fiddlerwoaroof/crawl - Change PTJJ6D52LDVJN7WA7NMYV2WHH3WJMWWLRGF3D7ZSBUNLAACFRJHAC

* Fix compilation.

Fix wording of stair slide chaos effect.
Add new stimulation triggers for Xom (monsters being polymorphed, accidentally hasted/healed, or going berserk) which has the side effect of keeping Xom's interest up if you actually use the chaos branded weapon he gifted you.
Greatly reduce stimulation possible from deliberately quaffing bad potions.

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

Created by j-p-e-g on April 12, 2009

PTJJ6D52LDVJN7WA7NMYV2WHH3WJMWWLRGF3D7ZSBUNLAACFRJHAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 3473 [10.16817]

B:BD[8.73] → [9.64:140]

        int key = unmangle_direction_keys(getchm(KC_LEVELMAP), KC_LEVELMAP,

[8.73]

[9.140]

        int key = unmangle_direction_keys(getchm(KMC_LEVELMAP), KMC_LEVELMAP,

Replacement in crawl-ref/source/view.cc at line 3475 [10.16817]

B:BD[9.197] → [9.197:258]

        command_type cmd = key_to_command(key, KC_LEVELMAP);

[9.197]

[9.258]

        command_type cmd = key_to_command(key, KMC_LEVELMAP);

Replacement in crawl-ref/source/terrain.cc at line 608 [12.26938]

B:BD[11.2012] → [11.2012:2070]

    std::string prep = grid_preposition(orig_feat, true);

[11.2012]

[11.2070]

    std::string prep = grid_preposition(orig_feat, false);

Deletion in crawl-ref/source/terrain.cc at line 885 [12.26938]
B:BD[11.6460] → [11.6460:6516]
```
        radius_iterator ri(src, 1, true, false, true);
```
Replacement in crawl-ref/source/terrain.cc at line 886 [12.26938]
B:BD[11.6541] → [11.6541:6566]
```
        for (; ri; ++ri)
```
[11.6541]
[11.6566]
```
        for (radius_iterator ri(src, 1, true, false, true); ri; ++ri)
```

Insertion in crawl-ref/source/terrain.cc at line 1034 [12.26938]

[11.6926]

// If active is true, the player is just stepping onto the grid, with the
// message: "<feature> slides away as you move <prep> it!"
// Else, the actor is already on the grid:
// "<feature> moves from <prep origin> to <prep destination>!"

Replacement in crawl-ref/source/terrain.cc at line 1048 [12.26938]
B:BD[11.7265] → [11.7265:7303]
```
        else if (grid_is_solid(grid))
```
[11.7265]
[11.7303]
```
        else if (grid_is_solid(grid)) // Passwall?
```
Replacement in crawl-ref/source/terrain.cc at line 1051 [12.26938]
B:BD[11.7337] → [11.7337:7370]
```
                return "around";
```
[11.7337]
[11.7370]
```
                return "inside";
```
Deletion in crawl-ref/source/terrain.cc at line 1053 [12.26938]
B:BD[11.7387] → [11.7387:7430]
B:BD[11.7430] → [3.305:383]
∅:D[3.383] → [11.7507:7541]
∅:D[13.1551] → [11.7507:7541]
B:BD[11.7507] → [11.7507:7541]
```
                return "inside";
        }
        else if (!airborne && (grid == DNGN_LAVA || grid == DNGN_DEEP_WATER))
        {
            if (active)
```
Deletion in crawl-ref/source/terrain.cc at line 1054 [12.26938]
B:BD[11.7574] → [11.7574:7620]
```
            else
                return "in";
```
Replacement in crawl-ref/source/terrain.cc at line 1055 [12.26938]
B:BD[11.7630] → [11.7630:7643]
```
        else
```
[11.7630]
[11.7643]
```
        else if (!airborne)
```

Replacement in crawl-ref/source/terrain.cc at line 1057 [12.26938]

B:BD[11.7653] → [11.7653:7708]

            if (active)
                return "over";

[11.7653]

[11.7708]

            if (grid == DNGN_LAVA || grid_is_water(grid))
            {
                if (active)
                    return "into";
                else
                    return "around";
            }

Replacement in crawl-ref/source/terrain.cc at line 1065 [12.26938]

B:BD[11.7725] → [11.7725:7757]

                return "above";

[11.7725]

[11.7757]

            {
                if (active)
                    return "onto";
                else
                    return "under";
            }

Replacement in crawl-ref/source/terrain.cc at line 1074 [12.26938]

B:BD[11.7774] → [11.7774:7875]

    if (dir == CMD_GO_DOWNSTAIRS
        && (grid_is_staircase(grid) || grid_is_escape_hatch(grid)))

[11.7774]

[11.7875]

    if (dir == CMD_GO_UPSTAIRS && grid_is_escape_hatch(grid))
    {
        if (active)
            return "under";
        else
            return "above";
    }
    if (airborne)

Replacement in crawl-ref/source/terrain.cc at line 1087 [12.26938]
B:BD[11.7941] → [11.7941:7969]
```
            return "above";
```
[11.7941]
[11.7969]
```
            return "beneath";
```

Replacement in crawl-ref/source/terrain.cc at line 1089 [12.26938]

B:BD[11.7975] → [11.7975:8016]

    else if (grid_is_escape_hatch(grid))

[11.7975]

[11.8016]


    if (dir == CMD_GO_DOWNSTAIRS
        && (grid_is_staircase(grid) || grid_is_escape_hatch(grid)))

Replacement in crawl-ref/source/terrain.cc at line 1094 [12.26938]
B:BD[11.8042] → [11.8042:8070]
```
            return "under";
```
[11.8042]
[11.8070]
```
            return "onto";
```

Insertion in crawl-ref/source/player.cc at line 4875 [10.962854]

[10.1053327]

[14.3274]

    if (you.species != SP_GHOUL)
        xom_is_stimulated(hp_loss * 32);

Replacement in crawl-ref/source/player.cc at line 5065 [10.962854]

B:BD[5.4501] → [5.4501:4559]

    // this is our "rotted" base (applied after scaling):

[5.4501]

[5.4559]

    // This is our "rotted" base (applied after scaling):

Insertion in crawl-ref/source/monstuff.cc at line 2127 [10.1396662]

[15.3143]

[10.1428579]

    // Xom likes watching monsters being polymorphed.
    xom_is_stimulated(mons_is_shapeshifter(monster)               ? 16 :
                      power == PPT_LESS || mons_friendly(monster) ? 32 :
                      power == PPT_SAME                           ? 64 : 128);

Insertion in crawl-ref/source/mon-util.cc at line 58 [10.1699344]
[10.1700204]
[10.1700204]
```
#include "xom.h"
```

Insertion in crawl-ref/source/mon-util.cc at line 5717 [10.1699344]

[16.6452]

[17.12557]


    // Xom likes monsters going berserk.
    if (mons_near(this))
        xom_is_stimulated(mons_friendly(this) ? 32 : 128);

Replacement in crawl-ref/source/misc.cc at line 2019 [10.1933596]

B:BD[10.1949692] → [18.1949:2007]

    if (!force_stair && you.flight_mode() == FL_LEVITATE)

[10.1949692]

[10.1949766]

    if (!force_stair && you.flight_mode() == FL_LEVITATE
        && !is_gate(stair_find))

Replacement in crawl-ref/source/menu.cc at line 313 [21.261322]
B:BD[19.4235] → [20.8890:8936]
```
        int keyin = getchm(KC_MENU, c_getch);
```
[19.4235]
[19.4273]
```
        int keyin = getchm(KMC_MENU, c_getch);
```

Replacement in crawl-ref/source/item_use.cc at line 4913 [10.2781507]

B:BD[22.577] → [7.5649:5730]

        big_cloud(random_smoke_type(), KC_OTHER, you.pos(), 50, 8 + random2(8));

[22.577]

[23.2872]

        big_cloud(random_smoke_type(), KC_YOU, you.pos(), 50, 8 + random2(8));

Replacement in crawl-ref/source/it_use2.cc at line 52 [10.2904329]

B:BD[6.3158] → [6.3158:3227]

    const int xom_factor = factor * (drank_it && was_known ? 2 : 1);

[6.3158]

[6.3227]

    int xom_factor = factor;
    if (drank_it && was_known)
    {
        xom_factor *= 2;
        if (!player_in_a_dangerous_place())
            xom_factor *= 3;
    }

Insertion in crawl-ref/source/fight.cc at line 2289 [10.3140790]
[24.26607]
[25.2763]
```
    // Already a shifter?
```
Deletion in crawl-ref/source/fight.cc at line 2291 [10.3140790]
B:BD[25.2783] → [2.2724:2754]
```
        // Already a shifter.
```
Insertion in crawl-ref/source/fight.cc at line 2309 [10.3140790]
[25.3101]
[26.9748]
```
            {
```
Insertion in crawl-ref/source/fight.cc at line 2313 [10.3140790]
[27.3320]
[25.3235]
```
            }
```
Insertion in crawl-ref/source/fight.cc at line 2354 [10.3140790]
[28.8383]
[28.8383]
```
            {
```
Insertion in crawl-ref/source/fight.cc at line 2358 [10.3140790]
[28.8546]
[28.8546]
```
            }
```

Insertion in crawl-ref/source/fight.cc at line 2364 [10.3140790]

[29.3116]


            // Monsters being cloned is interesting.
            xom_is_stimulated(mons_friendly(&clone) ? 16 : 32);

Insertion in crawl-ref/source/fight.cc at line 2385 [10.3140790]
[24.27982]
[28.8643]
```
    {
```

Insertion in crawl-ref/source/fight.cc at line 2395 [10.3140790]

[4.2856]

[28.8692]


        // Xom loves it if this happens!
        const int friend_factor = mons_friendly(defender_as_monster()) ? 1 : 2;
        const int glow_factor   =
            (defender_as_monster()->has_ench(ENCH_SHAPESHIFTER) ? 1 : 2);
        xom_is_stimulated( 64 * friend_factor * glow_factor );

Replacement in crawl-ref/source/fight.cc at line 2402 [10.3140790]
B:BD[28.8707] → [28.8707:8708]
[28.8707]
[28.8708]
```
    }
```

Replacement in crawl-ref/source/fight.cc at line 2422 [10.3140790]

B:BD[28.9225] → [28.9225:9284]

        miscast_target = coinflip() ? attacker : defender;

[28.9225]

[24.28376]

        miscast_target = one_chance_in(3) ? attacker : defender;

Insertion in crawl-ref/source/fight.cc at line 2481 [10.3140790]

[26.10540]

        if (beam.thrower == KILL_YOU || mons_friendly(attacker_as_monster()))
            beam.attitude = ATT_FRIENDLY;

Replacement in crawl-ref/source/fight.cc at line 2513 [10.3140790]
B:BD[28.9952] → [28.9952:9974]
```
        return false;
```
[28.9952]
[28.9974]
```
        return (false);
```
Replacement in crawl-ref/source/fight.cc at line 2562 [10.3140790]
B:BD[7.6921] → [7.6921:6956]
```
                  8 + random2(4));
```
[7.6921]
[28.14227]
```
                  4 + random2(8));
```

Replacement in crawl-ref/source/directn.cc at line 3465 [10.3697945]

B:BD[30.21965] → [31.8975:9047]

    return unmangle_direction_keys( getchm(KC_TARGETING), KC_TARGETING,

[30.21965]

[31.9047]

    return unmangle_direction_keys( getchm(KMC_TARGETING), KMC_TARGETING,

Replacement in crawl-ref/source/directn.cc at line 3474 [10.3697945]

B:BD[32.6679] → [33.4365:4423]

    command_type cmd = key_to_command(key, KC_TARGETING);

[32.6679]

[33.4423]

    command_type cmd = key_to_command(key, KMC_TARGETING);

Insertion in crawl-ref/source/beam.cc at line 3978 [10.4128068]
[34.45322]
[35.5630]
```
        {
```

Insertion in crawl-ref/source/beam.cc at line 3980 [10.4128068]

[35.5661]

[36.26708]

            // Accidentally helped a foe.
            if (!is_tracer && !effect_known)
            {
                int interest = 128;
                if (flavour == BEAM_INVISIBILITY && can_see_invis)
                    interest = 32;
                xom_is_stimulated(interest);
            }
        }

Replacement in crawl-ref/source/beam.cc at line 4600 [10.4128068]

B:BD[37.10146] → [38.14738:14805]

∅:D[38.14805] → [37.10146:10213]

B:BD[37.10146] → [37.10146:10213]

    case BEAM_ENSLAVE_SOUL:     // it has a different saving throw
    case BEAM_ENSLAVE_DEMON:    // it has a different saving throw

[37.10146]

[37.10213]

    case BEAM_ENSLAVE_SOUL:     // has a different saving throw
    case BEAM_ENSLAVE_DEMON:    // ditto

* Fix compilation.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.cc at line 3473 [10.16817]

Replacement in crawl-ref/source/view.cc at line 3475 [10.16817]

Replacement in crawl-ref/source/terrain.cc at line 608 [12.26938]

Deletion in crawl-ref/source/terrain.cc at line 885 [12.26938]

Replacement in crawl-ref/source/terrain.cc at line 886 [12.26938]

Insertion in crawl-ref/source/terrain.cc at line 1034 [12.26938]

Replacement in crawl-ref/source/terrain.cc at line 1048 [12.26938]

Replacement in crawl-ref/source/terrain.cc at line 1051 [12.26938]

Deletion in crawl-ref/source/terrain.cc at line 1053 [12.26938]

Deletion in crawl-ref/source/terrain.cc at line 1054 [12.26938]

Replacement in crawl-ref/source/terrain.cc at line 1055 [12.26938]

Replacement in crawl-ref/source/terrain.cc at line 1057 [12.26938]

Replacement in crawl-ref/source/terrain.cc at line 1065 [12.26938]

Replacement in crawl-ref/source/terrain.cc at line 1074 [12.26938]

Replacement in crawl-ref/source/terrain.cc at line 1087 [12.26938]

Replacement in crawl-ref/source/terrain.cc at line 1089 [12.26938]

Replacement in crawl-ref/source/terrain.cc at line 1094 [12.26938]

Insertion in crawl-ref/source/player.cc at line 4875 [10.962854]

Replacement in crawl-ref/source/player.cc at line 5065 [10.962854]

Insertion in crawl-ref/source/monstuff.cc at line 2127 [10.1396662]

Insertion in crawl-ref/source/mon-util.cc at line 58 [10.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 5717 [10.1699344]

Replacement in crawl-ref/source/misc.cc at line 2019 [10.1933596]

Replacement in crawl-ref/source/menu.cc at line 313 [21.261322]

Replacement in crawl-ref/source/item_use.cc at line 4913 [10.2781507]

Replacement in crawl-ref/source/it_use2.cc at line 52 [10.2904329]

Insertion in crawl-ref/source/fight.cc at line 2289 [10.3140790]

Deletion in crawl-ref/source/fight.cc at line 2291 [10.3140790]

Insertion in crawl-ref/source/fight.cc at line 2309 [10.3140790]

Insertion in crawl-ref/source/fight.cc at line 2313 [10.3140790]

Insertion in crawl-ref/source/fight.cc at line 2354 [10.3140790]

Insertion in crawl-ref/source/fight.cc at line 2358 [10.3140790]

Insertion in crawl-ref/source/fight.cc at line 2364 [10.3140790]

Insertion in crawl-ref/source/fight.cc at line 2385 [10.3140790]

Insertion in crawl-ref/source/fight.cc at line 2395 [10.3140790]

Replacement in crawl-ref/source/fight.cc at line 2402 [10.3140790]

Replacement in crawl-ref/source/fight.cc at line 2422 [10.3140790]

Insertion in crawl-ref/source/fight.cc at line 2481 [10.3140790]

Replacement in crawl-ref/source/fight.cc at line 2513 [10.3140790]

Replacement in crawl-ref/source/fight.cc at line 2562 [10.3140790]

Replacement in crawl-ref/source/directn.cc at line 3465 [10.3697945]

Replacement in crawl-ref/source/directn.cc at line 3474 [10.3697945]

Insertion in crawl-ref/source/beam.cc at line 3978 [10.4128068]

Insertion in crawl-ref/source/beam.cc at line 3980 [10.4128068]

Replacement in crawl-ref/source/beam.cc at line 4600 [10.4128068]