diff --git a/data/json/items/tool/unfoldable.json b/data/json/items/tool/unfoldable.json index b3432b6e43a1d..332509e8b400f 100644 --- a/data/json/items/tool/unfoldable.json +++ b/data/json/items/tool/unfoldable.json @@ -47,7 +47,7 @@ "type": "TOOL", "copy-from": "generic_folded_vehicle", "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.", + "description": "This rubber rowboat (oars included) is deflated for storage. Activate it, having an air pump in inventory, to inflate and launch.", "weight": "32420 g", "volume": "9000 ml", "symbol": "0", diff --git a/data/json/vehicleparts/vehicle_parts.json b/data/json/vehicleparts/vehicle_parts.json index 0dc20533c55a2..a350d3b5edf5a 100644 --- a/data/json/vehicleparts/vehicle_parts.json +++ b/data/json/vehicleparts/vehicle_parts.json @@ -1178,7 +1178,9 @@ "item": "inflatable_section", "location": "structure", "folded_volume": "750 ml", + "folding_time": "60 seconds", "unfolding_tools": [ "hand_pump" ], + "unfolding_time": "150 seconds", "requirements": { "install": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "vehicle_screw", 1 ], [ "drilling_standard", 1 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_screw", 1 ] ] }, @@ -1202,7 +1204,9 @@ "item": "inflatable_airbag", "location": "under", "folded_volume": "750 ml", + "folding_time": "60 seconds", "unfolding_tools": [ "hand_pump" ], + "unfolding_time": "150 seconds", "requirements": { "install": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "vehicle_screw", 1 ], [ "drilling_standard", 1 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_screw", 1 ] ] }, diff --git a/doc/JSON_INFO.md b/doc/JSON_INFO.md index 1e839a4a72577..cbdddad066308 100644 --- a/doc/JSON_INFO.md +++ b/doc/JSON_INFO.md @@ -2816,8 +2816,11 @@ Vehicle components when installed on a vehicle. { "id": "hotplate", "hotkey": "h" }, { "id": "pot" } ], -"fold_tools": [ "needle" ], // tool itype_ids required for folding -"unfold_tools": [ "hand_pump" ], // tool itype_ids required for unfolding +"folded_volume": "750 ml", // volume this vpart takes in folded form +"folding_tools": [ "needle_curved" ], // tool itype_ids required for folding +"folding_time": "100 seconds", // time to fold this part +"unfolding_tools": [ "hand_pump" ], // tool itype_ids required for unfolding +"unfolding_time": "150 seconds", // time to unfold this part "damage_reduction" : { // Flat reduction of damage, as described below. If not specified, set to zero "all" : 10, "physical" : 5 @@ -3972,12 +3975,6 @@ The contents of use_action fields can either be a string indicating a built-in f "waterproof": true, // Is the effect waterproof. (Default: false) "moves": 500 // Number of moves required in the process. }, -"use_action": { - "type": "unfold_vehicle", // Transforms the item into a vehicle. - "vehicle_name": "bicycle", // Vehicle name to create. - "unfold_msg": "You painstakingly unfold the bicycle and make it ready to ride.", // Message to display when transforming. - "moves": 500 // Number of moves required in the process. -}, "use_action" : { "type" : "consume_drug", // A drug the player can consume. "activation_message" : "You smoke your crack rocks. Mother would be proud.", // Message, ayup.