fiddlerwoaroof/crawl - Change MT73EUNHNCLN5AQW6TT2PSM26PJCFQL5SF53NUYQ2T27UHATQNUAC

Handle burning/freezing, smiting, and airstriking the same way as beams:

the attacked god gift stays, while the others disappear.

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

Created by dolorous on May 19, 2008

MT73EUNHNCLN5AQW6TT2PSM26PJCFQL5SF53NUYQ2T27UHATQNUAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/spells3.cc at line 202 [5.531613]
B:BD[5.536831] → [6.894:941]
```
    monsters *monster = 0;       // NULL {dlb}
```

Replacement in crawl-ref/source/spells3.cc at line 210 [5.531613]

B:BD[5.537154] → [5.537154:537203]

        monster = &menv[mgrd[beam.tx][beam.ty]];

[5.537154]

[5.537203]

        monsters *monster = &menv[mgrd[beam.tx][beam.ty]];

Replacement in crawl-ref/source/spells3.cc at line 214 [5.531613]

B:BD[5.537347] → [7.105:181]

B:BD[7.181] → [8.773:853]

∅:D[8.853] → [7.261:325]

B:BD[7.261] → [7.261:325]

        // Maxes out at around 40 damage at 27 Invocations, which is plenty
        // in my book (the old max damage was around 70, which seems excessive)
        hurt_monster(monster, 7 + (random2(power) * 33 / 191));

[5.537347]

[9.167]

        god_conduct_trigger conduct;
        conduct.enabled = false;

Replacement in crawl-ref/source/spells3.cc at line 218 [5.531613]

B:BD[9.204] → [9.204:270]

            did_god_conduct(DID_ATTACK_FRIEND, 5, true, monster);

[9.204]

[10.167]

            conduct.set(DID_ATTACK_FRIEND, 5, true, monster);

Replacement in crawl-ref/source/spells3.cc at line 220 [5.531613]
∅:D[10.207] → [11.207:274]
∅:D[12.212] → [11.207:274]
∅:D[13.270] → [11.207:274]
B:BD[11.207] → [11.207:274]
```
            did_god_conduct(DID_ATTACK_NEUTRAL, 5, true, monster);
```
[10.207]
[14.187]
```
            conduct.set(DID_ATTACK_NEUTRAL, 5, true, monster);
```

Replacement in crawl-ref/source/spells3.cc at line 223 [5.531613]

B:BD[14.247] → [14.247:318]

            did_god_conduct(DID_UNCHIVALRIC_ATTACK, 5, true, monster);

[14.247]

[15.167]

            conduct.set(DID_UNCHIVALRIC_ATTACK, 5, true, monster);

Replacement in crawl-ref/source/spells3.cc at line 226 [5.531613]

B:BD[15.203] → [15.203:283]

            did_god_conduct(DID_ATTACK_HOLY, monster->hit_dice, true, monster);

[15.203]

[16.167]

            conduct.set(DID_ATTACK_HOLY, monster->hit_dice, true, monster);

Insertion in crawl-ref/source/spells3.cc at line 229 [5.531613]
[16.221]
[5.537413]
```
        conduct.enabled = true;
```

Insertion in crawl-ref/source/spells3.cc at line 232 [5.531613]

[5.537414]

        // Maxes out at around 40 damage at 27 Invocations, which is plenty
        // in my book (the old max damage was around 70, which seems excessive)
        hurt_monster(monster, 7 + (random2(power) * 33 / 191));

Replacement in crawl-ref/source/spells3.cc at line 239 [5.531613]

B:BD[5.537511] → [17.285:411]

        {
            const monsters *mons = static_cast<const monsters*>(monster);
            print_wounds(mons);
        }

[5.537511]

[5.537546]

            print_wounds(monster);

Deletion in crawl-ref/source/spells3.cc at line 250 [5.531613]
B:BD[5.537731] → [5.537731:537805]
```
    struct monsters *monster = 0;       // NULL {dlb}
    int hurted = 0;
```

Replacement in crawl-ref/source/spells3.cc at line 258 [5.531613]

B:BD[5.538053] → [5.538053:538102]

        monster = &menv[mgrd[beam.tx][beam.ty]];

[5.538053]

[5.538102]

        monsters *monster = &menv[mgrd[beam.tx][beam.ty]];

Replacement in crawl-ref/source/spells3.cc at line 263 [5.531613]

B:BD[5.538270] → [7.433:553]

        hurted = 8 + random2( random2(4) + (random2(power) / 6)
                              + (random2(power) / 7) );

[5.538270]

[2.167]

        int hurted = 8 + random2( random2(4) + (random2(power) / 6)
                                  + (random2(power) / 7) );

Replacement in crawl-ref/source/spells3.cc at line 276 [5.531613]
B:BD[5.538498] → [5.538498:538511]
```
        else
```
[5.538498]
[5.538511]
```
        if (hurted)
```

Replacement in crawl-ref/source/spells3.cc at line 279 [5.531613]

∅:D[18.280] → [5.538521:538564]

B:BD[5.538521] → [5.538521:538564]

            hurt_monster(monster, hurted);

[5.538521]

[9.272]

            god_conduct_trigger conduct;
            conduct.enabled = false;

Replacement in crawl-ref/source/spells3.cc at line 283 [5.531613]

B:BD[9.313] → [9.313:383]

                did_god_conduct(DID_ATTACK_FRIEND, 5, true, monster);

[9.313]

[10.208]

                conduct.set(DID_ATTACK_FRIEND, 5, true, monster);

Replacement in crawl-ref/source/spells3.cc at line 285 [5.531613]
∅:D[10.252] → [11.319:390]
∅:D[12.262] → [11.319:390]
∅:D[13.397] → [11.319:390]
B:BD[11.319] → [11.319:390]
```
                did_god_conduct(DID_ATTACK_NEUTRAL, 5, true, monster);
```
[10.252]
[9.383]
```
                conduct.set(DID_ATTACK_NEUTRAL, 5, true, monster);
```

Replacement in crawl-ref/source/spells3.cc at line 288 [5.531613]

B:BD[14.382] → [14.382:457]

                did_god_conduct(DID_UNCHIVALRIC_ATTACK, 5, true, monster);

[14.382]

[14.457]

                conduct.set(DID_UNCHIVALRIC_ATTACK, 5, true, monster);

Replacement in crawl-ref/source/spells3.cc at line 291 [5.531613]

B:BD[15.323] → [15.323:407]

                did_god_conduct(DID_ATTACK_HOLY, monster->hit_dice, true, monster);

[15.323]

[16.222]

                conduct.set(DID_ATTACK_HOLY, monster->hit_dice, true, monster);

Insertion in crawl-ref/source/spells3.cc at line 294 [5.531613]
[16.280]
[15.407]
```
            conduct.enabled = true;
```
Insertion in crawl-ref/source/spells3.cc at line 297 [5.531613]
[15.408]
[5.538565]
```
            hurt_monster(monster, hurted);
```
Deletion in crawl-ref/source/spells2.cc at line 1153 [5.569242]
B:BD[5.596220] → [5.596220:596274]
```
    struct monsters *monster = 0;       // NULL {dlb}
```
Replacement in crawl-ref/source/spells2.cc at line 1191 [5.569242]
B:BD[5.596975] → [5.596975:597001]
```
    monster = &menv[mgr];
```
[5.596975]
[5.597001]
```
    monsters *monster = &menv[mgr];
```

Insertion in crawl-ref/source/spells2.cc at line 1212 [5.569242]

[4.191]

        god_conduct_trigger conduct;
        conduct.enabled = false;

Replacement in crawl-ref/source/spells2.cc at line 1216 [5.569242]

B:BD[4.227] → [4.227:293]

            did_god_conduct(DID_ATTACK_FRIEND, 5, true, monster);

[4.227]

[4.293]

            conduct.set(DID_ATTACK_FRIEND, 5, true, monster);

Replacement in crawl-ref/source/spells2.cc at line 1218 [5.569242]

B:BD[4.333] → [4.333:400]

            did_god_conduct(DID_ATTACK_NEUTRAL, 5, true, monster);

[4.333]

[14.481]

            conduct.set(DID_ATTACK_NEUTRAL, 5, true, monster);

Replacement in crawl-ref/source/spells2.cc at line 1221 [5.569242]

B:BD[4.460] → [4.460:531]

            did_god_conduct(DID_UNCHIVALRIC_ATTACK, 5, true, monster);

[4.460]

[11.551]

            conduct.set(DID_UNCHIVALRIC_ATTACK, 5, true, monster);

Replacement in crawl-ref/source/spells2.cc at line 1224 [5.569242]

B:BD[4.567] → [4.567:632]

            did_god_conduct(DID_ATTACK_HOLY, monster->hit_dice);

[4.567]

[19.169]

            conduct.set(DID_ATTACK_HOLY, monster->hit_dice);

Insertion in crawl-ref/source/spells2.cc at line 1227 [5.569242]
[4.686]
[20.257]
```
        conduct.enabled = true;
```

Deletion in crawl-ref/source/fight.cc at line 2885 [5.3140790]

B:BD[3.3000] → [3.3000:3088]

            else
                did_god_conduct(DID_UNCHIVALRIC_ATTACK, 5, true, def);

Insertion in crawl-ref/source/fight.cc at line 2886 [5.3140790]

[21.489]


        if (!cancel_attack)
            did_god_conduct(DID_UNCHIVALRIC_ATTACK, 5, true, def);

Handle burning/freezing, smiting, and airstriking the same way as beams:

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/spells3.cc at line 202 [5.531613]

Replacement in crawl-ref/source/spells3.cc at line 210 [5.531613]

Replacement in crawl-ref/source/spells3.cc at line 214 [5.531613]

Replacement in crawl-ref/source/spells3.cc at line 218 [5.531613]

Replacement in crawl-ref/source/spells3.cc at line 220 [5.531613]

Replacement in crawl-ref/source/spells3.cc at line 223 [5.531613]

Replacement in crawl-ref/source/spells3.cc at line 226 [5.531613]

Insertion in crawl-ref/source/spells3.cc at line 229 [5.531613]

Insertion in crawl-ref/source/spells3.cc at line 232 [5.531613]

Replacement in crawl-ref/source/spells3.cc at line 239 [5.531613]

Deletion in crawl-ref/source/spells3.cc at line 250 [5.531613]

Replacement in crawl-ref/source/spells3.cc at line 258 [5.531613]

Replacement in crawl-ref/source/spells3.cc at line 263 [5.531613]

Replacement in crawl-ref/source/spells3.cc at line 276 [5.531613]

Replacement in crawl-ref/source/spells3.cc at line 279 [5.531613]

Replacement in crawl-ref/source/spells3.cc at line 283 [5.531613]

Replacement in crawl-ref/source/spells3.cc at line 285 [5.531613]

Replacement in crawl-ref/source/spells3.cc at line 288 [5.531613]

Replacement in crawl-ref/source/spells3.cc at line 291 [5.531613]

Insertion in crawl-ref/source/spells3.cc at line 294 [5.531613]

Insertion in crawl-ref/source/spells3.cc at line 297 [5.531613]

Deletion in crawl-ref/source/spells2.cc at line 1153 [5.569242]

Replacement in crawl-ref/source/spells2.cc at line 1191 [5.569242]