Replaces ex_act and emp_act numbers with defines

This commit is contained in:
CitadelStationBot
2017-07-13 17:46:41 -05:00
parent da324257fe
commit 55462ed7d1
38 changed files with 74 additions and 66 deletions
+12 -12
View File
@@ -125,7 +125,7 @@ GLOBAL_LIST_EMPTY(explosions)
E = new
E.set_up(epicenter)
E.start()
EX_PREPROCESS_CHECK_TICK
//flash mobs
@@ -165,20 +165,20 @@ GLOBAL_LIST_EMPTY(explosions)
var/throw_dist = dist
if(dist < devastation_range)
dist = 1
dist = EXPLODE_DEVASTATE
else if(dist < heavy_impact_range)
dist = 2
dist = EXPLODE_HEAVY
else if(dist < light_impact_range)
dist = 3
dist = EXPLODE_LIGHT
else
dist = 0
dist = EXPLODE_NONE
//------- EX_ACT AND TURF FIRES -------
if(flame_dist && prob(40) && !isspaceturf(T) && !T.density)
new /obj/effect/hotspot(T) //Mostly for ambience!
if(dist > 0)
if(dist > EXPLODE_NONE)
T.explosion_level = max(T.explosion_level, dist) //let the bigger one have it
T.explosion_id = id
T.ex_act(dist)
@@ -192,7 +192,7 @@ GLOBAL_LIST_EMPTY(explosions)
var/throw_range = rand(throw_dist, max_range)
var/turf/throw_at = get_ranged_target_turf(I, throw_dir, throw_range)
I.throw_speed = EXPLOSION_THROW_SPEED //Temporarily change their throw_speed for embedding purposes (Reset when it finishes throwing, regardless of hitting anything)
I.throw_at(throw_at, throw_range, EXPLOSION_THROW_SPEED)
I.throw_at(throw_at, throw_range, EXPLOSION_THROW_SPEED)
//wait for the lists to repop
var/break_condition
@@ -208,7 +208,7 @@ GLOBAL_LIST_EMPTY(explosions)
if(!running)
break
//update the trackers
affTurfLen = affected_turfs.len
expBlockLen = cached_exp_block.len
@@ -274,7 +274,7 @@ GLOBAL_LIST_EMPTY(explosions)
. = list()
var/processed = 0
while(!stopped && running)
var/I
var/I
for(I in (processed + 1) to affected_turfs.len) // we cache the explosion block rating of every turf in the explosion area
var/turf/T = affected_turfs[I]
var/current_exp_block = T.density ? T.explosion_block : 0
@@ -282,12 +282,12 @@ GLOBAL_LIST_EMPTY(explosions)
for(var/obj/O in T)
var/the_block = O.explosion_block
current_exp_block += the_block == EXPLOSION_BLOCK_PROC ? O.GetExplosionBlock() : the_block
.[T] = current_exp_block
if(TICK_CHECK)
break
processed = I
stoplag()
@@ -346,7 +346,7 @@ GLOBAL_LIST_EMPTY(explosions)
TT = get_step_towards(TT,epicenter)
if(TT.density)
dist += TT.explosion_block
for(var/obj/O in T)
var/the_block = O.explosion_block
dist += the_block == EXPLOSION_BLOCK_PROC ? O.GetExplosionBlock() : the_block
+3 -3
View File
@@ -293,11 +293,11 @@
if (2)
D.adjustBruteLoss(rand(20,30))
if (3)
D.ex_act(3)
D.ex_act(EXPLODE_LIGHT)
else
D.adjustBruteLoss(rand(10,20))
else
D.ex_act(3)
D.ex_act(EXPLODE_LIGHT)
else
if (A)
@@ -404,7 +404,7 @@
if (falling == 1)
if (prob(33) || D.stat)
D.ex_act(3)
D.ex_act(EXPLODE_LIGHT)
else
D.adjustBruteLoss(rand(20,30))
else