cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-16 13:13:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1250 from SkyMarshal/BugFixes

Browse Source 
Commented and further improved explosions.
This commit is contained in:
Albert Iordache
2012-06-06 10:38:01 -07:00
parent 4ba8eae9fd 09c59064d2
commit cf65bbbcbf
1 changed files with 36 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
code/game/objects/explosion.dm
View File

@@ -28,10 +28,10 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa
E.set_up(epicenter) E.set_up(epicenter)
E.start() E.start()
var/list/dTurfs = list() var/list/dTurfs = list() //Holds the turfs in devestation range.
var/list/hTurfs = list() var/list/hTurfs = list() //Holds the turfs in heavy impact range, minus turfs in devestation range.
var/list/lTurfs = list() var/list/lTurfs = list() //Holds the turfs in light impact range, minus turfs in devestation range and heavy impact range.
var/list/fTurfs = list() var/list/fTurfs = list() //Holds turfs to loop through for mobs to flash. (Hehehe, dirty)
if(roundExplosions) if(roundExplosions)
fTurfs = circlerange(epicenter,max(devastation_range, heavy_impact_range, light_impact_range, flash_range)) fTurfs = circlerange(epicenter,max(devastation_range, heavy_impact_range, light_impact_range, flash_range))
@@ -44,36 +44,40 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa
hTurfs = circlerange(epicenter,heavy_impact_range) - dTurfs hTurfs = circlerange(epicenter,heavy_impact_range) - dTurfs
lTurfs = circlerange(epicenter,light_impact_range) - dTurfs - hTurfs lTurfs = circlerange(epicenter,light_impact_range) - dTurfs - hTurfs
spawn() spawn() //Lets pop these into different threads.
for(var/turf/T in dTurfs) for(var/turf/T in dTurfs) //Loop through the turfs in devestation range.
for(var/atom/object in T.contents) spawn() //Try to pop each turf into it's own thread, speed things along.
spawn() if(T) //Sanity checking.
if(object) //Now, the actual explosion stuff happens.
object.ex_act(1) if(prob(5))
if(prob(5)) T.ex_act(2)
if(T) else
T.ex_act(2) T.ex_act(1)
else for(var/atom/object in T.contents)
if(T) spawn()
T.ex_act(1) if(object)
object.ex_act(1)
spawn() spawn()
for(var/turf/T in hTurfs) for(var/turf/T in hTurfs)
for(var/atom/object in T.contents) spawn()
if(object)
object.ex_act(2)
if(prob(15) && devastation_range > 2 && heavy_impact_range > 2)
secondaryexplosion(T, 1)
else
if(T) if(T)
T.ex_act(2) if(prob(15) && devastation_range > 2 && heavy_impact_range > 2)
secondaryexplosion(T, 1)
else
T.ex_act(2)
for(var/atom/object in T.contents)
if(object)
object.ex_act(2)
spawn() spawn()
for(var/turf/T in lTurfs) for(var/turf/T in lTurfs)
for(var/atom/object in T.contents) spawn()
spawn() if(T)
if(object) T.ex_act(3)
object.ex_act(3) for(var/atom/object in T.contents)
if(T) spawn()
T.ex_act(3) if(object)
object.ex_act(3)
spawn() spawn()
for(var/mob/living/carbon/mob in fTurfs) for(var/mob/living/carbon/mob in fTurfs)
flick("flash", mob:flash) flick("flash", mob:flash)
@@ -87,5 +91,6 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa
proc/secondaryexplosion(turf/epicenter, range) proc/secondaryexplosion(turf/epicenter, range)
for(var/turf/tile in range(range, epicenter)) spawn()
tile.ex_act(2) for(var/turf/tile in range(range, epicenter))
tile.ex_act(2)