Fix Up Travel Toilets (#73734)

* Fix Travel Toilet CopyFrom Issues Should not negatively affect the trailer in any way * Add Travel Toilet Item Versions * Create Travel Toilet Construction Group * Add Travel Toilet Constructions
CleverRaven · May 16, 2024 · 2a9a5a5 · 2a9a5a5
1 parent e70a346
commit 2a9a5a5
Show file tree

Hide file tree

Showing 4 changed files with 88 additions and 1 deletion.
diff --git a/data/json/construction/furniture_seats.json b/data/json/construction/furniture_seats.json
@@ -95,6 +95,30 @@
     "post_terrain": "f_barstool",
     "activity_level": "LIGHT_EXERCISE"
   },
+  {
+    "type": "construction",
+    "id": "constr_place_travel_toilet",
+    "group": "place_travel_toilet",
+    "category": "FURN",
+    "required_skills": [ [ "fabrication", 0 ] ],
+    "time": "1 m",
+    "components": [ [ [ "toilet_travel", 1 ] ] ],
+    "pre_special": "check_empty",
+    "post_terrain": "f_bullettrailer_toilet",
+    "activity_level": "LIGHT_EXERCISE"
+  },
+  {
+    "type": "construction",
+    "id": "constr_place_folded_travel_toilet",
+    "group": "place_travel_toilet",
+    "category": "FURN",
+    "required_skills": [ [ "fabrication", 0 ] ],
+    "time": "1 m",
+    "components": [ [ [ "toilet_travel_folded", 1 ] ] ],
+    "pre_special": "check_empty",
+    "post_terrain": "f_bullettrailer_toilet",
+    "activity_level": "LIGHT_EXERCISE"
+  },
   {
     "type": "construction",
     "id": "constr_stool",

diff --git a/data/json/construction_group.json b/data/json/construction_group.json
@@ -1874,6 +1874,11 @@
     "id": "place_chair_wood_white",
     "name": "Place a white wooden chair"
   },
+  {
+    "type": "construction_group",
+    "id": "place_travel_toilet",
+    "name": "Place Travel Toilet"
+  },
   {
     "type": "construction_group",
     "id": "place_oxygen_concentrator",

diff --git a/data/json/furniture_and_terrain/special_use/bullet_trailer.json b/data/json/furniture_and_terrain/special_use/bullet_trailer.json
@@ -250,7 +250,18 @@
     "description": "A tiny plastic toilet for use in a travel trailer.  Unlike a normal toilet, it doesn't store water locally for you to siphon out.",
     "symbol": "b",
     "color": "white",
-    "copy-from": "f_toilet"
+    "move_cost_mod": 2,
+    "coverage": 15,
+    "required_str": 6,
+    "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "MOUNTABLE", "EASY_DECONSTRUCT" ],
+    "deconstruct": { "items": [ { "item": "toilet_travel", "count": 1 } ] },
+    "bash": {
+      "str_min": 6,
+      "str_max": 15,
+      "sound": "plastic cracking!",
+      "sound_fail": "whump!",
+      "items": [ { "item": "plastic_chunk", "count": [ 4, 8 ] } ]
+    }
   },
   {
     "type": "furniture",

diff --git a/data/json/items/tool/misc.json b/data/json/items/tool/misc.json
@@ -826,6 +826,53 @@
     "use_action": { "menu_text": "Collapse", "type": "transform", "target": "teleumbrella", "msg": "You collapse your umbrella." },
     "melee_damage": { "bash": 6, "stab": 4 }
   },
+  {
+    "id": "toilet_travel",
+    "type": "TOOL",
+    "name": { "str": "travel toilet" },
+    "description": "A portable plastic toilet, designed to use plastic bags for waste instead of plumbing.",
+    "weight": "1587 g",
+    "volume": "27651 ml",
+    "longest_side": "33 cm",
+    "price": "25 USD",
+    "price_postapoc": "4 USD",
+    "material": [ "plastic" ],
+    "symbol": ";",
+    "color": "white",
+    "use_action": {
+      "menu_text": "Collapse",
+      "type": "transform",
+      "target": "toilet_travel_folded",
+      "msg": "You collapse the toilet for transport."
+    },
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "watertight": false,
+        "rigid": true,
+        "open_container": true,
+        "max_item_length": "28 cm",
+        "max_contains_volume": "22712 ml",
+        "max_contains_weight": "6 kg"
+      }
+    ],
+    "flags": [ "COLLAPSE_CONTENTS" ]
+  },
+  {
+    "id": "toilet_travel_folded",
+    "type": "TOOL",
+    "name": { "str": "folded travel toilet" },
+    "description": "A portable plastic toilet.  It has been collapsed for easy transport.",
+    "weight": "1587 g",
+    "volume": "2 L",
+    "longest_side": "28 cm",
+    "price": "25 USD",
+    "price_postapoc": "4 USD",
+    "material": [ "plastic" ],
+    "symbol": ";",
+    "color": "white",
+    "use_action": { "menu_text": "Collapse", "type": "transform", "target": "toilet_travel", "msg": "You unfold the travel toilet." }
+  },
   {
     "id": "testflames",
     "type": "TOOL",