fiddlerwoaroof/crawl - Change YGDO5RDP2QWDEPUFJGY223VQUWCKPKQRNIWXIRXSMYHHXWJACSNAC

Split up the routines for Yred's and Okawaru's servants again.

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

Created by dolorous on October 16, 2008

YGDO5RDP2QWDEPUFJGY223VQUWCKPKQRNIWXIRXSMYHHXWJACSNAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 875 [3.804403]
B:BD[3.807449] → [3.807449:807507]
```
}                               // end inc_gift_timeout()
```
[3.807449]
[4.171800]
```
}
```

Replacement in crawl-ref/source/religion.cc at line 877 [3.804403]

B:BD[4.171801] → [5.2528:2578]

B:BD[5.2578] → [6.2357:2427]

// Only Yredelemnul and Okawaru use this for now.
static int _random_servants(god_type god, bool force_hostile = false)

[4.171801]

[4.171848]

static int _yred_random_servants(bool force_hostile = false)

Replacement in crawl-ref/source/religion.cc at line 884 [3.804403]

B:BD[7.595] → [7.595:662]

B:BD[7.662] → [6.2492:3402]

    switch (god)
    {
    case GOD_YREDELEMNUL:
        // undead
        mon = ((temp_rand > 74) ? MONS_WRAITH :           // 25%
               (temp_rand > 64) ? MONS_WIGHT :            // 10%
               (temp_rand > 54) ? MONS_FLYING_SKULL :     // 10%
               (temp_rand > 45) ? MONS_SPECTRAL_WARRIOR : //  9%
               (temp_rand > 38) ? MONS_ROTTING_HULK :     //  7%
               (temp_rand > 32) ? MONS_SKELETAL_WARRIOR : //  6%
               (temp_rand > 27) ? MONS_FREEZING_WRAITH :  //  5%
               (temp_rand > 22) ? MONS_FLAMING_CORPSE :   //  5%
               (temp_rand > 18) ? MONS_GHOUL :            //  5%
               (temp_rand > 13) ? MONS_MUMMY :            //  5%
               (temp_rand > 9)  ? MONS_VAMPIRE :          //  4%
               (temp_rand > 5)  ? MONS_FLAYED_GHOST :     //  4%
               (temp_rand > 2)  ? MONS_SKELETAL_DRAGON    //  3%
                                : MONS_DEATH_COB);        //  2%

[7.595]

[6.3402]

    // undead
    mon = ((temp_rand > 74) ? MONS_WRAITH :           // 25%
           (temp_rand > 64) ? MONS_WIGHT :            // 10%
           (temp_rand > 54) ? MONS_FLYING_SKULL :     // 10%
           (temp_rand > 45) ? MONS_SPECTRAL_WARRIOR : //  9%
           (temp_rand > 38) ? MONS_ROTTING_HULK :     //  7%
           (temp_rand > 32) ? MONS_SKELETAL_WARRIOR : //  6%
           (temp_rand > 27) ? MONS_FREEZING_WRAITH :  //  5%
           (temp_rand > 22) ? MONS_FLAMING_CORPSE :   //  5%
           (temp_rand > 18) ? MONS_GHOUL :            //  5%
           (temp_rand > 13) ? MONS_MUMMY :            //  5%
           (temp_rand > 9)  ? MONS_VAMPIRE :          //  4%
           (temp_rand > 5)  ? MONS_FLAYED_GHOST :     //  4%
           (temp_rand > 2)  ? MONS_SKELETAL_DRAGON    //  3%
                            : MONS_DEATH_COB);        //  2%

Replacement in crawl-ref/source/religion.cc at line 900 [3.804403]

B:BD[6.3403] → [6.3403:3480]

∅:D[8.3109] → [7.1337:1394]

∅:D[6.3480] → [7.1337:1394]

B:BD[7.1337] → [7.1337:1394]

B:BD[7.1394] → [6.3481:4131]

∅:D[6.4131] → [7.2005:2054]

B:BD[7.2005] → [7.2005:2054]

        if (mon == MONS_FLYING_SKULL)
            how_many = 2 + random2(4);
        break;
    case GOD_OKAWARU:
        // warriors
        mon = ((temp_rand > 84) ? MONS_ORC_WARRIOR :      // 15%
               (temp_rand > 69) ? MONS_ORC_KNIGHT :       // 14%
               (temp_rand > 59) ? MONS_NAGA_WARRIOR :     //  9%
               (temp_rand > 49) ? MONS_CENTAUR_WARRIOR :  //  9%
               (temp_rand > 39) ? MONS_STONE_GIANT :      //  9%
               (temp_rand > 29) ? MONS_FIRE_GIANT :       //  9%
               (temp_rand > 19) ? MONS_FROST_GIANT :      //  9%
               (temp_rand >  9) ? MONS_CYCLOPS :          //  9%
               (temp_rand >  4) ? MONS_HILL_GIANT         //  4%
                                : MONS_TITAN);            //  4%
        break;
    default:
        break;
    }

[6.3403]

[6.4132]

    if (mon == MONS_FLYING_SKULL)
        how_many = 2 + random2(4);

Replacement in crawl-ref/source/religion.cc at line 912 [3.804403]

B:BD[6.4437] → [6.4437:4479]

                          0, god)) != -1)

[6.4437]

[6.4479]

                          0, GOD_YREDELEMNUL)) != -1)

Insertion in crawl-ref/source/religion.cc at line 919 [3.804403]

[6.4547]

[9.71]

}
static bool _okawaru_random_servant()
{
    // error trapping {dlb}
    monster_type mon = MONS_PROGRAM_BUG;
    int temp_rand = random2(100);
    // warriors
    mon = ((temp_rand > 84) ? MONS_ORC_WARRIOR :      // 15%
           (temp_rand > 69) ? MONS_ORC_KNIGHT :       // 14%
           (temp_rand > 59) ? MONS_NAGA_WARRIOR :     //  9%
           (temp_rand > 49) ? MONS_CENTAUR_WARRIOR :  //  9%
           (temp_rand > 39) ? MONS_STONE_GIANT :      //  9%
           (temp_rand > 29) ? MONS_FIRE_GIANT :       //  9%
           (temp_rand > 19) ? MONS_FROST_GIANT :      //  9%
           (temp_rand >  9) ? MONS_CYCLOPS :          //  9%
           (temp_rand >  4) ? MONS_HILL_GIANT         //  4%
                            : MONS_TITAN);            //  4%
    bool success = false;
    if (create_monster(
            mgen_data::hostile_at(mon,
                you.pos(), 0, 0, true, GOD_OKAWARU)) != -1)
    {
        success = true;
    }
    return (success);

Replacement in crawl-ref/source/religion.cc at line 1868 [3.804403]

B:BD[4.177095] → [10.2677:2740]

                int how_many = _random_servants(you.religion);

[4.177095]

[11.397]

                int how_many = _yred_random_servants();

Replacement in crawl-ref/source/religion.cc at line 3886 [3.804403]

B:BD[2.2687] → [2.2687:2741]

                count += _random_servants(god, true);

[2.2687]

[3.862988]

                count += _yred_random_servants(true);

Replacement in crawl-ref/source/religion.cc at line 4125 [3.804403]
B:BD[6.5079] → [10.4454:4500]
```
        count += _random_servants(god, true);
```
[6.5079]
[3.870960]
```
        count += _okawaru_random_servant();
```