fiddlerwoaroof/crawl - Change VY5F47DRV7FDFLCDWZLKU3Q6SPEPSI2XR3WFITPWUB3A5EKAUEDAC

More code cleanups.

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

Created by haranp on January 10, 2009

VY5F47DRV7FDFLCDWZLKU3Q6SPEPSI2XR3WFITPWUB3A5EKAUEDAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells1.cc at line 1232 [7.616635]

∅:D[6.358] → [7.635710:635761]

B:BD[7.635710] → [7.635710:635761]

}                               // end extension()

[6.358]

[7.635761]

}
static void _increase_duration(duration_type dur, int amount, int cap,
                               const char* msg)
{
    if (msg)
        mpr(msg);
    you.duration[dur] += amount;
    if (you.duration[dur] > cap)
        you.duration[dur] = cap;
}

Replacement in crawl-ref/source/spells1.cc at line 1274 [7.616635]

B:BD[7.636481] → [7.636481:636551]

    you.duration[DUR_ICY_ARMOUR] += 20 + random2(pow) + random2(pow);

[7.636481]

[7.636551]

    _increase_duration(DUR_ICY_ARMOUR, 20 + random2(pow) + random2(pow), 50,
                       NULL);
}

Deletion in crawl-ref/source/spells1.cc at line 1278 [7.616635]

B:BD[7.636552] → [7.636552:636691]

    if (you.duration[DUR_ICY_ARMOUR] > 50)
        you.duration[DUR_ICY_ARMOUR] = 50;
}                               // end ice_armour()

Deletion in crawl-ref/source/spells1.cc at line 1280 [7.616635]
B:BD[7.636720] → [7.636720:636745]
```
    int dur_change = 0;
```

Deletion in crawl-ref/source/spells1.cc at line 1298 [7.616635]

∅:D[3.187] → [7.637295:637508]

B:BD[7.637295] → [7.637295:637508]


    dur_change = 20 + random2(pow) + random2(pow);
    if (dur_change + you.duration[DUR_STONEMAIL] >= 100)
        you.duration[DUR_STONEMAIL] = 100;
    else
        you.duration[DUR_STONEMAIL] += dur_change;

Insertion in crawl-ref/source/spells1.cc at line 1299 [7.616635]

[7.637509]

    _increase_duration(DUR_STONEMAIL, 20 + random2(pow) + random2(pow), 100,
                       NULL);

Replacement in crawl-ref/source/spells1.cc at line 1302 [7.616635]
B:BD[7.637530] → [7.637530:637584]
```
}                               // end stone_scales()
```
[7.637530]
[7.637584]
```
}
```

Replacement in crawl-ref/source/spells1.cc at line 1306 [7.616635]

B:BD[7.637614] → [7.637614:637823]

    mpr("You feel protected from missiles.");
    you.duration[DUR_REPEL_MISSILES] += 8 + roll_dice( 2, pow );
    if (you.duration[DUR_REPEL_MISSILES] > 100)
        you.duration[DUR_REPEL_MISSILES] = 100;

[7.637614]

[8.289]

    _increase_duration(DUR_REPEL_MISSILES, 8 + roll_dice( 2, pow ), 100,
                       "You feel protected from missiles.");

Replacement in crawl-ref/source/spells1.cc at line 1312 [7.616635]

B:BD[7.637905] → [7.637905:638114]

    mpr("You feel very safe from missiles.");
    you.duration[DUR_DEFLECT_MISSILES] += 15 + random2(pow);
    if (you.duration[DUR_DEFLECT_MISSILES] > 100)
        you.duration[DUR_DEFLECT_MISSILES] = 100;

[7.637905]

[8.292]

    _increase_duration(DUR_DEFLECT_MISSILES, 15 + random2(pow), 100,
                       "You feel very safe from missiles.");

Deletion in crawl-ref/source/spells1.cc at line 1318 [7.616635]
B:BD[7.638199] → [7.638199:638231]
```
    //if (pow > 150) pow = 150;
```
Deletion in crawl-ref/source/spells1.cc at line 1319 [7.616635]
B:BD[7.638261] → [7.638261:638333]
```
    you.duration[DUR_REGENERATION] += 5 + roll_dice( 2, pow / 3 + 1 );
```

Replacement in crawl-ref/source/spells1.cc at line 1320 [7.616635]

B:BD[7.638334] → [7.638334:638426]

    if (you.duration[DUR_REGENERATION] > 100)
        you.duration[DUR_REGENERATION] = 100;

[7.638334]

[8.295]

    _increase_duration(DUR_REGENERATION, 5 + roll_dice(2, pow / 3 + 1), 100,
                       "Your skin crawls.");

Deletion in crawl-ref/source/spells1.cc at line 1344 [7.616635]

B:BD[7.639047] → [7.639047:639179]


    // Reduced the duration:  -- bwr
    // dur_incr = random2(power) + random2(power) + 20;
    dur_incr = 20 + random2( power );

Replacement in crawl-ref/source/spells1.cc at line 1347 [7.616635]

∅:D[4.278] → [9.159284:159312]

B:BD[9.159284] → [9.159284:159312]

∅:D[9.159312] → [7.639383:639539]

B:BD[7.639383] → [7.639383:639539]

    mpr("You feel quick.");
    if (dur_incr + you.duration[DUR_SWIFTNESS] > 100)
        you.duration[DUR_SWIFTNESS] = 100;
    else
        you.duration[DUR_SWIFTNESS] += dur_incr;

[4.278]

[5.423]

    _increase_duration(DUR_SWIFTNESS, 20 + random2(power), 100,
                       "You feel quick.");

Deletion in crawl-ref/source/spells1.cc at line 1354 [7.616635]
∅:D[10.450] → [7.639682:639683]
B:BD[7.639682] → [7.639682:639683]

Replacement in crawl-ref/source/spells1.cc at line 1356 [7.616635]

B:BD[7.639806] → [11.2870:2927]

    if (you.duration[DUR_LEVITATION] + dur_change > 100)

[7.639806]

[11.2927]

    you.duration[DUR_LEVITATION] += dur_change;
    if (you.duration[DUR_LEVITATION] > 100)

Deletion in crawl-ref/source/spells1.cc at line 1359 [7.616635]
∅:D[11.2971] → [7.639879:639888]
B:BD[7.639879] → [7.639879:639888]
B:BD[7.639888] → [11.2972:3024]
```
    else
        you.duration[DUR_LEVITATION] += dur_change;
```

Replacement in crawl-ref/source/spells1.cc at line 1360 [7.616635]

B:BD[7.639927] → [7.639927:639991]

    if (you.duration[DUR_CONTROLLED_FLIGHT] + dur_change > 100)

[7.639927]

[7.639991]

    you.duration[DUR_CONTROLLED_FLIGHT] += dur_change;
    if (you.duration[DUR_CONTROLLED_FLIGHT] > 100)

Deletion in crawl-ref/source/spells1.cc at line 1363 [7.616635]
B:BD[7.640042] → [7.640042:640110]
```
    else
        you.duration[DUR_CONTROLLED_FLIGHT] += dur_change;
```

Replacement in crawl-ref/source/spells1.cc at line 1379 [7.616635]

B:BD[7.640282] → [7.640282:640514]

    int dur_incr = 10 + random2(power);
    mpr("You feel insulated.");
    if (dur_incr + you.duration[DUR_INSULATION] > 100)
        you.duration[DUR_INSULATION] = 100;
    else
        you.duration[DUR_INSULATION] += dur_incr;

[7.640282]

[8.301]

    _increase_duration(DUR_INSULATION, 10 + random2(power), 100,
                       "You feel insulated.");

Replacement in crawl-ref/source/spells1.cc at line 1385 [7.616635]

B:BD[7.640609] → [7.640609:640860]

    int dur_incr = 10 + random2(power);
    mpr("You feel resistant to poison.");
    if (dur_incr + you.duration[DUR_RESIST_POISON] > 100)
        you.duration[DUR_RESIST_POISON] = 100;
    else
        you.duration[DUR_RESIST_POISON] += dur_incr;

[7.640609]

[8.304]

    _increase_duration(DUR_RESIST_POISON, 10 + random2(power), 100,
                       "You feel resistant to poison.");

Replacement in crawl-ref/source/spells1.cc at line 1391 [7.616635]

B:BD[7.640961] → [7.640961:641001]

B:BD[7.641099] → [7.641099:641309]

    int dur_incr = 10 + random2(power);
    mpr("You feel in control.");
    if (dur_incr + you.duration[DUR_CONTROL_TELEPORT] >= 50)
        you.duration[DUR_CONTROL_TELEPORT] = 50;
    else
        you.duration[DUR_CONTROL_TELEPORT] += dur_incr;

[7.640961]

[8.307]

    _increase_duration(DUR_CONTROLLED_FLIGHT, 10 + random2(power), 50,
                       "You feel in control.");

Replacement in crawl-ref/source/spells1.cc at line 1397 [7.616635]

B:BD[7.641411] → [11.3025:3103]

∅:D[11.3103] → [7.641475:641476]

B:BD[7.641475] → [7.641475:641476]

B:BD[7.641476] → [11.3104:3192]

∅:D[11.3192] → [7.641536:641587]

B:BD[7.641536] → [7.641536:641587]

    you.duration[DUR_FIRE_SHIELD] += 5 + (power / 10) + (random2(power) / 5);
    if (you.duration[DUR_FIRE_SHIELD] > 50)
        you.duration[DUR_FIRE_SHIELD] = 50;
    mpr("The air around you leaps into flame!");

[7.641411]

[7.641587]

    _increase_duration(DUR_FIRE_SHIELD, 
                       5 + (power / 10) + (random2(power) / 5), 50,
                       "The air around you leaps into flame!");

Deletion in crawl-ref/source/spells1.cc at line 1408 [7.616635]
∅:D[2.267] → [7.641852:641853]
∅:D[11.3283] → [7.641852:641853]
∅:D[12.3612] → [7.641852:641853]
∅:D[13.7696] → [7.641852:641853]
B:BD[7.641852] → [7.641852:641853]
B:BD[7.641853] → [11.3284:3351]
```
    you.duration[DUR_CONFUSING_TOUCH] += 5 + (random2(power) / 5);
```

Replacement in crawl-ref/source/spells1.cc at line 1409 [7.616635]

B:BD[7.641926] → [11.3352:3448]

    if (you.duration[DUR_CONFUSING_TOUCH] > 50)
        you.duration[DUR_CONFUSING_TOUCH] = 50;

[7.641926]

[7.641994]

    _increase_duration(DUR_CONFUSING_TOUCH, 5 + (random2(power) / 5), 50, NULL);

Deletion in crawl-ref/source/spells1.cc at line 1430 [7.616635]
B:BD[7.642595] → [7.642595:642596]
B:BD[7.642596] → [11.3546:3613]
∅:D[11.3613] → [7.642649:642650]
B:BD[7.642649] → [7.642649:642650]
B:BD[7.642650] → [11.3614:3708]
```
        you.duration[DUR_SURE_BLADE] += 8 + (random2(power) / 10);
        if (you.duration[DUR_SURE_BLADE] > 25)
            you.duration[DUR_SURE_BLADE] = 25;
```

Insertion in crawl-ref/source/spells1.cc at line 1431 [7.616635]

[7.642717]

        _increase_duration(DUR_SURE_BLADE, 8 + (random2(power) / 10), 25, NULL);