diff options
Diffstat (limited to 'crawl-ref/source')
-rw-r--r-- | crawl-ref/source/decks.cc | 8 | ||||
-rw-r--r-- | crawl-ref/source/decks.h | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc index dfd7e0cee8..5df0544de8 100644 --- a/crawl-ref/source/decks.cc +++ b/crawl-ref/source/decks.cc @@ -2638,7 +2638,9 @@ static void _summon_flying(int power, deck_rarity_type rarity) { create_monster(result, std::min(power/50, 6), friendly ? BEH_FRIENDLY : BEH_HOSTILE, - you.x_pos, you.y_pos, MHITYOU, MONS_PROGRAM_BUG); + you.x_pos, you.y_pos, + friendly ? you.pet_target : MHITYOU, + MONS_PROGRAM_BUG); } } @@ -2652,7 +2654,9 @@ static void _summon_skeleton(int power, deck_rarity_type rarity) create_monster(skeltypes[power_level], std::min(power/50,6), friendly ? BEH_FRIENDLY : BEH_HOSTILE, - you.x_pos, you.y_pos, MHITYOU, MONS_PROGRAM_BUG ); + you.x_pos, you.y_pos, + friendly ? you.pet_target : MHITYOU, + MONS_PROGRAM_BUG); } static int _card_power(deck_rarity_type rarity) diff --git a/crawl-ref/source/decks.h b/crawl-ref/source/decks.h index a080723d81..e3d8b50928 100644 --- a/crawl-ref/source/decks.h +++ b/crawl-ref/source/decks.h @@ -65,9 +65,9 @@ enum card_type CARD_BANSHEE, // "the scream" CARD_DAMNATION, // banishment CARD_SOLITUDE, // dispersal - CARD_WARPWRIGHT, // create teleport trap + CARD_WARPWRIGHT, // create teleport trap CARD_FLIGHT, - + CARD_VITRIOL, // acid damage CARD_FLAME, // fire damage CARD_FROST, // cold damage @@ -76,7 +76,7 @@ enum card_type CARD_SPARK, // lightning damage CARD_PAIN, // single target, like spell of agony CARD_TORMENT, // Symbol of Torment - + CARD_ELIXIR, // healing CARD_BATTLELUST, // melee boosts CARD_METAMORPHOSIS, // transformation |