diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-02-25 16:27:02 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-02-25 16:27:02 +0000 |
| commit | 3c0facbc262ecdc02e714d22fcfcadc938816b2a (patch) | |
| tree | 6916e0b2e457ec1af02d7da380f26403bddbf86b | |
| parent | f10f789ac24d807aecbacb8b081eeaab59abc4f9 (diff) | |
| download | crawl-ref-3c0facbc262ecdc02e714d22fcfcadc938816b2a.tar.gz crawl-ref-3c0facbc262ecdc02e714d22fcfcadc938816b2a.zip | |
Give Angels and Daevas see invisible.
Fixed duplication of monster special attack messages.
Fixed typo s/auro/aura/.
Increased chance of monster not moving when confused.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@968 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/fight.cc | 9 | ||||
| -rw-r--r-- | crawl-ref/source/mon-data.h | 4 | ||||
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 2 |
3 files changed, 5 insertions, 10 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index fe7e7cf6df..b13b67101b 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -2326,7 +2326,7 @@ bool melee_attack::mons_attack_warded_off() { if (needs_message) { - mprf("%s tries to attack %s, but is repelled by %s holy auro.", + mprf("%s tries to attack %s, but is repelled by %s holy aura.", atk->name(DESC_CAP_THE).c_str(), defender->name(DESC_NOCAP_THE).c_str(), defender->pronoun(PRONOUN_NOCAP_POSSESSIVE).c_str()); @@ -2798,12 +2798,6 @@ void melee_attack::mons_apply_attack_flavour(const mon_attack_def &attk) void melee_attack::mons_perform_attack_rounds() { const int nrounds = atk->type == MONS_HYDRA? atk->number : 4; -#ifdef DEBUG_DIAGNOSTICS - mprf(MSGCH_DIAGNOSTICS, "%s gets %d attacks", - attacker->name(DESC_CAP_THE).c_str(), - nrounds); -#endif - const coord_def pos = defender->pos(); for (attack_number = 0; attack_number < nrounds; ++attack_number) @@ -2895,6 +2889,7 @@ void melee_attack::mons_perform_attack_rounds() return; special_damage = 0; + special_damage_message.clear(); apply_damage_brand(); if (!special_damage_message.empty()) diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h index 6bffc0fc46..f36d118044 100644 --- a/crawl-ref/source/mon-data.h +++ b/crawl-ref/source/mon-data.h @@ -445,7 +445,7 @@ { MONS_ANGEL, 'A', WHITE, "Angel", - M_FLIES | M_SPELLCASTER, + M_FLIES | M_SPELLCASTER | M_SEE_INVIS, MR_RES_POISON | MR_RES_ELEC, 0, 10, MONS_ANGEL, MONS_ANGEL, MH_HOLY, -8, { {AT_HIT, AF_PLAIN, 25}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0} }, @@ -3478,7 +3478,7 @@ { MONS_DAEVA, 'A', YELLOW, "Daeva", - M_LEVITATE | M_SPELLCASTER, + M_LEVITATE | M_SPELLCASTER | M_SEE_INVIS, MR_RES_POISON, 0, 12, MONS_ANGEL, MONS_DAEVA, MH_HOLY, -8, { {AT_HIT, AF_PLAIN, 25}, {AT_HIT, AF_PLAIN, 10}, {AT_HIT, AF_PLAIN, 10}, {AT_NONE, AF_PLAIN, 0} }, diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index a9f951eb57..8126a72afa 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -3796,7 +3796,7 @@ static void handle_monster_move(int i, monsters *monster) } } - if (one_chance_in(3)) + if (random2(2 + pfound) < 2) mmov_x = mmov_y = 0; // bounds check: don't let confused monsters try to run |