From 12b4e6cf5c681959019f201481366a9b07f97959 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Thu, 24 Oct 2024 18:33:34 -0400 Subject: [PATCH] fix zoo scenario spawn (#77237) * zoo ZONE_START_POINT * Update start_locations.json * Update scenarios.json * fix DinoMod * fix Xedra * Fix Limb WIP mod * Fix deadly bites mod * Update scenarios.json --- data/json/mapgen/zoo.json | 1 + data/json/scenarios.json | 33 +++++++++---------------- data/json/start_locations.json | 10 ++------ data/mods/DinoMod/scenarios.json | 15 ++++------- data/mods/Limb_WIP/scenarios.json | 3 +-- data/mods/MindOverMatter/scenarios.json | 3 +-- data/mods/Xedra_Evolved/scenario.json | 3 +-- data/mods/deadly_bites/scenarios.json | 3 +-- 8 files changed, 23 insertions(+), 48 deletions(-) diff --git a/data/json/mapgen/zoo.json b/data/json/mapgen/zoo.json index 192fa4d009f05..372dadb544817 100644 --- a/data/json/mapgen/zoo.json +++ b/data/json/mapgen/zoo.json @@ -251,6 +251,7 @@ "É": { "vehicle": "parking_garage", "chance": 25, "rotation": 90 }, "Ú": { "vehicle": "VETS", "chance": 35, "rotation": 90 } }, + "place_zones": [ { "type": "ZONE_START_POINT", "faction": "your_followers", "x": [ 36, 37 ], "y": [ 64, 65 ] } ], "place_signs": [ { "signage": "Authorized access only", "x": 0, "y": 15 }, { "signage": " Zoo", "x": 6, "y": 0 } ] } }, diff --git a/data/json/scenarios.json b/data/json/scenarios.json index b2c3dc0902c6e..8a90310127057 100644 --- a/data/json/scenarios.json +++ b/data/json/scenarios.json @@ -45,8 +45,7 @@ "sloc_furniture_store", "sloc_library", "sloc_bookstore", - "sloc_zoo_giftshop", - "sloc_zoo_cages", + "sloc_zoo_cafeteria", "sloc_golfcourse_mid_course", "sloc_golfcourse_clubhouse", "sloc_church", @@ -108,8 +107,7 @@ "sloc_furniture_store", "sloc_library", "sloc_bookstore", - "sloc_zoo_giftshop", - "sloc_zoo_cages", + "sloc_zoo_cafeteria", "sloc_golfcourse_mid_course", "sloc_golfcourse_clubhouse", "sloc_church", @@ -176,8 +174,7 @@ "sloc_furniture_store", "sloc_library", "sloc_bookstore", - "sloc_zoo_giftshop", - "sloc_zoo_cages", + "sloc_zoo_cafeteria", "sloc_golfcourse_mid_course", "sloc_golfcourse_clubhouse", "sloc_church", @@ -221,8 +218,7 @@ "sloc_furniture_store", "sloc_library", "sloc_bookstore", - "sloc_zoo_giftshop", - "sloc_zoo_cages", + "sloc_zoo_cafeteria", "sloc_golfcourse_mid_course", "sloc_golfcourse_clubhouse", "sloc_church", @@ -274,8 +270,7 @@ "sloc_furniture_store", "sloc_library", "sloc_bookstore", - "sloc_zoo_giftshop", - "sloc_zoo_cages", + "sloc_zoo_cafeteria", "sloc_golfcourse_mid_course", "sloc_golfcourse_clubhouse", "sloc_church", @@ -323,8 +318,7 @@ "sloc_furniture_store", "sloc_library", "sloc_bookstore", - "sloc_zoo_giftshop", - "sloc_zoo_cages", + "sloc_zoo_cafeteria", "sloc_golfcourse_mid_course", "sloc_golfcourse_clubhouse", "sloc_church", @@ -368,8 +362,7 @@ "sloc_furniture_store", "sloc_library", "sloc_bookstore", - "sloc_zoo_giftshop", - "sloc_zoo_cages", + "sloc_zoo_cafeteria", "sloc_golfcourse_clubhouse", "sloc_church", "sloc_cemetery", @@ -424,8 +417,7 @@ "sloc_furniture_store", "sloc_library", "sloc_bookstore", - "sloc_zoo_giftshop", - "sloc_zoo_cages", + "sloc_zoo_cafeteria", "sloc_golfcourse_mid_course", "sloc_golfcourse_clubhouse", "sloc_church", @@ -1146,8 +1138,7 @@ "sloc_furniture_store", "sloc_library", "sloc_bookstore", - "sloc_zoo_giftshop", - "sloc_zoo_cages", + "sloc_zoo_cafeteria", "sloc_church", "sloc_fire_station", "sloc_police", @@ -1215,8 +1206,7 @@ "sloc_furniture_store", "sloc_library", "sloc_bookstore", - "sloc_zoo_giftshop", - "sloc_zoo_cages", + "sloc_zoo_cafeteria", "sloc_golfcourse_mid_course", "sloc_golfcourse_clubhouse", "sloc_church", @@ -1262,8 +1252,7 @@ "sloc_furniture_store", "sloc_library", "sloc_bookstore", - "sloc_zoo_giftshop", - "sloc_zoo_cages", + "sloc_zoo_cafeteria", "sloc_church", "sloc_fire_station", "sloc_police", diff --git a/data/json/start_locations.json b/data/json/start_locations.json index 1c1c3d8f0444b..7f2a3948103d0 100644 --- a/data/json/start_locations.json +++ b/data/json/start_locations.json @@ -561,16 +561,10 @@ }, { "type": "start_location", - "id": "sloc_zoo_giftshop", - "name": "Zoo (Giftshop)", + "id": "sloc_zoo_cafeteria", + "name": "Zoo (Cafeteria)", "terrain": [ "zoo_0_1" ] }, - { - "type": "start_location", - "id": "sloc_zoo_cages", - "name": "Zoo (Cages)", - "terrain": [ "zoo_1_1" ] - }, { "type": "start_location", "id": "sloc_golfcourse_mid_course", diff --git a/data/mods/DinoMod/scenarios.json b/data/mods/DinoMod/scenarios.json index 08e28cf4f887d..8514e454dd65d 100644 --- a/data/mods/DinoMod/scenarios.json +++ b/data/mods/DinoMod/scenarios.json @@ -22,8 +22,7 @@ "sloc_furniture_store", "sloc_library", "sloc_bookstore", - "sloc_zoo_giftshop", - "sloc_zoo_cages", + "sloc_zoo_cafeteria", "sloc_dinozoo_cafeteria", "sloc_golfcourse_mid_course", "sloc_golfcourse_clubhouse", @@ -45,8 +44,7 @@ "sloc_furniture_store", "sloc_library", "sloc_bookstore", - "sloc_zoo_giftshop", - "sloc_zoo_cages", + "sloc_zoo_cafeteria", "sloc_dinozoo_cafeteria", "sloc_golfcourse_mid_course", "sloc_golfcourse_clubhouse", @@ -70,8 +68,7 @@ "sloc_furniture_store", "sloc_library", "sloc_bookstore", - "sloc_zoo_giftshop", - "sloc_zoo_cages", + "sloc_zoo_cafeteria", "sloc_dinozoo_cafeteria", "sloc_golfcourse_mid_course", "sloc_golfcourse_clubhouse", @@ -93,8 +90,7 @@ "sloc_furniture_store", "sloc_library", "sloc_bookstore", - "sloc_zoo_giftshop", - "sloc_zoo_cages", + "sloc_zoo_cafeteria", "sloc_dinozoo_cafeteria", "sloc_golfcourse_mid_course", "sloc_golfcourse_clubhouse", @@ -120,8 +116,7 @@ "sloc_furniture_store", "sloc_library", "sloc_bookstore", - "sloc_zoo_giftshop", - "sloc_zoo_cages", + "sloc_zoo_cafeteria", "sloc_dinozoo_cafeteria", "sloc_golfcourse_mid_course", "sloc_golfcourse_clubhouse", diff --git a/data/mods/Limb_WIP/scenarios.json b/data/mods/Limb_WIP/scenarios.json index ffed4119bcaa7..7b67cfce9f796 100644 --- a/data/mods/Limb_WIP/scenarios.json +++ b/data/mods/Limb_WIP/scenarios.json @@ -19,8 +19,7 @@ "sloc_furniture_store", "sloc_library", "sloc_bookstore", - "sloc_zoo_giftshop", - "sloc_zoo_cages", + "sloc_zoo_cafeteria", "sloc_golfcourse_mid_course", "sloc_golfcourse_clubhouse", "sloc_church", diff --git a/data/mods/MindOverMatter/scenarios.json b/data/mods/MindOverMatter/scenarios.json index f1b1021700a96..4fcb7351f8f36 100644 --- a/data/mods/MindOverMatter/scenarios.json +++ b/data/mods/MindOverMatter/scenarios.json @@ -53,8 +53,7 @@ "sloc_furniture_store", "sloc_library", "sloc_bookstore", - "sloc_zoo_giftshop", - "sloc_zoo_cages", + "sloc_zoo_cafeteria", "sloc_golfcourse_mid_course", "sloc_golfcourse_clubhouse", "sloc_church", diff --git a/data/mods/Xedra_Evolved/scenario.json b/data/mods/Xedra_Evolved/scenario.json index 95c696c09d25e..529fe20cacab6 100644 --- a/data/mods/Xedra_Evolved/scenario.json +++ b/data/mods/Xedra_Evolved/scenario.json @@ -87,8 +87,7 @@ "sloc_furniture_store", "sloc_library", "sloc_bookstore", - "sloc_zoo_giftshop", - "sloc_zoo_cages", + "sloc_zoo_cafeteria", "sloc_golfcourse_mid_course", "sloc_golfcourse_clubhouse", "sloc_church", diff --git a/data/mods/deadly_bites/scenarios.json b/data/mods/deadly_bites/scenarios.json index adfc45846e497..d159bc32c246c 100644 --- a/data/mods/deadly_bites/scenarios.json +++ b/data/mods/deadly_bites/scenarios.json @@ -16,8 +16,7 @@ "sloc_furniture_store", "sloc_library", "sloc_bookstore", - "sloc_zoo_giftshop", - "sloc_zoo_cages", + "sloc_zoo_cafeteria", "sloc_golfcourse_mid_course", "sloc_golfcourse_clubhouse", "sloc_church",