fiddlerwoaroof/crawl - Change ZUEGFWBXFOP5CA5V4XJ5MK2XNOOVDZGUN52VVWEDFXPO3M7NY5NQC

Fix [2035741]: give different messages when an attack is completely

stopped by AC and when at least some of it bypasses AC but it is completely stopped by resistance. Fix bug where determine_damage() was ignoring AC. Fix negative energy always being known even if it hits something you can't see.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9027 c06c8d41-db1a-0410-9941-cceddc491573

Created by haranp on February 11, 2009

ZUEGFWBXFOP5CA5V4XJ5MK2XNOOVDZGUN52VVWEDFXPO3M7NY5NQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/mon-util.cc at line 5945 [5.1699344]
B:BD[4.4002] → [3.2742:2809]
```
    if (!quiet && mons_near(this) && player_monster_visible(this))
```
[4.4002]
[6.2735]
```
    if (!quiet && you.can_see(this))
```
Replacement in crawl-ref/source/fight.cc at line 187 [5.3140790]
∅:D[7.83391] → [8.879882:879938]
B:BD[8.879882] → [8.879882:879938]
```
    const bool ur_armed = (you.equip[EQ_WEAPON] != -1);
```
[7.83391]
[8.879938]
```
    const bool ur_armed = (you.weapon() != NULL);
```
Replacement in crawl-ref/source/fight.cc at line 191 [5.3140790]
B:BD[5.3145792] → [9.4671:4693]
```
    if (you.shield())
```
[5.3145792]
[5.3145816]
```
    if (player_wearing_slot(EQ_SHIELD))
```

Replacement in crawl-ref/source/beam.cc at line 2102 [5.4128068]

B:BD[5.4180129] → [5.4180129:4180200]

                simple_monster_message(monster, " appears unharmed.");

[5.4180129]

[5.4180225]

            {
                simple_monster_message(monster,
                                       (original > 0) ? " completely resists."
                                                      : " appears unharmed.");
            }

Replacement in crawl-ref/source/beam.cc at line 2142 [5.4128068]

B:BD[5.4181118] → [5.4181118:4181189]

                simple_monster_message(monster, " appears unharmed.");

[5.4181118]

[5.4181214]

            {
                simple_monster_message(monster,
                                       (original > 0) ? " completely resists."
                                                      : " appears unharmed.");
            }

Replacement in crawl-ref/source/beam.cc at line 2167 [5.4128068]

B:BD[5.4181729] → [5.4181729:4181800]

                simple_monster_message(monster, " appears unharmed.");

[5.4181729]

[5.4181825]

            {
                simple_monster_message(monster,
                                       (original > 0) ? " completely resists."
                                                      : " appears unharmed.");
            }

Replacement in crawl-ref/source/beam.cc at line 2182 [5.4128068]

B:BD[10.1535] → [10.1535:1606]

                simple_monster_message(monster, " appears unharmed.");

[10.1535]

[10.1631]

            {
                simple_monster_message(monster,
                                       (original > 0) ? " completely resists."
                                                      : " appears unharmed.");
            }

Replacement in crawl-ref/source/beam.cc at line 2198 [5.4128068]

B:BD[5.4181962] → [11.3135:3206]

                simple_monster_message(monster, " appears unharmed.");

[5.4181962]

[5.4182060]

            {
                simple_monster_message(monster,
                                       (original > 0) ? " completely resists."
                                                      : " appears unharmed.");
            }

Replacement in crawl-ref/source/beam.cc at line 2235 [5.4128068]

B:BD[5.4183065] → [5.4183065:4183136]

                simple_monster_message(monster, " appears unharmed.");

[5.4183065]

[5.4183136]

                simple_monster_message(monster, " completely resists.");

Replacement in crawl-ref/source/beam.cc at line 2241 [5.4128068]

B:BD[5.4183194] → [12.8788:8841]

            // Early out for tracer/no side effects.

[5.4183194]

[5.4183246]

            // Early out if no side effects.

Insertion in crawl-ref/source/beam.cc at line 2244 [5.4128068]

[5.4183316]


            if (you.can_see(monster))
                pbolt.obvious_effect = true;

Deletion in crawl-ref/source/beam.cc at line 2249 [5.4128068]
∅:D[2.2898] → [13.1236:1277]
B:BD[5.4183378] → [13.1236:1277]
```
            pbolt.obvious_effect = true;
```
Replacement in crawl-ref/source/beam.cc at line 2252 [5.4128068]
∅:D[2.2971] → [5.4183766:4183810]
B:BD[5.4183766] → [5.4183766:4183810]
```
        }                       // end else
```
[2.2971]
[5.4183810]
```
        }
```

Replacement in crawl-ref/source/beam.cc at line 2259 [5.4128068]

B:BD[8.1231055] → [8.1231055:1231126]

                simple_monster_message(monster, " appears unharmed.");

[8.1231055]

[5.4183825]

                simple_monster_message(monster, " completely resists.");

Replacement in crawl-ref/source/beam.cc at line 2348 [5.4128068]

B:BD[5.4185939] → [5.4185939:4186010]

                simple_monster_message(monster, " appears unharmed.");

[5.4185939]

[5.4186010]

            {
                simple_monster_message(monster,
                                       (original > 0) ? " completely resists."
                                                      : " appears unharmed.");
            }

Replacement in crawl-ref/source/beam.cc at line 4063 [5.4128068]
∅:D[2.3035] → [14.47123:47184]
B:BD[14.47123] → [14.47123:47184]
```
    final = mons_adjust_flavoured(mon, *this, preac, false);
```
[2.3035]
[14.47184]
```
    final = mons_adjust_flavoured(mon, *this, postac, false);
```
Replacement in crawl-ref/source/beam.cc at line 4484 [5.4128068]
B:BD[15.36790] → [14.57860:57919]
```
        if (player_monster_visible(mon) && mons_near(mon))
```
[15.36790]
[5.4239635]
```
        if (you.can_see(mon))
```

Fix [2035741]: give different messages when an attack is completely

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/mon-util.cc at line 5945 [5.1699344]

Replacement in crawl-ref/source/fight.cc at line 187 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 191 [5.3140790]