fiddlerwoaroof/crawl - Change YMLVBQ6M27MECUVMU3BQP3WSGR7GW4XJMQIHLGHHWMVXHMMIXOYAC

Fix 2011722: Reallow targetting beams such that you may be hit. (There's

a new prompt now, but don't prompt a second time if you already confirmed another one before.) Fix some issues when creating items in the Abyss during GDT_GAME_START. This may or may not have played a role in 2008976.

Lower spawning rate in the Abyss during GDT_GAME_START (10% spawning chance instead of guaranteed spawning per 5 turns).

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

Created by j-p-e-g on July 6, 2008

YMLVBQ6M27MECUVMU3BQP3WSGR7GW4XJMQIHLGHHWMVXHMMIXOYAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spl-util.cc at line 795 [7.245665]
[7.265015]
[8.908]
```
        mpr("Not valid after all?", MSGCH_DIAGNOSTICS);
```
Replacement in crawl-ref/source/monstuff.cc at line 2285 [7.1396662]
B:BD[9.4883] → [4.3247:3270]
```
#define DEBUG_PATHFIND
```
[9.4883]
[10.4057]
```
//#define DEBUG_PATHFIND
```

Replacement in crawl-ref/source/monplace.cc at line 264 [7.1641732]

B:BD[6.3301] → [6.3301:3340]

    if (you.level_type == LEVEL_ABYSS)

[6.3301]

[11.2256]

    if (you.level_type == LEVEL_ABYSS
        && (you.char_direction != GDT_GAME_START || one_chance_in(10)))

Replacement in crawl-ref/source/directn.cc at line 1060 [7.3697945]

B:BD[12.1475] → [12.1475:1547]

            else if ( moves.isTarget && !see_grid(moves.tx, moves.ty) )

[12.1475]

[13.11573]

            else if (moves.isTarget && !see_grid(moves.tx, moves.ty))

Replacement in crawl-ref/source/directn.cc at line 1066 [7.3697945]

∅:D[14.5078] → [15.7374:7509]

B:BD[13.11780] → [15.7374:7509]

            else if ( moves.isValid || moves.isCancel
                      || yesno("Are you sure you want to fizzle?", false, 'n') )

[14.5078]

[13.11898]

            else if (moves.isValid || moves.isCancel
                     || yesno("Are you sure you want to fizzle?", false, 'n'))

Insertion in crawl-ref/source/directn.cc at line 1069 [7.3697945]
[13.11912]
[12.1548]
```
                mpr("We're done.", MSGCH_DIAGNOSTICS);
```
Replacement in crawl-ref/source/directn.cc at line 1103 [7.3697945]
∅:D[12.1747] → [16.3690:3719]
B:BD[7.3704212] → [16.3690:3719]
```
            if ( show_beam )
```
[12.1747]
[16.3719]
```
            if (show_beam)
```

Replacement in crawl-ref/source/directn.cc at line 1106 [7.3697945]

B:BD[16.3761] → [17.1387:1530]

            if ( !skip_iter )   // don't clear before we get a chance to see
                mesclr(true);   // maybe not completely necessary

[16.3761]

[12.1814]

            if (!skip_iter)     // Don't clear before we get a chance to see.
                mesclr(true);   // Maybe not completely necessary.

Replacement in crawl-ref/source/directn.cc at line 1130 [7.3697945]

B:BD[12.2008] → [18.1626:1684]

                while ( raycopy.pos() != moves.target() )

[12.2008]

[16.4144]

                while (raycopy.pos() != moves.target())

Replacement in crawl-ref/source/directn.cc at line 1132 [7.3697945]

B:BD[16.4162] → [18.1685:1739]

                    if ( raycopy.pos() != you.pos() )

[16.4162]

[16.4242]

                    if (raycopy.pos() != you.pos())

Replacement in crawl-ref/source/directn.cc at line 1135 [7.3697945]

∅:D[12.2089] → [16.4264:4329]

B:BD[16.4264] → [16.4264:4329]

                        if ( !in_los(raycopy.x(), raycopy.y()) )

[12.2089]

[16.4329]

                        if (!in_los(raycopy.x(), raycopy.y()))

Insertion in crawl-ref/source/directn.cc at line 1137 [7.3697945]
[16.4364]
[18.1740]

Replacement in crawl-ref/source/debug.cc at line 1854 [7.4016436]

B:BD[7.4051869] → [7.4051869:4051946]

            // Looking for infinite stacks (ie more links than tems allowed)

[7.4051869]

[7.4051946]

            // Looking for infinite stacks (ie more links than items allowed)

Replacement in crawl-ref/source/debug.cc at line 1858 [7.4016436]

B:BD[7.4052119] → [7.4052119:4052197]

                // Check for invalid (zero quantity) items that are linked in

[7.4052119]

[7.4052197]

                // Check for invalid (zero quantity) items that are linked in.

Deletion in crawl-ref/source/debug.cc at line 1906 [7.4016436]
B:BD[7.4054196] → [7.4054196:4054210]
```
            {
```
Deletion in crawl-ref/source/debug.cc at line 1915 [7.4016436]
B:BD[7.4054651] → [7.4054651:4054665]
```
            }
```
Replacement in crawl-ref/source/debug.cc at line 1938 [7.4016436]
B:BD[19.11419] → [19.11419:11462]
```
                && (abs(mitm[i].plus) > 30
```
[19.11419]
[7.4055572]
```
                 && (abs(mitm[i].plus) > 30
```

Replacement in crawl-ref/source/debug.cc at line 1940 [7.4016436]

B:BD[7.4055619] → [7.4055619:4055674]

B:BD[7.4055674] → [19.11463:11513]

∅:D[19.11513] → [7.4055725:4055782]

B:BD[7.4055725] → [7.4055725:4055782]

                    || (!is_random_artefact( mitm[i] )
                        && (mitm[i].special >= 30
                            && mitm[i].special < 181))))

[7.4055619]

[7.4055782]

                    || !is_random_artefact( mitm[i] )
                       && mitm[i].special >= 30
                       && mitm[i].special < 181))

Replacement in crawl-ref/source/debug.cc at line 1944 [7.4016436]

B:BD[7.4055783] → [19.11514:11662]

∅:D[19.11662] → [7.4055934:4055986]

B:BD[7.4055934] → [7.4055934:4055986]

            || (mitm[i].base_type == OBJ_MISSILES
                && (abs(mitm[i].plus) > 25
                    || (!is_random_artefact( mitm[i] )
                        && mitm[i].special >= 30)))

[7.4055783]

[7.4055986]

                 || (mitm[i].base_type == OBJ_MISSILES
                     && (abs(mitm[i].plus) > 25
                         || !is_random_artefact( mitm[i] )
                            && mitm[i].special >= 30))

Replacement in crawl-ref/source/debug.cc at line 1949 [7.4016436]

B:BD[7.4055987] → [7.4055987:4056035]

B:BD[7.4056035] → [19.11663:11706]

∅:D[19.11706] → [7.4056079:4056134]

B:BD[7.4056079] → [7.4056079:4056134]

B:BD[7.4056193] → [7.4056193:4056246]

            || (mitm[i].base_type == OBJ_ARMOUR
                && (abs(mitm[i].plus) > 25
                    || (!is_random_artefact( mitm[i] )
                        && mitm[i].special >= 30))))

[7.4055987]

[7.4056246]

                 || (mitm[i].base_type == OBJ_ARMOUR
                     && (abs(mitm[i].plus) > 25
                         || !is_random_artefact( mitm[i] )
                            && mitm[i].special >= 30)))

Insertion in crawl-ref/source/beam.h at line 155 [7.4124541]

[20.3040]

    bool        dont_stop_player; // player answered self target prompt with 'y'

Replacement in crawl-ref/source/beam.cc at line 3632 [7.4128068]

B:BD[2.2812] → [2.2812:2895]

            beam.fr_count += 1;
            beam.fr_power += you.experience_level;

[2.2812]

[2.2895]

            // Don't ask if we're aiming at ourselves.
            if (!beam.aimed_at_feet && !beam.dont_stop_player
                && !yesno("That beam is likely to hit yourself. Continue "
                          "anyway?", false, 'n'))
            {
                beam.fr_count += 1;
                beam.fr_power += you.experience_level;
                beam.dont_stop_player = true;
            }

Replacement in crawl-ref/source/beam.cc at line 5648 [7.4128068]

B:BD[20.4603] → [5.3209:3289]

               beam_cancelled(false), dont_stop_foe(false), dont_stop_fr(false)

[20.4603]

[21.1514]

               beam_cancelled(false), dont_stop_foe(false),
               dont_stop_fr(false), dont_stop_player(false)

Insertion in crawl-ref/source/abyss.cc at line 222 [7.4482606]

[7.4486208]

[22.1246]

    // During game start, number and level of items mustn't be higher than
    // that on level 1.
    int num_items = 150, items_level = 51;
    if (you.char_direction == GDT_GAME_START)
    {
        num_items   = 3 + roll_dice( 3, 11 );
        items_level = 0;
    }

Replacement in crawl-ref/source/abyss.cc at line 238 [7.4482606]

B:BD[7.4486442] → [7.4486442:4486504]

                if (items_placed < 150 && one_chance_in(200))

[7.4486442]

[7.4486504]

                if (items_placed < num_items && one_chance_in(200))

Replacement in crawl-ref/source/abyss.cc at line 253 [7.4482606]

B:BD[7.4486802] → [23.8306:8845]

B:BD[23.8845] → [3.11735:11878]

∅:D[3.11878] → [23.8988:9014]

B:BD[23.8988] → [23.8988:9014]

                        if (you.char_direction == GDT_GAME_START)
                        {
                            // Number and level of items as that on level 1.
                            const int num_items   = 3 + roll_dice( 3, 11 );
                            const int items_level = 0;
                            thing_created = items(1, OBJ_RANDOM, OBJ_RANDOM,
                                                  true, items_level, num_items);
                        }
                        else
                        {
                            thing_created = items(1, OBJ_RANDOM, OBJ_RANDOM,
                                                  true, 51, 250);
                        }

[7.4486802]

[7.4486937]

                        thing_created = items(1, OBJ_RANDOM, OBJ_RANDOM,
                                              true, items_level, 250);