Skip to content

Commit

Permalink
Mob Spawner Rework (shiptest-ss13#2848)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

reworks most mob spawners to fall under a much simpler spawner/burrow
each planet has one simple nest instead of the old system with
difficultly levels i never even noticed were there despite the fact i
used to basically just kill nests and powergame when i first played
this has the byproduct of killing off all the awful magic item spawns

attacking a bunch of other cruft, mostly lavaland
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
add: A new generic nest used across all planets
del: Old portal and tendrils and other cruft
refactor: refactorted mob spawners to have one for each planet
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Signed-off-by: FalloutFalcon <[email protected]>
Signed-off-by: Theos <[email protected]>
Co-authored-by: Mark Suckerberg <[email protected]>
Co-authored-by: Theos <[email protected]>
  • Loading branch information
3 people committed Aug 30, 2024
1 parent a6c3432 commit 7c65b3f
Show file tree
Hide file tree
Showing 41 changed files with 289 additions and 1,732 deletions.
12 changes: 6 additions & 6 deletions _maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@
dir = 9
},
/obj/effect/decal/cleanable/dirt/dust,
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril,
/obj/structure/spawner/burrow/lava_planet,
/turf/open/floor/plasteel/white,
/area/ruin/unpowered/winter_biodome/living_quarters)
"fs" = (
Expand Down Expand Up @@ -896,7 +896,7 @@
dir = 4
},
/obj/effect/decal/cleanable/dirt/dust,
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril,
/obj/structure/spawner/burrow/lava_planet,
/turf/open/floor/plasteel/white,
/area/ruin/unpowered/winter_biodome/living_quarters)
"lq" = (
Expand Down Expand Up @@ -952,7 +952,7 @@
"mD" = (
/obj/effect/turf_decal/solgov/wood/center,
/obj/effect/decal/cleanable/dirt/dust,
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril,
/obj/structure/spawner/burrow/lava_planet,
/turf/open/floor/wood,
/area/ruin/unpowered/winter_biodome/living_quarters)
"mX" = (
Expand Down Expand Up @@ -1081,7 +1081,7 @@
},
/obj/effect/turf_decal/corner/opaque/solgovgold/diagonal,
/obj/effect/decal/cleanable/dirt/dust,
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril,
/obj/structure/spawner/burrow/lava_planet,
/turf/open/floor/plasteel/white,
/area/ruin/unpowered/winter_biodome/engineering)
"qt" = (
Expand Down Expand Up @@ -1467,7 +1467,7 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/blood/gibs/up,
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril,
/obj/structure/spawner/burrow/lava_planet,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 4
},
Expand Down Expand Up @@ -1925,7 +1925,7 @@
/turf/open/floor/wood,
/area/ruin/unpowered/winter_biodome/sauna)
"Lf" = (
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril,
/obj/structure/spawner/burrow/lava_planet,
/turf/open/floor/grass/snow,
/area/ruin/unpowered/winter_biodome)
"Lt" = (
Expand Down
10 changes: 5 additions & 5 deletions _maps/RandomRuins/LavaRuins/lavaland_surface_buried_shrine.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,7 @@
/area/ruin/unpowered/buried_shrine)
"nq" = (
/obj/structure/stone_tile/surrounding,
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril,
/obj/structure/spawner/burrow/lava_planet,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/buried_shrine)
"nz" = (
Expand Down Expand Up @@ -664,7 +664,7 @@
dir = 5
},
/obj/structure/chair/wood,
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril,
/obj/structure/spawner/burrow/lava_planet,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/buried_shrine)
"qT" = (
Expand Down Expand Up @@ -931,7 +931,7 @@
/area/ruin/unpowered/buried_shrine)
"wM" = (
/obj/structure/stone_tile/slab,
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril,
/obj/structure/spawner/burrow/lava_planet,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/buried_shrine)
"wS" = (
Expand Down Expand Up @@ -1647,7 +1647,7 @@
/obj/structure/stone_tile/cracked{
dir = 1
},
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril,
/obj/structure/spawner/burrow/lava_planet,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/buried_shrine)
"QR" = (
Expand Down Expand Up @@ -1864,7 +1864,7 @@
/obj/structure/stone_tile{
dir = 1
},
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril,
/obj/structure/spawner/burrow/lava_planet,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface/lit,
/area/ruin/unpowered/buried_shrine)
"Xr" = (
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/SpaceRuins/corporate_mining.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1577,7 +1577,7 @@
/turf/open/floor/plating/asteroid/airless,
/area/ruin/space)
"Iv" = (
/obj/structure/spawner/mining/hivelord,
/obj/structure/spawner/burrow/asteroid,
/turf/open/floor/plating/asteroid/airless,
/area/ruin/space)
"IE" = (
Expand Down Expand Up @@ -2036,7 +2036,7 @@
/turf/open/floor/plating/asteroid/airless,
/area/ruin/space)
"TO" = (
/obj/structure/spawner/mining/goliath,
/obj/structure/spawner/burrow/asteroid,
/turf/open/floor/plating/asteroid/airless,
/area/ruin/space)
"TR" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/WasteRuins/wasteplanet_unhonorable.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@
/turf/open/floor/plating,
/area/ruin/wasteplanet/wasteplanet_radiation/containment)
"iT" = (
/obj/structure/spawner/wasteplanet/hivebot/low_threat,
/obj/structure/spawner/hivebot,
/turf/open/floor/plating/asteroid/wasteplanet,
/area/ruin/wasteplanet/wasteplanet_radiation)
"jh" = (
Expand Down
10 changes: 2 additions & 8 deletions code/__DEFINES/achievements.dm
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
//Skill medal hub IDs
#define MEDAL_LEGENDARY_MINER "Legendary Miner"


//Boss medals

// Medal hub IDs for boss medals (Pre-fixes)
Expand All @@ -40,10 +39,8 @@
#define BOSS_MEDAL_DRAKE "Drake Killer"
#define BOSS_MEDAL_HIEROPHANT "Hierophant Killer"
#define BOSS_MEDAL_LEGION "Legion Killer"
#define BOSS_MEDAL_TENDRIL "Tendril Exterminator"
#define BOSS_MEDAL_SWARMERS "Swarmer Beacon Killer"
#define BOSS_MEDAL_NEST "Nest Exterminator"
#define BOSS_MEDAL_WENDIGO "Wendigo Killer"
#define BOSS_MEDAL_KINGGOAT "King Goat Killer"

#define BOSS_MEDAL_MINER_CRUSHER "Blood-drunk Miner Crusher"
#define BOSS_MEDAL_FROSTMINER_CRUSHER "Demonic-frost Miner Crusher"
Expand All @@ -52,9 +49,7 @@
#define BOSS_MEDAL_DRAKE_CRUSHER "Drake Crusher"
#define BOSS_MEDAL_HIEROPHANT_CRUSHER "Hierophant Crusher"
#define BOSS_MEDAL_LEGION_CRUSHER "Legion Crusher"
#define BOSS_MEDAL_SWARMERS_CRUSHER "Swarmer Beacon Crusher"
#define BOSS_MEDAL_WENDIGO_CRUSHER "Wendigo Crusher"
#define BOSS_MEDAL_KINGGOAT_CRUSHER "King Goat Crusher"

// Medal hub IDs for boss-kill scores
#define BOSS_SCORE "Bosses Killed"
Expand All @@ -65,6 +60,5 @@
#define DRAKE_SCORE "Drakes Killed"
#define HIEROPHANT_SCORE "Hierophants Killed"
#define LEGION_SCORE "Legion Killed"
#define SWARMER_BEACON_SCORE "Swarmer Beacs Killed"
#define WENDIGO_SCORE "Wendigos Killed"
#define TENDRIL_CLEAR_SCORE "Tendrils Killed"
#define NEST_CLEAR_SCORE "Nests Destroyed"
29 changes: 3 additions & 26 deletions code/datums/achievements/boss_achievements.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
category = "Bosses"
icon = "baseboss"

/datum/award/achievement/boss/tendril_exterminator
name = "Tendril Exterminator"
/datum/award/achievement/boss/nest_exterminator
name = "Nest Exterminator"
desc = "Watch your step"
database_id = BOSS_MEDAL_TENDRIL
database_id = BOSS_MEDAL_NEST
icon = "tendril"

/datum/award/achievement/boss/boss_killer
Expand Down Expand Up @@ -55,23 +55,11 @@
database_id = BOSS_MEDAL_LEGION
icon = "legion"

/datum/award/achievement/boss/swarmer_beacon_kill
name = "Swarm Beacon Killer"
desc = "GET THEM OFF OF ME!"
database_id = BOSS_MEDAL_SWARMERS
icon = "swarmer"

/datum/award/achievement/boss/wendigo_kill
name = "Wendigo Killer"
desc = "You've now ruined years of mythical storytelling."
database_id = BOSS_MEDAL_WENDIGO

/datum/award/achievement/boss/king_goat_kill
name = "King Goat Killer"
desc = "The king is dead, long live the king!"
database_id = BOSS_MEDAL_KINGGOAT
icon = "goatboss"

/datum/award/achievement/boss/blood_miner_crusher
name = "Blood-drunk Miner Crusher"
desc = "I guess he couldn't handle his drink that well."
Expand Down Expand Up @@ -112,18 +100,7 @@
desc = "We were many... now we are none."
database_id = BOSS_MEDAL_LEGION_CRUSHER

/datum/award/achievement/boss/swarmer_beacon_crusher
name = "Swarm Beacon Crusher"
desc = "GET THEM OFF OF ME!"
database_id = BOSS_MEDAL_SWARMERS_CRUSHER

/datum/award/achievement/boss/wendigo_crusher
name = "Wendigo Crusher"
desc = "You've now ruined years of mythical storytelling."
database_id = BOSS_MEDAL_WENDIGO_CRUSHER

/datum/award/achievement/boss/king_goat_crusher
name = "King Goat Crusher"
desc = "The king is dead, long live the king!"
database_id = BOSS_MEDAL_KINGGOAT_CRUSHER
icon = "goatboss"
11 changes: 3 additions & 8 deletions code/datums/achievements/boss_scores.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/datum/award/score/tendril_score
name = "Tendril Score"
/datum/award/score/nest_score
name = "Nest Score"
desc = "Watch your step"
database_id = TENDRIL_CLEAR_SCORE
database_id = NEST_CLEAR_SCORE

/datum/award/score/boss_score
name = "Bosses Killed"
Expand Down Expand Up @@ -43,11 +43,6 @@
desc = "You've killed HOW many?"
database_id = LEGION_SCORE

/datum/award/score/swarmer_beacon_score
name = "Swarmer Beacons Killed"
desc = "You've killed HOW many?"
database_id = SWARMER_BEACON_SCORE

/datum/award/score/wendigo_score
name = "Wendigos Killed"
desc = "You've killed HOW many?"
Expand Down
2 changes: 0 additions & 2 deletions code/datums/components/chasm.dm
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
/obj/effect/hotspot,
/obj/effect/landmark,
/obj/effect/temp_visual,
/obj/effect/light_emitter/tendril,
/obj/effect/collapse,
/obj/effect/particle_effect/ion_trails,
/obj/effect/dummy/phased_mob,
/obj/effect/mapping_helpers,
Expand Down
6 changes: 2 additions & 4 deletions code/datums/mapgen/planetary/AsteroidGenerator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,8 @@
)

feature_spawn_list = list(
/obj/structure/spawner/burrow/asteroid = 3,
/obj/structure/geyser/random = 1,
/obj/structure/spawner/mining/goliath = 1,
/obj/structure/spawner/mining = 1,
/obj/structure/spawner/mining/hivelord = 1,
/obj/structure/vein/asteroid = 5,
/obj/structure/vein/classtwo/asteroid = 10,
/obj/structure/vein/classthree/asteroid = 5
Expand Down Expand Up @@ -161,7 +159,7 @@

feature_spawn_list = list(
/obj/structure/geyser/random = 5,
/obj/structure/spawner/mining/carp = 5,
/obj/structure/spawner/carp = 5,
/obj/structure/vein/asteroid = 10,
/obj/structure/vein/classtwo/asteroid = 15,
/obj/structure/vein/classthree/asteroid = 12
Expand Down
2 changes: 1 addition & 1 deletion code/datums/mapgen/planetary/JungleGenerator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@
feature_spawn_chance = 0.5
feature_spawn_list = list(
/obj/item/pickaxe/rusted = 1,
/obj/structure/spawner/ice_moon = 1,
/obj/structure/spawner/burrow/jungle_planet = 1,
/obj/effect/spawner/lootdrop/anomaly/jungle = 1
)

Expand Down
9 changes: 2 additions & 7 deletions code/datums/mapgen/planetary/LavaGenerator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,7 @@
/mob/living/simple_animal/hostile/asteroid/goliath/beast/ancient/crystal = 1,
/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/forgotten = 1,
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/crystal = 1,
/obj/structure/spawner/lavaland/low_threat = 8,
/obj/structure/spawner/lavaland/medium_threat = 3,
/obj/structure/spawner/lavaland/high_threat = 1,
/obj/structure/spawner/burrow/lava_planet = 10
)

/datum/biome/lavaland/forest
Expand Down Expand Up @@ -242,10 +240,7 @@
/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/random = 40,
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/random = 30,
/mob/living/simple_animal/hostile/asteroid/goldgrub = 10,
/obj/structure/spawner/lavaland/low_threat = 8,
/obj/structure/spawner/lavaland/medium_threat = 3,
/obj/structure/spawner/lavaland/high_threat = 2,
/obj/structure/spawner/lavaland/extreme_threat = 1
/obj/structure/spawner/burrow/lava_planet = 10
)
flora_spawn_chance = 1
flora_spawn_list = list(
Expand Down
2 changes: 1 addition & 1 deletion code/datums/mapgen/planetary/RockGenerator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,8 @@
/obj/structure/vein/classtwo = 2,
/obj/structure/elite_tumor = 1,
/obj/structure/vein/classthree = 1,
/obj/structure/spawner/burrow/rock_plant = 4,
/obj/effect/spawner/minefield = 1,
/obj/structure/spawner/ice_moon/rockplanet = 4,
/obj/effect/spawner/lootdrop/anomaly/rock/cave = 1,
)
mob_spawn_chance = 6
Expand Down
4 changes: 1 addition & 3 deletions code/datums/mapgen/planetary/SandGenerator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -217,9 +217,7 @@
/mob/living/simple_animal/hostile/asteroid/basilisk/whitesands = 40,
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/random = 30,
/mob/living/simple_animal/hostile/asteroid/goldgrub = 20,
/obj/structure/spawner/lavaland/sand_world/low_threat = 14,
/obj/structure/spawner/lavaland/sand_world/medium_threat = 8,
/obj/structure/spawner/lavaland/sand_world/high_threat = 2,
/obj/structure/spawner/burrow/sand_planet = 25
)

/datum/biome/cave/sand/volcanic
Expand Down
Loading

0 comments on commit 7c65b3f

Please sign in to comment.