fiddlerwoaroof/crawl - Change NMZFCCM6O3KO2GJWKOSULN27B3QIZKWPBOB62PAILXMRQD4JMIMAC

Outsourcing Xom speech.

"You hear the rejoicing of dolorous and dpeg!" Xom is fascinated!

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

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

NMZFCCM6O3KO2GJWKOSULN27B3QIZKWPBOB62PAILXMRQD4JMIMAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/xom.cc at line 13 [5.3]
[4.142]
[5.226]
```
#include "database.h"
```

Deletion in crawl-ref/source/xom.cc at line 65 [5.3]

B:BD[5.1764] → [6.247:251]

B:BD[6.251] → [3.5:54]

∅:D[3.54] → [6.293:398]

B:BD[6.293] → [6.293:398]

B:BD[6.398] → [3.55:109]

∅:D[3.109] → [6.445:712]

B:BD[6.445] → [6.445:712]

B:BD[6.712] → [3.110:272]

∅:D[3.272] → [6.712:740]

B:BD[6.712] → [6.712:740]

B:BD[6.740] → [3.273:619]

∅:D[3.619] → [6.740:1573]

B:BD[6.740] → [6.740:1573]

∅:D[6.1573] → [5.1764:2370]

B:BD[5.1764] → [5.1764:2370]

};
static const char *xom_single_normal_summons[] =
{
    "\"Serve the mortal, my child!\"",
    "\"Serve the toy, my child!\"",
    "Xom opens a gate."
};
static const char *xom_single_normal_diff_summons[] =
{
    "\"Serve the mortal, my confused child!\"",
    "\"Serve the toy, my child of exile!\"",
    "Xom calls in a curious servant of another god.",
    "Xom lures something onto this plane.",
    "\"A toy for the toy!\"",
    "\"I wonder which toy lasts longer.\"",
    "Xom opens a gate."
};
static const char *xom_single_high_summons[] =
{
    "Xom grants you a demonic assistant.",
    "Xom grants you a demonic servitor.",
    "Xom opens a gate."
};
static const char *xom_single_high_diff_summons[] =
{
    "Xom grants you an assistant from another god.",
    "Xom beguiles another god's servant into helping you.",
    "\"Where'd that come from? Oh, well.\"",
    "You wonder where Xom got that toy from.",
    "Xom seems to have successfully tricked another god.",
    "Xom opens a gate."
};
static const char *xom_multiple_summons[] =
{
    "\"Serve the mortal, my children!\"",
    "Xom grants you some temporary aid.",
    "Xom momentarily opens a gate."
};
static const char *xom_multiple_some_diff_summons[] =
{
    "Xom calls in some mixed company.",
    "\"Serve the toy, my motley children!\"",
    "Xom sends help from the ranks of the outcast.",
    "\"Oh, what a happy playground.\"",
    "Xom manages to trick several beings into existence.",
    "Xom snickers at the variety.",
    "Xom momentarily opens several gates."
};
static const char *xom_multiple_all_diff_summons[] =
{
    "Xom stirs up dislodged servants of other gods.",
    "Xom summons wayward servants of other gods.",
    "Xom tricks other gods for their servants.",
    "\"Different god, different toy.\"",
    "Xom momentarily opens a gate."
};
static const char *xom_try_this[] =
{
    "\"Perhaps you should try this instead.\"",
    "\"Maybe this would work better.\"",
    "\"Catch!\""
};
static const char *xom_try_this_ring[] =
{
    "\"Try this.\"",
    "\"Catch!\"",
    "\"Take this!\""
};
static const char *xom_try_this_other_thing[] =
{
    "\"Perhaps you should try this instead.\"",
    "\"Have you considered using one of these?\"",
    "\"How about this?\""
};
static const char *xom_try_these_duds[] =
{
    "\"Perhaps you should try this instead.\"",
    "\"Have you considered wearing one of these?\"",
    "\"Here you go.\""

Deletion in crawl-ref/source/xom.cc at line 67 [5.3]

B:BD[5.2374] → [5.2374:2682]

static const char *xom_generic_beneficence[] =
{
    "Xom grants you a gift!",
    "\"Here.\"",
    "Xom's generous nature manifests itself.",
    "Xom grants you an implement of some kind.",
    "\"Take this instrument of something!\"",
    "\"Take this token of my esteem.\"",
    "Xom smiles on you."
};

Insertion in crawl-ref/source/xom.cc at line 111 [5.3]

[7.1742]

static const char* _get_xom_speech(const std::string key)
{
    std::string result = getSpeakString("Xom " + key);
    
    if (result.empty())
        result = getSpeakString("Xom general effect");
        
    if (!result.empty())
        return (result.c_str());
        
    return ("Xom makes something happen.");
}

Replacement in crawl-ref/source/xom.cc at line 193 [5.3]

B:BD[5.4515] → [5.4515:4574]

    god_speaks(GOD_XOM, "Xom's power flows through you!");

[5.4515]

[8.65]

    god_speaks(GOD_XOM, _get_xom_speech("spell effect"));

Replacement in crawl-ref/source/xom.cc at line 268 [5.3]

B:BD[5.6599] → [9.72:135]

            god_speaks(GOD_XOM, RANDOM_ELEMENT(xom_try_this));

[5.6599]

[5.6634]

            god_speaks(GOD_XOM, _get_xom_speech("cursed gift"));

Replacement in crawl-ref/source/xom.cc at line 284 [5.3]

B:BD[5.7215] → [9.136:199]

            god_speaks(GOD_XOM, RANDOM_ELEMENT(xom_try_this));

[5.7215]

[5.7250]

            god_speaks(GOD_XOM, _get_xom_speech("cursed gift"));

Replacement in crawl-ref/source/xom.cc at line 294 [5.3]

B:BD[5.7595] → [9.200:263]

            god_speaks(GOD_XOM, RANDOM_ELEMENT(xom_try_this));

[5.7595]

[5.7630]

            god_speaks(GOD_XOM, _get_xom_speech("cursed gift"));

Replacement in crawl-ref/source/xom.cc at line 306 [5.3]

B:BD[5.8122] → [9.264:332]

            god_speaks(GOD_XOM, RANDOM_ELEMENT(xom_try_this_ring));

[5.8122]

[5.8162]

            god_speaks(GOD_XOM, _get_xom_speech("ring gift"));

Replacement in crawl-ref/source/xom.cc at line 315 [5.3]

B:BD[5.8448] → [9.333:408]

            god_speaks(GOD_XOM, RANDOM_ELEMENT(xom_try_this_other_thing));

[5.8448]

[5.8495]

            god_speaks(GOD_XOM, _get_xom_speech("weapon gift"));

Replacement in crawl-ref/source/xom.cc at line 341 [5.3]

B:BD[5.9162] → [9.409:474]

        god_speaks(GOD_XOM, RANDOM_ELEMENT(xom_try_these_duds));

[5.9162]

[5.9199]

        god_speaks(GOD_XOM, _get_xom_speech("xom armour gift"));

Replacement in crawl-ref/source/xom.cc at line 350 [5.3]

B:BD[5.9443] → [9.475:541]

    god_speaks(GOD_XOM, RANDOM_ELEMENT(xom_generic_beneficence));

[5.9443]

[5.9481]

    god_speaks(GOD_XOM, _get_xom_speech("general gift"));

Replacement in crawl-ref/source/xom.cc at line 478 [5.3]

∅:D[8.173] → [10.125:401]

B:BD[10.125] → [10.125:401]

        god_speaks(GOD_XOM, random_choose_string(
                       "\"Go forth and destroy!\"",
                       "\"Go forth and cause havoc, mortal!\"",
                       "Xom grants you a minor favour.",
                       "Xom smiles on you.", NULL));

[8.173]

[10.401]

        god_speaks(GOD_XOM, _get_xom_speech("potion effect"));

Replacement in crawl-ref/source/xom.cc at line 507 [5.3]

B:BD[6.2173] → [6.2173:2253]

            god_speaks(GOD_XOM, RANDOM_ELEMENT(xom_multiple_all_diff_summons));

[6.2173]

[6.2253]

            god_speaks(GOD_XOM, _get_xom_speech("multiple holy summons"));

Replacement in crawl-ref/source/xom.cc at line 509 [5.3]

B:BD[6.2288] → [6.2288:2369]

            god_speaks(GOD_XOM, RANDOM_ELEMENT(xom_multiple_some_diff_summons));

[6.2288]

[6.2369]

            god_speaks(GOD_XOM, _get_xom_speech("multiple mixed summons"));

Replacement in crawl-ref/source/xom.cc at line 511 [5.3]

B:BD[6.2382] → [6.2382:2453]

            god_speaks(GOD_XOM, RANDOM_ELEMENT(xom_multiple_summons));

[6.2382]

[6.2453]

            god_speaks(GOD_XOM, _get_xom_speech("multiple summons"));

Replacement in crawl-ref/source/xom.cc at line 521 [5.3]

∅:D[8.175] → [11.1180:1230]

∅:D[10.602] → [11.1180:1230]

B:BD[11.1180] → [11.1180:1230]

B:BD[11.1230] → [10.603:810]

∅:D[10.810] → [11.1296:1365]

B:BD[11.1296] → [11.1296:1365]

        god_speaks(GOD_XOM, random_choose_string(
                       "You feel watched.",
                       "Everything around seems to assume a strange transparency.",
                       "All the walls suddenly lose part of their structure.",
                       "Xom alters the dungeon around you.", NULL));

[8.175]

[5.14663]

        god_speaks(GOD_XOM, _get_xom_speech("vitrification"));

Replacement in crawl-ref/source/xom.cc at line 544 [5.3]

B:BD[6.2878] → [3.620:705]

                god_speaks(GOD_XOM, RANDOM_ELEMENT(xom_single_normal_diff_summons));

[6.2878]

[6.2956]

                god_speaks(GOD_XOM, _get_xom_speech("single holy summon"));

Replacement in crawl-ref/source/xom.cc at line 546 [5.3]

B:BD[6.2973] → [3.706:786]

                god_speaks(GOD_XOM, RANDOM_ELEMENT(xom_single_normal_summons));

[6.2973]

[6.3046]

                god_speaks(GOD_XOM, _get_xom_speech("single summon"));

Replacement in crawl-ref/source/xom.cc at line 562 [5.3]

B:BD[5.15864] → [11.1835:2145]

            god_speaks(GOD_XOM, random_choose_string(
                           "\"This might be better!\"",
                           "\"Hum-dee-hum-dee-hum...\"",
                           "Xom's power touches on a nearby monster.",
                           "You hear Xom's avuncular chuckle.", NULL));

[5.15864]

[12.4]

            god_speaks(GOD_XOM, _get_xom_speech("weaker monster polymorph"));

Replacement in crawl-ref/source/xom.cc at line 581 [5.3]

B:BD[11.2272] → [11.2272:2590]

        god_speaks(GOD_XOM, random_choose_string(
                       "\"You need some minor adjustments, mortal!\"",
                       "\"Let me alter your pitiful body.\"",
                       "Xom's power touches on you for a moment.",
                       "You hear Xom's maniacal cackling.", NULL));

[11.2272]

[5.17069]

        god_speaks(GOD_XOM, _get_xom_speech("good mutations"));

Replacement in crawl-ref/source/xom.cc at line 613 [5.3]

B:BD[3.1071] → [3.1071:1154]

                god_speaks(GOD_XOM, RANDOM_ELEMENT(xom_single_high_diff_summons));

[3.1071]

[3.1154]

                god_speaks(GOD_XOM, _get_xom_speech("single major holy summon"));

Replacement in crawl-ref/source/xom.cc at line 615 [5.3]

B:BD[3.1171] → [3.1171:1249]

                god_speaks(GOD_XOM, RANDOM_ELEMENT(xom_single_high_summons));

[3.1171]

[3.1249]

	        god_speaks(GOD_XOM, _get_xom_speech("single demon summon"));

Replacement in crawl-ref/source/xom.cc at line 666 [5.3]

B:BD[5.19833] → [11.2981:3326]

            god_speaks(GOD_XOM, random_choose_string(
                           "Xom almost notices you.",
                           "Xom's attention almost turns to you for a moment.",
                           "Xom's power almost touches on you for a moment.",
                           "You almost hear Xom's maniacal laughter.", NULL));

[5.19833]

[8.257]

            god_speaks(GOD_XOM, _get_xom_speech("zero miscast effect"));

Replacement in crawl-ref/source/xom.cc at line 674 [5.3]

B:BD[5.20470] → [11.3327:3644]

            god_speaks(GOD_XOM, random_choose_string(
                           "Xom notices you.",
                           "Xom's attention turns to you for a moment.",
                           "Xom's power touches on you for a moment.",
                           "You hear Xom's maniacal laughter.", NULL));

[5.20470]

[8.261]

            god_speaks(GOD_XOM, _get_xom_speech("minor miscast effect"));

Replacement in crawl-ref/source/xom.cc at line 683 [5.3]

B:BD[5.21091] → [11.3645:3964]

            god_speaks(GOD_XOM, random_choose_string(
                           "\"Suffer!\"",
                           "Xom's malign attention turns to you for a moment.",
                           "Xom's power touches on you for a moment.",
                           "You hear Xom's maniacal laughter.", NULL));

[5.21091]

[8.325]

            god_speaks(GOD_XOM, _get_xom_speech("lose stats"));

Replacement in crawl-ref/source/xom.cc at line 692 [5.3]

B:BD[5.21653] → [11.3965:4282]

            god_speaks(GOD_XOM, random_choose_string(
                           "Xom notices you.",
                           "Xom's attention turns to you for a moment.",
                           "Xom's power touches on you for a moment.",
                           "You hear Xom's maniacal laughter.", NULL));

[5.21653]

[8.329]

            god_speaks(GOD_XOM, _get_xom_speech("medium miscast effect"));

Replacement in crawl-ref/source/xom.cc at line 703 [5.3]

B:BD[11.4385] → [11.4385:4721]

            god_speaks(GOD_XOM, random_choose_string(
                           "\"You need some minor improvements, mortal!\"",
                           "\"Let me alter your body.\"",
                           "Xom's power brushes against you for a moment.",
                           "You hear Xom's avuncular chuckle.", NULL));

[11.4385]

[5.22679]

            god_speaks(GOD_XOM, _get_xom_speech("random mutations"));

Replacement in crawl-ref/source/xom.cc at line 729 [5.3]

B:BD[12.162] → [11.4842:5172]

                god_speaks(GOD_XOM, random_choose_string(
                               "\"This might be better!\"",
                               "\"Hum-dee-hum-dee-hum...\"",
                               "Xom's power touches on a nearby monster.",
                               "You hear Xom's avuncular chuckle.", NULL));

[12.162]

[12.548]

                god_speaks(GOD_XOM, _get_xom_speech("stronger monster polymorph"));

Replacement in crawl-ref/source/xom.cc at line 742 [5.3]

B:BD[11.5275] → [11.5275:5624]

            god_speaks(GOD_XOM, random_choose_string(
                           "\"You have displeased me, mortal.\"",
                           "\"You have grown too confident for your meagre worth.\"",
                           "Xom's power touches on you for a moment.",
                           "You hear Xom's maniacal laughter.", NULL));

[11.5275]

[8.397]

            god_speaks(GOD_XOM, _get_xom_speech("draining or torment"));

Replacement in crawl-ref/source/xom.cc at line 762 [5.3]

B:BD[5.24951] → [11.5625:5950]

            god_speaks(GOD_XOM, random_choose_string(
                           "\"Time to have some fun!\"",
                           "\"Fight to survive, mortal.\"",
                           "\"Let's see if it's strong enough to survive yet.\"",
                           "You hear Xom's maniacal laughter.", NULL));

[5.24951]

[8.401]

            god_speaks(GOD_XOM, _get_xom_speech("hostile monster"));

Replacement in crawl-ref/source/xom.cc at line 783 [5.3]

B:BD[5.26093] → [11.5951:6218]

B:BD[11.6218] → [8.405:406]

            god_speaks(GOD_XOM, random_choose_string(
                           "\"Try this!\"",
                           "Xom's attention turns to you.",
                           "Xom's power touches on you.",
                           "Xom giggles.", NULL));

[5.26093]

[8.406]

            god_speaks(GOD_XOM, _get_xom_speech("major miscast effect"));

Replacement in crawl-ref/source/xom.cc at line 792 [5.3]

B:BD[5.26708] → [11.6219:6537]

            god_speaks(GOD_XOM, random_choose_string(
                           "\"You have grown too comfortable in your little world, mortal!\"",
                           "Xom casts you into the Abyss!",
                           "The world seems to spin as Xom's maniacal laughter rings in your ears.", NULL));

[5.26708]

[8.469]

            god_speaks(GOD_XOM, _get_xom_speech("banishment"));

Insertion in crawl-ref/source/database.cc at line 69 [13.13932]
[2.3891]
[2.3891]
```
            
```
Insertion in crawl-ref/source/database.cc at line 76 [13.13932]
[2.4141]
[2.4141]
```
            
```
Insertion in crawl-ref/source/database.cc at line 81 [13.13932]
[2.4337]
[2.4337]
```
            "database/godspeak.txt", // god speech
```
Insertion in crawl-ref/source/database.cc at line 83 [13.13932]
[2.4353]
[2.4353]
```
            
```

Replacement in crawl-ref/source/database.cc at line 88 [13.13932]

B:BD[2.4491] → [2.4491:4541]

    TextDB( "db/help",  "database/help.txt",  0),

[2.4491]

[14.876]

            
    TextDB( "db/help",
            "database/help.txt",
            0),

Replacement in crawl-ref/source/database.cc at line 95 [13.13932]

B:BD[2.4584] → [2.4584:4729]

static TextDB& RandartDB = AllDBs[1];
static TextDB& SpeakDB = AllDBs[2];
static TextDB& ShoutDB = AllDBs[3];
static TextDB& HelpDB = AllDBs[4];

[2.4584]

[15.11703]

static TextDB& RandartDB     = AllDBs[1];
static TextDB& SpeakDB       = AllDBs[2];
static TextDB& ShoutDB       = AllDBs[3];
static TextDB& HelpDB        = AllDBs[4];

Replacement in crawl-ref/source/database.cc at line 113 [13.13932]

B:BD[2.5098] → [2.5098:5134]

        if (input_file == 0) break;

[2.5098]

[2.5134]

        
        if (input_file == 0)
            break;

Insertion in crawl-ref/source/database.cc at line 127 [13.13932]
[2.5371]
[2.5371]
```
        
```
Insertion in crawl-ref/source/database.cc at line 130 [13.13932]
[2.5494]
[2.5494]
```
    
```

File addition: godspeak.txt (----------)

[15.14636]

############################################################
# godspeak.txt contains the messages for divine speech,
# though currently only for Xom.
#
# For an explanation of how to read godspeak.txt and how to 
# add new messages, see monster_speech.txt in the docs 
# directory.
############################################################
%%%%
# fall-back in case a keyword can't be found
Xom general effect
Xom snickers.
"How about this?"
"Let's try an experiment, hmm?"
"I wonder... What does this button do?"
%%%%
##############################
# Xom throwing stuff at you.
##############################
Xom general gift
Xom grants you a gift!
"Here."
Xom's generous nature manifests itself.
Xom grants you an implement of some kind.
"Take this instrument of something!"
"Take this token of my esteem."
Xom smiles on you.
%%%%
# Xom will give you a ring or amulet you can't currently use due to
# cursed equipment.
Xom cursed gift
"Perhaps you should try this instead."
"Maybe this would work better."
"Catch!"
%%%%
# If you're wearing a cursed ring Xom will give you another ring.
Xom ring gift
"Try this."
"Catch!"
"Take this!"
%%%%
# Xom will choose a weapon of a different subtype than the one you're
# currently wielding.
Xom weapon gift
"Perhaps you should try this instead."
"Have you considered using one of these?"
"How about this?"
%%%%
# If you're wearing a cursed cloak, Xom will give you either a cloak
# or body armour.
Xom armour gift
"Perhaps you should try this instead."
"Have you considered wearing one of these?"
"Here you go."
%%%%
####################
# friendly summons
####################
Xom single summon
"Serve the mortal, my child!"
"Serve the toy, my child!"
Xom opens a gate.
%%%%
Xom single holy summon
"Serve the mortal, my confused child!"
"Serve the toy, my child of exile!"
Xom calls in a curious servant of another god.
Xom lures something onto this plane.
"A toy for the toy!"
"I wonder which toy lasts longer."
Xom opens a gate.
%%%%
# higher demonic being
Xom single demon summon
Xom grants you a demonic assistant.
Xom grants you a demonic servitor.",
Xom opens a gate.
%%%%
Xom single major holy summon
Xom grants you an assistant from another god.
Xom beguiles another god's servant into helping you.
"Where'd that come from?  Oh, well."
You wonder where Xom got that toy from.
Xom seems to have successfully tricked another god.
Xom opens a gate.
%%%%
# several demons
Xom multiple summons
"Serve the mortal, my children!"
Xom grants you some temporary aid.
Xom momentarily opens a gate.
%%%%
# holy beings and demons at the same time
Xom multiple mixed summons
Xom calls in some mixed company.
"Serve the toy, my motley children!"
Xom sends help from the ranks of the outcast.
"Oh, what a happy playground."
Xom manages to trick several beings into existence.
Xom snickers at the variety.
Xom momentarily opens several gates.
%%%%
Xom multiple holy summons
Xom stirs up dislodged servants of other gods.
Xom summons wayward servants of other gods.
Xom tricks other gods for their servants.
"Different god, different toy."
Xom momentarily opens a gate.
%%%%
##################
# Xom nastiness
##################
# miscast strength 0, mostly harmless
Xom zero miscast effect
Xom almost notices you.
Xom's attention almost turns to you for a moment.
Xom's power almost touches on you for a moment.
You almost hear Xom's maniacal laughter.
%%%%
# miscast strength random2(2), harmless/annoying
Xom minor miscast effect
Xom notices you.
Xom's attention turns to you for a moment.
Xom's power touches on you for a moment.
You hear Xom's maniacal laughter.
%%%%
# miscast strength random2(3), mostly annoying
Xom medium miscast effect
@Xom minor miscast effect@
%%%%
# miscast strength random2(4), up to really nasty
Xom major miscast effect
"Try this!"
Xom's attention turns to you.
Xom's power touches on you.
Xom giggles.
%%%%
Xom lose stats
"Suffer!"
Xom's malign attention turns to you for a moment.
Xom's power touches on you for a moment.
You hear Xom's maniacal laughter.
%%%%
# 25% chance of draining, else torment
Xom draining or torment
"You have displeased me, mortal."
"You have grown too confident for your meagre worth."
Xom's power touches on you for a moment.
You hear Xom's maniacal laughter.
%%%%
# 25% chance dancing weapon, else summon hostile monster
Xom hostile monster
"Time to have some fun!"
"Fight to survive, mortal."
"Let's see if it's strong enough to survive yet."
You hear Xom's maniacal laughter.
%%%%
Xom banishment
"You have grown too comfortable in your little world, mortal!"
Xom casts you into the Abyss!
The world seems to spin as Xom's maniacal laughter rings in your ears.
%%%%
#####################
# other effects
#####################
Xom potion effect
"Go forth and destroy!"
"Go forth and cause havoc, mortal!"
Xom grants you a minor favour.
Xom smiles on you.
%%%%
# cast a random spell
Xom spell effect
Xom's power flows through you!
%%%%
# turns walls into glass
Xom vitrification
You feel watched.
Everything around seems to assume a strange transparency.
All the walls suddenly lose part of their structure.
Xom alters the dungeon around you.
%%%%
# strengthens friendlies, weakens hostiles
Xom better monster polymorph
"This might be better!"
"Hum-dee-hum-dee-hum..."
Xom's power touches on a nearby monster.
You hear Xom's avuncular chuckle.
%%%%
# weakens friendlies, strengthens hostiles
Xom worse monster polymorph
@Xom better monster polymorph@
%%%%
Xom good mutations
"You need some minor adjustments, mortal!"
"Let me alter your pitiful body."
Xom's power touches on you for a moment.
You hear Xom's maniacal cackling.
%%%%
Xom random mutations
"You need some minor improvements, mortal!"
"Let me alter your body."
Xom's power brushes against you for a moment.
You hear Xom's avuncular chuckle.
%%%%