fiddlerwoaroof/crawl - Change GNS2MZLFRFGMG7L26JFBXEEALSIQNPUVA4NDUJH42Q5TEJDPPFDAC

Simplify.

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

Created by dolorous on June 19, 2008

GNS2MZLFRFGMG7L26JFBXEEALSIQNPUVA4NDUJH42Q5TEJDPPFDAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/item_use.cc at line 1950 [3.2781507]
B:BD[3.2815455] → [4.742374:742425]
∅:D[4.742425] → [3.2815506:2815548]
B:BD[3.2815506] → [3.2815506:2815548]
```
    baseHit = you.strength - item_mass(item) / 10;
    if (baseHit > 0)
        baseHit = 0;
```
[3.2815455]
[3.2815548]
```
    baseHit = std::min(0, you.strength - item_mass(item) / 10);
```

Replacement in crawl-ref/source/item_use.cc at line 1957 [3.2781507]

B:BD[3.2815710] → [3.2815710:2815825]

    {
        baseDam = property( item, PWPN_DAMAGE ) - 4;
        if (baseDam < 0)
            baseDam = 0;
    }

[3.2815710]

[5.4802]

        baseDam = std::max(0, property(item, PWPN_DAMAGE) - 4);

Replacement in crawl-ref/source/item_use.cc at line 2015 [3.2781507]

B:BD[3.2817002] → [5.4848:4912]

∅:D[5.4912] → [3.2817067:2817118]

B:BD[3.2817067] → [3.2817067:2817118]

            if (get_equip_race( you.inv[you.equip[EQ_WEAPON]] )
                        == get_equip_race( item ))

[3.2817002]

[3.2817118]

            if (get_equip_race(you.inv[you.equip[EQ_WEAPON]])
                        == get_equip_race(item))

Replacement in crawl-ref/source/item_use.cc at line 2018 [3.2781507]

B:BD[3.2817132] → [3.2817132:2817192]

                baseHit += 1;
                baseDam += 1;

[3.2817132]

[3.2817192]

                baseHit++;
                baseDam++;

Replacement in crawl-ref/source/item_use.cc at line 2026 [3.2781507]
B:BD[3.2817382] → [3.2817382:2817416]
```
                    baseHit += 1;
```
[3.2817382]
[3.2817416]
```
                    baseHit++;
```

Replacement in crawl-ref/source/item_use.cc at line 2100 [3.2781507]

B:BD[3.2819606] → [4.745820:745910]

            if (strbonus > lnchDamBonus + 1)
                strbonus = lnchDamBonus + 1;

[3.2819606]

[3.2819700]

            strbonus = std::min(lnchDamBonus + 1, strbonus);

Replacement in crawl-ref/source/item_use.cc at line 2107 [3.2781507]
∅:D[2.12841] → [3.2819867:2819935]
B:BD[3.2819867] → [3.2819867:2819935]
```
            if (lnchDamBonus > 0)
                lnchDamBonus = 0;
```
[2.12841]
[3.2819935]
```
            lnchDamBonus = std::min(0, lnchDamBonus);
```

Replacement in crawl-ref/source/item_use.cc at line 2121 [3.2781507]

∅:D[2.13095] → [3.2820397:2820533]

B:BD[3.2820397] → [3.2820397:2820533]

            if (lnchDamBonus > 0)
                lnchDamBonus = 0;
            if (ammoDamBonus > 0)
                ammoDamBonus = 0;

[2.13095]

[3.2820533]

            lnchDamBonus = std::min(0, lnchDamBonus);
            ammoDamBonus = std::min(0, ammoDamBonus);

Replacement in crawl-ref/source/item_use.cc at line 2137 [3.2781507]

B:BD[4.746575] → [4.746575:746665]

            if (strbonus > lnchDamBonus + 1)
                strbonus = lnchDamBonus + 1;

[4.746575]

[4.746665]

            strbonus = std::min(lnchDamBonus + 1, strbonus);

Replacement in crawl-ref/source/item_use.cc at line 2147 [3.2781507]
∅:D[2.13360] → [3.2821181:2821249]
B:BD[3.2821181] → [3.2821181:2821249]
```
            if (lnchDamBonus > 0)
                lnchDamBonus = 0;
```
[2.13360]
[3.2821249]
```
            lnchDamBonus = std::min(0, lnchDamBonus);
```
Replacement in crawl-ref/source/item_use.cc at line 2297 [3.2781507]
∅:D[6.318] → [3.2825851:2825881]
∅:D[7.2694] → [3.2825851:2825881]
∅:D[4.749041] → [3.2825851:2825881]
B:BD[3.2825851] → [3.2825851:2825881]
```
                baseHit += 1;
```
[7.2694]
[7.2695]
```
                baseHit++;
```
Replacement in crawl-ref/source/item_use.cc at line 2310 [3.2781507]
B:BD[3.2826198] → [3.2826198:2826236]
```
                        baseHit += 1;
```
[3.2826198]
[3.2826236]
```
                        baseHit++;
```
Replacement in crawl-ref/source/item_use.cc at line 2313 [3.2781507]
B:BD[3.2826303] → [3.2826303:2826341]
```
                        baseHit -= 1;
```
[3.2826303]
[3.2826341]
```
                        baseHit--;
```

Replacement in crawl-ref/source/item_use.cc at line 2328 [3.2781507]

B:BD[8.1485] → [8.1485:1523]

                        baseHit += 1;

[8.1485]

[8.1523]

                        baseHit++;

Replacement in crawl-ref/source/item_use.cc at line 2337 [3.2781507]

B:BD[3.2826558] → [3.2826558:2826611]

            baseDam = property( item, PWPN_DAMAGE );

[3.2826558]

[9.274]

            baseDam = property(item, PWPN_DAMAGE);

Replacement in crawl-ref/source/item_use.cc at line 2345 [3.2781507]
B:BD[9.562] → [9.562:592]
```
                baseDam += 1;
```
[9.562]
[9.592]
```
                baseDam++;
```

Replacement in crawl-ref/source/item_use.cc at line 2479 [3.2781507]

B:BD[3.2828882] → [3.2828882:2828955]

        pbolt.damage = dice_def( 1, baseDam + random2(exDamBonus + 1) );

[3.2828882]

[3.2828955]

        pbolt.damage = dice_def(1, baseDam + random2(exDamBonus + 1));

Replacement in crawl-ref/source/item_use.cc at line 2481 [3.2781507]

B:BD[3.2828964] → [3.2828964:2829043]

        pbolt.damage = dice_def( 1, baseDam - random2(0 - (exDamBonus - 1)) );

[3.2828964]

[4.751128]

        pbolt.damage = dice_def(1, baseDam - random2(0 - (exDamBonus - 1)));

Replacement in crawl-ref/source/item_use.cc at line 2497 [3.2781507]
∅:D[10.1839] → [11.452:484]
B:BD[11.452] → [11.452:484]
```
    scale_dice( pbolt.damage );
```
[10.1839]
[3.2829280]
```
    scale_dice(pbolt.damage);
```

Replacement in crawl-ref/source/item_use.cc at line 2527 [3.2781507]

B:BD[10.1919] → [10.1919:1989]

        hit = (affect( pbolt, pbolt.target_x, pbolt.target_y ) != 0);

[10.1919]

[12.685]

        hit = (affect(pbolt, pbolt.target_x, pbolt.target_y) != 0);

Replacement in crawl-ref/source/item_use.cc at line 2529 [3.2781507]

B:BD[12.724] → [12.724:802]

            beam_drop_object( pbolt, &item, pbolt.target_x, pbolt.target_y );

[12.724]

[10.2063]

            beam_drop_object(pbolt, &item, pbolt.target_x, pbolt.target_y);

Replacement in crawl-ref/source/item_use.cc at line 2571 [3.2781507]
∅:D[13.5191] → [14.2585:2630]
∅:D[2.15438] → [14.2585:2630]
B:BD[14.2585] → [14.2585:2630]
```
        dec_inv_item_quantity( throw_2, 1 );
```
[2.15438]
[13.5192]
```
        dec_inv_item_quantity(throw_2, 1);
```

Simplify.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/item_use.cc at line 1950 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1957 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2015 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2018 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2026 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2100 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2107 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2121 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2137 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2147 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2297 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2310 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2313 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2328 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2337 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2345 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2479 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2481 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2497 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2527 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2529 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2571 [3.2781507]