fiddlerwoaroof/crawl - Change CCBZCRRBI5MJA7BXOMCIDO7B7OCXWEWYLEG3IE4XFZGLEF36OMYQC

For [2615112], add a hook for portal vault levels to override the

default extension (ptl) for ghost filenames. This currently has no effect, as I don't know how to hook in Lua code; can someone who knows this better put in code to allow .des files to override this extension? [The idea is to give "suffix" a good value in _make_ghost_filename().]

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

Created by haranp on February 19, 2009

CCBZCRRBI5MJA7BXOMCIDO7B7OCXWEWYLEG3IE4XFZGLEF36OMYQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/monstuff.cc at line 6897 [4.1396662]
B:BD[4.1506505] → [5.428798:428821]
∅:D[5.428866] → [4.1506576:1506577]
B:BD[4.1506576] → [4.1506576:1506577]
```
    bool brkk = false;
```
Deletion in crawl-ref/source/monstuff.cc at line 7169 [4.1396662]
∅:D[6.4580] → [4.1510532:1510533]
∅:D[7.7848] → [4.1510532:1510533]
∅:D[5.433240] → [4.1510532:1510533]
B:BD[4.1510532] → [4.1510532:1510533]
B:BD[4.1510533] → [6.4581:4607]
```
            brkk = false;
```
Deletion in crawl-ref/source/monstuff.cc at line 7190 [4.1396662]
B:BD[8.9213] → [8.9213:9250]
```
                        brkk = true;
```
Insertion in crawl-ref/source/monstuff.cc at line 7192 [4.1396662]
[8.9384]
[8.9384]
```
                        continue;
```
Deletion in crawl-ref/source/monstuff.cc at line 7207 [4.1396662]
∅:D[6.6557] → [4.1512168:1512169]
∅:D[8.10428] → [4.1512168:1512169]
∅:D[5.434323] → [4.1512168:1512169]
B:BD[4.1512168] → [4.1512168:1512169]
B:BD[4.1512169] → [8.10429:10477]
```
            if (brkk)
                continue;
```
Deletion in crawl-ref/source/monstuff.cc at line 7302 [4.1396662]
∅:D[9.29275] → [6.7445:7478]
B:BD[6.7445] → [6.7445:7478]
```
                    brkk = true;
```
Insertion in crawl-ref/source/monstuff.cc at line 7303 [4.1396662]
[10.5584]
[5.436217]
```
                    continue;
```
Deletion in crawl-ref/source/monstuff.cc at line 7307 [4.1396662]
B:BD[4.1514763] → [6.7479:7527]
∅:D[6.7527] → [4.1514857:1514858]
∅:D[5.436386] → [4.1514857:1514858]
B:BD[4.1514857] → [4.1514857:1514858]
```
            if (brkk)
                continue;
```
Insertion in crawl-ref/source/it_use3.cc at line 14 [4.2870456]
[4.2870961]
[11.428]
```
#include <algorithm>
```

Replacement in crawl-ref/source/it_use3.cc at line 65 [4.2870456]

B:BD[4.2871748] → [4.2871748:2871929]

B:BD[4.2871929] → [12.727:757]

    const int wpn = you.equip[EQ_WEAPON];
    const int old_plus = you.inv[wpn].plus;
    const int old_plus2 = you.inv[wpn].plus2;
    const char old_colour = you.inv[wpn].colour;
    bool makes_noise = false;

[4.2871748]

[4.2872116]

    item_def&  weapon     = *you.weapon();
    const int  old_plus   = weapon.plus;
    const int  old_plus2  = weapon.plus2;
    const char old_colour = weapon.colour;

Replacement in crawl-ref/source/it_use3.cc at line 75 [4.2870456]
B:BD[12.786] → [2.7986:8053]
∅:D[2.8053] → [13.29153:29154]
B:BD[12.864] → [13.29153:29154]
∅:D[12.875] → [4.2872175:2872200]
∅:D[13.29154] → [4.2872175:2872200]
B:BD[4.2872175] → [4.2872175:2872200]
```
        makes_noise = (one_chance_in(20) && !silenced(you.pos()));
        if (makes_noise)
```
[12.786]
[4.2872200]
```
        if (!silenced(you.pos()) && one_chance_in(20))
```

Replacement in crawl-ref/source/it_use3.cc at line 151 [4.2870456]

B:BD[14.2891] → [14.2891:2973]

            msg = replace_all(msg, "@weapon@", you.inv[wpn].name(DESC_BASENAME));

[14.2891]

[3.2514]

            msg = replace_all(msg, "@weapon@", weapon.name(DESC_BASENAME));

Replacement in crawl-ref/source/it_use3.cc at line 160 [4.2870456]
∅:D[14.3014] → [12.7130:7155]
B:BD[12.7130] → [12.7130:7155]
```
        } // makes_noise
```
[14.3014]
[4.2874415]
```
            noisy(25, you.pos());
        }
```
Replacement in crawl-ref/source/it_use3.cc at line 171 [4.2870456]
B:BD[4.2874618] → [4.2874618:2874659]
```
        do_uncurse_item( you.inv[wpn] );
```
[4.2874588]
[4.2874659]
```
        do_uncurse_item(weapon);
```

Replacement in crawl-ref/source/it_use3.cc at line 173 [4.2870456]

B:BD[4.2874660] → [15.7922:7979]

∅:D[15.7979] → [4.2874712:2874770]

B:BD[4.2874712] → [4.2874712:2874770]

        if (x_chance_in_y(2, 5))     // 40% chance {dlb}
            you.inv[wpn].plus  += (coinflip() ? +1 : -1);

[4.2874660]

[4.2874770]

        if (x_chance_in_y(2, 5))
            weapon.plus  += (coinflip() ? +1 : -1);

Replacement in crawl-ref/source/it_use3.cc at line 176 [4.2870456]

B:BD[4.2874771] → [15.7980:8037]

∅:D[15.8037] → [4.2874823:2874881]

B:BD[4.2874823] → [4.2874823:2874881]

        if (x_chance_in_y(2, 5))     // 40% chance {dlb}
            you.inv[wpn].plus2 += (coinflip() ? +1 : -1);

[4.2874771]

[4.2874881]

        if (x_chance_in_y(2, 5))
            weapon.plus2 += (coinflip() ? +1 : -1);

Replacement in crawl-ref/source/it_use3.cc at line 179 [4.2870456]

B:BD[4.2874882] → [4.2874882:2875031]

        if (you.inv[wpn].plus < -4)
            you.inv[wpn].plus = -4;
        else if (you.inv[wpn].plus > 16)
            you.inv[wpn].plus = 16;

[4.2874882]

[4.2875031]

        if (weapon.plus < -4)
            weapon.plus = -4;
        else if (weapon.plus > 16)
            weapon.plus = 16;

Replacement in crawl-ref/source/it_use3.cc at line 184 [4.2870456]

B:BD[4.2875032] → [4.2875032:2875185]

        if (you.inv[wpn].plus2 < -4)
            you.inv[wpn].plus2 = -4;
        else if (you.inv[wpn].plus2 > 16)
            you.inv[wpn].plus2 = 16;

[4.2875032]

[4.2875185]

        if (weapon.plus2 < -4)
            weapon.plus2 = -4;
        else if (weapon.plus2 > 16)
            weapon.plus2 = 16;

Replacement in crawl-ref/source/it_use3.cc at line 189 [4.2870456]
B:BD[4.2875186] → [4.2875186:2875233]
```
        you.inv[wpn].colour = random_colour();
```
[4.2875186]
[4.2875233]
```
        weapon.colour = random_colour();
```

Replacement in crawl-ref/source/it_use3.cc at line 209 [4.2870456]

B:BD[4.2875718] → [15.8038:8117]

∅:D[15.8117] → [4.2875826:2875874]

B:BD[4.2875826] → [4.2875826:2875874]

        you.inv[wpn].plus  = stepdown_value( -4 + (you.hp / 5), 4, 4, 4, 20 );
        you.inv[wpn].plus2 = you.inv[wpn].plus;

[4.2875718]

[4.2875874]

        weapon.plus  = stepdown_value( -4 + (you.hp / 5), 4, 4, 4, 20 );
        weapon.plus2 = weapon.plus;

Replacement in crawl-ref/source/it_use3.cc at line 216 [4.2870456]

B:BD[4.2876054] → [15.8118:8180]

∅:D[15.8180] → [4.2876115:2876163]

B:BD[4.2876115] → [4.2876115:2876163]

        you.inv[wpn].plus  = you.skills[SK_POISON_MAGIC] / 3;
        you.inv[wpn].plus2 = you.inv[wpn].plus;

[4.2876054]

[4.2876163]

        weapon.plus  = you.skills[SK_POISON_MAGIC] / 3;
        weapon.plus2 = weapon.plus;

Replacement in crawl-ref/source/it_use3.cc at line 221 [4.2870456]

B:BD[4.2876234] → [4.2876234:2876374]

        you.inv[wpn].plus  = ((you.intel > 25) ? 22 : you.intel - 3);
        you.inv[wpn].plus2 = ((you.intel > 25) ? 13 : you.intel / 2);

[4.2876204]

[4.2876374]

        weapon.plus  = std::min(you.intel - 3, 22);
        weapon.plus2 = std::min(you.intel / 2, 13);

Replacement in crawl-ref/source/it_use3.cc at line 239 [4.2870456]

B:BD[4.2877578] → [4.2877578:2877599]

B:BD[4.2877599] → [9.43448:43478]

∅:D[16.3874] → [4.2877642:2877770]

∅:D[9.43478] → [4.2877642:2877770]

B:BD[4.2877642] → [4.2877642:2877770]

    if (makes_noise)
        noisy(25, you.pos());
    if (old_plus != you.inv[wpn].plus
        || old_plus2 != you.inv[wpn].plus2
        || old_colour != you.inv[wpn].colour)

[4.2877578]

[4.2877770]

    if (old_plus != weapon.plus
        || old_plus2 != weapon.plus2
        || old_colour != weapon.colour)

Replacement in crawl-ref/source/it_use3.cc at line 245 [4.2870456]
B:BD[4.2877828] → [4.2877828:2877885]
```
}                               // end special_wielded()
```
[4.2877815]
[4.2877885]
```
}
```

Insertion in crawl-ref/source/files.cc at line 1541 [4.3084589]

[17.2248]

}
static std::string _make_ghost_filename()
{
    if (you.level_type == LEVEL_PORTAL_VAULT)
    {
        std::string suffix = "ptl";
        return get_savedir_filename("bones", "", suffix, true);
    }
    else
    {
        return make_filename("bones", you.your_level, you.where_are_you,
                             you.level_type, true);
    }

Replacement in crawl-ref/source/files.cc at line 1562 [4.3084589]

B:BD[4.3114501] → [5.871184:871308]

B:BD[5.871308] → [18.4450:4506]

∅:D[18.4506] → [5.871383:871431]

B:BD[5.871383] → [5.871383:871431]

∅:D[5.871431] → [4.3114635:3114636]

B:BD[4.3114635] → [4.3114635:3114636]

    std::string cha_fil = make_filename("bones", you.your_level,
                                        you.where_are_you,
                                        you.level_type,
                                        true );

[4.3114501]

[5.871432]

    const std::string cha_fil = _make_ghost_filename();

Replacement in crawl-ref/source/files.cc at line 1909 [4.3084589]

B:BD[4.3123228] → [5.873755:873881]

B:BD[5.873881] → [18.4507:4564]

∅:D[18.4564] → [5.873957:874006]

B:BD[5.873957] → [5.873957:874006]

∅:D[5.874006] → [4.3123362:3123363]

B:BD[4.3123362] → [4.3123362:3123363]

    std::string cha_fil = make_filename( "bones", you.your_level,
                                         you.where_are_you,
                                         you.level_type,
                                         true );

[4.3123228]

[5.874007]

    const std::string cha_fil = _make_ghost_filename();

For [2615112], add a hook for portal vault levels to override the

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/monstuff.cc at line 6897 [4.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 7169 [4.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 7190 [4.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 7192 [4.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 7207 [4.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 7302 [4.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 7303 [4.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 7307 [4.1396662]

Insertion in crawl-ref/source/it_use3.cc at line 14 [4.2870456]