fiddlerwoaroof/crawl - Change MG6LLF3XYCOEBQRX7TJ4MUTKM3IROYWUMZGCMYVW4TGDG36CJMJQC

Beogh conversion fixes for trunk.

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

Created by j-p-e-g on October 29, 2007

MG6LLF3XYCOEBQRX7TJ4MUTKM3IROYWUMZGCMYVW4TGDG36CJMJQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/view.h at line 73 [3.13254]

[3.13646]

/* called from: beam - fight */
void beogh_follower_convert(monsters *monster, bool orc_hit = false);

Replacement in crawl-ref/source/view.cc at line 656 [3.16817]

B:BD[4.46] → [5.70:131]

inline static void beogh_follower_convert(monsters *monster)

[4.46]

[4.100]

void beogh_follower_convert(monsters *monster, bool orc_hit)

Replacement in crawl-ref/source/view.cc at line 690 [3.16817]

B:BD[4.1259] → [2.81:121]

            beogh_convert_orc(monster);

[4.1259]

[4.3393]

            beogh_convert_orc(monster, orc_hit);

Replacement in crawl-ref/source/religion.h at line 50 [3.800304]
B:BD[6.188] → [2.357:396]
```
void beogh_convert_orc(monsters *orc);
```
[6.188]
[7.161]
```
void beogh_convert_orc(monsters *orc, bool emergency);
```
Replacement in crawl-ref/source/religion.cc at line 2866 [3.804403]
B:BD[8.16982] → [2.2411:2449]
```
void beogh_convert_orc(monsters *orc)
```
[8.16982]
[2.2449]
```
void beogh_convert_orc(monsters *orc, bool emergency)
```
Replacement in crawl-ref/source/religion.cc at line 2875 [3.804403]
B:BD[2.2673] → [2.2673:2707]
```
        if (orc->hit_points <= 0)
```
[2.2673]
[2.2707]
```
        if (emergency || orc->hit_points <= 0)
```
Replacement in crawl-ref/source/monstuff.cc at line 464 [3.1396662]
B:BD[2.4592] → [2.4592:4632]
```
            beogh_convert_orc(monster);
```
[2.4592]
[2.4632]
```
            beogh_convert_orc(monster, true);
```

Replacement in crawl-ref/source/mon-util.cc at line 5238 [3.1699344]

B:BD[9.19177] → [9.19177:19255]

    if (monster->attitude == ATT_FRIENDLY && player_monster_visible(monster))

[9.19177]

[9.19255]

    if (monster->attitude == ATT_FRIENDLY && !mons_is_unique(monster->type)
        && player_monster_visible(monster))

Insertion in crawl-ref/source/fight.cc at line 552 [3.3140790]

[3.3148919]

[10.33810]

        bool hit_woke_orc = false;
        if (you.religion == GOD_BEOGH && mons_species(def->type) == MONS_ORC
            && def->behaviour == BEH_SLEEP && you.species == SP_HILL_ORC
            && !player_under_penance() && you.piety >= 75 )
        {
            hit_woke_orc = true;
        }

Replacement in crawl-ref/source/fight.cc at line 562 [3.3140790]
B:BD[10.33912] → [10.33912:33921]
```
        
```
[10.33912]
[2.5195]

Insertion in crawl-ref/source/fight.cc at line 578 [3.3140790]

[10.34078]

[11.259]

            
        if (hit_woke_orc)
        {
            // call function of orcs first noticing you but with
            // beaten-up conversion messages (if applicable)
            beogh_follower_convert(def, true);
        }

Insertion in crawl-ref/source/beam.cc at line 3651 [3.4128068]
[3.4234212]
[12.1247621]
```
    bool hit_woke_orc = false;
```

Insertion in crawl-ref/source/beam.cc at line 3688 [3.4128068]

[13.1315]

[12.1248136]


                if (you.religion == GOD_BEOGH && mons_species(mon->type) == MONS_ORC
                    && mon->behaviour == BEH_SLEEP && you.species == SP_HILL_ORC
                    && !player_under_penance() && you.piety >= 75)
                {
                    hit_woke_orc = true;
                }

Insertion in crawl-ref/source/beam.cc at line 3733 [3.4128068]

[3.4236088]

        if (hit_woke_orc)
            beogh_follower_convert(mon, true);

Insertion in crawl-ref/source/beam.cc at line 3846 [3.4128068]

[12.1249699]

[14.825]

        if (you.religion == GOD_BEOGH && mons_species(mon->type) == MONS_ORC
            && mon->behaviour == BEH_SLEEP && you.species == SP_HILL_ORC
            && YOU_KILL(beam.thrower) && !player_under_penance()
            && you.piety >= 75)
        {
            hit_woke_orc = true;
        }

Insertion in crawl-ref/source/beam.cc at line 3983 [3.4128068]

[3.4242283]

        else if (hit_woke_orc)
            beogh_follower_convert(mon, true);