Join GitHub today
GitHub is home to over 36 million developers working together to host and review code, manage projects, and build software together.
Sign upFixes radiation protection/treatment pills. #14736
Conversation
Coolthulhu
reviewed
Jan 6, 2016
src/enums.h
Outdated
| @@ -92,7 +92,8 @@ enum art_effect_passive : int { | |||
| AEP_INT_UP, // Intelligence + 4 | |||
| AEP_ALL_UP, // All stats + 2 | |||
| AEP_SPEED_UP, // +20 speed | |||
| AEP_IODINE, // Reduces radiation | |||
| AEP_PBLUE, // Reduces radiation | |||
| AEP_IODINE, // Resist half radiation | |||
This comment has been minimized.
This comment has been minimized.
Coolthulhu
Jan 6, 2016
Contributor
Adding artifact effects like that could break things (as in, saves).
Just renaming the AEP_IODINE to AEP_PBLUE would be safer. Especially considering you didn't implement it anywhere.
Coolthulhu
reviewed
Jan 6, 2016
src/iuse.cpp
Outdated
| @@ -951,9 +951,16 @@ int iuse::sleep(player *p, item *it, bool, const tripoint& ) | |||
| return it->type->charges_to_use(); | |||
| } | |||
|
|
|||
| int iuse::pblue(player *p, item *it, bool, const tripoint& ) | |||
This comment has been minimized.
This comment has been minimized.
Coolthulhu
Jan 6, 2016
Contributor
This function could be implemented using consume_drug actor. Same for iodine below. Like this:
"use_action" : {
"type" : "consume_drug",
"activation_message" : "You take some [drugname].",
"effects" : [
{
"id": "[drug effect id here]",
"duration": [duration here]
}
]
},
This would make maintenance easier.
Coolthulhu
reviewed
Jan 6, 2016
src/player.cpp
Outdated
| @@ -8326,6 +8326,8 @@ void player::suffer() | |||
| rads = localRadiation / 200.0f + selfRadiation / 10.0f; | |||
| } else { | |||
| rads = localRadiation / 32.0f + selfRadiation / 3.0f; | |||
| } if (has_effect("iodine")) { | |||
This comment has been minimized.
This comment has been minimized.
Coolthulhu
Jan 6, 2016
Contributor
That formatting makes it look misleading, as if it was an if/else
Cyrano7
reviewed
Jan 6, 2016
data/json/items/comestibles.json
Outdated
| "id": "pblue", | ||
| "duration": 1200 | ||
| } | ||
| ], |
This comment has been minimized.
This comment has been minimized.
Coolthulhu
self-assigned this
Jan 10, 2016
Coolthulhu
added a commit
that referenced
this pull request
Jan 10, 2016
Coolthulhu
merged commit 3e3dbbf
into
CleverRaven:master
Jan 10, 2016
1 check passed
default
This has been rescheduled for testing as the 'master' branch has been updated.
Rivet-the-Zombie
deleted the
Rivet-the-Zombie:prussian-blue
branch
Jan 13, 2016
This comment has been minimized.
This comment has been minimized.
|
Ooh, I missed this it seems. Interesting to see this. So essentially we now have Rad-X and Radaway. XP |
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.
Rivet-the-Zombie commentedJan 6, 2016
It's bugged me for a long time that our 'iodine tablets' are all wrong.
Makes potassium iodide tablets protect against radiation exposure (reduces uptake to 33%) instead of being used to treat radiation poisoning post-exposure.
Adds Prussian blue tablets (and recipe) that work the same as the old 'iodine tablets' did.