cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-26 01:52:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduce machinery and mob processing (#15385)

Browse Source
This commit is contained in:
Wildkins
2022-12-23 06:19:24 -05:00
committed by GitHub
parent 3a3cc2c532
commit e0c0cc57e7
25 changed files with 284 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/controllers/subsystems/machinery.dm
View File

@@ -100,7 +100,7 @@ if(Datum.isprocessing) {\
timer = world.tick_usage
process_pipenets(resumed, no_mc_tick)
cost_pipenets = MC_AVERAGE(cost_pipenets, TICK_DELTA_TO_MS(world.tick_usage - timer))
if (state != SS_RUNNING)
if (state != SS_RUNNING && init_state == SS_INITSTATE_DONE)
return
current_step = SSMACHINERY_MACHINERY
resumed = FALSE
@@ -108,7 +108,7 @@ if(Datum.isprocessing) {\
timer = world.tick_usage
process_machinery(resumed, no_mc_tick)
cost_machinery = MC_AVERAGE(cost_machinery, TICK_DELTA_TO_MS(world.tick_usage - timer))
if(state != SS_RUNNING)
if(state != SS_RUNNING && init_state == SS_INITSTATE_DONE)
return
current_step = SSMACHINERY_POWERNETS
resumed = FALSE
@@ -116,7 +116,7 @@ if(Datum.isprocessing) {\
timer = world.tick_usage
process_powernets(resumed, no_mc_tick)
cost_powernets = MC_AVERAGE(cost_powernets, TICK_DELTA_TO_MS(world.tick_usage - timer))
if(state != SS_RUNNING)
if(state != SS_RUNNING && init_state == SS_INITSTATE_DONE)
return
current_step = SSMACHINERY_POWER_OBJECTS
resumed = FALSE
@@ -124,7 +124,7 @@ if(Datum.isprocessing) {\
timer = world.tick_usage
process_power_objects(resumed, no_mc_tick)
cost_power_objects = MC_AVERAGE(cost_power_objects, TICK_DELTA_TO_MS(world.tick_usage - timer))
if (state != SS_RUNNING)
if (state != SS_RUNNING && init_state == SS_INITSTATE_DONE)
return
current_step = SSMACHINERY_PIPENETS

30
code/controllers/subsystems/spatial_gridmap.dm
View File

@@ -52,6 +52,8 @@
var/list/hearing_contents
///every client possessed mob inside this cell
var/list/client_contents
///every mob inside this cell
var/list/tgt_contents
/datum/spatial_grid_cell/New(cell_x, cell_y, cell_z)
. = ..()
@@ -67,6 +69,7 @@
hearing_contents = dummy_list
client_contents = dummy_list
tgt_contents = dummy_list
/datum/spatial_grid_cell/Destroy(force, ...)
if(force)//the response to someone trying to qdel this is a right proper fuck you
@@ -102,7 +105,7 @@
///list of the spatial_grid_cell datums per z level, arranged in the order of y index then x index
var/list/grids_by_z_level = list()
///everything that spawns before us is added to this list until we initialize
var/list/waiting_to_add_by_type = list(RECURSIVE_CONTENTS_HEARING_SENSITIVE = list(), RECURSIVE_CONTENTS_CLIENT_MOBS = list())
var/list/waiting_to_add_by_type = list(RECURSIVE_CONTENTS_HEARING_SENSITIVE = list(), RECURSIVE_CONTENTS_CLIENT_MOBS = list(), RECURSIVE_CONTENTS_AI_TARGETS = list())
var/cells_on_x_axis = 0
var/cells_on_y_axis = 0
@@ -316,6 +319,12 @@
. += grid_level[row][x_index].hearing_contents
if(SPATIAL_GRID_CONTENTS_TYPE_TARGETS)
for(var/row in BOUNDING_BOX_MIN(center_y) to BOUNDING_BOX_MAX(center_y, cells_on_y_axis))
for(var/x_index in BOUNDING_BOX_MIN(center_x) to BOUNDING_BOX_MAX(center_x, cells_on_x_axis))
. += grid_level[row][x_index].tgt_contents
return .
///get the grid cell encomapassing targets coordinates
@@ -369,7 +378,7 @@
var/datum/spatial_grid_cell/intersecting_cell = grids_by_z_level[z_index][y_index][x_index]
if(new_target.important_recursive_contents[RECURSIVE_CONTENTS_CLIENT_MOBS])
GRID_CELL_SET(intersecting_cell.client_contents, new_target.important_recursive_contents[SPATIAL_GRID_CONTENTS_TYPE_CLIENTS])
GRID_CELL_SET(intersecting_cell.client_contents, new_target.important_recursive_contents[RECURSIVE_CONTENTS_CLIENT_MOBS])
SEND_SIGNAL(intersecting_cell, SPATIAL_GRID_CELL_ENTERED(RECURSIVE_CONTENTS_CLIENT_MOBS), new_target)
@@ -378,6 +387,12 @@
SEND_SIGNAL(intersecting_cell, SPATIAL_GRID_CELL_ENTERED(RECURSIVE_CONTENTS_HEARING_SENSITIVE), new_target)
if(new_target.important_recursive_contents[RECURSIVE_CONTENTS_AI_TARGETS])
GRID_CELL_SET(intersecting_cell.tgt_contents, new_target.important_recursive_contents[RECURSIVE_CONTENTS_AI_TARGETS])
SEND_SIGNAL(intersecting_cell, SPATIAL_GRID_CELL_ENTERED(RECURSIVE_CONTENTS_AI_TARGETS), new_target)
/**
* find the spatial map cell that target used to belong to, then subtract target's important_recusive_contents from it.
* make sure to provide the turf old_target used to be "in"
@@ -390,9 +405,6 @@
if(init_state != SS_INITSTATE_DONE)
return
if(QDELETED(old_target))
CRASH("qdeleted or null target trying to enter the spatial grid")
if(!target_turf || !old_target?.important_recursive_contents)
CRASH("/datum/controller/subsystem/spatial_grid/proc/exit_cell() was given null arguments or a new_target without important_recursive_contents!")
@@ -411,6 +423,9 @@
if(RECURSIVE_CONTENTS_HEARING_SENSITIVE)
GRID_CELL_REMOVE(intersecting_cell.hearing_contents, old_target.important_recursive_contents[RECURSIVE_CONTENTS_HEARING_SENSITIVE])
if(RECURSIVE_CONTENTS_AI_TARGETS)
GRID_CELL_REMOVE(intersecting_cell.tgt_contents, old_target.important_recursive_contents[RECURSIVE_CONTENTS_AI_TARGETS])
SEND_SIGNAL(intersecting_cell, SPATIAL_GRID_CELL_EXITED(exclusive_type), old_target)
return
@@ -424,6 +439,11 @@
SEND_SIGNAL(intersecting_cell, SPATIAL_GRID_CELL_EXITED(RECURSIVE_CONTENTS_HEARING_SENSITIVE), old_target)
if(old_target.important_recursive_contents[RECURSIVE_CONTENTS_AI_TARGETS])
GRID_CELL_REMOVE(intersecting_cell.hearing_contents, old_target.important_recursive_contents[RECURSIVE_CONTENTS_AI_TARGETS])
SEND_SIGNAL(intersecting_cell, SPATIAL_GRID_CELL_EXITED(RECURSIVE_CONTENTS_AI_TARGETS), old_target)
///find the cell this movable is associated with and removes it from all lists
/datum/controller/subsystem/spatial_grid/proc/force_remove_from_cell(atom/movable/to_remove, datum/spatial_grid_cell/input_cell)
if(init_state != SS_INITSTATE_DONE)