From ac0000139937f7340d7562d38ecdb6a30f2dc60a Mon Sep 17 00:00:00 2001 From: Aryn Date: Thu, 31 May 2012 00:25:52 -0600 Subject: [PATCH] Made some more airflow changes that are irrelevant until I get airflow working. --- code/ZAS/Airflow.dm | 20 +++++++++----------- code/ZAS/Debug.dm | 1 + 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/code/ZAS/Airflow.dm b/code/ZAS/Airflow.dm index 0e022e3c489..bd3109f4a05 100644 --- a/code/ZAS/Airflow.dm +++ b/code/ZAS/Airflow.dm @@ -50,13 +50,11 @@ atom/movable/RepelAirflowDest(n) vs_control/var - zone_share_percent = 5 - - airflow_lightest_pressure = 35 - airflow_light_pressure = 50 - airflow_medium_pressure = 80 - airflow_heavy_pressure = 100 - airflow_heaviest_pressure = 150 + airflow_lightest_pressure = 15 + airflow_light_pressure = 30 + airflow_medium_pressure = 45 + airflow_heavy_pressure = 60 + airflow_heaviest_pressure = 100 airflow_damage = 0.3 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. - 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. 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. - spawn M.RepelAirflowDest(abs(n)/20) + spawn M.RepelAirflowDest(abs(n)/5) proc/AirflowSpace(zone/A) @@ -216,7 +214,7 @@ atom/movable if(airflow_speed < 0) return if(last_airflow > world.time - 150) return if(airflow_speed) - airflow_speed = n + airflow_speed = n/max(get_dist(src,airflow_dest),1) return last_airflow = world.time if(airflow_dest == loc) @@ -265,7 +263,7 @@ atom/movable if(airflow_speed < 0) return if(last_airflow > world.time - 150) return if(airflow_speed) - airflow_speed = n + airflow_speed = n/max(get_dist(src,airflow_dest),1) return last_airflow = world.time if(airflow_dest == loc) diff --git a/code/ZAS/Debug.dm b/code/ZAS/Debug.dm index 66c6a12ca33..7a0285cc1e1 100644 --- a/code/ZAS/Debug.dm +++ b/code/ZAS/Debug.dm @@ -32,6 +32,7 @@ zone/proc M << "Pressure: [air.return_pressure()]" M << "" M << "Space Tiles: [length(space_tiles)]" + M << "Movable Objects: [length(movable_objects)]" M << "Connections: [length(connections)]" for(var/connection/C in connections)