fiddlerwoaroof/crawl - Change PRQVFUGUGPKI2Q74ODEI3CYUJQB63CKC6ONQTE3BTOHKXG4JCNLQC

Different messages for piety gain/no piety gain when sacrificing.

Doesn't take the piety slowdowns at high piety (this is semi-intentional.)

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

Created by haranp on September 17, 2007

PRQVFUGUGPKI2Q74ODEI3CYUJQB63CKC6ONQTE3BTOHKXG4JCNLQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 79 [5.804403]
∅:D[3.310] → [4.29274:29300]
B:BD[5.805784] → [4.29274:29300]
```
const char *sacrifice[] =
```
[3.310]
[4.29300]
```
// First message is if there's no piety gain, second is if there is.
const char *sacrifice[NUM_GODS][2] =
```

Replacement in crawl-ref/source/religion.cc at line 83 [5.804403]

B:BD[3.325] → [3.325:370]

    " & eaten by a ravening swarm of bugs.",

[3.325]

[6.45]

    {
        " & eaten by a bored swarm of bugs.",
        " & eaten by a ravening swarm of bugs."
    },

Replacement in crawl-ref/source/religion.cc at line 88 [5.804403]

B:BD[6.56] → [3.371:408]

    " glow% silver and disappear%.",

[6.56]

[6.57]

    {
        " faintly glow% silver and disappear%.",
        " glow% silver and disappear%.",
    },

Replacement in crawl-ref/source/religion.cc at line 93 [5.804403]

B:BD[6.68] → [3.409:465]

    " glow% a brilliant golden colour and disappear%.",

[6.68]

[6.69]

    {
        " glow% a golden colour and disappear%.",
        " glow% a brilliant golden colour and disappear%.",
    },

Replacement in crawl-ref/source/religion.cc at line 98 [5.804403]

B:BD[6.90] → [3.466:499]

    " rot% away in an instant.",

[6.90]

[6.91]

    {
        " slowly rot% away.",
        " rot% away in an instant.",
    },

Replacement in crawl-ref/source/religion.cc at line 103 [5.804403]

B:BD[6.110] → [3.500:526]

    " crumble% to dust.",

[6.110]

[6.111]

    {
        " crumble% to dust.",
        " crumble% to dust.",
    },

Replacement in crawl-ref/source/religion.cc at line 108 [5.804403]

B:BD[6.138] → [3.527:553]

    " & eaten by a bug.",

[6.138]

[6.165]

    {
        " & eaten by a bored bug.",
        " & eaten by a bug.",
    },

Replacement in crawl-ref/source/religion.cc at line 113 [5.804403]

B:BD[6.180] → [3.554:589]

    " explode% into nothingness.",

[6.180]

[6.181]

    {
        " burn% into nothingness.",
        " explode% into nothingness.",
    },

Replacement in crawl-ref/source/religion.cc at line 118 [5.804403]

B:BD[6.196] → [3.590:630]

    " & consumed in a burst of flame.",

[6.196]

[6.197]

    {
        " & consumed by flame.",
        " & consumed in a burst of flame.",
    },

Replacement in crawl-ref/source/religion.cc at line 123 [5.804403]

B:BD[6.212] → [7.162:203]

    " flare% blood-red and disappear%.",

[6.212]

[6.213]

    {
        " flare% red and disappear%.",
        " flare% blood-red and disappear%.",
    },

Replacement in crawl-ref/source/religion.cc at line 128 [5.804403]

B:BD[6.229] → [3.681:729]

    " glow% faintly for a moment, and & gone.",

[6.229]

[6.230]

    {
        " glow% very faintly for a moment, and & gone.",
        " glow% faintly for a moment, and & gone.",
    },

Replacement in crawl-ref/source/religion.cc at line 133 [5.804403]

B:BD[6.242] → [3.730:779]

    " & consumed in a roaring column of flame.",

[6.242]

[6.243]

    {
        " & consumed in a column of flame.",
        " & consumed in a roaring column of flame.",
    },

Replacement in crawl-ref/source/religion.cc at line 138 [5.804403]

B:BD[6.258] → [3.780:842]

    " glow% with a rainbow of weird colours and disappear%.",

[6.258]

[6.259]

    {
        " glow% slightly and disappear%.",
        " glow% with a rainbow of weird colours and disappear%.",
    },

Replacement in crawl-ref/source/religion.cc at line 143 [5.804403]

B:BD[6.275] → [3.843:863]

    " evaporate%.",

[6.275]

[8.159]

    {
        " slowly evaporate%.",
        " evaporate%.",
    },

Replacement in crawl-ref/source/religion.cc at line 148 [5.804403]

B:BD[8.173] → [9.5142:5174]

    " & consumed by the void.",

[8.173]

[9.5174]

    {
        " & disappears into the void.",
        " & consumed by the void.",
    },

Replacement in crawl-ref/source/religion.cc at line 153 [5.804403]

B:BD[9.5187] → [9.5187:5220]

    " crumble% into the ground."

[9.5187]

[10.278]

    {
        " slowly crumble% into the ground."
        " crumble% into the ground."
    }

Replacement in crawl-ref/source/religion.cc at line 159 [5.804403]

B:BD[10.282] → [10.282:353]

const char* god_gain_power_messages[MAX_NUM_GODS][MAX_GOD_ABILITIES] =

[10.282]

[10.353]

const char* god_gain_power_messages[NUM_GODS][MAX_GOD_ABILITIES] =

Replacement in crawl-ref/source/religion.cc at line 244 [5.804403]

B:BD[10.2471] → [10.2471:2542]

const char* god_lose_power_messages[MAX_NUM_GODS][MAX_GOD_ABILITIES] =

[10.2471]

[10.2542]

const char* god_lose_power_messages[NUM_GODS][MAX_GOD_ABILITIES] =

Replacement in crawl-ref/source/religion.cc at line 2719 [5.804403]

B:BD[3.899] → [3.899:972]

static std::string sacrifice_message(god_type god, const item_def &item)

[3.899]

[3.972]

static std::string sacrifice_message(god_type god, const item_def &item,
                                     bool gained_piety)

Replacement in crawl-ref/source/religion.cc at line 2722 [5.804403]
B:BD[3.974] → [3.974:1012]
```
    const char *msg = sacrifice[god];
```
[3.974]
[3.1012]
```
    const char *msg = sacrifice[god][!!gained_piety];
```

Replacement in crawl-ref/source/religion.cc at line 2849 [5.804403]

B:BD[5.880035] → [11.1493:1677]

        msg::streams(MSGCH_GOD) << mitm[i].name(DESC_CAP_THE)
                                << sacrifice_message(you.religion, mitm[i])
                                << std::endl;

[5.880035]

[5.880100]

        bool gained_piety = false;

Insertion in crawl-ref/source/religion.cc at line 2872 [5.804403]
[12.2394]
[12.2394]
```
                gained_piety = true;
```
Insertion in crawl-ref/source/religion.cc at line 2883 [5.804403]
[5.880557]
[5.880557]
```
                gained_piety = true;
```
Insertion in crawl-ref/source/religion.cc at line 2890 [5.804403]
[5.880872]
[5.880872]
```
            {
```
Insertion in crawl-ref/source/religion.cc at line 2892 [5.804403]
[5.880916]
[5.880946]
```
                gained_piety = true;
            }
```
Insertion in crawl-ref/source/religion.cc at line 2899 [5.804403]
[5.881285]
[5.881937]
```
            gained_piety = true;
```

Insertion in crawl-ref/source/religion.cc at line 2906 [5.804403]

[5.882004]

[11.1765]

        msg::streams(MSGCH_GOD) << mitm[i].name(DESC_CAP_THE)
                                << sacrifice_message(you.religion, mitm[i],
                                                     gained_piety)
                                << std::endl;

Insertion in crawl-ref/source/religion.cc at line 3036 [5.804403]

[5.884385]

[13.877]

    // We always give the "good" (piety-gain) message when doing
    // dedicated butchery. Uh, call it a feature.

Replacement in crawl-ref/source/religion.cc at line 3039 [5.804403]

∅:D[13.946] → [3.1566:1631]

B:BD[14.2936] → [3.1566:1631]

         sacrifice_message(you.religion, mitm[corpse]).c_str());

[13.946]

[5.884556]

         sacrifice_message(you.religion, mitm[corpse], true).c_str());

Replacement in crawl-ref/source/describe.h at line 78 [5.3734214]

B:BD[5.3736372] → [2.99041:99118]

extern const char* god_gain_power_messages[MAX_NUM_GODS][MAX_GOD_ABILITIES];

[5.3736372]

[2.99118]

extern const char* god_gain_power_messages[NUM_GODS][MAX_GOD_ABILITIES];

Insertion in crawl-ref/source/abl-show.cc at line 1126 [5.4494389]

[5.4515011]

        // FIXME This is not the best way to do stuff, because
        // you have a chance of failing the evocation test, in
        // which case you'll lose MP, etc.
        // We should add a pre-failure-test check in general.

Insertion in crawl-ref/source/abl-show.cc at line 1135 [5.4494389]

[5.4515153]

        else if ( !you.can_go_berserk(true) )
            return (false);

Insertion in crawl-ref/source/abl-show.cc at line 1139 [5.4494389]

[15.1283014]

        // because of the test above, this should always happen,
        // but I'm leaving it in -- haranp

Replacement in crawl-ref/source/abl-show.cc at line 1156 [5.4494389]

B:BD[5.4515585] → [5.4515585:4515667]


    case ABIL_FLY_II:           // Fly (Draconians, or anything else with wings)

[5.4515585]

[16.20325]

    
    // Fly (Draconians, or anything else with wings)
    case ABIL_FLY_II: