Attached Files:
|
iashol_poison_fix.patch [^] (2,111 bytes) 2014-06-15 15:42 [Show Content] [Hide Content]commit 34fa1c502aba0e197b85afe4e5901c92fe85c638
Author: Corin Buchanan-Howland <corin@buchananhowland.net>
Date: Sun Jun 15 09:32:16 2014 -0400
Iashol words/taste poison interaction
Exempting poison damage from the check to apply -scrolls/-potions status
diff --git a/crawl-ref/source/ouch.cc b/crawl-ref/source/ouch.cc
index e0e34e5..1e038ad 100644
--- a/crawl-ref/source/ouch.cc
+++ b/crawl-ref/source/ouch.cc
@@ -877,25 +877,27 @@ void ouch(int dam, int death_source, kill_method_type death_type,
ait_hp_loss hpl(dam, death_type);
interrupt_activity(AI_HP_LOSS, &hpl);
- if (dam > 0 && player_mutation_level(MUT_NO_DRINK))
+ if (dam > 0 && death_type != KILLED_BY_POISON)
{
- if (one_chance_in(min(1, you.hp_max - dam*2))) {
- you.increase_duration(DUR_NO_POTIONS, 1 + random2(dam), 30);
- mpr("You feel threatened and lose the ability to drink potions!");
+ you.check_awaken(500);
+
+ if (player_mutation_level(MUT_NO_READ))
+ {
+ if (one_chance_in(min(1, you.hp_max - dam*2))) {
+ you.increase_duration(DUR_NO_SCROLLS, 1 + random2(dam), 30);
+ mpr("You feel threatened and lose the ability to read scrolls!");
+ }
}
- }
- if (dam > 0 && player_mutation_level(MUT_NO_READ))
- {
- if (one_chance_in(min(1, you.hp_max - dam*2))) {
- you.increase_duration(DUR_NO_SCROLLS, 1 + random2(dam), 30);
- mpr("You feel threatened and lose the ability to read scrolls!");
+ if (player_mutation_level(MUT_NO_DRINK))
+ {
+ if (one_chance_in(min(1, you.hp_max - dam*2))) {
+ you.increase_duration(DUR_NO_POTIONS, 1 + random2(dam), 30);
+ mpr("You feel threatened and lose the ability to drink potions!");
+ }
}
}
- if (dam > 0 && death_type != KILLED_BY_POISON)
- you.check_awaken(500);
-
const bool non_death = death_type == KILLED_BY_QUITTING
|| death_type == KILLED_BY_WINNING
|| death_type == KILLED_BY_LEAVING;
|