From 1db2da54309cfd5f98e2eb70eeaf13fe534c28cc Mon Sep 17 00:00:00 2001 From: BevapDin Date: Sat, 14 Dec 2019 20:37:00 +0100 Subject: [PATCH] Remove JSON members that are not visited and therefor useless. --- .../isherwood_farm/NPC_Barry_Isherwood.json | 2 +- .../isherwood_farm/NPC_Carlos_Isherwood.json | 1 - .../isherwood_farm/NPC_Chris_Isherwood.json | 1 - .../isherwood_farm/NPC_Eddie_Isherwood.json | 1 - .../surface_refugees/NPC_Dana_Nunez.json | 2 +- .../NPC_free_merchant_shopkeep.json | 3 -- .../NPC_old_guard_representative.json | 2 - .../npcs/robofac/NPC_ROBOFAC_INTERCOM.json | 2 - .../tacoma_ranch/NPC_ranch_bartender.json | 4 -- .../npcs/tacoma_ranch/NPC_ranch_foreman.json | 52 ------------------- data/mods/Aftershock/items/afs_bioparts.json | 2 - data/mods/Aftershock/items/afs_tools.json | 2 +- data/mods/Aftershock/maps/afs_furniture.json | 2 - data/mods/FictonalWeapons/fic_mods.json | 3 +- data/mods/FictonalWeapons/fic_weapons.json | 1 - data/mods/Modular_Turrets/items.json | 3 -- data/mods/Salvaged_Robots/monsters.json | 30 ----------- 17 files changed, 4 insertions(+), 109 deletions(-) diff --git a/data/json/npcs/isherwood_farm/NPC_Barry_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Barry_Isherwood.json index 11a70b1485f3e..834ab44363852 100644 --- a/data/json/npcs/isherwood_farm/NPC_Barry_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Barry_Isherwood.json @@ -77,7 +77,7 @@ "destination": "dairy_farm_isherwood_W", "start": { "effect": [ { "u_add_var": "u_have_barry_escape", "type": "general", "context": "meeting", "value": "yes" } ], - "assign_mission_target": { "om_terrain": "dairy_farm_isherwood_W", "om_special": "Isherwood Farms", "reveal_radius": 3 } + "assign_mission_target": { "om_terrain": "dairy_farm_isherwood_W", "reveal_radius": 3 } }, "end": { "opinion": { "trust": 5, "value": 5 }, diff --git a/data/json/npcs/isherwood_farm/NPC_Carlos_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Carlos_Isherwood.json index a8fd1ec2c2c2a..c9427af5c6c52 100644 --- a/data/json/npcs/isherwood_farm/NPC_Carlos_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Carlos_Isherwood.json @@ -198,7 +198,6 @@ "update_mapgen": [ { "om_terrain": "horse_farm_isherwood_4", - "om_special": "Isherwood Farms", "set": [ { "point": "furniture", "id": "f_anvil", "x": 6, "y": 12 } ] } ] diff --git a/data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json index d78f4c0fd01b7..57d907bf2f3ad 100644 --- a/data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json @@ -189,7 +189,6 @@ "update_mapgen": [ { "om_terrain": "cabin_isherwood", - "om_special": "Isherwood Farms", "place_nested": [ { "chunks": [ "cabin_isherwood_update" ], "x": 3, "y": 1 } ] } ] diff --git a/data/json/npcs/isherwood_farm/NPC_Eddie_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Eddie_Isherwood.json index d2ce435f3e92a..8970247bf6f2d 100644 --- a/data/json/npcs/isherwood_farm/NPC_Eddie_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Eddie_Isherwood.json @@ -222,7 +222,6 @@ "update_mapgen": [ { "om_terrain": "rural_outbuilding", - "om_special": "Isherwood Farms", "place_nested": [ { "chunks": [ "isherwood_outbuilding_kilns" ], "x": 0, "y": 0 } ], "set": [ { "point": "furniture", "id": "f_kiln_empty", "x": 8, "y": 13 }, diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Dana_Nunez.json b/data/json/npcs/refugee_center/surface_refugees/NPC_Dana_Nunez.json index 4d092a1329238..3496c276a12bd 100644 --- a/data/json/npcs/refugee_center/surface_refugees/NPC_Dana_Nunez.json +++ b/data/json/npcs/refugee_center/surface_refugees/NPC_Dana_Nunez.json @@ -328,7 +328,7 @@ "item": "landough_calrisean", "start": { "assign_mission_target": { "om_terrain": "bakery", "reveal_radius": 1, "random": true, "search_range": 120 }, - "update_mapgen": { "om_terrain": "bakery", "om_special": "bakery", "place_item": [ { "item": "landough_calrisean", "x": 5, "y": 16 } ] }, + "update_mapgen": { "om_terrain": "bakery", "place_item": [ { "item": "landough_calrisean", "x": 5, "y": 16 } ] }, "effect": { "u_add_var": "Dana_Sourdough", "type": "mission", "context": "flag", "value": "in_progress" } }, "end": { 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 index c9b611f314bed..963339124865e 100644 --- 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 @@ -415,7 +415,6 @@ "assign_mission_target": { "om_terrain": "evac_center_9", "reveal_radius": 1 }, "update_mapgen": { "om_terrain": "evac_center_9", - "om_special": "evac_center", "place_monster": [ { "group": "GROUP_REFUGEE_BOSS_ZOMBIE", "name": "Sean McLaughlin", "x": 10, "y": 10, "target": true } ] } }, @@ -426,7 +425,6 @@ ], "update_mapgen": { "om_terrain": "evac_center_9", - "om_special": "evac_center", "set": [ { "square": "terrain", "id": "t_floor", "x": 0, "y": 23, "x2": 1, "y2": 23 } ] } }, @@ -556,7 +554,6 @@ ], "update_mapgen": { "om_terrain": "evac_center_8", - "om_special": "evac_center", "set": [ { "point": "terrain", "id": "t_gates_mech_control_lab", "x": 17, "y": 1 }, { "point": "terrain", "id": "t_gates_mech_control_lab", "x": 17, "y": 3 } diff --git a/data/json/npcs/refugee_center/surface_visitors/NPC_old_guard_representative.json b/data/json/npcs/refugee_center/surface_visitors/NPC_old_guard_representative.json index 4f6c05a918819..f0830b5ebb9ec 100644 --- a/data/json/npcs/refugee_center/surface_visitors/NPC_old_guard_representative.json +++ b/data/json/npcs/refugee_center/surface_visitors/NPC_old_guard_representative.json @@ -133,12 +133,10 @@ "update_mapgen": [ { "om_terrain": "evac_center_19", - "om_special": "evac_center", "place_npcs": [ { "class": "evac_guard3", "x": 12, "y": 12, "target": true } ] }, { "om_terrain": "evac_center_7", - "om_special": "evac_center", "place_npcs": [ { "class": "scavenger_hunter", "x": [ 9, 15 ], "y": [ 9, 15 ] } ] } ] diff --git a/data/json/npcs/robofac/NPC_ROBOFAC_INTERCOM.json b/data/json/npcs/robofac/NPC_ROBOFAC_INTERCOM.json index ea38f5434b0f1..6605d27f48e8e 100644 --- a/data/json/npcs/robofac/NPC_ROBOFAC_INTERCOM.json +++ b/data/json/npcs/robofac/NPC_ROBOFAC_INTERCOM.json @@ -122,12 +122,10 @@ "update_mapgen": [ { "om_terrain": "robofachq_surface_b0", - "om_special": "hub_01", "place_nested": [ { "chunks": [ "robofac_hq_surface_freemerchant_camp" ], "x": 4, "y": 0 } ] }, { "om_terrain": "robofachq_surface_entrance", - "om_special": "hub_01", "place_nested": [ { "chunks": [ "robofac_hq_surface_merc_1" ], "x": 3, "y": 10 } ] } ], diff --git a/data/json/npcs/tacoma_ranch/NPC_ranch_bartender.json b/data/json/npcs/tacoma_ranch/NPC_ranch_bartender.json index afa3ace311ea3..739b67bf3da91 100644 --- a/data/json/npcs/tacoma_ranch/NPC_ranch_bartender.json +++ b/data/json/npcs/tacoma_ranch/NPC_ranch_bartender.json @@ -93,7 +93,6 @@ "end": { "update_mapgen": { "om_terrain": "ranch_camp_51", - "om_special": "ranch_camp", "place_nested": [ { "chunks": [ "tacoma_commune_bar_bartender_1" ], "x": 0, "y": 0 } ] } } @@ -124,7 +123,6 @@ "effect": { "npc_add_trait": "NPC_BRANDY" }, "update_mapgen": { "om_terrain": "ranch_camp_51", - "om_special": "ranch_camp", "place_nested": [ { "chunks": [ "tacoma_commune_bar_bartender_2" ], "x": 0, "y": 0 } ] } } @@ -155,7 +153,6 @@ "effect": { "npc_add_trait": "NPC_RUM" }, "update_mapgen": { "om_terrain": "ranch_camp_51", - "om_special": "ranch_camp", "place_nested": [ { "chunks": [ "tacoma_commune_bar_bartender_3" ], "x": 0, "y": 0 } ] } } @@ -186,7 +183,6 @@ "effect": { "npc_add_trait": "NPC_WHISKEY" }, "update_mapgen": { "om_terrain": "ranch_camp_51", - "om_special": "ranch_camp", "place_nested": [ { "chunks": [ "tacoma_commune_bar_bartender_4" ], "x": 0, "y": 0 } ] } } diff --git a/data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json b/data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json index 8d3f66d705851..752c45aa6cded 100644 --- a/data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json +++ b/data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json @@ -104,13 +104,11 @@ "update_mapgen": [ { "om_terrain": "ranch_camp_65", - "om_special": "ranch_camp", "translate_ter": [ { "from": "t_underbrush", "to": "t_dirt", "x": 0, "y": 0 } ], "place_nested": [ { "chunks": [ "tacoma_commune_west_wall_door" ], "x": 22, "y": 0 } ] }, { "om_terrain": "ranch_camp_66", - "om_special": "ranch_camp", "translate_ter": [ { "from": "t_underbrush", "to": "t_dirt", "x": 0, "y": 0 } ], "place_nested": [ { "chunks": [ "tacoma_commune_east_wall_door" ], "x": 0, "y": 0 }, @@ -120,13 +118,11 @@ }, { "om_terrain": "ranch_camp_74", - "om_special": "ranch_camp", "translate_ter": [ { "from": "t_underbrush", "to": "t_dirt", "x": 0, "y": 0 } ], "place_nested": [ { "chunks": [ "tacoma_commune_west_wall_door" ], "x": 22, "y": 0 } ] }, { "om_terrain": "ranch_camp_66", - "om_special": "ranch_camp", "translate_ter": [ { "from": "t_underbrush", "to": "t_dirt", "x": 0, "y": 0 } ], "place_nested": [ { "chunks": [ "tacoma_commune_east_wall_door" ], "x": 0, "y": 0 }, @@ -163,7 +159,6 @@ "update_mapgen": [ { "om_terrain": "ranch_camp_65", - "om_special": "ranch_camp", "//": "Beds in the barn", "place_nested": [ { "chunks": [ "tacoma_commune_makeshift_bed" ], "x": 19, "y": 1 }, @@ -178,7 +173,6 @@ }, { "om_terrain": "ranch_camp_66", - "om_special": "ranch_camp", "//": "Beds in the barn", "place_nested": [ { "chunks": [ "tacoma_commune_makeshift_bed" ], "x": 19, "y": 1 }, @@ -229,7 +223,6 @@ "update_mapgen": [ { "om_terrain": "ranch_camp_46", - "om_special": "ranch_camp", "//": "tilled soil in the fields", "translate_ter": [ { "from": "t_underbrush", "to": "t_dirt", "x": 0, "y": 0 } ], "set": [ @@ -240,7 +233,6 @@ }, { "om_terrain": "ranch_camp_55", - "om_special": "ranch_camp", "//": "tilled soil in the fields", "translate_ter": [ { "from": "t_underbrush", "to": "t_dirt", "x": 0, "y": 0 } ], "set": [ @@ -251,19 +243,16 @@ }, { "om_terrain": "ranch_camp_56", - "om_special": "ranch_camp", "translate_ter": [ { "from": "t_underbrush", "to": "t_dirt", "x": 0, "y": 0 } ], "place_vehicles": [ { "vehicle": "hippie_van", "x": 10, "y": 10, "rotation": 270, "chance": 100 } ] }, { "om_terrain": "ranch_camp_65", - "om_special": "ranch_camp", "place_furniture": [ { "furn": "f_bookcase", "x": 17, "y": 11 } ], "place_npcs": [ { "class": "ranch_farmer_1", "x": 19, "y": 20 } ] }, { "om_terrain": "ranch_camp_66", - "om_special": "ranch_camp", "place_npcs": [ { "class": "ranch_woodcutter_1", "x": 4, "y": 11 } ] } ] @@ -295,7 +284,6 @@ "update_mapgen": [ { "om_terrain": "ranch_camp_46", - "om_special": "ranch_camp", "//": "tilled soil in the fields", "set": [ { "square": "terrain", "id": "t_dirtmound", "x": 14, "y": 5, "x2": 15, "y2": 22 }, @@ -305,7 +293,6 @@ }, { "om_terrain": "ranch_camp_55", - "om_special": "ranch_camp", "//": "tilled soil in the fields", "set": [ { "square": "terrain", "id": "t_dirtmound", "x": 14, "y": 2, "x2": 15, "y2": 17 }, @@ -315,24 +302,20 @@ }, { "om_terrain": "ranch_camp_56", - "om_special": "ranch_camp", "place_vehicles": [ { "vehicle": "flatbed_truck", "x": 18, "y": 3, "rotation": 0, "chance": 100 } ] }, { "om_terrain": "ranch_camp_57", - "om_special": "ranch_camp", "translate_ter": [ { "from": "t_underbrush", "to": "t_dirt", "x": 0, "y": 0 } ], "place_npcs": [ { "class": "ranch_crop_overseer", "x": 12, "y": 7 } ] }, { "om_terrain": "ranch_camp_58", - "om_special": "ranch_camp", "translate_ter": [ { "from": "t_underbrush", "to": "t_dirt", "x": 0, "y": 0 } ], "place_nested": [ { "chunks": [ "tacoma_commune_lumbermill_4" ], "x": 0, "y": 2 } ] }, { "om_terrain": "ranch_camp_67", - "om_special": "ranch_camp", "translate_ter": [ { "from": "t_underbrush", "to": "t_dirt", "x": 0, "y": 0 } ], "set": [ { "square": "terrain", "id": "t_palisade", "x": 21, "y": 19, "x2": 23, "y2": 19 } ] } @@ -365,24 +348,20 @@ "update_mapgen": [ { "om_terrain": "ranch_camp_56", - "om_special": "ranch_camp", "place_vehicles": [ { "vehicle": "car_chassis", "x": 17, "y": 11, "rotation": 90, "chance": 100 } ] }, { "om_terrain": "ranch_camp_58", - "om_special": "ranch_camp", "place_nested": [ { "chunks": [ "tacoma_commune_lumbermill_5" ], "x": 0, "y": 2 } ], "set": [ { "point": "terrain", "id": "t_pit", "x": 6, "y": 18 } ] }, { "om_terrain": "ranch_camp_66", - "om_special": "ranch_camp", "set": [ { "point": "terrain", "id": "t_palisade", "x": 23, "y": 22 } ], "place_npcs": [ { "class": "ranch_farmer_2", "x": 9, "y": 22 } ] }, { "om_terrain": "ranch_camp_67", - "om_special": "ranch_camp", "set": [ { "square": "terrain", "id": "t_palisade", "x": 0, "y": 22, "x2": 5, "y2": 22 } ] } ] @@ -414,13 +393,11 @@ "update_mapgen": [ { "om_terrain": "ranch_camp_58", - "om_special": "ranch_camp", "place_nested": [ { "chunks": [ "tacoma_commune_lumbermill_6" ], "x": 0, "y": 2 } ], "set": [ { "point": "terrain", "id": "t_covered_well", "x": 6, "y": 18 } ] }, { "om_terrain": "ranch_camp_66", - "om_special": "ranch_camp", "set": [ { "point": "furniture", "id": "f_fireplace", "x": 6, "y": 12 }, { "point": "furniture", "id": "f_fireplace", "x": 8, "y": 12 } @@ -463,7 +440,6 @@ "update_mapgen": [ { "om_terrain": "ranch_camp_56", - "om_special": "ranch_camp", "//": "western palisade", "set": [ { "square": "terrain", "id": "t_palisade", "x": 16, "y": 16, "x2": 16, "y2": 23 }, @@ -473,7 +449,6 @@ }, { "om_terrain": "ranch_camp_58", - "om_special": "ranch_camp", "place_nested": [ { "chunks": [ "tacoma_commune_lumbermill_7" ], "x": 0, "y": 2 } ], "//": "finish the well", "set": [ @@ -483,7 +458,6 @@ }, { "om_terrain": "ranch_camp_65", - "om_special": "ranch_camp", "//": "untilled soil in the fields", "set": [ { "square": "terrain", "id": "t_dirt", "x": 0, "y": 4, "x2": 12, "y2": 18 } ] } @@ -516,7 +490,6 @@ "update_mapgen": [ { "om_terrain": "ranch_camp_56", - "om_special": "ranch_camp", "//": "finish western palisade", "set": [ { "square": "terrain", "id": "t_palisade", "x": 23, "y": 7, "x2": 23, "y2": 10 }, @@ -525,12 +498,10 @@ }, { "om_terrain": "ranch_camp_58", - "om_special": "ranch_camp", "place_nested": [ { "chunks": [ "tacoma_commune_lumbermill_8_done" ], "x": 0, "y": 2 } ] }, { "om_terrain": "ranch_camp_59", - "om_special": "ranch_camp", "place_nested": [ { "chunks": [ "tacoma_commune_toolshed_8" ], "x": 13, "y": 17 }, { "chunks": [ "tacoma_commune_clinic_8" ], "x": 0, "y": 2 } @@ -538,7 +509,6 @@ }, { "om_terrain": "ranch_camp_65", - "om_special": "ranch_camp", "//": "tilled soil in the fields", "set": [ { "square": "terrain", "id": "t_dirtmound", "x": 1, "y": 5, "x2": 2, "y2": 17 }, @@ -549,7 +519,6 @@ }, { "om_terrain": "ranch_camp_68", - "om_special": "ranch_camp", "place_nested": [ { "chunks": [ "tacoma_commune_outhouse_8" ], "x": 16, "y": 1 } ] } ] @@ -581,7 +550,6 @@ "update_mapgen": [ { "om_terrain": "ranch_camp_59", - "om_special": "ranch_camp", "place_nested": [ { "chunks": [ "tacoma_commune_toolshed_9_done" ], "x": 13, "y": 17 }, { "chunks": [ "tacoma_commune_clinic_9" ], "x": 0, "y": 2 } @@ -589,7 +557,6 @@ }, { "om_terrain": "ranch_camp_68", - "om_special": "ranch_camp", "place_nested": [ { "chunks": [ "tacoma_commune_outhouse_9_done" ], "x": 16, "y": 1 } ] } ] @@ -621,12 +588,10 @@ "update_mapgen": [ { "om_terrain": "ranch_camp_59", - "om_special": "ranch_camp", "place_nested": [ { "chunks": [ "tacoma_commune_clinic_10" ], "x": 0, "y": 2 } ] }, { "om_terrain": "ranch_camp_60", - "om_special": "ranch_camp", "place_nested": [ { "chunks": [ "tacoma_commune_chopshop_10" ], "x": 0, "y": 4 } ] } ] @@ -658,17 +623,14 @@ "update_mapgen": [ { "om_terrain": "ranch_camp_59", - "om_special": "ranch_camp", "place_nested": [ { "chunks": [ "tacoma_commune_clinic_11" ], "x": 0, "y": 2 } ] }, { "om_terrain": "ranch_camp_60", - "om_special": "ranch_camp", "place_nested": [ { "chunks": [ "tacoma_commune_chopshop_11" ], "x": 0, "y": 4 } ] }, { "om_terrain": "ranch_camp_61", - "om_special": "ranch_camp", "place_vehicles": [ { "vehicle": "car", "chance": 100, "rotation": 270, "x": 1, "y": 20 }, { "vehicle": "cube_van_cheap", "chance": 100, "rotation": 90, "x": 10, "y": 10 }, @@ -678,7 +640,6 @@ }, { "om_terrain": "ranch_camp_69", - "om_special": "ranch_camp", "translate_ter": [ { "from": "t_underbrush", "to": "t_dirt", "x": 0, "y": 0 } ], "place_vehicles": [ { "vehicle": "car_chassis", "chance": 100, "rotation": 0, "x": 3, "y": 14 }, @@ -715,17 +676,14 @@ "update_mapgen": [ { "om_terrain": "ranch_camp_49", - "om_special": "ranch_camp", "place_nested": [ { "chunks": [ "tacoma_commune_junk_shop_12" ], "x": 0, "y": 9 } ] }, { "om_terrain": "ranch_camp_60", - "om_special": "ranch_camp", "place_nested": [ { "chunks": [ "tacoma_commune_chopshop_12_done" ], "x": 0, "y": 4 } ] }, { "om_terrain": "ranch_camp_69", - "om_special": "ranch_camp", "translate_ter": [ { "from": "t_underbrush", "to": "t_dirt", "x": 0, "y": 0 } ], "place_vehicles": [ { "vehicle": "cube_van", "chance": 100, "rotation": 180, "x": 13, "y": 15 } ] } @@ -758,17 +716,14 @@ "update_mapgen": [ { "om_terrain": "ranch_camp_49", - "om_special": "ranch_camp", "place_nested": [ { "chunks": [ "tacoma_commune_junk_shop_13" ], "x": 0, "y": 9 } ] }, { "om_terrain": "ranch_camp_66", - "om_special": "ranch_camp", "place_npcs": [ { "class": "ranch_barber", "x": 5, "y": 3 } ] }, { "om_terrain": "ranch_camp_70", - "om_special": "ranch_camp", "translate_ter": [ { "from": "t_underbrush", "to": "t_dirt", "x": 0, "y": 0 } ], "place_vehicles": [ { "vehicle": "car_mini", "chance": 100, "rotation": 45, "x": 8, "y": 3 } ] } @@ -801,17 +756,14 @@ "update_mapgen": [ { "om_terrain": "ranch_camp_49", - "om_special": "ranch_camp", "place_nested": [ { "chunks": [ "tacoma_commune_junk_shop_14_done" ], "x": 0, "y": 9 } ] }, { "om_terrain": "ranch_camp_51", - "om_special": "ranch_camp", "place_nested": [ { "chunks": [ "tacoma_commune_bar_14" ], "x": 0, "y": 0 } ] }, { "om_terrain": "ranch_camp_61", - "om_special": "ranch_camp", "translate_ter": [ { "from": "t_underbrush", "to": "t_dirt", "x": 0, "y": 0 } ], "place_vehicles": [ { "vehicle": "ambulance", "chance": 100, "rotation": 90, "x": 14, "y": 4 } ] } @@ -843,7 +795,6 @@ "end": { "update_mapgen": { "om_terrain": "ranch_camp_51", - "om_special": "ranch_camp", "place_nested": [ { "chunks": [ "tacoma_commune_bar_15" ], "x": 0, "y": 0 } ] } } @@ -874,12 +825,10 @@ "update_mapgen": [ { "om_terrain": "ranch_camp_51", - "om_special": "ranch_camp", "place_nested": [ { "chunks": [ "tacoma_commune_bar_16_done" ], "x": 0, "y": 0 } ] }, { "om_terrain": "ranch_camp_52", - "om_special": "ranch_camp", "place_nested": [ { "chunks": [ "tacoma_commune_greenhouse_16" ], "x": 2, "y": 10 } ] } ] @@ -911,7 +860,6 @@ "update_mapgen": [ { "om_terrain": "ranch_camp_52", - "om_special": "ranch_camp", "place_nested": [ { "chunks": [ "tacoma_commune_greenhouse_17_done" ], "x": 2, "y": 10 } ] } ] diff --git a/data/mods/Aftershock/items/afs_bioparts.json b/data/mods/Aftershock/items/afs_bioparts.json index 96a2259546a8e..4a98739889e9d 100644 --- a/data/mods/Aftershock/items/afs_bioparts.json +++ b/data/mods/Aftershock/items/afs_bioparts.json @@ -106,8 +106,6 @@ "dispersion": 90, "durability": 7, "loudness": 8, - "max_charges": 80, - "initial_charges": 80, "ammo_effects": [ "LASER", "INCENDIARY" ], "flags": [ "NO_UNLOAD", "NON-FOULING" ] } diff --git a/data/mods/Aftershock/items/afs_tools.json b/data/mods/Aftershock/items/afs_tools.json index e256f1b6bd594..188b848e456d0 100644 --- a/data/mods/Aftershock/items/afs_tools.json +++ b/data/mods/Aftershock/items/afs_tools.json @@ -19,7 +19,7 @@ "active": true, "type": "transform" }, - { "revert_to": "afs_atomic_smartphone", "type": "CAMERA" } + { "type": "CAMERA" } ], "flags": [ "WATCH", "ALARMCLOCK" ] }, diff --git a/data/mods/Aftershock/maps/afs_furniture.json b/data/mods/Aftershock/maps/afs_furniture.json index 32f0d048acf60..c26822de67bc0 100644 --- a/data/mods/Aftershock/maps/afs_furniture.json +++ b/data/mods/Aftershock/maps/afs_furniture.json @@ -8,7 +8,6 @@ "color": "white", "move_cost_mod": -1, "required_str": 10, - "insulation": 3, "flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR", "MINEABLE", "EASY_DECONSTRUCT" ], "deconstruct": { "items": [ { "item": "afs_fridge", "count": 1 } ] }, "max_volume": "1000 L", @@ -42,7 +41,6 @@ "color": "light_blue", "move_cost_mod": -1, "required_str": 10, - "insulation": 3, "flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR", "MINEABLE", "EASY_DECONSTRUCT" ], "deconstruct": { "items": [ { "item": "afs_freezer", "count": 1 } ] }, "max_volume": "1000 L", diff --git a/data/mods/FictonalWeapons/fic_mods.json b/data/mods/FictonalWeapons/fic_mods.json index 0010bc74ef993..c699d66ae3be0 100644 --- a/data/mods/FictonalWeapons/fic_mods.json +++ b/data/mods/FictonalWeapons/fic_mods.json @@ -60,7 +60,6 @@ "bashing": 5, "handling_modifier": -5, "price": 20000, - "min_skills": [ [ "gun", 5 ] ], - "ups_charges": 5 + "min_skills": [ [ "gun", 5 ] ] } ] diff --git a/data/mods/FictonalWeapons/fic_weapons.json b/data/mods/FictonalWeapons/fic_weapons.json index 0096787d6edc6..b118ba98559c0 100644 --- a/data/mods/FictonalWeapons/fic_weapons.json +++ b/data/mods/FictonalWeapons/fic_weapons.json @@ -227,7 +227,6 @@ "material": [ "steel", "plastic" ], "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON-FOULING" ], "ammo_effects": [ "LIGHTNING", "BEANBAG" ], - "mode_modifier": [ [ "DEFAULT", "auto", 5 ] ], "ups_charges": 6, "skill": "smg", "weight": "2100 g", diff --git a/data/mods/Modular_Turrets/items.json b/data/mods/Modular_Turrets/items.json index e2acab25e34ce..9dce49a7fd94b 100644 --- a/data/mods/Modular_Turrets/items.json +++ b/data/mods/Modular_Turrets/items.json @@ -194,7 +194,6 @@ "use_action": { "type": "place_monster", "monster_id": "mon_turret_disarmed", - "use_message": "Error. No weapon systems found.", "difficulty": 4, "moves": 100, "skill1": "electronics", @@ -213,7 +212,6 @@ "use_action": { "type": "place_monster", "monster_id": "mon_milturret_disarmed", - "use_message": "Error. No weapon systems found.", "difficulty": 5, "moves": 100, "skill1": "electronics", @@ -232,7 +230,6 @@ "use_action": { "type": "place_monster", "monster_id": "mon_advturret_disarmed", - "use_message": "Error. No weapon systems found.", "difficulty": 6, "moves": 100, "skill1": "electronics", diff --git a/data/mods/Salvaged_Robots/monsters.json b/data/mods/Salvaged_Robots/monsters.json index 2cefef9242f74..56fa77f1125ef 100644 --- a/data/mods/Salvaged_Robots/monsters.json +++ b/data/mods/Salvaged_Robots/monsters.json @@ -276,7 +276,6 @@ "gun_type": "robogun_laser", "fake_skills": [ [ "gun", 6 ], [ "rifle", 6 ] ], "fake_dex": 10, - "range": 20, "ranges": [ [ 0, 30, "DEFAULT" ] ], "require_targeting_player": true, "require_targeting_npc": true, @@ -348,7 +347,6 @@ "gun_type": "robogun_nail", "fake_skills": [ [ "gun", 0 ], [ "pistol", 2 ] ], "fake_dex": 8, - "range": 3, "ranges": [ [ 0, 3, "BURST" ] ] } ] @@ -373,7 +371,6 @@ "gun_type": "watercannon", "fake_skills": [ [ "gun", 2 ], [ "launcher", 2 ] ], "fake_dex": 8, - "range": 5, "ranges": [ [ 0, 5, "BURST" ] ] } ], @@ -439,7 +436,6 @@ "fake_skills": [ [ "gun", 3 ], [ "archery", 3 ] ], "fake_dex": 8, "no_ammo_sound": "click!", - "range": 10, "ranges": [ [ 0, 10, "DEFAULT" ] ] } ], @@ -637,7 +633,6 @@ "fake_skills": [ [ "gun", 5 ], [ "rifle", 6 ] ], "fake_dex": 10, "no_ammo_sound": "click!", - "range": 10, "ranges": [ [ 0, 10, "DEFAULT" ] ] } ] @@ -703,7 +698,6 @@ "fake_skills": [ [ "gun", 2 ], [ "shotgun", 2 ] ], "fake_dex": 9, "no_ammo_sound": "click click!", - "range": 8, "ranges": [ [ 0, 8, "DEFAULT" ] ] } ] @@ -764,7 +758,6 @@ "fake_skills": [ [ "gun", 4 ], [ "launcher", 4 ] ], "fake_dex": 9, "no_ammo_sound": "click!", - "range": 15, "ranges": [ [ 0, 15, "DEFAULT" ] ], "require_targeting_player": true, "require_targeting_npc": true, @@ -796,7 +789,6 @@ "fake_skills": [ [ "gun", 5 ], [ "rifle", 5 ] ], "fake_dex": 10, "no_ammo_sound": "click!", - "range": 18, "ranges": [ [ 0, 4, "BURST" ], [ 5, 8, "AUTO" ], [ 9, 16, "DEFAULT" ] ], "require_targeting_player": true, "require_targeting_npc": true, @@ -829,7 +821,6 @@ "fake_skills": [ [ "gun", 5 ], [ "rifle", 5 ] ], "fake_dex": 10, "no_ammo_sound": "click!", - "range": 20, "ranges": [ [ 0, 5, "DEFAULT" ], [ 6, 10, "BURST" ], [ 11, 20, "DEFAULT" ] ], "require_targeting_player": true, "require_targeting_npc": true, @@ -861,7 +852,6 @@ "fake_skills": [ [ "gun", 5 ], [ "rifle", 5 ] ], "fake_dex": 10, "no_ammo_sound": "click!", - "range": 20, "ranges": [ [ 0, 5, "DEFAULT" ], [ 6, 10, "BURST" ], [ 11, 20, "DEFAULT" ] ], "require_targeting_player": true, "require_targeting_npc": true, @@ -893,7 +883,6 @@ "fake_skills": [ [ "gun", 5 ], [ "rifle", 6 ] ], "fake_dex": 10, "no_ammo_sound": "whirrrr!", - "range": 24, "ranges": [ [ 0, 5, "BURST" ], [ 6, 10, "AUTO" ], [ 11, 24, "DEFAULT" ] ], "require_targeting_player": true, "require_targeting_npc": true, @@ -925,7 +914,6 @@ "fake_skills": [ [ "gun", 5 ], [ "rifle", 5 ] ], "fake_dex": 10, "no_ammo_sound": "click!", - "range": 18, "ranges": [ [ 0, 4, "BURST" ], [ 4, 8, "AUTO" ], [ 9, 16, "DEFAULT" ] ], "require_targeting_player": true, "require_targeting_npc": true, @@ -958,7 +946,6 @@ "fake_skills": [ [ "gun", 4 ], [ "launcher", 5 ] ], "fake_dex": 10, "no_ammo_sound": "click!", - "range": 30, "ranges": [ [ 6, 30, "DEFAULT" ] ], "require_targeting_player": true, "require_targeting_npc": true, @@ -989,7 +976,6 @@ "fake_skills": [ [ "gun", 4 ], [ "launcher", 5 ] ], "fake_dex": 10, "no_ammo_sound": "hiss!", - "range": 10, "ranges": [ [ 0, 10, "DEFAULT" ] ], "require_targeting_player": true, "require_targeting_npc": true, @@ -1038,7 +1024,6 @@ "gun_type": "robogun_laser", "fake_skills": [ [ "gun", 5 ], [ "rifle", 5 ] ], "fake_dex": 10, - "range": 18, "ranges": [ [ 0, 8, "AUTO" ], [ 8, 16, "BURST" ] ], "require_targeting_player": true, "require_targeting_npc": true, @@ -1067,7 +1052,6 @@ "gun_type": "robogun_plasma", "fake_skills": [ [ "gun", 5 ], [ "rifle", 5 ] ], "fake_dex": 10, - "range": 18, "ranges": [ [ 4, 16, "DEFAULT" ] ], "require_targeting_player": true, "require_targeting_npc": true, @@ -1096,7 +1080,6 @@ "fake_skills": [ [ "gun", 5 ], [ "rifle", 5 ] ], "fake_dex": 10, "no_ammo_sound": "buzz!", - "range": 18, "ranges": [ [ 0, 18, "DEFAULT" ] ], "require_targeting_player": true, "require_targeting_npc": true, @@ -1125,7 +1108,6 @@ "gun_type": "robogun_lightning", "fake_skills": [ [ "gun", 5 ], [ "rifle", 5 ] ], "fake_dex": 10, - "range": 12, "ranges": [ [ 0, 12, "DEFAULT" ] ], "require_targeting_player": true, "require_targeting_npc": true, @@ -1153,7 +1135,6 @@ "gun_type": "robogun_emp", "fake_skills": [ [ "gun", 5 ], [ "rifle", 5 ] ], "fake_dex": 10, - "range": 18, "ranges": [ [ 0, 4, "BURST" ], [ 4, 8, "AUTO" ], [ 9, 16, "DEFAULT" ] ], "require_targeting_player": true, "require_targeting_npc": true, @@ -1192,7 +1173,6 @@ "fake_skills": [ [ "gun", 2 ], [ "shotgun", 2 ] ], "fake_dex": 9, "no_ammo_sound": "click!", - "range": 3, "ranges": [ [ 0, 3, "DEFAULT" ] ] } ] @@ -1255,7 +1235,6 @@ "fake_skills": [ [ "gun", 4 ], [ "launcher", 5 ] ], "fake_dex": 10, "no_ammo_sound": "hiss!", - "range": 10, "ranges": [ [ 0, 10, "DEFAULT" ] ] } ], @@ -1286,7 +1265,6 @@ "fake_skills": [ [ "gun", 3 ], [ "smg", 3 ] ], "fake_dex": 9, "no_ammo_sound": "click click!", - "range": "10", "ranges": [ [ 0, 10, "AUTO" ] ] } ] @@ -1325,7 +1303,6 @@ "fake_skills": [ [ "gun", 5 ], [ "rifle", 5 ] ], "fake_dex": 10, "no_ammo_sound": "click!", - "range": 18, "ranges": [ [ 0, 16, "BURST" ] ], "require_targeting_player": true } @@ -1357,7 +1334,6 @@ "fake_dex": 11, "fake_per": 10, "no_ammo_sound": "click!", - "range": 30, "ranges": [ [ 0, 30, "DEFAULT" ] ], "require_targeting_player": true, "require_targeting_npc": true, @@ -1391,7 +1367,6 @@ "gun_type": "robogun_laser", "fake_skills": [ [ "gun", 5 ], [ "rifle", 5 ] ], "fake_dex": 8, - "range": 5, "ranges": [ [ 0, 5, "AUTO" ] ] } ] @@ -1484,7 +1459,6 @@ "vision_day": 20, "vision_night": 10, "revert_to_itype": "bot_chickenbot_horror", - "remove:special_attack": [ "CHICKENBOT" ], "special_attacks": [ [ "SMASH", 30 ], [ "SHRIEK", 10 ], [ "SHRIEK_STUN", 10 ] ] }, { @@ -1503,7 +1477,6 @@ "vision_day": 20, "vision_night": 10, "revert_to_itype": "bot_chickenbot_terror", - "remove:special_attack": [ "CHICKENBOT" ], "special_attacks": [ [ "SMASH", 30 ], [ "SHRIEK", 10 ], [ "SHRIEK_STUN", 10 ] ] }, { @@ -1522,7 +1495,6 @@ "vision_day": 20, "vision_night": 10, "revert_to_itype": "bot_chickenbot_nightmare", - "remove:special_attack": [ "CHICKENBOT" ], "special_attacks": [ [ "SMASH", 30 ], [ "SHRIEK", 10 ], [ "SHRIEK_STUN", 10 ], [ "RANGED_PULL", 10 ], [ "GRAB_DRAG", 10 ] ], "extend": { "flags": [ "GRABS" ] } }, @@ -1583,7 +1555,6 @@ "attack_effs": [ { "id": "downed", "chance": 20, "duration": 10 }, { "id": "stunned", "chance": 20, "duration": 10 } ], "vision_day": 20, "revert_to_itype": "bot_tankbot_king", - "remove:special_attack": [ "MULTI_ROBOT" ], "special_attacks": [ [ "SMASH", 15 ] ] }, { @@ -1606,7 +1577,6 @@ "vision_day": 20, "revert_to_itype": "bot_tankbot_sultan", "emit_fields": [ "emit_nuclear_trail" ], - "remove:special_attack": [ "MULTI_ROBOT" ], "special_attacks": [ [ "SMASH", 30 ], [ "GRAB", 20 ] ], "extend": { "flags": [ "STUMBLES", "GRABS" ] } }