Migrate bicycle, wheelchair, inflatable boat items

CleverRaven · Jul 24, 2022 · 35b7de4 · 35b7de4
1 parent 73065b0
commit 35b7de4
Show file tree

Hide file tree

Showing 5 changed files with 92 additions and 59 deletions.
diff --git a/data/json/item_actions.json b/data/json/item_actions.json
@@ -1035,11 +1035,6 @@
     "id": "change_scent",
     "name": { "str": "Mask scent" }
   },
-  {
-    "type": "item_action",
-    "id": "unfold_vehicle",
-    "name": { "str": "Unfold" }
-  },
   {
     "type": "item_action",
     "id": "install_bionic",

diff --git a/data/json/items/migration.json b/data/json/items/migration.json
@@ -1795,5 +1795,23 @@
     "id": "canola",
     "type": "MIGRATION",
     "replace": "seed_canola"
+  },
+  {
+    "id": "folding_bicycle",
+    "type": "MIGRATION",
+    "replace": "folded_bicycle",
+    "reset_item_vars": true
+  },
+  {
+    "id": "folded_wheelchair",
+    "type": "MIGRATION",
+    "replace": "folded_wheelchair_generic",
+    "reset_item_vars": true
+  },
+  {
+    "id": "inflatable_boat",
+    "type": "MIGRATION",
+    "replace": "folded_inflatable_boat",
+    "reset_item_vars": true
   }
 ]
diff --git a/data/json/items/tool/deployable.json b/data/json/items/tool/deployable.json
@@ -138,25 +138,18 @@
     }
   },
   {
-    "id": "folding_bicycle",
+    "id": "folded_bicycle",
     "type": "TOOL",
-    "name": { "str": "folding bicycle" },
-    "description": "This is a bicycle folded into a relatively portable package.",
-    "weight": "10160 g",
-    "volume": "76651 ml",
-    "//": "Data taken from given values/dimensions for the Brompton S1E folding bicycle",
-    "price": 35000,
-    "price_postapoc": 2000,
-    "to_hit": -5,
-    "bashing": 10,
-    "material": [ "steel" ],
+    "copy-from": "generic_folded_vehicle",
+    "name": { "str": "folded Bicycle" },
+    "description": "A folded Bicycle.",
+    "weight": "20790 g",
+    "volume": "18500 ml",
     "symbol": "0",
     "color": "light_gray",
-    "use_action": {
-      "type": "unfold_vehicle",
-      "vehicle_name": "bicycle",
-      "unfold_msg": "You painstakingly unfold the bicycle and make it ready to ride.",
-      "moves": 500
+    "variables": {
+      "vehicle_name": "Bicycle",
+      "folding_bicycle_parts": "[{\"id\":\"folding_frame\",\"base\":{\"typeid\":\"foldframe\",\"item_tags\":[\"VEHICLE\"]},\"mount_dx\":0,\"mount_dy\":0},{\"id\":\"saddle_pedal\",\"base\":{\"typeid\":\"saddle\",\"item_tags\":[\"VEHICLE\"]},\"mount_dx\":0,\"mount_dy\":0},{\"id\":\"horn_bicycle\",\"base\":{\"typeid\":\"horn_bicycle\",\"item_vars\":{\"magazine_converted\":\"1\"},\"item_tags\":[\"VEHICLE\"]},\"mount_dx\":0,\"mount_dy\":0},{\"id\":\"foot_pedals\",\"base\":{\"typeid\":\"foot_crank\",\"item_tags\":[\"VEHICLE\"]},\"mount_dx\":0,\"mount_dy\":0},{\"id\":\"folding_frame\",\"base\":{\"typeid\":\"foldframe\",\"item_tags\":[\"VEHICLE\"]},\"mount_dx\":1,\"mount_dy\":0},{\"id\":\"wheel_mount_light_steerable\",\"base\":{\"typeid\":\"wheel_mount_light\",\"item_tags\":[\"VEHICLE\"]},\"mount_dx\":1,\"mount_dy\":0},{\"id\":\"wheel_bicycle\",\"base\":{\"typeid\":\"wheel_bicycle\",\"item_tags\":[\"VEHICLE\"]},\"mount_dx\":1,\"mount_dy\":0},{\"id\":\"folding_frame\",\"base\":{\"typeid\":\"foldframe\",\"item_tags\":[\"VEHICLE\"]},\"mount_dx\":-1,\"mount_dy\":0},{\"id\":\"wheel_mount_light\",\"base\":{\"typeid\":\"wheel_mount_light\",\"item_tags\":[\"VEHICLE\"]},\"mount_dx\":-1,\"mount_dy\":0},{\"id\":\"wheel_bicycle\",\"variant\":\"rear\",\"base\":{\"typeid\":\"wheel_bicycle\",\"item_tags\":[\"VEHICLE\"]},\"mount_dx\":-1,\"mount_dy\":0},{\"id\":\"basketsm_bike\",\"variant\":\"rear\",\"base\":{\"typeid\":\"bike_basket\",\"item_tags\":[\"VEHICLE\"]},\"mount_dx\":-1,\"mount_dy\":0}]"
     }
   },
   {
@@ -189,28 +182,6 @@
     "color": "light_gray",
     "use_action": { "type": "deploy_furn", "furn_type": "f_metal_butcher_rack" }
   },
-  {
-    "id": "inflatable_boat",
-    "type": "TOOL",
-    "symbol": "0",
-    "color": "light_gray",
-    "name": { "str": "inflatable boat" },
-    "description": "This rubber rowboat (oars included) is deflated for storage.  Activate it (having an air pump in inventory) to inflate and launch.",
-    "price": 350000,
-    "price_postapoc": 4000,
-    "material": [ "rubber" ],
-    "weight": "1100 g",
-    "volume": "10000 ml",
-    "bashing": 10,
-    "to_hit": -5,
-    "use_action": {
-      "type": "unfold_vehicle",
-      "vehicle_name": "inflatable_boat",
-      "tools_needed": { "hand_pump": 1 },
-      "unfold_msg": "You painstakingly unfold, inflate, and launch the %s.",
-      "moves": 15000
-    }
-  },
   {
     "id": "metal_smoking_rack",
     "type": "TOOL",
@@ -368,21 +339,33 @@
     "use_action": { "type": "deploy_furn", "furn_type": "f_manual_tire_changer" }
   },
   {
-    "id": "folded_wheelchair",
+    "id": "folded_wheelchair_generic",
     "type": "TOOL",
+    "copy-from": "generic_folded_vehicle",
     "name": { "str": "folded wheelchair" },
-    "description": "A folded wheelchair.",
+    "description": "A folded Wheelchair.",
     "weight": "10586 g",
     "volume": "13500 ml",
-    "longest_side": "92 cm",
     "symbol": "/",
     "color": "light_gray",
-    "flags": [ "NO_REPAIR" ],
-    "use_action": {
-      "type": "unfold_vehicle",
-      "vehicle_name": "wheelchair",
-      "unfold_msg": "You painstakingly unfold the wheelchair and make it ready to use.",
-      "moves": 500
+    "variables": {
+      "vehicle_name": "Wheelchair",
+      "folding_bicycle_parts": "[{\"id\":\"folding_frame\",\"base\":{\"typeid\":\"foldframe\",\"bday\":0,\"last_temp_check\":0,\"item_tags\":[\"VEHICLE\"]},\"mount_dx\":0,\"mount_dy\":0},{\"id\":\"folding_seat\",\"base\":{\"typeid\":\"sheet\",\"bday\":0,\"last_temp_check\":0,\"item_tags\":[\"VEHICLE\"]},\"mount_dx\":0,\"mount_dy\":0},{\"id\":\"wheel_mount_light\",\"base\":{\"typeid\":\"wheel_mount_light\",\"bday\":0,\"last_temp_check\":0,\"item_tags\":[\"VEHICLE\"]},\"mount_dx\":0,\"mount_dy\":0},{\"id\":\"wheel_wheelchair\",\"base\":{\"typeid\":\"wheel_wheelchair\",\"bday\":0,\"last_temp_check\":0,\"item_tags\":[\"VEHICLE\"]},\"mount_dx\":0,\"mount_dy\":0},{\"id\":\"hand_rims\",\"base\":{\"typeid\":\"hand_rims\",\"bday\":0,\"last_temp_check\":0,\"item_tags\":[\"VEHICLE\"]},\"mount_dx\":0,\"mount_dy\":0},{\"id\":\"basketsm_wheelchair\",\"base\":{\"typeid\":\"bike_basket\",\"bday\":0,\"last_temp_check\":0,\"item_tags\":[\"VEHICLE\"]},\"mount_dx\":0,\"mount_dy\":0}]"
+    }
+  },
+  {
+    "id": "folded_inflatable_boat",
+    "type": "TOOL",
+    "copy-from": "generic_folded_vehicle",
+    "name": { "str": "inflatable boat" },
+    "description": "This rubber rowboat in original packaging (oars and pump included) is deflated for storage.  Activate it to inflate and launch.",
+    "weight": "32420 g",
+    "volume": "9000 ml",
+    "symbol": "0",
+    "color": "light_gray",
+    "variables": {
+      "vehicle_name": "inflatable boat",
+      "folding_bicycle_parts": "[{\"id\":\"inflatable_section\",\"base\":{\"typeid\":\"inflatable_section\",\"bday\":0,\"last_temp_check\":0,\"item_tags\":[\"VEHICLE\"]},\"mount_dx\":0,\"mount_dy\":0},{\"id\":\"folding_seat\",\"base\":{\"typeid\":\"sheet\",\"bday\":0,\"last_temp_check\":0,\"item_tags\":[\"VEHICLE\"]},\"mount_dx\":0,\"mount_dy\":0},{\"id\":\"inflatable_airbag\",\"base\":{\"typeid\":\"inflatable_airbag\",\"bday\":0,\"last_temp_check\":0,\"item_tags\":[\"VEHICLE\"]},\"mount_dx\":0,\"mount_dy\":0},{\"id\":\"hand_paddles\",\"base\":{\"typeid\":\"hand_paddles\",\"bday\":0,\"last_temp_check\":0,\"item_tags\":[\"VEHICLE\"]},\"mount_dx\":0,\"mount_dy\":0},{\"id\":\"inflatable_section\",\"base\":{\"typeid\":\"inflatable_section\",\"bday\":0,\"last_temp_check\":0,\"item_tags\":[\"VEHICLE\"]},\"mount_dx\":1,\"mount_dy\":0},{\"id\":\"inflatable_airbag\",\"base\":{\"typeid\":\"inflatable_airbag\",\"bday\":0,\"last_temp_check\":0,\"item_tags\":[\"VEHICLE\"]},\"mount_dx\":1,\"mount_dy\":0},{\"id\":\"inflatable_section\",\"base\":{\"typeid\":\"inflatable_section\",\"bday\":0,\"last_temp_check\":0,\"item_tags\":[\"VEHICLE\"]},\"mount_dx\":1,\"mount_dy\":1},{\"id\":\"inflatable_airbag\",\"base\":{\"typeid\":\"inflatable_airbag\",\"bday\":0,\"last_temp_check\":0,\"item_tags\":[\"VEHICLE\"]},\"mount_dx\":1,\"mount_dy\":1},{\"id\":\"inflatable_section\",\"base\":{\"typeid\":\"inflatable_section\",\"bday\":0,\"last_temp_check\":0,\"item_tags\":[\"VEHICLE\"]},\"mount_dx\":0,\"mount_dy\":1},{\"id\":\"inflatable_airbag\",\"base\":{\"typeid\":\"inflatable_airbag\",\"bday\":0,\"last_temp_check\":0,\"item_tags\":[\"VEHICLE\"]},\"mount_dx\":0,\"mount_dy\":1}]"
     }
   }
 ]
diff --git a/data/json/obsolete.json b/data/json/obsolete.json
@@ -661,5 +661,48 @@
     "description": "A long soft leather rifle case.  Provides storage for long arms and rifles.  Includes a small pocket, strap and handle.",
     "flags": [ "WATER_FRIENDLY", "STURDY", "BELTED", "OVERSIZE", "UNDERSIZE", "OBSOLETE" ],
     "price": 0
+  },
+  {
+    "id": "folding_bicycle",
+    "type": "TOOL",
+    "name": { "str": "folding bicycle" },
+    "description": "This is a bicycle folded into a relatively portable package.",
+    "weight": "10160 g",
+    "volume": "76651 ml",
+    "//": "Data taken from given values/dimensions for the Brompton S1E folding bicycle",
+    "price": 35000,
+    "price_postapoc": 2000,
+    "to_hit": -5,
+    "bashing": 10,
+    "material": [ "steel" ],
+    "symbol": "0",
+    "color": "light_gray"
+  },
+  {
+    "id": "folded_wheelchair",
+    "type": "TOOL",
+    "name": { "str": "folded wheelchair" },
+    "description": "A folded wheelchair.",
+    "weight": "10586 g",
+    "volume": "13500 ml",
+    "longest_side": "92 cm",
+    "symbol": "/",
+    "color": "light_gray",
+    "flags": [ "NO_REPAIR" ]
+  },
+  {
+    "id": "inflatable_boat",
+    "type": "TOOL",
+    "symbol": "0",
+    "color": "light_gray",
+    "name": { "str": "inflatable boat" },
+    "description": "This rubber rowboat (oars included) is deflated for storage.  Activate it (having an air pump in inventory) to inflate and launch.",
+    "price": 350000,
+    "price_postapoc": 4000,
+    "material": [ "rubber" ],
+    "weight": "1100 g",
+    "volume": "10000 ml",
+    "bashing": 10,
+    "to_hit": -5
   }
 ]
diff --git a/data/mods/TEST_DATA/items.json b/data/mods/TEST_DATA/items.json
@@ -3080,13 +3080,7 @@
     "bashing": 10,
     "material": [ "steel" ],
     "symbol": "0",
-    "color": "light_gray",
-    "use_action": {
-      "type": "unfold_vehicle",
-      "vehicle_name": "bicycle",
-      "unfold_msg": "You painstakingly unfold the bicycle and make it ready to ride.",
-      "moves": 500
-    }
+    "color": "light_gray"
   },
   {
     "id": "test_armor_chitin",