fiddlerwoaroof/crawl - Change 4NBPZKMZBKB3QYX4FFUAKDXQS43NJCBDLMHKDJFVXHQLX4MQDINAC

The accuracy of dragon breath is now halved if you're wielding

a weapon of dragon slaying (with the somewhat weak reasoning that a dragon will try to avert its eyes from your awful weapon).

From how I read the code this function is only called if you are attacked as monsters will not breathe at other monsters, so that the above check is valid.

Also fix 1865179: Airstrike now wakes (and annoys) monsters. 1861118: Evaporate now can be cancelled during potion or direction choice.

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

Created by j-p-e-g on January 8, 2008

4NBPZKMZBKB3QYX4FFUAKDXQS43NJCBDLMHKDJFVXHQLX4MQDINAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-data.h at line 1992 [4.268152]
B:BD[4.289535] → [5.123980:123998]
```
     SPFLAG_NONE,
```
[4.289535]
[6.4102]
```
     SPFLAG_DIR_OR_TARGET,
```
Insertion in crawl-ref/source/spl-cast.cc at line 33 [4.293070]
[2.217]
[4.293763]
```
#include "invent.h"
```
Insertion in crawl-ref/source/spl-cast.cc at line 867 [4.293070]
[7.1888]
[6.5693]
```
    int potion = -1;
```
Insertion in crawl-ref/source/spl-cast.cc at line 876 [4.293070]
[6.6014]
[8.8092]
```
        mpr("targeting mask is true");
```

Insertion in crawl-ref/source/spl-cast.cc at line 897 [4.293070]

[3.751]

        else if (spell == SPELL_EVAPORATE)
        {
            potion = prompt_invent_item( "Throw which potion?",
                                         MT_INVLIST, OBJ_POTIONS );
            if (potion == -1)
                return (SPRET_ABORT);
            else if (you.inv[potion].base_type != OBJ_POTIONS)
            {
                mpr( "This spell works only on potions!" );
                return (SPRET_ABORT);
            }
            mprf(MSGCH_PROMPT, "Where do you want to aim %s?",
                               you.inv[potion].name(DESC_NOCAP_YOUR).c_str());
        }

Replacement in crawl-ref/source/spl-cast.cc at line 1834 [4.293070]

B:BD[4.340298] → [4.340298:340328]

        cast_evaporate(powc);

[4.340298]

[4.340328]

        if ( !cast_evaporate(powc, beam, potion) )
            return SPRET_ABORT;

Replacement in crawl-ref/source/spells4.h at line 31 [4.434549]
B:BD[4.435210] → [4.435210:435240]
```
void cast_evaporate(int pow);
```
[4.435210]
[4.435240]
```
bool cast_evaporate(int pow, bolt& beem, int potion);
```
Replacement in crawl-ref/source/spells4.cc at line 1683 [4.436250]
B:BD[4.487974] → [4.487974:488003]
```
void cast_evaporate(int pow)
```
[4.487974]
[4.488003]
```
bool cast_evaporate(int pow, bolt& beem, int potion)
```
Deletion in crawl-ref/source/spells4.cc at line 1688 [4.436250]
B:BD[4.488164] → [4.488164:488187]
B:BD[4.488187] → [5.143532:143555]
B:BD[5.143555] → [9.331:409]
```
    struct bolt beem;
    const int potion =
        prompt_invent_item( "Throw which potion?", MT_INVLIST, OBJ_POTIONS );
```
Replacement in crawl-ref/source/spells4.cc at line 1690 [4.436250]
B:BD[4.488291] → [4.488291:488297]
B:BD[4.488297] → [10.3234:3309]
B:BD[10.3309] → [11.149:190]
∅:D[11.190] → [4.488427:488450]
∅:D[10.3343] → [4.488427:488450]
∅:D[12.5231] → [4.488427:488450]
B:BD[4.488427] → [4.488427:488450]
```
    {
        msg::stream << "Wisps of steam play over your " << your_hand(true)
                    << '.' << std::endl;
        return;
    } 
```
[4.488291]
[4.488450]
```
        return (false);
```
Deletion in crawl-ref/source/spells4.cc at line 1694 [4.436250]
B:BD[4.488563] → [4.488563:488624]
B:BD[4.488672] → [4.488672:488703]
B:BD[4.488704] → [13.377:424]
∅:D[13.424] → [4.488751:488783]
∅:D[5.143689] → [4.488751:488783]
B:BD[4.488751] → [4.488751:488783]
```
        canned_msg(MSG_SPELL_FIZZLES);
        return;
    }
    message_current_target();
    direction( spelld, DIR_NONE, TARG_ENEMY );
    if (!spelld.isValid)
    {
```
Replacement in crawl-ref/source/spells4.cc at line 1695 [4.436250]
B:BD[4.488822] → [4.488822:488838]
```
        return;
```
[4.488822]
[4.488838]
```
        return (false);
```
Deletion in crawl-ref/source/spells4.cc at line 1698 [4.436250]
B:BD[4.488845] → [5.143690:143719]
∅:D[5.143719] → [4.488907:488971]
B:BD[4.488907] → [4.488907:488971]
```
    beem.set_target(spelld);
    beem.source_x = you.x_pos;
    beem.source_y = you.y_pos;
```
Replacement in crawl-ref/source/spells4.cc at line 1793 [4.436250]
B:BD[4.491899] → [4.491899:491911]
```
    return;
```
[4.491899]
[4.491911]
```
    return (true);
```

Insertion in crawl-ref/source/spells3.cc at line 265 [4.531613]

[4.538564]

            behaviour_event(monster, ME_ANNOY, MHITYOU, you.x_pos, you.y_pos);

Insertion in crawl-ref/source/mstuff2.cc at line 1069 [4.1340842]

[5.402045]

[4.1365097]

    
    // accuracy is halved if you're wielding a weapon of dragon slaying
    // (which makes the dragon/draconian avoid looking at you)
    if ((mons_genus(monster->type) == MONS_DRAGON
           || mons_genus(monster->type) == MONS_DRACONIAN)
        && you.equip[EQ_WEAPON]
        && get_weapon_brand(you.inv[you.equip[EQ_WEAPON]])
            == SPWPN_DRAGON_SLAYING)
    {
        pbolt.hit /= 2;
    }

The accuracy of dragon breath is now halved if you're wielding

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spl-data.h at line 1992 [4.268152]

Insertion in crawl-ref/source/spl-cast.cc at line 33 [4.293070]

Insertion in crawl-ref/source/spl-cast.cc at line 867 [4.293070]

Insertion in crawl-ref/source/spl-cast.cc at line 876 [4.293070]

Insertion in crawl-ref/source/spl-cast.cc at line 897 [4.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1834 [4.293070]

Replacement in crawl-ref/source/spells4.h at line 31 [4.434549]

Replacement in crawl-ref/source/spells4.cc at line 1683 [4.436250]

Deletion in crawl-ref/source/spells4.cc at line 1688 [4.436250]

Replacement in crawl-ref/source/spells4.cc at line 1690 [4.436250]

Deletion in crawl-ref/source/spells4.cc at line 1694 [4.436250]

Replacement in crawl-ref/source/spells4.cc at line 1695 [4.436250]

Deletion in crawl-ref/source/spells4.cc at line 1698 [4.436250]

Replacement in crawl-ref/source/spells4.cc at line 1793 [4.436250]

Insertion in crawl-ref/source/spells3.cc at line 265 [4.531613]

Insertion in crawl-ref/source/mstuff2.cc at line 1069 [4.1340842]