fiddlerwoaroof/crawl - Change 5YQ53FYWPSONG3EOUAEMII2ECVAO6SRDUBVICH7JFGFS2Q5L4HYQC

Determine if an orc is an unbeliever when it's generated, and use an orc's god

field to determine whether to use a believer speech or an unbeliever speech. This prevents orc priests from using unbeliever speech, and has the side benefit of preventing other orcs from flip-flopping on whether they believe.

If a band leader is a priest then make all band members have the same god (so that Saint Roka won't have any unbelievers among his entourage).

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

Created by zelgadis on January 4, 2009

5YQ53FYWPSONG3EOUAEMII2ECVAO6SRDUBVICH7JFGFS2Q5L4HYQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/religion.cc at line 5664 [8.804403]

[6.3046]

[7.12684]


    // Prevent assertion if the orc was previously worshipping a different
    // god rather than already worhsipping Beogh or being an athiest.
    orc->god = GOD_NO_GOD;

Replacement in crawl-ref/source/monspeak.cc at line 448 [8.1558496]

∅:D[2.2647] → [9.7617:7675]

B:BD[10.2704] → [9.7617:7675]

B:BD[9.7675] → [5.8759:8825]

∅:D[5.8825] → [9.7750:7793]

B:BD[9.7750] → [9.7750:7793]

    // results in wizard mode.) Don't count charmed orcs.
    if (god == GOD_BEOGH && mons_genus(monster->type) == MONS_ORC
        && !monster->has_ench(ENCH_CHARM))

[2.2647]

[9.7793]

    // results in wizard mode.) Don't count charmed or summoned orcs.
    if (you.religion == GOD_BEOGH && mons_genus(monster->type) == MONS_ORC
        && !monster->has_ench(ENCH_CHARM) && !monster->is_summoned())

Replacement in crawl-ref/source/monspeak.cc at line 452 [8.1558496]

∅:D[9.7799] → [10.2812:2849]

B:BD[10.2812] → [10.2812:2849]

        prefixes.push_back("beogh");

[9.7799]

[9.7800]

        if (monster->god == GOD_BEOGH)
            prefixes.push_back("beogh");
        else 
            prefixes.push_back("unbeliever");

Insertion in crawl-ref/source/monplace.cc at line 931 [8.1641732]
[11.17667]
[8.1651874]
```
    const bool priest = mons_class_flag(mon->type, M_PRIEST);
```
Insertion in crawl-ref/source/monplace.cc at line 944 [8.1641732]
[12.426]
[12.426]
```
        {
```

Insertion in crawl-ref/source/monplace.cc at line 946 [8.1641732]

[12.477]

[8.1652110]

            // Priestly band leaders should have an entourage of the
            // same religion.
            if (priest)
                menv[band_id].god = mon->god;
        }

Insertion in crawl-ref/source/monplace.cc at line 1054 [8.1641732]

[13.4399]

[3.2631]

    // 6 out of 7 non-priestly orcs are believers.
    else if (mons_genus(mg.cls) == MONS_ORC)
    {
        if (x_chance_in_y(6, 7))
            menv[id].god = GOD_BEOGH;
    }

Replacement in crawl-ref/source/dat/database/monspeak.txt at line 1562 [15.307]
B:BD[14.28144] → [14.28144:28203]
```
VISUAL:@The_monster@ gazes at you @hypnot_or_seductively@.
```
[14.28144]
[14.28203]
```
VISUAL:@The_monster@ gazes at @foe@ @hypnot_or_seductively@.
```
Replacement in crawl-ref/source/dat/database/monspeak.txt at line 2316 [15.307]
B:BD[14.31282] → [14.31282:31320]
```
@_hostile_orc_beogh_believer_common_@
```
[14.31282]
[14.31320]
```
@_hostile_orc_beogh_believer_speech_common_@
```
Replacement in crawl-ref/source/dat/database/monspeak.txt at line 2319 [15.307]
B:BD[14.31325] → [14.31325:31361]
```
@_hostile_orc_beogh_believer_rare_@
```
[14.31325]
[14.31361]
```
@_hostile_orc_beogh_believer_speech_rare_@
```

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

[10.4485]

#######################################################
# Heretic orcs, not believing in Beogh.

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

B:BD[10.4541] → [10.4541:4613]

# Heretic orcs, not believing in Beogh or doubting the
# saviour story.

[10.4541]

[10.4613]

related unbeliever orc
# hostile orcs shouldn't be too talkative
w:60
__NONE
w:1
@_generic_orc_speech_@
w:5
@_hostile_orc_beogh_unbeliever_speech_@
%%%%
#######################################################
# Heretic orcs, doubting the saviour story.

Replacement in crawl-ref/source/dat/database/monspeak.txt at line 2998 [15.307]
B:BD[16.8486] → [16.8486:8511]
```
@_hostile_beogh_speech_@
```
[16.8486]
[16.8512]
```
@_hostile_orc_beogh_believer_speech_@
```
Replacement in crawl-ref/source/dat/database/monspeak.txt at line 3000 [15.307]
B:BD[16.8517] → [16.8517:8540]
```
_hostile_beogh_speech_
```
[16.8517]
[16.8540]
```
_hostile_orc_beogh_believer_speech_
```
Replacement in crawl-ref/source/dat/database/monspeak.txt at line 3002 [15.307]
B:BD[16.8541] → [17.19846:19878]
```
@_hostile_beogh_speech_common_@
```
[16.8541]
[17.19878]
```
@_hostile_orc_beogh_believer_speech_common_@
```
Replacement in crawl-ref/source/dat/database/monspeak.txt at line 3005 [15.307]
B:BD[17.19883] → [17.19883:19913]
```
@_hostile_beogh_speech_rare_@
```
[17.19883]
[17.19913]
```
@_hostile_orc_beogh_believer_speech_rare_@
```
Replacement in crawl-ref/source/dat/database/monspeak.txt at line 3007 [15.307]
B:BD[17.19918] → [4.2802:2840]
```
_hostile_orc_beogh_unbeliever_common_
```
[17.19918]
[17.19948]
```
_hostile_orc_beogh_unbeliever_speech_
@_hostile_orc_beogh_unbeliever_speech_common_@
```

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

[17.19949]

[5.41063]

w:4
@_hostile_orc_beogh_unbeliever_speech_rare_@
%%%%
_hostile_orc_beogh_unbeliever_speech_common_

Replacement in crawl-ref/source/dat/database/monspeak.txt at line 3020 [15.307]
B:BD[14.32203] → [14.32203:32239]
```
_hostile_orc_beogh_believer_common_
```
[14.32203]
[10.4937]
```
_hostile_orc_beogh_believer_speech_common_
```
Replacement in crawl-ref/source/dat/database/monspeak.txt at line 3046 [15.307]
B:BD[17.20168] → [14.32240:32276]
```
_hostile_orc_beogh_unbeliever_rare_
```
[17.20168]
[17.20196]
```
_hostile_orc_beogh_unbeliever_speech_rare_
```
Replacement in crawl-ref/source/dat/database/monspeak.txt at line 3054 [15.307]
B:BD[14.32353] → [14.32353:32387]
```
_hostile_orc_beogh_believer_rare_
```
[14.32353]
[14.32387]
```
_hostile_orc_beogh_believer_speech_rare_
```

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

B:BD[10.5644] → [18.5050:5098]

B:BD[18.5098] → [14.32389:32698]

VISUAL:@The_monster@ stares at you quizzically.
%%%%
_hostile_beogh_speech_common_
# unbelievers
w:1
@_hostile_orc_beogh_unbeliever_common_@
# orcs doubting you
w:6
@_hostile_orc_beogh_believer_common_@
%%%%
_hostile_beogh_speech_rare_
# unbelievers
w:3
@_hostile_orc_beogh_unbeliever_rare_@
# orcs doubting you
w:7
@_hostile_orc_beogh_believer_rare_@

[10.5644]

[18.5098]

VISUAL:@The_monster@ stares at you quizzically. @player_only@

Determine if an orc is an unbeliever when it's generated, and use an orc's god

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/religion.cc at line 5664 [8.804403]

Replacement in crawl-ref/source/monspeak.cc at line 448 [8.1558496]

Replacement in crawl-ref/source/monspeak.cc at line 452 [8.1558496]

Insertion in crawl-ref/source/monplace.cc at line 931 [8.1641732]

Insertion in crawl-ref/source/monplace.cc at line 944 [8.1641732]

Insertion in crawl-ref/source/monplace.cc at line 946 [8.1641732]

Insertion in crawl-ref/source/monplace.cc at line 1054 [8.1641732]

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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