cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2392 from Fox-McCloud/power-performance

Browse Source 
Lights and Static Power: Machine Processing Optimization
This commit is contained in:
TheDZD
2015-10-19 18:29:57 -04:00
parent 7b0859493e cd3d97c017
commit ccafe065af
7 changed files with 57 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/machines.dm
+7 -4
View File
@@ -1,8 +1,11 @@
// channel numbers for power
#define EQUIP 1
#define LIGHT 2
#define ENVIRON 3
#define TOTAL 4 //for total power used only
#define EQUIP 1
#define LIGHT 2
#define ENVIRON 3
#define TOTAL 4 //for total power used only
#define STATIC_EQUIP 5
#define STATIC_LIGHT 6
#define STATIC_ENVIRON 7
//computer3 error codes, move lower in the file when it passes dev -Sayu
#define PROG_CRASH 1 // Generic crash
code/controllers/Processes/machinery.dm
+3 -16
View File
@@ -20,15 +20,11 @@
if(machinery_sort_required)
machinery_sort_required = 0
machines = dd_sortedObjectList(machines)
/datum/controller/process/machinery/proc/process_machines()
for(last_object in machines)
var/obj/machinery/M = last_object
if(istype(M) && isnull(M.gcDestroyed))
#ifdef PROFILE_MACHINES
var/time_start = world.timeofday
#endif
try
if(M.process() == PROCESS_KILL)
machines.Remove(M)
@@ -38,15 +34,6 @@
M.auto_use_power()
catch(var/exception/e)
catchException(e, M)
#ifdef PROFILE_MACHINES
var/time_end = world.timeofday
if(!(M.type in machine_profiling))
machine_profiling[M.type] = 0
machine_profiling[M.type] += (time_end - time_start)
#endif
else
catchBadType(M)
machines -= M
@@ -63,9 +50,9 @@
catchException(e, powerNetwork)
SCHECK
continue
powernets.Remove(powerNetwork)
/datum/controller/process/machinery/proc/process_power_drain()
// Currently only used by powersinks. These items get priority processed before machinery
for(var/obj/item/I in processing_power_items)
code/game/area/Space Station 13 areas.dm
+3
View File
@@ -45,6 +45,9 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
var/used_equip = 0
var/used_light = 0
var/used_environ = 0
var/static_equip
var/static_light = 0
var/static_environ
var/has_gravity = 1
var/list/apc = list()
code/game/area/areas.dm
+21 -7
View File
@@ -43,7 +43,7 @@
for (var/obj/machinery/camera/C in src)
cameras += C
return cameras
/area/proc/atmosalert(danger_level, var/alarm_source)
if (danger_level == 0)
@@ -66,7 +66,7 @@
atmosalm = danger_level
for (var/obj/machinery/alarm/AA in src)
AA.update_icon()
air_alarm_repository.update_cache(src)
return 1
air_alarm_repository.update_cache(src)
@@ -108,7 +108,7 @@
updateicon()
mouse_opacity = 0
air_doors_open()
return
/area/proc/burglaralert(var/obj/trigger)
@@ -117,7 +117,7 @@
//Trigger alarm effect
set_fire_alarm_effect()
//Lockdown airlocks
for(var/obj/machinery/door/airlock/A in src)
spawn(0)
@@ -128,12 +128,12 @@
burglar_alarm.triggerAlarm(src, trigger)
spawn(600)
burglar_alarm.clearAlarm(src, trigger)
/area/proc/set_fire_alarm_effect()
fire = 1
updateicon()
mouse_opacity = 0
/area/proc/readyalert()
if(!eject)
eject = 1
@@ -251,9 +251,23 @@
used += used_environ
if(TOTAL)
used += used_light + used_equip + used_environ
if(STATIC_EQUIP)
used += static_equip
if(STATIC_LIGHT)
used += static_light
if(STATIC_ENVIRON)
used += static_environ
return used
/area/proc/addStaticPower(value, powerchannel)
switch(powerchannel)
if(STATIC_EQUIP)
static_equip += value
if(STATIC_LIGHT)
static_light += value
if(STATIC_ENVIRON)
static_environ += value
/area/proc/clear_usage()
used_equip = 0
code/modules/power/apc.dm
+4 -1
View File
@@ -1123,9 +1123,12 @@
if(!area.requires_power)
return
lastused_light = area.usage(LIGHT)
lastused_light = area.usage(STATIC_LIGHT)
lastused_light += area.usage(LIGHT)
lastused_equip = area.usage(EQUIP)
lastused_equip += area.usage(STATIC_EQUIP)
lastused_environ = area.usage(ENVIRON)
lastused_environ += area.usage(STATIC_ENVIRON)
area.clear_usage()
lastused_total = lastused_light + lastused_equip + lastused_environ
code/modules/power/lighting.dm
+9 -16
View File
@@ -136,6 +136,7 @@
power_channel = LIGHT //Lights are calc'd via area so they dont need to be in the machine list
var/on = 0 // 1 if on, 0 if off
var/on_gs = 0
var/static_power_used = 0
var/brightness_range = 8 // luminosity when on, also used in power calculation
var/brightness_power = 3
var/brightness_color = null
@@ -180,7 +181,6 @@
// create a new lighting fixture
/obj/machinery/light/New()
..()
spawn(2)
var/area/A = get_area(src)
if(A && !A.requires_power)
@@ -233,10 +233,8 @@
switchcount++
if(rigged)
if(status == LIGHT_OK && trigger)
log_admin("LOG: Rigged light explosion, last touched by [fingerprintslast]")
message_admins("LOG: Rigged light explosion, last touched by [fingerprintslast]")
explode()
else if( prob( min(60, switchcount*switchcount*0.01) ) )
if(status == LIGHT_OK && trigger)
@@ -251,10 +249,14 @@
use_power = 1
set_light(0)
active_power_usage = brightness_range * 10
active_power_usage = (brightness_range * 10)
if(on != on_gs)
on_gs = on
if(on)
static_power_used = brightness_range * 20 //20W per unit luminosity
addStaticPower(static_power_used, STATIC_LIGHT)
else
removeStaticPower(static_power_used, STATIC_LIGHT)
// attempt to set the light's on/off status
// will not switch on if broken/burned/empty
@@ -556,19 +558,10 @@
// timed process
// use power
#define LIGHTING_POWER_FACTOR 20 //20W per unit luminosity
/obj/machinery/light/process()//TODO: remove/add this from machines to save on processing as needed ~Carn PRIORITY
if(on)
use_power(brightness_range * LIGHTING_POWER_FACTOR, LIGHT)
// called when area power state changes
/obj/machinery/light/power_change()
spawn(10)
var/area/A = get_area_master(src)
if(A) seton(A.lightswitch && A.power_light)
var/area/A = get_area_master(src)
if(A) seton(A.lightswitch && A.power_light)
// called when on fire
code/modules/power/power.dm
+10 -1
View File
@@ -44,7 +44,7 @@
return powernet.avail
else
return 0
/obj/machinery/power/proc/load()
if(powernet)
return powernet.load
@@ -77,6 +77,15 @@
chan = power_channel
A.use_power(amount, chan)
/obj/machinery/proc/addStaticPower(value, powerchannel)
var/area/A = get_area(src)
if(!A)
return
A.addStaticPower(value, powerchannel)
/obj/machinery/proc/removeStaticPower(value, powerchannel)
addStaticPower(-value, powerchannel)
/obj/machinery/proc/power_change() // called whenever the power settings of the containing area change
// by default, check equipment channel & set flag
// can override if needed