fiddlerwoaroof/crawl - Change QUFPPRIIRXHUFEDH3EFES7CSHTA7GG2DAXTRHUAUQBYMSWK4BP6AC

Finally fixed pickup.lua to work as intended (I hope).

Other small changes: - default yesno for renouncing religion to 'n' - plants and fungi aren't "interesting", even when OOD - added WIZ designator to listed saved characters

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

Created by j-p-e-g on August 24, 2007

QUFPPRIIRXHUFEDH3EFES7CSHTA7GG2DAXTRHUAUQBYMSWK4BP6AC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/player.cc at line 4967 [6.962854]
[4.204606]
[5.358291]
```
#ifdef WIZARD
    if (wizard)
        desc += " (WIZ)";
#endif
```
Deletion in crawl-ref/source/monplace.cc at line 337 [6.1641732]
B:BD[3.1285] → [3.1285:1347]
```
    // player shoved out of the way?
    bool shoved = false;
```

Deletion in crawl-ref/source/monplace.cc at line 366 [6.1641732]

B:BD[3.1915] → [3.1915:2152]

                // Is the monster happy where we want to put it?
                unsigned char grid_wanted = monster_habitat(mon_type);
                if (!grid_compatible(grid_wanted, grd[px][py], true))
                    continue;

Deletion in crawl-ref/source/monplace.cc at line 404 [6.1641732]

B:BD[3.3555] → [3.3555:3696]

                        // or maybe allow 1st level monsters, having visited the
                        // surface, to re-enter the dungeon

Insertion in crawl-ref/source/monplace.cc at line 456 [6.1641732]
[6.1646511]
[6.1646511]
```
    // player shoved out of the way?
    bool shoved = false;
```
Insertion in crawl-ref/source/monplace.cc at line 462 [6.1641732]
[3.4746]
[6.1646559]
```
        
```

Replacement in crawl-ref/source/monplace.cc at line 1417 [6.1641732]

B:BD[7.11897] → [7.11897:11952]

                monster->type <= MONS_AIR_ELEMENTAL) )

[7.11897]

[7.11952]

                monster->type <= MONS_AIR_ELEMENTAL)
              && (!Options.safe_zero_exp ||
                  !mons_class_flag( monster->type, M_NO_EXP_GAIN )))

Replacement in crawl-ref/source/lua/pickup.lua at line 1 [8.272]

B:BD[8.272] → [8.273:350]

---------------------------------------------------------------------------

[8.272]

[8.350]

------------------------------------------------------------

Replacement in crawl-ref/source/lua/pickup.lua at line 3 [8.272]

B:BD[8.366] → [8.366:528]

-- Smarter autopickup handling that takes into account the item type
-- in combination with your character's race, religion, knowledge,
-- and eating habits.

[8.366]

[8.528]

-- Smarter autopickup handling that takes into account the 
-- item type in combination with your character's race, 
-- religion, knowledge, and eating habits.

Replacement in crawl-ref/source/lua/pickup.lua at line 11 [8.272]

B:BD[8.628] → [8.628:845]

--  * This script only handles items of classes with autopickup on.
--  * Any result can still be overridden using autopickup_exceptions.
---------------------------------------------------------------------------

[8.628]

[8.845]

--  * This script only handles items of classes with 
--    autopickup on.
--  * Any result can still be overridden using 
--    autopickup_exceptions.
------------------------------------------------------------

Replacement in crawl-ref/source/lua/pickup.lua at line 26 [8.272]

B:BD[8.995] → [2.234:320]

    return you.race() == "Mummy" or you.race() == "Ghoul" or you.race() == "Vampire"

[8.995]

[8.1054]

    return you.race() == "Mummy" or you.race() == "Ghoul" 
           or you.race() == "Vampire"

Replacement in crawl-ref/source/lua/pickup.lua at line 39 [8.272]
B:BD[8.1197] → [8.1197:1222]
```
function bad_potion(it)
```
[8.1197]
[8.1222]
```
function bad_potion(type)
```
Replacement in crawl-ref/source/lua/pickup.lua at line 44 [8.272]
B:BD[8.1269] → [8.1269:1295]
```
function spec_potion(it)
```
[8.1269]
[8.1295]
```
function spec_potion(type)
```

Replacement in crawl-ref/source/lua/pickup.lua at line 60 [8.272]

B:BD[8.1633] → [8.1633:1706]

        -- no potions for Mummies, also: no bad potions for anyone else

[8.1633]

[8.1706]

        -- no potions for Mummies
	-- also: no bad potions for anyone else

Replacement in crawl-ref/source/lua/pickup.lua at line 75 [8.272]

B:BD[8.2055] → [8.2055:2105]

           if item.subtype(it) == "berserk" then

[8.2055]

[8.2105]

	   -- or anything involving mutations
           if item.subtype(it) == "berserk" 
	        or item.subtype(it) == "gain ability"
		or item.subtype(it) == "cure mutation" then

Replacement in crawl-ref/source/lua/pickup.lua at line 87 [8.272]

B:BD[2.381] → [2.381:456]

           if item.subtype(it) == "blood" or item.subtype(it) == "water"

[2.381]

[2.456]

           if item.subtype(it) == "blood" 
	        or item.subtype(it) == "water"

Replacement in crawl-ref/source/lua/pickup.lua at line 98 [8.272]

B:BD[8.2564] → [2.513:589]

    if item.class(it) == "Carrion" or item.class(it) == "Comestibles" then

[8.2564]

[8.2609]

    if item.class(it) == "Carrion" 
         or item.class(it) == "Comestibles" then

Replacement in crawl-ref/source/lua/pickup.lua at line 103 [8.272]

B:BD[8.2659] → [8.2659:2743]

    if item.class(it) == "Books" and you.god() == "Trog" then
       return false

[8.2659]

[8.2743]

    if item.class(it) == "Books" and you.god() == "Trog"
       then return false

Replacement in crawl-ref/source/lua/pickup.lua at line 108 [8.272]

B:BD[8.2797] → [8.2797:2870]

       if item.subtype == "hunger" or item.subtype == "inaccuracy" then

[8.2797]

[8.2870]

       if item.subtype(it) == "hunger" 
            or item.subtype(it) == "inaccuracy" then

Replacement in crawl-ref/source/lua/pickup.lua at line 113 [8.272]

B:BD[8.2935] → [8.2935:3020]

            (item.subtype(it) == "regeneration" or item.subtype(it) == "rage") then

[8.2935]

[8.3020]

            (item.subtype(it) == "regeneration" 
	       or item.subtype(it) == "rage") then

Deletion in crawl-ref/source/clua.cc at line 1183 [4.483969]
B:BD[2.767] → [2.767:828]
∅:D[2.828] → [8.3524:3558]
B:BD[8.3524] → [8.3524:3558]
```
                else if (item->sub_type == POT_BERSERK_RAGE)
                   s = "berserk";
```

Insertion in crawl-ref/source/clua.cc at line 1187 [4.483969]

[8.3736]

                else if (item->sub_type == POT_BERSERK_RAGE)
                   s = "berserk";
                else if (item->sub_type == POT_GAIN_STRENGTH
                         || item->sub_type == POT_GAIN_DEXTERITY
                         || item->sub_type == POT_GAIN_INTELLIGENCE)
                   s = "gain ability";
                else if (item->sub_type == POT_CURE_MUTATION)
                   s = "cure mutation";

Replacement in crawl-ref/source/clua.cc at line 1216 [4.483969]
B:BD[8.3839] → [8.3839:3844]
```
    
```
[8.3839]
[8.3844]
Insertion in crawl-ref/source/clua.cc at line 1220 [4.483969]
[8.3934]
[8.3934]
```
       {
```
Insertion in crawl-ref/source/clua.cc at line 1222 [4.483969]
[8.3953]
[8.3953]
```
       }
```

Deletion in crawl-ref/source/clua.cc at line 1232 [4.483969]

B:BD[8.4168] → [8.4168:4281]

            case POT_GAIN_STRENGTH:
            case POT_GAIN_DEXTERITY:
            case POT_GAIN_INTELLIGENCE:

Deletion in crawl-ref/source/clua.cc at line 1237 [4.483969]
B:BD[8.4450] → [8.4450:4486]
```
            case POT_CURE_MUTATION:
```
Replacement in crawl-ref/source/clua.cc at line 1254 [4.483969]
B:BD[8.4912] → [8.4912:4947]
```
            case POT_BERSERK_RAGE:
```
[8.4912]
[2.829]
```
            // for eating habits
```

Insertion in crawl-ref/source/clua.cc at line 1258 [4.483969]

[8.5006]

            // for undead
            case POT_BERSERK_RAGE:
            case POT_GAIN_STRENGTH:
            case POT_GAIN_DEXTERITY:
            case POT_GAIN_INTELLIGENCE:
            case POT_CURE_MUTATION:

Replacement in crawl-ref/source/acr.cc at line 383 [6.4397395]

B:BD[6.4408414] → [4.549316:549415]

        if (!yesno( "Do you really want to enter wizard mode?", 
                    false, 'n' ))

[6.4408414]

[6.4408487]

        if (!yesno( "Do you really want to enter wizard mode?", false, 'n' ))

Replacement in crawl-ref/source/abl-show.cc at line 1702 [6.4494389]

B:BD[6.4530208] → [6.4530208:4530364]

        if (yesno("Really renounce your faith, foregoing its fabulous benefits?")
            && yesno( "Are you sure you won't change your mind later?" ))

[6.4530208]

[6.4530364]

        if (yesno("Really renounce your faith, foregoing its fabulous benefits?",
                   false, 'n')
            && yesno("Are you sure you won't change your mind later?",
                      false, 'n' ))

Replacement in crawl-ref/init.txt at line 7 [6.4830895]

B:BD[6.4830918] → [6.4830918:4830980]

# Lines begining with '#' are comments.  The basic syntax is:

[6.4830918]

[6.4830980]

# Lines beginning with '#' are comments.  The basic syntax is:

Replacement in crawl-ref/init.txt at line 17 [6.4830895]

B:BD[6.4831282] → [9.308:454]

# White space is stripped from the begining and end of the line, as well 
# as imediately before and after the '='. If the option allows multiple

[6.4831282]

[10.2619]

# White space is stripped from the beginning and end of the line, as well 
# as immediately before and after the '='. If the option allows multiple

Replacement in crawl-ref/init.txt at line 23 [6.4830895]

B:BD[6.4831442] → [11.1117:1176]

# For descriptions concerning the option consult the file

[6.4831442]

[11.1176]

# For descriptions concerning an option consult the file

Finally fixed pickup.lua to work as intended (I hope).

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/player.cc at line 4967 [6.962854]

Deletion in crawl-ref/source/monplace.cc at line 337 [6.1641732]

Deletion in crawl-ref/source/monplace.cc at line 366 [6.1641732]

Deletion in crawl-ref/source/monplace.cc at line 404 [6.1641732]

Insertion in crawl-ref/source/monplace.cc at line 456 [6.1641732]

Insertion in crawl-ref/source/monplace.cc at line 462 [6.1641732]