Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allows Chances Claim [Forecon] to be selected #617

Merged
merged 1 commit into from
Dec 26, 2024
Merged

Allows Chances Claim [Forecon] to be selected #617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions code/__DEFINES/__game.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions code/modules/cm_marines/equipment/maps.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
4 changes: 3 additions & 1 deletion map_config/maps.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,9 @@ map sorokyne_strata
endmap

map lv522_chances_claim
minplayers 130
endmap

map lv522_chances_claim_forecon
endmap

map new_varadero
Expand Down
2 changes: 1 addition & 1 deletion maps/lv522_chances_claim.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
38 changes: 38 additions & 0 deletions maps/lv522_chances_claim_forecon.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"map_name": "LV-522 Chance's Claim Forecon",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just leave this without the forecon as I believe it shows up as the map name in game and I think that'd be a bit awkward.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But that would result in 2 maps named Lv-522 Chance's Claim, and afaik the map picker uses the map name, resulting in 2 names, is there any way you know to avoid this?

"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"
]
}
Loading