fiddlerwoaroof/crawl - Change I3GNXBIGS7FK6WL3ZSVPRM6FRICFU4FCIJQFK6VB4YLF2SBLGIXAC

Revert r8981, specifically the part which changed how max MP depends

on class and spellcasting (the !oMagic change is still in.)

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

Created by haranp on February 8, 2009

I3GNXBIGS7FK6WL3ZSVPRM6FRICFU4FCIJQFK6VB4YLF2SBLGIXAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/skills2.cc at line 2155 [4.647133]
[3.681]
[4.738957]
Replacement in crawl-ref/source/skills2.cc at line 2157 [4.647133]
B:BD[4.738980] → [2.281:316]
```
    deflate_hp(you.hp_max, false);
```
[4.738980]
[4.739019]
```
    deflate_hp( you.hp_max, false );
```
Replacement in crawl-ref/source/skills2.cc at line 2161 [4.647133]
B:BD[4.739038] → [2.317:319]
```
}
```
[4.739038]
[4.739088]
```
}                               // end calc_hp()
```

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

B:BD[4.739109] → [2.320:414]

    // base_magic_points2 accounts for species
    int enp = (you.base_magic_points2 - 5000);

[4.739109]

[4.739122]

    int enp;

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

B:BD[4.739123] → [2.415:628]

    // 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);

[4.739123]

[4.739231]

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

Insertion in crawl-ref/source/skills2.cc at line 2170 [4.647133]

[4.739232]

[4.739312]

    int spell_extra = (you.experience_level * you.skills[SK_SPELLCASTING]) / 4;

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

B:BD[4.739470] → [2.629:676]

    enp += std::max(spell_extra, invoc_extra);

[4.739470]

[4.739665]

    if (spell_extra > invoc_extra)
        enp += spell_extra;
    else
        enp += invoc_extra;

Replacement in crawl-ref/source/skills2.cc at line 2210 [4.647133]
B:BD[4.740575] → [2.677:679]
```
}
```
[4.740575]
[4.740624]
```
}                               // end calc_mp()
```
Insertion in crawl-ref/source/newgame.cc at line 2786 [4.1132300]
[4.1177676]
[4.1177704]
```
    int mp = 0;  // MP base
```

Replacement in crawl-ref/source/newgame.cc at line 2791 [4.1132300]

B:BD[4.1177807] → [2.3024:3312]

    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;

[4.1177807]

[4.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;

Replacement in crawl-ref/source/newgame.cc at line 2796 [4.1132300]

B:BD[4.1178128] → [2.3313:3529]

    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;

[4.1178128]

[4.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;

Replacement in crawl-ref/source/newgame.cc at line 2800 [4.1132300]

B:BD[4.1178369] → [2.3530:3746]

    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;

[4.1178369]

[4.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;

Replacement in crawl-ref/source/newgame.cc at line 2804 [4.1132300]

B:BD[4.1178610] → [2.3747:3963]

    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;

[4.1178610]

[4.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;

Replacement in crawl-ref/source/newgame.cc at line 2808 [4.1132300]

B:BD[4.1178851] → [2.3964:4108]

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

[4.1178851]

[4.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;

Replacement in crawl-ref/source/newgame.cc at line 2811 [4.1132300]

B:BD[4.1179012] → [2.4109:4253]

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

[4.1179012]

[4.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;

Replacement in crawl-ref/source/newgame.cc at line 2814 [4.1132300]

B:BD[4.1179173] → [2.4254:4974]

    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;

[4.1179173]

[4.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;

Replacement in crawl-ref/source/newgame.cc at line 2825 [4.1132300]

B:BD[4.1179974] → [2.4975:5047]

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

[4.1179974]

[5.3222]

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

Replacement in crawl-ref/source/newgame.cc at line 2827 [4.1132300]

B:BD[5.3223] → [2.5048:5192]

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

[5.3223]

[4.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;

Replacement in crawl-ref/source/newgame.cc at line 2833 [4.1132300]
B:BD[4.1180175] → [2.5193:5236]
```
    set_hp(hp, true);
    set_mp(0, true);
```
[4.1180175]
[4.1180223]
```
    set_hp( hp, true );
    set_mp( mp, true );
```