fiddlerwoaroof/crawl - Change LM764EO6YIFOKMRXWZ5S4GYZB4BHZQDTEFP7MEVYO4NN4EDOFGNQC

Outsource more speech:

Beogh's rants on destroying one of his idols
orcs converting to you
holy beings becoming neutral

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

Created by j-p-e-g on March 20, 2008

LM764EO6YIFOKMRXWZ5S4GYZB4BHZQDTEFP7MEVYO4NN4EDOFGNQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.h at line 67 [12.800304]

∅:D[4.2613] → [11.387:442]

∅:D[13.4909] → [11.387:442]

B:BD[14.188] → [11.387:442]

void beogh_convert_orc(monsters *orc, bool emergency);

[4.2613]

[5.2557]

void beogh_convert_orc(monsters *orc, bool emergency,
                       bool converted_by_follower = false);

Insertion in crawl-ref/source/religion.cc at line 41 [12.804403]
[15.234]
[12.805333]
```
#include "database.h"
```
Replacement in crawl-ref/source/religion.cc at line 1009 [12.804403]
B:BD[16.550] → [16.550:574]
```
        : "displeased";
```
[16.550]
[17.174]
```
                          : "displeased";
```
Deletion in crawl-ref/source/religion.cc at line 1436 [12.804403]
B:BD[12.838622] → [9.2547:2599]
∅:D[9.2599] → [18.184460:184505]
B:BD[18.184460] → [18.184460:184505]
```
            // hooking this up, but is it too good?
            // enjoy it while you can -- bwr
```

Insertion in crawl-ref/source/religion.cc at line 3157 [12.804403]

[19.3591]

[14.345]

}
// currently only used when orcish idols have been destroyed
static const char* _get_beogh_speech(const std::string key)
{
    std::string result = getSpeakString("Beogh " + key);
    if (!result.empty())
        return (result.c_str());
    return ("Beogh is angry!");

Replacement in crawl-ref/source/religion.cc at line 3183 [12.804403]

∅:D[20.499] → [14.692:702]

B:BD[14.692] → [14.692:702]

B:BD[14.702] → [2.247:287]

∅:D[2.287] → [20.540:807]

B:BD[20.540] → [20.540:807]

∅:D[20.807] → [14.895:905]

B:BD[14.895] → [14.895:905]

        {
            const char *messages[3] = {
                "Beogh fumes, \"This is no small sin, orc. Repent!\"",
                "Beogh whispers, \"You will pay for this transgression.\"",
                "Beogh rages, \"An eye for an eye...\""
            };
            revenge = RANDOM_ELEMENT(messages);
        }

[20.499]

[20.808]

            revenge = _get_beogh_speech("idol follower");

Replacement in crawl-ref/source/religion.cc at line 3185 [12.804403]

∅:D[20.853] → [14.918:928]

B:BD[14.918] → [14.918:928]

B:BD[14.928] → [2.288:328]

∅:D[2.328] → [20.894:1045]

B:BD[20.894] → [20.894:1045]

∅:D[20.1045] → [14.1115:1116]

∅:D[21.1471] → [14.1115:1116]

B:BD[14.1115] → [14.1115:1116]

B:BD[14.1116] → [20.1046:1104]

        {
            const char *messages[2] = {
                "Beogh's voice booms out: \"Heretic, die!\"",
                "You hear Beogh's thundering voice: \"Suffer, infidel!\""
            };
            revenge = RANDOM_ELEMENT(messages);
        }

[20.853]

[20.1104]

            revenge = _get_beogh_speech("idol hill orc");

Replacement in crawl-ref/source/religion.cc at line 3187 [12.804403]

B:BD[20.1117] → [20.1117:1127]

B:BD[20.1127] → [2.329:369]

∅:D[2.369] → [20.1167:1306]

B:BD[20.1167] → [20.1167:1306]

∅:D[20.1306] → [14.1165:1166]

B:BD[14.1165] → [14.1165:1166]

B:BD[14.1166] → [20.1307:1365]

        {
            const char *messages[2] = {
                "Beogh is not amused about the destruction of his idols.",
                "Beogh seems highly displeased."
            };
            revenge = RANDOM_ELEMENT(messages);
        }

[20.1117]

[14.1272]

            revenge = _get_beogh_speech("idol other");

Replacement in crawl-ref/source/religion.cc at line 3205 [12.804403]

B:BD[13.7121] → [3.2469:2525]

∅:D[3.2525] → [13.7172:7222]

B:BD[13.7172] → [13.7172:7222]

static void good_god_holy_being_attitude_change_speech(
    std::ostream &chan,
    const monsters *holy)

[13.7121]

[13.7222]

static void _print_good_god_neutral_holy_being_speech(const std::string key,
                                                      monsters *mon,
                                                      msg_channel_type channel)

Replacement in crawl-ref/source/religion.cc at line 3209 [12.804403]

B:BD[13.7224] → [13.7224:7466]

∅:D[13.7466] → [20.1436:1442]

B:BD[14.1587] → [20.1436:1442]

B:BD[20.1442] → [13.7467:8039]

B:BD[13.8039] → [6.2696:2702]

∅:D[20.1442] → [22.400:402]

∅:D[6.2702] → [22.400:402]

∅:D[13.8049] → [22.400:402]

B:BD[14.1592] → [22.400:402]

    switch (random2(3))
    {
    case 0:
        chan << " is calmed by your holy aura.";
        break;
    case 1:
        chan << " relaxes its fighting stance.";
        break;
    case 2:
        chan << " salutes you.";
        break;
    }
    chan << std::endl;
    if (!one_chance_in(3))
    {
        std::ostream& tchan = msg::streams(MSGCH_TALK);
        tchan << holy->pronoun(PRONOUN_CAP) << " ";
        switch (random2(3))
        {
        case 0:
            tchan << "shouts, \"Continue thy quest, mortal!\"";
            break;
        case 1:
            tchan << "says, \"Forge ahead, servant of "
                  << god_name(you.religion) << "!\"";
            break;
        case 2:
            tchan << "says, \"Carry on, mortal.\"";
            break;
        }
        tchan << std::endl;
    }
}

[13.7224]

[22.402]

    std::string msg = getSpeakString("good_god_neutral_holy_being_" + key);

Replacement in crawl-ref/source/religion.cc at line 3211 [12.804403]

B:BD[22.403] → [22.403:529]

static void beogh_orc_emergency_conversion_speech(
    std::ostream &chan,
    const monsters *orc)
{
    switch (random2(3))

[22.403]

[22.529]

    if (!msg.empty())

Replacement in crawl-ref/source/religion.cc at line 3213 [12.804403]

B:BD[22.535] → [22.535:818]

    case 0: chan << " surrenders. "; break;
    case 1: chan << " falls to " << orc->pronoun(PRONOUN_NOCAP_POSSESSIVE)
                 << " knees. "; break;
    case 2: chan << " raises " << orc->pronoun(PRONOUN_NOCAP_POSSESSIVE)
                 << " hands in surrender. "; break;

[22.535]

[22.818]

        msg = do_mon_str_replacements(msg, mon);
        mpr(msg.c_str(), channel);

Deletion in crawl-ref/source/religion.cc at line 3216 [12.804403]

B:BD[22.824] → [22.824:847]

B:BD[22.847] → [6.2703:2704]

∅:D[6.2704] → [22.852:1235]

B:BD[22.852] → [22.852:1235]

    chan << std::endl;
    static const char *mercy_message[] =
    {
        " shouts, \"I'll follow you, let me live!\"",
        " says, \"You must be the Messiah, I see it now!\"",
        " yells, \"Beogh is my god, I swear it!\""
    };
    msg::streams(MSGCH_TALK) << orc->pronoun(PRONOUN_CAP)
                             << RANDOM_ELEMENT(mercy_message)
                             << std::endl;

Deletion in crawl-ref/source/religion.cc at line 3218 [12.804403]

B:BD[22.1238] → [22.1238:1775]

static void beogh_orc_spontaneous_conversion_speech(
    std::ostream &chan,
    const monsters *orc)
{
    switch (random2(3))
    {
    case 0:
        chan << " stares at you in amazement and kneels.";
        break;
    case 1:
        chan << " relaxes " << orc->pronoun(PRONOUN_NOCAP_POSSESSIVE)
             << " fighting stance and smiles at you.";
        break;
    case 2:
        chan << " falls on " << orc->pronoun(PRONOUN_NOCAP_POSSESSIVE)
             << " knees before you.";
        break;
    }
    chan << std::endl;

Deletion in crawl-ref/source/religion.cc at line 3219 [12.804403]

B:BD[22.1776] → [22.1776:2400]

B:BD[22.2400] → [6.2705:2711]

∅:D[6.2711] → [13.8050:8052]

B:BD[22.2410] → [13.8050:8052]

    if (!one_chance_in(3))
    {
        std::ostream& tchan = msg::streams(MSGCH_TALK);
        tchan << orc->pronoun(PRONOUN_CAP) << " ";
        switch (random2(4))
        {
        case 0:
            tchan << "shouts, \"I'll follow thee gladly!\"";
            break;
        case 1:
            tchan << "shouts, \"Surely Beogh must have "
                "sent you!\"";
            break;
        case 2:
            tchan << "asks, \"Are you our saviour?\"";
            break;
        case 3:
            tchan << "says, \"I'm so glad you are here now.\"";
            break;
        }
        tchan << std::endl;
    }
}

Replacement in crawl-ref/source/religion.cc at line 3226 [12.804403]

B:BD[13.8216] → [13.8216:8324]

        std::ostream& chan = msg::streams(MSGCH_MONSTER_ENCHANT);
        chan << holy->name(DESC_CAP_THE);

[13.8216]

[13.8324]

        _print_good_god_neutral_holy_being_speech("reaction", holy,
                                                 MSGCH_MONSTER_ENCHANT);

Replacement in crawl-ref/source/religion.cc at line 3229 [12.804403]

B:BD[13.8325] → [3.2526:2590]

        good_god_holy_being_attitude_change_speech(chan, holy);

[13.8325]

[13.8384]

        if (!one_chance_in(3))
            _print_good_god_neutral_holy_being_speech("speech", holy,
                                                      MSGCH_TALK);

Replacement in crawl-ref/source/religion.cc at line 3244 [12.804403]

B:BD[23.16982] → [11.444:498]

void beogh_convert_orc(monsters *orc, bool emergency)

[23.16982]

[22.2449]

static void _print_converted_orc_speech(const std::string key,
                                        monsters *mon,
                                        msg_channel_type channel)
{
    std::string msg = getSpeakString("beogh_converted_orc_" + key);
    
    if (!msg.empty())
    {
        msg = do_mon_str_replacements(msg, mon);
        mpr(msg.c_str(), channel);
    }
}
void beogh_convert_orc(monsters *orc, bool emergency,
                       bool converted_by_follower)

Deletion in crawl-ref/source/religion.cc at line 3264 [12.804403]

B:BD[22.2565] → [22.2565:2673]

        std::ostream& chan = msg::streams(MSGCH_MONSTER_ENCHANT);
        chan << orc->name(DESC_CAP_THE);

Replacement in crawl-ref/source/religion.cc at line 3265 [12.804403]

∅:D[11.546] → [22.2707:2769]

B:BD[22.2707] → [22.2707:2769]

            beogh_orc_emergency_conversion_speech(chan, orc);

[11.546]

[22.2769]

        {
            if (converted_by_follower)
            {
                _print_converted_orc_speech("reaction_battle_follower", orc,
                                            MSGCH_MONSTER_ENCHANT);
                _print_converted_orc_speech("speech_battle_follower", orc,
                                            MSGCH_TALK);
            }
            else
            {
                _print_converted_orc_speech("reaction_battle", orc,
                                            MSGCH_MONSTER_ENCHANT);
                _print_converted_orc_speech("speech_battle", orc, MSGCH_TALK);
            }
        }

Replacement in crawl-ref/source/religion.cc at line 3281 [12.804403]

B:BD[22.2782] → [22.2782:2846]

            beogh_orc_spontaneous_conversion_speech(chan, orc);

[22.2782]

[22.2846]

        {
            _print_converted_orc_speech("reaction_sight", orc,
                                        MSGCH_MONSTER_ENCHANT);
            
            if (!one_chance_in(3))
                _print_converted_orc_speech("speech_sight", orc, MSGCH_TALK);
        }

Replacement in crawl-ref/source/randart.cc at line 133 [12.893152]

B:BD[12.904872] → [24.5757:5950]

    // Don't allow "player's Doom" type names for god gifts (except Xom!)
    if (name.find("@player_name@'s", 0) != std::string::npos
        && god_gift != GOD_NO_GOD && god_gift != GOD_XOM)

[12.904872]

[24.5950]

    // Don't allow "player's Death" type names for god gifts (except Xom!)
    if (god_gift != GOD_NO_GOD && god_gift != GOD_XOM
        && name.find("@player_name@'s", 0) != std::string::npos
        && name.find("Death", 0) != std::string::npos)

Replacement in crawl-ref/source/randart.cc at line 157 [12.893152]
B:BD[24.6614] → [24.6614:6645]
```
            switch(random2(6))
```
[24.6614]
[24.6645]
```
            switch(random2(8))
```

Insertion in crawl-ref/source/randart.cc at line 169 [12.893152]

[24.6898]

            case 5:
               place = "the Realm of Zot";
               break;
            case 6:

Replacement in crawl-ref/source/randart.cc at line 175 [12.893152]
B:BD[24.6960] → [24.6960:6980]
```
            case 5:
```
[24.6960]
[24.6980]
```
            case 7:
```

Replacement in crawl-ref/source/randart.cc at line 183 [12.893152]

B:BD[24.7134] → [24.7134:7206]

                     static_cast<branch_type>(random2(BRANCH_INFERNO));

[24.7134]

[24.7206]

                     static_cast<branch_type>(random2(BRANCH_TARTARUS));

Replacement in crawl-ref/source/monstuff.cc at line 508 [12.1396662]

B:BD[22.4592] → [11.579:625]

            beogh_convert_orc(monster, true);

[22.4592]

[22.4632]

            beogh_convert_orc(monster, true, MON_KILL(killer));

Replacement in crawl-ref/source/monstuff.cc at line 6272 [12.1396662]
B:BD[12.1555845] → [12.1555845:1555909]
```
}                               // end message_current_target()
```
[12.1555845]
[12.1555909]
```
}
```
Replacement in crawl-ref/source/monstuff.cc at line 6278 [12.1396662]
B:BD[12.1556058] → [12.1556058:1556113]
```
}                               // end monster_index()
```
[12.1556058]
[12.1556113]
```
}
```
Replacement in crawl-ref/source/enum.h at line 331 [12.3287960]
B:BD[25.11227] → [25.11227:11243]
B:BD[25.11243] → [8.2982:3018]
```
    BRANCH_DIS,
    BRANCH_FIRST_HELL = BRANCH_DIS,
```
[25.11227]
[25.11243]
```
    BRANCH_FIRST_HELL,
    BRANCH_DIS = BRANCH_FIRST_HELL,
```

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

[26.4208]


%%%%
good_god_neutral_holy_being_reaction
@The_monster@ is calmed by your holy aura.
@The_monster@ relaxes its fighting stance.
@The_monster@ salutes you.

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

[26.4214]

good_god_neutral_holy_being_speech
@The_monster@ shouts, "Continue thy quest, mortal!"
@The_monster@ says, "Forge ahead, servant of @player_god@!"
@The_monster@ says, "Carry on, mortal."
%%%%

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

[7.4234]

[28.7279]

%%%%
###############################
# orc conversion speech 
###############################
# on sight
beogh_converted_orc_reaction_sight
@The_monster@ stares at you in amazement and kneels.
@The_monster@ relaxes @pronoun@ fighting stance and smiles at you.
@The_monster@ falls on @pronoun@ knees before you.
%%%%
beogh_converted_orc_speech_sight
@Pronoun@ shouts, "I'll follow thee gladly!"
@Pronoun@ shouts, "Surely Beogh must have sent you!"
@Pronoun@ asks, "Are you our saviour?"
@Pronoun@ says, "I'm so glad you are here now."
%%%%
# through battle
beogh_converted_orc_reaction_battle
@The_monster@ surrenders.
@The_monster@ falls to @pronoun@ knees.
@The_monster@ raises @pronoun@ hands in surrender.

Insertion in crawl-ref/source/dat/database/monspeak.txt at line 2283 [27.307]
[28.7284]
[29.6816]
```
beogh_converted_orc_speech_battle
```

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

[29.6817]

@Pronoun@ shouts, "I'll follow you, let me live!"
@Pronoun@ says, "You must be the Messiah, I see it now!"
@Pronoun@ yells, "Beogh is my god, I swear it!"
%%%%
########################################################
# Maybe use different speech if converted by a follower.
########################################################
beogh_converted_orc_reaction_battle_follower
@beogh_converted_orc_reaction_battle@
%%%%
beogh_converted_orc_reaction_speech_follower
@beogh_converted_orc_reaction_speech@
%%%%

Insertion in crawl-ref/source/dat/database/godspeak.txt at line 338 [10.5538]

[10.11472]


%%%%
############################################
# Beogh rants on destroying an orcish idol #
############################################
# Beogh's messiah has destroyed an idol
Beogh idol follower
Beogh fumes, "This is no small sin, orc. Repent!"
Beogh whispers, "You will pay for this transgression.",
Beogh rages, "An eye for an eye..."
%%%%
# an unbelieving hill orc has destroyed an idol
Beogh idol hill orc
Beogh's voice booms out: "Heretic, die!"
You hear Beogh's thundering voice: "Suffer, infidel!"

Insertion in crawl-ref/source/dat/database/godspeak.txt at line 361 [10.5538]

[10.11478]

# a character of another species has destroyed an idol
Beogh idol other
Beogh is not amused about the destruction of his idols.

Insertion in crawl-ref/source/dat/database/godspeak.txt at line 366 [10.5538]
[10.11479]
```
Beogh seems highly displeased.
%%%%
```