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

Wax changes #62843

Merged
merged 19 commits into from
Oct 19, 2023
Merged

Wax changes #62843

merged 19 commits into from
Oct 19, 2023

Conversation

Karol1223
Copy link
Contributor

@Karol1223 Karol1223 commented Dec 23, 2022

Summary

Balance "Plenty of changes regarding wax and the addition of paraffin wax"

Purpose of change

I was incredibly annoyed that I could eat the wax rings around toilets.

Describe the solution

Beeswax changes

  • the current wax chunks were renamed to chunks of beeswax
  • beeswax is no longer edible, as it is entirely indigestible for humans - I did consider having it be consumable but give no calories but... why?
  • beeswax density got slightly lowered to be more realistic
  • beeswax no longer conducts electricity
  • the weight of beeswax chunks was adjusted accordingly to the accurate density
  • beeswax was made unrecoverable, meaning you should no longer be able to scrape it off armor you make
  • should now appear under 'spare parts' in the inventory menu

New material: Paraffin Wax

  • a slightly less-dense alternate-reality beeswax
  • functionally pretty much identical at the moment, I am not experienced with working with any wax - any recipe that can use beeswax can use paraffin wax as well, I did this as with the changes I'll describe later beeswax should be much harder to obtain now and I wasn't aware which recipes could only use beeswax, which could only use paraffin and which could use either DISCLAIMER: if you are actually experienced with this and can tell me if any of these recipes should not take one of the waxes for one reason or another, please let me know. I am open to editing them, I am simply not aware of whether I have made mistakes or not.
  • replaces beeswax as the item dropped from bashing toilets - wax rings around toilet base are paraffin in the real world
  • candles now have paraffin wax as their material

Candle changes

  • as mentioned above the material is now paraffin wax
  • had the time it takes for one charge to deplete slightly reduced - now the candle burns exactly 35 hours
  • had its weight and volume increased and was given a longest side - the numbers are based off 35 hours paraffin wax candles I found for sale on Amazon

Describe alternatives you've considered

I really really wanted to have candles be cuttable the same way plastic or cotton is so that you could salvage paraffin wax chunks from them but the code stumped me. I am almost certain I made the wax materials able to be cut yet during my testing I could not for the love of me get candles to be cuttable. I am not sure what I did wrong and I'd appreciate feedback on this.

Testing

The recipes and items appear to work just about fine. The only issue I've come across was when I tried making candles cuttable - still can't get that to work.

Additional context

Requires #63931 to be fixed before being able to get green test results

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. Items: Armor / Clothing Armor and clothing Spawn Creatures, items, vehicles, locations appearing on map Game: Balance Balancing of (existing) in-game features. astyled astyled PR, label is assigned by github actions labels Dec 23, 2022
@github-actions github-actions bot added json-styled JSON lint passed, label assigned by github actions Code: Tests Measurement, self-control, statistics, balancing. BasicBuildPassed This PR builds correctly, label assigned by github actions labels Dec 23, 2022
@Maleclypse Maleclypse added 0.G String Freeze and removed Game: Balance Balancing of (existing) in-game features. [JSON] Changes (can be) made in JSON Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. json-styled JSON lint passed, label assigned by github actions labels Dec 24, 2022
@Karol1223 Karol1223 changed the title Wax Changes Wax changes Jan 1, 2023
@bombasticSlacks
Copy link
Contributor

Fixed issues and am running this for merging rn,

However in the future it might be worth it to move the waxes into a crafting group so they don't need to be duplicated everywhere they are used interchangably.

@Karol1223
Copy link
Contributor Author

Fixed issues and am running this for merging rn,

However in the future it might be worth it to move the waxes into a crafting group so they don't need to be duplicated everywhere they are used interchangably.

That is a very fair point. I did this manually because, like mentioned in the description, I have no idea how often these waxes can be used interchangeably. I know in cooking they wouldn't be but we don't use wax anywhere in cooking yet.

@bombasticSlacks
Copy link
Contributor

That is a very fair point. I did this manually because, like mentioned in the description, I have no idea how often these waxes can be used interchangeably. I know in cooking they wouldn't be but we don't use wax anywhere in cooking yet.

Yeah, I don't think they exclusively should be grouped, but having it as an option in the future might be nice. If you want to do it for this PR that's fine too but no pressure it was a future suggestion :)

@Karol1223
Copy link
Contributor Author

Yeah, I don't think they exclusively should be grouped, but having it as an option in the future might be nice. If you want to do it for this PR that's fine too but no pressure it was a future suggestion :)

Yeah give me a moment I'll get it done, that's like 10 minutes of work

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. Game: Balance Balancing of (existing) in-game features. BasicBuildPassed This PR builds correctly, label assigned by github actions json-styled JSON lint passed, label assigned by github actions and removed BasicBuildPassed This PR builds correctly, label assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Mar 2, 2023
@Vzor-
Copy link
Contributor

Vzor- commented Oct 8, 2023

This commit history is fantastic. Keep at it. I added the wax to toilets and it always bothered be that you could eat it lol.

@GuardianDll
Copy link
Member

I think you also need to copy books where this recipes can be found?

@Karol1223
Copy link
Contributor Author

I think you also need to copy books where this recipes can be found?

You're right. I hate copy-from

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Oct 18, 2023
@Maleclypse Maleclypse merged commit ede1dc5 into CleverRaven:master Oct 19, 2023
23 checks passed
@Karol1223 Karol1223 deleted the more-wax-maybe branch October 19, 2023 15:55
detahramet pushed a commit to detahramet/Cataclysm-DDA that referenced this pull request Nov 6, 2023
* first waxing

* the incredible wax

* cleanup

* cleanup

* itemgroups

* linting linting

* linting more linting I love linting

* density fixed hallelujah

* crafting requirements

* I hate syntax I hate syntax I hate syntax

* please work

* Update lights.json

* I'm going insane here

* please tell me it's over

* stop stop stop

* are we done yet?

* material resistances

* raise the white flag

* bookz

---------

Co-authored-by: bombasticSlacks <[email protected]>
Maleclypse pushed a commit to Maleclypse/Cataclysm-DDA that referenced this pull request Nov 16, 2023
* first waxing

* the incredible wax

* cleanup

* cleanup

* itemgroups

* linting linting

* linting more linting I love linting

* density fixed hallelujah

* crafting requirements

* I hate syntax I hate syntax I hate syntax

* please work

* Update lights.json

* I'm going insane here

* please tell me it's over

* stop stop stop

* are we done yet?

* material resistances

* raise the white flag

* bookz

---------

Co-authored-by: bombasticSlacks <[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 Code: Tests Measurement, self-control, statistics, balancing. Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. Game: Balance Balancing of (existing) in-game features. Items: Armor / Clothing Armor and clothing [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Spawn Creatures, items, vehicles, locations appearing on map
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants