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

Fixes radiation protection/treatment pills. #14736

Merged
merged 4 commits into from Jan 10, 2016

Conversation

Rivet-the-Zombie
Copy link
Member

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.

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.
@@ -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
Copy link
Contributor

Choose a reason for hiding this comment

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

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.

@@ -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")) {
Copy link
Contributor

Choose a reason for hiding this comment

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

That formatting makes it look misleading, as if it was an if/else

"id": "pblue",
"duration": 1200
}
],
Copy link
Member

Choose a reason for hiding this comment

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

You need a ] }, here I think.

@Coolthulhu Coolthulhu self-assigned this Jan 10, 2016
Coolthulhu added a commit that referenced this pull request Jan 10, 2016
Fixes radiation protection/treatment pills.
@Coolthulhu Coolthulhu merged commit 3e3dbbf into CleverRaven:master Jan 10, 2016
@Rivet-the-Zombie Rivet-the-Zombie deleted the prussian-blue branch January 13, 2016 01:50
@chaosvolt
Copy link
Contributor

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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants