fiddlerwoaroof/crawl - Change GP7RUHLNB4KISSZAENEYVNY3MB5YRCFRWRWYAROBZIQ5MR4DXB7QC

* For flavour, let Xom laugh himself silly whenever a follower dies.

Fix Xom being amused about rotten corpses being butchered. (As opposed to clean corpses becoming rotten while butchered, which is how it was originally intended.)
Xom no longer is amused if you deliberately hit yourself with a missile/wand/spell in safe surroundings. (Identifying wands that way or zapping /random effects is still considered amusing.)

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

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

GP7RUHLNB4KISSZAENEYVNY3MB5YRCFRWRWYAROBZIQ5MR4DXB7QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/xom.h at line 38 [6.3]
∅:D[5.37] → [6.922:923]
∅:D[7.120] → [6.922:923]
B:BD[6.922] → [6.922:923]
[7.120]
[6.923]
```
void xom_death_message();
```

Replacement in crawl-ref/source/xom.cc at line 107 [9.3]

B:BD[8.200] → [8.200:378]

∅:D[8.378] → [10.385:434]

B:BD[10.385] → [10.385:434]

B:BD[10.434] → [8.379:628]

∅:D[8.628] → [11.67:129]

B:BD[11.67] → [11.67:129]

           (you.piety > 160) ? "A favourite toy of Xom." :
           (you.piety > 140) ? "A very special toy of Xom." :
           (you.piety > 120) ? "A special toy of Xom." :
           (you.piety > 100) ? "A toy of Xom." :
           (you.piety >  80) ? "A plaything of Xom." :
           (you.piety >  60) ? "A special plaything of Xom." :
           (you.piety >  40) ? "A very special plaything of Xom." :
           (you.piety >  20) ? "A favourite plaything of Xom."
                             : "A beloved plaything of Xom.";

[8.200]

[10.747]

               (you.piety > 160) ? "A favourite toy of Xom." :
               (you.piety > 140) ? "A very special toy of Xom." :
               (you.piety > 120) ? "A special toy of Xom." :
               (you.piety > 100) ? "A toy of Xom." :
               (you.piety >  80) ? "A plaything of Xom." :
               (you.piety >  60) ? "A special plaything of Xom." :
               (you.piety >  40) ? "A very special plaything of Xom." :
               (you.piety >  20) ? "A favourite plaything of Xom."
                                 : "A beloved plaything of Xom.";

Insertion in crawl-ref/source/xom.cc at line 172 [9.3]
[6.2343]
[6.2343]
```
    {
```
Insertion in crawl-ref/source/xom.cc at line 180 [9.3]
[12.133]
[6.2733]
```
    }
```
Insertion in crawl-ref/source/xom.cc at line 228 [9.3]
[6.3091]
[13.192]
```
    if (you.religion != GOD_XOM)
        return;
```
Insertion in crawl-ref/source/xom.cc at line 2003 [9.3]
[14.4836]
[14.4836]
```
        {
```
Insertion in crawl-ref/source/xom.cc at line 2006 [9.3]
[14.4947]
[14.4947]
```
        }
```
Insertion in crawl-ref/source/xom.cc at line 2008 [9.3]
[14.4960]
[14.4960]
```
        {
```
Insertion in crawl-ref/source/xom.cc at line 2011 [9.3]
[14.5057]
[14.5057]
```
        }
```

Insertion in crawl-ref/source/xom.cc at line 2182 [9.3]

[7.2264]

[9.27718]

}
void xom_death_message()
{
    god_speaks(GOD_XOM, _get_xom_speech("laughter").c_str());

Replacement in crawl-ref/source/tutorial.cc at line 138 [16.5936]

B:BD[15.1647] → [15.1647:1748]

        "<brown>SPACE - Back to class selection; "
        "Bksp - Back to race selection; X - Quit"

[15.1647]

[15.1748]

        "<brown>SPACE - Back to job selection; "
        "Bksp - Back to species selection; X - Quit"

Replacement in crawl-ref/source/tutorial.cc at line 311 [16.5936]

∅:D[17.313] → [15.5251:5321]

B:BD[15.5251] → [15.5251:5321]

        "This contains all details on races, magic, skills, etc." EOL

[17.313]

[18.133]

        "This contains all details on species, magic, skills, etc." EOL

Replacement in crawl-ref/source/tutorial.cc at line 810 [16.5936]

B:BD[19.6432] → [19.6432:6504]

            "to try the other ones as well. Note that the help screen "

[19.6432]

[19.6504]

            "to try the other ones as well. Note that the command help screen "

Replacement in crawl-ref/source/tutorial.cc at line 820 [16.5936]

B:BD[20.22148] → [21.2893:2961]

∅:D[22.1454] → [20.22226:22300]

∅:D[21.2961] → [20.22226:22300]

B:BD[20.22226] → [20.22226:22300]

B:BD[20.22300] → [22.1455:1526]

                "auto-explore (<w>o</w>). You can even make Crawl "
                "automatically pick up interesting items by setting the "
                "option <w>explore_greedy=true</w> in the init file.";

[20.22148]

[20.22376]

                "auto-explore (<w>o</w>). Crawl will let you automatically "
                "move to and pick up interesting items.";

Replacement in crawl-ref/source/tutorial.cc at line 2233 [16.5936]

B:BD[23.21231] → [23.21231:21306]

                "to rot. Few races can digest these safely, so you might "

[23.21231]

[23.21306]

                "to rot. Few species can digest these safely, so you might "

Replacement in crawl-ref/source/tutorial.cc at line 2773 [16.5936]

B:BD[24.22971] → [24.22971:23121]

        text << ". Small races may also wriggle out of a net, only damaging it "
                "a bit, so as to then <w>f</w>ire it at a monster.";

[24.22971]

[24.23121]

        text << ". Small species may also wriggle out of a net, only damaging "
                "it a bit, so as to then <w>f</w>ire it at a monster.";

Replacement in crawl-ref/source/shopping.cc at line 112 [26.759950]

B:BD[25.1514] → [3.497:548]

            "] exit            [<w>!</w>] %s  %s",

[25.1514]

[27.429]

            "] exit            [<w>!</w>] %s   %s",

Insertion in crawl-ref/source/ouch.h at line 58 [26.1101726]
[28.2881]
[26.1102273]
```
    KILLED_BY_SELF_AIMED,
```
Insertion in crawl-ref/source/ouch.cc at line 97 [26.1104358]
[29.3356]
[30.2522]
```
        {
```
Insertion in crawl-ref/source/ouch.cc at line 99 [26.1104358]
[30.2566]
[31.361010]
```
            xom_is_stimulated(200);
        }
```

Replacement in crawl-ref/source/ouch.cc at line 731 [26.1104358]

B:BD[28.2976] → [28.2976:3027]

            || death_type == KILLED_BY_REFLECTION)

[28.2976]

[32.2534]

            || death_type == KILLED_BY_REFLECTION
            || death_type == KILLED_BY_SELF_AIMED
               && player_in_a_dangerous_place())

Replacement in crawl-ref/source/ouch.cc at line 735 [26.1104358]

B:BD[32.2544] → [32.2544:2670]

            // Xom thinks the player hurting him/herself is funny.
            xom_is_stimulated(255 * dam / (dam + you.hp));

[32.2544]

[32.2670]

            // Xom thinks the player accidentally hurting him/herself is funny.
            // Deliberate damage is only amusing if it's dangerous.
            int amusement = 255 * dam / (dam + you.hp);
            if (death_type == KILLED_BY_SELF_AIMED)
                amusement /= 5;
            xom_is_stimulated(amusement);

Replacement in crawl-ref/source/ouch.cc at line 750 [26.1104358]

B:BD[32.2951] → [32.2951:3059]

                && death_type != KILLED_BY_BEAM
                    || invalid_monster_index(death_source))

[32.2951]

[32.3059]

                    && death_type != KILLED_BY_BEAM
                 || invalid_monster_index(death_source))

Replacement in crawl-ref/source/ouch.cc at line 1095 [26.1104358]

∅:D[33.3441] → [34.6198:6292]

∅:D[35.6683] → [34.6198:6292]

B:BD[26.1128922] → [34.6198:6292]

∅:D[34.6292] → [26.1128968:1129012]

B:BD[26.1128968] → [26.1128968:1129012]

    if (se.death_type == KILLED_BY_LEAVING  ||
        se.death_type == KILLED_BY_QUITTING ||
        se.death_type == KILLED_BY_WINNING)

[33.3441]

[26.1129012]

    if (se.death_type == KILLED_BY_LEAVING
        || se.death_type == KILLED_BY_QUITTING
        || se.death_type == KILLED_BY_WINNING)

Insertion in crawl-ref/source/ouch.cc at line 1150 [26.1104358]
[26.1130235]
[36.301]
```
        xom_death_message();
        flush_prev_message();
```

Replacement in crawl-ref/source/ouch.cc at line 1160 [26.1104358]

B:BD[37.312] → [37.312:478]

                    se.death_type == KILLED_BY_WINNING? "won"  :
                    se.death_type == KILLED_BY_LEAVING? "bailed out" :
                    "dead" );

[37.312]

[37.478]

                    se.death_type == KILLED_BY_WINNING ? "won"  :
                    se.death_type == KILLED_BY_LEAVING ? "bailed out"
                                                       : "dead" );

Insertion in crawl-ref/source/mstuff2.cc at line 512 [26.1340842]
[4.2728]
[4.2728]
```
        // Allow the caster to comment on moving the foe.
```
Replacement in crawl-ref/source/mstuff2.cc at line 515 [26.1340842]
B:BD[4.2855] → [4.2855:2881]
```
        if (!msg.empty())
```
[4.2855]
[4.2881]
```
        if (!msg.empty() && msg != "__NONE")
```
Insertion in crawl-ref/source/item_use.cc at line 1777 [26.2781507]
[38.7510]
[38.7510]
```
    {
```
Replacement in crawl-ref/source/item_use.cc at line 1780 [26.2781507]
B:BD[38.7623] → [38.7623:7624]
[38.7623]
[38.7624]
```
    }
```

Replacement in crawl-ref/source/hiscores.cc at line 310 [26.2987663]

∅:D[31.815202] → [26.2994307:2994449]

B:BD[26.2994307] → [26.2994307:2994449]

            || strncmp( aux, "Hit ", 4 ) == 0           // thrown
            || strncmp( aux, "volley ", 7 ) == 0)       // manticore spikes

[31.815202]

[26.2994449]

             || strncmp( aux, "Hit ", 4 ) == 0          // thrown
             || strncmp( aux, "volley ", 7 ) == 0)      // manticore spikes

Replacement in crawl-ref/source/hiscores.cc at line 430 [26.2987663]

B:BD[39.528] → [40.2649:2706]

    "beogh_smiting", "divine_wrath", "bounce", "reflect"

[39.528]

[41.5211]

    "beogh_smiting", "divine_wrath", "bounce", "reflect", "self_aimed"

Insertion in crawl-ref/source/hiscores.cc at line 1671 [26.2987663]

[28.5101]

            if (auxkilldata.empty())
                desc += "beam";
            else
                desc += auxkilldata;
        }
        needs_damage = true;
        break;
    case KILLED_BY_SELF_AIMED:
        if (terse)
            desc += "suicidal targeting";
        else
        {
            desc += "Shot themselves with a ";

Insertion in crawl-ref/source/delay.cc at line 864 [26.3963459]
[42.5472]
[42.5472]
```
                    {
```

Insertion in crawl-ref/source/delay.cc at line 866 [26.3963459]

[42.5540]

                        if (you.is_undead != US_UNDEAD
                            && player_mutation_level(MUT_SAPROVOROUS) < 3)
                        {
                            _xom_check_corpse_waste();
                        }
                    }

Deletion in crawl-ref/source/delay.cc at line 885 [26.3963459]
B:BD[31.998462] → [43.3028:3079]
B:BD[43.3079] → [44.33756:33827]
∅:D[45.7175] → [6.20114:20136]
∅:D[44.33827] → [6.20114:20136]
B:BD[6.20114] → [6.20114:20136]
B:BD[6.20136] → [46.24332:24383]
∅:D[46.24383] → [43.3080:3102]
B:BD[6.20186] → [43.3080:3102]
```
                    if (you.is_undead != US_UNDEAD
                        && player_mutation_level(MUT_SAPROVOROUS) < 3)
                    {
                        _xom_check_corpse_waste();
                    }
```

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

[47.6845]

%%%%
# Xom laughing
# (Currently only used post-game in response to "You die...")
Xom laughter
Xom guffaws!
Xom roars with laughter!
Xom thinks this is hilarious!
Xom is highly amused!
Xom cackles wildly!
Xom snickers!
Xom laughs nastily!
Xom howls with laughter!
Xom bursts into laughter!
Xom giggles madly!
Xom titters!
Xom chuckles heartily!
Xom chortles!

Replacement in crawl-ref/source/beam.cc at line 3139 [26.4128068]

B:BD[28.12051] → [28.12051:12109]

            ouch(dam, NON_MONSTER, KILLED_BY_TARGETTING);

[28.12051]

[26.4222438]

        {
            if (aimed_at_feet && effect_known)
                ouch(dam, NON_MONSTER, KILLED_BY_SELF_AIMED, name.c_str());
            else
                ouch(dam, NON_MONSTER, KILLED_BY_TARGETTING);
        }

Deletion in crawl-ref/docs/changes.stone_soup at line 41 [50.210753]
B:BD[49.3151] → [49.3151:3224]
```
* Vampires can no longer heal via potions of blood or non-fresh corpses.
```
Insertion in crawl-ref/docs/changes.stone_soup at line 42 [50.210753]
[49.3298]
[2.2971]
```
* Vampires can no longer heal via potions of blood or non-fresh corpses.
```
Replacement in crawl-ref/docs/changes.stone_soup at line 89 [50.210753]
∅:D[51.3460] → [52.4730:4781]
B:BD[52.4730] → [52.4730:4781]
```
* Greatly improved the monster view command ('V').
```
[51.3460]
[53.6012]
```
* Greatly improved the monster view command ('V'), allowing travel to items.
```
Insertion in crawl-ref/docs/changes.stone_soup at line 94 [50.210753]
[52.5163]
[52.5163]
```
* Card descriptions are now searchable in the database ('?/c').
```

Replacement in crawl-ref/docs/changes.stone_soup at line 130 [50.210753]

B:BD[52.7947] → [54.3496:3552]

* Sif Muna no longer gifts Kiku/Vehumet specific books.

[52.7947]

* Sif Muna no longer gifts Kiku/Vehumet specific books, spells still possible.

* For flavour, let Xom laugh himself silly whenever a follower dies.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/xom.h at line 38 [6.3]

Replacement in crawl-ref/source/xom.cc at line 107 [9.3]

Insertion in crawl-ref/source/xom.cc at line 172 [9.3]

Insertion in crawl-ref/source/xom.cc at line 180 [9.3]

Insertion in crawl-ref/source/xom.cc at line 228 [9.3]

Insertion in crawl-ref/source/xom.cc at line 2003 [9.3]

Insertion in crawl-ref/source/xom.cc at line 2006 [9.3]

Insertion in crawl-ref/source/xom.cc at line 2008 [9.3]

Insertion in crawl-ref/source/xom.cc at line 2011 [9.3]

Insertion in crawl-ref/source/xom.cc at line 2182 [9.3]

Replacement in crawl-ref/source/tutorial.cc at line 138 [16.5936]

Replacement in crawl-ref/source/tutorial.cc at line 311 [16.5936]

Replacement in crawl-ref/source/tutorial.cc at line 810 [16.5936]

Replacement in crawl-ref/source/tutorial.cc at line 820 [16.5936]

Replacement in crawl-ref/source/tutorial.cc at line 2233 [16.5936]

Replacement in crawl-ref/source/tutorial.cc at line 2773 [16.5936]

Replacement in crawl-ref/source/shopping.cc at line 112 [26.759950]

Insertion in crawl-ref/source/ouch.h at line 58 [26.1101726]

Insertion in crawl-ref/source/ouch.cc at line 97 [26.1104358]

Insertion in crawl-ref/source/ouch.cc at line 99 [26.1104358]

Replacement in crawl-ref/source/ouch.cc at line 731 [26.1104358]

Replacement in crawl-ref/source/ouch.cc at line 735 [26.1104358]

Replacement in crawl-ref/source/ouch.cc at line 750 [26.1104358]

Replacement in crawl-ref/source/ouch.cc at line 1095 [26.1104358]

Insertion in crawl-ref/source/ouch.cc at line 1150 [26.1104358]

Replacement in crawl-ref/source/ouch.cc at line 1160 [26.1104358]

Insertion in crawl-ref/source/mstuff2.cc at line 512 [26.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 515 [26.1340842]

Insertion in crawl-ref/source/item_use.cc at line 1777 [26.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1780 [26.2781507]

Replacement in crawl-ref/source/hiscores.cc at line 310 [26.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 430 [26.2987663]

Insertion in crawl-ref/source/hiscores.cc at line 1671 [26.2987663]

Insertion in crawl-ref/source/delay.cc at line 864 [26.3963459]

Insertion in crawl-ref/source/delay.cc at line 866 [26.3963459]

Deletion in crawl-ref/source/delay.cc at line 885 [26.3963459]

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

Replacement in crawl-ref/source/beam.cc at line 3139 [26.4128068]

Deletion in crawl-ref/docs/changes.stone_soup at line 41 [50.210753]

Insertion in crawl-ref/docs/changes.stone_soup at line 42 [50.210753]

Replacement in crawl-ref/docs/changes.stone_soup at line 89 [50.210753]

Insertion in crawl-ref/docs/changes.stone_soup at line 94 [50.210753]

Replacement in crawl-ref/docs/changes.stone_soup at line 130 [50.210753]