Skip to content

Commit

Permalink
Deconstructing a water heater yields a 100L tank instead of 60L (Clev…
Browse files Browse the repository at this point in the history
…erRaven#68359)

* Deconstructing a water heater yields a 100L tank instead of 60L

plus the usual bits and bobs.

I did a quick search for water heaters on the website of the nearest
home improvement store and found that the Rheem model XE36S06ST45U0 is
a good match for the stats of the existing household_water_heater item
at 240L exterior volume and 54kg mass. See
<https://images.thdstatic.com/catalog/pdfImages/2d/2d7ed116-1a8c-439d-b7fe-a62a0a98f806.pdf>
for published dimensions.

As this water heater has an internal capacity of 36 US gallons (136L),
I changed the deconstruction recipe to yield a 100L tank instead of
the 60L it used to be. I also changed the keg_capacity of the heater
to match.

Of course, this size of water heater is intended for use in small
apartments; larger houses would have larger heaters (up to 100 gallons
even). I’m resisting the temptation to add another size or two just on
general principle, but I note that mansions do exist.

Fixes CleverRaven#68316

* bugfix: keg_capacity is measured in cups, not liters

so 100 liters needs to be entered as 400, not 100. Oops.
  • Loading branch information
db48x authored Sep 28, 2023
1 parent e16e7e8 commit 9bace41
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
3 changes: 2 additions & 1 deletion data/json/furniture_and_terrain/furniture-plumbing.json
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,9 @@
"coverage": 55,
"required_str": -1,
"flags": [ "CONTAINER", "PLACE_ITEM", "LIQUIDCONT", "NOITEM", "SEALED", "EASY_DECONSTRUCT", "SMALL_HIDE" ],
"//": "keg_capacity assumed to be from model XE36S06ST45U0 water heater <https://images.thdstatic.com/catalog/pdfImages/2d/2d7ed116-1a8c-439d-b7fe-a62a0a98f806.pdf>",
"examine_action": "keg",
"keg_capacity": 240,
"keg_capacity": 400,
"deconstruct": { "items": [ { "item": "household_water_heater", "count": 1 } ] },
"bash": {
"str_min": 18,
Expand Down
1 change: 1 addition & 0 deletions data/json/items/generic.json
Original file line number Diff line number Diff line change
Expand Up @@ -1271,6 +1271,7 @@
"price": 0,
"price_postapoc": 10,
"material": [ "steel" ],
"//": "weight and volume assumed to be from model XE36S06ST45U0 water heater <https://images.thdstatic.com/catalog/pdfImages/2d/2d7ed116-1a8c-439d-b7fe-a62a0a98f806.pdf>",
"weight": "54431 g",
"volume": "240 L",
"to_hit": -5,
Expand Down
5 changes: 3 additions & 2 deletions data/json/recipes/recipe_deconstruction.json
Original file line number Diff line number Diff line change
Expand Up @@ -4183,8 +4183,9 @@
[ [ "thermostat", 1 ] ],
[ [ "water_faucet", 1 ] ],
[ [ "pipe_fittings", 6 ] ],
[ [ "metal_tank", 1 ] ]
]
[ [ "30gal_drum", 1 ] ]
],
"//": "drum assumed to be from model XE36S06ST45U0 water heater <https://images.thdstatic.com/catalog/pdfImages/2d/2d7ed116-1a8c-439d-b7fe-a62a0a98f806.pdf>"
},
{
"result": "television",
Expand Down

0 comments on commit 9bace41

Please sign in to comment.