summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/potion.cc
diff options
context:
space:
mode:
authorShmuale Mark <shm.mark@gmail.com>2014-07-06 09:20:32 -0400
committerShmuale Mark <shm.mark@gmail.com>2014-07-06 09:28:14 -0400
commit3167ec3d6532df95e4d16b1ec514199c66ec646d (patch)
treecb70f1159ce9cfaa5a82d1f2c5c748aed6ded7c1 /crawl-ref/source/potion.cc
parentd9acbb9e23001793bc0acb1b6cfed9dedb9d66b7 (diff)
downloadcrawl-ref-3167ec3d6532df95e4d16b1ec514199c66ec646d.tar.gz
crawl-ref-3167ec3d6532df95e4d16b1ec514199c66ec646d.zip
Remove potions of strong poison.
Their peculiar depth restriction meant that when you found them, they were quite harmless. Even if the restriction were removed, they would be basically the same as potions of poison, since when they might be harmful the player would have little enough HP that the weaker potion could kill them. Their weight is distributed evenly among all other potions -- a very slight buff seems like a fine thing to do, especially since potion generation at D:2-10 isn't considered too good.
Diffstat (limited to 'crawl-ref/source/potion.cc')
-rw-r--r--crawl-ref/source/potion.cc27
1 files changed, 8 insertions, 19 deletions
diff --git a/crawl-ref/source/potion.cc b/crawl-ref/source/potion.cc
index a24065475e..4d1bcdf59a 100644
--- a/crawl-ref/source/potion.cc
+++ b/crawl-ref/source/potion.cc
@@ -271,30 +271,19 @@ bool potion_effect(potion_type pot_eff, int pow, item_def *potion, bool was_know
break;
case POT_POISON:
+#if TAG_MAJOR_VERSION == 34
case POT_STRONG_POISON:
- if (player_res_poison() >= (pot_eff == POT_POISON ? 1 : 3))
- {
- mprf("You feel %s nauseous.",
- (pot_eff == POT_POISON) ? "slightly" : "quite");
- }
+#endif
+ if (player_res_poison() >= 1)
+ mpr("You feel slightly nauseous.");
else
{
mprf(MSGCH_WARN,
- "That liquid tasted %s nasty...",
- (pot_eff == POT_POISON) ? "very" : "extremely");
+ "That liquid tasted very nasty...");
+
+ int amount = 10 + random2avg(15, 2);
+ string msg = "a potion of poison";
- int amount;
- string msg;
- if (pot_eff == POT_POISON)
- {
- amount = 10 + random2avg(15, 2);
- msg = "a potion of poison";
- }
- else
- {
- amount = 30 + random2avg(55, 2);
- msg = "a potion of strong poison";
- }
poison_player(amount, "", msg);
xom_is_stimulated(100 / xom_factor);
}