From 0d16e8d698045e0c67c01271e98c19f6ca35df6c Mon Sep 17 00:00:00 2001 From: Ramza13 <52087122+Ramza13@users.noreply.github.com> Date: Sun, 1 May 2022 17:41:16 -0400 Subject: [PATCH] Remove json changes --- data/json/mapgen/nested/shelter_nested.json | 36 +++++++++++++++---- data/json/mapgen/shelter.json | 12 +++++-- data/json/npcs/TALK_COMPUTER.json | 8 ++--- .../overmap/overmap_special/specials.json | 28 +++------------ .../No_Hope/Mapgen/nested/shelter_nested.json | 36 +++++++++++++++---- data/mods/TEST_DATA/mapgen-test.json | 4 +-- doc/MAPGEN.md | 4 +-- 7 files changed, 82 insertions(+), 46 deletions(-) diff --git a/data/json/mapgen/nested/shelter_nested.json b/data/json/mapgen/nested/shelter_nested.json index b55595e6072db..d357d5517338a 100644 --- a/data/json/mapgen/nested/shelter_nested.json +++ b/data/json/mapgen/nested/shelter_nested.json @@ -33,7 +33,11 @@ ], "furniture": { "b": "f_bench", "c": "f_cupboard", "l": "f_locker", "S": "f_sink", "%": "f_trashcan", "6": "f_console" }, "computers": { - "6": { "name": "Evac shelter computer", "eocs": [ "EOC_EVAC_CENTER_COMPUTER" ], "chat_topics": [ "COMP_EVAC_CENTER_MAIN" ] } + "6": { + "name": "Evac shelter computer", + "eocs": [ "EOC_REFUGEE_CENTER_COMPUTER" ], + "chat_topics": [ "COMP_REFUGEE_CENTER_MAIN" ] + } }, "items": { "l": { "item": "SUS_evac_shelter_locker", "chance": 75 }, "c": { "item": "SUS_evac_shelter_cabinet", "chance": 50 } } } @@ -85,7 +89,11 @@ "x": "f_console_broken" }, "computers": { - "6": { "name": "Evac shelter computer", "eocs": [ "EOC_EVAC_CENTER_COMPUTER" ], "chat_topics": [ "COMP_EVAC_CENTER_MAIN" ] } + "6": { + "name": "Evac shelter computer", + "eocs": [ "EOC_REFUGEE_CENTER_COMPUTER" ], + "chat_topics": [ "COMP_REFUGEE_CENTER_MAIN" ] + } }, "items": { "l": { "item": "SUS_evac_shelter_locker_used", "chance": 75 }, @@ -189,7 +197,11 @@ "furniture": { "b": "f_bench", "c": "f_cupboard", "l": "f_locker", "S": "f_sink", "%": "f_trashcan", "6": "f_console" }, "items": { "l": { "item": "SUS_evac_shelter_locker", "chance": 70 }, "c": { "item": "SUS_evac_shelter_cabinet", "chance": 50 } }, "computers": { - "6": { "name": "Evac shelter computer", "eocs": [ "EOC_EVAC_CENTER_COMPUTER" ], "chat_topics": [ "COMP_EVAC_CENTER_MAIN" ] } + "6": { + "name": "Evac shelter computer", + "eocs": [ "EOC_REFUGEE_CENTER_COMPUTER" ], + "chat_topics": [ "COMP_REFUGEE_CENTER_MAIN" ] + } } } }, @@ -240,7 +252,11 @@ "6": "f_console" }, "computers": { - "6": { "name": "Evac shelter computer", "eocs": [ "EOC_EVAC_CENTER_COMPUTER" ], "chat_topics": [ "COMP_EVAC_CENTER_MAIN" ] } + "6": { + "name": "Evac shelter computer", + "eocs": [ "EOC_REFUGEE_CENTER_COMPUTER" ], + "chat_topics": [ "COMP_REFUGEE_CENTER_MAIN" ] + } }, "items": { "l": { "item": "SUS_evac_shelter_locker_used", "chance": 70 }, @@ -339,7 +355,11 @@ ], "furniture": { "b": "f_bench", "c": "f_cupboard", "l": "f_locker", "S": "f_sink", "%": "f_trashcan", "6": "f_console" }, "computers": { - "6": { "name": "Evac shelter computer", "eocs": [ "EOC_EVAC_CENTER_COMPUTER" ], "chat_topics": [ "COMP_EVAC_CENTER_MAIN" ] } + "6": { + "name": "Evac shelter computer", + "eocs": [ "EOC_REFUGEE_CENTER_COMPUTER" ], + "chat_topics": [ "COMP_REFUGEE_CENTER_MAIN" ] + } }, "items": { "l": { "item": "SUS_evac_shelter_locker", "chance": 70 }, "c": { "item": "SUS_evac_shelter_cabinet", "chance": 50 } } } @@ -392,7 +412,11 @@ "x": "f_console_broken" }, "computers": { - "6": { "name": "Evac shelter computer", "eocs": [ "EOC_EVAC_CENTER_COMPUTER" ], "chat_topics": [ "COMP_EVAC_CENTER_MAIN" ] } + "6": { + "name": "Evac shelter computer", + "eocs": [ "EOC_REFUGEE_CENTER_COMPUTER" ], + "chat_topics": [ "COMP_REFUGEE_CENTER_MAIN" ] + } }, "items": { "l": { "item": "SUS_evac_shelter_locker_used", "chance": 70 }, diff --git a/data/json/mapgen/shelter.json b/data/json/mapgen/shelter.json index 26261f18c9023..343aacfd5f575 100644 --- a/data/json/mapgen/shelter.json +++ b/data/json/mapgen/shelter.json @@ -235,7 +235,11 @@ "palettes": [ "shelter" ], "place_nested": [ { "chunks": [ [ "shelter_2_nest_base", 100 ] ], "x": 0, "y": 0 } ], "computers": { - "6": { "name": "Evac shelter computer", "eocs": [ "EOC_EVAC_CENTER_COMPUTER" ], "chat_topics": [ "COMP_EVAC_CENTER_MAIN" ] } + "6": { + "name": "Evac shelter computer", + "eocs": [ "EOC_REFUGEE_CENTER_COMPUTER" ], + "chat_topics": [ "COMP_REFUGEE_CENTER_MAIN" ] + } } } }, @@ -396,7 +400,11 @@ "palettes": [ "shelter" ], "place_nested": [ { "chunks": [ [ "shelter_2_nest_vandal", 50 ], [ "shelter_2_nest_used", 50 ] ], "x": 0, "y": 0 } ], "computers": { - "6": { "name": "Evac shelter computer", "eocs": [ "EOC_EVAC_CENTER_COMPUTER" ], "chat_topics": [ "COMP_EVAC_CENTER_MAIN" ] } + "6": { + "name": "Evac shelter computer", + "eocs": [ "EOC_REFUGEE_CENTER_COMPUTER" ], + "chat_topics": [ "COMP_REFUGEE_CENTER_MAIN" ] + } } } }, diff --git a/data/json/npcs/TALK_COMPUTER.json b/data/json/npcs/TALK_COMPUTER.json index 9a878858cd0d8..6ab62eff1edc3 100644 --- a/data/json/npcs/TALK_COMPUTER.json +++ b/data/json/npcs/TALK_COMPUTER.json @@ -1,12 +1,12 @@ [ { - "id": "EOC_EVAC_CENTER_COMPUTER", + "id": "EOC_REFUGEE_CENTER_COMPUTER", "type": "effect_on_condition", "effect": [ "open_dialogue" ] }, { "type": "talk_topic", - "id": "COMP_EVAC_CENTER_MAIN", + "id": "COMP_REFUGEE_CENTER_MAIN", "dynamic_line": "The computer awaits input…", "responses": [ { "text": "Emergency Message.", "topic": "COMP_EMERGENCY_MESSAGE" }, @@ -23,7 +23,7 @@ "type": "talk_topic", "id": "COMP_EMERGENCY_MESSAGE", "dynamic_line": "GREETINGS CITIZEN. A BIOLOGICAL ATTACK HAS TAKEN PLACE AND A STATE OF EMERGENCY HAS BEEN DECLARED. EMERGENCY PERSONNEL WILL BE AIDING YOU SHORTLY. TO ENSURE YOUR SAFETY PLEASE FOLLOW THE STEPS BELOW.\n 1. DO NOT PANIC.\n 2. REMAIN INSIDE THE BUILDING.\n 3. SEEK SHELTER IN THE BASEMENT.\n 4. USE PROVIDED GAS MASKS.\n 5. AWAIT FURTHER INSTRUCTIONS.", - "responses": [ { "text": "Press any key.", "topic": "COMP_EVAC_CENTER_MAIN" } ] + "responses": [ { "text": "Press any key.", "topic": "COMP_REFUGEE_CENTER_MAIN" } ] }, { "type": "talk_topic", @@ -54,7 +54,7 @@ { "condition": { "compare_int": [ { "global_val": "var", "var_name": "find_refugee_center" }, "=", { "const": 1 } ] }, "text": "Press any key.", - "topic": "COMP_EVAC_CENTER_MAIN" + "topic": "COMP_REFUGEE_CENTER_MAIN" } ] } diff --git a/data/json/overmap/overmap_special/specials.json b/data/json/overmap/overmap_special/specials.json index b28b82997d24a..abadf96b9dfa5 100644 --- a/data/json/overmap/overmap_special/specials.json +++ b/data/json/overmap/overmap_special/specials.json @@ -3414,12 +3414,7 @@ "city_distance": [ 3, -1 ], "city_sizes": [ 4, -1 ], "occurrences": [ 75, 100 ], - "flags": [ "UNIQUE", "SAFE_AT_WORLDGEN", "MAN_MADE" ], - "eoc": { - "id": "EOC_REFUGEE_CENTER_GENERATE", - "condition": { "compare_int": [ { "global_val": "var", "var_name": "refugee_centers", "default": 0 }, "<", { "const": 1 } ] }, - "effect": [ { "arithmetic": [ { "global_val": "var", "var_name": "refugee_centers" }, "++" ] } ] - } + "flags": [ "UNIQUE", "SAFE_AT_WORLDGEN", "MAN_MADE" ] }, { "type": "overmap_special", @@ -4581,12 +4576,7 @@ "city_sizes": [ 1, 16 ], "occurrences": [ 33, 100 ], "rotate": false, - "flags": [ "UNIQUE", "SAFE_AT_WORLDGEN" ], - "eoc": { - "id": "EOC_HUB01_GENERATE", - "condition": { "compare_int": [ { "global_val": "var", "var_name": "hub01s", "default": 0 }, "<", { "const": 1 } ] }, - "effect": [ { "arithmetic": [ { "global_val": "var", "var_name": "hub01s" }, "++" ] } ] - } + "flags": [ "UNIQUE", "SAFE_AT_WORLDGEN" ] }, { "type": "overmap_special", @@ -4605,12 +4595,7 @@ "city_sizes": [ 1, 16 ], "occurrences": [ 33, 100 ], "rotate": false, - "flags": [ "UNIQUE", "SAFE_AT_WORLDGEN" ], - "eoc": { - "id": "EOC_ISOLATED_ROAD_GENERATE", - "condition": { "compare_int": [ { "global_val": "var", "var_name": "isolated_roads", "default": 0 }, "<", { "const": 1 } ] }, - "effect": [ { "arithmetic": [ { "global_val": "var", "var_name": "isolated_roads" }, "++" ] } ] - } + "flags": [ "UNIQUE", "SAFE_AT_WORLDGEN" ] }, { "type": "overmap_special", @@ -6931,12 +6916,7 @@ "occurrences": [ 35, 100 ], "//": "Inflated chance, effective rate ~19% (n=726)", "connections": [ { "point": [ -1, 15, 0 ], "terrain": "road" } ], - "flags": [ "FARM", "UNIQUE", "SAFE_AT_WORLDGEN" ], - "eoc": { - "id": "EOC_ISHERWOOD_GENERATE", - "condition": { "compare_int": [ { "global_val": "var", "var_name": "isherwoodss", "default": 0 }, "<", { "const": 1 } ] }, - "effect": [ { "arithmetic": [ { "global_val": "var", "var_name": "isherwoodss" }, "++" ] } ] - } + "flags": [ "FARM", "UNIQUE", "SAFE_AT_WORLDGEN" ] }, { "id": "airliner_crashed", diff --git a/data/mods/No_Hope/Mapgen/nested/shelter_nested.json b/data/mods/No_Hope/Mapgen/nested/shelter_nested.json index a0e89be7eecc4..e8161a6962b2f 100644 --- a/data/mods/No_Hope/Mapgen/nested/shelter_nested.json +++ b/data/mods/No_Hope/Mapgen/nested/shelter_nested.json @@ -33,7 +33,11 @@ ], "furniture": { "b": "f_bench", "c": "f_cupboard", "l": "f_locker", "S": "f_sink", "%": "f_trashcan", "6": "f_console" }, "computers": { - "6": { "name": "Evac shelter computer", "eocs": [ "EOC_EVAC_CENTER_COMPUTER" ], "chat_topics": [ "COMP_EVAC_CENTER_MAIN" ] } + "6": { + "name": "Evac shelter computer", + "eocs": [ "EOC_REFUGEE_CENTER_COMPUTER" ], + "chat_topics": [ "COMP_REFUGEE_CENTER_MAIN" ] + } }, "items": { "l": { "item": "SUS_evac_shelter_locker", "chance": 5 }, "c": { "item": "SUS_evac_shelter_cabinet", "chance": 5 } } } @@ -85,7 +89,11 @@ "x": "f_console_broken" }, "computers": { - "6": { "name": "Evac shelter computer", "eocs": [ "EOC_EVAC_CENTER_COMPUTER" ], "chat_topics": [ "COMP_EVAC_CENTER_MAIN" ] } + "6": { + "name": "Evac shelter computer", + "eocs": [ "EOC_REFUGEE_CENTER_COMPUTER" ], + "chat_topics": [ "COMP_REFUGEE_CENTER_MAIN" ] + } }, "items": { "l": { "item": "SUS_evac_shelter_locker_used", "chance": 5 }, @@ -135,7 +143,11 @@ "furniture": { "b": "f_bench", "c": "f_cupboard", "l": "f_locker", "S": "f_sink", "%": "f_trashcan", "6": "f_console" }, "items": { "l": { "item": "SUS_evac_shelter_locker", "chance": 5 }, "c": { "item": "SUS_evac_shelter_cabinet", "chance": 5 } }, "computers": { - "6": { "name": "Evac shelter computer", "eocs": [ "EOC_EVAC_CENTER_COMPUTER" ], "chat_topics": [ "COMP_EVAC_CENTER_MAIN" ] } + "6": { + "name": "Evac shelter computer", + "eocs": [ "EOC_REFUGEE_CENTER_COMPUTER" ], + "chat_topics": [ "COMP_REFUGEE_CENTER_MAIN" ] + } } } }, @@ -186,7 +198,11 @@ "6": "f_console" }, "computers": { - "6": { "name": "Evac shelter computer", "eocs": [ "EOC_EVAC_CENTER_COMPUTER" ], "chat_topics": [ "COMP_EVAC_CENTER_MAIN" ] } + "6": { + "name": "Evac shelter computer", + "eocs": [ "EOC_REFUGEE_CENTER_COMPUTER" ], + "chat_topics": [ "COMP_REFUGEE_CENTER_MAIN" ] + } }, "items": { "l": { "item": "SUS_evac_shelter_locker_used", "chance": 5 }, @@ -231,7 +247,11 @@ ], "furniture": { "b": "f_bench", "c": "f_cupboard", "l": "f_locker", "S": "f_sink", "%": "f_trashcan", "6": "f_console" }, "computers": { - "6": { "name": "Evac shelter computer", "eocs": [ "EOC_EVAC_CENTER_COMPUTER" ], "chat_topics": [ "COMP_EVAC_CENTER_MAIN" ] } + "6": { + "name": "Evac shelter computer", + "eocs": [ "EOC_REFUGEE_CENTER_COMPUTER" ], + "chat_topics": [ "COMP_REFUGEE_CENTER_MAIN" ] + } }, "items": { "l": { "item": "SUS_evac_shelter_locker", "chance": 5 }, "c": { "item": "SUS_evac_shelter_cabinet", "chance": 5 } } } @@ -284,7 +304,11 @@ "x": "f_console_broken" }, "computers": { - "6": { "name": "Evac shelter computer", "eocs": [ "EOC_EVAC_CENTER_COMPUTER" ], "chat_topics": [ "COMP_EVAC_CENTER_MAIN" ] } + "6": { + "name": "Evac shelter computer", + "eocs": [ "EOC_REFUGEE_CENTER_COMPUTER" ], + "chat_topics": [ "COMP_REFUGEE_CENTER_MAIN" ] + } }, "items": { "l": { "item": "SUS_evac_shelter_locker_used", "chance": 5 }, diff --git a/data/mods/TEST_DATA/mapgen-test.json b/data/mods/TEST_DATA/mapgen-test.json index ff75c70015ec0..aaa3c73d20d73 100644 --- a/data/mods/TEST_DATA/mapgen-test.json +++ b/data/mods/TEST_DATA/mapgen-test.json @@ -191,8 +191,8 @@ "place_computers": [ { "name": "Test computer 2", - "eocs": [ "EOC_EVAC_CENTER_COMPUTER" ], - "chat_topics": [ "COMP_EVAC_CENTER_MAIN" ], + "eocs": [ "EOC_REFUGEE_CENTER_COMPUTER" ], + "chat_topics": [ "COMP_REFUGEE_CENTER_MAIN" ], "x": 20, "y": 20 } diff --git a/doc/MAPGEN.md b/doc/MAPGEN.md index adb659e9ba53c..cd2827ddd2ccb 100644 --- a/doc/MAPGEN.md +++ b/doc/MAPGEN.md @@ -1142,8 +1142,8 @@ Example for placing computer console (either by using a character in the rows ar "place_computers": [ { "name": "Test computer 2", - "eocs": [ "EOC_EVAC_CENTER_COMPUTER" ], - "chat_topics": [ "COMP_EVAC_CENTER_MAIN" ], + "eocs": [ "EOC_REFUGEE_CENTER_COMPUTER" ], + "chat_topics": [ "COMP_REFUGEE_CENTER_MAIN" ], "x": 20, "y": 20 }