fiddlerwoaroof/crawl - Change 2O3C3MTT2ZBYIFGPJ4MF5R4AXBYUHOEN62KAUWFWF6JWHIIVLRNQC

Some more Stealth changes.

(1) Use diminishing returns for passive training depending on skill level. Below skill level 2, chances are unchanged; at level 2 chances are 2/3 of that, and at level 3 at 1/3. From level 4 onwards, Stealth cannot be trained by waiting anymore.

(2) Active stealth training only has a 1% chance (instead of 5%) if you're sneaking around monsters while invisible (and the monster cannot see you).

Add yet another function for blood potions - I sure hope this works when I eventually get around to actually use them.

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

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

2O3C3MTT2ZBYIFGPJ4MF5R4AXBYUHOEN62KAUWFWF6JWHIIVLRNQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/view.cc at line 901 [6.16817]
[5.190]
[5.190]
```
    {
```
Insertion in crawl-ref/source/view.cc at line 903 [6.16817]
[5.206]
[5.206]
```
    }
```
Insertion in crawl-ref/source/view.cc at line 915 [6.16817]
[5.756]
[5.756]
```
    {
```
Insertion in crawl-ref/source/view.cc at line 917 [6.16817]
[5.772]
[5.772]
```
    }
```
Deletion in crawl-ref/source/view.cc at line 1234 [6.16817]
∅:D[7.295] → [6.47613:47619]
B:BD[6.47613] → [6.47613:47619]
```
    {
```
Deletion in crawl-ref/source/view.cc at line 1235 [6.16817]
B:BD[6.47642] → [6.47642:47648]
```
    }
```

Insertion in crawl-ref/source/view.cc at line 1239 [6.16817]

[8.133]

[6.47845]


    bool unnatural_stealthy = false; // "stealthy" only because of invisibility?

Insertion in crawl-ref/source/view.cc at line 1250 [6.16817]
[6.48239]
[6.48239]
```
    {
```
Insertion in crawl-ref/source/view.cc at line 1252 [6.16817]
[6.48264]
[6.48264]
```
        unnatural_stealthy = true;
    }
```
Replacement in crawl-ref/source/view.cc at line 1284 [6.16817]
B:BD[9.159] → [2.8:43]
```
    if (player_light_armour(true) 
```
[9.159]
[2.43]
```
    if (player_light_armour(true)
```

Replacement in crawl-ref/source/view.cc at line 1286 [6.16817]

B:BD[2.90] → [2.90:151]

	&& you.special_wield != SPWLD_SHADOW
	&& one_chance_in(20))

[2.90]

[2.151]

        && you.special_wield != SPWLD_SHADOW
        // if invisible, training happens much more rarely
        && (!unnatural_stealthy && one_chance_in(25) || one_chance_in(100)))

Replacement in crawl-ref/source/view.cc at line 1292 [6.16817]
∅:D[2.164] → [9.219:228]
B:BD[9.219] → [9.219:228]
```
        
```
[2.164]
[9.228]
Replacement in crawl-ref/source/view.cc at line 1298 [6.16817]
B:BD[10.11826] → [11.11094:11133]
```
    // Must avoid double setting it.  
```
[10.11826]
[11.11133]
```
    // Must avoid double setting it.
```
Replacement in crawl-ref/source/view.cc at line 1463 [6.16817]
B:BD[12.3896] → [12.3896:3941]
```
    env.show_col[ex][ey] = which_colour;    
```
[12.3896]
[13.1629]
```
    env.show_col[ex][ey] = which_colour;
```

Replacement in crawl-ref/source/view.cc at line 1466 [6.16817]

B:BD[13.1646] → [13.1646:1736]

    tile_place_cloud(ex, ey, env.cloud[cloudno].type, 
        env.cloud[cloudno].decay);

[13.1646]

[13.1736]

    tile_place_cloud(ex, ey, env.cloud[cloudno].type,
                     env.cloud[cloudno].decay);

Replacement in crawl-ref/source/misc.cc at line 205 [6.1933596]

B:BD[3.11434] → [3.11434:11530]

    ASSERT (blood.sub_type == POT_BLOOD
            || blood.sub_type == POT_BLOOD_COAGULATED);

[3.11434]

[3.11530]

    ASSERT(blood.sub_type == POT_BLOOD
           || blood.sub_type == POT_BLOOD_COAGULATED);

Replacement in crawl-ref/source/misc.cc at line 224 [6.1933596]
B:BD[3.12080] → [3.12080:12109]
```
    int size = timer.size();
```
[3.12080]
[3.12109]
```
    const int size = timer.size();
```

Replacement in crawl-ref/source/misc.cc at line 230 [6.1933596]

B:BD[3.12245] → [3.12245:12285]

        else if (coag_limit >= current)

[3.12245]

[3.12285]

        else if (blood.sub_type == POT_BLOOD && coag_limit >= current)

Replacement in crawl-ref/source/misc.cc at line 246 [6.1933596]
B:BD[3.12620] → [3.12620:12641]
```
    if (!coag_count)
```
[3.12620]
[3.12641]
```
    if (!coag_count) // some potions rotted away
```
Insertion in crawl-ref/source/misc.cc at line 263 [6.1933596]
[3.13119]
[3.13119]
```
            // merge with existing stack
```

Insertion in crawl-ref/source/misc.cc at line 278 [6.1933596]

[3.13616]

            inc_mitm_item_quantity(o, coag_count);
            ASSERT(timer2.size() == mitm[o].quantity);

Insertion in crawl-ref/source/misc.cc at line 285 [6.1933596]
[3.13750]
[3.13750]
```
    // If we got here nothing was found!
```

Replacement in crawl-ref/source/misc.cc at line 287 [6.1933596]

B:BD[3.13751] → [3.13751:13791]

    // if we got here nothing was found

[3.13751]

[3.13791]

    // entire stack is gone, rotted or coagulated.
    // -> change potions to coagulated type
    if (rot_count + coag_count == blood.quantity)
    {
        ASSERT(timer.empty());
        // update subtype
        blood.sub_type = POT_BLOOD_COAGULATED;
        item_colour(blood);
        // re-fill vector
        long val;
        while (!age_timer.empty())
        {
            val = age_timer[age_timer.size() - 1];
            age_timer.pop_back();
            timer.push_back(val);
        }
        dec_mitm_item_quantity(blood.link, rot_count);
        ASSERT(timer.size() == blood.quantity);
    }

Insertion in crawl-ref/source/misc.cc at line 340 [6.1933596]
[3.14762]
[3.14762]
```
    ASSERT(timer.size() == blood.quantity);
```

Replacement in crawl-ref/source/effects.cc at line 597 [6.3382105]

B:BD[6.3389026] → [11.937957:938020]

        ouch(damage_taken, pbolt.beam_source, KILLED_BY_BEAM,

[6.3389026]

[11.938020]

    {
        ouch(damage_taken, pbolt.beam_source, KILLED_BY_BEAM,

Insertion in crawl-ref/source/effects.cc at line 600 [6.3382105]
[11.938060]
[6.3389107]
```
    }
```
Insertion in crawl-ref/source/effects.cc at line 1460 [6.3382105]
[14.1320]
[4.2737]
```
        {
```
Replacement in crawl-ref/source/effects.cc at line 1463 [6.3382105]
B:BD[15.30247] → [16.7162:7163]
[15.30247]
[16.7163]
```
        }
```

Replacement in crawl-ref/source/effects.cc at line 2655 [6.3382105]

B:BD[17.18429] → [17.18429:18460]

        if (one_chance_in(18))

[17.18429]

[17.18460]

        // diminishing returns for Stealth training by waiting
        if (you.skills[SK_STEALTH] <= 2 + random2(3) && one_chance_in(18))

Some more Stealth changes.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/view.cc at line 901 [6.16817]

Insertion in crawl-ref/source/view.cc at line 903 [6.16817]

Insertion in crawl-ref/source/view.cc at line 915 [6.16817]

Insertion in crawl-ref/source/view.cc at line 917 [6.16817]

Deletion in crawl-ref/source/view.cc at line 1234 [6.16817]

Deletion in crawl-ref/source/view.cc at line 1235 [6.16817]

Insertion in crawl-ref/source/view.cc at line 1239 [6.16817]

Insertion in crawl-ref/source/view.cc at line 1250 [6.16817]

Insertion in crawl-ref/source/view.cc at line 1252 [6.16817]

Replacement in crawl-ref/source/view.cc at line 1284 [6.16817]

Replacement in crawl-ref/source/view.cc at line 1286 [6.16817]

Replacement in crawl-ref/source/view.cc at line 1292 [6.16817]

Replacement in crawl-ref/source/view.cc at line 1298 [6.16817]

Replacement in crawl-ref/source/view.cc at line 1463 [6.16817]

Replacement in crawl-ref/source/view.cc at line 1466 [6.16817]

Replacement in crawl-ref/source/misc.cc at line 205 [6.1933596]

Replacement in crawl-ref/source/misc.cc at line 224 [6.1933596]

Replacement in crawl-ref/source/misc.cc at line 230 [6.1933596]

Replacement in crawl-ref/source/misc.cc at line 246 [6.1933596]

Insertion in crawl-ref/source/misc.cc at line 263 [6.1933596]

Insertion in crawl-ref/source/misc.cc at line 278 [6.1933596]

Insertion in crawl-ref/source/misc.cc at line 285 [6.1933596]

Replacement in crawl-ref/source/misc.cc at line 287 [6.1933596]

Insertion in crawl-ref/source/misc.cc at line 340 [6.1933596]

Replacement in crawl-ref/source/effects.cc at line 597 [6.3382105]

Insertion in crawl-ref/source/effects.cc at line 600 [6.3382105]

Insertion in crawl-ref/source/effects.cc at line 1460 [6.3382105]

Replacement in crawl-ref/source/effects.cc at line 1463 [6.3382105]

Replacement in crawl-ref/source/effects.cc at line 2655 [6.3382105]