diff options
| -rw-r--r-- | crawl-ref/source/abl-show.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/decks.cc | 11 | ||||
| -rw-r--r-- | crawl-ref/source/decks.h | 2 |
3 files changed, 13 insertions, 2 deletions
diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc index 7dce230919..b181a12568 100644 --- a/crawl-ref/source/abl-show.cc +++ b/crawl-ref/source/abl-show.cc @@ -305,7 +305,7 @@ static const ability_def Ability_List[] = { ABIL_NEMELEX_DRAW_CARD, "Draw Card", 2, 0, 0, 0, ABFLAG_NONE }, { ABIL_NEMELEX_TRIPLE_DRAW, "Triple Draw", 2, 0, 100, 2, ABFLAG_NONE }, { ABIL_NEMELEX_MARK_DECK, "Mark Deck", 4, 0, 125, 5, ABFLAG_NONE }, - { ABIL_NEMELEX_STACK_DECK, "Stack Deck", 5, 0, 150, 6, ABFLAG_NONE }, + { ABIL_NEMELEX_STACK_DECK, "Stack Deck", 5, 0, 250, 10, ABFLAG_NONE }, // Beogh { ABIL_BEOGH_SMITING, "Smiting", diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc index ee8d342add..b8977ff2a4 100644 --- a/crawl-ref/source/decks.cc +++ b/crawl-ref/source/decks.cc @@ -76,7 +76,8 @@ static card_type a_deck_of_emergency[] = { DEFVEC(deck_of_emergency); static card_type a_deck_of_destruction[] = { - CARD_VITRIOL, CARD_FLAME, CARD_FROST, CARD_VENOM, CARD_HAMMER + CARD_VITRIOL, CARD_FLAME, CARD_FROST, CARD_VENOM, CARD_HAMMER, + CARD_PAIN, CARD_TORMENT }; DEFVEC(deck_of_destruction); @@ -246,6 +247,8 @@ const char* card_name(card_type card) case CARD_FROST: return "Frost"; case CARD_VENOM: return "Venom"; case CARD_HAMMER: return "the Hammer"; + case CARD_PAIN: return "Pain"; + case CARD_TORMENT: return "Torment"; case CARD_SPADE: return "the Spade"; case CARD_BARGAIN: return "the Bargain"; case CARD_WRATH: return "Wrath"; @@ -1457,6 +1460,10 @@ static void damaging_card(card_type card, int power, deck_rarity_type rarity) ztype = venomzaps[power_level]; break; + case CARD_PAIN: + ztype = ZAP_AGONY; + break; + default: break; } @@ -2117,6 +2124,7 @@ void card_effect(card_type which_card, deck_rarity_type rarity, case CARD_TROWEL: trowel_card(power, rarity); break; case CARD_SPADE: your_spells(SPELL_DIG, random2(power/4), false); break; case CARD_BANSHEE: mass_enchantment(ENCH_FEAR, power, MHITYOU); break; + case CARD_TORMENT: torment(TORMENT_CARDS, you.x_pos, you.y_pos); break; case CARD_VENOM: if ( coinflip() ) @@ -2126,6 +2134,7 @@ void card_effect(card_type which_card, deck_rarity_type rarity, break; case CARD_VITRIOL: case CARD_FLAME: case CARD_FROST: case CARD_HAMMER: + case CARD_PAIN: damaging_card(which_card, power, rarity); break; diff --git a/crawl-ref/source/decks.h b/crawl-ref/source/decks.h index df5b3942e5..94c40468db 100644 --- a/crawl-ref/source/decks.h +++ b/crawl-ref/source/decks.h @@ -74,6 +74,8 @@ enum card_type CARD_FROST, // cold damage CARD_VENOM, // poison damage CARD_HAMMER, // pure damage + CARD_PAIN, // single target, like spell of agony + CARD_TORMENT, // Symbol of Torment CARD_ELIXIR, // healing CARD_BATTLELUST, // melee boosts |