Remove duplicate JSON entries: data/json

Remove duplicated EXO_ flags. Rename two EOCs to prevent one from overwriting the other. Remove old duplicate mission definitions (duplicated in CleverRaven#52374) Remove the old mine entrance overmap special (the new one was correctly overwriting it) Remove some duplicate overmap terrain defs. Remove some duplicate basecamp recipe groups. Remove a duplicated widget.
anothersimulacrum · Feb 21, 2022 · 8265132 · 8265132
1 parent de31727
commit 8265132
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 798 deletions.
diff --git a/data/json/flags.json b/data/json/flags.json
@@ -1930,76 +1930,6 @@
     "type": "json_flag",
     "info": "This is meant for exosuit leg plating."
   },
-  {
-    "id": "EXO_BOOT_PLATE",
-    "type": "json_flag",
-    "info": "This is meant for exosuit foot plating."
-  },
-  {
-    "id": "EXO_SMALL",
-    "type": "json_flag",
-    "info": "This is meant for a small exosuit hardpoint."
-  },
-  {
-    "id": "EXO_LARGE",
-    "type": "json_flag",
-    "info": "This is meant for a large exosuit hardpoint."
-  },
-  {
-    "id": "EXO_PSU",
-    "type": "json_flag",
-    "info": "This is meant for an exosuit PSU hardpoint."
-  },
-  {
-    "id": "EXO_SMALL_GADGET",
-    "type": "json_flag",
-    "info": "This is meant for small exosuit gadgets, 1 L or less."
-  },
-  {
-    "id": "EXO_HELMET_GADGET",
-    "type": "json_flag",
-    "info": "This is meant for helmet-specific gadgets."
-  },
-  {
-    "id": "EXO_MEDIUM_GADGET",
-    "type": "json_flag",
-    "info": "This is meant for medium exosuit gadgets, between 1 L and 5 L."
-  },
-  {
-    "id": "EXO_LARGE_GADGET",
-    "type": "json_flag",
-    "info": "This is meant for large exosuit gadgets, larger than 5 L."
-  },
-  {
-    "id": "EXO_HELMET_PLATE",
-    "type": "json_flag",
-    "info": "This is meant for exosuit helmet plating."
-  },
-  {
-    "id": "EXO_TORSO_PLATE",
-    "type": "json_flag",
-    "info": "This is meant for exosuit torso plating."
-  },
-  {
-    "id": "EXO_PSU_PLATE",
-    "type": "json_flag",
-    "info": "This is meant for exosuit PSU plating."
-  },
-  {
-    "id": "EXO_ARM_PLATE",
-    "type": "json_flag",
-    "info": "This is meant for exosuit arm plating."
-  },
-  {
-    "id": "EXO_GLOVE_PLATE",
-    "type": "json_flag",
-    "info": "This is meant for exosuit arm plating."
-  },
-  {
-    "id": "EXO_LEG_PLATE",
-    "type": "json_flag",
-    "info": "This is meant for exosuit leg plating."
-  },
   {
     "id": "EXO_BOOT_PLATE",
     "type": "json_flag",

diff --git a/data/json/items/tool/science.json b/data/json/items/tool/science.json
@@ -1435,15 +1435,15 @@
       "description": "Touch the opening.",
       "effect_on_conditions": [
         {
-          "id": "EOC_MIGO_BIO_TECH_INTEREST",
+          "id": "EOC_MIGO_BIO_TECH_INTEREST_SLIGHT",
           "condition": { "not": { "one_in_chance": 3 } },
           "effect": [
             { "u_message": "You have a slight feeling of being watched." },
             { "u_adjust_var": "migo_interest", "type": "migo_interest", "context": "interest", "adjustment": 1 }
           ]
         },
         {
-          "id": "EOC_MIGO_BIO_TECH_INTEREST",
+          "id": "EOC_MIGO_BIO_TECH_INTEREST_INTENSE",
           "condition": { "not": { "one_in_chance": 100 } },
           "effect": [
             { "u_message": "You have an intense feeling of being watched." },

diff --git a/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_shopkeep.json b/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_shopkeep.json
diff --git a/data/json/overmap/overmap_special/specials.json b/data/json/overmap/overmap_special/specials.json
@@ -1234,29 +1234,6 @@
     "occurrences": [ 10, 100 ],
     "flags": [ "LAB", "UNIQUE" ]
   },
-  {
-    "type": "overmap_special",
-    "id": "Mine Entrance",
-    "overmaps": [
-      { "point": [ 0, 0, 0 ], "overmap": "s_lot_north" },
-      { "point": [ 0, 1, 0 ], "overmap": "mine_entrance_north" },
-      { "point": [ 1, 1, 0 ], "overmap": "mine_entrance_loading_zone_north" },
-      { "point": [ 1, 0, 0 ], "overmap": "road_end_north" },
-      { "point": [ 0, 1, 1 ], "overmap": "mine_entrance_roof_north" },
-      { "point": [ 0, 1, -1 ], "overmap": "mine_shaft_middle_north" },
-      { "point": [ 0, 1, -2 ], "overmap": "mine_shaft_lower_north" },
-      { "point": [ 1, 1, -2 ], "overmap": "mine_shaft_lower_east_north" }
-    ],
-    "connections": [
-      { "point": [ 0, -1, 0 ], "terrain": "road", "connection": "local_road", "from": [ 0, 0, 0 ] },
-      { "point": [ 1, -1, 0 ], "terrain": "road", "connection": "local_road", "from": [ 1, 0, 0 ] }
-    ],
-    "locations": [ "wilderness" ],
-    "city_distance": [ 10, 40 ],
-    "city_sizes": [ 4, -1 ],
-    "occurrences": [ 0, 2 ],
-    "flags": [ "WILDERNESS" ]
-  },
   {
     "type": "overmap_special",
     "id": "Spider Pit",

diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_commercial.json b/data/json/overmap/overmap_terrain/overmap_terrain_commercial.json
@@ -338,14 +338,7 @@
   },
   {
     "type": "overmap_terrain",
-    "id": [
-      "s_bookstore_roof",
-      "s_bookstore_roof_1",
-      "s_bookstore_roof_2",
-      "s_bookstore_upper_roof",
-      "s_bookstore_upper_roof_1",
-      "s_bookstore_upper_roof_1"
-    ],
+    "id": [ "s_bookstore_roof", "s_bookstore_roof_1", "s_bookstore_roof_2", "s_bookstore_upper_roof", "s_bookstore_upper_roof_1" ],
     "copy-from": "generic_city_building",
     "looks_like": "s_bookstore_roof",
     "name": "bookstore roof",
@@ -829,7 +822,6 @@
       "hdwr_large_0_1_1",
       "hdwr_large_1_1_1",
       "hdwr_large_0_2_1",
-      "hdwr_large_1_2_1",
       "hdwr_large_1_2_1"
     ],
     "name": "home improvement superstore",
@@ -1186,7 +1178,6 @@
       "2fmotel_1_f2",
       "2fmotel_2_f2",
       "2fmotel_3_f2",
-      "2fmotel_3_f2",
       "2fmotel_1_r",
       "2fmotel_2_r",
       "2fmotel_3_r"
@@ -1235,8 +1226,7 @@
       "loffice_tower_12",
       "loffice_tower_13",
       "loffice_tower_14",
-      "loffice_tower_15",
-      "loffice_tower_16"
+      "loffice_tower_15"
     ],
     "copy-from": "generic_large_office_tower"
   },

diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_industrial.json b/data/json/overmap/overmap_terrain/overmap_terrain_industrial.json
@@ -21,7 +21,7 @@
   },
   {
     "type": "overmap_terrain",
-    "id": [ "public_works_NE_roof", "public_works_NW_roof", "public_works_SW_roof", "public_works_SE_roof" ],
+    "id": [ "public_works_NE_roof", "public_works_NW_roof", "public_works_SE_roof" ],
     "name": "public works roof",
     "sym": "w",
     "color": "light_gray",
@@ -269,7 +269,6 @@
       "steel_mill_4_2_3",
       "steel_mill_4_3",
       "steel_mill_4_3_2",
-      "steel_mill_4_3_3",
       "steel_mill_4_3_3"
     ],
     "copy-from": "generic_city_building_no_sidewalk",

diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_public_institutional.json b/data/json/overmap/overmap_terrain/overmap_terrain_public_institutional.json
@@ -118,22 +118,14 @@
       "police_dept_u011",
       "police_dept_u101",
       "police_dept_u111",
-      "police_dept_u002",
-      "police_dept_u012",
-      "police_dept_u102",
-      "police_dept_u112",
       "police_dept_d000",
       "police_dept_d010",
       "police_dept_d100",
       "police_dept_d110",
       "police_dept_d001",
       "police_dept_d011",
       "police_dept_d101",
-      "police_dept_d111",
-      "police_dept_d002",
-      "police_dept_d012",
-      "police_dept_d102",
-      "police_dept_d112"
+      "police_dept_d111"
     ],
     "name": "police department",
     "copy-from": "generic_city_building",

diff --git a/...ecipes/basecamps/base/recipe_modular_firestation_1/modular_firestation_recipe_groups.json b/...ecipes/basecamps/base/recipe_modular_firestation_1/modular_firestation_recipe_groups.json
@@ -88,25 +88,6 @@
       { "id": "steel_lump", "description": " Craft: Steel, Lump" }
     ]
   },
-  {
-    "type": "recipe_group",
-    "id": "blacksmith_recipes_2",
-    "building_type": "SMITH",
-    "recipes": [
-      { "id": "copper_knife", "description": " Craft: Knife, Copper" },
-      { "id": "sword_crude", "description": " Craft: Sword, Crude" },
-      { "id": "pot_copper", "description": " Craft: Pot, Copper" },
-      { "id": "bolt_metal", "description": " Craft: Crossbow Bolt, Steel" },
-      { "id": "armor_scrapsuit", "description": " Craft: Armor, Scrap Suit" },
-      { "id": "helmet_scrap", "description": " Craft: Armor, Scrap Helmet" },
-      { "id": "cuirass_scrap", "description": " Craft: Armor, Scrap Cuirass" },
-      { "id": "armguard_scrap", "description": " Craft: Armor, Scrap Arm Guards" },
-      { "id": "legguard_scrap", "description": " Craft: Armor, Scrap Leg Guards" },
-      { "id": "boots_scrap", "description": " Craft: Armor, Scrap Boots" },
-      { "id": "copper_ax", "description": " Craft: Axe, Copper" },
-      { "id": "spear_copper", "description": " Craft: Spear, Copper" }
-    ]
-  },
   {
     "type": "recipe_group",
     "id": "fbmc_firestation_blacksmith_recipes_3",