From 37c16ff6e2ebfc846112ea3862c435bd53d4bd0b Mon Sep 17 00:00:00 2001 From: Atlantiscze Date: Tue, 12 May 2015 05:33:55 +0200 Subject: [PATCH 1/3] Merge powernet process into machinery process. --- baystation12.dme | 1 - code/controllers/Processes/machinery.dm | 13 ++++++++++--- code/controllers/Processes/powernet.dm | 20 -------------------- 3 files changed, 10 insertions(+), 24 deletions(-) delete mode 100644 code/controllers/Processes/powernet.dm diff --git a/baystation12.dme b/baystation12.dme index 2584fc6002..0e31e70812 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -108,7 +108,6 @@ #include "code\controllers\Processes\nanoui.dm" #include "code\controllers\Processes\obj.dm" #include "code\controllers\Processes\pipenet.dm" -#include "code\controllers\Processes\powernet.dm" #include "code\controllers\Processes\Shuttle.dm" #include "code\controllers\Processes\sun.dm" #include "code\controllers\Processes\supply.dm" diff --git a/code/controllers/Processes/machinery.dm b/code/controllers/Processes/machinery.dm index 232ef91973..702a4c7121 100644 --- a/code/controllers/Processes/machinery.dm +++ b/code/controllers/Processes/machinery.dm @@ -14,9 +14,16 @@ machines = dd_sortedObjectList(machines) /datum/controller/process/machinery/proc/internal_process() -//#ifdef PROFILE_MACHINES - //machine_profiling.len = 0 - //#endif + for(var/datum/powernet/powerNetwork in powernets) + if(istype(powerNetwork) && !powerNetwork.disposed) + powerNetwork.reset() + scheck() + continue + + powernets.Remove(powerNetwork) + + for(var/obj/item/device/powersink/S in processing_objects) + S.drain() for(var/obj/machinery/M in machines) if(M && !M.gcDestroyed) diff --git a/code/controllers/Processes/powernet.dm b/code/controllers/Processes/powernet.dm deleted file mode 100644 index 4a85ea4150..0000000000 --- a/code/controllers/Processes/powernet.dm +++ /dev/null @@ -1,20 +0,0 @@ -/datum/controller/process/powernet/setup() - name = "powernet" - schedule_interval = 20 // every 2 seconds - -/datum/controller/process/powernet/doWork() - for(var/datum/powernet/powerNetwork in powernets) - if(istype(powerNetwork) && !powerNetwork.disposed) - powerNetwork.reset() - scheck() - continue - - powernets.Remove(powerNetwork) - - // This is necessary to ensure powersinks are always the first devices that drain power from powernet. - // Otherwise APCs or other stuff go first, resulting in bad things happening. - for(var/obj/item/device/powersink/S in processing_objects) - S.drain() - -/datum/controller/process/powernet/getStatName() - return ..()+"([powernets.len])" From 51043bc84aee53f86cf0d52d98dc956b7204bb05 Mon Sep 17 00:00:00 2001 From: Atlantiscze Date: Tue, 12 May 2015 07:49:31 +0200 Subject: [PATCH 2/3] Update - Creates a global list of items which have pwr_drain() called every powernet tick - Makes powersink use this list - Adds scheck --- code/controllers/Processes/machinery.dm | 7 +++++-- code/game/objects/items.dm | 5 ++++- code/game/objects/items/devices/powersink.dm | 13 +++++++++---- code/global.dm | 1 + 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/code/controllers/Processes/machinery.dm b/code/controllers/Processes/machinery.dm index 702a4c7121..c95e8667d6 100644 --- a/code/controllers/Processes/machinery.dm +++ b/code/controllers/Processes/machinery.dm @@ -22,8 +22,11 @@ powernets.Remove(powerNetwork) - for(var/obj/item/device/powersink/S in processing_objects) - S.drain() + // Currently only used by powersinks. These items get priority processed before machinery + for(var/obj/item/I in processing_power_items) + if(!I.pwr_drain()) // 0 = Process Kill, remove from processing list. + processing_power_items.Remove(I) + scheck() for(var/obj/machinery/M in machines) if(M && !M.gcDestroyed) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 1c29aa8088..d2d8f1801c 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -599,4 +599,7 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out. if(!cannotzoom) usr.visible_message("[zoomdevicename ? "[usr] looks up from the [src.name]" : "[usr] lowers the [src.name]"].") - return \ No newline at end of file + return + +/obj/item/proc/pwr_drain() + return 0 // Process Kill \ No newline at end of file diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index 623c57be89..caf2017237 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -27,6 +27,7 @@ /obj/item/device/powersink/Destroy() processing_objects.Remove(src) + processing_power_items.Remove(src) ..() /obj/item/device/powersink/attackby(var/obj/item/I, var/mob/user) @@ -49,6 +50,7 @@ else if (mode == 2) processing_objects.Remove(src) // Now the power sink actually stops draining the station's power if you unhook it. --NeoFite + processing_power_items.Remove(src) anchored = 0 mode = 0 src.visible_message("[user] detaches [src] from the cable!") @@ -71,25 +73,27 @@ mode = 2 icon_state = "powersink1" processing_objects.Add(src) + processing_power_items.Add(src) if(2) //This switch option wasn't originally included. It exists now. --NeoFite src.visible_message("[user] deactivates [src]!") mode = 1 set_light(0) icon_state = "powersink0" processing_objects.Remove(src) + processing_power_items.Remove(src) -/obj/item/device/powersink/proc/drain() +/obj/item/device/powersink/pwr_drain() if(!attached) - return + return 0 if(drained_this_tick) - return + return 1 drained_this_tick = 1 var/drained = 0 if(!PN) - return + return 1 set_light(12) PN.trigger_warning() @@ -110,6 +114,7 @@ A.cell.use(drain_val * CELLRATE) drained += drain_val power_drained += drained + return 1 /obj/item/device/powersink/process() diff --git a/code/global.dm b/code/global.dm index 2e7ddeb0e6..fce133f586 100644 --- a/code/global.dm +++ b/code/global.dm @@ -8,6 +8,7 @@ var/global/obj/effect/datacore/data_core = null var/global/list/all_areas = list() var/global/list/machines = list() var/global/list/processing_objects = list() +var/global/list/processing_power_items = list() var/global/list/active_diseases = list() var/global/list/med_hud_users = list() // List of all entities using a medical HUD. var/global/list/sec_hud_users = list() // List of all entities using a security HUD. From 616e9c773fd6004c34c71cfa335640adf2e2073d Mon Sep 17 00:00:00 2001 From: Atlantiscze Date: Wed, 13 May 2015 06:06:08 +0200 Subject: [PATCH 3/3] Changes order of processing - Machinery is now processed before powernets, using data from previous tick. This fixes various UI issues with power related machinery, such as, SMES always showing output load of 100%. Otherwise has no changing effect on gameplay. --- code/controllers/Processes/machinery.dm | 28 ++++++++++++------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/code/controllers/Processes/machinery.dm b/code/controllers/Processes/machinery.dm index c95e8667d6..dcc1bb207c 100644 --- a/code/controllers/Processes/machinery.dm +++ b/code/controllers/Processes/machinery.dm @@ -14,20 +14,6 @@ machines = dd_sortedObjectList(machines) /datum/controller/process/machinery/proc/internal_process() - for(var/datum/powernet/powerNetwork in powernets) - if(istype(powerNetwork) && !powerNetwork.disposed) - powerNetwork.reset() - scheck() - continue - - powernets.Remove(powerNetwork) - - // Currently only used by powersinks. These items get priority processed before machinery - for(var/obj/item/I in processing_power_items) - if(!I.pwr_drain()) // 0 = Process Kill, remove from processing list. - processing_power_items.Remove(I) - scheck() - for(var/obj/machinery/M in machines) if(M && !M.gcDestroyed) #ifdef PROFILE_MACHINES @@ -53,6 +39,20 @@ scheck() + for(var/datum/powernet/powerNetwork in powernets) + if(istype(powerNetwork) && !powerNetwork.disposed) + powerNetwork.reset() + scheck() + continue + + powernets.Remove(powerNetwork) + + // Currently only used by powersinks. These items get priority processed before machinery + for(var/obj/item/I in processing_power_items) + if(!I.pwr_drain()) // 0 = Process Kill, remove from processing list. + processing_power_items.Remove(I) + scheck() + /datum/controller/process/machinery/getStatName() return ..()+"([machines.len])" \ No newline at end of file