Corrects mining export names on icebox (#91145)

## About The Pull Request

Closes #90666, converts minetypes to defines, gives icebox a minetype
define which could also be used later to give mining suits some fur or
something.

## Changelog
🆑
fix: Icebox artifact exports no longer claim they're from a lava planet
/🆑
This commit is contained in:
SmArtKar
2025-05-16 23:27:49 +02:00
committed by GitHub
parent 84118874f2
commit 29d9626d3d
5 changed files with 29 additions and 8 deletions

View File

@@ -40,7 +40,7 @@
"No Parallax": true "No Parallax": true
} }
], ],
"minetype": "none", "minetype": "ice",
"blacklist_file": "iceruinblacklist.txt", "blacklist_file": "iceruinblacklist.txt",
"job_changes": { "job_changes": {
"Captain": { "Captain": {

View File

@@ -242,3 +242,8 @@ Always compile, always use that verb, and always make sure that it works for wha
#define AWAYSTART_SNOWCABIN "AWAYSTART_SNOWCABIN" #define AWAYSTART_SNOWCABIN "AWAYSTART_SNOWCABIN"
#define AWAYSTART_SNOWDIN "AWAYSTART_SNOWDIN" #define AWAYSTART_SNOWDIN "AWAYSTART_SNOWDIN"
#define AWAYSTART_UNDERGROUND "AWAYSTART_UNDERGROUND" #define AWAYSTART_UNDERGROUND "AWAYSTART_UNDERGROUND"
// Minetypes for maps
#define MINETYPE_NONE "none"
#define MINETYPE_LAVALAND "lavaland"
#define MINETYPE_ICE "ice"

View File

@@ -448,9 +448,9 @@ Used by the AI doomsday and the self-destruct nuke.
#ifndef LOWMEMORYMODE #ifndef LOWMEMORYMODE
if(current_map.minetype == "lavaland") if(current_map.minetype == MINETYPE_LAVALAND)
LoadGroup(FailedZs, "Lavaland", "map_files/Mining", "Lavaland.dmm", default_traits = ZTRAITS_LAVALAND) LoadGroup(FailedZs, "Lavaland", "map_files/Mining", "Lavaland.dmm", default_traits = ZTRAITS_LAVALAND)
else if (!isnull(current_map.minetype) && current_map.minetype != "none") else if (!isnull(current_map.minetype) && current_map.minetype != MINETYPE_NONE && current_map.minetype != MINETYPE_ICE)
INIT_ANNOUNCE("WARNING: An unknown minetype '[current_map.minetype]' was set! This is being ignored! Update the maploader code!") INIT_ANNOUNCE("WARNING: An unknown minetype '[current_map.minetype]' was set! This is being ignored! Update the maploader code!")
#endif #endif
@@ -511,7 +511,7 @@ GLOBAL_LIST_EMPTY(the_station_areas)
/datum/controller/subsystem/mapping/proc/preloadRuinTemplates() /datum/controller/subsystem/mapping/proc/preloadRuinTemplates()
// Still supporting bans by filename // Still supporting bans by filename
var/list/banned = generateMapList("spaceruinblacklist.txt") var/list/banned = generateMapList("spaceruinblacklist.txt")
if(current_map.minetype == "lavaland") if(current_map.minetype == MINETYPE_LAVALAND)
banned += generateMapList("lavaruinblacklist.txt") banned += generateMapList("lavaruinblacklist.txt")
else if(current_map.blacklist_file) else if(current_map.blacklist_file)
banned += generateMapList(current_map.blacklist_file) banned += generateMapList(current_map.blacklist_file)

View File

@@ -31,7 +31,7 @@
var/planetary = FALSE var/planetary = FALSE
///The type of mining Z-level that should be loaded. ///The type of mining Z-level that should be loaded.
var/minetype = "lavaland" var/minetype = MINETYPE_LAVALAND
///If no minetype is set, this will be the blacklist file used ///If no minetype is set, this will be the blacklist file used
var/blacklist_file var/blacklist_file

View File

@@ -1,9 +1,26 @@
//Tendril chest artifacts and ruin loot. //Tendril chest artifacts and ruin loot.
//Consumable or one-use items like the magic D20 and gluttony's blessing are omitted //Consumable or one-use items like the magic D20 and gluttony's blessing are omitted
/datum/export/lavaland
unit_name = "lava planet artifact"
/// Prefix to add to our unit name after generation
var/prefix = null
/datum/export/lavaland/New()
. = ..()
switch (SSmapping.current_map.minetype)
if (MINETYPE_NONE)
unit_name = "unknown artifact"
if (MINETYPE_LAVALAND)
unit_name = "lava planet artifact"
if (MINETYPE_ICE)
unit_name = "ice moon artifact"
if (prefix)
unit_name = "[prefix] [unit_name]"
/datum/export/lavaland/minor /datum/export/lavaland/minor
cost = CARGO_CRATE_VALUE * 20 cost = CARGO_CRATE_VALUE * 20
unit_name = "minor lava planet artifact" prefix = "minor"
export_types = list( export_types = list(
/obj/item/immortality_talisman, /obj/item/immortality_talisman,
/obj/item/book_of_babel, /obj/item/book_of_babel,
@@ -31,7 +48,6 @@
/datum/export/lavaland/major //valuable chest/ruin loot, minor megafauna loot /datum/export/lavaland/major //valuable chest/ruin loot, minor megafauna loot
cost = CARGO_CRATE_VALUE * 40 cost = CARGO_CRATE_VALUE * 40
unit_name = "lava planet artifact"
export_types = list( export_types = list(
/obj/item/dragons_blood, /obj/item/dragons_blood,
/obj/item/guardian_creator/miner, /obj/item/guardian_creator/miner,
@@ -48,7 +64,7 @@
/datum/export/lavaland/megafauna /datum/export/lavaland/megafauna
cost = CARGO_CRATE_VALUE * 80 cost = CARGO_CRATE_VALUE * 80
unit_name = "major lava planet artifact" prefix = "major"
export_types = list( export_types = list(
/obj/item/hierophant_club, /obj/item/hierophant_club,
/obj/item/melee/cleaving_saw, /obj/item/melee/cleaving_saw,