Skip to content

Commit

Permalink
Adds new wasteplanet cave type (#3374)
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
Concrete Caves. They're caves but cement.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

![dreamseeker_GF0CtB249n](https://github.com/user-attachments/assets/489c2127-0a7d-42f8-a7cf-49d14515433b)

![dreamseeker_3Ko7axdwIy](https://github.com/user-attachments/assets/d76b67ef-6d5f-483d-b569-6457dc983dff)

## Why It's Good For The Game
planetary variety.
<!-- 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: Wasteplanets now will generate concrete filled caves. 
/: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. -->
  • Loading branch information
Erikafox authored Sep 23, 2024
1 parent 05f9de1 commit 15525b0
Show file tree
Hide file tree
Showing 2 changed files with 125 additions and 11 deletions.
65 changes: 54 additions & 11 deletions code/datums/mapgen/planetary/WasteGenerator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@
BIOME_COLD_CAVE = list(
BIOME_LOWEST_HUMIDITY = /datum/biome/cave/waste,
BIOME_LOW_HUMIDITY = /datum/biome/cave/waste/rad,
BIOME_MEDIUM_HUMIDITY = /datum/biome/cave/waste,
BIOME_HIGH_HUMIDITY = /datum/biome/cave/waste/rad,
BIOME_HIGHEST_HUMIDITY = /datum/biome/cave/waste
BIOME_MEDIUM_HUMIDITY = /datum/biome/cave/waste/conc,
BIOME_HIGH_HUMIDITY = /datum/biome/cave/waste/conc,
BIOME_HIGHEST_HUMIDITY = /datum/biome/cave/waste/conc
),
BIOME_WARM_CAVE = list(
BIOME_LOWEST_HUMIDITY = /datum/biome/cave/waste,
Expand Down Expand Up @@ -284,10 +284,10 @@

closed_turf_types = list(
/turf/closed/mineral/random/wasteplanet = 40,
/turf/closed/wall/r_wall = 1,
/turf/closed/wall/r_wall/rust = 3,
/turf/closed/wall = 2,
/turf/closed/wall/rust = 6
/turf/closed/wall/r_wall/wasteplanet = 1,
/turf/closed/wall/r_wall/rust/wasteplanet = 3,
/turf/closed/wall/wasteplanet = 2,
/turf/closed/wall/rust/wasteplanet = 6
)

flora_spawn_list = list(
Expand Down Expand Up @@ -381,10 +381,10 @@
/turf/open/floor/plating/wasteplanet = 4
)
closed_turf_types = list(
/turf/closed/wall/r_wall = 1,
/turf/closed/wall/r_wall/rust = 1,
/turf/closed/wall = 5,
/turf/closed/wall/rust = 10
/turf/closed/wall/r_wall/wasteplanet = 1,
/turf/closed/wall/r_wall/rust/wasteplanet = 1,
/turf/closed/wall/wasteplanet = 5,
/turf/closed/wall/rust/wasteplanet = 10
)
flora_spawn_list = list(
/obj/effect/spawner/lootdrop/waste/mechwreck = 40,
Expand Down Expand Up @@ -450,3 +450,46 @@
/obj/effect/spawner/minefield/manhack = 2
)
feature_spawn_chance = 2 //hivebot biomes should have their dongles

/datum/biome/cave/waste/conc //da concrete jungle baybee
open_turf_types = list(
/turf/open/floor/concrete/wasteplanet = 10,
/turf/open/floor/concrete/reinforced/wasteplanet = 4,
/turf/open/floor/concrete/pavement/wasteplanet = 4
)
closed_turf_types = list(
/turf/closed/wall/concrete/wasteplanet = 15,
/turf/closed/wall/concrete/reinforced/wasteplanet = 3
)

flora_spawn_list = list(
/obj/effect/spawner/lootdrop/waste/mechwreck = 20,
/obj/effect/spawner/lootdrop/waste/trash = 90,
/obj/effect/spawner/lootdrop/waste/radiation = 16,
/obj/structure/reagent_dispensers/fueltank = 10,
/obj/structure/reagent_dispensers/watertank = 20,
/obj/item/stack/cable_coil/cut = 50,
/obj/structure/closet/crate/secure/loot = 3,
/obj/effect/spawner/lootdrop/waste/atmos_can = 5,
/obj/effect/spawner/lootdrop/waste/atmos_can/rare = 1,
/obj/effect/spawner/lootdrop/waste/salvageable = 30,
/obj/effect/spawner/lootdrop/maintenance = 2,
/obj/effect/spawner/lootdrop/maintenance/two = 5,
/obj/effect/spawner/lootdrop/maintenance/three = 10,
/obj/effect/spawner/lootdrop/waste/salvageable = 40,
)
mob_spawn_list = list(
/mob/living/simple_animal/hostile/hivebot/wasteplanet/strong = 80,
/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged = 50,
/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged/rapid = 50,
/mob/living/simple_animal/bot/firebot/rockplanet = 15,
/mob/living/simple_animal/bot/secbot/ed209/rockplanet = 3,
/mob/living/simple_animal/hostile/abandoned_minebot = 15,
/mob/living/simple_animal/bot/floorbot/rockplanet = 15,
/obj/structure/spawner/hivebot = 35
)

flora_spawn_chance = 30
feature_spawn_chance = 8
mob_spawn_chance = 5

71 changes: 71 additions & 0 deletions code/game/turfs/open/floor/plating/wasteplanet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,43 @@
initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
planetary_atmos = TRUE

//cement

/turf/open/floor/concrete/wasteplanet
initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
planetary_atmos = TRUE
baseturfs = /turf/open/floor/plating/asteroid/wasteplanet

/turf/open/floor/concrete/wasteplanet/Initialize()
. = ..()
icon_state = pick(list(
"conc_smooth",
"conc_slab_1",
"conc_slab_2",
"conc_slab_3",
"conc_slab_4",
"conc_tiles"
))

/turf/open/floor/concrete/wasteplanet/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent)
return

/turf/open/floor/concrete/reinforced/wasteplanet
initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
planetary_atmos = TRUE
baseturfs = /turf/open/floor/plating/asteroid/wasteplanet

/turf/open/floor/concrete/reinforced/wasteplanet/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent)
return

/turf/open/floor/concrete/pavement/wasteplanet
initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
planetary_atmos = TRUE
baseturfs = /turf/open/floor/plating/asteroid/wasteplanet

/turf/open/floor/concrete/pavement/wasteplanet/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent)
return

//open turfs then open lits.

/turf/open/floor/plating/wasteplanet/lit
Expand Down Expand Up @@ -94,3 +131,37 @@
light_range = 2
light_power = 0.2
light_color = LIGHT_COLOR_FLARE

/turf/open/floor/concrete/wasteplanet/lit
light_range = 2
light_power = 0.2
light_color = LIGHT_COLOR_FLARE

/turf/open/floor/concrete/reinforced/wasteplanet/lit
light_range = 2
light_power = 0.2
light_color = LIGHT_COLOR_FLARE

/turf/open/floor/concrete/pavement/wasteplanet/lit
light_range = 2
light_power = 0.2
light_color = LIGHT_COLOR_FLARE

//closed turfs are a thing
/turf/closed/wall/r_wall/wasteplanet
baseturfs = /turf/open/floor/plating/wasteplanet

/turf/closed/wall/r_wall/rust/wasteplanet
baseturfs = /turf/open/floor/plating/wasteplanet/rust

/turf/closed/wall/wasteplanet
baseturfs = /turf/open/floor/plating/wasteplanet

/turf/closed/wall/rust/wasteplanet
baseturfs = /turf/open/floor/plating/wasteplanet/rust

/turf/closed/wall/concrete/wasteplanet
baseturfs = /turf/open/floor/concrete/wasteplanet

/turf/closed/wall/concrete/reinforced/wasteplanet
baseturfs = /turf/open/floor/concrete/wasteplanet

0 comments on commit 15525b0

Please sign in to comment.