cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ports more of /tg/'s powernet code.

Browse Source 
Among other things this fixes a a bug where SMES would draw excess power from the powergrid they were outputting to, rather than drawing from.
This commit is contained in:
PsiOmega
2014-10-29 14:00:11 +01:00
parent c8e27555b9
commit a1c19b78be
14 changed files with 204 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/ATMOSPHERICS/components/unary/cold_sink.dm
View File

@@ -181,13 +181,8 @@
/obj/machinery/atmospherics/unary/freezer/proc/set_power_level(var/new_power_setting) /obj/machinery/atmospherics/unary/freezer/proc/set_power_level(var/new_power_setting)
power_setting = new_power_setting power_setting = new_power_setting
var/old_power_usage = active_power_usage
active_power_usage = max_power_usage * (power_setting/100) 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)
if(istype(O, /obj/item/weapon/screwdriver)) if(istype(O, /obj/item/weapon/screwdriver))

9
code/ATMOSPHERICS/components/unary/heat_source.dm
View File

@@ -18,7 +18,7 @@
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 //50 kW. The power rating of the heater active_power_usage //50 kW. The power rating of the heater
var/max_power_usage = 20000 //power rating when the usage is turned up to 100 var/max_power_usage = 20000 //power rating when the usage is turned up to 100
var/power_setting = 100 var/power_setting = 100
@@ -35,7 +35,7 @@
component_parts += new /obj/item/weapon/stock_parts/matter_bin(src) component_parts += new /obj/item/weapon/stock_parts/matter_bin(src)
component_parts += new /obj/item/weapon/stock_parts/capacitor(src) component_parts += new /obj/item/weapon/stock_parts/capacitor(src)
component_parts += new /obj/item/weapon/stock_parts/capacitor(src) component_parts += new /obj/item/weapon/stock_parts/capacitor(src)
active_power_usage = max_power_usage * (power_setting/100) active_power_usage = max_power_usage * (power_setting/100)
/obj/machinery/atmospherics/unary/heater/initialize() /obj/machinery/atmospherics/unary/heater/initialize()
@@ -164,12 +164,7 @@
/obj/machinery/atmospherics/unary/heater/proc/set_power_level(var/new_power_setting) /obj/machinery/atmospherics/unary/heater/proc/set_power_level(var/new_power_setting)
power_setting = new_power_setting power_setting = new_power_setting
var/old_power_usage = active_power_usage
active_power_usage = max_power_usage * (power_setting/100) 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)

53
code/controllers/master_controller.dm
View File

@@ -274,8 +274,6 @@ datum/controller/game_controller/proc/process_diseases()
datum/controller/game_controller/proc/process_machines() datum/controller/game_controller/proc/process_machines()
process_machines_sort() process_machines_sort()
process_machines_process() process_machines_process()
process_machines_power()
process_machines_rebuild()
/var/global/machinery_sort_required = 0 /var/global/machinery_sort_required = 0
datum/controller/game_controller/proc/process_machines_sort() datum/controller/game_controller/proc/process_machines_sort()
@@ -284,49 +282,14 @@ datum/controller/game_controller/proc/process_machines_sort()
machines = dd_sortedObjectList(machines) machines = dd_sortedObjectList(machines)
datum/controller/game_controller/proc/process_machines_process() datum/controller/game_controller/proc/process_machines_process()
var/i = 1 for(var/obj/machinery/Machine in machines)
while(i<=machines.len) last_thing_processed = Machine.type
var/obj/machinery/Machine = machines[i] if(Machine.process() != PROCESS_KILL)
if(Machine) if(Machine)
last_thing_processed = Machine.type if(Machine.use_power)
if(Machine.process() != PROCESS_KILL) Machine.auto_use_power()
if(Machine) continue
i++ machines -= Machine
continue
machines.Cut(i,i+1)
datum/controller/game_controller/proc/process_machines_power()
var/i=1
while(i<=active_areas.len)
var/area/A = active_areas[i]
if(A.powerupdate && A.master == A)
A.powerupdate -= 1
A.clear_usage()
for(var/j = 1; j <= A.related.len; j++)
var/area/SubArea = A.related[j]
for(var/obj/machinery/M in SubArea)
if(M)
//check if the area has power for M's channel
//this will keep stat updated in case the machine is moved from one area to another.
M.power_change(A) //we've already made sure A is a master area, above.
if(!(M.stat & NOPOWER) && M.use_power)
M.auto_use_power()
if(A.apc.len && A.master == A)
i++
continue
A.powerupdate = 0
active_areas.Cut(i,i+1)
datum/controller/game_controller/proc/process_machines_rebuild()
if(controller_iteration % 150 == 0 || rebuild_active_areas) //Every 300 seconds we retest every area/machine
for(var/area/A in all_areas)
if(A == A.master)
A.powerupdate += 1
active_areas |= A
rebuild_active_areas = 0
datum/controller/game_controller/proc/process_objects() datum/controller/game_controller/proc/process_objects()

1
code/game/area/Space Station 13 areas.dm
View File

@@ -33,7 +33,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
var/eject = null var/eject = null
var/debug = 0 var/debug = 0
var/powerupdate = 10 //We give everything 10 ticks to settle out it's power usage.
var/requires_power = 1 var/requires_power = 1
var/unlimited_power = 0 var/unlimited_power = 0
var/always_unpowered = 0 //this gets overriden to 1 for space in area/New() var/always_unpowered = 0 //this gets overriden to 1 for space in area/New()

25
code/game/gamemodes/events/power_failure.dm
View File

@@ -9,13 +9,13 @@
var/area/current_area = get_area(S) var/area/current_area = get_area(S)
if(current_area.type in skipped_areas || S.z != 1) if(current_area.type in skipped_areas || S.z != 1)
continue continue
S.last_charge = S.charge S.last_charge = S.charge
S.last_output = S.output S.last_output_attempt = S.output_attempt
S.last_online = S.online S.last_input_attempt = S.input_attempt
S.charge = 0 S.charge = 0
S.output = 0 S.inputting(0)
S.online = 0 S.outputting(0)
S.updateicon() S.update_icon()
S.power_change() S.power_change()
@@ -36,9 +36,9 @@
if(current_area.type in skipped_areas || S.z != 1) if(current_area.type in skipped_areas || S.z != 1)
continue continue
S.charge = S.last_charge S.charge = S.last_charge
S.output = S.last_output S.output_attempt = S.last_output_attempt
S.online = S.last_online S.input_attempt = S.last_input_attempt
S.updateicon() S.update_icon()
S.power_change() S.power_change()
/proc/power_restore_quick(var/announce = 1) /proc/power_restore_quick(var/announce = 1)
@@ -49,7 +49,8 @@
if(S.z != 1) if(S.z != 1)
continue continue
S.charge = S.capacity S.charge = S.capacity
S.output = 200000 S.output_level = 200000
S.online = 1 S.output_attempt = 1
S.updateicon() S.input_attempt = 1
S.update_icon()
S.power_change() S.power_change()

15
code/game/machinery/machinery.dm
View File

@@ -165,14 +165,6 @@ Class Procs:
use_power = new_use_power use_power = new_use_power
//force area power update
force_power_update()
/obj/machinery/proc/force_power_update()
var/area/A = get_area(src)
if(A && A.master)
A.master.powerupdate = 1
/obj/machinery/proc/auto_use_power() /obj/machinery/proc/auto_use_power()
if(!powered(power_channel)) if(!powered(power_channel))
return 0 return 0
@@ -214,9 +206,6 @@ Class Procs:
src.add_fingerprint(usr) src.add_fingerprint(usr)
var/area/A = get_area(src)
A.master.powerupdate = 1
return 0 return 0
/obj/machinery/attack_ai(mob/user as mob) /obj/machinery/attack_ai(mob/user as mob)
@@ -257,13 +246,9 @@ Class Procs:
src.add_fingerprint(user) src.add_fingerprint(user)
var/area/A = get_area(src)
A.master.powerupdate = 1
return 0 return 0
/obj/machinery/proc/RefreshParts() //Placeholder proc for machines that are built using frames. /obj/machinery/proc/RefreshParts() //Placeholder proc for machines that are built using frames.
return
return 0 return 0
/obj/machinery/proc/assign_uid() /obj/machinery/proc/assign_uid()

14
code/modules/admin/verbs/debug.dm
View File

@@ -957,7 +957,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
for(var/obj/machinery/power/smes/SMES in world) for(var/obj/machinery/power/smes/SMES in world)
if(SMES.anchored) if(SMES.anchored)
SMES.chargemode = 1 SMES.input_attempt = 1
/client/proc/setup_supermatter_engine() /client/proc/setup_supermatter_engine()
set category = "Debug" set category = "Debug"
@@ -1017,16 +1017,16 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
else if(istype(M,/obj/machinery/power/smes)) //This is the SMES inside the engine room. We don't need much power. else if(istype(M,/obj/machinery/power/smes)) //This is the SMES inside the engine room. We don't need much power.
var/obj/machinery/power/smes/SMES = M var/obj/machinery/power/smes/SMES = M
SMES.chargemode = 1 SMES.input_attempt = 1
SMES.chargelevel = 200000 SMES.input_level = 200000
SMES.output = 75000 SMES.output_level = 75000
else if(istype(M.loc.loc,/area/engine/engine_smes)) //Set every SMES to charge and spit out 300,000 power between the 4 of them. else if(istype(M.loc.loc,/area/engine/engine_smes)) //Set every SMES to charge and spit out 300,000 power between the 4 of them.
if(istype(M,/obj/machinery/power/smes)) if(istype(M,/obj/machinery/power/smes))
var/obj/machinery/power/smes/SMES = M var/obj/machinery/power/smes/SMES = M
SMES.chargemode = 1 SMES.input_attempt = 1
SMES.chargelevel = 200000 SMES.input_level = 200000
SMES.output = 75000 SMES.output_level = 75000
if(!found_the_pump && response == "Setup Completely") if(!found_the_pump && response == "Setup Completely")
src << "\red Unable to locate air supply to fill up with coolant, adding some coolant around the supermatter" src << "\red Unable to locate air supply to fill up with coolant, adding some coolant around the supermatter"

85
code/modules/power/apc.dm
View File

@@ -1072,10 +1072,10 @@
if(!area.requires_power) if(!area.requires_power)
return return
lastused_light = area.usage(LIGHT) lastused_light = area.usage(LIGHT)
lastused_equip = area.usage(EQUIP) lastused_equip = area.usage(EQUIP)
lastused_environ = area.usage(ENVIRON) lastused_environ = area.usage(ENVIRON)
area.clear_usage()
lastused_total = lastused_light + lastused_equip + lastused_environ lastused_total = lastused_light + lastused_equip + lastused_environ
@@ -1086,45 +1086,33 @@
var/last_ch = charging var/last_ch = charging
var/excess = surplus() var/excess = surplus()
var/power_excess = 0
var/perapc = 0 if(!src.avail())
if(terminal && terminal.powernet) main_status = 0
perapc = terminal.powernet.perapc else if(excess < 0)
main_status = 1
else
main_status = 2
if(debug) if(debug)
log_debug( "Status: [main_status] - Excess: [excess] - Last Equip: [lastused_equip] - Last Light: [lastused_light]") log_debug("Status: [main_status] - Excess: [excess] - Last Equip: [lastused_equip] - Last Light: [lastused_light] - Longterm: [longtermpower]")
if(area.powerupdate)
log_debug("power update in [area.name] / [name]")
if(cell && !shorted) if(cell && !shorted)
//var/cell_charge = cell.charge // draw power from cell as before to power the area
var/cell_maxcharge = cell.maxcharge var/cellused = min(cell.charge, CELLRATE * lastused_total) // clamp deduction to a max, amount left in cell
cell.use(cellused)
// Calculate how much power the APC will try to get from the grid. if(excess > lastused_total) // if power excess recharge the cell
var/target_draw = lastused_total // by the same amount just used
if (src.attempt_charging()) var/draw = draw_power(cellused/CELLRATE) // draw the power needed to charge this cell
target_draw += min((cell_maxcharge - cell.charge), (cell_maxcharge*CHARGELEVEL))/CELLRATE cell.give(draw * CELLRATE)
target_draw = min(target_draw, perapc) //limit power draw by perapc else // no excess, and not enough per-apc
if( (cell.charge/CELLRATE + excess) >= lastused_total) // can we draw enough from cell+grid to cover last usage?
// try to draw power from the grid var/draw = draw_power(excess)
var/power_drawn = 0 cell.charge = min(cell.maxcharge, cell.charge + CELLRATE * draw) //recharge with what we can
if (src.avail()) charging = 0
power_drawn = draw_power(target_draw) //get some power from the powernet else // not enough power available to run the last tick!
charging = 0
//figure out how much power is left over after meeting demand
power_excess = power_drawn - lastused_total
if (power_excess < 0) //couldn't get enough power from the grid, we will need to take from the power cell.
charging = 0
var/required_power = -power_excess
if(cell.charge >= required_power*CELLRATE) // can we draw enough from cell to cover what's left over?
cell.use(required_power*CELLRATE)
else if (autoflag != 0) // not enough power available to run the last tick!
chargecount = 0 chargecount = 0
// This turns everything off in the case that there is still a charge left on the battery, just not enough to run the room. // This turns everything off in the case that there is still a charge left on the battery, just not enough to run the room.
equipment = autoset(equipment, 0) equipment = autoset(equipment, 0)
@@ -1132,13 +1120,6 @@
environ = autoset(environ, 0) environ = autoset(environ, 0)
autoflag = 0 autoflag = 0
//Set external power status
if (!power_drawn)
main_status = 0
else if (power_excess < 0)
main_status = 1
else
main_status = 2
// Set channels depending on how much charge we have left // Set channels depending on how much charge we have left
@@ -1148,7 +1129,6 @@
else if(longtermpower > -10) else if(longtermpower > -10)
longtermpower -= 2 longtermpower -= 2
if(cell.charge >= 1250 || longtermpower > 0) // Put most likely at the top so we don't check it last, effeciency 101 if(cell.charge >= 1250 || longtermpower > 0) // Put most likely at the top so we don't check it last, effeciency 101
if(autoflag != 3) if(autoflag != 3)
equipment = autoset(equipment, 1) equipment = autoset(equipment, 1)
@@ -1181,28 +1161,33 @@
autoflag = 0 autoflag = 0
// now trickle-charge the cell // now trickle-charge the cell
if(src.attempt_charging()) if(src.attempt_charging())
if (power_excess > 0) // check to make sure we have enough to charge if(excess > 0) // check to make sure we have enough to charge
cell.give(power_excess*CELLRATE) // actually recharge the cell // Max charge is capped to % per second constant
var/ch = min(excess*CELLRATE, cell.maxcharge*CHARGELEVEL)
ch = draw_power(ch/CELLRATE) // Removes the power we're taking from the grid
cell.give(ch*CELLRATE) // actually recharge the cell
else else
charging = 0 // stop charging charging = 0 // stop charging
chargecount = 0 chargecount = 0
// show cell as fully charged if so // show cell as fully charged if so
if(cell.charge >= cell_maxcharge) if(cell.charge >= cell.maxcharge)
cell.charge = cell.maxcharge
charging = 2 charging = 2
//if we have excess power for long enough, think about re-enable charging.
if(chargemode) if(chargemode)
if(!charging) if(!charging)
//last_surplus() overestimates the amount of power available for charging, but it's equivalent to what APCs were doing before. if(excess > cell.maxcharge*CHARGELEVEL)
if(src.last_surplus()*CELLRATE >= cell_maxcharge*CHARGELEVEL)
chargecount++ chargecount++
else else
chargecount = 0 chargecount = 0
charging = 0
if(chargecount >= 10) if(chargecount >= 10)
chargecount = 0 chargecount = 0
charging = 1 charging = 1
@@ -1220,7 +1205,6 @@
area.poweralert(0, src) area.poweralert(0, src)
autoflag = 0 autoflag = 0
// update icon & area power if anything changed // update icon & area power if anything changed
if(last_lt != lighting || last_eq != equipment || last_en != environ) if(last_lt != lighting || last_eq != equipment || last_en != environ)
@@ -1228,7 +1212,6 @@
update() update()
else if (last_ch != charging) else if (last_ch != charging)
queue_icon_update() queue_icon_update()
src.updateDialog()
// val 0=off, 1=off(auto) 2=on 3=on(auto) // val 0=off, 1=off(auto) 2=on 3=on(auto)
// on 0=off, 1=on, 2=autooff // on 0=off, 1=on, 2=autooff

54
code/modules/power/batteryrack.dm
View File

@@ -23,9 +23,9 @@
name = "power cell rack PSU" name = "power cell rack PSU"
desc = "A rack of power cells working as a PSU." desc = "A rack of power cells working as a PSU."
charge = 0 //you dont really want to make a potato PSU which already is overloaded charge = 0 //you dont really want to make a potato PSU which already is overloaded
online = 0 output_attempt = 0
chargelevel = 0 input_level = 0
output = 0 output_level = 0
input_level_max = 0 input_level_max = 0
output_level_max = 0 output_level_max = 0
icon_state = "gsmes" icon_state = "gsmes"
@@ -37,9 +37,9 @@
/obj/machinery/power/smes/batteryrack/substation /obj/machinery/power/smes/batteryrack/substation
name = "Substation PSU" name = "Substation PSU"
desc = "A rack of power cells working as a PSU. This one seems to be equipped for higher power loads." desc = "A rack of power cells working as a PSU. This one seems to be equipped for higher power loads."
output = 150000 output_level = 150000
chargelevel = 150000 input_level = 150000
online = 1 output_attempt = 1
// One high capacity cell, two regular cells. Lots of room for engineer upgrades // One high capacity cell, two regular cells. Lots of room for engineer upgrades
// Also five basic capacitors. Again, upgradeable. // Also five basic capacitors. Again, upgradeable.
@@ -89,13 +89,13 @@
capacity = C * 40 //Basic cells are such crap. Hyper cells needed to get on normal SMES levels. capacity = C * 40 //Basic cells are such crap. Hyper cells needed to get on normal SMES levels.
/obj/machinery/power/smes/batteryrack/updateicon() /obj/machinery/power/smes/batteryrack/update_icon()
overlays.Cut() overlays.Cut()
if(stat & BROKEN) return if(stat & BROKEN) return
if (online) if (output_attempt)
overlays += image('icons/obj/power.dmi', "gsmes_outputting") overlays += image('icons/obj/power.dmi', "gsmes_outputting")
if(charging) if(inputting)
overlays += image('icons/obj/power.dmi', "gsmes_charging") overlays += image('icons/obj/power.dmi', "gsmes_charging")
var/clevel = chargedisplay() var/clevel = chargedisplay()
@@ -113,7 +113,7 @@
if(open_hatch) if(open_hatch)
if(istype(W, /obj/item/weapon/crowbar)) if(istype(W, /obj/item/weapon/crowbar))
if (charge < (capacity / 100)) if (charge < (capacity / 100))
if (!online && !chargemode) if (!output_attempt && !input_attempt)
playsound(get_turf(src), 'sound/items/Crowbar.ogg', 50, 1) playsound(get_turf(src), 'sound/items/Crowbar.ogg', 50, 1)
var/obj/machinery/constructable_frame/machine_frame/M = new /obj/machinery/constructable_frame/machine_frame(src.loc) var/obj/machinery/constructable_frame/machine_frame/M = new /obj/machinery/constructable_frame/machine_frame(src.loc)
M.state = 2 M.state = 2
@@ -130,7 +130,7 @@
user << "<span class='warning'>Better let [src] discharge before dismantling it.</span>" user << "<span class='warning'>Better let [src] discharge before dismantling it.</span>"
else if ((istype(W, /obj/item/weapon/stock_parts/capacitor) && (capacitors_amount < 5)) || (istype(W, /obj/item/weapon/cell) && (cells_amount < 5))) else if ((istype(W, /obj/item/weapon/stock_parts/capacitor) && (capacitors_amount < 5)) || (istype(W, /obj/item/weapon/cell) && (cells_amount < 5)))
if (charge < (capacity / 100)) if (charge < (capacity / 100))
if (!online && !chargemode) if (!output_attempt && !input_attempt)
user.drop_item() user.drop_item()
component_parts += W component_parts += W
W.loc = src W.loc = src
@@ -163,13 +163,13 @@
return return
/obj/machinery/power/smes/batteryrack/makeshift/updateicon() /obj/machinery/power/smes/batteryrack/makeshift/update_icon()
overlays.Cut() overlays.Cut()
if(stat & BROKEN) return if(stat & BROKEN) return
if (online) if (output_attempt)
overlays += image('icons/obj/power.dmi', "gsmes_outputting") overlays += image('icons/obj/power.dmi', "gsmes_outputting")
if(charging) if(inputting)
overlays += image('icons/obj/power.dmi', "gsmes_charging") overlays += image('icons/obj/power.dmi', "gsmes_charging")
if (overcharge_percent > 100) if (overcharge_percent > 100)
overlays += image('icons/obj/power.dmi', "gsmes_overcharge") overlays += image('icons/obj/power.dmi', "gsmes_overcharge")
@@ -234,35 +234,35 @@
//store machine state to see if we need to update the icon overlays //store machine state to see if we need to update the icon overlays
var/last_disp = chargedisplay() var/last_disp = chargedisplay()
var/last_chrg = charging var/last_chrg = inputting
var/last_onln = online var/last_onln = output_attempt
var/last_overcharge = overcharge_percent var/last_overcharge = overcharge_percent
if(terminal) if(terminal)
if(chargemode) if(input_attempt)
var/target_load = min((capacity-charge)/SMESRATE, chargelevel) // charge at set rate, limited to spare capacity var/target_load = min((capacity-charge)/SMESRATE, input_level) // charge at set rate, limited to spare capacity
var/actual_load = draw_power(target_load) // add the load to the terminal side network var/actual_load = draw_power(target_load) // add the load to the terminal side network
charge += actual_load * SMESRATE // increase the charge charge += actual_load * SMESRATE // increase the charge
if (actual_load >= target_load) // did the powernet have enough power available for us? if (actual_load >= target_load) // did the powernet have enough power available for us?
charging = 1 inputting = 1
else else
charging = 0 inputting = 0
if(online) // if outputting if(output_attempt) // if outputting
lastout = min( charge/SMESRATE, output) //limit output to that stored output_used = min( charge/SMESRATE, output_level) //limit output to that stored
charge -= lastout*SMESRATE // reduce the storage (may be recovered in /restore() if excessive) charge -= output_used*SMESRATE // reduce the storage (may be recovered in /restore() if excessive)
add_avail(lastout) // add output to powernet (smes side) add_avail(output_used) // add output to powernet (smes side)
if(charge < 0.0001) if(charge < 0.0001)
online = 0 // stop output if charge falls to zero outputting(0) // stop output if charge falls to zero
overcharge_percent = round((charge / capacity) * 100) overcharge_percent = round((charge / capacity) * 100)
if (overcharge_percent > 115) //115% is the minimum overcharge for anything to happen if (overcharge_percent > 115) //115% is the minimum overcharge for anything to happen
overcharge_consequences() overcharge_consequences()
// only update icon if state changed // only update icon if state changed
if(last_disp != chargedisplay() || last_chrg != charging || last_onln != online || ((overcharge_percent > 100) ^ (last_overcharge > 100))) if(last_disp != chargedisplay() || last_chrg != inputting || last_onln != output_attempt || ((overcharge_percent > 100) ^ (last_overcharge > 100)))
updateicon() update_icon()
return return
#undef SMESRATE #undef SMESRATE

24
code/modules/power/cable.dm
View File

@@ -212,30 +212,6 @@ obj/structure/cable/proc/cableColor(var/colorC)
color_n = colorC color_n = colorC
color = color_n color = color_n
////////////////////////////////////////////
// Power related
///////////////////////////////////////////
obj/structure/cable/proc/add_avail(var/amount)
if(powernet)
powernet.newavail += amount
obj/structure/cable/proc/add_load(var/amount)
if(powernet)
powernet.load += amount
obj/structure/cable/proc/surplus()
if(powernet)
return powernet.avail-powernet.load
else
return 0
obj/structure/cable/proc/avail()
if(powernet)
return powernet.avail
else
return 0
///////////////////////////////////////////////// /////////////////////////////////////////////////
// Cable laying helpers // Cable laying helpers
//////////////////////////////////////////////// ////////////////////////////////////////////////

2
code/modules/power/power.dm
View File

@@ -352,7 +352,7 @@
source_area.use_power(drained_energy/CELLRATE) source_area.use_power(drained_energy/CELLRATE)
else if (istype(power_source,/datum/powernet)) else if (istype(power_source,/datum/powernet))
var/drained_power = drained_energy/CELLRATE //convert from "joules" to "watts" var/drained_power = drained_energy/CELLRATE //convert from "joules" to "watts"
PN.load+=drained_power PN.draw_power(drained_power)
else if (istype(power_source, /obj/item/weapon/cell)) else if (istype(power_source, /obj/item/weapon/cell))
cell.use(drained_energy) cell.use(drained_energy)
return drained_energy return drained_energy

4
code/modules/power/powernet.dm
View File

@@ -21,7 +21,7 @@
//Returns the amount of excess power (before refunding to SMESs) from last tick. //Returns the amount of excess power (before refunding to SMESs) from last tick.
//This is for machines that might adjust their power consumption using this data. //This is for machines that might adjust their power consumption using this data.
/datum/powernet/proc/last_surplus() /datum/powernet/proc/last_surplus()
return max(avail - load, 0) return netexcess
/datum/powernet/proc/draw_power(var/amount) /datum/powernet/proc/draw_power(var/amount)
var/draw = between(0, amount, avail - load) var/draw = between(0, amount, avail - load)
@@ -89,7 +89,7 @@
//Therefore we can raise the amount of power rationed out to APCs on the assumption that those APCs that used less than perapc will continue to do so. //Therefore we can raise the amount of power rationed out to APCs on the assumption that those APCs that used less than perapc will continue to do so.
//If that assumption fails, then some APCs will miss out on power next tick, however it will be rebalanced for the tick after. //If that assumption fails, then some APCs will miss out on power next tick, however it will be rebalanced for the tick after.
if (netexcess >= 0) if (netexcess >= 0)
perapc_excess += min(netexcess/numapc, (avail - perapc) - perapc_excess) perapc_excess = netexcess/numapc
else else
perapc_excess = 0 perapc_excess = 0

187
code/modules/power/smes.dm
View File

@@ -11,7 +11,23 @@
density = 1 density = 1
anchored = 1 anchored = 1
use_power = 0 use_power = 0
var/output = 50000 //Amount of power it tries to output
var/capacity = 5e6 // maximum charge
var/charge = 1e6 // actual charge
var/input_attempt = 0 // 1 = attempting to charge, 0 = not attempting to charge
var/inputting = 0 // 1 = actually inputting, 0 = not inputting
var/input_level = 50000 // amount of power the SMES attempts to charge by
var/input_level_max = 200000 // cap on input_level
var/input_available = 0 // amount of charge available from input last tick
var/output_attempt = 1 // 1 = attempting to output, 0 = not attempting to output
var/outputting = 1 // 1 = actually outputting, 0 = not outputting
var/output_level = 50000 // amount of power the SMES attempts to output
var/output_level_max = 200000 // cap on output_level
var/output_used = 0 // amount of power actually outputted. may be less than output_level if the powernet returns excess power
/*var/output = 50000 //Amount of power it tries to output
var/lastout = 0 //Amount of power it actually outputs to the powernet var/lastout = 0 //Amount of power it actually outputs to the powernet
var/loaddemand = 0 //For use in restore() var/loaddemand = 0 //For use in restore()
var/capacity = 5e6 //Maximum amount of power it can hold var/capacity = 5e6 //Maximum amount of power it can hold
@@ -21,16 +37,17 @@
//var/chargecount = 0 //var/chargecount = 0
var/chargelevel = 0 //Amount of power it tries to charge from powernet var/chargelevel = 0 //Amount of power it tries to charge from powernet
var/online = 1 //1 if it's outputting power, 0 if not. var/online = 1 //1 if it's outputting power, 0 if not.
var/name_tag = null */
var/obj/machinery/power/terminal/terminal = null
//Holders for powerout event. //Holders for powerout event.
var/last_output = 0 var/last_output_attempt = 0
var/last_charge = 0 var/last_input_attempt = 0
var/last_online = 0 var/last_charge = 0
var/open_hatch = 0 var/open_hatch = 0
var/name_tag = null
var/building_terminal = 0 //Suggestions about how to avoid clickspam building several terminals accepted! var/building_terminal = 0 //Suggestions about how to avoid clickspam building several terminals accepted!
var/input_level_max = 200000 var/obj/machinery/power/terminal/terminal = null
var/output_level_max = 200000
/obj/machinery/power/smes/New() /obj/machinery/power/smes/New()
..() ..()
@@ -51,19 +68,19 @@
terminal.master = src terminal.master = src
if(!terminal.powernet) if(!terminal.powernet)
terminal.connect_to_network() terminal.connect_to_network()
updateicon() update_icon()
return return
/obj/machinery/power/smes/proc/updateicon() /obj/machinery/power/smes/update_icon()
overlays.Cut() overlays.Cut()
if(stat & BROKEN) return if(stat & BROKEN) return
overlays += image('icons/obj/power.dmi', "smes-op[online]") overlays += image('icons/obj/power.dmi', "smes-op[outputting]")
if(charging) if(inputting)
overlays += image('icons/obj/power.dmi', "smes-oc1") overlays += image('icons/obj/power.dmi', "smes-oc1")
else else
if(chargemode) if(input_attempt)
overlays += image('icons/obj/power.dmi', "smes-oc0") overlays += image('icons/obj/power.dmi', "smes-oc0")
var/clevel = chargedisplay() var/clevel = chargedisplay()
@@ -79,55 +96,67 @@
/obj/machinery/power/smes/process() /obj/machinery/power/smes/process()
if(stat & BROKEN) return if(stat & BROKEN) return
//store machine state to see if we need to update the icon overlays //store machine state to see if we need to update the icon overlays
var/last_disp = chargedisplay() var/last_disp = chargedisplay()
var/last_chrg = charging var/last_chrg = inputting
var/last_onln = online var/last_onln = outputting
if(terminal) //inputting
//If chargemod is set, try to charge if(terminal && input_attempt)
//Use charging to let the player know whether we were able to obtain our target load. input_available = terminal.surplus()
//TODO: Add a meter to tell players how much charge we are actually getting, and only set charging to 0 when we are unable to get any charge at all.
if(chargemode)
var/target_load = min((capacity-charge)/SMESRATE, chargelevel) // charge at set rate, limited to spare capacity
var/actual_load = draw_power(target_load) // add the load to the terminal side network
charge += actual_load * SMESRATE // increase the charge
if (actual_load >= target_load) // did the powernet have enough power available for us? if(inputting)
charging = 1 if(input_available > 0 && input_available >= input_level) // if there's power available, try to charge
else
charging = 0
if(online) // if outputting var/load = min((capacity-charge)/SMESRATE, input_level) // charge at set rate, limited to spare capacity
lastout = min( charge/SMESRATE, output) //limit output to that stored var/actual_load = terminal.draw_power(load) // draw power from the terminal side network
charge -= lastout*SMESRATE // reduce the storage (may be recovered in /restore() if excessive) charge += actual_load * SMESRATE // increase the charge
add_avail(lastout) // add output to powernet (smes side)
if(charge < 0.0001) else // if not enough capcity
online = 0 // stop output if charge falls to zero inputting = 0 // stop inputting
else
if(input_attempt && input_available > 0 && input_available >= input_level)
inputting = 1
//outputting
if(outputting)
output_used = min( charge/SMESRATE, output_level) //limit output to that stored
charge -= output_used*SMESRATE // reduce the storage (may be recovered in /restore() if excessive)
add_avail(output_used) // add output to powernet (smes side)
if(output_used < 0.0001) // either from no charge or set to 0
outputting = 0
investigate_log("lost power and turned <font color='red'>off</font>","singulo")
else if(output_attempt && charge > output_level && output_level > 0)
outputting = 1
else
output_used = 0
// only update icon if state changed // only update icon if state changed
if(last_disp != chargedisplay() || last_chrg != charging || last_onln != online) if(last_disp != chargedisplay() || last_chrg != inputting || last_onln != outputting)
updateicon() update_icon()
return
// called after all power processes are finished // called after all power processes are finished
// restores charge level to smes if there was excess this ptick // restores charge level to smes if there was excess this ptick
/obj/machinery/power/smes/proc/restore() /obj/machinery/power/smes/proc/restore()
if(stat & BROKEN) if(stat & BROKEN)
return return
if(!online) if(!outputting)
loaddemand = 0 output_used = 0
return return
var/excess = powernet.netexcess // this was how much wasn't used on the network last ptick, minus any removed by other SMESes var/excess = powernet.netexcess // this was how much wasn't used on the network last ptick, minus any removed by other SMESes
excess = min(lastout, excess) // clamp it to how much was actually output by this SMES last ptick excess = min(output_used, excess) // clamp it to how much was actually output by this SMES last ptick
excess = min((capacity-charge)/SMESRATE, excess) // for safety, also limit recharge by space capacity of SMES (shouldn't happen) excess = min((capacity-charge)/SMESRATE, excess) // for safety, also limit recharge by space capacity of SMES (shouldn't happen)
@@ -135,13 +164,13 @@
var/clev = chargedisplay() var/clev = chargedisplay()
charge += excess * SMESRATE charge += excess * SMESRATE // restore unused power
powernet.netexcess -= excess // remove the excess from the powernet, so later SMESes don't try to use it powernet.netexcess -= excess // remove the excess from the powernet, so later SMESes don't try to use it
loaddemand = lastout-excess output_used -= excess
if(clev != chargedisplay() ) if(clev != chargedisplay() ) //if needed updates the icons overlay
updateicon() update_icon()
return return
//Will return 1 on failure //Will return 1 on failure
@@ -256,14 +285,14 @@
var/data[0] var/data[0]
data["nameTag"] = name_tag data["nameTag"] = name_tag
data["storedCapacity"] = round(100.0*charge/capacity, 0.1) data["storedCapacity"] = round(100.0*charge/capacity, 0.1)
data["charging"] = charging data["charging"] = inputting
data["chargeMode"] = chargemode data["chargeMode"] = input_attempt
data["chargeLevel"] = chargelevel data["chargeLevel"] = input_level
data["chargeMax"] = input_level_max data["chargeMax"] = input_level_max
data["outputOnline"] = online data["outputOnline"] = output_attempt
data["outputLevel"] = output data["outputLevel"] = output_level
data["outputMax"] = output_level_max data["outputMax"] = output_level_max
data["outputLoad"] = round(loaddemand) data["outputLoad"] = round(output_used)
// update the ui if it exists, returns null if no ui is passed/found // update the ui if it exists, returns null if no ui is passed/found
ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
@@ -294,40 +323,34 @@
if (!istype(src.loc, /turf) && !istype(usr, /mob/living/silicon/)) if (!istype(src.loc, /turf) && !istype(usr, /mob/living/silicon/))
return 0 // Do not update ui return 0 // Do not update ui
for(var/area/A in active_areas)
A.master.powerupdate = 3
if( href_list["cmode"] ) if( href_list["cmode"] )
chargemode = !chargemode inputting(!inputting)
if(!chargemode) update_icon()
charging = 0
updateicon()
else if( href_list["online"] ) else if( href_list["online"] )
online = !online outputting(!outputting)
updateicon() update_icon()
else if( href_list["input"] ) else if( href_list["input"] )
switch( href_list["input"] ) switch( href_list["input"] )
if("min") if("min")
chargelevel = 0 input_level = 0
if("max") if("max")
chargelevel = input_level_max input_level = input_level_max
if("set") if("set")
chargelevel = input(usr, "Enter new input level (0-[input_level_max])", "SMES Input Power Control", chargelevel) as num input_level = input(usr, "Enter new input level (0-[input_level_max])", "SMES Input Power Control", input_level) as num
chargelevel = max(0, min(input_level_max, chargelevel)) // clamp to range input_level = max(0, min(input_level_max, input_level)) // clamp to range
else if( href_list["output"] ) else if( href_list["output"] )
switch( href_list["output"] ) switch( href_list["output"] )
if("min") if("min")
output = 0 output_level = 0
if("max") if("max")
output = output_level_max output_level = output_level_max
if("set") if("set")
output = input(usr, "Enter new output level (0-[output_level_max])", "SMES Output Power Control", output) as num output_level = input(usr, "Enter new output level (0-[output_level_max])", "SMES Output Power Control", output_level) as num
output = max(0, min(output_level_max, output)) // clamp to range output_level = max(0, min(output_level_max, output_level)) // clamp to range
investigate_log("input/output; [chargelevel>output?"<font color='green'>":"<font color='red'>"][chargelevel]/[output]</font> | Output-mode: [online?"<font color='green'>on</font>":"<font color='red'>off</font>"] | Input-mode: [chargemode?"<font color='green'>auto</font>":"<font color='red'>off</font>"] by [usr.key]","singulo") investigate_log("input/output; [input_level>output_level?"<font color='green'>":"<font color='red'>"][input_level]/[output_level]</font> | Output-mode: [output_attempt?"<font color='green'>on</font>":"<font color='red'>off</font>"] | Input-mode: [input_attempt?"<font color='green'>auto</font>":"<font color='red'>off</font>"] by [usr.key]","singulo")
return 1 return 1
@@ -359,27 +382,33 @@
smoke.attach(src) smoke.attach(src)
smoke.start() smoke.start()
/obj/machinery/power/smes/proc/inputting(var/do_input)
input_attempt = do_input
if(!input_attempt)
inputting = 0
/obj/machinery/power/smes/proc/outputting(var/do_output)
output_attempt = do_output
if(!output_attempt)
outputting = 0
/obj/machinery/power/smes/emp_act(severity) /obj/machinery/power/smes/emp_act(severity)
online = 0 inputting(rand(0,1))
charging = 0 outputting(rand(0,1))
output = 0 output_level = rand(0, output_level_max)
input_level = rand(0, input_level_max)
charge -= 1e6/severity charge -= 1e6/severity
if (charge < 0) if (charge < 0)
charge = 0 charge = 0
spawn(100) update_icon()
output = initial(output)
charging = initial(charging)
online = initial(online)
..() ..()
/obj/machinery/power/smes/magical /obj/machinery/power/smes/magical
name = "magical power storage unit" name = "magical power storage unit"
desc = "A high-capacity superconducting magnetic energy storage (SMES) unit. Magically produces power." desc = "A high-capacity superconducting magnetic energy storage (SMES) unit. Magically produces power."
capacity = 9000000 capacity = 9000000
output = 250000 output_level = 250000
/obj/machinery/power/smes/magical/process() /obj/machinery/power/smes/magical/process()
charge = 5000000 charge = 5000000

4
code/modules/power/smes_construction.dm
View File

@@ -174,7 +174,7 @@
A.set_broken() A.set_broken()
// Failing SMES has special icon overlay. // Failing SMES has special icon overlay.
/obj/machinery/power/smes/buildable/updateicon() /obj/machinery/power/smes/buildable/update_icon()
if (failing) if (failing)
overlays.Cut() overlays.Cut()
overlays += image('icons/obj/power.dmi', "smes-crit") overlays += image('icons/obj/power.dmi', "smes-crit")
@@ -196,7 +196,7 @@
user << "<span class='warning'>Safety circuit of [src] is preventing modifications while it's charged!</span>" user << "<span class='warning'>Safety circuit of [src] is preventing modifications while it's charged!</span>"
return return
if (online || chargemode) if (output_attempt || input_attempt)
user << "<span class='warning'>Turn off the [src] first!</span>" user << "<span class='warning'>Turn off the [src] first!</span>"
return return