From 4dbe58f4d8a824d0bca049b602bb6fbfe7a36060 Mon Sep 17 00:00:00 2001 From: dolorous Date: Sun, 15 Jun 2008 04:02:21 +0000 Subject: Add miscellaneous minor fixes. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5830 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/decks.cc | 50 +++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 25 deletions(-) (limited to 'crawl-ref/source/decks.cc') diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc index beaa76ebf2..5a5342d152 100644 --- a/crawl-ref/source/decks.cc +++ b/crawl-ref/source/decks.cc @@ -2322,9 +2322,9 @@ static bool _trowel_card(int power, deck_rarity_type rarity) }; if (create_monster( - mgen_data( RANDOM_ELEMENT(golems), - BEH_FRIENDLY, 5, you.pos(), - you.pet_target )) != -1) + mgen_data(RANDOM_ELEMENT(golems), + BEH_FRIENDLY, 5, you.pos(), + you.pet_target)) != -1) { mpr("You construct a golem!"); num_made++; @@ -2494,9 +2494,9 @@ static void _summon_demon_card(int power, deck_rarity_type rarity) dct = DEMON_LESSER; create_monster( - mgen_data( summon_any_demon(dct), BEH_FRIENDLY, - std::min(power / 50, 6), - you.pos(), you.pet_target )); + mgen_data(summon_any_demon(dct), BEH_FRIENDLY, + std::min(power / 50, 6), + you.pos(), you.pet_target)); } static void _summon_any_monster(int power, deck_rarity_type rarity) @@ -2545,10 +2545,10 @@ static void _summon_any_monster(int power, deck_rarity_type rarity) const bool friendly = (power_level > 0 || !one_chance_in(4)); create_monster( - mgen_data( mon_chosen, - friendly ? BEH_FRIENDLY : BEH_HOSTILE, - 3, coord_def(chosen_x, chosen_y), - MHITYOU ) ); + mgen_data(mon_chosen, + friendly ? BEH_FRIENDLY : BEH_HOSTILE, + 3, coord_def(chosen_x, chosen_y), + friendly ? MHITNOT : MHITYOU)); } static void _summon_dancing_weapon(int power, deck_rarity_type rarity) @@ -2558,10 +2558,10 @@ static void _summon_dancing_weapon(int power, deck_rarity_type rarity) const int mon = create_monster( - mgen_data( MONS_DANCING_WEAPON, - friendly ? BEH_FRIENDLY : BEH_HOSTILE, - power_level + 3, you.pos(), - friendly ? you.pet_target : MHITYOU )); + mgen_data(MONS_DANCING_WEAPON, + friendly ? BEH_FRIENDLY : BEH_HOSTILE, + power_level + 3, you.pos(), + friendly ? you.pet_target : MHITYOU)); // Given the abundance of Nemelex decks, not setting hard reset // leaves a trail of weapons behind, most of which just get @@ -2632,11 +2632,11 @@ static void _summon_flying(int power, deck_rarity_type rarity) for ( int i = 0; i < power_level * 5 + 2; ++i ) { create_monster( - mgen_data( result, - friendly ? BEH_FRIENDLY : BEH_HOSTILE, - std::min(power/50, 6), - you.pos(), - friendly ? you.pet_target : MHITYOU )); + mgen_data(result, + friendly ? BEH_FRIENDLY : BEH_HOSTILE, + std::min(power / 50, 6), + you.pos(), + friendly ? you.pet_target : MHITYOU )); } } @@ -2652,7 +2652,7 @@ static void _summon_skeleton(int power, deck_rarity_type rarity) mgen_data( skeltypes[power_level], friendly ? BEH_FRIENDLY : BEH_HOSTILE, - std::min(power/50,6), + std::min(power / 50, 6), you.pos(), friendly ? you.pet_target : MHITYOU )); } @@ -2670,11 +2670,11 @@ static void _summon_ugly(int power, deck_rarity_type rarity) ugly = MONS_UGLY_THING; create_monster( - mgen_data( ugly, - friendly ? BEH_FRIENDLY : BEH_HOSTILE, - std::min(power/50,6), - you.pos(), - friendly ? you.pet_target : MHITYOU)); + mgen_data(ugly, + friendly ? BEH_FRIENDLY : BEH_HOSTILE, + std::min(power / 50, 6), + you.pos(), + friendly ? you.pet_target : MHITYOU)); } static int _card_power(deck_rarity_type rarity) -- cgit v1.2.3-54-g00ecf