diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-03 16:18:02 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-03 16:18:02 +0000 |
| commit | 2c2a0304ec8308f912860f05dc1099b86f71773c (patch) | |
| tree | 26a30495b0700fcb595aeafb7b3149c9f73d18d6 /crawl-ref/source/decks.cc | |
| parent | 1127ccc6b5bd418aead10e6b968aeef4d6909551 (diff) | |
| download | crawl-ref-2c2a0304ec8308f912860f05dc1099b86f71773c.tar.gz crawl-ref-2c2a0304ec8308f912860f05dc1099b86f71773c.zip | |
* Fix centaur/naga tiles not being displayed correctly in the character
selection menu.
* Add dolls_data to player_save_info struct, to make it easier to read
in per-character doll information once we get around to that.
Including the tiledef files in externs.h is probably overkill, though,
so we might want to move player_save_info into another header file.
* Fix Xom's repel stair effect moving shops.
* Fix decks granting permanent summons at low power (and only at low
power).
* Make default settings of the brand options consistent between init.txt
and initfile.cc.
* Update FAQ.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10086 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/decks.cc')
| -rw-r--r-- | crawl-ref/source/decks.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc index 1659903d9b..825ce9601f 100644 --- a/crawl-ref/source/decks.cc +++ b/crawl-ref/source/decks.cc @@ -2687,7 +2687,7 @@ static void _summon_demon_card(int power, deck_rarity_type rarity) // This hack appears later in this file as well. if (create_monster( mgen_data(summon_any_demon(dct), BEH_FRIENDLY, - std::min(power / 50, 6), 0, + std::min(power/50 + 1, 6), 0, you.pos(), MHITYOU), false) == -1) { @@ -2835,7 +2835,7 @@ static void _summon_flying(int power, deck_rarity_type rarity) create_monster( mgen_data(result, friendly ? BEH_FRIENDLY : BEH_HOSTILE, - std::min(power / 50, 6), 0, + std::min(power/50 + 1, 6), 0, you.pos(), MHITYOU)); } } @@ -2850,7 +2850,7 @@ static void _summon_skeleton(int power, deck_rarity_type rarity) if (create_monster(mgen_data(skeltypes[power_level], friendly ? BEH_FRIENDLY : BEH_HOSTILE, - std::min(power / 50, 6), 0, + std::min(power/50 + 1, 6), 0, you.pos(), MHITYOU), false) == -1) { @@ -2872,7 +2872,7 @@ static void _summon_ugly(int power, deck_rarity_type rarity) if (create_monster(mgen_data(ugly, friendly ? BEH_FRIENDLY : BEH_HOSTILE, - std::min(power / 50, 6), 0, + std::min(power/50 + 1, 6), 0, you.pos(), MHITYOU), false) == -1) { |