diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-12-08 21:53:05 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-12-08 21:53:05 +0000 |
| commit | 7cc66e61e50963ba90a5db8db19cf75890d3c733 (patch) | |
| tree | fa2ee702c472095c0c3c2326fd7920d02875e29a /crawl-ref/source/effects.cc | |
| parent | 8cbb227becdc172839b901aedf972022dc73118d (diff) | |
| download | crawl-ref-7cc66e61e50963ba90a5db8db19cf75890d3c733.tar.gz crawl-ref-7cc66e61e50963ba90a5db8db19cf75890d3c733.zip | |
Apply more commits into 0.4 branch, again mostly by Haran:
6950, 6954, 6959, 6962, 6963, 6965, 6968, 6970 (partly), 6997, 6998,
7001, 7061, 7065, 7071, 7132 (partly), 7174, 7186, 7213, 7233, 7268,
7268, 7293, 7319, 7339, 7358, 7393 (partly)
* Tweak a few monster flags.
* Fix autoswapping jewellery taking longer than manual swapping.
* Fix crash when attempting to create nonexisting monster in wizmode.
* Make ego armour descriptions follow abbreviation guidelines.
* Fixed buggy monster movement away from the player.
* Disabled traps in the Abyss.
* Fixed a few other minor bugs, and improves messaging.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@7788 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/effects.cc')
| -rw-r--r-- | crawl-ref/source/effects.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc index dfd013c784..959480db75 100644 --- a/crawl-ref/source/effects.cc +++ b/crawl-ref/source/effects.cc @@ -136,6 +136,7 @@ int holy_word_monsters(int x, int y, int pow, int caster) // Currently, holy word annoys the monsters it affects because it // can kill them, and because hostile monsters don't use it. behaviour_event(monster, ME_ANNOY, MHITYOU); + simple_monster_message(monster, " convulses!"); hurt_monster(monster, hploss); if (hploss) @@ -148,8 +149,6 @@ int holy_word_monsters(int x, int y, int pow, int caster) } } - simple_monster_message(monster, " convulses!"); - if (monster->speed_increment >= 25) { retval = 1; @@ -1310,6 +1309,7 @@ static int _find_acquirement_subtype(object_class_type class_wanted, // If the book is invalid find any valid one. while (book_rarity(type_wanted) == 100 + || type_wanted == BOOK_HEALING || type_wanted == BOOK_DESTRUCTION || type_wanted == BOOK_MANUAL) { @@ -1528,7 +1528,7 @@ bool acquirement(object_class_type class_wanted, int agent, if (thing_created == NON_ITEM) continue; - const item_def &doodad(mitm[thing_created]); + item_def &doodad(mitm[thing_created]); if (doodad.base_type == OBJ_WEAPONS && !can_wield(&doodad, false, true) || doodad.base_type == OBJ_ARMOUR @@ -2937,6 +2937,10 @@ void update_level(double elapsedTime) false); } + // Handle nets specially to remove the trapping property of the net. + if (mons_is_caught(mon)) + mon->del_ench(ENCH_HELD, true); + _catchup_monster_moves(mon, turns); if (turns >= 10 && mon->alive()) |