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

Heavyweight Drunk Trait + Drunk Traits Rework #512

Merged
merged 6 commits into from
Jul 12, 2024

Conversation

WarMechanic
Copy link
Contributor

@WarMechanic WarMechanic commented Jul 5, 2024

Description

Adds the inverse of lightweight drunk, which makes you less susceptible to the effects of ethanol.
(more specifically, it halves the damage of alcohol and you need to drink twice as much to feel the effects in the first place)

To make the change happen, LightweightDrunk component was reworked to:

  • A) no longer change any drunk effects (including non-alcohol related drunkness like bloodloss)
  • B) instead multiply the effects of ethanol in your bloodstream

I chose this route in particular, because the other option of multiplying the amount of ethanol gained from alcohols is nonsense.


TODO

  • Add a TryMetabolizeReagent event to MetabolizerSystem.cs so a LightweightDrunkSystem.cs can listen to the event and multiply the effects of "Ethanol" specifically.
  • Add the Heavyweight Drunk trait
  • Fix a minor spelling mistake that caused the trait condition to not show up
  • Would we be able to name trait files after categories? I don't want to put every positive trait in a file named 'skills.yml'

Media

Example Media Embed


Changelog

🆑

  • add: Added the Heavyweight Drunk trait, which doubles your alcoholism potential.

@github-actions github-actions bot added Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: YML Changes any yml files labels Jul 5, 2024
@SimpleStation14 SimpleStation14 changed the title Heavyweight drunk trait + drunk traits rework Heavyweight Drunk Trait + Drunk Traits Rework Jul 5, 2024
@WarMechanic
Copy link
Contributor Author

before i undraft this im actually going to move LightweightDrunkComponent.cs to server because the client shouldn't use it anymore

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Jul 5, 2024
Copy link
Contributor

github-actions bot commented Jul 5, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Jul 6, 2024
@WarMechanic WarMechanic marked this pull request as ready for review July 6, 2024 02:36
@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Jul 12, 2024
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Copy link
Contributor

@DangerRevolution DangerRevolution left a comment

Choose a reason for hiding this comment

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

Is this something that's possible to replicate for being high?

@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Jul 12, 2024
@VMSolidus
Copy link
Member

Had to update it to include the new engine version, this was one I think where I had to very much by hand modify the merge conflict, rather than pick one.

@VMSolidus VMSolidus merged commit 7916f07 into Simple-Station:master Jul 12, 2024
11 checks passed
SimpleStation14 added a commit that referenced this pull request Jul 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: YML Changes any yml files Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants