Adjust item groups, professions to new folded items

CleverRaven · Aug 13, 2022 · 4229494 · 4229494
1 parent 2ab06d7
commit 4229494
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 20 deletions.
diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json
@@ -2465,7 +2465,7 @@
       [ "fish_sandwich", 2 ],
       [ "mango", 1 ],
       [ "hand_pump", 5 ],
-      [ "inflatable_boat", 1 ]
+      [ "folded_inflatable_boat", 1 ]
     ]
   },
   {

diff --git a/data/json/itemgroups/Clothing_Gear/gear.json b/data/json/itemgroups/Clothing_Gear/gear.json
@@ -196,7 +196,10 @@
         "collection": [ { "item": "rebreather_filter", "prob": 50 }, { "item": "rebreather", "prob": 90, "charges": [ 10, 60 ] } ],
         "prob": 20
       },
-      { "collection": [ { "item": "inflatable_boat", "prob": 30 }, { "item": "hand_pump", "prob": 60 } ], "prob": 15 }
+      {
+        "collection": [ { "item": "folded_inflatable_boat", "prob": 30 }, { "item": "hand_pump", "prob": 60 } ],
+        "prob": 15
+      }
     ]
   },
   {

diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json
@@ -625,7 +625,7 @@
       { "item": "glowstick", "prob": 60, "charges": 1400 },
       { "item": "handflare", "prob": 40, "charges": 300 },
       [ "hand_pump", 10 ],
-      [ "inflatable_boat", 10 ],
+      [ "folded_inflatable_boat", 10 ],
       [ "grapnel", 40 ],
       [ "fishing_rod_professional", 60 ],
       [ "fishing_rod_basic", 60 ],
@@ -1268,7 +1268,7 @@
       [ "hose", 15 ],
       [ "water_faucet", 20 ],
       [ "screwdriver", 40 ],
-      [ "inflatable_boat", 10 ],
+      [ "folded_inflatable_boat", 10 ],
       [ "hand_pump", 10 ],
       [ "wrench", 30 ],
       [ "pipe", 20 ],
@@ -2389,7 +2389,7 @@
       [ "soup_meat", 15 ],
       [ "soup_chicken", 15 ],
       [ "soup_mushroom", 15 ],
-      [ "inflatable_boat", 5 ],
+      [ "folded_inflatable_boat", 5 ],
       [ "hand_pump", 5 ],
       [ "soup_tomato", 15 ],
       [ "soup_dumplings", 15 ],

diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
@@ -208,7 +208,7 @@
       { "item": "oxylamp", "prob": 50, "charges-min": 0 },
       [ "bathroom_scale", 50 ],
       [ "polisher", 6 ],
-      [ "inflatable_boat", 10 ],
+      [ "folded_inflatable_boat", 10 ],
       [ "hand_pump", 10 ],
       [ "wakizashi_inferior", 30 ],
       [ "katana_inferior", 30 ],
@@ -666,7 +666,7 @@
       [ "kukri", 2 ],
       [ "knife_hunting", 4 ],
       [ "knife_rambo", 20 ],
-      [ "inflatable_boat", 40 ],
+      [ "folded_inflatable_boat", 40 ],
       [ "hand_pump", 40 ],
       [ "throwing_knife", 14 ],
       [ "leg_sheath6", 10 ],
@@ -857,7 +857,7 @@
       { "item": "game_watch", "prob": 15 },
       { "item": "deck_of_cards", "prob": 25 },
       { "item": "atomic_light", "prob": 1 },
-      { "item": "inflatable_boat", "prob": 10 },
+      { "item": "folded_inflatable_boat", "prob": 10 },
       { "item": "hand_pump", "prob": 15 },
       { "item": "toastem", "prob": 45 },
       { "item": "toastem2", "prob": 45 },
@@ -872,7 +872,7 @@
       { "item": "teleumbrella", "prob": 4 },
       { "group": "kids_books", "prob": 215 },
       { "item": "novel_pulp", "prob": 30 },
-      { "item": "folding_bicycle", "prob": 3 },
+      { "item": "folded_bicycle", "prob": 3 },
       { "item": "sunglasses", "prob": 25 },
       { "item": "cowboy_hat", "prob": 25 },
       { "item": "mp3", "prob": 35, "charges": [ 0, 100 ] },
@@ -1141,7 +1141,7 @@
           { "item": "bike_rack", "prob": 20 },
           { "item": "small_storage_battery", "prob": 10 },
           { "item": "alternator_bicycle", "prob": 10 },
-          { "item": "folding_bicycle", "prob": 10 },
+          { "item": "folded_bicycle", "prob": 10 },
           { "item": "roller_blades", "prob": 10 }
         ]
       },

diff --git a/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json b/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json
@@ -117,7 +117,7 @@
       [ "disc_golf", 40 ],
       [ "magic_8_ball", 30 ],
       [ "novel_pulp", 20 ],
-      [ "folding_bicycle", 5 ],
+      [ "folded_bicycle", 5 ],
       [ "sunglasses", 25 ],
       [ "cowboy_hat", 25 ],
       { "item": "mp3", "prob": 40, "charges": 100 },

diff --git a/data/json/itemgroups/activities_hobbies.json b/data/json/itemgroups/activities_hobbies.json
@@ -225,7 +225,7 @@
       { "item": "bandolier_wrist", "prob": 100 },
       { "item": "fitness_band", "prob": 10 },
       { "item": "hand_pump", "prob": 10 },
-      { "item": "inflatable_boat", "prob": 4 }
+      { "item": "folded_inflatable_boat", "prob": 4 }
     ]
   },
   {
@@ -241,7 +241,7 @@
       { "item": "misc_repairkit", "prob": 5, "charges-min": 0 },
       { "item": "mess_kit", "prob": 10, "charges": [ 0, 500 ] },
       [ "pot", 20 ],
-      [ "inflatable_boat", 25 ],
+      [ "folded_inflatable_boat", 25 ],
       [ "hand_pump", 5 ],
       [ "pot_copper", 5 ],
       [ "teapot", 5 ],
@@ -384,7 +384,7 @@
       { "item": "electric_lantern", "prob": 8, "charges": [ 0, 100 ] },
       { "item": "oil_lamp", "prob": 5, "charges-min": 0 },
       { "item": "lamp_oil", "prob": 5, "charges-min": 0 },
-      [ "folding_bicycle", 1 ],
+      [ "folded_bicycle", 1 ],
       [ "coat_rain", 10 ],
       [ "hood_rain", 5 ],
       [ "rubber_harness_dog", 3 ],
@@ -448,7 +448,7 @@
       { "item": "misc_repairkit", "prob": 5, "charges-min": 0 },
       { "item": "mess_kit", "prob": 10, "charges": [ 0, 500 ] },
       [ "pot", 20 ],
-      [ "inflatable_boat", 25 ],
+      [ "folded_inflatable_boat", 25 ],
       [ "hand_pump", 5 ],
       [ "pot_copper", 5 ],
       [ "teapot", 5 ],

diff --git a/data/json/monsterdrops/feral_humans.json b/data/json/monsterdrops/feral_humans.json
@@ -910,7 +910,7 @@
       { "item": "cookies", "prob": 100 },
       { "group": "harddrugs", "prob": 10 },
       { "item": "dentures", "prob": 75 },
-      { "item": "folded_wheelchair", "damage": [ 1, 4 ], "prob": 100 }
+      { "item": "folded_wheelchair_generic", "damage": [ 1, 4 ], "prob": 100 }
     ]
   }
 ]
diff --git a/data/json/npcs/items_generic.json b/data/json/npcs/items_generic.json
@@ -548,7 +548,7 @@
       [ "flask_hip", 5 ],
       [ "flour", 10 ],
       [ "flyer", 1 ],
-      [ "folding_bicycle", 1 ],
+      [ "folded_bicycle", 1 ],
       [ "folding_poncho", 5 ],
       [ "foon", 1 ],
       [ "football", 1 ],

diff --git a/data/json/professions.json b/data/json/professions.json
@@ -865,7 +865,7 @@
       "both": {
         "items": [
           "helmet_bike",
-          "folding_bicycle",
+          "folded_bicycle",
           "under_armor_shorts",
           "under_armor",
           "socks_ankle",
@@ -3422,7 +3422,7 @@
           "newest_newspaper",
           "newest_newspaper",
           "newest_newspaper",
-          "folding_bicycle"
+          "folded_bicycle"
         ],
         "entries": [ { "group": "charged_smart_phone" } ]
       },
@@ -4940,7 +4940,7 @@
     "traits": [ "OUTDOORSMAN" ],
     "items": {
       "both": {
-        "items": [ "trunks", "bastsandals", "dive_bag", "wristwatch", "flotation_vest", "hand_pump", "inflatable_boat" ],
+        "items": [ "trunks", "bastsandals", "dive_bag", "wristwatch", "flotation_vest", "hand_pump", "folded_inflatable_boat" ],
         "entries": [
           { "item": "rashguard", "variant": "tropical_rashguard_shirt" },
           { "item": "hat_ball", "variant": "generic_hatball" },