fiddlerwoaroof/crawl - Change RZLMIEOHITWGYNVBHDVVWS24YQ5SD5HG3T3JCMIBCD2VA5TEPHCQC

Fixed unacquirable lajatangs (Matt).

Moved weapon acquirement probability numbers into itemprop.cc.

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

Created by dshaligram on March 5, 2007

RZLMIEOHITWGYNVBHDVVWS24YQ5SD5HG3T3JCMIBCD2VA5TEPHCQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/itemprop.cc at line 165 [3.646661]
[3.653559]
[3.653559]
```
    int                 acquire_weight;
```
Replacement in crawl-ref/source/itemprop.cc at line 174 [3.646661]
B:BD[3.653810] → [3.653810:653835]
```
        DAMV_SLASHING },
```
[3.653810]
[3.653835]
```
        DAMV_SLASHING, 0 },
```
Replacement in crawl-ref/source/itemprop.cc at line 177 [3.646661]
B:BD[3.653975] → [3.653975:654000]
```
        DAMV_CRUSHING },
```
[3.653975]
[3.654000]
```
        DAMV_CRUSHING, 0 },
```
Replacement in crawl-ref/source/itemprop.cc at line 180 [3.646661]
B:BD[3.654141] → [3.654141:654166]
```
        DAMV_CRUSHING },
```
[3.654141]
[3.654166]
```
        DAMV_CRUSHING, 0 },
```
Replacement in crawl-ref/source/itemprop.cc at line 183 [3.646661]
B:BD[3.654307] → [3.654307:654332]
```
        DAMV_CRUSHING },
```
[3.654307]
[3.654332]
```
        DAMV_CRUSHING, 10 },
```
Replacement in crawl-ref/source/itemprop.cc at line 186 [3.646661]
B:BD[3.654473] → [3.654473:654498]
```
        DAMV_CRUSHING },
```
[3.654473]
[3.654498]
```
        DAMV_CRUSHING, 10 },
```
Replacement in crawl-ref/source/itemprop.cc at line 189 [3.646661]
B:BD[3.654639] → [3.654639:654664]
```
        DAMV_CRUSHING },
```
[3.654639]
[3.654664]
```
        DAMV_CRUSHING, 10 },
```
Replacement in crawl-ref/source/itemprop.cc at line 192 [3.646661]
B:BD[3.654805] → [3.654805:654845]
```
        DAMV_PIERCING | DAM_BLUDGEON },
```
[3.654805]
[3.654845]
```
        DAMV_PIERCING | DAM_BLUDGEON, 10 },
```
Replacement in crawl-ref/source/itemprop.cc at line 195 [3.646661]
B:BD[3.654985] → [3.654985:655010]
```
        DAMV_SLASHING },
```
[3.654985]
[3.655010]
```
        DAMV_SLASHING, 2 },
```
Replacement in crawl-ref/source/itemprop.cc at line 198 [3.646661]
B:BD[3.655151] → [3.655151:655191]
```
        DAMV_PIERCING | DAM_BLUDGEON },
```
[3.655151]
[3.655191]
```
        DAMV_PIERCING | DAM_BLUDGEON, 10 },
```
Replacement in crawl-ref/source/itemprop.cc at line 201 [3.646661]
B:BD[3.655332] → [3.655332:655372]
```
        DAMV_PIERCING | DAM_BLUDGEON },
```
[3.655332]
[3.655372]
```
        DAMV_PIERCING | DAM_BLUDGEON, 2 },
```
Replacement in crawl-ref/source/itemprop.cc at line 204 [3.646661]
B:BD[3.655513] → [3.655513:655553]
```
        DAMV_PIERCING | DAM_BLUDGEON },
```
[3.655513]
[3.655553]
```
        DAMV_PIERCING | DAM_BLUDGEON, 10 },
```
Replacement in crawl-ref/source/itemprop.cc at line 207 [3.646661]
B:BD[3.655694] → [3.655694:655719]
```
        DAMV_CRUSHING },
```
[3.655694]
[3.655719]
```
        DAMV_CRUSHING, 10 },
```
Replacement in crawl-ref/source/itemprop.cc at line 210 [3.646661]
B:BD[3.655859] → [3.655859:655884]
```
        DAMV_CRUSHING },
```
[3.655859]
[3.655884]
```
        DAMV_CRUSHING, 0 },
```
Replacement in crawl-ref/source/itemprop.cc at line 213 [3.646661]
B:BD[3.656024] → [3.656024:656064]
```
        DAMV_PIERCING | DAM_BLUDGEON },
```
[3.656024]
[3.656064]
```
        DAMV_PIERCING | DAM_BLUDGEON, 0 },
```
Replacement in crawl-ref/source/itemprop.cc at line 218 [3.646661]
B:BD[3.656225] → [3.656225:656262]
```
        DAMV_STABBING | DAM_SLICE },
```
[3.656225]
[3.656262]
```
        DAMV_STABBING | DAM_SLICE, 0 },
```
Replacement in crawl-ref/source/itemprop.cc at line 221 [3.646661]
B:BD[3.656401] → [3.656401:656438]
```
        DAMV_STABBING | DAM_SLICE },
```
[3.656401]
[3.656438]
```
        DAMV_STABBING | DAM_SLICE, 10 },
```
Replacement in crawl-ref/source/itemprop.cc at line 224 [3.646661]
B:BD[3.656579] → [3.656579:656616]
```
        DAMV_STABBING | DAM_SLICE },
```
[3.656579]
[3.656616]
```
        DAMV_STABBING | DAM_SLICE, 2 },
```
Replacement in crawl-ref/source/itemprop.cc at line 227 [3.646661]
B:BD[3.656756] → [3.656756:656793]
```
        DAMV_SLICING | DAM_PIERCE },
```
[3.656756]
[3.656793]
```
        DAMV_SLICING | DAM_PIERCE, 10 },
```
Replacement in crawl-ref/source/itemprop.cc at line 230 [3.646661]
B:BD[3.656933] → [3.656933:656970]
```
        DAMV_SLICING | DAM_PIERCE },
```
[3.656933]
[3.656970]
```
        DAMV_SLICING | DAM_PIERCE, 10 },
```

Replacement in crawl-ref/source/itemprop.cc at line 235 [3.646661]

B:BD[3.657130] → [3.657130:657196]

        DAMV_SLICING },  // or perhaps DAMV_CHOPPING is more apt?

[3.657130]

[3.657196]

        DAMV_SLICING, 10 },  // or perhaps DAMV_CHOPPING is more apt?

Replacement in crawl-ref/source/itemprop.cc at line 238 [3.646661]
B:BD[3.657335] → [3.657335:657359]
```
        DAMV_SLICING },
```
[3.657335]
[3.657359]
```
        DAMV_SLICING, 10 },
```
Replacement in crawl-ref/source/itemprop.cc at line 241 [3.646661]
B:BD[3.657499] → [3.657499:657523]
```
        DAMV_SLICING },
```
[3.657499]
[3.657523]
```
        DAMV_SLICING, 10 },
```
Replacement in crawl-ref/source/itemprop.cc at line 244 [3.646661]
B:BD[3.657662] → [3.657662:657686]
```
        DAMV_SLICING },
```
[3.657662]
[3.657686]
```
        DAMV_SLICING, 2 },
```
Replacement in crawl-ref/source/itemprop.cc at line 247 [3.646661]
B:BD[3.657826] → [3.657826:657850]
```
        DAMV_SLICING },
```
[3.657826]
[3.657850]
```
        DAMV_SLICING, 2 },
```
Replacement in crawl-ref/source/itemprop.cc at line 250 [3.646661]
B:BD[3.657989] → [3.657989:658013]
```
        DAMV_SLICING },
```
[3.657989]
[3.658013]
```
        DAMV_SLICING, 0 },
```
Replacement in crawl-ref/source/itemprop.cc at line 253 [3.646661]
B:BD[3.658153] → [3.658153:658177]
```
        DAMV_SLICING },
```
[3.658153]
[3.658177]
```
        DAMV_SLICING, 2 },
```
Replacement in crawl-ref/source/itemprop.cc at line 256 [3.646661]
B:BD[3.658317] → [3.658317:658341]
```
        DAMV_SLICING },
```
[3.658317]
[3.658341]
```
        DAMV_SLICING, 10 },
```
Replacement in crawl-ref/source/itemprop.cc at line 259 [3.646661]
B:BD[3.658481] → [3.658481:658505]
```
        DAMV_SLICING },
```
[3.658481]
[3.658505]
```
        DAMV_SLICING, 2 },
```
Replacement in crawl-ref/source/itemprop.cc at line 264 [3.646661]
B:BD[3.658658] → [3.658658:658683]
```
        DAMV_CHOPPING },
```
[3.658658]
[3.658683]
```
        DAMV_CHOPPING, 10 },
```
Replacement in crawl-ref/source/itemprop.cc at line 267 [3.646661]
B:BD[3.658823] → [3.658823:658848]
```
        DAMV_CHOPPING },
```
[3.658823]
[3.658848]
```
        DAMV_CHOPPING, 10 },
```
Replacement in crawl-ref/source/itemprop.cc at line 270 [3.646661]
B:BD[3.658989] → [3.658989:659014]
```
        DAMV_CHOPPING },
```
[3.658989]
[3.659014]
```
        DAMV_CHOPPING, 10 },
```
Replacement in crawl-ref/source/itemprop.cc at line 273 [3.646661]
B:BD[3.659155] → [3.659155:659180]
```
        DAMV_CHOPPING },
```
[3.659155]
[3.659180]
```
        DAMV_CHOPPING, 10 },
```
Replacement in crawl-ref/source/itemprop.cc at line 276 [3.646661]
B:BD[3.659321] → [3.659321:659346]
```
        DAMV_CHOPPING },
```
[3.659321]
[3.659346]
```
        DAMV_CHOPPING, 2 },
```
Replacement in crawl-ref/source/itemprop.cc at line 281 [3.646661]
B:BD[3.659502] → [3.659502:659527]
```
        DAMV_PIERCING },
```
[3.659502]
[3.659527]
```
        DAMV_PIERCING, 10 },
```
Replacement in crawl-ref/source/itemprop.cc at line 284 [3.646661]
B:BD[3.659667] → [3.659667:659692]
```
        DAMV_PIERCING },
```
[3.659667]
[3.659692]
```
        DAMV_PIERCING, 10 },
```
Replacement in crawl-ref/source/itemprop.cc at line 287 [3.646661]
B:BD[3.659832] → [3.659832:659857]
```
        DAMV_PIERCING },
```
[3.659832]
[3.659857]
```
        DAMV_PIERCING, 2 },
```
Replacement in crawl-ref/source/itemprop.cc at line 290 [3.646661]
B:BD[3.659997] → [3.659997:660035]
```
        DAMV_CHOPPING | DAM_PIERCE },
```
[3.659997]
[3.660035]
```
        DAMV_CHOPPING | DAM_PIERCE, 10 },
```
Replacement in crawl-ref/source/itemprop.cc at line 293 [3.646661]
B:BD[3.660175] → [3.660175:660199]
```
        DAMV_SLICING },
```
[3.660175]
[3.660199]
```
        DAMV_SLICING, 10 },
```
Replacement in crawl-ref/source/itemprop.cc at line 296 [3.646661]
B:BD[3.660339] → [3.660339:660364]
```
        DAMV_CHOPPING },
```
[3.660339]
[3.660364]
```
        DAMV_CHOPPING, 10 },
```
Replacement in crawl-ref/source/itemprop.cc at line 299 [3.646661]
B:BD[3.660504] → [3.660504:660529]
```
        DAMV_CHOPPING },
```
[3.660504]
[3.660529]
```
        DAMV_CHOPPING, 2 },
```
Replacement in crawl-ref/source/itemprop.cc at line 303 [3.646661]
B:BD[3.660670] → [3.660670:660695]
```
        DAMV_CRUSHING },
```
[3.660670]
[3.660695]
```
        DAMV_CRUSHING, 10 },
```
Replacement in crawl-ref/source/itemprop.cc at line 306 [3.646661]
B:BD[3.660835] → [3.660835:660859]
```
        DAMV_SLICING },
```
[3.660835]
[3.660859]
```
        DAMV_SLICING, 2 },
```
Replacement in crawl-ref/source/itemprop.cc at line 316 [3.646661]
B:BD[3.661317] → [3.661317:661343]
```
        DAMV_NON_MELEE },
```
[3.661317]
[3.661343]
```
        DAMV_NON_MELEE, 0 },
```
Replacement in crawl-ref/source/itemprop.cc at line 319 [3.646661]
B:BD[3.661484] → [3.661484:661510]
```
        DAMV_NON_MELEE },
```
[3.661484]
[3.661510]
```
        DAMV_NON_MELEE, 10 },
```
Replacement in crawl-ref/source/itemprop.cc at line 322 [3.646661]
B:BD[3.661650] → [3.661650:661676]
```
        DAMV_NON_MELEE },
```
[3.661650]
[3.661676]
```
        DAMV_NON_MELEE, 10 },
```
Replacement in crawl-ref/source/itemprop.cc at line 325 [3.646661]
B:BD[3.661816] → [3.661816:661842]
```
        DAMV_NON_MELEE },
```
[3.661816]
[2.129]
```
        DAMV_NON_MELEE, 10 },
```
Replacement in crawl-ref/source/itemprop.cc at line 328 [3.646661]
B:BD[3.661983] → [3.661983:662009]
```
        DAMV_NON_MELEE },
```
[3.661983]
[2.202]
```
        DAMV_NON_MELEE, 10 },
```
Replacement in crawl-ref/source/itemprop.cc at line 331 [3.646661]
B:BD[3.662150] → [3.662150:662176]
```
        DAMV_NON_MELEE },
```
[3.662150]
[3.662176]
```
        DAMV_NON_MELEE, 10 },
```

Insertion in crawl-ref/source/itemprop.cc at line 1849 [3.646661]

[3.703268]

        else if (prop_type == PWPN_ACQ_WEIGHT)
            return (Weapon_prop[ Weapon_index[item.sub_type] ].acquire_weight);

Replacement in crawl-ref/source/enum.h at line 3937 [4.3287960]
B:BD[4.3376859] → [4.3376859:3376874]
```
    PWPN_SPEED
```
[4.3376859]
[4.3376874]
```
    PWPN_SPEED,
    PWPN_ACQ_WEIGHT
```

Replacement in crawl-ref/source/effects.cc at line 609 [4.3382105]

B:BD[4.3398831] → [4.3398831:3398982]

        if (skill == SK_STAVES)
            type_wanted = WPN_QUARTERSTAFF;    // only one in this class
        else
        {
            count = 0;

[4.3398831]

[4.3398982]

        count = 0;

Replacement in crawl-ref/source/effects.cc at line 611 [4.3382105]

B:BD[4.3398983] → [4.3398983:3399102]

B:BD[4.3399102] → [3.939131:939206]

∅:D[3.939206] → [4.3399213:3399253]

B:BD[4.3399213] → [4.3399213:3399253]

B:BD[4.3399253] → [3.939207:939308]

            // skipping clubs, knives, blowguns
            for (int i = WPN_MACE; i < NUM_WEAPONS; i++)
            {
                // FIXME: Add a flag to itemprop.cc to do these exclusions
                // skipping giant clubs
                if (i == WPN_GIANT_CLUB || i == WPN_GIANT_SPIKED_CLUB)
                    continue;

[4.3398983]

[4.3399335]

        item_def item_considered;
        item_considered.base_type = OBJ_WEAPONS;
        for (int i = 0; i < NUM_WEAPONS; ++i)
        {
            item_considered.sub_type = i;

Replacement in crawl-ref/source/effects.cc at line 617 [4.3382105]

B:BD[4.3399336] → [4.3399336:3399382]

B:BD[4.3399382] → [3.939309:939395]

                // skipping knife and blowgun
                if (i == WPN_KNIFE || i == WPN_BLOWGUN)
                    continue;

[4.3399336]

[3.939395]

            const int acqweight = property(item_considered, PWPN_ACQ_WEIGHT);
            
            if (!acqweight)
                continue;

Replacement in crawl-ref/source/effects.cc at line 622 [4.3382105]

B:BD[3.939396] → [3.939396:939551]

                // blessed blades can only be created by the player, never found
                if (i == WPN_BLESSED_BLADE)
                    continue;

[3.939396]

[4.3399456]

            int wskill = range_skill(OBJ_WEAPONS, i);
            if (wskill == SK_RANGED_COMBAT)
                wskill = weapon_skill(OBJ_WEAPONS, i);

Replacement in crawl-ref/source/effects.cc at line 626 [4.3382105]

B:BD[4.3399457] → [4.3399457:3399606]

B:BD[4.3399606] → [3.939552:939753]

∅:D[3.939753] → [4.3399666:3399996]

B:BD[4.3399666] → [4.3399666:3399996]

B:BD[4.3399996] → [3.939754:939768]

                // "rare" weapons are only considered some of the time...
                // still, the chance is higher than actual random creation
                int wskill = range_skill(OBJ_WEAPONS, i);
                if (wskill == SK_RANGED_COMBAT)
                    wskill = weapon_skill(OBJ_WEAPONS, i);
                if (wskill == skill
                    && (i < WPN_EVENINGSTAR || i > WPN_BROAD_AXE 
                        || (i >= WPN_HAMMER && i <= WPN_SABRE) 
                        || one_chance_in(4)))
                {
                    count++;
                    if (one_chance_in( count ))
                        type_wanted = i;
                }
            }

[4.3399457]

[3.939768]

            if (wskill == skill && random2(count += acqweight) < acqweight)
                type_wanted = i;

Deletion in crawl-ref/source/effects.cc at line 1168 [4.3382105]
B:BD[3.942211] → [3.942211:942297]
```
	// give some more gold
	if ( class_wanted == OBJ_GOLD )
	    thing.quantity += 150;
```

Insertion in crawl-ref/source/effects.cc at line 1169 [4.3382105]

[4.3417883]

        // give some more gold
        if ( class_wanted == OBJ_GOLD )
            thing.quantity += 150;

Fixed unacquirable lajatangs (Matt).

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/itemprop.cc at line 165 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 174 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 177 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 180 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 183 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 186 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 189 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 192 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 195 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 198 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 201 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 204 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 207 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 210 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 213 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 218 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 221 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 224 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 227 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 230 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 235 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 238 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 241 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 244 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 247 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 250 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 253 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 256 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 259 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 264 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 267 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 270 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 273 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 276 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 281 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 284 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 287 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 290 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 293 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 296 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 299 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 303 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 306 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 316 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 319 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 322 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 325 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 328 [3.646661]

Replacement in crawl-ref/source/itemprop.cc at line 331 [3.646661]