fiddlerwoaroof/crawl - Change 5HBRQ2QZTFBQE2Z2CFADUI2D52LO5Z5CNHXHA7BJP3LGO7FJPUCQC

Another one with a multitude of (smallish) changes.

Fixed 1788033, 1787436, 1782862.
Modified basename, so it's a bit more useful and it's seeing use when not switching back during butcher.
Mummy Wanderers won't get a potion.
NOTE_XP_LEVEL_CHANGE notes "real" hp/mp.

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

Created by j-p-e-g on September 4, 2007

5HBRQ2QZTFBQE2Z2CFADUI2D52LO5Z5CNHXHA7BJP3LGO7FJPUCQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spells3.cc at line 485 [4.531613]
[3.147429]
[4.545218]
```
    burden_change();
```
Replacement in crawl-ref/source/skills2.h at line 58 [4.643583]
B:BD[4.645693] → [4.645693:645712]
```
int calc_mp(void);
```
[4.645693]
[4.645712]
```
int calc_mp(bool real_mp = false);
```
Replacement in crawl-ref/source/skills2.h at line 66 [4.643583]
B:BD[4.646036] → [4.646036:646055]
```
int calc_hp(void);
```
[4.646036]
[4.646055]
```
int calc_hp(bool real_hp = false);
```
Replacement in crawl-ref/source/skills2.cc at line 2173 [4.647133]
B:BD[4.738189] → [4.738189:738207]
```
int calc_hp(void)
```
[4.738189]
[4.738207]
```
int calc_hp(bool real_hp)
```
Replacement in crawl-ref/source/skills2.cc at line 2181 [4.647133]
B:BD[4.738418] → [5.3790:3827]
```
    if (you.duration[DUR_BERSERKER])
```
[4.738418]
[4.738441]
```
    if (you.duration[DUR_BERSERKER] && !real_hp)
```
Replacement in crawl-ref/source/skills2.cc at line 2188 [4.647133]
B:BD[4.738540] → [4.738540:738588]
```
    switch (you.attribute[ATTR_TRANSFORMATION])
```
[4.738540]
[4.738588]
```
    switch (you.attribute[ATTR_TRANSFORMATION] && !real_hp)
```
Replacement in crawl-ref/source/skills2.cc at line 2216 [4.647133]
B:BD[4.739089] → [4.739089:739107]
```
int calc_mp(void)
```
[4.739089]
[4.739107]
```
int calc_mp(bool real_mp)
```

Replacement in crawl-ref/source/skills2.cc at line 2243 [4.647133]

B:BD[4.740178] → [4.740178:740230]

    you.max_magic_points += player_magical_power();

[4.740178]

[4.740230]

    if (!real_mp)
        you.max_magic_points += player_magical_power();

Insertion in crawl-ref/source/player.cc at line 3011 [4.962854]

[4.1026579]

        if (Options.use_notes)
        {
            // calculate "real" values for note-taking, i.e. ignore Berserk,
            // transformations or equipped items
            calc_hp(true);
            calc_mp(true);
            char buf[200];
            sprintf(buf, "HP: %d/%d MP: %d/%d",
                    you.hp, you.hp_max, you.magic_points, you.max_magic_points);
            take_note(Note(NOTE_XP_LEVEL_CHANGE, you.experience_level, 0, buf));
        }
        // recalculate for game

Deletion in crawl-ref/source/player.cc at line 3029 [4.962854]

B:BD[4.1026718] → [6.4006:4236]

        
        char buf[200];
        sprintf(buf, "HP: %d/%d MP: %d/%d",
                you.hp, you.hp_max, you.magic_points, you.max_magic_points);
        take_note(Note(NOTE_XP_LEVEL_CHANGE, you.experience_level, 0, buf));

Insertion in crawl-ref/source/newgame.cc at line 2871 [4.1132300]

[4.1205922]

    
    if (you.species == SP_MUMMY)
        you.inv[3].quantity = 0; // remove potion

Replacement in crawl-ref/source/itemname.cc at line 1022 [4.2667494]
∅:D[7.3973] → [4.2688844:2688845]
∅:D[8.4164] → [4.2688844:2688845]
∅:D[9.14965] → [4.2688844:2688845]
B:BD[4.2688844] → [4.2688844:2688845]
B:BD[4.2688845] → [8.4165:4208]
```
            buff << item_base_name(*this);
```
[8.4164]
[8.4208]
```
        }
        buff << item_base_name(*this);
            
        if (!basename)
        {
```

Insertion in crawl-ref/source/itemname.cc at line 1158 [4.2667494]

[4.2700583]

[10.5980]

        if (basename)
        {
            buff << "wand";
            break;
        }

Insertion in crawl-ref/source/itemname.cc at line 1185 [4.2667494]

[4.2704455]

[10.6030]

        if (basename)
        {
            buff << "potion";
            break;
        }

Replacement in crawl-ref/source/itemname.cc at line 1264 [4.2667494]

B:BD[4.2711403] → [8.5493:5520]

        buff << "scroll ";

[4.2711403]

[4.2711520]

        buff << "scroll";
        if (basename)
            break;
        else
            buff << " ";

Replacement in crawl-ref/source/itemname.cc at line 1288 [4.2667494]
B:BD[2.2843] → [2.2843:2878]
```
                buff << " amulet";
```
[2.2843]
[2.2878]
```
                buff << "amulet";
```
Replacement in crawl-ref/source/itemname.cc at line 1290 [4.2667494]
B:BD[2.2929] → [2.2929:2962]
```
                buff << " ring";
```
[2.2929]
[2.2962]
```
                buff << "ring";
```

Insertion in crawl-ref/source/itemname.cc at line 1363 [4.2667494]

[11.4046]

                if (basename)
                {
                    buff << "deck of cards";
                    break;
                }

Replacement in crawl-ref/source/itemname.cc at line 1405 [4.2667494]

B:BD[4.2738436] → [12.34193:34318]

            buff << staff_primary_string(this->special) << " "
                 << (item_is_rod( *this ) ? "rod" : "staff");

[4.2738436]

[12.34318]

            if (!basename)
                buff << staff_primary_string(this->special) << " ";
                
            buff << (item_is_rod( *this ) ? "rod" : "staff");

Replacement in crawl-ref/source/itemname.cc at line 1415 [4.2667494]
B:BD[4.2740199] → [12.34467:34503]
```
            if (item_is_rod(*this))
```
[4.2740199]
[12.34503]
```
            if (item_is_rod(*this) && !basename)
```

Replacement in crawl-ref/source/item_use.cc at line 1144 [4.2781507]

B:BD[13.520] → [13.520:637]

        if ((fire_type & FIRE_STONE)
            && (item.sub_type == MI_STONE || item.sub_type == MI_SLING_BULLET))

[13.520]

[13.637]

        if ((fire_type & FIRE_STONE) && item.sub_type == MI_STONE)

Replacement in crawl-ref/source/delay.cc at line 161 [4.3963459]
∅:D[3.995689] → [4.3964933:3964934]
B:BD[4.3964933] → [4.3964933:3964934]
[3.995689]
[4.3964980]
```
    
```

Replacement in crawl-ref/source/delay.cc at line 167 [4.3963459]

B:BD[14.875] → [14.875:1012]

            mpr("You stop butchering the corpse; not switching back to "
                "primary weapon.",
                MSGCH_WARN);

[14.875]

[14.1012]

        {
            int swapwpn = you.delay_queue[1].parm1;
            mprf(MSGCH_WARN, "You stop butchering the corpse; not switching "
                 "back to your %s.",
                 you.inv[swapwpn].name(DESC_BASENAME).c_str());
        }

Replacement in crawl-ref/source/abl-show.cc at line 175 [4.4494389]

B:BD[4.4497543] → [3.1282472:1282538]

    { ABIL_SPIT_ACID, "Spit Acid", 0, 0, 125, 0, ABFLAG_BREATH },

[4.4497543]

[4.4497679]

    { ABIL_SPIT_ACID, "Spit Acid", 0, 0, 125, 0, ABFLAG_NONE },

Another one with a multitude of (smallish) changes.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/spells3.cc at line 485 [4.531613]

Replacement in crawl-ref/source/skills2.h at line 58 [4.643583]

Replacement in crawl-ref/source/skills2.h at line 66 [4.643583]

Replacement in crawl-ref/source/skills2.cc at line 2173 [4.647133]

Replacement in crawl-ref/source/skills2.cc at line 2181 [4.647133]

Replacement in crawl-ref/source/skills2.cc at line 2188 [4.647133]

Replacement in crawl-ref/source/skills2.cc at line 2216 [4.647133]