fiddlerwoaroof/crawl - Change IGNQ3YSGMW6NG7GPYYXWXW6XPM4YWKNUJ5IU55QCWZ2AEHHO3L3QC

Rework the Yred slave abandonment routines again, modeling them after

those of Beogh's orcish followers.

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

Created by dolorous on September 27, 2008

IGNQ3YSGMW6NG7GPYYXWXW6XPM4YWKNUJ5IU55QCWZ2AEHHO3L3QC

Dependencies

In channels

main

Change contents

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

B:BD[7.3294] → [7.3294:3356]

                // for now CREATED_FRIENDLY/WAS_NEUTRAL stays

[7.3294]

[9.3567]

                // For now CREATED_FRIENDLY/WAS_NEUTRAL stays.

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

B:BD[7.3754] → [7.3754:3816]

                // for now CREATED_FRIENDLY/WAS_NEUTRAL stays

[7.3754]

[10.4513]

                // For now CREATED_FRIENDLY/WAS_NEUTRAL stays.

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

B:BD[7.4088] → [7.4088:4150]

                // for now CREATED_FRIENDLY/WAS_NEUTRAL stays

[7.4088]

[11.3805]

                // For now CREATED_FRIENDLY/WAS_NEUTRAL stays.

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

B:BD[7.4419] → [7.4419:4481]

                // for now CREATED_FRIENDLY/WAS_NEUTRAL stays

[7.4419]

[12.3592]

                // For now CREATED_FRIENDLY/WAS_NEUTRAL stays.

Insertion in crawl-ref/source/religion.cc at line 4541 [8.804403]

[13.10307]

[14.5410]

}
static bool _yred_slaves_on_level_abandon_you()
{
    bool success = false;
    for (int i = 0; i < MAX_MONSTERS; ++i)
    {
        monsters *monster = &menv[i];
        if (is_yred_slave(monster))
        {
#ifdef DEBUG_DIAGNOSTICS
            mprf(MSGCH_DIAGNOSTICS, "Slave abandoning: %s on level %d, branch %d",
                 monster->name(DESC_PLAIN).c_str(),
                 static_cast<int>(you.your_level),
                 static_cast<int>(you.where_are_you));
#endif
            monster->attitude = ATT_HOSTILE;
            behaviour_event(monster, ME_ALERT, MHITYOU);
            // For now CREATED_FRIENDLY stays.
            success = true;
        }
    }
    return (success);

Replacement in crawl-ref/source/religion.cc at line 4588 [8.804403]
∅:D[15.2745] → [16.3347:3393]
B:BD[16.3347] → [16.3347:3393]
```
            // for now CREATED_FRIENDLY stays
```
[15.2745]
[17.2595]
```
            // For now CREATED_FRIENDLY stays.
```
Replacement in crawl-ref/source/religion.cc at line 4594 [8.804403]
B:BD[17.2626] → [17.2626:2646]
```
    return success;
```
[17.2626]
[16.3409]
```
    return (success);
```

Insertion in crawl-ref/source/religion.cc at line 4597 [8.804403]

[18.2506]

[19.2986]

// Upon excommunication, ex-Yredelemnulites lose all their undead
// slaves.  When under penance, Yredelemnulites can lose all undead
// slaves in sight.

Replacement in crawl-ref/source/religion.cc at line 4602 [8.804403]
B:BD[19.3027] → [5.2428:2492]
∅:D[20.2492] → [19.3091:3110]
∅:D[5.2492] → [19.3091:3110]
∅:D[21.2492] → [19.3091:3110]
B:BD[19.3091] → [19.3091:3110]
```
    int how_many = 1 + random2(1 + (you.experience_level / 5));
    int count = 0;
```
[19.3027]
[19.3110]
```
    bool reclaim = false;
    int num_reclaim = 0;
    int num_slaves = 0;
```

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

B:BD[19.3111] → [19.3111:3148]

    for (; how_many > 0; --how_many)

[19.3111]

[19.3148]

    if (you.religion != GOD_YREDELEMNUL)
        reclaim = apply_to_all_dungeons(_yred_slaves_on_level_abandon_you);
    else

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

B:BD[19.3154] → [4.2428:2564]

        // Choose a random slave in LOS.
        monsters *slave = choose_random_nearby_monster(0, is_yred_slave);
        if (!slave)

[19.3154]

[4.2564]

        for (radius_iterator ri(you.pos(), 9); ri; ++ri)

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

B:BD[4.2574] → [4.2574:2714]

            // Try again, without the LOS restriction.
            slave = choose_random_nearby_monster(0, is_yred_slave, false);
        }

[4.2574]

[4.2714]

            if (mgrd(*ri) == NON_MONSTER)
                continue;

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

B:BD[4.2715] → [4.2715:2881]

        if (!slave)
        {
            // Try *again*, on the entire level.
            slave = choose_random_monster_on_level(0, is_yred_slave, false);
        }

[4.2715]

[4.2881]

            monsters *monster = &menv[mgrd(*ri)];

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

∅:D[22.2573] → [19.3295:3422]

∅:D[4.2882] → [19.3295:3422]

B:BD[19.3295] → [19.3295:3422]

        if (slave)
        {
            slave->attitude = ATT_HOSTILE;
            behaviour_event(slave, ME_ALERT, MHITYOU);

[4.2882]

[19.3422]

            if (is_yred_slave(monster))
            {
                num_slaves++;
                const int hd = monster->hit_dice;
                // During penance, followers get a saving throw.
                if (random2((you.piety-you.penance[GOD_YREDELEMNUL])/18) +
                    random2(you.skills[SK_INVOCATIONS]-6)
                    > random2(hd) + hd + random2(5))
                {
                    continue;
                }
                monster->attitude = ATT_HOSTILE;
                behaviour_event(monster, ME_ALERT, MHITYOU);
                // For now CREATED_FRIENDLY stays.

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

B:BD[19.3490] → [19.3490:3511]

            count++;

[19.3423]

[19.3511]

                num_reclaim++;
                reclaim = true;
            }

Replacement in crawl-ref/source/religion.cc at line 4642 [8.804403]
B:BD[19.3528] → [23.3137:3156]
```
    if (count > 0)
```
[19.3528]
[23.3156]
```
    if (reclaim)
```

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

B:BD[23.3162] → [6.2428:2587]

        simple_god_message(count > 1 ? " reclaims some of your undead slaves!"
                                     : " reclaims one of your undead slaves!");

[23.3162]

[23.3321]

        if (you.religion != GOD_YREDELEMNUL)
        {
            simple_god_message(" reclaims all of your undead slaves!",
                               GOD_YREDELEMNUL);
        }
        else if (num_reclaim > 0)
        {
            if (num_reclaim == 1 && num_slaves > 1)
                simple_god_message(" reclaims one of your undead slaves!");
            else if (num_reclaim == num_slaves)
                simple_god_message(" reclaims your undead slaves!");
            else
                simple_god_message(" reclaims some of your undead slaves!");
        }

Insertion in crawl-ref/source/religion.cc at line 4687 [8.804403]
[24.39672]
[24.39672]

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

B:BD[25.412] → [24.40023:40091]

                    // During penance followers get a saving throw.

[25.412]

[24.40091]

                    // During penance, followers get a saving throw.

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

B:BD[24.40593] → [24.40593:40655]

                        num_reconvert++; // only visible ones

[24.40593]

[26.16164]

                        num_reconvert++; // Only visible ones.

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

B:BD[27.2826] → [2.2528:2582]

    if (reconvert) // maybe all of them are invisible

[27.2826]

[27.2876]

    if (reconvert) // Maybe all of them are invisible.

Insertion in crawl-ref/source/religion.cc at line 4733 [8.804403]

[27.3237]

            else if (num_reconvert == num_followers)
                chan << "Your followers decide to abandon you.";

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

B:BD[27.3254] → [27.3254:3496]

            {
                if (num_reconvert == num_followers)
                    chan << "Your";
                else
                    chan << "Some of your";
                chan << " followers decide to abandon you.";
            }

[27.3254]

[16.5822]

                chan << "Some of your followers decide to abandon you.";

Insertion in crawl-ref/source/religion.cc at line 4740 [8.804403]
[16.5860]
[28.15561]
Replacement in crawl-ref/source/religion.cc at line 4945 [8.804403]
B:BD[8.877892] → [3.2357:2397]
```
        _make_god_gifts_hostile(false);
```
[8.877892]
[3.2397]
```
        _yred_slaves_abandon_you();
```