fiddlerwoaroof/crawl - Change 47NSOFQMBZCDIBHEAZSENFUGDSQCX3GJHFBUZ65ARDKCYIZ435LAC

* Add a wizard function apply_monster_blessing to allow for easy testing

of dolorous' fabulous blessing routines.

Allow the possibility of naming monsters: A monster's random name seed is stored in its number property, and the actual name gets picked from randname.txt. (Once this leaves the experimental stage I'll move them into a file of their own.) This means that monster types that already use number for something else (hydras for #heads, manticores for #spikes, or zombies for monster type) cannot be named.

Use the new functions for naming orcs blessed by Beogh. Only non-generic orcs may get named, e.g. orcs promoted to priesthood or orc warriors that get their weapon enchanted.

I tried to come up with a number of thematic orcish names, and if anyone would like to contribute, they're welcome to do so.

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

Created by j-p-e-g on April 24, 2008

47NSOFQMBZCDIBHEAZSENFUGDSQCX3GJHFBUZ65ARDKCYIZ435LAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.h at line 83 [13.800304]

B:BD[12.2646] → [12.2646:2720]

                    bool (*suitable)(const monsters* mon) = is_follower);

[12.2646]

[14.397]

                    bool (*suitable)(const monsters* mon) = is_follower,
                    bool force = false);

Replacement in crawl-ref/source/religion.cc at line 776 [13.804403]
B:BD[7.2580] → [7.2580:2612]
```
        && mons_friendly(mon));
```
[7.2580]
[12.2964]
```
            && mons_friendly(mon));
```
Insertion in crawl-ref/source/religion.cc at line 1057 [13.804403]
[15.3798]
[15.3798]
```
        give_unique_monster_name(mon);
```

Replacement in crawl-ref/source/religion.cc at line 1069 [13.804403]

B:BD[12.3582] → [12.3582:3641]

                    bool (*suitable)(const monsters* mon))

[12.3582]

[16.2698]

                    bool (*suitable)(const monsters* mon),
                    bool force)

Insertion in crawl-ref/source/religion.cc at line 1079 [13.804403]
[17.2983]
[17.2983]
```
    if (force)
        chance = coinflip();
```
Replacement in crawl-ref/source/religion.cc at line 1085 [13.804403]
B:BD[18.2925] → [18.2925:2965]
```
    if (follower && suitable(follower))
```
[18.2925]
[18.2965]
```
    if (follower && (force || suitable(follower)))
```

Replacement in crawl-ref/source/religion.cc at line 1114 [13.804403]

B:BD[19.3039] → [19.3039:3093]

                            result = "reinforcement";

[19.3039]

[19.3093]

                            result  = "reinforcement";

Insertion in crawl-ref/source/religion.cc at line 1150 [13.804403]

[11.2853]

[20.4056]

                    else if (force)
                        mpr("Couldn't bless monster's weapon.");

Insertion in crawl-ref/source/religion.cc at line 1162 [13.804403]

[11.3172]

[21.3301]

                    else if (force)
                        mpr("Couldn't bless monster's armour.");

Insertion in crawl-ref/source/religion.cc at line 1174 [13.804403]

[21.3613]

                else if (force)
                    mpr("Couldn't promote monster to priesthood.");

Insertion in crawl-ref/source/religion.cc at line 1202 [13.804403]
[22.3563]
[22.3563]
```
                give_unique_monster_name(mon);
```

Insertion in crawl-ref/source/religion.cc at line 1205 [13.804403]

[22.3613]

            else if (force)
                mpr("Couldn't enchant monster's weapon.");

Insertion in crawl-ref/source/religion.cc at line 1221 [13.804403]
[22.3906]
[22.3906]
```
                give_unique_monster_name(mon);
```

Insertion in crawl-ref/source/religion.cc at line 1224 [13.804403]

[22.3956]

[23.3806]

            else if (force)
                mpr("Couldn't enchant monster's armour.");

Insertion in crawl-ref/source/religion.cc at line 1248 [13.804403]

[9.2988]

[24.3417]

            else if (force)
                mpr("Couldn't increase monster's friendliness or time.");

Replacement in crawl-ref/source/religion.cc at line 1279 [13.804403]

B:BD[25.4085] → [25.4085:4115]

                return false;

[25.4085]

[26.4681]

            {
                if (force)
                    mpr("Couldn't heal monster.");

Insertion in crawl-ref/source/religion.cc at line 1283 [13.804403]
[26.4682]
[25.4116]
```
                return false;
            }
```

Replacement in crawl-ref/source/religion.cc at line 1293 [13.804403]

B:BD[23.3926] → [5.2569:2625]

∅:D[5.2625] → [27.2818:2882]

B:BD[27.2818] → [27.2818:2882]

    snprintf(info, INFO_SIZE, " blesses %s%s with %s.",
             pronoun.c_str(), blessed.c_str(), result.c_str());

[23.3926]

[18.3340]

    std::string whom = get_unique_monster_name(mon);
    if (whom.empty())
        whom = pronoun + blessed;
    snprintf(info, INFO_SIZE, " blesses %s with %s.",
             whom.c_str(), result.c_str());

Replacement in crawl-ref/source/randart.cc at line 796 [13.893152]

B:BD[13.914696] → [28.2909:3032]

    if (random2(15) >= power_level && aclass != OBJ_WEAPONS &&
        (aclass != OBJ_JEWELLERY || atype != RING_SLAYING))

[13.914696]

[13.914840]

    if (random2(15) >= power_level && aclass != OBJ_WEAPONS
        && (aclass != OBJ_JEWELLERY || atype != RING_SLAYING))

Replacement in crawl-ref/source/mutation.cc at line 1740 [13.1263003]

B:BD[13.1300797] → [10.3016:3085]

∅:D[10.3085] → [29.263:296]

B:BD[29.263] → [29.263:296]

        if (!wearing_amulet(AMU_RESIST_MUTATION) ? !one_chance_in(3)
            : one_chance_in(10))

[13.1300797]

[13.1300893]

        if (wearing_amulet(AMU_RESIST_MUTATION) ? one_chance_in(10)
                                                : !one_chance_in(3))

Replacement in crawl-ref/source/mtransit.cc at line 170 [31.8445]

B:BD[30.713] → [30.713:787]

    for (m_transit_list::iterator i = m.begin();
         i != m.end(); )

[30.713]

[30.787]

    for (m_transit_list::iterator i = m.begin(); i != m.end(); )

Replacement in crawl-ref/source/monstuff.cc at line 1539 [13.1396662]
B:BD[13.1427436] → [32.2798:2842]
```
    const int old_hp = monster->hit_points;
```
[13.1427436]
[32.2842]
```
    const int old_hp     = monster->hit_points;
```
Replacement in crawl-ref/source/monstuff.cc at line 1547 [13.1396662]
∅:D[4.2742] → [32.3042:3071]
B:BD[32.3042] → [32.3042:3071]
```
    monster->type = targetc;
```
[4.2742]
[32.3071]
```
    monster->type   = targetc;
```
Replacement in crawl-ref/source/monstuff.cc at line 1550 [13.1396662]
B:BD[32.3112] → [32.3112:3163]
```
    mon_enchant abj = monster->get_ench(ENCH_ABJ);
```
[32.3112]
[32.3163]
```
    mon_enchant abj     = monster->get_ench(ENCH_ABJ);
```

Replacement in crawl-ref/source/monstuff.cc at line 1553 [13.1396662]

B:BD[32.3298] → [33.2695:2750]

    mon_enchant charm = monster->get_ench(ENCH_CHARM);

[32.3298]

[34.2783]

    mon_enchant charm   = monster->get_ench(ENCH_CHARM);

Replacement in crawl-ref/source/monstuff.cc at line 2611 [13.1396662]

B:BD[35.2108] → [6.2558:2604]

∅:D[6.2604] → [36.1805:1864]

B:BD[13.1451608] → [36.1805:1864]

        snprintf( buff, sizeof(buff), "%s%s",
                  monster->name(descrip).c_str(), event );

[35.2108]

[13.1451669]


        std::string name = get_unique_monster_name(monster);
        if (name.empty())
            name = monster->name(descrip);
        snprintf( buff, sizeof(buff), "%s%s", name.c_str(), event );

Replacement in crawl-ref/source/monstuff.cc at line 3159 [13.1396662]
B:BD[13.1477909] → [13.1477909:1477943]
```
            monster->number -= 1;
```
[13.1477909]
[13.1477943]
```
            monster->number--;
```
Replacement in crawl-ref/source/mon-util.h at line 53 [13.1682293]
B:BD[37.66259] → [37.66259:66264]
```
    
```
[37.66259]
[37.66264]
Replacement in crawl-ref/source/mon-util.h at line 177 [13.1682293]
B:BD[37.69700] → [37.69700:69735]
```
    // resistances 
    // Notes: 
```
[37.69700]
[38.3577]
```
    // resistances
    // Notes:
```
Replacement in crawl-ref/source/mon-util.h at line 196 [13.1682293]
B:BD[37.70350] → [37.70350:70395]
```
    // melee armour resists/vulnerabilities 
```
[37.70350]
[37.70395]
```
    // melee armour resists/vulnerabilities
```

Replacement in crawl-ref/source/mon-util.h at line 214 [13.1682293]

B:BD[37.70734] → [37.70734:70814]

    S_SHOUT,                // shout

[37.70734]

[37.70814]

    S_SHOUT,                // shout

Replacement in crawl-ref/source/mon-util.h at line 287 [13.1682293]
B:BD[39.10632] → [39.10632:10637]
```
    
```
[39.10632]
[39.10637]

Replacement in crawl-ref/source/mon-util.h at line 386 [13.1682293]

B:BD[35.5569] → [35.5569:5637]

std::string mons_type_name(int type, description_level_type desc );

[35.5569]

[40.925]

std::string mons_type_name(int type, description_level_type desc);
bool give_unique_monster_name(monsters *mon, bool orc_only = true);
std::string get_unique_monster_name(const monsters *mon);

Replacement in crawl-ref/source/mon-util.cc at line 1654 [13.1699344]
∅:D[41.11294] → [35.7478:7509]
B:BD[35.7478] → [35.7478:7509]
```
        result += "spectral ";
```
[41.11294]
[35.7509]
```
        result  += "spectral ";
```

Replacement in crawl-ref/source/mon-util.cc at line 1728 [13.1699344]

B:BD[35.9477] → [35.9477:9561]

B:BD[35.9561] → [2.228:257]

∅:D[2.257] → [35.9592:9623]

B:BD[35.9592] → [35.9592:9623]

    if ( result.length() >= 3 &&
         (result[0] == 'a' || result[0] == 'A') &&
         result[1] == ' ' &&
         is_vowel(result[2]) )

[35.9477]

[42.11162]

    if ( result.length() >= 3
         && (result[0] == 'a' || result[0] == 'A')
         && result[1] == ' '
         && is_vowel(result[2]) )

Insertion in crawl-ref/source/mon-util.cc at line 1736 [13.1699344]

[35.9675]

}
// Fills the number parameter (if not otherwise needed) with a seed for
// random name choice from randname.txt.
bool give_unique_monster_name(monsters *mon, bool higher_orcs_only)
{
    // already have a name
    if (mons_is_unique(mon->type) || mon->type == MONS_PLAYER_GHOST
        || mon->type == MONS_PANDEMONIUM_DEMON)
    {
        return false;
    }
    // need their number parameter for other information
    if (mon->type == MONS_HYDRA // #heads
        || mon->type == MONS_ABOMINATION_SMALL // colour
        || mon->type == MONS_ABOMINATION_LARGE // colour
        || mon->type == MONS_MANTICORE // #spikes
        || mons_genus(mon->type) == MONS_DRACONIAN // subspecies
        || mons_class_is_zombified(mon->type)) // zombie type
    {
        return false;
    }
    // Since this is called from the various divine blessing routines,
    // don't bless non-orcs, and don't bless plain orcs, either.
    if (higher_orcs_only
        && (mons_species(mon->type) != MONS_ORC || mon->type == MONS_ORC))
    {
        return false;
    }
    // already has a unique name
    if (mon->number > 0 && mon->number != MONS_PROGRAM_BUG)
        return false;
    // randomly pick a number
    // XXX: Why does unsigned int (number's type) get munged on save & reload?
    mon->number = (unsigned char) random_int();
//    mprf(MSGCH_DIAGNOSTICS, "new monster number is %d", mon->number);
    return (mon->number != 0 && mon->number != MONS_PROGRAM_BUG);

Insertion in crawl-ref/source/mon-util.cc at line 1780 [13.1699344]

[42.11348]

[13.1731690]

std::string get_unique_monster_name(const monsters *mon)
{
    if (mons_is_unique(mon->type))
        return get_monster_data(mon->type)->name;
    if (mon->type == MONS_PLAYER_GHOST)
        return mon->ghost->name + "'s ghost";
    if (mon->type == MONS_PANDEMONIUM_DEMON)
        return mon->ghost->name;
    // Since the seed for the monster name is stored in mon->number
    // any monster that uses number for something else cannot be named.
    if (mon->type == MONS_HYDRA // #heads
        || mon->type == MONS_ABOMINATION_SMALL // colour
        || mon->type == MONS_ABOMINATION_LARGE // colour
        || mon->type == MONS_MANTICORE // #spikes
        || mons_genus(mon->type) == MONS_DRACONIAN // subspecies
        || mons_class_is_zombified(mon->type)) // zombie type
    {
        return "";
    }
    // unnamed, sorry
    if (mon->number <= 0 || mon->number == MONS_PROGRAM_BUG)
        return "";
//    mprf(MSGCH_DIAGNOSTICS, "get name from number %d", mon->number);
    rng_save_excursion rng_state;
    seed_rng( mon->number );
    std::string name
        = getRandNameString(get_monster_data(mon->type)->name, " name");
    if (!name.empty())
        return name;
    name = getRandNameString(get_monster_data(mons_genus(mon->type))->name,
                             " name");
    if (!name.empty())
        return name;
    name = getRandNameString("generic_monster_name");
    return name;
}

Insertion in crawl-ref/source/mon-util.cc at line 3015 [13.1699344]
[43.4475]
[43.4475]
```
    {
```
Insertion in crawl-ref/source/mon-util.cc at line 3018 [13.1699344]
[43.4579]
[43.4579]
```
    }
```
Insertion in crawl-ref/source/mon-util.cc at line 3055 [13.1699344]
[43.5051]
[43.5051]
```
    {
```
Insertion in crawl-ref/source/mon-util.cc at line 3059 [13.1699344]
[44.848]
[43.5158]
```
    }
```
Insertion in crawl-ref/source/mon-util.cc at line 3101 [13.1699344]
[43.6100]
[43.6100]
```
    {
```
Insertion in crawl-ref/source/mon-util.cc at line 3104 [13.1699344]
[43.6208]
[43.6208]
```
    }
```
Insertion in crawl-ref/source/mon-util.cc at line 3583 [13.1699344]
[45.15493]
[45.15493]
```
    {
```
Insertion in crawl-ref/source/mon-util.cc at line 3586 [13.1699344]
[45.15601]
[45.15601]
```
    }
```

Insertion in crawl-ref/source/mon-util.cc at line 3724 [13.1699344]

[36.2393]

    std::string monnam = get_unique_monster_name(this);
    if (!monnam.empty())
        return monnam;

Replacement in crawl-ref/source/mon-util.cc at line 4115 [13.1699344]

B:BD[46.6916] → [39.14084:14277]

    hit_dice = ghost->xl;
    hit_points = ghost->max_hp;
    max_hit_points = ghost->max_hp;
    ac = ghost->ac;
    ev = ghost->ev;
    speed = (one_chance_in(3) ? 10 : 8 + roll_dice(2, 9));

[46.6916]

[46.7200]

    hit_dice        = ghost->xl;
    hit_points      = ghost->max_hp;
    max_hit_points  = ghost->max_hp;
    ac              = ghost->ac;
    ev              = ghost->ev;
    speed           = (one_chance_in(3) ? 10 : 8 + roll_dice(2, 9));

Insertion in crawl-ref/source/mon-util.cc at line 4122 [13.1699344]
[46.7226]
[47.2676]
Insertion in crawl-ref/source/mon-util.cc at line 4127 [13.1699344]
[48.2330]
[46.7281]

Replacement in crawl-ref/source/mon-util.cc at line 4133 [13.1699344]

B:BD[46.7342] → [46.7342:7372]

B:BD[46.7372] → [39.14278:14438]

    type = MONS_PLAYER_GHOST;
    hit_dice = ghost->xl;
    hit_points = ghost->max_hp;
    max_hit_points = ghost->max_hp;
    ac = ghost->ac;
    ev = ghost->ev;
    speed = ghost->speed;

[46.7342]

[46.7628]

    type            = MONS_PLAYER_GHOST;
    hit_dice        = ghost->xl;
    hit_points      = ghost->max_hp;
    max_hit_points  = ghost->max_hp;
    ac              = ghost->ac;
    ev              = ghost->ev;
    speed           = ghost->speed;

Replacement in crawl-ref/source/mon-util.cc at line 4141 [13.1699344]

B:BD[46.7654] → [46.7654:7815]

B:BD[46.7815] → [49.14461:14492]

    attitude = ATT_HOSTILE;
    behaviour = BEH_WANDER;
    flags = 0;
    foe = MHITNOT;
    foe_memory = 0;
    colour = mons_class_colour(MONS_PLAYER_GHOST);
    number = MONS_PROGRAM_BUG;

[46.7654]

[46.7833]

    attitude        = ATT_HOSTILE;
    behaviour       = BEH_WANDER;
    flags           = 0;
    foe             = MHITNOT;
    foe_memory      = 0;
    colour          = mons_class_colour(MONS_PLAYER_GHOST);
    number          = MONS_PROGRAM_BUG;

Replacement in crawl-ref/source/mon-util.cc at line 4260 [13.1699344]

B:BD[46.8217] → [46.8217:8232]

B:BD[46.8232] → [14.4809:4830]

∅:D[14.4830] → [46.8232:8333]

B:BD[46.8232] → [46.8232:8333]

    flags = 0;
    experience = 0L;
    type = -1;
    hit_points = 0;
    max_hit_points = 0;
    hit_dice = 0;
    ac = 0;
    ev = 0;

[46.8217]

[46.8333]

    flags           = 0;
    experience      = 0L;
    type            = -1;
    hit_points      = 0;
    max_hit_points  = 0;
    hit_dice        = 0;
    ac              = 0;
    ev              = 0;

Replacement in crawl-ref/source/mon-util.cc at line 4269 [13.1699344]

B:BD[46.8358] → [46.8358:8432]

B:BD[46.8432] → [50.12617:12633]

    attitude = ATT_HOSTILE;
    behaviour = BEH_SLEEP;
    foe = MHITNOT;
    number = 0;

[46.8358]

[46.8432]

    attitude        = ATT_HOSTILE;
    behaviour       = BEH_SLEEP;
    foe             = MHITNOT;
    number          = 0;

Replacement in crawl-ref/source/mon-util.cc at line 4298 [13.1699344]
∅:D[51.33474] → [46.8603:8673]
B:BD[46.8603] → [46.8603:8673]
```
    if (book == MST_NO_SPELLS || (book == MST_GHOST && !ghost.get()))
```
[51.33474]
[46.8673]
```
    if (book == MST_NO_SPELLS || book == MST_GHOST && !ghost.get())
```
Insertion in crawl-ref/source/mon-util.cc at line 5591 [13.1699344]
[52.8239]
[52.8239]
```
            {
```
Insertion in crawl-ref/source/mon-util.cc at line 5595 [13.1699344]
[52.8385]
[52.8385]
```
            }
```

Replacement in crawl-ref/source/mon-util.cc at line 5854 [13.1699344]

B:BD[53.19177] → [54.632:752]

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

[53.19177]

[53.19255]

    std::string name = get_unique_monster_name(monster);
    if (!name.empty() && player_monster_visible(monster))
    {
        msg = replace_all(msg, "@the_something@", name);
        msg = replace_all(msg, "@The_something@", name);
        msg = replace_all(msg, "@the_monster@",   name);
        msg = replace_all(msg, "@The_monster@",   name);
    }
    else if (monster->attitude == ATT_FRIENDLY && !mons_is_unique(monster->type)
             && player_monster_visible(monster))

Replacement in crawl-ref/source/enum.h at line 77 [13.3287960]
B:BD[55.2372] → [56.2890:2937]
```
    ABIL_ZIN_RECITE = 110,             //  110
```
[55.2372]
[57.16997]
```
    ABIL_ZIN_RECITE = 110,                  //  110
```
Replacement in crawl-ref/source/enum.h at line 80 [13.3287960]
B:BD[57.17050] → [58.3203:3250]
```
    ABIL_TSO_DIVINE_SHIELD = 120,      //  120
```
[57.17050]
[59.903301]
```
    ABIL_TSO_DIVINE_SHIELD = 120,           //  120
```
Replacement in crawl-ref/source/enum.h at line 82 [13.3287960]
B:BD[59.903331] → [3.2666:2713]
```
    ABIL_TSO_SUMMON_DAEVA,             //  122
```
[59.903331]
[13.3290877]
```
    ABIL_TSO_SUMMON_DAEVA,                  //  122
```
Replacement in crawl-ref/source/enum.h at line 95 [13.3287960]
∅:D[60.6728] → [13.3291409:3291464]
B:BD[13.3291409] → [13.3291409:3291464]
```
    ABIL_MAKHLEB_MINOR_DESTRUCTION = 180,      //  180
```
[60.6728]
[13.3291464]
```
    ABIL_MAKHLEB_MINOR_DESTRUCTION = 180,   //  180
```

Replacement in crawl-ref/source/enum.h at line 98 [13.3287960]

B:BD[13.3291544] → [13.3291544:3291599]

B:BD[13.3291599] → [59.903367:903422]

    ABIL_MAKHLEB_GREATER_SERVANT_OF_MAKHLEB,   //  183
    ABIL_SIF_MUNA_CHANNEL_ENERGY = 190,        //  190

[13.3291544]

[59.903422]

    ABIL_MAKHLEB_GREATER_SERVANT_OF_MAKHLEB,//  183
    ABIL_SIF_MUNA_CHANNEL_ENERGY = 190,     //  190

Replacement in crawl-ref/source/enum.h at line 102 [13.3287960]
∅:D[60.6761] → [13.3291655:3291701]
∅:D[61.6882] → [13.3291655:3291701]
∅:D[59.903454] → [13.3291655:3291701]
B:BD[13.3291655] → [13.3291655:3291701]
```
    ABIL_TROG_BERSERK = 200,          //  200
```
[60.6761]
[60.6762]
```
    ABIL_TROG_BERSERK = 200,                //  200
```

Replacement in crawl-ref/source/enum.h at line 104 [13.3287960]

B:BD[60.6790] → [60.6790:6848]

    ABIL_TROG_BROTHERS_IN_ARMS,                   //  202

[60.6790]

[60.6848]

    ABIL_TROG_BROTHERS_IN_ARMS,             //  202

Replacement in crawl-ref/source/enum.h at line 106 [13.3287960]
∅:D[60.6889] → [13.3291774:3291830]
∅:D[61.6918] → [13.3291774:3291830]
B:BD[13.3291774] → [13.3291774:3291830]
```
    ABIL_ELYVILON_LESSER_HEALING = 220,         //  220
```
[60.6889]
[13.3291830]
```
    ABIL_ELYVILON_LESSER_HEALING = 220,     //  220
```
Replacement in crawl-ref/source/enum.h at line 110 [13.3287960]
B:BD[13.3291920] → [13.3291920:3291976]
```
    ABIL_ELYVILON_GREATER_HEALING,              //  224
```
[13.3291920]
[62.1234]
```
    ABIL_ELYVILON_GREATER_HEALING,          //  224
```
Replacement in crawl-ref/source/enum.h at line 115 [13.3287960]
∅:D[63.11577] → [62.1293:1322]
B:BD[62.1293] → [62.1293:1322]
```
    ABIL_LUGONU_ABYSS_ENTER,
```
[63.11577]
[64.2715]
```
    ABIL_LUGONU_ABYSS_ENTER,                //  229
```
Replacement in crawl-ref/source/enum.h at line 120 [13.3287960]
B:BD[64.2798] → [64.2798:2827]
```
    ABIL_NEMELEX_STACK_FIVE,
```
[64.2798]
[65.20667]
```
    ABIL_NEMELEX_STACK_FIVE,                // 234
```
Replacement in crawl-ref/source/enum.h at line 122 [13.3287960]
B:BD[65.20691] → [66.650:690]
```
    ABIL_BEOGH_RECALL_ORCISH_FOLLOWERS,
```
[65.20691]
[67.4312]
```
    ABIL_BEOGH_RECALL_ORCISH_FOLLOWERS,     // 236
```
Insertion in crawl-ref/source/enum.h at line 595 [13.3287960]
[68.530]
[53.33313]
```
    CMD_TARGET_WIZARD_BLESS_MONSTER,
```

Replacement in crawl-ref/source/directn.cc at line 865 [13.3697945]

B:BD[53.34703] → [53.34703:34773]

                // seem capabable of adding bolding, not removing it,

[53.34703]

[53.34773]

                // seems capabable of adding bolding, not removing it,

Insertion in crawl-ref/source/directn.cc at line 869 [13.3697945]

[68.1180]

[53.34842]

            break;
        case CMD_TARGET_WIZARD_BLESS_MONSTER:
            if (!you.wizard || !in_bounds(moves.tx, moves.ty))
                break;
            mid = mgrd[moves.tx][moves.ty];
            if (mid == NON_MONSTER) // can put in terrain description here
                break;
            debug_apply_monster_blessing(&menv[mid]);

Insertion in crawl-ref/source/directn.cc at line 2014 [13.3697945]
[69.15392]
[44.1895]
```
    {
```
Insertion in crawl-ref/source/directn.cc at line 2017 [13.3697945]
[44.2010]
[69.15434]
```
    }
```
Insertion in crawl-ref/source/directn.cc at line 2019 [13.3697945]
[69.15491]
[44.2011]
```
    {
```
Insertion in crawl-ref/source/directn.cc at line 2022 [13.3697945]
[44.2124]
[69.15532]
```
    }
```

Replacement in crawl-ref/source/directn.cc at line 2168 [13.3697945]

B:BD[70.4729] → [44.2365:2409]

    std::string desc = mon->name(mondtype);

[70.4729]

[70.4775]

    std::string desc = get_unique_monster_name(mon);
    if (desc.empty())
        desc = mon->name(mondtype);

Insertion in crawl-ref/source/directn.cc at line 2405 [13.3697945]
[8.9269]
[8.9269]
```
    case 'P':  return CMD_TARGET_WIZARD_BLESS_MONSTER;
```

Replacement in crawl-ref/source/describe.cc at line 2070 [13.3736416]

B:BD[59.988435] → [36.3480:3530]

    description << mons.name(DESC_CAP_A) << "$$";

[71.2684]

[72.3317]

    std::string name = get_unique_monster_name(&mons);
    if (name.empty())
        name = mons.name(DESC_CAP_A);

Insertion in crawl-ref/source/describe.cc at line 2074 [13.3736416]
[72.3318]
[72.3318]
```
    description << name << "$$";
```
Insertion in crawl-ref/source/debug.h at line 165 [13.4011741]
[53.35375]
[43.10960]
```
void debug_apply_monster_blessing(monsters* mon);
```
Deletion in crawl-ref/source/debug.cc at line 3480 [13.4016436]
B:BD[53.37893] → [53.37893:37894]
Insertion in crawl-ref/source/debug.cc at line 3515 [13.4016436]
[53.38809]
[53.38809]
```
        {
```
Insertion in crawl-ref/source/debug.cc at line 3518 [13.4016436]
[53.38924]
[53.38924]
```
        }
```
Insertion in crawl-ref/source/debug.cc at line 3522 [13.4016436]
[53.39154]
[53.39154]
```
        {
```
Insertion in crawl-ref/source/debug.cc at line 3525 [13.4016436]
[53.39267]
[53.39267]
```
        }
```

Insertion in crawl-ref/source/debug.cc at line 3536 [13.4016436]

[43.11023]

static bool _force_suitable(const monsters *mon)
{
    return (mon->alive());
}
void debug_apply_monster_blessing(monsters* mon)
{
    mpr("Apply blessing of (B)eogh, The (S)hining One, or (R)andomly?",
        MSGCH_PROMPT);
    char type = (char) getchm(KC_DEFAULT);
    type = tolower(type);
    if (type != 'b' && type != 's' && type != 'r')
    {
        canned_msg( MSG_OK );
        return;
    }
    god_type god = GOD_NO_GOD;
    if (type == 'b' || type == 'r' && coinflip())
        god = GOD_BEOGH;
    else
        god = GOD_SHINING_ONE;
    if (!bless_follower(mon, god, _force_suitable, true))
        mprf("%s won't bless this monster for you!", god_name(god).c_str());
}
#endif
#ifdef WIZARD

Insertion in crawl-ref/source/dat/database/randname.txt at line 688 [73.14728]

[73.24786]


##############################################
# monster names
##############################################
orc name
# Some important syllables
#   beogh, bog = referring to Beogh
#   ork, orc, org, ok, oc, og (and more) = referring to orcs
#
# Other syllables may be borrowed from real life, or made up.
Albeogh
Bogbart
# slavic name, meaning "god's gift" :)
Bogdan
# Obvious references to Beogh
Bogdar
Bogmar
Bogward
Bogwik
Morbeogh
Sharbog
# Obvious references to orcs in general
Alork
Boruk
Marbork
Milork
Okrist
Oreg
Orik
Orkrul
Orkwin
Oruk
# Other
Agrik

Insertion in crawl-ref/source/dat/database/randname.txt at line 744 [73.14728]

[73.24787]

Arbolt
Arkwar
Berold
Dorog
Gorbash
Gorg
Learuk
Margrim
Morun
Murdo
Norbak
Olfik
Olfrun
Wardok
Worak
Wulfoc
Zoruk
%%%%

* Add a wizard function apply_monster_blessing to allow for easy testing

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/religion.h at line 83 [13.800304]

Replacement in crawl-ref/source/religion.cc at line 776 [13.804403]

Insertion in crawl-ref/source/religion.cc at line 1057 [13.804403]

Replacement in crawl-ref/source/religion.cc at line 1069 [13.804403]

Insertion in crawl-ref/source/religion.cc at line 1079 [13.804403]

Replacement in crawl-ref/source/religion.cc at line 1085 [13.804403]

Replacement in crawl-ref/source/religion.cc at line 1114 [13.804403]

Insertion in crawl-ref/source/religion.cc at line 1150 [13.804403]

Insertion in crawl-ref/source/religion.cc at line 1162 [13.804403]

Insertion in crawl-ref/source/religion.cc at line 1174 [13.804403]

Insertion in crawl-ref/source/religion.cc at line 1202 [13.804403]

Insertion in crawl-ref/source/religion.cc at line 1205 [13.804403]

Insertion in crawl-ref/source/religion.cc at line 1221 [13.804403]

Insertion in crawl-ref/source/religion.cc at line 1224 [13.804403]

Insertion in crawl-ref/source/religion.cc at line 1248 [13.804403]

Replacement in crawl-ref/source/religion.cc at line 1279 [13.804403]

Insertion in crawl-ref/source/religion.cc at line 1283 [13.804403]

Replacement in crawl-ref/source/religion.cc at line 1293 [13.804403]

Replacement in crawl-ref/source/randart.cc at line 796 [13.893152]

Replacement in crawl-ref/source/mutation.cc at line 1740 [13.1263003]

Replacement in crawl-ref/source/mtransit.cc at line 170 [31.8445]

Replacement in crawl-ref/source/monstuff.cc at line 1539 [13.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 1547 [13.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 1550 [13.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 1553 [13.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2611 [13.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 3159 [13.1396662]

Replacement in crawl-ref/source/mon-util.h at line 53 [13.1682293]

Replacement in crawl-ref/source/mon-util.h at line 177 [13.1682293]

Replacement in crawl-ref/source/mon-util.h at line 196 [13.1682293]

Replacement in crawl-ref/source/mon-util.h at line 214 [13.1682293]

Replacement in crawl-ref/source/mon-util.h at line 287 [13.1682293]

Replacement in crawl-ref/source/mon-util.h at line 386 [13.1682293]

Replacement in crawl-ref/source/mon-util.cc at line 1654 [13.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1728 [13.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 1736 [13.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 1780 [13.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 3015 [13.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 3018 [13.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 3055 [13.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 3059 [13.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 3101 [13.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 3104 [13.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 3583 [13.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 3586 [13.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 3724 [13.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 4115 [13.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 4122 [13.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 4127 [13.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 4133 [13.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 4141 [13.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 4260 [13.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 4269 [13.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 4298 [13.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 5591 [13.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 5595 [13.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 5854 [13.1699344]

Replacement in crawl-ref/source/enum.h at line 77 [13.3287960]

Replacement in crawl-ref/source/enum.h at line 80 [13.3287960]

Replacement in crawl-ref/source/enum.h at line 82 [13.3287960]

Replacement in crawl-ref/source/enum.h at line 95 [13.3287960]

Replacement in crawl-ref/source/enum.h at line 98 [13.3287960]

Replacement in crawl-ref/source/enum.h at line 102 [13.3287960]

Replacement in crawl-ref/source/enum.h at line 104 [13.3287960]

Replacement in crawl-ref/source/enum.h at line 106 [13.3287960]

Replacement in crawl-ref/source/enum.h at line 110 [13.3287960]

Replacement in crawl-ref/source/enum.h at line 115 [13.3287960]

Replacement in crawl-ref/source/enum.h at line 120 [13.3287960]

Replacement in crawl-ref/source/enum.h at line 122 [13.3287960]

Insertion in crawl-ref/source/enum.h at line 595 [13.3287960]

Replacement in crawl-ref/source/directn.cc at line 865 [13.3697945]

Insertion in crawl-ref/source/directn.cc at line 869 [13.3697945]

Insertion in crawl-ref/source/directn.cc at line 2014 [13.3697945]

Insertion in crawl-ref/source/directn.cc at line 2017 [13.3697945]

Insertion in crawl-ref/source/directn.cc at line 2019 [13.3697945]

Insertion in crawl-ref/source/directn.cc at line 2022 [13.3697945]