cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-17 13:42:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Attempting to prevent overlapping blob chunks.

Browse Source
This commit is contained in:
MistakeNot4892
2023-07-03 01:38:50 +10:00
parent b7048d890d
commit c9cce12305
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/modules/blob2/blobs/base_blob.dm
View File

@@ -148,16 +148,17 @@ GLOBAL_LIST_EMPTY(all_blobs)
var/dirn = pick(dirs) var/dirn = pick(dirs)
dirs.Remove(dirn) dirs.Remove(dirn)
T = get_step(src, dirn) T = get_step(src, dirn)
var/obj/structure/blob/B = locate(/obj/structure/blob) in T if(!T)
continue
var/obj/structure/blob/B = locate() in T
if(!B || B.faction != faction) // Allow opposing blobs to fight. if(!B || B.faction != faction) // Allow opposing blobs to fight.
break break
else T = null
T = null
if(!T) if(!T)
return FALSE return FALSE
var/make_blob = TRUE //can we make a blob? var/make_blob = TRUE //can we make a blob?
if(istype(T, /turf/space) && !(locate(/obj/structure/lattice) in T) && prob(80)) if(istype(T, /turf/space) && !(locate(/obj/structure/lattice) in T) && prob(80))
make_blob = FALSE make_blob = FALSE
playsound(src, 'sound/effects/splat.ogg', 50, 1) //Let's give some feedback that we DID try to spawn in space, since players are used to it playsound(src, 'sound/effects/splat.ogg', 50, 1) //Let's give some feedback that we DID try to spawn in space, since players are used to it
@@ -183,7 +184,7 @@ GLOBAL_LIST_EMPTY(all_blobs)
B.density = TRUE B.density = TRUE
if(T.Enter(B,src)) //NOW we can attempt to move into the tile if(T.Enter(B,src)) //NOW we can attempt to move into the tile
do_slide_animation(B, T, expand_reaction) do_slide_animation(B, T, expand_reaction)
return B return QDELETED(B) ? null : B
blob_attack_animation(T, controller) blob_attack_animation(T, controller)
T.blob_act(src) //if we can't move in hit the turf again T.blob_act(src) //if we can't move in hit the turf again
qdel(B) //we should never get to this point, since we checked before moving in. destroy the blob so we don't have two blobs on one tile qdel(B) //we should never get to this point, since we checked before moving in. destroy the blob so we don't have two blobs on one tile
@@ -194,6 +195,9 @@ GLOBAL_LIST_EMPTY(all_blobs)
/obj/structure/blob/proc/do_slide_animation(var/obj/structure/blob/B, var/turf/T, var/expand_reaction) /obj/structure/blob/proc/do_slide_animation(var/obj/structure/blob/B, var/turf/T, var/expand_reaction)
set waitfor = FALSE set waitfor = FALSE
sleep(1) // To have the slide animation work. sleep(1) // To have the slide animation work.
if(locate(/obj/structure/blob) in T)
qdel(B)
return
B.density = initial(B.density) B.density = initial(B.density)
B.forceMove(T) B.forceMove(T)
B.update_icon() B.update_icon()

8
code/modules/gamemaster/event2/events/engineering/blob.dm
View File

@@ -106,11 +106,15 @@
/datum/event2/event/blob/start() /datum/event2/event/blob/start()
if(!open_turfs.len) if(!open_turfs.len)
set_up() set_up()
for(var/i = 1 to number_of_blobs) var/i = number_of_blobs
while(i && length(open_turfs))
var/turf/T = pick(open_turfs) var/turf/T = pick(open_turfs)
open_turfs -= T // So we can't put two cores on the same tile if doing multiblob.
if(locate(/obj/structure/blob) in T)
continue
i--
var/obj/structure/blob/core/new_blob = new spawn_blob_type(T) var/obj/structure/blob/core/new_blob = new spawn_blob_type(T)
blobs += weakref(new_blob) blobs += weakref(new_blob)
open_turfs -= T // So we can't put two cores on the same tile if doing multiblob.
log_debug("Spawned [new_blob.overmind.blob_type.name] blob at [get_area(new_blob)].") log_debug("Spawned [new_blob.overmind.blob_type.name] blob at [get_area(new_blob)].")
/datum/event2/event/blob/should_end() /datum/event2/event/blob/should_end()