fiddlerwoaroof/crawl - Change UFKUPRSVD4FYKEL5K7KPSJZJJBG4DXR5PCSQHFSWAHEETX43ITDQC

Implement [2546032]: Aside from orc priests and orcs, which can worship

Beogh, and holy beings, which can worship TSO (or, specially, Xom), give other priestly monsters that need gods the new god GOD_NAMELESS.
Monsters with this god will produce messages like "The monster invokes the aid of its god against you."

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

Created by dolorous on February 8, 2009

UFKUPRSVD4FYKEL5K7KPSJZJJBG4DXR5PCSQHFSWAHEETX43ITDQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/religion.cc at line 2261 [7.804403]
[5.697]
[6.12434]
```
    case GOD_NAMELESS: return "nameless";
```

Replacement in crawl-ref/source/religion.cc at line 6176 [7.804403]

B:BD[8.602] → [8.602:655]

    case GOD_NO_GOD: case NUM_GODS: case GOD_RANDOM:

[8.602]

[9.2715]

    case GOD_NO_GOD: case NUM_GODS: case GOD_RANDOM: case GOD_NAMELESS:

Insertion in crawl-ref/source/religion.cc at line 6997 [7.804403]
[2.2590]
[7.888962]
```
    case GOD_NAMELESS:
```

Deletion in crawl-ref/source/monplace.cc at line 1050 [7.1641732]

B:BD[10.3874] → [10.3874:3970]

            menv[id].god = coinflip() ? GOD_KIKUBAAQUDGHA : GOD_YREDELEMNUL;
            break;

Replacement in crawl-ref/source/monplace.cc at line 1052 [7.1641732]

B:BD[10.3993] → [10.3993:4164]

        {
            god_type gods[] = {GOD_KIKUBAAQUDGHA, GOD_YREDELEMNUL,
                               GOD_MAKHLEB};
            menv[id].god = RANDOM_ELEMENT(gods);

[10.3993]

[10.4164]

            menv[id].god = GOD_NAMELESS;

Deletion in crawl-ref/source/monplace.cc at line 1054 [7.1641732]
B:BD[10.4183] → [10.4183:4193]
```
        }
```

Replacement in crawl-ref/source/mon-util.cc at line 8209 [7.1699344]

B:BD[11.18898] → [4.11189:11244]

∅:D[4.11244] → [12.10488:10547]

B:BD[12.10488] → [12.10488:10547]

// Replaces @foe_god@ and @god_is@ with foe's god name
// special handling for atheists: use "you"/"You" instead.

[11.18898]

[4.11245]

// Replaces @foe_god@ and @god_is@ with foe's god name.
//
// Atheists get "You"/"you", and worshippers of nameless gods get "Your
// god"/"your god".

Replacement in crawl-ref/source/mon-util.cc at line 8217 [7.1699344]

B:BD[13.2784] → [4.11321:11432]

          (god == GOD_NO_GOD ? (capital ? "You" : "you")
                             : god_name(god, false));

[13.2784]

[13.2921]

          ((god == GOD_NO_GOD)    ? (capital ? "You"      : "you") :
           (god == GOD_NAMELESS)  ? (capital ? "Your god" : "your god")
                                  : god_name(god, false));

Replacement in crawl-ref/source/mon-util.cc at line 8221 [7.1699344]
B:BD[13.2940] → [13.2940:2964]
B:BD[13.2964] → [4.11433:11481]
∅:D[14.2819] → [13.3020:3026]
∅:D[4.11481] → [13.3020:3026]
B:BD[13.3020] → [13.3020:3026]
```
    {
        result +=
          (god == GOD_NO_GOD ? " are" : " is");
    }
```
[13.2940]
[15.11963]
```
        result += (god == GOD_NO_GOD) ? " are" : " is";
```

Replacement in crawl-ref/source/mon-util.cc at line 8499 [7.1699344]

B:BD[10.4403] → [10.4403:4447]

    // The monster's god, not the player's.

[10.4403]

[10.4447]

    // The monster's god, not the player's.  Atheists get
    // "NO GOD"/"NO GOD", and worshippers of nameless gods get
    // "a god"/"its god".

Insertion in crawl-ref/source/mon-util.cc at line 8503 [7.1699344]
[10.4483]
[10.4483]
```
    {
```

Insertion in crawl-ref/source/mon-util.cc at line 8505 [7.1699344]

[10.4534]

        msg = replace_all(msg, "@possessive_God@", "NO GOD");
    }
    else if (monster->god == GOD_NAMELESS)
    {
        msg = replace_all(msg, "@God@", "a god");
        std::string possessive = monster->pronoun(PRONOUN_NOCAP_POSSESSIVE);
        possessive += " god";
        msg = replace_all(msg, "@possessive_God@", possessive.c_str());
    }

Insertion in crawl-ref/source/mon-util.cc at line 8515 [7.1699344]
[10.4543]
[10.4543]
```
    {
```

Insertion in crawl-ref/source/mon-util.cc at line 8517 [7.1699344]

[10.4608]

[11.22313]

        msg = replace_all(msg, "@possessive_God@", god_name(monster->god));
    }

Replacement in crawl-ref/source/enum.h at line 1338 [7.3287960]

B:BD[7.3317858] → [7.3317858:3317880]

    GOD_RANDOM  = 100

[7.3317858]

[7.3320149]

    GOD_RANDOM = 100,
    GOD_NAMELESS = 101                 // for monsters with nameless gods

Replacement in crawl-ref/source/dat/database/monspell.txt at line 162 [16.11984]

B:BD[3.2969] → [3.2969:3028]

@The_monster@ calls down the wrath of @God@ upon @target@.

[3.2969]

[16.13080]

@The_monster@ calls down the wrath of @possessive_God@ upon @target@.

Replacement in crawl-ref/source/dat/database/monspell.txt at line 199 [16.11984]
B:BD[16.13593] → [10.4867:4926]
```
@The_monster@ calls down the wrath of @God@ upon @target@.
```
[16.13593]
[17.12754]
```
@The_monster@ calls down the wrath of @possessive_God@ upon @target@.
```

Replacement in crawl-ref/source/dat/database/monspell.txt at line 201 [16.11984]

B:BD[17.12755] → [10.4927:4997]

@The_monster@ mumbles some strange prayers to @God@ against @target@.

[17.12755]

[17.12816]

@The_monster@ mumbles some strange prayers to @possessive_God@ against @target@.

Replacement in crawl-ref/source/dat/database/monspell.txt at line 203 [16.11984]
B:BD[17.12817] → [10.4998:5055]
```
@The_monster@ invokes the aid of @God@ against @target@.
```
[17.12817]
[16.13634]
```
@The_monster@ invokes the aid of @possessive_God@ against @target@.
```
Replacement in crawl-ref/source/dat/database/monspell.txt at line 207 [16.11984]
B:BD[17.12884] → [10.5056:5086]
```
@The_monster@ prays to @God@.
```
[17.12884]
[17.12905]
```
@The_monster@ prays to @possessive_God@.
```
Replacement in crawl-ref/source/dat/database/monspell.txt at line 209 [16.11984]
B:BD[17.12906] → [10.5087:5140]
```
@The_monster@ mumbles some strange prayers to @God@.
```
[17.12906]
[16.13658]
```
@The_monster@ mumbles some strange prayers to @possessive_God@.
```
Replacement in crawl-ref/source/dat/database/monspell.txt at line 211 [16.11984]
B:BD[16.13659] → [10.5141:5186]
```
@The_monster@ utters an invocation to @God@.
```
[16.13659]
[16.13696]
```
@The_monster@ utters an invocation to @possessive_God@.
```
Insertion in crawl-ref/source/acr.cc at line 392 [7.4397395]
[18.5153]
[18.5153]
```
    case GOD_NAMELESS:
```

Implement [2546032]: Aside from orc priests and orcs, which can worship

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/religion.cc at line 2261 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 6176 [7.804403]

Insertion in crawl-ref/source/religion.cc at line 6997 [7.804403]

Deletion in crawl-ref/source/monplace.cc at line 1050 [7.1641732]

Replacement in crawl-ref/source/monplace.cc at line 1052 [7.1641732]

Deletion in crawl-ref/source/monplace.cc at line 1054 [7.1641732]

Replacement in crawl-ref/source/mon-util.cc at line 8209 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 8217 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 8221 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 8499 [7.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 8503 [7.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 8505 [7.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 8515 [7.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 8517 [7.1699344]

Replacement in crawl-ref/source/enum.h at line 1338 [7.3287960]

Replacement in crawl-ref/source/dat/database/monspell.txt at line 162 [16.11984]

Replacement in crawl-ref/source/dat/database/monspell.txt at line 199 [16.11984]

Replacement in crawl-ref/source/dat/database/monspell.txt at line 201 [16.11984]

Replacement in crawl-ref/source/dat/database/monspell.txt at line 203 [16.11984]

Replacement in crawl-ref/source/dat/database/monspell.txt at line 207 [16.11984]

Replacement in crawl-ref/source/dat/database/monspell.txt at line 209 [16.11984]

Replacement in crawl-ref/source/dat/database/monspell.txt at line 211 [16.11984]

Insertion in crawl-ref/source/acr.cc at line 392 [7.4397395]