From 1bbd6fd340a9d8dce7bf9ebc04e79f68c00729e0 Mon Sep 17 00:00:00 2001 From: private-tristan <54422837+private-tristan@users.noreply.github.com> Date: Thu, 26 Dec 2024 13:55:14 -0500 Subject: [PATCH] Allows Chances Claim [Forecon] to be selected (#617) --- code/__DEFINES/__game.dm | 1 + code/modules/cm_marines/equipment/maps.dm | 1 + map_config/maps.txt | 4 ++- maps/lv522_chances_claim.json | 2 +- maps/lv522_chances_claim_forecon.json | 38 +++++++++++++++++++++++ 5 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 maps/lv522_chances_claim_forecon.json diff --git a/code/__DEFINES/__game.dm b/code/__DEFINES/__game.dm index 9a2c68e0d50..0b9be19711d 100644 --- a/code/__DEFINES/__game.dm +++ b/code/__DEFINES/__game.dm @@ -35,6 +35,7 @@ #define MAP_ICE_COLONY_V3 "Shivas Snowball" //Ice Rework, low pop enabled. #define MAP_RUNTIME "USS Runtime" #define MAP_LV522_CHANCES_CLAIM "LV-522 Chance's Claim" // Highpop Only +#define MAP_LV522_CHANCES_CLAIM_FORECON "LV-522 Chance's Claim Forecon" #define MAP_NEW_VARADERO "New Varadero"//ice colony underground but as its own map #define MAP_NEW_VARADERO_REPAIRED "New Varadero Repaired" #define MAP_CHINOOK "Chinook 91 GSO" //admin level diff --git a/code/modules/cm_marines/equipment/maps.dm b/code/modules/cm_marines/equipment/maps.dm index a6dd0660f44..fb60e78c47d 100644 --- a/code/modules/cm_marines/equipment/maps.dm +++ b/code/modules/cm_marines/equipment/maps.dm @@ -164,6 +164,7 @@ GLOBAL_LIST_INIT_TYPED(map_type_list, /obj/item/map, setup_all_maps()) MAP_CORSAT = new /obj/item/map/corsat(), MAP_KUTJEVO = new /obj/item/map/kutjevo_map(), MAP_LV522_CHANCES_CLAIM = new /obj/item/map/lv522_map(), + MAP_LV522_CHANCES_CLAIM_FORECON = new /obj/item/map/lv522_map(), MAP_NEW_VARADERO = new /obj/item/map/new_varadero(), MAP_NEW_VARADERO_REPAIRED = new /obj/item/map/new_varadero(), MAP_DERELICT_ALMAYER = new /obj/item/map/almayer(), diff --git a/map_config/maps.txt b/map_config/maps.txt index bf3570e7f52..efeba0d0b4f 100644 --- a/map_config/maps.txt +++ b/map_config/maps.txt @@ -57,7 +57,9 @@ map sorokyne_strata endmap map lv522_chances_claim - minplayers 130 +endmap + +map lv522_chances_claim_forecon endmap map new_varadero diff --git a/maps/lv522_chances_claim.json b/maps/lv522_chances_claim.json index dcaeaa5af5a..6100b977908 100644 --- a/maps/lv522_chances_claim.json +++ b/maps/lv522_chances_claim.json @@ -13,7 +13,7 @@ 0.0 ], "survivor_message": "You are USCM Force Reconnaissance (FORECON) marine from the USS Hanyut, stranded on this planet after your team was wiped out while investigating the distress signal. With your pilot dead along with the majority of your unit, you and your team have been running and gunning to survive... but with supplies low and food running out maybe your only means of survival is to move west to the crashed dropship to salvage anything useful.", - "announce_text": "Pan-Pan. This is the commanding officer of the USS Hanyut, USCMC FORECON. We are currently grounded on planet LV-522 in the immediate area of Chance's Claim. We are unable to contact the Hanyut and our dropships are unable to take off at this time. We are requesting assistance from any nearby vessels; this broadcast is set to repeat every 24 hours.", + "announce_text": "Now orbiting the planet LV-522, above the colony Chance's Claim.", "map_item_type": "/obj/item/map/lv522_map", "monkey_types": [ "neaera", diff --git a/maps/lv522_chances_claim_forecon.json b/maps/lv522_chances_claim_forecon.json new file mode 100644 index 00000000000..16a0bc9fa86 --- /dev/null +++ b/maps/lv522_chances_claim_forecon.json @@ -0,0 +1,38 @@ +{ + "map_name": "LV-522 Chance's Claim Forecon", + "short_name": "Chance's Claim", + "map_path": "map_files/LV522_Chances_Claim_FORECON", + "map_file": "LV522_Chances_Claim_FORECON.dmm", + "webmap_url": "LV552", + "weather_holder": "/datum/weather_ss_map_holder/lv522_chances_claim", + "defcon_triggers": [ + 3300, + 2100, + 1450, + 580, + 0.0 + ], + "survivor_message": "You are USCM Force Reconnaissance (FORECON) marine from the USS Hanyut, stranded on this planet after your team was wiped out while investigating the distress signal. With your pilot dead along with the majority of your unit, you and your team have been running and gunning to survive... but with supplies low and food running out maybe your only means of survival is to move west to the crashed dropship to salvage anything useful.", + "announce_text": "Pan-Pan. This is the commanding officer of the USS Hanyut, USCMC FORECON. We are currently grounded on planet LV-522 in the immediate area of Chance's Claim. We are unable to contact the Hanyut and our dropships are unable to take off at this time. We are requesting assistance from any nearby vessels; this broadcast is set to repeat every 24 hours.", + "map_item_type": "/obj/item/map/lv522_map", + "monkey_types": [ + "neaera", + "stok" + ], + "environment_traits": { "Fog": true }, + "traits": [{ "Ground": true }], + "xvx_hives": { + "xeno_hive_alpha": 0, + "xeno_hive_bravo": 0, + "xeno_hive_charlie": 0, + "xeno_hive_delta": 0 + }, + "camouflage": "jungle", + "gamemodes": [ + "Distress Signal", + "Hunter Games", + "Hive Wars", + "Faction Clash", + "Infection" + ] +}