diff options
29 files changed, 24 insertions, 98 deletions
diff --git a/crawl-ref/source/dat/des/branches/snake.des b/crawl-ref/source/dat/des/branches/snake.des index 7167c505a6..c8a299df5a 100644 --- a/crawl-ref/source/dat/des/branches/snake.des +++ b/crawl-ref/source/dat/des/branches/snake.des @@ -197,7 +197,7 @@ WEIGHT: 5 KMONS: 123 = water moccasin / black mamba / nothing KMONS: 4 = guardian serpent KMONS: 5 = naga mage / nothing -KITEM: 1235 = potion of poison / potion of strong poison / \ +KITEM: 1235 = potion of poison w:20 / \ potion of confusion / nothing w:20 KITEM: 4 = any weapon good_item ego:venom q:1 / \ any weapon good_item ego:venom q:2 diff --git a/crawl-ref/source/dat/des/builder/food.des b/crawl-ref/source/dat/des/builder/food.des index 8564a0b081..ff70f5fa74 100644 --- a/crawl-ref/source/dat/des/builder/food.des +++ b/crawl-ref/source/dat/des/builder/food.des @@ -131,8 +131,8 @@ SUBVAULT: Z : fruiting_plant SUBVAULT: Y : fruiting_plant SUBVAULT: X : fruiting_plant SUBVAULT: W : fruiting_plant -KITEM: p = potion of restore abilities w:1 / potion of poison w:3 / \ - potion of strong poison w:1 / potion of confusion w:1 / nothing +KITEM: p = potion of restore abilities w:2 / potion of poison w:3 / \ + potion of confusion w:1 / nothing MONS: kobold ; wand of magic darts ident:type . short sword MAP ZZZZZ..YYYYY diff --git a/crawl-ref/source/dat/des/builder/shops.des b/crawl-ref/source/dat/des/builder/shops.des index 9f9d8eea5c..d03f6ea566 100644 --- a/crawl-ref/source/dat/des/builder/shops.des +++ b/crawl-ref/source/dat/des/builder/shops.des @@ -283,7 +283,7 @@ TAGS: no_monster_gen DEPTH: D:4-, Depths MONS: ball python w:5 / adder / water moccasin, place:Snake:1 KFEAT: v = general shop type:Serpentskin suffix:Sales count:7 ; \ - w:25 potion of poison | w:5 potion of strong poison | \ + w:30 potion of poison | \ w:8 blowgun | w:8 needle ego:poisoned | w:4 needle ego:curare | \ w:14 arrow ego:poisoned | w:14 tomahawk ego:poisoned | \ w:3 ring of poison resistance | w:6 randbook disc:poison | \ diff --git a/crawl-ref/source/dat/des/serial/magic_research.des b/crawl-ref/source/dat/des/serial/magic_research.des index 2665b7ad77..111ef15810 100644 --- a/crawl-ref/source/dat/des/serial/magic_research.des +++ b/crawl-ref/source/dat/des/serial/magic_research.des @@ -139,7 +139,6 @@ MONS: sea snake / redback, red wasp / yellow wasp MONS: mana viper / tarantella KMONS: D = death drake KITEM: E = potion of poison ident:type / \ - potion of strong poison ident:type / \ potion of confusion ident:type / \ potion of paralysis ident:type COLOUR: .012345DE = lightgreen diff --git a/crawl-ref/source/dat/des/sprint/sprint_mu.des b/crawl-ref/source/dat/des/sprint/sprint_mu.des index 2ad120e0b6..86246d7e1b 100644 --- a/crawl-ref/source/dat/des/sprint/sprint_mu.des +++ b/crawl-ref/source/dat/des/sprint/sprint_mu.des @@ -172,7 +172,7 @@ KITEM: * = potion of flight ident:all q:2 / potion of flight q:1 / any potion, \ scroll of remove curse ident:all q:2 / scroll of remove curse q:1 / any scroll, \ scroll of identify ident:all q:2/ scroll of identify q:1 / any scroll, \ scroll of torment / scroll of holy word / scroll of immolation, \ - potion of mutation / potion of decay / potion of strong poison + potion of mutation / potion of decay SUBST: T = t. MAP @@ -205,7 +205,7 @@ KITEM: * = potion of flight ident:all q:2 / potion of flight q:1 / any potion, \ scroll of remove curse ident:all q:2 / scroll of remove curse q:1 / any scroll, \ scroll of identify ident:all q:2 / scroll of identify q:1 / any scroll, \ scroll of torment / scroll of holy word / scroll of immolation, \ - potion of mutation / potion of decay / potion of strong poison + potion of mutation / potion of decay MAP {..x%..xxxxxxxxx. diff --git a/crawl-ref/source/dat/des/variable/mini_features.des b/crawl-ref/source/dat/des/variable/mini_features.des index bb6829a48b..0fa42f7574 100644 --- a/crawl-ref/source/dat/des/variable/mini_features.des +++ b/crawl-ref/source/dat/des/variable/mini_features.des @@ -2927,7 +2927,7 @@ TAGS: extra DEPTH: D:2-12 : if you.absdepth() > 4 then ITEM: scroll of immolation / potion of degeneration / potion of decay / \ - potion of strong poison / potion of poison + potion of poison : else ITEM: scroll of random uselessness / potion of degeneration / potion of poison : end diff --git a/crawl-ref/source/dat/descript/cs/items.txt b/crawl-ref/source/dat/descript/cs/items.txt index 0c39f9e3cb..e6663aed44 100644 --- a/crawl-ref/source/dat/descript/cs/items.txt +++ b/crawl-ref/source/dat/descript/cs/items.txt @@ -190,10 +190,6 @@ potion of slowing Lektvar, který zpomaluje vaše akce. %%%% -potion of strong poison - -Nesmírně jedovatý lektvar. -%%%% quarterstaff Robustni dreveni kul určenej k boji. diff --git a/crawl-ref/source/dat/descript/da/items.txt b/crawl-ref/source/dat/descript/da/items.txt index 28e49acb68..75764946da 100644 --- a/crawl-ref/source/dat/descript/da/items.txt +++ b/crawl-ref/source/dat/descript/da/items.txt @@ -576,10 +576,6 @@ potion of slowing En drik, som forsinker dine handlinger. %%%% -potion of strong poison - -En forfærdeligt giftig drik. -%%%% quad damage En mystisk genstand, som ligner en form for rune. Når den aktiveres, får den diff --git a/crawl-ref/source/dat/descript/de/items.txt b/crawl-ref/source/dat/descript/de/items.txt index d32f4436a5..10385f5b25 100644 --- a/crawl-ref/source/dat/descript/de/items.txt +++ b/crawl-ref/source/dat/descript/de/items.txt @@ -525,10 +525,6 @@ potion of slowing Ein Trank, der Ihre Taten verlangsamt. %%%% -potion of strong poison - -Ein schrecklich giftiger Trank. -%%%% quad damage Eine mysteriöse Sache, die einer Rune von irgendeiner Art ähnelt. Sobald diff --git a/crawl-ref/source/dat/descript/el/items.txt b/crawl-ref/source/dat/descript/el/items.txt index c70afc808c..0b67a6a4ab 100644 --- a/crawl-ref/source/dat/descript/el/items.txt +++ b/crawl-ref/source/dat/descript/el/items.txt @@ -406,10 +406,6 @@ potion of slowing Ένα μαγικό φίλτρο που κάνει τις κινήσεις σου πιο αργές. %%%% -potion of strong poison - -Ένα φοβερά δηλητηριώδες υγρό. -%%%% quad damage Ένα μυστηριώδες αντικείμενο που μοιάζει να είναι κάποιο μαγικό σύμβολο. Όταν diff --git a/crawl-ref/source/dat/descript/es/items.txt b/crawl-ref/source/dat/descript/es/items.txt index 6ad05ffd35..3c96ca4c83 100644 --- a/crawl-ref/source/dat/descript/es/items.txt +++ b/crawl-ref/source/dat/descript/es/items.txt @@ -442,10 +442,6 @@ potion of slowing Una poción que vuelve más lentas tus acciones. %%%% -potion of strong poison - -Una poción muy venenosa. -%%%% quad damage Un objeto misterioso semejante a una runa de algún tipo. Una vez se evoque, diff --git a/crawl-ref/source/dat/descript/fr/items.txt b/crawl-ref/source/dat/descript/fr/items.txt index 5578c6d29b..7dc896a2b5 100644 --- a/crawl-ref/source/dat/descript/fr/items.txt +++ b/crawl-ref/source/dat/descript/fr/items.txt @@ -758,10 +758,6 @@ potion of haste Un breuvage enchanté qui accélère les actions de celui qui le boit. %%%% -potion of strong poison - -Une épouvantable potion empoisonnée. -%%%% quad damage Un mystérieux objet qui ressemble à une rune. Une fois évoqué, l'utilisateur diff --git a/crawl-ref/source/dat/descript/items.txt b/crawl-ref/source/dat/descript/items.txt index de1def41d0..e55b3583bc 100644 --- a/crawl-ref/source/dat/descript/items.txt +++ b/crawl-ref/source/dat/descript/items.txt @@ -905,10 +905,6 @@ potion of haste An enchanted beverage which speeds the actions of anyone who drinks it. %%%% -potion of strong poison - -A terribly venomous potion. -%%%% quad damage A mysterious item resembling a rune of some kind. Once evoked, it will make the diff --git a/crawl-ref/source/dat/descript/ja/items.txt b/crawl-ref/source/dat/descript/ja/items.txt index 3210ff3d65..859488506b 100644 --- a/crawl-ref/source/dat/descript/ja/items.txt +++ b/crawl-ref/source/dat/descript/ja/items.txt @@ -468,10 +468,6 @@ potion of slowing これは水薬だ。これはあなたの動作を遅くする。 %%%% -potion of strong poison - -これは恐ろしい猛毒の水薬だ。 -%%%% quad damage 何らかのルーンに似た奇妙な道具だ。いったん喚起すると、これは使用者を青く輝かせ、 diff --git a/crawl-ref/source/dat/descript/ko/items.txt b/crawl-ref/source/dat/descript/ko/items.txt index 807eb966f7..c0cbf1bf8d 100644 --- a/crawl-ref/source/dat/descript/ko/items.txt +++ b/crawl-ref/source/dat/descript/ko/items.txt @@ -546,10 +546,6 @@ potion of slowing 짧은 시간동안 모든 동작을 느리게 만드는 물약이다. %%%% -potion of strong poison - -끔찍한 맹독이 든 물약. -%%%% quad damage 룬을 닮은 신비로운 도구. 사용하면 사용자가 파랗게 빛나며, 주변의 모든 소리가 diff --git a/crawl-ref/source/dat/descript/lv/items.txt b/crawl-ref/source/dat/descript/lv/items.txt index 140825ba7d..72512219df 100644 --- a/crawl-ref/source/dat/descript/lv/items.txt +++ b/crawl-ref/source/dat/descript/lv/items.txt @@ -107,10 +107,6 @@ potion of poison Nejauki indīgs šķidrums. %%%% -potion of strong poison - -Trakoti indīga dzira. -%%%% quarterstaff Izturīga koka nūja, kas paredzēta cīņai. diff --git a/crawl-ref/source/dat/descript/pl/items.txt b/crawl-ref/source/dat/descript/pl/items.txt index 8b35875ccc..69ea3d5716 100644 --- a/crawl-ref/source/dat/descript/pl/items.txt +++ b/crawl-ref/source/dat/descript/pl/items.txt @@ -476,10 +476,6 @@ potion of slowing Eliksir który spowalnia szybkość ruchów. %%%% -potion of strong poison - -Wyjątkowo groźna trucizna. -%%%% quad damage Zadziwiający magiczny przedmiot w kształcie runy, jednorazowego użytku. Użyty, diff --git a/crawl-ref/source/dat/descript/pt/items.txt b/crawl-ref/source/dat/descript/pt/items.txt index 1515eb7889..d5a65f5968 100644 --- a/crawl-ref/source/dat/descript/pt/items.txt +++ b/crawl-ref/source/dat/descript/pt/items.txt @@ -251,10 +251,6 @@ potion of slowing Uma poção que retarda as suas ações. %%%% -potion of strong poison - -Uma poção terrivelmente venenosa. -%%%% quarterstaff Uma haste de madeira robusta feita para combate. diff --git a/crawl-ref/source/dat/descript/quotes.txt b/crawl-ref/source/dat/descript/quotes.txt index 2a4083bbe0..72a26c0545 100644 --- a/crawl-ref/source/dat/descript/quotes.txt +++ b/crawl-ref/source/dat/descript/quotes.txt @@ -1952,7 +1952,7 @@ potion of poison then certainly I am against it.” -Noah S. Sweat, Jr. “If By Whiskey”. 1952 %%%% -potion of strong poison +potion of curing “But if when you say "whiskey" you mean the oil of conversation, the philosophic wine, the ale that is consumed when good fellows diff --git a/crawl-ref/source/dat/descript/ru/items.txt b/crawl-ref/source/dat/descript/ru/items.txt index ab27e7abf4..4415f9d7e6 100644 --- a/crawl-ref/source/dat/descript/ru/items.txt +++ b/crawl-ref/source/dat/descript/ru/items.txt @@ -391,10 +391,6 @@ potion of slowing Зелье замедлит ваши действия. %%%% -potion of strong poison - -Чрезвычайно ядовитое зелье. -%%%% quarterstaff Прочный деревянный шест, предназначенный для использования в бою. diff --git a/crawl-ref/source/dat/descript/zh/items.txt b/crawl-ref/source/dat/descript/zh/items.txt index b04fb04b84..9b38f2b6d4 100644 --- a/crawl-ref/source/dat/descript/zh/items.txt +++ b/crawl-ref/source/dat/descript/zh/items.txt @@ -437,10 +437,6 @@ potion of slowing 饮用这瓶药水会使你的动作速度变慢。 %%%% -potion of strong poison - -一瓶剧毒药水。 -%%%% quad damage 一个看上去像是某种符文的神秘物品。 diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 8d533a2197..3d749fe02a 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -3572,7 +3572,9 @@ enum potion_type POT_EXPERIENCE, POT_MAGIC, POT_RESTORE_ABILITIES, +#if TAG_MAJOR_VERSION == 34 POT_STRONG_POISON, +#endif POT_BERSERK_RAGE, POT_CURE_MUTATION, POT_MUTATION, diff --git a/crawl-ref/source/godabil.cc b/crawl-ref/source/godabil.cc index e2133326ab..22b4e40ce7 100644 --- a/crawl-ref/source/godabil.cc +++ b/crawl-ref/source/godabil.cc @@ -3844,7 +3844,7 @@ static void _gozag_add_bad_potion(CrawlVector &vec) 10, POT_DECAY, 10, POT_LIGNIFY, 5, POT_DEGENERATION, - 2, POT_STRONG_POISON, + 2, POT_POISON, 0); vec.push_back(what); } diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc index 0ae5452e4f..75ac0aba74 100644 --- a/crawl-ref/source/itemname.cc +++ b/crawl-ref/source/itemname.cc @@ -660,6 +660,7 @@ const char* potion_type_name(int potiontype) case POT_GAIN_STRENGTH: return "gain strength"; case POT_GAIN_DEXTERITY: return "gain dexterity"; case POT_GAIN_INTELLIGENCE: return "gain intelligence"; + case POT_STRONG_POISON: return "strong poison"; #endif case POT_FLIGHT: return "flight"; case POT_POISON: return "poison"; @@ -673,7 +674,6 @@ const char* potion_type_name(int potiontype) case POT_EXPERIENCE: return "experience"; case POT_MAGIC: return "magic"; case POT_RESTORE_ABILITIES: return "restore abilities"; - case POT_STRONG_POISON: return "strong poison"; case POT_BERSERK_RAGE: return "berserk rage"; case POT_CURE_MUTATION: return "cure mutation"; case POT_MUTATION: return "mutation"; @@ -3059,8 +3059,6 @@ bool is_bad_item(const item_def &item, bool temp) return true; case POT_DECAY: return !you.res_rotting(false); - case POT_STRONG_POISON: - return player_res_poison(false, temp) < 3; case POT_POISON: // Poison is not that bad if you're poison resistant. return player_res_poison(false) <= 0 @@ -3348,8 +3346,6 @@ bool is_useless_item(const item_def &item, bool temp) // Spriggans could argue, but it's too small of a gain for // possible player confusion. return player_res_poison(false, temp) > 0; - case POT_STRONG_POISON: - return player_res_poison(false, temp) >= 3; case POT_SLOWING: case POT_PARALYSIS: return you.species == SP_FORMICID; diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc index ffc806740b..3e7e02a30d 100644 --- a/crawl-ref/source/makeitem.cc +++ b/crawl-ref/source/makeitem.cc @@ -2196,7 +2196,7 @@ static void _generate_potion_item(item_def& item, int force_type, int tries = 500; do { - // total weight is 1090 + // total weight is 1075 stype = random_choose_weighted(191, POT_CURING, 95, POT_HEAL_WOUNDS, 75, POT_RESTORE_ABILITIES, @@ -2216,7 +2216,6 @@ static void _generate_potion_item(item_def& item, int force_type, 34, POT_CONFUSION, 25, POT_DEGENERATION, 23, POT_CURE_MUTATION, - 15, POT_STRONG_POISON, 12, POT_BENEFICIAL_MUTATION, 10, POT_PORRIDGE, 2, POT_EXPERIENCE, @@ -2225,7 +2224,6 @@ static void _generate_potion_item(item_def& item, int force_type, } while (stype == POT_POISON && item_level < 1 || stype == POT_BERSERK_RAGE && item_level < 2 - || stype == POT_STRONG_POISON && item_level < 11 || (agent == GOD_XOM && _is_boring_item(OBJ_POTIONS, stype) && --tries > 0)); 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); } diff --git a/crawl-ref/source/rltiles/dc-item.txt b/crawl-ref/source/rltiles/dc-item.txt index 013cb4f2a5..fa88dd8b8a 100644 --- a/crawl-ref/source/rltiles/dc-item.txt +++ b/crawl-ref/source/rltiles/dc-item.txt @@ -821,6 +821,7 @@ i-confusion POT_REMOVE_ME i-experience POT_EXPERIENCE i-magic POT_MAGIC i-restore-abilities POT_RESTORE_ABILITIES +# please remove when TAG_MAJOR_VERSION is bumped i-strong-poison POT_STRONG_POISON i-berserk-rage POT_BERSERK_RAGE i-cure-mutation POT_CURE_MUTATION diff --git a/crawl-ref/source/shopping.cc b/crawl-ref/source/shopping.cc index 9a28efc86d..af54b72753 100644 --- a/crawl-ref/source/shopping.cc +++ b/crawl-ref/source/shopping.cc @@ -1452,7 +1452,9 @@ unsigned int item_value(item_def item, bool ident) case POT_CURING: case POT_DECAY: case POT_DEGENERATION: +#if TAG_MAJOR_VERSION == 34 case POT_STRONG_POISON: +#endif case POT_LIGNIFY: valued += 20; break; @@ -1812,7 +1814,6 @@ bool is_worthless_consumable(const item_def &item) case POT_PARALYSIS: case POT_POISON: case POT_SLOWING: - case POT_STRONG_POISON: return true; default: return false; diff --git a/crawl-ref/source/spl-damage.cc b/crawl-ref/source/spl-damage.cc index 6a8912e82d..f845d3ecdf 100644 --- a/crawl-ref/source/spl-damage.cc +++ b/crawl-ref/source/spl-damage.cc @@ -1462,9 +1462,6 @@ static int _ignite_poison_affect_item(item_def& item, bool in_inv, bool tracer = // Burn poisonous potions. switch (item.sub_type) { - case POT_STRONG_POISON: - strength = 20 * item.quantity; - break; case POT_DEGENERATION: case POT_POISON: strength = 10 * item.quantity; @@ -1759,7 +1756,6 @@ static bool maybe_abort_ignite() { switch (item.sub_type) { - case POT_STRONG_POISON: case POT_DEGENERATION: case POT_POISON: prompt += "over "; |