Atomic drinks are not radioactive anymore[WIP] #39116
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fris0uman
changed the title
|
Is |
twadams
added a commit
to twadams/Cataclysm-DDA
that referenced
this pull request
Mar 30, 2020
This reverts commit 73bc329.
twadams
added a commit
to twadams/Cataclysm-DDA
that referenced
this pull request
Mar 30, 2020
This reverts commit 73bc329.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
SUMMARY: Bugfixes "Atomic drinks are not radioactive anymore"Purpose of change
Atomic coffee and atomic energy drinks actually irradiating player as if this game was fallout make no sense in vanilla.
Describe the solution
Change ATOMIC_CAFF iuse for CAFF and adjust the stim level to stay close of the previous effect on fatigue
Atomic coffee now "restores" 90 fatigue instead of 300 and bring at the brink of stimulant overdose
Atomic energy drink restores 102 fatigue instead of 324 and gives stimulant overdose of 4
Describe alternatives you've considered
Edit c++ code to remove radiation but keep the same effect on fatigue
Testing
Spawn the drinks
Drink
See effect on stimulant
Additional context
If this gets merge as is,
iuse::atomic_caffwon't be used by anything else in the repo so I don't know what should be done with it.