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

Made some more airflow changes that are irrelevant until I get airflow working.

Browse Source
This commit is contained in:
Aryn
2012-05-31 00:25:52 -06:00
parent db79302749
commit ac00001399
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
code/ZAS/Airflow.dm
View File

@@ -50,13 +50,11 @@ atom/movable/RepelAirflowDest(n)
vs_control/var vs_control/var
zone_share_percent = 5 airflow_lightest_pressure = 15
airflow_light_pressure = 30
airflow_lightest_pressure = 35 airflow_medium_pressure = 45
airflow_light_pressure = 50 airflow_heavy_pressure = 60
airflow_medium_pressure = 80 airflow_heaviest_pressure = 100
airflow_heavy_pressure = 100
airflow_heaviest_pressure = 150
airflow_damage = 0.3 airflow_damage = 0.3
airflow_stun = 0.15 airflow_stun = 0.15
@@ -145,7 +143,7 @@ proc/Airflow(zone/A,zone/B)
M.airflow_dest = pick(close_turfs) //Pick a random midpoint to fly towards. M.airflow_dest = pick(close_turfs) //Pick a random midpoint to fly towards.
spawn M.GotoAirflowDest(abs(n)/20) spawn M.GotoAirflowDest(abs(n)/5)
//Do it again for the stuff in the other zone, making it fly away. //Do it again for the stuff in the other zone, making it fly away.
for(var/atom/movable/M in otherpplz) for(var/atom/movable/M in otherpplz)
@@ -168,7 +166,7 @@ proc/Airflow(zone/A,zone/B)
M.airflow_dest = pick(close_turfs) //Pick a random midpoint to fly towards. M.airflow_dest = pick(close_turfs) //Pick a random midpoint to fly towards.
spawn M.RepelAirflowDest(abs(n)/20) spawn M.RepelAirflowDest(abs(n)/5)
proc/AirflowSpace(zone/A) proc/AirflowSpace(zone/A)
@@ -216,7 +214,7 @@ atom/movable
if(airflow_speed < 0) return if(airflow_speed < 0) return
if(last_airflow > world.time - 150) return if(last_airflow > world.time - 150) return
if(airflow_speed) if(airflow_speed)
airflow_speed = n airflow_speed = n/max(get_dist(src,airflow_dest),1)
return return
last_airflow = world.time last_airflow = world.time
if(airflow_dest == loc) if(airflow_dest == loc)
@@ -265,7 +263,7 @@ atom/movable
if(airflow_speed < 0) return if(airflow_speed < 0) return
if(last_airflow > world.time - 150) return if(last_airflow > world.time - 150) return
if(airflow_speed) if(airflow_speed)
airflow_speed = n airflow_speed = n/max(get_dist(src,airflow_dest),1)
return return
last_airflow = world.time last_airflow = world.time
if(airflow_dest == loc) if(airflow_dest == loc)

1
code/ZAS/Debug.dm
View File

@@ -32,6 +32,7 @@ zone/proc
M << "Pressure: [air.return_pressure()]" M << "Pressure: [air.return_pressure()]"
M << "" M << ""
M << "Space Tiles: [length(space_tiles)]" M << "Space Tiles: [length(space_tiles)]"
M << "Movable Objects: [length(movable_objects)]"
M << "<u>Connections: [length(connections)]</u>" M << "<u>Connections: [length(connections)]</u>"
for(var/connection/C in connections) for(var/connection/C in connections)