diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-02-27 16:03:19 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-02-27 16:03:19 +0000 |
| commit | 191eef419bc1f97eedf833fc01908bb4afbcd65c (patch) | |
| tree | dc9fa9a9c02c4eff39f133846ed2b0bef676c20b | |
| parent | 147f57b8232067ebbd0dd5facf7df58ee3f05ce9 (diff) | |
| download | crawl-ref-191eef419bc1f97eedf833fc01908bb4afbcd65c.tar.gz crawl-ref-191eef419bc1f97eedf833fc01908bb4afbcd65c.zip | |
* Fix 2644253: mgrd bogosity with shafts.
* Fix wizmode regex "dismiss monster" command &G only dismissing monsters
in sight.
* Make fixed level randart books a bit more expensive depending on spell
level.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9258 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/debug.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/mon-util.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/mtransit.cc | 1 | ||||
| -rw-r--r-- | crawl-ref/source/player.cc | 1 | ||||
| -rw-r--r-- | crawl-ref/source/shopping.cc | 7 |
5 files changed, 10 insertions, 3 deletions
diff --git a/crawl-ref/source/debug.cc b/crawl-ref/source/debug.cc index 66be978463..27610c837e 100644 --- a/crawl-ref/source/debug.cc +++ b/crawl-ref/source/debug.cc @@ -5056,7 +5056,7 @@ void wizard_dismiss_all_monsters(bool force_all) { monsters *monster = &menv[mon]; - if (monster->alive() && tpat.matches(monster->name(DESC_PLAIN))) + if (monster->alive() && tpat.matches(monster->name(DESC_PLAIN, true))) { if (!keep_item) _vanish_orig_eq(monster); diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 16f034d2be..f58a448c9c 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -6225,7 +6225,7 @@ bool monsters::find_home_anywhere() bool monsters::find_place_to_live(bool near_player) { - if ((near_player && find_place_near_player()) + if (near_player && find_place_near_player() || find_home_anywhere()) { mgrd(pos()) = mindex(); diff --git a/crawl-ref/source/mtransit.cc b/crawl-ref/source/mtransit.cc index 6f04a51138..d43ad22022 100644 --- a/crawl-ref/source/mtransit.cc +++ b/crawl-ref/source/mtransit.cc @@ -268,6 +268,7 @@ bool follower::place(bool near_player) near_player = true; else { + m.moveto(where_to_go); mgrd(where_to_go) = m.mindex(); placed = true; } diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index f77f7012e1..436039914d 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -202,6 +202,7 @@ bool move_player_to_grid( const coord_def& p, bool stepped, bool allow_shift, // Prompt for any trap where you might not have enough hp // as defined in init.txt (see trapwalk.lua) if (new_grid != DNGN_TRAP_MECHANICAL + && type != TRAP_SHAFT || !clua.callbooleanfn(false, "ch_cross_trap", "s", trap_name(p))) #endif diff --git a/crawl-ref/source/shopping.cc b/crawl-ref/source/shopping.cc index c39f30b748..fc956d5004 100644 --- a/crawl-ref/source/shopping.cc +++ b/crawl-ref/source/shopping.cc @@ -1698,6 +1698,11 @@ unsigned int item_value( item_def item, bool ident ) } rarity /= count_valid; + + // Fixed level randarts get a bonus for the really low and + // really high level spells. + if (item.sub_type == BOOK_RANDART_LEVEL) + valued += 50 * abs(5 - item.plus); } else rarity = book_rarity(item.sub_type); @@ -1773,7 +1778,7 @@ void shop() const std::string shopname = shop_name(env.shop[i].pos); // If the shop is now empty, erase it from the overmap. - if ( _shop_get_stock(i).empty() ) + if (_shop_get_stock(i).empty()) _delete_shop(i); burden_change(); |