From 5f517f64705493e6c9de4bcbecf0a40fa88fed74 Mon Sep 17 00:00:00 2001 From: forwardslashN <150570209+FslashN@users.noreply.github.com> Date: Sun, 18 Feb 2024 17:23:20 -0600 Subject: [PATCH 1/3] Update ice_colony_v2.json Fixes the runtime where the map JSON failed to load due to a bad item path. --- maps/ice_colony_v2.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maps/ice_colony_v2.json b/maps/ice_colony_v2.json index bc618bd825..dcd2c79fa9 100644 --- a/maps/ice_colony_v2.json +++ b/maps/ice_colony_v2.json @@ -22,7 +22,7 @@ 0.0 ], "survivor_message": "You are a survivor of the attack on the ice habitat. You worked or lived on the colony, and managed to avoid the alien attacks... until now.", - "map_item_type": "/obj/item/map/ice_colony_map/v2", + "map_item_type": "/obj/item/map/ice_colony_map", "announce_text": "An automated distress signal has been received from archaeology site \"Shiva's Snowball\", on border ice world \"Ifrit\". A response team from the ###SHIPNAME### will be dispatched shortly to investigate.", "monkey_types": [ "yiren" From b048835c3d6d8653ee7c3762f4583fcc64267298 Mon Sep 17 00:00:00 2001 From: forwardslashN <150570209+FslashN@users.noreply.github.com> Date: Sun, 18 Feb 2024 23:44:30 -0600 Subject: [PATCH 2/3] Update ice_colony_v2.json Apparently the v2 map does exist as an item, but it has a weird underscore. --- maps/ice_colony_v2.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maps/ice_colony_v2.json b/maps/ice_colony_v2.json index dcd2c79fa9..b29cfbf9d7 100644 --- a/maps/ice_colony_v2.json +++ b/maps/ice_colony_v2.json @@ -22,7 +22,7 @@ 0.0 ], "survivor_message": "You are a survivor of the attack on the ice habitat. You worked or lived on the colony, and managed to avoid the alien attacks... until now.", - "map_item_type": "/obj/item/map/ice_colony_map", + "map_item_type": "/obj/item/map/ice_colony_map_/v2", "announce_text": "An automated distress signal has been received from archaeology site \"Shiva's Snowball\", on border ice world \"Ifrit\". A response team from the ###SHIPNAME### will be dispatched shortly to investigate.", "monkey_types": [ "yiren" From d9cf9d1e25d66ce1ea1492f421d30559c7f42aa3 Mon Sep 17 00:00:00 2001 From: forwardslashN <150570209+FslashN@users.noreply.github.com> Date: Mon, 19 Feb 2024 04:33:36 -0600 Subject: [PATCH 3/3] More Updates Looks like the failure was due to the map name not properly reading as the define didn't match the JSON. What a headache. --- code/__DEFINES/__game.dm | 2 +- code/modules/cm_marines/equipment/maps.dm | 4 ++-- maps/ice_colony_v2.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/__DEFINES/__game.dm b/code/__DEFINES/__game.dm index 2bd861f69f..59c2604ed3 100644 --- a/code/__DEFINES/__game.dm +++ b/code/__DEFINES/__game.dm @@ -36,7 +36,7 @@ block( \ #define MAP_CORSAT "CORSAT" // Highpop only #define MAP_KUTJEVO "Kutjevo Refinery" #define MAP_ICE_COLONY_V1 "Ice Colony Classic" -#define MAP_ICE_COLONY_V2 "Ice Colony V2" +#define MAP_ICE_COLONY_V2 "Ice Colony v2" #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 diff --git a/code/modules/cm_marines/equipment/maps.dm b/code/modules/cm_marines/equipment/maps.dm index d8116d145b..b611218dda 100644 --- a/code/modules/cm_marines/equipment/maps.dm +++ b/code/modules/cm_marines/equipment/maps.dm @@ -70,7 +70,7 @@ /obj/item/map/ice_colony_map/v1 html_link = "https://cm-ss13.com/w/images/8/88/Ice_V1.png" -/obj/item/map/ice_colony_map_/v2 +/obj/item/map/ice_colony_map/v2 html_link = "https://cm-ss13.com/w/images/c/cf/Ice_Colony_v2.png" /obj/item/map/ice_colony_map_v3 @@ -152,7 +152,7 @@ GLOBAL_LIST_INIT_TYPED(map_type_list, /obj/item/map, setup_all_maps()) MAP_LV_624 = new /obj/item/map/lazarus_landing_map(), MAP_ICE_COLONY = new /obj/item/map/ice_colony_map(), MAP_ICE_COLONY_V1 = new /obj/item/map/ice_colony_map/v1(), - MAP_ICE_COLONY_V2 = new /obj/item/map/ice_colony_map_/v2(), + MAP_ICE_COLONY_V2 = new /obj/item/map/ice_colony_map/v2(), MAP_ICE_COLONY_V3 = new /obj/item/map/ice_colony_map_v3(), MAP_WHISKEY_OUTPOST = new /obj/item/map/whiskey_outpost_map(), MAP_BIG_RED = new /obj/item/map/big_red_map(), diff --git a/maps/ice_colony_v2.json b/maps/ice_colony_v2.json index b29cfbf9d7..bc618bd825 100644 --- a/maps/ice_colony_v2.json +++ b/maps/ice_colony_v2.json @@ -22,7 +22,7 @@ 0.0 ], "survivor_message": "You are a survivor of the attack on the ice habitat. You worked or lived on the colony, and managed to avoid the alien attacks... until now.", - "map_item_type": "/obj/item/map/ice_colony_map_/v2", + "map_item_type": "/obj/item/map/ice_colony_map/v2", "announce_text": "An automated distress signal has been received from archaeology site \"Shiva's Snowball\", on border ice world \"Ifrit\". A response team from the ###SHIPNAME### will be dispatched shortly to investigate.", "monkey_types": [ "yiren"