cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 12:04:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1595 from caelaislinn/master

Browse Source 
zas debugging, custom id fix
This commit is contained in:
headswe
2012-08-09 01:18:40 -07:00
parent 8e6ae30e3a dca3f3bd8a
commit 7d0b246331
5 changed files with 51 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/ZAS/FEA_system.dm
+7 -7
View File
@@ -171,14 +171,14 @@ datum
proc/tick()
. = 1 //Set the default return value, for runtime detection.
tick_progress = 0
tick_progress = "next_stat_check (atmos statistics)"
if(current_cycle >= next_stat_check)
var/zone/z = pick(zones)
var/log_file = file("[time2text(world.timeofday, "statistics/DD-MM-YYYY-air.txt")]")
log_file << "\"\The [get_area(pick(z.contents))]\",[z.air.oxygen],[z.air.nitrogen],[z.air.carbon_dioxide],[z.air.toxins],[z.air.temperature],[z.air.group_multiplier * z.air.volume]"
next_stat_check = current_cycle + (rand(5,7)*60)
tick_progress = 1
tick_progress = "update_air_properties"
if(tiles_to_update.len) //If there are tiles to update, do so.
for(var/turf/simulated/T in tiles_to_update)
var/output = T.update_air_properties()
@@ -187,19 +187,19 @@ datum
log_admin("ZASALERT: Either a null turf in list/tiles_to_update, or unable run turf/simualted/update_air_properties()")
tiles_to_update = list()
tick_progress = 2
tick_progress = "connections_to_check"
if(connections_to_check.len)
for(var/connection/C in connections_to_check)
C.CheckPassSanity()
connections_to_check = list()
tick_progress = 3
tick_progress = "tiles_to_reconsider_zones"
if(tiles_to_reconsider_zones.len)
for(var/turf/simulated/T in tiles_to_reconsider_zones)
if(!T.zone)
new /zone(T)
tick_progress = 4
tick_progress = "zone/process()"
for(var/zone/Z in zones)
if(Z.last_update < current_cycle)
var/output = Z.process()
@@ -209,11 +209,11 @@ datum
. = 0
log_admin("ZASALERT: Either a null zone in list/zones, or unable run zone/process()")
tick_progress = 5
tick_progress = "active_hotspots (fire)"
for(var/obj/fire/F in active_hotspots)
var/output = F.process()
if(. && F && !output)
. = 0
log_admin("ZASALERT: Either a null fire in list/active_hotspots, or unable run obj/fire/process()")
tick_progress = 6
tick_progress = "success"
code/ZAS/Processing.dm
+38
View File
@@ -1,9 +1,18 @@
#define QUANTIZE(variable) (round(variable,0.0001))
zone/var/progress = "nothing"
zone/proc/process()
. = 1
progress = "problem with: src.SoftDelete()"
//Deletes zone if empty.
if(!contents.len)
return SoftDelete()
progress = "problem with: src.Rebuild()"
//Does rebuilding stuff.
if(rebuild)
rebuild = 0
@@ -12,12 +21,16 @@ zone/proc/process()
if(!contents.len) //If we got soft deleted.
return
progress = "problem with: src.air.adjust()"
//Sometimes explosions will cause the air to be deleted for some reason.
if(!air)
air = new()
air.adjust(MOLES_O2STANDARD, 0, MOLES_N2STANDARD, 0, list())
world.log << "Air object lost in zone. Regenerating."
progress = "problem with: calculating total space tiles"
//Counting up space.
var/total_space = 0
@@ -28,6 +41,8 @@ zone/proc/process()
if(space_tiles)
total_space = space_tiles.len
progress = "problem with: src.ShareSpace()"
//Add checks to ensure that we're not sucking air out of an empty room.
if(total_space && air.total_moles > 0.1 && air.temperature > TCMB+0.5)
//If there is space, air should flow out of the zone.
@@ -35,11 +50,15 @@ zone/proc/process()
AirflowSpace(src)
ShareSpace(air,total_space*vsc.zone_share_percent/200)
progress = "problem with: src.air.react()"
//React the air here.
air.react(null,0)
//Check the graphic.
progress = "problem with: modifying turf graphics"
air.graphic = 0
if(air.toxins > MOLES_PLASMA_VISIBLE)
air.graphic = 1
@@ -48,9 +67,13 @@ zone/proc/process()
if(sleeping_agent && (sleeping_agent.moles > 1))
air.graphic = 2
progress = "problem with an inbuilt byond function: some conditional checks"
//Only run through the individual turfs if there's reason to.
if(air.graphic != air.graphic_archived || air.temperature > FIRE_MINIMUM_TEMPERATURE_TO_EXIST)
progress = "problem with: turf/simulated/update_visuals()"
for(var/turf/simulated/S in contents)
//Update overlays.
if(air.graphic != air.graphic_archived)
@@ -59,20 +82,31 @@ zone/proc/process()
else
S.update_visuals(air)
progress = "problem with: item or turf temperature_expose()"
//Expose stuff to extreme heat.
if(air.temperature > FIRE_MINIMUM_TEMPERATURE_TO_EXIST)
for(var/atom/movable/item in S)
item.temperature_expose(air, air.temperature, CELL_VOLUME)
S.temperature_expose(air, air.temperature, CELL_VOLUME)
progress = "problem with: calculating air graphic"
//Archive graphic so we can know if it's different.
air.graphic_archived = air.graphic
progress = "problem with: calculating air temp"
//Ensure temperature does not reach absolute zero.
air.temperature = max(TCMB,air.temperature)
progress = "problem with an inbuilt byond function: length(connections)"
//Handle connections to other zones.
if(length(connections))
progress = "problem with: src.ZMerge(), a couple of misc procs"
for(var/connection/C in connections)
//Check if the connection is valid first.
if(!C.Cleanup())
@@ -84,6 +118,8 @@ zone/proc/process()
if(C.A.zone.air.compare(C.B.zone.air) || total_space)
ZMerge(C.A.zone,C.B.zone)
progress = "problem with: src.ShareRatio(), src.Airflow(), a couple of misc procs"
//Share some
for(var/zone/Z in connected_zones)
if(air && Z.air)
@@ -95,6 +131,8 @@ zone/proc/process()
//Divided by 200 since each zone is processed. Each connection is considered twice
//Space tiles force it to try and move twice as much air.
progress = "all components completed successfully, the problem is not here"
proc/ShareRatio(datum/gas_mixture/A, datum/gas_mixture/B, ratio)
//Shares a specific ratio of gas between mixtures using simple weighted averages.
var
code/game/master_controller.dm
+4 -20
View File
@@ -176,30 +176,14 @@ datum/controller/game_controller
air_master.current_cycle++
var/success = air_master.tick() //Changed so that a runtime does not crash the ticker.
if(!success) //Runtimed.
var/section = "unknown"
switch(air_master.tick_progress)
if(0)
section = "next_stat_check (atmos statistics)"
if(1)
section = "update_air_properties"
if(2)
section = "connections_to_check"
if(3)
section = "tiles_to_reconsider_zones"
if(4)
section = "zone/process"
if(5)
section = "active_hotspots (fire)"
if(6)
section = "success"
log_admin("ZASALERT: air_system/tick() failed with progress: [air_master.tick_progress] ([section])")
log_admin("ZASALERT: air_system/tick() failed: [air_master.tick_progress]")
air_master.failed_ticks++
if(air_master.failed_ticks > 20)
if(air_master.failed_ticks > 10)
world << "<font color='red'><b>RUNTIMES IN ATMOS TICKER. Killing air simulation!</font></b>"
kill_air = 1
air_master.failed_ticks = 0
else if (air_master.failed_ticks > 10)
air_master.failed_ticks = 0
/*else if (air_master.failed_ticks > 10)
air_master.failed_ticks = 0*/
air_master_ready = 1
src.set_debug_state("Tension Master")
code/modules/admin/admin_verbs.dm
+1 -1
View File
@@ -292,6 +292,7 @@
verbs += /client/proc/Force_Event_admin
verbs += /client/proc/radioalert
verbs += /client/proc/CarbonCopy
verbs += /client/proc/kill_air //formerly game masters only. this should help for zas debugging while we're having these issues
//verbs += /client/proc/jump_to_dead_group
else return
@@ -311,7 +312,6 @@
verbs += /client/proc/startSinglo //Used to prevent the station from losing power while testing stuff out.
verbs += /client/proc/toggle_log_hrefs
verbs += /client/proc/enable_debug_verbs
verbs += /client/proc/kill_air
verbs += /client/proc/callprocgen
verbs += /client/proc/callprocobj
verbs += /client/proc/rnd_check_designs
code/modules/customitems/item_spawning.dm
+1
View File
@@ -43,6 +43,7 @@
I.blood_type = C.blood_type
I.dna_hash = C.dna_hash
I.fingerprint_hash = C.fingerprint_hash
I.pin = C.pin
//custom stuff
if(M.ckey == "fastler" && M.real_name == "Fastler Greay") //This is a Lifetime ID