between() -> clamp() & swaps args 1 and 2 in uses

This commit is contained in:
Spookerton
2024-01-31 13:34:02 +00:00
parent dfac4a77fe
commit ebbf0e33fb
68 changed files with 137 additions and 146 deletions
@@ -232,23 +232,23 @@
pump_direction = 1
if(signal.data["set_input_pressure"])
input_pressure_min = between(
0,
input_pressure_min = clamp(
text2num(signal.data["set_input_pressure"]),
0,
ONE_ATMOSPHERE*50
)
if(signal.data["set_output_pressure"])
output_pressure_max = between(
0,
output_pressure_max = clamp(
text2num(signal.data["set_output_pressure"]),
0,
ONE_ATMOSPHERE*50
)
if(signal.data["set_external_pressure"])
external_pressure_bound = between(
0,
external_pressure_bound = clamp(
text2num(signal.data["set_external_pressure"]),
0,
ONE_ATMOSPHERE*50
)
@@ -181,9 +181,9 @@
unlocked = !unlocked
if("set_target_pressure" in signal.data)
target_pressure = between(
0,
target_pressure = clamp(
text2num(signal.data["set_target_pressure"]),
0,
max_pressure_setting
)
@@ -262,7 +262,7 @@
target_pressure = max_pressure_setting
if("set")
var/new_pressure = input(usr,"Enter new output pressure (0-[max_pressure_setting]kPa)","Pressure Control",src.target_pressure) as num
src.target_pressure = between(0, new_pressure, max_pressure_setting)
src.target_pressure = clamp(new_pressure, 0, max_pressure_setting)
if("set_flow_rate")
. = TRUE
@@ -273,7 +273,7 @@
set_flow_rate = air1.volume
if("set")
var/new_flow_rate = input(usr,"Enter new flow rate limit (0-[air1.volume]L/s)","Flow Rate Control",src.set_flow_rate) as num
src.set_flow_rate = between(0, new_flow_rate, air1.volume)
src.set_flow_rate = clamp(new_flow_rate, 0, air1.volume)
update_icon()
add_fingerprint(usr)
@@ -182,9 +182,9 @@ Thus, the two variables affect pump operation are set in New():
update_use_power(!use_power)
if(signal.data["set_output_pressure"])
target_pressure = between(
0,
target_pressure = clamp(
text2num(signal.data["set_output_pressure"]),
0,
ONE_ATMOSPHERE*50
)
@@ -227,7 +227,7 @@ Thus, the two variables affect pump operation are set in New():
target_pressure = max_pressure_setting
if("set")
var/new_pressure = input(usr,"Enter new output pressure (0-[max_pressure_setting]kPa)","Pressure control",src.target_pressure) as num
src.target_pressure = between(0, new_pressure, max_pressure_setting)
src.target_pressure = clamp(new_pressure, 0, max_pressure_setting)
. = TRUE
add_fingerprint(usr)