fiddlerwoaroof/crawl - Change PVLLIAYFIAU4TQFBIP7B4ARIBUX2CVTSBQECEU6VTONJV4ANHVFAC

Tweak DID_KILL_HOLY handling to allow for killing hostile angels

without being put under penance by the good gods. Also add a flag MF_WAS_NEUTRAL, so that previously neutral monsters can be handled differently from always hostile ones.

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

Created by j-p-e-g on February 12, 2008

PVLLIAYFIAU4TQFBIP7B4ARIBUX2CVTSBQECEU6VTONJV4ANHVFAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tags.cc at line 2131 [8.164589]

B:BD[8.215630] → [8.215630:215698]

        menv[i].attitude = (isFriendly)?ATT_FRIENDLY : ATT_HOSTILE;

[8.215630]

[9.277]

        menv[i].attitude = (isFriendly)? ATT_FRIENDLY : ATT_HOSTILE;

Replacement in crawl-ref/source/religion.h at line 43 [8.800304]

∅:D[10.406] → [11.342:392]

B:BD[11.342] → [11.342:392]

                     const actor *victim = NULL);

[10.406]

[12.195]

                     const monsters *victim = NULL);

Replacement in crawl-ref/source/religion.cc at line 765 [8.804403]

B:BD[13.172850] → [14.127:186]

            //jmf: "good" god will feed you (a la Nethack)

[13.172850]

[15.263]

            //jmf: this "good" god will feed you (a la Nethack)

Replacement in crawl-ref/source/religion.cc at line 1150 [8.804403]

B:BD[10.478] → [10.478:522]

                      const actor *victim )

[10.478]

[8.836718]

                      const monsters *victim )

Replacement in crawl-ref/source/religion.cc at line 1220 [8.804403]

B:BD[13.182200] → [16.230:253]

            if (known)

[13.182200]

[16.253]

            if (known || DID_ATTACK_HOLY && victim->attitude != ATT_HOSTILE)

Replacement in crawl-ref/source/religion.cc at line 1434 [8.804403]

B:BD[13.184973] → [13.184973:184997]

            level *= 3;

[13.184973]

[13.184997]

            if (testbits(victim->flags, MF_CREATED_FRIENDLY)
                || testbits(victim->flags, MF_WAS_NEUTRAL))
            {
                level *= 3;
                penance = level * ((you.religion == GOD_ZIN) ? 2 : 1);
            }

Deletion in crawl-ref/source/religion.cc at line 1441 [8.804403]
B:BD[13.185032] → [13.185032:185099]
```
            penance = level * ((you.religion == GOD_ZIN) ? 2 : 1);
```
Insertion in crawl-ref/source/religion.cc at line 1643 [8.804403]
[17.6316]
[13.188452]
```
    case DID_KILL_NEUTRAL:                      // unused
```

Replacement in crawl-ref/source/religion.cc at line 2960 [8.804403]

B:BD[4.429] → [4.429:488]

                            static_cast<actor *>(&dummy));

[4.429]

[18.1577]

                            static_cast<const monsters *>(&dummy));

Insertion in crawl-ref/source/religion.cc at line 3088 [8.804403]
[6.3883]
[6.3883]
```
    holy->flags |= MF_WAS_NEUTRAL;
```
Insertion in crawl-ref/source/monstuff.cc at line 406 [8.1396662]
[5.2638]
[5.2638]
```
    const bool was_neutral = testbits(monster->flags, MF_WAS_NEUTRAL);
```
Replacement in crawl-ref/source/monstuff.cc at line 409 [8.1396662]
B:BD[5.2695] → [5.2695:2730]
```
    if (created_friendly || no_xp)
```
[5.2695]
[5.2730]
```
    if (created_friendly || was_neutral || no_xp)
```

Insertion in crawl-ref/source/monstuff.cc at line 646 [8.1396662]

[5.3100]

[19.243950]

            const bool was_neutral =
                testbits(monster->flags, MF_WAS_NEUTRAL);

Replacement in crawl-ref/source/monstuff.cc at line 656 [8.1396662]

B:BD[8.1409094] → [5.3101:3164]

            if (created_friendly && gives_xp && death_message)

[8.1409094]

[20.11426]

            if ((created_friendly || was_neutral) && gives_xp && death_message)

Insertion in crawl-ref/source/monstuff.cc at line 701 [8.1396662]

[12.4489]

[8.1411211]


                if (created_friendly)
                    did_god_conduct(DID_KILL_NEUTRAL, monster->hit_dice,
                                    true, monster);

Replacement in crawl-ref/source/fight.cc at line 973 [8.3140790]

B:BD[21.42119] → [3.293:342]

            did_god_conduct(DID_ATTACK_HOLY, 1);

[21.42119]

[22.1442]

            did_god_conduct(DID_ATTACK_HOLY, 1, true, def);

Replacement in crawl-ref/source/fight.cc at line 1587 [8.3140790]

B:BD[2.1081] → [2.1081:1152]

        did_god_conduct(mondied? DID_KILL_ANGEL : DID_ATTACK_HOLY, 1);

[2.1081]

[23.397]

        did_god_conduct(mondied? DID_KILL_ANGEL : DID_ATTACK_HOLY, 1,
                        true, def);

Insertion in crawl-ref/source/enum.h at line 644 [8.3287960]
[13.908773]
[13.908773]
```
    DID_KILL_NEUTRAL,                   // unused
```

Replacement in crawl-ref/source/enum.h at line 1869 [8.3287960]

B:BD[24.34211] → [6.4119:4194]

    MF_ATT_CHANGE_ATTEMPT = 0x800,  // Saw player and attitude changed (or

[24.34211]

[6.4194]

    MF_WAS_NEUTRAL        = 0x800,  // mirror to CREATED_FRIENDLY for neutrals
    MF_ATT_CHANGE_ATTEMPT = 0x1000, // Saw player and attitude changed (or

Replacement in crawl-ref/source/enum.h at line 1874 [8.3287960]

∅:D[6.4423] → [24.34339:34480]

B:BD[24.34339] → [24.34339:34480]

    MF_WAS_IN_VIEW        = 0x1000, // Was in view during previous turn
    MF_BAND_MEMBER        = 0x2000  // Created as a member of a band

[6.4423]

[8.3342202]

    MF_WAS_IN_VIEW        = 0x2000, // Was in view during previous turn
    MF_BAND_MEMBER        = 0x4000  // Created as a member of a band

Replacement in crawl-ref/source/direct.cc at line 797 [8.3697945]

B:BD[25.1061] → [7.2977:3192]

                m.attitude = (m.attitude == ATT_FRIENDLY? ATT_NEUTRAL :
                              m.attitude == ATT_HOSTILE ? ATT_FRIENDLY
                                                        : ATT_HOSTILE);

[25.1061]

[24.34636]

                switch (m.attitude)
                {
                 case ATT_FRIENDLY:
                     m.attitude = ATT_NEUTRAL;
                     m.flags &= ~MF_CREATED_FRIENDLY;
                     m.flags |= MF_WAS_NEUTRAL;
                     break;
                 case ATT_NEUTRAL:
                     m.attitude = ATT_HOSTILE;
                     m.flags &= ~MF_WAS_NEUTRAL;
                     break;
                 case ATT_HOSTILE:
                     m.attitude = ATT_FRIENDLY;
                     m.flags |= MF_CREATED_FRIENDLY;
                     break;
                 default:
                     break;
                }

Insertion in crawl-ref/source/delay.cc at line 170 [8.3963459]
[26.4906]
[26.4906]
```
          mons->flags |= MF_WAS_NEUTRAL;
```