fiddlerwoaroof/crawl - Change LZN527GR3AULRHWIBA537RR4WSCNNYY4XSEZ6VFF7TKGYSUSBOCAC

A number of small bug fixes:

2811005: unknown mimics being stabbable
2818709: restrict monsters picking up stuff to 2 items per turn
2820097: reintroduce prompts for firing in the direction of allies and fix message
2821462: returning from tutorial screen swallowing a keypress
2822771: fire elementals could be placed in shallow water Also, Azrael is no longer generated in the Shoals/Swamp

Also, implement the second part of FR 2820876: Xom will no longer confuse the player if there's adjacent deep water or lava. This restriction doesn't apply if Xom is feeling nasty (penance or bored) and there's also no checks for water/lava further away.

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

Created by j-p-e-g on July 17, 2009

LZN527GR3AULRHWIBA537RR4WSCNNYY4XSEZ6VFF7TKGYSUSBOCAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/xom.cc at line 2249 [10.3]

[9.3269]

    if (!_xom_feels_nasty())
    {
        // Don't confuse the player if standing next to lava or deep water.
        for (adjacent_iterator ai; ai; ++ai)
            if (in_bounds(*ai) && is_grid_dangerous(grd(*ai)))
                return (false);
    }

Deletion in crawl-ref/source/tutorial.cc at line 203 [12.5936]
∅:D[5.247] → [11.3528:3555]
B:BD[11.3528] → [11.3528:3555]
```
            choose_race();
```
Deletion in crawl-ref/source/tutorial.cc at line 205 [12.5936]
B:BD[11.3599] → [11.3599:3627]
```
            choose_class();
```

Replacement in crawl-ref/source/spells3.cc at line 202 [15.531613]

B:BD[13.168] → [14.5576:5639]

    const bool success = !stop_attack_prompt(m, false, false);

[13.168]

[16.187]

    const bool success = !stop_attack_prompt(m, false, you.pos());

Replacement in crawl-ref/source/spells3.cc at line 243 [15.531613]

B:BD[15.538270] → [17.282:344]

        success = !stop_attack_prompt(monster, false, false);

[15.538270]

[18.167]

        success = !stop_attack_prompt(monster, false, you.pos());

Replacement in crawl-ref/source/spells2.cc at line 728 [15.569242]

B:BD[19.350] → [19.350:419]

    const bool success = !stop_attack_prompt(monster, false, false);

[19.350]

[19.419]

    const bool success = !stop_attack_prompt(monster, false, you.pos());

Replacement in crawl-ref/source/spells2.cc at line 807 [15.569242]

B:BD[15.597539] → [20.1304:1373]

    const bool success = !stop_attack_prompt(monster, false, false);

[15.597539]

[21.336]

    const bool success = !stop_attack_prompt(monster, false, you.pos());

Replacement in crawl-ref/source/spells1.cc at line 141 [15.616635]

B:BD[22.6847] → [23.34541:34589]

            if (see_grid_no_trans(beam.target))

[24.4360]

[4.278]

            if (!wizard_blink && grd(beam.target) == DNGN_OPEN_SEA)
            {
                mesclr();
                mpr("You can't blink into the sea!");
            }
            else if (see_grid_no_trans(beam.target))

Insertion in crawl-ref/source/monstuff.cc at line 3838 [15.1396662]
[25.2980]
[25.2980]
```
        {
```
Insertion in crawl-ref/source/monstuff.cc at line 3841 [15.1396662]
[25.3082]
[25.3082]
```
        }
```

Replacement in crawl-ref/source/monstuff.cc at line 7709 [15.1396662]

B:BD[15.1521408] → [15.1521408:1521484]

                // shouldn't be much trouble to digest a huge pile of gold!

[15.1521408]

[15.1521484]

                // Shouldn't be much trouble to digest a huge pile of gold!

Replacement in crawl-ref/source/monstuff.cc at line 7753 [15.1396662]

B:BD[26.10380] → [27.7552:7660]

∅:D[27.7660] → [28.2860:2886]

∅:D[26.10380] → [28.2860:2886]

B:BD[29.9750] → [28.2860:2886]

    // Monsters may now pick up several items in the same turn, though with
    // reducing chances. (jpeg)
    bool success = false;

[26.10380]

[30.4457]

    // Monsters may now pick up up to two items in the same turn. (jpeg)
    int count_pickup = 0;

Replacement in crawl-ref/source/monstuff.cc at line 7758 [15.1396662]
∅:D[30.4567] → [28.2887:2915]
B:BD[31.4236] → [28.2887:2915]
∅:D[28.2915] → [32.514:538]
B:BD[15.1525431] → [32.514:538]
```
            success = true;
        if (coinflip())
```
[30.4567]
[32.538]
```
            count_pickup++;
        if (count_pickup > 1 || coinflip())
```
Replacement in crawl-ref/source/monstuff.cc at line 7762 [15.1396662]
B:BD[15.1529176] → [28.2916:2938]
```
    return (success);
```
[15.1529176]
[30.4568]
```
    return (count_pickup > 0);
```

Insertion in crawl-ref/source/monstuff.cc at line 8197 [15.1396662]

[33.2671]

[34.4429]

    // No monster may enter the open sea.
    if (grd(targ) == DNGN_OPEN_SEA)
        return (false);

Insertion in crawl-ref/source/monplace.cc at line 143 [15.1641732]

[35.452472]

[36.2473]

    // No monster may be placed on open sea.
    if (actual_grid == DNGN_OPEN_SEA)
        return (false);

Insertion in crawl-ref/source/monplace.cc at line 152 [15.1641732]

[37.15195]

[36.2574]

    // Special check for fire elementals since their habitat is floor which
    // is generally considered compatible with shallow water.
    if (monster_class == MONS_FIRE_ELEMENTAL && grid_is_watery(actual_grid))
        return (false);

Replacement in crawl-ref/source/monplace.cc at line 1026 [15.1641732]

B:BD[15.1654210] → [38.2641:2668]

    if (crawl_state.arena)

[15.1654210]

[38.2668]

    if (crawl_state.arena
        && arena_veto_place_monster(mg, first_band_member, fpos))

Replacement in crawl-ref/source/monplace.cc at line 1029 [15.1641732]

B:BD[38.2674] → [38.2674:2766]

        if (arena_veto_place_monster(mg, first_band_member, fpos))
            return (-1);

[38.2674]

[38.2766]

        return (-1);

Replacement in crawl-ref/source/misc.h at line 115 [15.1928926]

B:BD[39.5124] → [17.2921:2964]

                        bool beam_target);

[39.5124]

[40.2498]

                        coord_def beam_target);

Replacement in crawl-ref/source/misc.cc at line 3042 [15.1933596]

B:BD[39.5290] → [17.3086:3128]

                        bool beam_target)

[39.5290]

[39.5362]

                        coord_def beam_target)

Insertion in crawl-ref/source/misc.cc at line 3052 [15.1933596]
[39.5415]
[41.39520]
```
    const bool mon_target    = (beam_target == mon->pos());
```

Replacement in crawl-ref/source/misc.cc at line 3067 [15.1933596]

∅:D[42.5695] → [39.5902:6271]

∅:D[43.8977] → [39.5902:6271]

B:BD[39.5902] → [39.5902:6271]

        snprintf(info, INFO_SIZE, "Really %s %s%s?",
                 (beam_attack) ? (beam_target) ? "fire at"
                                               : "fire through"
                               : "attack",
                 mon->name(DESC_NOCAP_THE).c_str(),
                 (inSanctuary) ? ", despite your sanctuary"
                               : "");

[42.5695]

[39.6271]

        std::string verb = "";
        bool need_mon_name = true;
        if (beam_attack)
        {
            verb = "fire ";
            if (mon_target)
                verb += "at ";
            else if (you.pos() < beam_target && beam_target < mon->pos()
                     || you.pos() > beam_target && beam_target > mon->pos())
            {
                verb += "in " + mon->name(DESC_NOCAP_THE) + "'s direction";
                need_mon_name = false;
            }
            else
            {
                verb += "through ";
            }
        }
        else
            verb = "attack ";
        if (need_mon_name)
            verb += mon->name(DESC_NOCAP_THE);
        snprintf(info, INFO_SIZE, "Really %s%s?",
                 verb.c_str(),
                 (inSanctuary) ? ", despite your sanctuary" : "");

Replacement in crawl-ref/source/misc.cc at line 3104 [15.1933596]

B:BD[39.6676] → [39.6676:6799]

                 (beam_attack) ? (beam_target) ? "fire at"
                                               : "fire through"

[39.6676]

[39.6799]

                 (beam_attack) ? (mon_target) ? "fire at"
                                              : "fire through"

Replacement in crawl-ref/source/fight.cc at line 570 [15.3140790]

B:BD[44.4037] → [45.4637:4706]

        if (stop_attack_prompt(defender_as_monster(), false, false))

[44.4037]

[44.4088]

        if (stop_attack_prompt(defender_as_monster(), false, attacker->pos()))

Replacement in crawl-ref/source/fight.cc at line 1183 [15.3140790]
B:BD[6.2853] → [6.2853:2897]
```
            if (you.equip[EQ_HELMET] != -1 
```
[6.2853]
[6.2897]
```
            if (you.equip[EQ_HELMET] != -1
```

Insertion in crawl-ref/source/fight.cc at line 3754 [15.3140790]

[46.73485]

[2.3684]

    // Unknown mimics cannot be stabbed.
    if (mons_is_unknown_mimic(defender_as_monster()))
    {
        stab_attempt = false;
        stab_bonus = 0;
        return;
    }

Replacement in crawl-ref/source/fight.cc at line 3772 [15.3140790]

B:BD[46.73664] → [2.4000:4049]

    case UCAT_NO_ATTACK:  stab_bonus = 0; break;

[46.73664]

[47.3822]

    case UCAT_NO_ATTACK:
        stab_bonus = 0;
        break;

Replacement in crawl-ref/source/fight.cc at line 3787 [15.3140790]

B:BD[16.5406] → [2.4222:4271]

    case UCAT_DISTRACTED: stab_bonus = 3; break;

[16.5406]

[46.74185]

    case UCAT_DISTRACTED:
        stab_bonus = 3;
        break;

Insertion in crawl-ref/source/externs.h at line 121 [15.3270163]

[23.67110]

    bool operator >  (const coord_def &other) const
    {
        return (x > other.x) || (x == other.x && y > other.y);
    }

Insertion in crawl-ref/source/dungeon.cc at line 3348 [15.3429798]

[48.3133]

[49.4884]

    // Azrael may not be created in the Swamp or Shoals.
    if (which_unique == MONS_AZRAEL
        && (player_in_branch(BRANCH_SWAMP) || player_in_branch(BRANCH_SHOALS)))
    {
        return MONS_PROGRAM_BUG;
    }

Replacement in crawl-ref/source/beam.cc at line 194 [15.4128068]
B:BD[15.4131540] → [50.12834:12892]
```
    mprf(MSGCH_DIAGNOSTICS, "zapping: power=%d", power );
```
[15.4131540]
[15.4131639]
```
    mprf(MSGCH_DIAGNOSTICS, "zapping: power=%d", power);
```

Replacement in crawl-ref/source/beam.cc at line 2033 [15.4128068]

B:BD[51.2869] → [51.2869:2929]

               || (is_tracer && affects_wall(grd(pos()))));

[51.2869]

[52.4020]

               || is_tracer && affects_wall(grd(pos())));

Replacement in crawl-ref/source/beam.cc at line 3534 [15.4128068]

B:BD[53.6714] → [8.3921:3977]

    if (has_saving_throw() && flavour != BEAM_POLYMORPH

[53.6714]

[54.36906]

    if (flavour != BEAM_POLYMORPH && has_saving_throw()

Replacement in crawl-ref/source/beam.cc at line 4143 [15.4128068]

B:BD[35.1247043] → [55.3048:3107]

∅:D[55.3107] → [54.47518:47576]

B:BD[54.47518] → [54.47518:47576]

            const bool on_target = (target == mon->pos());
            if (stop_attack_prompt(mon, true, on_target))

[35.1247043]

[54.47576]

            if (stop_attack_prompt(mon, true, target))

Replacement in crawl-ref/source/beam.cc at line 4194 [15.4128068]
B:BD[3.5294] → [3.5294:5313]
```
    if (final > 0)
```
[3.5294]
[3.5313]
```
    if (!is_tracer && final > 0)
```

Insertion in crawl-ref/source/beam.cc at line 5069 [15.4128068]

[15.4249148]

[56.26965]

    // Assume we didn't hit, after all.
    if (is_tracer && used == BEAM_STOP)
        return 1;

Deletion in crawl-ref/source/acr.cc at line 3080 [15.4397395]
B:BD[7.6649] → [7.6649:6680]
```
    ASSERT(door_move.isValid);
```