Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a larger “family–sized” water heater #68404

Merged
merged 6 commits into from
Oct 2, 2023

Conversation

db48x
Copy link
Contributor

@db48x db48x commented Sep 30, 2023

Summary

Content "Add a larger “family–sized” water heater"

Purpose of change

Prior to the cataclysm it was common for larger households to have installed larger water heaters so that everybody could take a hot shower every night. Commercial establishments frequently required larger water heaters in order to serve customers reliably as well. Mapgen doesn’t reflect these facts well.

Describe the solution

Adds one larger size of water heater, with a 55–gallon capacity.

Describe alternatives you've considered

75 and 100–gallon water heaters are not uncommon, but that would require adding more tank objects.

Testing

make check for syntax, and I wandered around a world verifying that both sizes were available.

Additional context

Screenshot 2023-09-29 at 17-08-32 7e7928b1-8b4f-472a-8ee8-b48eb1e7932a pdf

This one has a 55–gallon tank; naturally deconstructing it yields a
`55gal-drum` of the same capacity. For consistency, the stats are
taken from a Rheem model XG55T06EC50UO water heater
<https://images.thdstatic.com/catalog/pdfImages/7e/7e7928b1-8b4f-472a-8ee8-b48eb1e7932a.pdf>.
Anode rods for water heaters are typically aluminum or magnesium, as
these metals have good electronegativity and don’t cost very
much. CDDA doesn’t have magnesium metal chunks or ingots, but it does
have aluminum, so it is easiest to always use aluminum.
For some buildings I left the existing small water heater as is, for a
few (such as the landromat) I changed it to a larger one, but for most
I left it to chance. I didn’t add water heaters to any building that
doesn’t already have one.
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto-requesting reviews from non-collaborators: @LyleSY

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Mods Issues related to mods or modding Bionics CBM (Compact Bionic Modules) Map / Mapgen Overmap, Mapgen, Map extras, Map display Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. Mods: Dinomod Anything to do with the Dinoclysm mod (DinoMod) Mods: No Hope Relating to the mod No Hope astyled astyled PR, label is assigned by github actions labels Sep 30, 2023
@github-actions github-actions bot added json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Sep 30, 2023
It looks like the water heaters are mostly in the barracks, infirmary,
etc, so it makes sense that they would use large ones. If 100–gallon
commercial water heaters are ever added to the game, this would be a
great place to use them.
@github-actions github-actions bot removed the BasicBuildPassed This PR builds correctly, label assigned by github actions label Sep 30, 2023
@db48x
Copy link
Contributor Author

db48x commented Oct 2, 2023

I accepted your suggestion for water heater sizes on the carrier map, but I am not entirely sure that a modern carrier would have any water heaters at all. I’ve never encountered it in the game and I haven’t looked at the map, but it seems to me that a nuclear carrier would use the reactor to heat water and then pipe it around the ship instead of making electricity that is then converted back into heat in a water heater.

But if the map has water heaters, we might as well make them large ones :)

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Oct 2, 2023
@Maleclypse Maleclypse merged commit 842d15f into CleverRaven:master Oct 2, 2023
detahramet pushed a commit to detahramet/Cataclysm-DDA that referenced this pull request Nov 6, 2023
* Add a larger “family–sized” water heater

This one has a 55–gallon tank; naturally deconstructing it yields a
`55gal-drum` of the same capacity. For consistency, the stats are
taken from a Rheem model XG55T06EC50UO water heater
<https://images.thdstatic.com/catalog/pdfImages/7e/7e7928b1-8b4f-472a-8ee8-b48eb1e7932a.pdf>.

* add sacrificial anode rods to water heaters to prevent corrosion

Anode rods for water heaters are typically aluminum or magnesium, as
these metals have good electronegativity and don’t cost very
much. CDDA doesn’t have magnesium metal chunks or ingots, but it does
have aluminum, so it is easiest to always use aluminum.

* update a wide variety of buildings to use the larger water heaters

For some buildings I left the existing small water heater as is, for a
few (such as the landromat) I changed it to a larger one, but for most
I left it to chance. I didn’t add water heaters to any building that
doesn’t already have one.

* lint the json

* make the military base use the larger water heaters

It looks like the water heaters are mostly in the barracks, infirmary,
etc, so it makes sense that they would use large ones. If 100–gallon
commercial water heaters are ever added to the game, this would be a
great place to use them.

* make the carrier only use the larger water heaters as well

Co-authored-by: Anton Simakov <[email protected]>

---------

Co-authored-by: Anton Simakov <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions Bionics CBM (Compact Bionic Modules) Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Map / Mapgen Overmap, Mapgen, Map extras, Map display Mods: Dinomod Anything to do with the Dinoclysm mod (DinoMod) Mods: No Hope Relating to the mod No Hope Mods Issues related to mods or modding
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants