From 719717934c6e6cbc9494bfa284d2ed9f7fcbd964 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 29 Aug 2017 17:10:59 -0500 Subject: [PATCH 1/2] Makes the singularity eat asteroids, adds a planetary z-level list with a helper that adds maps to it --- _maps/RandomZLevels/Cabin.dmm | 6 +- _maps/RandomZLevels/caves.dmm | 6 +- _maps/RandomZLevels/moonoutpost19.dmm | 880 +++++++++--------- _maps/RandomZLevels/snowdin.dmm | 6 +- _maps/RandomZLevels/spacebattle.dmm | 36 +- _maps/RandomZLevels/undergroundoutpost45.dmm | 56 +- _maps/map_files/Mining/Lavaland.dmm | 6 +- code/__HELPERS/unsorted.dm | 4 + .../simulated/floor/plating/asteroid.dm.rej | 14 + code/modules/mapping/mapping_helpers.dm | 18 + 10 files changed, 548 insertions(+), 484 deletions(-) create mode 100644 code/game/turfs/simulated/floor/plating/asteroid.dm.rej diff --git a/_maps/RandomZLevels/Cabin.dmm b/_maps/RandomZLevels/Cabin.dmm index a0a4907b02..b4869790a8 100644 --- a/_maps/RandomZLevels/Cabin.dmm +++ b/_maps/RandomZLevels/Cabin.dmm @@ -975,6 +975,10 @@ }, /turf/open/floor/plating, /area/awaymission/cabin) +"dw" = ( +/obj/effect/mapping_helpers/planet_z, +/turf/closed/indestructible/rock/snow, +/area/space) (1,1,1) = {" aa @@ -1231,7 +1235,7 @@ aa aa aa aa -aa +dw "} (2,1,1) = {" aa diff --git a/_maps/RandomZLevels/caves.dmm b/_maps/RandomZLevels/caves.dmm index 024abd1968..5c89b42453 100644 --- a/_maps/RandomZLevels/caves.dmm +++ b/_maps/RandomZLevels/caves.dmm @@ -2973,6 +2973,10 @@ initial_gas_mix = "n2=23;o2=14" }, /area/awaymission/BMPship) +"gW" = ( +/obj/effect/mapping_helpers/planet_z, +/turf/closed/indestructible/rock, +/area/space) (1,1,1) = {" aa @@ -3229,7 +3233,7 @@ aa aa aa aa -aa +gW "} (2,1,1) = {" aa diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm index 5daed4908c..22f0169437 100644 --- a/_maps/RandomZLevels/moonoutpost19.dmm +++ b/_maps/RandomZLevels/moonoutpost19.dmm @@ -10575,6 +10575,10 @@ has_gravity = 1; name = "MO19 Research" }) +"oV" = ( +/obj/effect/mapping_helpers/planet_z, +/turf/open/space, +/area/space) (1,1,1) = {" aa @@ -10831,7 +10835,7 @@ aa aa aa aa -aa +oV "} (2,1,1) = {" aa @@ -29943,10 +29947,10 @@ ac ac ac ac -af -ae ad -ae +ad +ad +ad ac ac ac @@ -30200,10 +30204,10 @@ ac ac ad ad -af -hl -ah -af +ad +hk +ag +ad ad ad ac @@ -30455,14 +30459,14 @@ ac ac ac ac -ae +ad ai -ah -al +ag +ag ai hk ai -af +ad ad ac ac @@ -30711,16 +30715,16 @@ ac ac ac ac -ae -af +ad +ad hk -aq +ai ai hk -bb -ar -ah -af +aM +ai +ag +ad ac ac ac @@ -30968,13 +30972,13 @@ ac ac ac ac -af +ad +ai ai -aq aD -an -aq -ar +aj +ai +ai aD ai ad @@ -31227,14 +31231,14 @@ ac ac ad ai -ar -an -ar +ai +aj +ai aT av bj bc -ae +ad ac ac ac @@ -31482,16 +31486,16 @@ ac ac ac ac -ae -ah +ad +ag au ai -aq -ar +ai +ai bc av -ar -af +ai +ad ac ac ac @@ -31739,16 +31743,16 @@ ac ac ac ac -af -ao +ad +aj av -aq +ai ai am -ar -bk -al -ae +ai +au +ag +ad ac ac ac @@ -31999,13 +32003,13 @@ ac ad ap aw -ar -aq -aq -ar -al -aq -af +ai +ai +ai +ai +ag +ai +ad ac ac ac @@ -32253,11 +32257,11 @@ ac ac ac ac -ae -aq -ax -af -aq +ad +ai +av +ad +ai ai ai aD @@ -32511,31 +32515,31 @@ ac ac ac ad -af -ar -ai -ar -ai -ar -ar -aq -af -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -af -ae ad -ae +ai +ai +ai +ai +ai +ai +ai +ad +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ad +ad +ad +ad ac ac ac @@ -32768,15 +32772,15 @@ ac ac ac ac -ae +ad ag -aq ai -aq ai -ar -aq -ae +ai +ai +ai +ai +ad ac ac ac @@ -32788,12 +32792,12 @@ ac ac ac ac -ae +ad ad dO aj -af -ae +ad +ad ac ac ac @@ -33025,15 +33029,15 @@ ac ac ac ac -af -ae -ar -aq -am -ar +ad +ad ai -af -af +ai +am +ai +ai +ad +ad ac ac ac @@ -33045,12 +33049,12 @@ ac ac ac ad -ae +ad ag -aL +av dS -ar -af +ai +ad ac ac ac @@ -33283,12 +33287,12 @@ ac ac ac ac -af -ae +ad +ad ai -ar -aq -ae +ai +ai +ad ad ac ac @@ -33301,12 +33305,12 @@ ac ac ac ac -af +ad aj -ar +ai am ai -ah +ag ad ac ac @@ -33541,11 +33545,11 @@ ac ac ac ac -af -af ad -af -af +ad +ad +ad +ad ac ac ac @@ -33557,13 +33561,13 @@ ac ac ac ad -ae -af -aq +ad +ad +ai +ai ai -ar aj -ae +ad ad ac ac @@ -33798,10 +33802,10 @@ ac ac ac ac -ae +ad am am -ae +ad ac ac ac @@ -33812,14 +33816,14 @@ ac ac ac ac -ae -ae -ar +ad +ad +ai ak ai -ah -ae -af +ag +ad +ad ad ac ac @@ -34055,27 +34059,27 @@ ac ac ac ac -af -ai -aq ad -ae +ai +ai +ad +ad ac ad -ae -af -ae -af ad -ae -ae -af +ad +ad +ad +ad +ad +ad +ad +ai ai -aq -ae -af ad -ae +ad +ad +ad ac ac ac @@ -34313,23 +34317,23 @@ ac ac ac ad -ar -ar -ai -af -af -ae -ar -ai -ar -aq ai ai -af +ai +ad +ad ad ai -af -ae +ai +ai +ai +ai +ai +ad +ad +ai +ad +ad ac ac ac @@ -34569,22 +34573,22 @@ ac ac ac ac -ae -ae +ad +ad +ai +ai +ai +ad +ai +ai ai ai -aq -af ai -ar -aq ai -ar -aq am -ar ai -aq +ai +ai ad ac ac @@ -34821,27 +34825,27 @@ ab ab ac ad -af -ae +ad +ad ad ac ac ac ad -af -aq -am -aq -ar +ad ai -af -ae -af -ae -ar -aq -ar -ae +am +ai +ai +ai +ad +ad +ad +ad +ai +ai +ai +ad ad ac ac @@ -35077,28 +35081,28 @@ ab ab ab ad -af -ah +ad +ag aj -ae -af -ae ad -ae -af -ar -aq +ad +ad +ad +ad +ad ai -aq -ae +ai +ai +ai +ad ad bl bl ad -af +ad ai -aq -af +ai +ad ac ac ac @@ -35333,29 +35337,29 @@ ab ab ab ab -ae +ad ag ai ak ai ad -af -ar +ad ai -aq ai -ar -ar -af +ai +ai +ai +ai +ad ad bl bl bl -ae -ar -ar +ad ai -ae +ai +ai +ad ac ac ac @@ -35591,27 +35595,27 @@ ab ab ab ad -ah +ag ai -al +ag am -ar ai -aq -af -ae -aq -af -ae -af -bl -bl -bl -bl -af ai -aq -af +ai +ad +ad +ai +ad +ad +ad +bl +bl +bl +bl +ad +ai +ai +ad ad ac ac @@ -35847,14 +35851,14 @@ ab ab ab ab -ae -af -af +ad +ad +ad +aj aj -an ad -af -ae +ad +ad ad ad ai @@ -35865,10 +35869,10 @@ bl bl bl bl -af -aq +ad ai -af +ai +ad ac ac ac @@ -36106,17 +36110,17 @@ ab ab ac ac -ae -af -af -ae +ad +ad +ad +ad ac ac ac -af +ad aM -af -ae +ad +ad bl bl bl @@ -36126,7 +36130,7 @@ ad ai dd ad -af +ad ad ac ac @@ -36134,8 +36138,8 @@ ac dA dA dA -dR -dU +dP +dT ba ba ba @@ -36370,27 +36374,27 @@ ac ac ac ac -af -aq +ad ai -ae -bl -bl -bl -bl -bl -ae -ar -aq -ar ai -af -ae -af +ad +bl +bl +bl +bl +bl +ad +ai +ai +ai +ai +ad +ad +ad ac dA dA -dW +dP dP dT ba @@ -36626,30 +36630,30 @@ ac ac ac ad -af -ae -ar -ar -af +ad +ad +ai +ai +ad ad bl bl bl bl -af -af -ai -aq -aq -ai -ar ad -af +ad +ai +ai +ai +ai +ai +ad +ad +dP dP -dR dV dT -dU +dT ba ba ba @@ -36882,31 +36886,31 @@ ac ac ac ad -ae +ad aJ ai -ar +ai am ag -ae +ad bl bl bl ad -af +ad +ai +ai +ad +ad +ai ai -ar -ae -af ai -aq -ar ad dQ dT -dX -dU -dX +dT +dT +dT ba ba ba @@ -37138,32 +37142,32 @@ ac ac ac ac -af +ad aE aK ak ai ag -an -af -bl -bl -bl -ae -ai -aq -af -ae +aj +ad +bl +bl +bl +ad +ai +ai +ad +ad +ad ad -af ai am ad dQ -dU -dX dT -dU +dT +dT +dT ba ba ba @@ -37395,32 +37399,32 @@ ac ac ac ac -af +ad aj -aL -aq -ao -an -af +av +ai +aj +aj +ad ad bl bl bl -af -ar -ae -af -ac -ac -ae -af ad -af -dR +ai +ad +ad +ac +ac +ad +ad +ad +ad +dP dV -dU -dX -dU +dT +dT +dT ba ba ba @@ -37652,20 +37656,20 @@ ac ac ac ac -ae ad -af +ad +ad ai -af -af -ae +ad +ad +ad bl bl bl bl ad -aq -af +ai +ad ad ac ac @@ -37674,9 +37678,9 @@ ac ac dA dA -dR +dP +dT dT -dU ba ba ba @@ -37911,19 +37915,19 @@ ac ac ac ac -ae -aq -ae +ad +ai +ad bl bl bl bl bl bl -ae +ad ai ai -ae +ad ac ac ac @@ -37932,7 +37936,7 @@ ac dA dA dP -dX +dT dT ba ba @@ -38169,27 +38173,27 @@ ac ac ac ad -aq -af +ai +ad bl bl bl bl bl bl -ae -af +ad +ad am -af +ad ac ac ac ac dA dA -dR -dR -dU +dP +dP +dT ba ba ba @@ -38425,7 +38429,7 @@ ac ac ac ac -ae +ad am ad bl @@ -38436,15 +38440,15 @@ bl bl bl ad -aq -ae +ai +ad ac ac ac ac dA dA -dR +dP ba ba ba @@ -38682,9 +38686,9 @@ ac ac ac ac -af -aq -ae +ad +ai +ad bl bl bl @@ -38692,9 +38696,9 @@ bl bl bl bl -af -ar -af +ad +ai +ad ac ac ac @@ -38939,19 +38943,19 @@ ac ac ac ac -ae +ad ai -af +ad bl bl bl bl bl bl -af -ae +ad +ad ai -ae +ad ac ac ac @@ -39196,18 +39200,18 @@ ac ac ac ac -af -ar -ae +ad +ai +ad bl bl bl bl bl ad -ae +ad +ai ai -aq ad ac ac @@ -39453,19 +39457,19 @@ ac ac ac ad -af -aq -af ad -ae -af -af +ai +ad +ad +ad +ad +ad +ad +ad +ai +ai +ad ad -af -aq -ar -ae -af ac ac ac @@ -39709,18 +39713,18 @@ ac ac ac ad -af -ar +ad +ai +ai +ag +ad +ad ai -al -ae -af ai -ar bW ai -ar -af +ai +ad ad ac ac @@ -39965,19 +39969,19 @@ ac ac ac ac -ae -an -aM -aq -ai -ar -aq -aq ad -af -ae -af -ae +aj +aM +ai +ai +ai +ai +ai +ad +ad +ad +ad +ad ac ac ac @@ -40221,16 +40225,16 @@ ac ac ac ac -af -af -ah -ar +ad +ad +ag +ai am ai ag -af -ae -af +ad +ad +ad ac ac ac @@ -40478,13 +40482,13 @@ ac ac ac ac -ae +ad ag -ar ai -ao -an -af +ai +aj +aj +ad ad ac ac @@ -40736,12 +40740,12 @@ ac ac ac as -af -ae -af ad -ae -af +ad +ad +ad +ad +ad ac ac ac @@ -41800,7 +41804,7 @@ ba ba ea eg -ew +eg eI fj fA @@ -43087,7 +43091,7 @@ ea ea eA eq -eD +eq fF gc gu @@ -43343,10 +43347,10 @@ ba ea el er -eE +eq en fG -eG +em gv gM ha @@ -43600,13 +43604,13 @@ ba ea em eB -eG -eR +em +en fH -gd -eC +el +en eB -eE +eq ea ba ba @@ -43856,13 +43860,13 @@ ba ba ea en -eC -eP -eE -fI -eE -eD -eC +en +eH +eq +fH +eq +eq +en eq ea ba @@ -44113,11 +44117,11 @@ ba ba ec eo -eD +eq eq eq fJ -eE +eq eq en hb @@ -44370,11 +44374,11 @@ ba ba ea ep -eE -eP -eD -eD -eE +eq +eH +eq +eq +eq eq eQ hc @@ -44629,9 +44633,9 @@ ea eq eF eQ -fo -eC -ge +eH +en +fp eq en eq @@ -44884,12 +44888,12 @@ ba ba ea er -eG -eR +em +en en eQ -eC -eR +en +en eB eq ea @@ -45140,14 +45144,14 @@ ba ba ba ea -es +el eH eB fp fK eH -fo -eD +eH +eq eq ea ba diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm index 7acf9a7b3a..a18c9f18c8 100644 --- a/_maps/RandomZLevels/snowdin.dmm +++ b/_maps/RandomZLevels/snowdin.dmm @@ -5278,6 +5278,10 @@ }, /turf/open/floor/plating/asteroid/snow, /area/awaymission/snowdin) +"nR" = ( +/obj/effect/mapping_helpers/planet_z, +/turf/closed/indestructible/rock/snow, +/area/awaymission/snowdin) (1,1,1) = {" aa @@ -5534,7 +5538,7 @@ aa aa aa aa -aa +nR "} (2,1,1) = {" aa diff --git a/_maps/RandomZLevels/spacebattle.dmm b/_maps/RandomZLevels/spacebattle.dmm index c554618c9a..1b803966d3 100644 --- a/_maps/RandomZLevels/spacebattle.dmm +++ b/_maps/RandomZLevels/spacebattle.dmm @@ -3065,6 +3065,10 @@ /obj/item/mecha_parts/mecha_equipment/weapon/energy/ion, /turf/open/floor/plating, /area/awaymission/spacebattle/cruiser) +"kM" = ( +/obj/effect/mapping_helpers/planet_z, +/turf/closed/mineral/random, +/area/space) (1,1,1) = {" aa @@ -3321,7 +3325,7 @@ aa aa aa aa -aa +kM "} (2,1,1) = {" aa @@ -38141,17 +38145,17 @@ bT cd bT bT -eF -eQ -eQ -eQ -eQ -eQ -eQ -eQ -eQ -eQ -eQ +cY +eb +eb +eb +eb +eb +eb +eb +eb +eb +eb ha bT bT @@ -48177,7 +48181,7 @@ jS jS bT kd -ko +ki ix ab ab @@ -48691,7 +48695,7 @@ jS jS bT kd -ko +ki kr kx ab @@ -49205,7 +49209,7 @@ jS jS bT kd -ko +ki kr kx ab @@ -49719,7 +49723,7 @@ jS jS bT kd -ko +ki kr kz ab diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm index 575af3c075..a22555c6c8 100644 --- a/_maps/RandomZLevels/undergroundoutpost45.dmm +++ b/_maps/RandomZLevels/undergroundoutpost45.dmm @@ -17834,6 +17834,10 @@ power_light = 0; poweralm = 0 }) +"zi" = ( +/obj/effect/mapping_helpers/planet_z, +/turf/open/space, +/area/space) (1,1,1) = {" aa @@ -18090,7 +18094,7 @@ aa aa aa aa -aa +zi "} (2,1,1) = {" aa @@ -36521,9 +36525,9 @@ ad ad ad ad -ys +yk yw -yx +yn ad ad ad @@ -37036,7 +37040,7 @@ ad ad ad ad -yx +yn eJ yB ad @@ -37298,8 +37302,8 @@ eJ eJ yr ad -yF -yG +yA +yj ad ad ad @@ -37554,8 +37558,8 @@ ad ad yC eJ -yE -yv +yw +ym yH ad ad @@ -37811,7 +37815,7 @@ ad ad ad eJ -yx +yn eJ yz ad @@ -38320,7 +38324,7 @@ ad yl eJ yq -yv +ym ad ad yz @@ -38578,7 +38582,7 @@ ad eJ eJ eJ -yy +yn ad yD eJ @@ -38588,8 +38592,8 @@ ad ad ad ad -yG -yy +yj +yn ad ad ad @@ -38835,17 +38839,17 @@ ad ad yr yn -yy yn -yx +yn +yn eJ eJ ad ad ad ad -yI -yv +yp +ym yA ad ad @@ -39092,7 +39096,7 @@ ad ad ad ad -yx +yn eJ eJ eJ @@ -39353,7 +39357,7 @@ yz eJ eJ eJ -yy +yn eJ eJ eJ @@ -39609,12 +39613,12 @@ ad yp yq eJ -yy yn -yv +yn +ym eJ -yy -yy +yn +yn ad ad ad @@ -39864,14 +39868,14 @@ ad ad ad yA -yx +yn eJ yn ad ad yw -yG -ys +yj +yk ad ad ad diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm index 9a982211b4..3e53168c2e 100644 --- a/_maps/map_files/Mining/Lavaland.dmm +++ b/_maps/map_files/Mining/Lavaland.dmm @@ -3420,6 +3420,10 @@ /obj/effect/baseturf_helper/lava_land/surface, /turf/open/floor/plasteel, /area/mine/production) +"Wz" = ( +/obj/effect/mapping_helpers/planet_z, +/turf/open/lava/smooth/lava_land_surface, +/area/lavaland/surface/outdoors) (1,1,1) = {" aa @@ -3676,7 +3680,7 @@ aj aj aj aj -aj +Wz "} (2,1,1) = {" aa diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 918fd0b28c..05a0c9c3f1 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -1453,3 +1453,7 @@ GLOBAL_PROTECT(valid_HTTPSGet) var/temp = bitfield - ((bitfield>>1)&46811) - ((bitfield>>2)&37449) //0133333 and 0111111 respectively temp = ((temp + (temp>>3))&29127) % 63 //070707 return temp + +//checks if a turf is in the planet z list. +/proc/turf_z_is_planet(turf/T) + return GLOB.z_is_planet["[T.z]"] diff --git a/code/game/turfs/simulated/floor/plating/asteroid.dm.rej b/code/game/turfs/simulated/floor/plating/asteroid.dm.rej new file mode 100644 index 0000000000..d8845745e8 --- /dev/null +++ b/code/game/turfs/simulated/floor/plating/asteroid.dm.rej @@ -0,0 +1,14 @@ +diff a/code/game/turfs/simulated/floor/plating/asteroid.dm b/code/game/turfs/simulated/floor/plating/asteroid.dm (rejected hunks) +@@ -101,10 +101,9 @@ + return + + /turf/open/floor/plating/asteroid/singularity_act() +- if(!turf_z_is_planet(src)) +- ChangeTurf(/turf/open/space) +- else ++ if(turf_z_is_planet(src)) + return ..() ++ ChangeTurf(/turf/open/space) + + /turf/open/floor/plating/asteroid/singularity_pull(S, current_size) + return diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm index cf82921646..e70786f80d 100644 --- a/code/modules/mapping/mapping_helpers.dm +++ b/code/modules/mapping/mapping_helpers.dm @@ -49,3 +49,21 @@ /obj/effect/baseturf_helper/lava_land/surface name = "lavaland baseturf editor" baseturf = /turf/open/lava/smooth/lava_land_surface + + +//Contains the list of planetary z-levels defined by the planet_z helper. +GLOBAL_LIST_EMPTY(z_is_planet) + +/obj/effect/mapping_helpers/planet_z //adds the map it is on to the z_is_planet list + name = "planet z helper" + icon = 'icons/obj/items_and_weapons.dmi' + icon_state = "syndballoon" + layer = POINT_LAYER + +/obj/effect/mapping_helpers/planet_z/Initialize() + . = ..() + var/turf/T = get_turf(src) + if(!turf_z_is_planet(T)) + GLOB.z_is_planet["[T.z]"] = list() + qdel(src) + From b9c58a2914069a0cb064b9fd9875bf04a5664893 Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Tue, 29 Aug 2017 21:14:33 -0700 Subject: [PATCH 2/2] wew --- .../game/turfs/simulated/floor/plating/asteroid.dm | 4 +++- .../turfs/simulated/floor/plating/asteroid.dm.rej | 14 -------------- 2 files changed, 3 insertions(+), 15 deletions(-) delete mode 100644 code/game/turfs/simulated/floor/plating/asteroid.dm.rej diff --git a/code/game/turfs/simulated/floor/plating/asteroid.dm b/code/game/turfs/simulated/floor/plating/asteroid.dm index 8143bc3c9e..b24b758d73 100644 --- a/code/game/turfs/simulated/floor/plating/asteroid.dm +++ b/code/game/turfs/simulated/floor/plating/asteroid.dm @@ -101,7 +101,9 @@ return /turf/open/floor/plating/asteroid/singularity_act() - return + if(turf_z_is_planet(src)) + return ..() + ChangeTurf(/turf/open/space) /turf/open/floor/plating/asteroid/singularity_pull(S, current_size) if(dug) diff --git a/code/game/turfs/simulated/floor/plating/asteroid.dm.rej b/code/game/turfs/simulated/floor/plating/asteroid.dm.rej deleted file mode 100644 index d8845745e8..0000000000 --- a/code/game/turfs/simulated/floor/plating/asteroid.dm.rej +++ /dev/null @@ -1,14 +0,0 @@ -diff a/code/game/turfs/simulated/floor/plating/asteroid.dm b/code/game/turfs/simulated/floor/plating/asteroid.dm (rejected hunks) -@@ -101,10 +101,9 @@ - return - - /turf/open/floor/plating/asteroid/singularity_act() -- if(!turf_z_is_planet(src)) -- ChangeTurf(/turf/open/space) -- else -+ if(turf_z_is_planet(src)) - return ..() -+ ChangeTurf(/turf/open/space) - - /turf/open/floor/plating/asteroid/singularity_pull(S, current_size) - return