fiddlerwoaroof/crawl - Change 36DYXIWAQTBOCZBCUPYWDKAXVWDU3TRMSM3OCQZGGMWE2KPERJMAC

Fix props vector not being initialized for unrandarts (BR 1951367

and others). I'm really sorry about that!

Modify pickup.lua to allow Vampires to pick up !berserk rage etc.

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

Created by j-p-e-g on April 25, 2008

36DYXIWAQTBOCZBCUPYWDKAXVWDU3TRMSM3OCQZGGMWE2KPERJMAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/randart.cc at line 1150 [5.893152]

[4.4045]

    else if (is_unrandom_artefact( item ))
    {
        const unrandart_entry *unrand = _seekunrandart( item );
        for (int i = 0; i < RA_PROPERTIES; i++)
            proprt[i] = (short) unrand->prpty[i];
    }

Replacement in crawl-ref/source/randart.cc at line 1892 [5.893152]

∅:D[6.5624] → [5.937382:937654]

B:BD[5.937382] → [5.937382:937654]

    item.base_type = unranddata[unrand_index].ura_cl;
    item.sub_type  = unranddata[unrand_index].ura_ty;
    item.plus      = unranddata[unrand_index].ura_pl;
    item.plus2     = unranddata[unrand_index].ura_pl2;
    item.colour    = unranddata[unrand_index].ura_col;

[6.5624]

[5.937654]

    const unrandart_entry *unrand = &unranddata[unrand_index];
    item.base_type = unrand->ura_cl;
    item.sub_type  = unrand->ura_ty;
    item.plus      = unrand->ura_pl;
    item.plus2     = unrand->ura_pl2;
    item.colour    = unrand->ura_col;

Replacement in crawl-ref/source/randart.cc at line 1900 [5.893152]
∅:D[7.10269] → [5.937692:937758]
B:BD[5.937692] → [5.937692:937758]
```
    item.special = unranddata[ unrand_index ].prpty[ RAP_BRAND ];
```
[7.10269]
[5.937758]
```
    _init_randart_properties(item);
```

Replacement in crawl-ref/source/randart.cc at line 1902 [5.893152]

B:BD[5.937759] → [3.3002:3063]

    if (unranddata[ unrand_index ].prpty[ RAP_CURSED ] != 0)

[5.937759]

[5.937815]

    item.special = unrand->prpty[ RAP_BRAND ];
    if (unrand->prpty[ RAP_CURSED ] != 0)

Insertion in crawl-ref/source/randart.cc at line 1906 [5.893152]

[5.937847]

[8.215]

    // get true artefact name
    ASSERT(!item.props.exists( RANDART_NAME_KEY ));
    item.props[RANDART_NAME_KEY].get_string() = unrand->name;
    // get artefact appearance
    ASSERT(!item.props.exists( RANDART_APPEAR_KEY ));
    item.props[RANDART_APPEAR_KEY].get_string() = unrand->unid_name;

Replacement in crawl-ref/source/randart.cc at line 1921 [5.893152]

B:BD[5.938049] → [5.938049:938141]

/* Eventually it would be great to have randomly generated descriptions for
   randarts. */

[5.938049]

[9.4349]

// Eventually it would be great to have randomly generated descriptions
// for randarts.

Replacement in crawl-ref/source/lua/pickup.lua at line 25 [10.272]

B:BD[2.916] → [2.916:938]

function you_undead()

[2.916]

[2.938]

-- don't count Vampires here because of all those exceptions
function you_real_undead()

Deletion in crawl-ref/source/lua/pickup.lua at line 28 [10.272]
B:BD[2.997] → [2.997:1035]
```
           or you.race() == "Vampire"
```
Replacement in crawl-ref/source/lua/pickup.lua at line 52 [10.272]
B:BD[2.1402] → [2.1402:1406]
```
   
```
[2.1402]
[2.1406]
Replacement in crawl-ref/source/lua/pickup.lua at line 61 [10.272]
B:BD[2.1620] → [2.1620:1661]
```
	-- also: no bad potions for anyone else
```
[2.1620]
[2.1661]
```
        -- also: no bad potions for anyone else
```

Replacement in crawl-ref/source/lua/pickup.lua at line 74 [10.272]

B:BD[2.1957] → [2.1957:2036]

           -- undead cannot use berserk
	   -- or anything involving mutations

[2.1957]

[2.2036]

           -- real undead cannot use berserk
           -- or anything involving mutations

Replacement in crawl-ref/source/lua/pickup.lua at line 77 [10.272]

B:BD[2.2081] → [2.2081:2209]

	        or item.subtype(it) == "gain ability"
		or item.subtype(it) == "cure mutation" then
              if you_undead() then

[2.2081]

[2.2209]

                or item.subtype(it) == "gain ability"
                or item.subtype(it) == "cure mutation" then
              if you_real_undead() then

Replacement in crawl-ref/source/lua/pickup.lua at line 88 [10.272]

B:BD[2.2424] → [2.2424:2465]

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

[2.2424]

[2.2465]

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

Replacement in crawl-ref/source/lua/pickup.lua at line 112 [10.272]
B:BD[2.3075] → [2.3075:3102]
```
       if you_undead() and
```
[2.3075]
[2.3102]
```
       if you_real_undead() and
```

Replacement in crawl-ref/source/lua/pickup.lua at line 114 [10.272]

B:BD[2.3151] → [2.3151:3276]

	       or item.subtype(it) == "rage"
	       or item.subtype(it) == "sustenance"
	          and you.race() == "Mummy") then

[2.3151]

[2.3276]

               or item.subtype(it) == "rage" 
               or item.subtype(it) == "sustenance"
                  and you.race() == "Mummy") then

Replacement in crawl-ref/source/lua/pickup.lua at line 120 [10.272]
B:BD[2.3319] → [2.3319:3327]
```
       
```
[2.3319]
[2.3327]
Deletion in crawl-ref/source/lua/pickup.lua at line 124 [10.272]
B:BD[2.3394] → [2.3394:3395]

Insertion in crawl-ref/source/acr.cc at line 552 [5.4397395]

[5.4409978]

            break;
        }
        if (you.inv[i].base_type != OBJ_WEAPONS
            && you.inv[i].base_type != OBJ_ARMOUR
            && you.inv[i].base_type != OBJ_JEWELLERY)
        {
            mpr("That item cannot be turned into an artefact.");

Fix props vector not being initialized for unrandarts (BR 1951367

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/randart.cc at line 1150 [5.893152]

Replacement in crawl-ref/source/randart.cc at line 1892 [5.893152]

Replacement in crawl-ref/source/randart.cc at line 1900 [5.893152]

Replacement in crawl-ref/source/randart.cc at line 1902 [5.893152]

Insertion in crawl-ref/source/randart.cc at line 1906 [5.893152]

Replacement in crawl-ref/source/randart.cc at line 1921 [5.893152]

Replacement in crawl-ref/source/lua/pickup.lua at line 25 [10.272]

Deletion in crawl-ref/source/lua/pickup.lua at line 28 [10.272]

Replacement in crawl-ref/source/lua/pickup.lua at line 52 [10.272]

Replacement in crawl-ref/source/lua/pickup.lua at line 61 [10.272]

Replacement in crawl-ref/source/lua/pickup.lua at line 74 [10.272]

Replacement in crawl-ref/source/lua/pickup.lua at line 77 [10.272]

Replacement in crawl-ref/source/lua/pickup.lua at line 88 [10.272]

Replacement in crawl-ref/source/lua/pickup.lua at line 112 [10.272]

Replacement in crawl-ref/source/lua/pickup.lua at line 114 [10.272]

Replacement in crawl-ref/source/lua/pickup.lua at line 120 [10.272]

Deletion in crawl-ref/source/lua/pickup.lua at line 124 [10.272]

Insertion in crawl-ref/source/acr.cc at line 552 [5.4397395]