fiddlerwoaroof/crawl - Change 5BPJZOGZ6VTUNTJXBTP22KIPGT5NNNSXZVW5J2BGQYBP4MTCZ3CQC

Add various attitude- and alignment-related fixes.

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

Created by dolorous on May 20, 2008

5BPJZOGZ6VTUNTJXBTP22KIPGT5NNNSXZVW5J2BGQYBP4MTCZ3CQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/output.cc at line 1028 [4.1088282]

B:BD[2.3080] → [2.3080:3340]

        // XXX: this doesn't take into account ENCH_NEUTRAL, but that's probably
        // a bug for mons_attitude, not this.
        // XXX: also, mons_attitude_type should be sorted hostile/neutral/friendly;
        // will break saves a little bit though.

Insertion in crawl-ref/source/mon-util.h at line 621 [4.1682293]
[4.1698660]
[4.1698660]
```
bool mons_atts_aligned(mon_attitude_type fr1, mon_attitude_type fr2);
```
Insertion in crawl-ref/source/mon-util.h at line 631 [4.1682293]
[5.2646]
[6.7760]
```
bool mons_att_wont_attack(mon_attitude_type fr);
```
Replacement in crawl-ref/source/mon-util.cc at line 1886 [4.1699344]
∅:D[6.7846] → [4.1733134:1733168]
B:BD[4.1733134] → [4.1733134:1733168]
```
    struct monsters *mon1, *mon2;
```
[6.7846]
[4.1733168]
```
    monsters *mon1, *mon2;
```
Insertion in crawl-ref/source/mon-util.cc at line 1906 [4.1699344]
[4.1733580]
[4.1733580]
```
    return (mons_atts_aligned(fr1, fr2));
}
```
Insertion in crawl-ref/source/mon-util.cc at line 1910 [4.1699344]
[4.1733581]
[7.2821]
```
bool mons_atts_aligned(mon_attitude_type fr1, mon_attitude_type fr2)
{
```

Insertion in crawl-ref/source/mon-util.cc at line 1982 [4.1699344]

[5.2862]

[6.8061]

bool mons_att_wont_attack(mon_attitude_type fr)
{
    return (fr == ATT_FRIENDLY || fr == ATT_GOOD_NEUTRAL);
}

Replacement in crawl-ref/source/mon-util.cc at line 1989 [4.1699344]

B:BD[6.8114] → [6.8114:8180]

    return (m->has_ench(ENCH_CHARM)? ATT_FRIENDLY : m->attitude);

[6.8114]

[6.8180]

    if (mons_friendly(m))
        return ATT_FRIENDLY;
    else if (mons_good_neutral(m))
        return ATT_GOOD_NEUTRAL;
    else if (mons_neutral(m))
        return ATT_NEUTRAL;
    else
        return ATT_HOSTILE;

Deletion in crawl-ref/source/enum.h at line 1879 [4.3287960]
B:BD[4.3340904] → [4.3340904:3340975]
```
    ATT_FRIENDLY,                      // created friendly (or tamed?)
```

Replacement in crawl-ref/source/enum.h at line 1880 [4.3287960]

B:BD[7.3305] → [3.2664:2743]

    ATT_GOOD_NEUTRAL                   // neutral, but won't attack friendlies

[7.3305]

[4.3340991]

    ATT_GOOD_NEUTRAL,                  // neutral, but won't attack friendlies
    ATT_FRIENDLY                       // created friendly (or tamed?)

Replacement in crawl-ref/source/beam.cc at line 2317 [4.4128068]

B:BD[4.4200779] → [8.463:540]

    if (pbolt.attitude == ATT_FRIENDLY && monster->attitude != ATT_FRIENDLY)

[4.4200779]

[9.1235196]

    if (mons_att_wont_attack(pbolt.attitude)
        && !mons_att_wont_attack(monster->attitude))
    {

Insertion in crawl-ref/source/beam.cc at line 2321 [4.4128068]
[9.1235226]
[4.4200851]
```
    }
```

Replacement in crawl-ref/source/beam.cc at line 3102 [4.4128068]

B:BD[4.4223241] → [8.541:587]

            if (beam.attitude != ATT_HOSTILE)

[4.4223241]

[4.4223274]

            if (mons_att_wont_attack(beam.attitude))

Replacement in crawl-ref/source/beam.cc at line 3332 [4.4128068]

∅:D[10.1076] → [11.25152:25231]

B:BD[11.25152] → [11.25152:25231]

            if (beam.attitude == ATT_HOSTILE && you.level_type == LEVEL_ABYSS)

[10.1076]

[11.25231]

            if (!mons_att_wont_attack(beam.attitude)
                && you.level_type == LEVEL_ABYSS)
            {

Insertion in crawl-ref/source/beam.cc at line 3336 [4.4128068]
[11.25271]
[11.25271]
```
            }
```

Replacement in crawl-ref/source/beam.cc at line 3427 [4.4128068]

B:BD[11.25302] → [11.25302:25348]

            if (beam.attitude != ATT_HOSTILE)

[11.25302]

[11.25348]

            if (mons_att_wont_attack(beam.attitude))

Replacement in crawl-ref/source/beam.cc at line 3443 [4.4128068]

B:BD[11.25537] → [11.25537:25583]

            if (beam.attitude != ATT_HOSTILE)

[11.25537]

[11.25583]

            if (mons_att_wont_attack(beam.attitude))

Replacement in crawl-ref/source/beam.cc at line 3602 [4.4128068]
B:BD[11.26152] → [11.26152:26194]
```
        if (beam.attitude != ATT_HOSTILE)
```
[11.26152]
[11.26194]
```
        if (mons_att_wont_attack(beam.attitude))
```
Replacement in crawl-ref/source/beam.cc at line 3653 [4.4128068]
B:BD[11.26523] → [11.26523:26568]
```
    if (beam.attitude != mons_attitude(mon))
```
[11.26523]
[11.26568]
```
    if (mons_atts_aligned(beam.attitude, mons_attitude(mon)))
```

Replacement in crawl-ref/source/beam.cc at line 3740 [4.4128068]

B:BD[4.4234369] → [8.588:641]

            if (beam.attitude != mons_attitude(mon))

[4.4234369]

[4.4234423]

            if (mons_atts_aligned(beam.attitude, mons_attitude(mon)))

Replacement in crawl-ref/source/beam.cc at line 3914 [4.4128068]

B:BD[4.4237952] → [8.642:695]

            if (beam.attitude != mons_attitude(mon))

[4.4237952]

[4.4238006]

            if (mons_atts_aligned(beam.attitude, mons_attitude(mon)))

Add various attitude- and alignment-related fixes.

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/output.cc at line 1028 [4.1088282]

Insertion in crawl-ref/source/mon-util.h at line 621 [4.1682293]

Insertion in crawl-ref/source/mon-util.h at line 631 [4.1682293]

Replacement in crawl-ref/source/mon-util.cc at line 1886 [4.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 1906 [4.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 1910 [4.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 1982 [4.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1989 [4.1699344]

Deletion in crawl-ref/source/enum.h at line 1879 [4.3287960]

Replacement in crawl-ref/source/enum.h at line 1880 [4.3287960]

Replacement in crawl-ref/source/beam.cc at line 2317 [4.4128068]

Insertion in crawl-ref/source/beam.cc at line 2321 [4.4128068]

Replacement in crawl-ref/source/beam.cc at line 3102 [4.4128068]

Replacement in crawl-ref/source/beam.cc at line 3332 [4.4128068]

Insertion in crawl-ref/source/beam.cc at line 3336 [4.4128068]

Replacement in crawl-ref/source/beam.cc at line 3427 [4.4128068]

Replacement in crawl-ref/source/beam.cc at line 3443 [4.4128068]

Replacement in crawl-ref/source/beam.cc at line 3602 [4.4128068]

Replacement in crawl-ref/source/beam.cc at line 3653 [4.4128068]

Replacement in crawl-ref/source/beam.cc at line 3740 [4.4128068]

Replacement in crawl-ref/source/beam.cc at line 3914 [4.4128068]