Adds variable power setting to heaters and freezers

This commit is contained in:
mwerezak
2014-09-10 21:14:39 -04:00
parent 709d87d933
commit b4751e8161
4 changed files with 58 additions and 3 deletions

View File

@@ -1,3 +1,5 @@
//TODO: Put this under a common parent type with heaters to cut down on the copypasta
/obj/machinery/atmospherics/unary/freezer /obj/machinery/atmospherics/unary/freezer
name = "gas cooling system" name = "gas cooling system"
desc = "Cools gas when connected to pipe network" desc = "Cools gas when connected to pipe network"
@@ -12,9 +14,12 @@
var/on = 0 var/on = 0
use_power = 0 use_power = 0
idle_power_usage = 5 //5 Watts for thermostat related circuitry idle_power_usage = 5 //5 Watts for thermostat related circuitry
active_power_usage = 50000 //50 kW. The power rating of the freezer active_power_usage = 50000 //50 kW. The power rating of the freezer
var/max_power_usage = 50000 //power rating when the usage is turned up to 1
var/power_setting = 100
var/set_temperature = T20C //thermostat var/set_temperature = T20C //thermostat
var/cooling = 0 var/cooling = 0
var/opened = 0 //for deconstruction var/opened = 0 //for deconstruction
@@ -72,6 +77,7 @@
data["minGasTemperature"] = 0 data["minGasTemperature"] = 0
data["maxGasTemperature"] = round(T20C+500) data["maxGasTemperature"] = round(T20C+500)
data["targetGasTemperature"] = round(set_temperature) data["targetGasTemperature"] = round(set_temperature)
data["powerSetting"] = power_setting
var/temp_class = "good" var/temp_class = "good"
if (air_contents.temperature > (T0C - 20)) if (air_contents.temperature > (T0C - 20))
@@ -104,6 +110,10 @@
src.set_temperature = min(src.set_temperature+amount, 1000) src.set_temperature = min(src.set_temperature+amount, 1000)
else else
src.set_temperature = max(src.set_temperature+amount, 0) src.set_temperature = max(src.set_temperature+amount, 0)
if(href_list["setPower"]) //setting power to 0 is redundant anyways
world << "href_list\[\"setPower\"\] = [href_list["setPower"]]"
var/new_setting = between(0, text2num(href_list["setPower"]), 100)
set_power_level(new_setting)
src.add_fingerprint(usr) src.add_fingerprint(usr)
return 1 return 1
@@ -165,6 +175,16 @@
active_power_usage = initial(active_power_usage)*cap_rating //more powerful active_power_usage = initial(active_power_usage)*cap_rating //more powerful
heatsink_temperature = initial(heatsink_temperature)/((manip_rating+bin_rating)/2) //more efficient heatsink_temperature = initial(heatsink_temperature)/((manip_rating+bin_rating)/2) //more efficient
air_contents.volume = max(initial(internal_volume) - 200, 0) + 200*bin_rating air_contents.volume = max(initial(internal_volume) - 200, 0) + 200*bin_rating
set_power_level(power_setting)
/obj/machinery/atmospherics/unary/freezer/proc/set_power_level(var/new_power_setting)
power_setting = new_power_setting
var/old_power_usage = active_power_usage
active_power_usage = max_power_usage * (power_setting/100)
if (use_power >= 2 && old_power_usage != active_power_usage)
force_power_update()
//dismantling code. copied from autolathe //dismantling code. copied from autolathe
/obj/machinery/atmospherics/unary/freezer/attackby(var/obj/item/O as obj, var/mob/user as mob) /obj/machinery/atmospherics/unary/freezer/attackby(var/obj/item/O as obj, var/mob/user as mob)

View File

@@ -1,3 +1,5 @@
//TODO: Put this under a common parent type with freezers to cut down on the copypasta
/obj/machinery/atmospherics/unary/heater /obj/machinery/atmospherics/unary/heater
name = "gas heating system" name = "gas heating system"
desc = "Heats gas when connected to a pipe network" desc = "Heats gas when connected to a pipe network"
@@ -13,8 +15,11 @@
var/on = 0 var/on = 0
use_power = 0 use_power = 0
idle_power_usage = 5 //5 Watts for thermostat related circuitry idle_power_usage = 5 //5 Watts for thermostat related circuitry
active_power_usage = 50000 //50 kW. The power rating of the heater active_power_usage = 50000 //50 kW. The power rating of the heater
var/max_power_usage = 50000 //power rating when the usage is turned up to 1
var/power_setting = 1.0 //between 0 and 1
var/heating = 0 //mainly for icon updates var/heating = 0 //mainly for icon updates
var/opened = 0 //for deconstruction var/opened = 0 //for deconstruction
@@ -93,6 +98,7 @@
data["minGasTemperature"] = 0 data["minGasTemperature"] = 0
data["maxGasTemperature"] = round(max_temperature) data["maxGasTemperature"] = round(max_temperature)
data["targetGasTemperature"] = round(set_temperature) data["targetGasTemperature"] = round(set_temperature)
data["powerSetting"] = power_setting
var/temp_class = "normal" var/temp_class = "normal"
if (air_contents.temperature > (T20C+40)) if (air_contents.temperature > (T20C+40))
@@ -123,6 +129,9 @@
src.set_temperature = min(src.set_temperature+amount, max_temperature) src.set_temperature = min(src.set_temperature+amount, max_temperature)
else else
src.set_temperature = max(src.set_temperature+amount, 0) src.set_temperature = max(src.set_temperature+amount, 0)
if(href_list["setPower"]) //setting power to 0 is redundant anyways
var/new_setting = between(0, text2num(href_list["setPower"]), 100)
set_power_level(new_setting)
src.add_fingerprint(usr) src.add_fingerprint(usr)
return 1 return 1
@@ -145,9 +154,19 @@
cap_rating /= cap_count cap_rating /= cap_count
bin_rating /= bin_count bin_rating /= bin_count
active_power_usage = initial(active_power_usage)*cap_rating max_power_usage = initial(max_power_usage)*cap_rating
max_temperature = max(initial(max_temperature) - T20C, 0)*((bin_rating*2 + cap_rating)/3) + T20C max_temperature = max(initial(max_temperature) - T20C, 0)*((bin_rating*2 + cap_rating)/3) + T20C
air_contents.volume = max(initial(internal_volume) - 200, 0) + 200*bin_rating air_contents.volume = max(initial(internal_volume) - 200, 0) + 200*bin_rating
set_power_level(power_setting)
/obj/machinery/atmospherics/unary/heater/proc/set_power_level(var/new_power_setting)
power_setting = new_power_setting
var/old_power_usage = active_power_usage
active_power_usage = max_power_usage * (power_setting/100)
if (use_power >= 2 && old_power_usage != active_power_usage)
force_power_update()
//dismantling code. copied from autolathe //dismantling code. copied from autolathe
/obj/machinery/atmospherics/unary/heater/attackby(var/obj/item/O as obj, var/mob/user as mob) /obj/machinery/atmospherics/unary/heater/attackby(var/obj/item/O as obj, var/mob/user as mob)

View File

@@ -165,6 +165,9 @@ Class Procs:
use_power = new_use_power use_power = new_use_power
//force area power update //force area power update
force_power_update()
/obj/machinery/proc/force_power_update()
var/area/A = get_area(src) var/area/A = get_area(src)
if(A && A.master) if(A && A.master)
A.master.powerupdate = 1 A.master.powerupdate = 1

View File

@@ -7,6 +7,19 @@
</div> </div>
</div> </div>
<div class="item">
<div class="itemLabel">
Power Level:
</div>
<div class="itemContent">
{{:helper.link('1', null, {'setPower' : 20}, (data.powerSetting == 20)? 'selected' : null)}}
{{:helper.link('2', null, {'setPower' : 40}, (data.powerSetting == 40)? 'selected' : null)}}
{{:helper.link('3', null, {'setPower' : 60}, (data.powerSetting == 60)? 'selected' : null)}}
{{:helper.link('4', null, {'setPower' : 80}, (data.powerSetting == 80)? 'selected' : null)}}
{{:helper.link('5', null, {'setPower' : 100}, (data.powerSetting == 100)? 'selected' : null)}}
</div>
</div>
<div class="item"> <div class="item">
<div class="itemLabel"> <div class="itemLabel">
Gas Pressure: Gas Pressure: