fiddlerwoaroof/crawl - Change PMCHUVWMCDXOWGXB4SWMBXFGHJYZG7KZ34SE33HFUGHPQYP3LYEAC

Allow christening (beoghening?) of plain orcs, after all, but make it

rare and let the chance depend on max hp. Clean up naming some.

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

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

PMCHUVWMCDXOWGXB4SWMBXFGHJYZG7KZ34SE33HFUGHPQYP3LYEAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 888 [4.804403]

B:BD[3.2693] → [3.2693:2751]

    return heal_monster(mon, mon->max_hit_points, extra);

[3.2693]

[5.2524]

    if (heal_monster(mon, mon->max_hit_points, extra))
    {
        // high hp monsters might get a unique name
        if (random2(100) <= mon->max_hit_points)
            give_unique_monster_name(mon);
        return true;
    }
    return false;

Replacement in crawl-ref/source/mon-util.h at line 388 [4.1682293]

B:BD[2.4983] → [2.4983:5051]

bool give_unique_monster_name(monsters *mon, bool orc_only = true);

[2.4983]

[2.5051]

bool give_unique_monster_name(monsters *mon, bool orcs_only = true);

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

B:BD[2.5405] → [2.5405:5473]

bool give_unique_monster_name(monsters *mon, bool higher_orcs_only)

[2.5405]

[2.5473]

bool give_unique_monster_name(monsters *mon, bool orcs_only)

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

[2.5475]

    // already has a unique name
    if (mon->number > 0 && mon->number != MONS_PROGRAM_BUG)
        return false;

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

B:BD[2.5653] → [2.5653:6043]

    // 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

[2.5653]

[2.6043]

    // Since this is called from the various divine blessing routines,
    // don't bless non-orcs, and normally don't bless plain orcs, either.
    if (orcs_only)

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

B:BD[2.6049] → [2.6049:6071]

        return false;

[2.6049]

[2.6071]

        if (mons_species(mon->type) != MONS_ORC
            || mon->type == MONS_ORC && !one_chance_in(8))
        {
            return false;
        }

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

B:BD[2.6077] → [2.6077:6314]


    // 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))

[2.6077]

[2.6314]

    else

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

B:BD[2.6320] → [2.6320:6342]

        return false;

[2.6320]

[2.6342]

        // 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;
        }

Deletion in crawl-ref/source/mon-util.cc at line 1777 [4.1699344]

B:BD[2.6349] → [2.6349:6465]

    // already has a unique name
    if (mon->number > 0 && mon->number != MONS_PROGRAM_BUG)
        return false;

Insertion in crawl-ref/source/mon-util.cc at line 2966 [4.1699344]
[6.4006]
[6.4006]
```
    {
```
Insertion in crawl-ref/source/mon-util.cc at line 2970 [4.1699344]
[7.735]
[6.4111]
```
    }
```

Replacement in crawl-ref/source/mgrow.cc at line 82 [8.2647]

B:BD[8.5250] → [8.5250:5343]

static const monster_level_up *monster_level_up_target(
    monster_type type, int hit_dice)

[8.5250]

[8.5343]

static const _monster_level_up *monster_level_up_target( monster_type type,
                                                         int hit_dice)

Replacement in crawl-ref/source/directn.cc at line 2168 [4.3697945]
B:BD[9.4729] → [2.11298:11351]
```
    std::string desc = get_unique_monster_name(mon);
```
[9.4729]
[2.11351]
```
    std::string desc = mon->name(mondtype);
```
Deletion in crawl-ref/source/directn.cc at line 2170 [4.3697945]
B:BD[2.11352] → [2.11352:11410]
∅:D[7.2409] → [9.4775:4776]
∅:D[2.11410] → [9.4775:4776]
B:BD[9.4775] → [9.4775:4776]
```
    if (desc.empty())
        desc = mon->name(mondtype);
```

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

B:BD[10.2684] → [2.11471:11586]

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

[10.2684]

[11.3317]

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

Deletion in crawl-ref/source/describe.cc at line 2072 [4.3736416]
B:BD[11.3318] → [2.11587:11621]
```
    description << name << "$$";
```
Insertion in crawl-ref/source/dat/database/randname.txt at line 700 [12.14728]
[2.12779]
[2.12779]
```
# Obvious references to Beogh
```
Deletion in crawl-ref/source/dat/database/randname.txt at line 708 [12.14728]
B:BD[2.12844] → [2.12844:12874]
```
# Obvious references to Beogh
```
Insertion in crawl-ref/source/dat/database/randname.txt at line 711 [12.14728]
[2.12889]
[2.12889]
```
Bogric
Bogwald
```
Replacement in crawl-ref/source/dat/database/randname.txt at line 722 [12.14728]
B:BD[2.12917] → [2.12917:12925]
```
Sharbog
```
[2.12917]
[2.12925]
```
Sharbogh
```
Insertion in crawl-ref/source/dat/database/randname.txt at line 738 [12.14728]
[2.13016]
[2.13016]
```
Orgrim
```
Insertion in crawl-ref/source/dat/database/randname.txt at line 755 [12.14728]
[2.13077]
[2.13077]
```
Blodwig
Boderik
Brandogh
Brunolf
```
Insertion in crawl-ref/source/dat/database/randname.txt at line 769 [12.14728]
[2.13099]
[2.13099]
```
Grimold
Herok
```
Insertion in crawl-ref/source/dat/database/randname.txt at line 774 [12.14728]
[2.13100]
[2.13100]
```
Hilgar
```
Replacement in crawl-ref/source/dat/database/monspeak.txt at line 2042 [14.307]
B:BD[13.4441] → [13.4441:4445]
```
w:9
```
[13.4441]
[13.4445]
```
w:19
```
Replacement in crawl-ref/source/dat/database/monspeak.txt at line 2099 [14.307]
B:BD[13.4722] → [13.4722:4727]
```
w:60
```
[13.4722]
[13.4727]
```
w:70
```
Insertion in crawl-ref/source/dat/database/monspeak.txt at line 2159 [14.307]
[15.4024]
[13.5712]
```
# As they'll be constantly around you, don't let them talk too much.
w:30
__NONE
```
Insertion in crawl-ref/source/command.cc at line 581 [4.4082507]
[16.2919]
[17.48539]
```
    "<w>P</w>: apply divine blessing to target\n"
```

Allow christening (beoghening?) of plain orcs, after all, but make it

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/religion.cc at line 888 [4.804403]

Replacement in crawl-ref/source/mon-util.h at line 388 [4.1682293]

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

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

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

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

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

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

Deletion in crawl-ref/source/mon-util.cc at line 1777 [4.1699344]

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

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

Replacement in crawl-ref/source/mgrow.cc at line 82 [8.2647]

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

Deletion in crawl-ref/source/directn.cc at line 2170 [4.3697945]

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

Deletion in crawl-ref/source/describe.cc at line 2072 [4.3736416]

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

Deletion in crawl-ref/source/dat/database/randname.txt at line 708 [12.14728]

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

Replacement in crawl-ref/source/dat/database/randname.txt at line 722 [12.14728]

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

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

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

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

Replacement in crawl-ref/source/dat/database/monspeak.txt at line 2042 [14.307]

Replacement in crawl-ref/source/dat/database/monspeak.txt at line 2099 [14.307]

Insertion in crawl-ref/source/dat/database/monspeak.txt at line 2159 [14.307]

Insertion in crawl-ref/source/command.cc at line 581 [4.4082507]