fiddlerwoaroof/crawl - Change CCVMHSW2XB6RY3B6QRISMTF36QZ5ZA2VW2IFO7EBFUL4EKJ6HWDQC

Redo potions of magic again. They are now effectively potions of heal wounds

for MP; there is never any max-MP gain. Classes no longer influence max MP. Instead, you get an extra MP point for each level of Spellcasting between 1 and 5. (This might be too good.) Invocations does not get this boost.

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

Created by haranp on February 8, 2009

CCVMHSW2XB6RY3B6QRISMTF36QZ5ZA2VW2IFO7EBFUL4EKJ6HWDQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/skills2.cc at line 2155 [5.647133]
∅:D[4.378] → [5.738834:738835]
∅:D[6.681] → [5.738834:738835]
B:BD[5.738834] → [5.738834:738835]
Replacement in crawl-ref/source/skills2.cc at line 2156 [5.647133]
B:BD[5.738980] → [5.738980:739019]
```
    deflate_hp( you.hp_max, false );
```
[5.738980]
[5.739019]
```
    deflate_hp(you.hp_max, false);
```
Replacement in crawl-ref/source/skills2.cc at line 2158 [5.647133]
B:BD[5.739038] → [5.739038:739087]
```
}                               // end calc_hp()
```
[5.739038]
[5.739088]
```
}
```
Replacement in crawl-ref/source/skills2.cc at line 2162 [5.647133]
B:BD[5.739109] → [5.739109:739122]
```
    int enp;
```
[5.739109]
[5.739122]
```
    // base_magic_points2 accounts for species
    int enp = (you.base_magic_points2 - 5000);
```

Replacement in crawl-ref/source/skills2.cc at line 2165 [5.647133]

B:BD[5.739123] → [5.739123:739231]

    // base_magic_points2 accounts for species and magic potions
    enp = (you.base_magic_points2 - 5000);

[5.739123]

[5.739231]

    // You get 1 bonus MP for each of the first five levels of Spellcasting.
    int spell_extra = (you.experience_level * you.skills[SK_SPELLCASTING]) / 4
        + std::min<int>(you.skills[SK_SPELLCASTING], 5);

Deletion in crawl-ref/source/skills2.cc at line 2169 [5.647133]
B:BD[5.739232] → [5.739232:739312]
```
    int spell_extra = (you.experience_level * you.skills[SK_SPELLCASTING]) / 4;
```
Replacement in crawl-ref/source/skills2.cc at line 2171 [5.647133]
B:BD[5.739470] → [7.2511:2546]
∅:D[7.2546] → [5.739534:739562]
∅:D[8.164129] → [5.739534:739562]
B:BD[5.739534] → [5.739534:739562]
B:BD[5.739562] → [8.164130:164139]
∅:D[8.164139] → [5.739601:739629]
B:BD[5.739601] → [5.739601:739629]
```
    if (spell_extra > invoc_extra)
        enp += spell_extra;
    else
        enp += invoc_extra;
```
[5.739470]
[5.739665]
```
    enp += std::max(spell_extra, invoc_extra);
```
Replacement in crawl-ref/source/skills2.cc at line 2205 [5.647133]
B:BD[5.740575] → [5.740575:740624]
```
}                               // end calc_mp()
```
[5.740575]
[5.740624]
```
}
```
Deletion in crawl-ref/source/shopping.cc at line 1341 [5.759950]
B:BD[5.787873] → [5.787873:787927]
```
                valued += 120;
                break;
```
Deletion in crawl-ref/source/newgame.cc at line 2786 [5.1132300]
B:BD[5.1177676] → [5.1177676:1177704]
```
    int mp = 0;  // MP base
```

Replacement in crawl-ref/source/newgame.cc at line 2790 [5.1132300]

B:BD[5.1177807] → [5.1177807:1178127]

    case JOB_FIGHTER:           s =  7; i =  0; d =  3; hp = 15; mp = 0; break;
    case JOB_BERSERKER:         s =  7; i = -1; d =  4; hp = 15; mp = 0; break;
    case JOB_GLADIATOR:         s =  6; i =  0; d =  4; hp = 14; mp = 0; break;
    case JOB_PALADIN:           s =  6; i =  2; d =  2; hp = 14; mp = 0; break;

[5.1177807]

[5.1178127]

    case JOB_FIGHTER:           s =  7; i =  0; d =  3; hp = 15; break;
    case JOB_BERSERKER:         s =  7; i = -1; d =  4; hp = 15; break;
    case JOB_GLADIATOR:         s =  6; i =  0; d =  4; hp = 14; break;
    case JOB_PALADIN:           s =  6; i =  2; d =  2; hp = 14; break;

Replacement in crawl-ref/source/newgame.cc at line 2795 [5.1132300]

B:BD[5.1178128] → [5.1178128:1178368]

    case JOB_CRUSADER:          s =  4; i =  3; d =  3; hp = 13; mp = 1; break;
    case JOB_DEATH_KNIGHT:      s =  4; i =  3; d =  3; hp = 13; mp = 1; break;
    case JOB_CHAOS_KNIGHT:      s =  4; i =  3; d =  3; hp = 13; mp = 1; break;

[5.1178128]

[5.1178368]

    case JOB_CRUSADER:          s =  4; i =  3; d =  3; hp = 13; break;
    case JOB_DEATH_KNIGHT:      s =  4; i =  3; d =  3; hp = 13; break;
    case JOB_CHAOS_KNIGHT:      s =  4; i =  3; d =  3; hp = 13; break;

Replacement in crawl-ref/source/newgame.cc at line 2799 [5.1132300]

B:BD[5.1178369] → [5.1178369:1178609]

    case JOB_REAVER:            s =  4; i =  4; d =  2; hp = 13; mp = 1; break;
    case JOB_HEALER:            s =  4; i =  4; d =  2; hp = 13; mp = 1; break;
    case JOB_PRIEST:            s =  4; i =  4; d =  2; hp = 12; mp = 1; break;

[5.1178369]

[5.1178609]

    case JOB_REAVER:            s =  4; i =  4; d =  2; hp = 13; break;
    case JOB_HEALER:            s =  4; i =  4; d =  2; hp = 13; break;
    case JOB_PRIEST:            s =  4; i =  4; d =  2; hp = 12; break;

Replacement in crawl-ref/source/newgame.cc at line 2803 [5.1132300]

B:BD[5.1178610] → [5.1178610:1178850]

    case JOB_ASSASSIN:          s =  2; i =  2; d =  6; hp = 12; mp = 0; break;
    case JOB_THIEF:             s =  3; i =  2; d =  5; hp = 13; mp = 0; break;
    case JOB_STALKER:           s =  2; i =  3; d =  5; hp = 12; mp = 1; break;

[5.1178610]

[5.1178850]

    case JOB_ASSASSIN:          s =  2; i =  2; d =  6; hp = 12; break;
    case JOB_THIEF:             s =  3; i =  2; d =  5; hp = 13; break;
    case JOB_STALKER:           s =  2; i =  3; d =  5; hp = 12; break;

Replacement in crawl-ref/source/newgame.cc at line 2807 [5.1132300]

B:BD[5.1178851] → [5.1178851:1179011]

    case JOB_HUNTER:            s =  3; i =  3; d =  4; hp = 13; mp = 0; break;
    case JOB_WARPER:            s =  3; i =  4; d =  3; hp = 12; mp = 1; break;

[5.1178851]

[5.1179011]

    case JOB_HUNTER:            s =  3; i =  3; d =  4; hp = 13; break;
    case JOB_WARPER:            s =  3; i =  4; d =  3; hp = 12; break;

Replacement in crawl-ref/source/newgame.cc at line 2810 [5.1132300]

B:BD[5.1179012] → [5.1179012:1179172]

    case JOB_MONK:              s =  2; i =  2; d =  6; hp = 13; mp = 0; break;
    case JOB_TRANSMUTER:        s =  2; i =  4; d =  4; hp = 12; mp = 1; break;

[5.1179012]

[5.1179172]

    case JOB_MONK:              s =  2; i =  2; d =  6; hp = 13; break;
    case JOB_TRANSMUTER:        s =  2; i =  4; d =  4; hp = 12; break;

Replacement in crawl-ref/source/newgame.cc at line 2813 [5.1132300]

B:BD[5.1179173] → [5.1179173:1179973]

    case JOB_WIZARD:            s = -1; i =  8; d =  3; hp =  8; mp = 5; break;
    case JOB_CONJURER:          s =  0; i =  6; d =  4; hp = 10; mp = 3; break;
    case JOB_ENCHANTER:         s =  0; i =  6; d =  4; hp = 10; mp = 3; break;
    case JOB_FIRE_ELEMENTALIST: s =  0; i =  6; d =  4; hp = 10; mp = 3; break;
    case JOB_ICE_ELEMENTALIST:  s =  0; i =  6; d =  4; hp = 10; mp = 3; break;
    case JOB_AIR_ELEMENTALIST:  s =  0; i =  6; d =  4; hp = 10; mp = 3; break;
    case JOB_EARTH_ELEMENTALIST:s =  0; i =  6; d =  4; hp = 10; mp = 3; break;
    case JOB_SUMMONER:          s =  0; i =  6; d =  4; hp = 10; mp = 3; break;
    case JOB_VENOM_MAGE:        s =  0; i =  6; d =  4; hp = 10; mp = 3; break;
    case JOB_NECROMANCER:       s =  0; i =  6; d =  4; hp = 10; mp = 3; break;

[5.1179173]

[5.1179973]

    case JOB_WIZARD:            s = -1; i =  8; d =  3; hp =  8; break;
    case JOB_CONJURER:          s =  0; i =  6; d =  4; hp = 10; break;
    case JOB_ENCHANTER:         s =  0; i =  6; d =  4; hp = 10; break;
    case JOB_FIRE_ELEMENTALIST: s =  0; i =  6; d =  4; hp = 10; break;
    case JOB_ICE_ELEMENTALIST:  s =  0; i =  6; d =  4; hp = 10; break;
    case JOB_AIR_ELEMENTALIST:  s =  0; i =  6; d =  4; hp = 10; break;
    case JOB_EARTH_ELEMENTALIST:s =  0; i =  6; d =  4; hp = 10; break;
    case JOB_SUMMONER:          s =  0; i =  6; d =  4; hp = 10; break;
    case JOB_VENOM_MAGE:        s =  0; i =  6; d =  4; hp = 10; break;
    case JOB_NECROMANCER:       s =  0; i =  6; d =  4; hp = 10; break;

Replacement in crawl-ref/source/newgame.cc at line 2824 [5.1132300]

B:BD[5.1179974] → [5.1179974:1180054]

    case JOB_WANDERER:          s =  2; i =  2; d =  2; hp = 11; mp = 1; break;

[5.1179974]

[9.3222]

    case JOB_WANDERER:          s =  2; i =  2; d =  2; hp = 11; break;

Replacement in crawl-ref/source/newgame.cc at line 2826 [5.1132300]

B:BD[9.3223] → [10.2579:2659]

∅:D[10.2659] → [5.1180054:1180134]

∅:D[9.3303] → [5.1180054:1180134]

B:BD[5.1180054] → [5.1180054:1180134]

    case JOB_ARTIFICER:         s =  2; i =  3; d =  4; hp = 13; mp = 0; break;
    default:                    s =  0; i =  0; d =  0; hp = 10; mp = 0; break;

[9.3223]

[5.1180134]

    case JOB_ARTIFICER:         s =  2; i =  3; d =  4; hp = 13; break;
    default:                    s =  0; i =  0; d =  0; hp = 10; break;

Replacement in crawl-ref/source/newgame.cc at line 2832 [5.1132300]
B:BD[5.1180175] → [5.1180175:1180223]
```
    set_hp( hp, true );
    set_mp( mp, true );
```
[5.1180175]
[5.1180223]
```
    set_hp(hp, true);
    set_mp(0, true);
```

Replacement in crawl-ref/source/makeitem.cc at line 2336 [12.927]

B:BD[11.42192] → [11.42192:42251]

                                            14, POT_MAGIC,

[11.42192]

[2.2666]

                                            140, POT_MAGIC,

Replacement in crawl-ref/source/it_use2.cc at line 304 [5.2904329]
B:BD[5.2910684] → [13.2711:2786]
∅:D[13.2786] → [5.2910763:2910764]
∅:D[14.4844] → [5.2910763:2910764]
B:BD[5.2910763] → [5.2910763:2910764]
B:BD[5.2910764] → [3.2717:2748]
∅:D[3.2748] → [13.2819:2959]
B:BD[13.2819] → [13.2819:2959]
∅:D[13.2959] → [5.2910869:2910879]
B:BD[5.2910869] → [5.2910869:2910879]
B:BD[5.2910879] → [13.2960:2998]
∅:D[13.2998] → [5.2911026:2911036]
∅:D[15.4451] → [5.2911026:2911036]
B:BD[5.2911026] → [5.2911026:2911036]
```
        // Restore all MP
        you.magic_points = you.max_magic_points;
        // Sometimes boost max
        if (one_chance_in(3))
        {
            mpr("You feel extremely magical!");
            inc_mp(1, true);
        }
        else
        {
            mpr("You feel magical!");
        }
```
[5.2910684]
[13.2999]
```
        inc_mp((10 + random2avg(28, 3)), false);
        mpr("Magic courses through your body.");
```

Replacement in crawl-ref/source/decks.cc at line 2034 [5.3987460]

∅:D[16.18419] → [17.24334:24359]

B:BD[17.24334] → [17.24334:24359]

        pot = POT_MAGIC;

[16.18419]

[5.4002818]

    {
        // +1 to a random stat.
        const potion_type gain_stat_pots[] = {
            POT_GAIN_STRENGTH, POT_GAIN_DEXTERITY, POT_GAIN_INTELLIGENCE
        };
        pot = RANDOM_ELEMENT(gain_stat_pots);
    }

Redo potions of magic again. They are now effectively potions of heal wounds

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/skills2.cc at line 2155 [5.647133]

Replacement in crawl-ref/source/skills2.cc at line 2156 [5.647133]

Replacement in crawl-ref/source/skills2.cc at line 2158 [5.647133]

Replacement in crawl-ref/source/skills2.cc at line 2162 [5.647133]

Replacement in crawl-ref/source/skills2.cc at line 2165 [5.647133]

Deletion in crawl-ref/source/skills2.cc at line 2169 [5.647133]

Replacement in crawl-ref/source/skills2.cc at line 2171 [5.647133]

Replacement in crawl-ref/source/skills2.cc at line 2205 [5.647133]

Deletion in crawl-ref/source/shopping.cc at line 1341 [5.759950]

Deletion in crawl-ref/source/newgame.cc at line 2786 [5.1132300]