fiddlerwoaroof/crawl - Change IL4WCJVROF4HKGUQLIRWIMXL2SCULU43PAE5D7U5V6EXLB52DO6QC

Apply castamir's antiscum patch. Except for Wanderers, starting stats,

skills and equipment enchantment are now fixed, as are hp gains when leveling. (Stat gains during level up are still random.)

Thank you!

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

Created by j-p-e-g on September 15, 2009

IL4WCJVROF4HKGUQLIRWIMXL2SCULU43PAE5D7U5V6EXLB52DO6QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/player.cc at line 3125 [11.962854]
∅:D[10.3728] → [11.1008651:1008696]
B:BD[11.1008651] → [11.1008651:1008696]
```
                brek = (coinflip() ? 3 : 2);
```
[10.3728]
[10.3729]
```
                brek = 2 + new_exp % 2;
```

Replacement in crawl-ref/source/player.cc at line 3127 [11.962854]

∅:D[10.3764] → [11.1008744:1008818]

B:BD[11.1008744] → [11.1008744:1008818]

                brek = 3 + random2(3);      // up from 2 + rand(3) -- bwr

[10.3764]

[11.1008818]

                brek = 4;                  // up from 2 + rand(3) -- bwr

Replacement in crawl-ref/source/player.cc at line 3129 [11.962854]

B:BD[11.1008835] → [11.1008835:1008909]

                brek = 4 + random2(4);      // up from 3 + rand(4) -- bwr

[11.1008835]

[11.1008909]

                brek = 5 + new_exp % 2;    // up from 3 + rand(4) -- bwr

Replacement in crawl-ref/source/newgame.cc at line 70 [11.1132300]
B:BD[11.1135661] → [11.1135661:1135692]
```
#define MIN_START_STAT       1
```
[11.1135661]
[11.1135692]
```
#define MIN_START_STAT       3
```

Replacement in crawl-ref/source/newgame.cc at line 969 [11.1132300]

B:BD[11.1143957] → [12.4998:5041]

B:BD[12.5041] → [9.2871:2924]

// Randomly boost stats a number of times.
static void _assign_remaining_stats(int points_left)

[11.1143957]

[13.6716]

// Make sure no stats are unacceptably low
// (currently possible only for GhBe -- 1KB)
static void _unfocus_stats()

Replacement in crawl-ref/source/newgame.cc at line 973 [11.1132300]
B:BD[13.6718] → [7.2871:2944]
∅:D[7.2944] → [11.1144029:1144068]
∅:D[12.5115] → [11.1144029:1144068]
B:BD[11.1144029] → [11.1144029:1144068]
```
    // First spend points to get us to the minimum allowed value. -- bwr
    if (you.strength < MIN_START_STAT)
```
[13.6718]
[11.1144068]
```
    int needed;
    if ((needed = MIN_START_STAT - you.strength) > 0)
```

Replacement in crawl-ref/source/newgame.cc at line 977 [11.1132300]

B:BD[11.1144074] → [11.1144074:1144130]

        points_left -= (MIN_START_STAT - you.strength);

[11.1144074]

[11.1144130]

        if (you.intel > you.dex)
            you.intel -= needed;
        else
            you.dex -= needed;

Insertion in crawl-ref/source/newgame.cc at line 984 [11.1132300]

[11.1144175]

    if ((needed = MIN_START_STAT - you.intel) > 0)
    {
        if (you.strength > you.dex)
            you.strength -= needed;
        else
            you.dex -= needed;

Deletion in crawl-ref/source/newgame.cc at line 991 [11.1132300]

B:BD[11.1144176] → [11.1144176:1144271]

    if (you.intel < MIN_START_STAT)
    {
        points_left -= (MIN_START_STAT - you.intel);

Replacement in crawl-ref/source/newgame.cc at line 993 [11.1132300]
B:BD[11.1144313] → [11.1144313:1144348]
```
    if (you.dex < MIN_START_STAT)
```
[11.1144313]
[11.1144348]
```
    if ((needed = MIN_START_STAT - you.dex) > 0)
```

Replacement in crawl-ref/source/newgame.cc at line 995 [11.1132300]

B:BD[11.1144354] → [11.1144354:1144405]

        points_left -= (MIN_START_STAT - you.dex);

[11.1144354]

[11.1144405]

        if (you.strength > you.intel)
            you.strength -= needed;
        else
            you.intel -= needed;

Insertion in crawl-ref/source/newgame.cc at line 1002 [11.1132300]
[11.1144445]
[11.1144445]
```
}
```

Replacement in crawl-ref/source/newgame.cc at line 1004 [11.1132300]

B:BD[11.1144446] → [9.2925:2981]

    // Now randomly assign the remaining points. -- bwr

[11.1144446]

[11.1144500]

// Randomly boost stats a number of times.
static void _wanderer_assign_remaining_stats(int points_left)
{

Replacement in crawl-ref/source/newgame.cc at line 1310 [11.1132300]

B:BD[13.9740] → [14.17294:17422]

    _assign_remaining_stats((you.species == SP_DEMIGOD ||
                             you.species == SP_DEMONSPAWN) ? 15 : 8);

[13.9740]

[13.9866]

    _unfocus_stats();

Replacement in crawl-ref/source/newgame.cc at line 2751 [11.1132300]
B:BD[11.1173975] → [5.2634:2672]
```
        you.gold = roll_dice(2, 100);
```
[11.1173975]
[11.1174015]
```
        you.gold = 100;
```
Replacement in crawl-ref/source/newgame.cc at line 2757 [11.1132300]
B:BD[11.1174098] → [5.2673:2710]
```
        you.gold = roll_dice(2, 50);
```
[11.1174098]
[11.1174137]
```
        you.gold = 50;
```
Replacement in crawl-ref/source/newgame.cc at line 2761 [11.1132300]
B:BD[11.1174166] → [5.2711:2748]
```
        you.gold = roll_dice(2, 20);
```
[11.1174166]
[11.1174205]
```
        you.gold = 20;
```
Replacement in crawl-ref/source/newgame.cc at line 2783 [11.1132300]
B:BD[11.1174849] → [12.19250:19322]
∅:D[12.19322] → [11.1174922:1174993]
B:BD[11.1174922] → [11.1174922:1174993]
```
    // are supposed to be a really hard race).  Also note that Demigods
    // and Demonspawn get seven more random points added later. -- bwr
```
[11.1174849]
[11.1174993]
```
    // are supposed to be a really hard race).  -- bwr
```

Replacement in crawl-ref/source/newgame.cc at line 2788 [11.1132300]

B:BD[11.1175182] → [11.1175182:1175342]

    case SP_DEMIGOD:            sb =  7; ib =  7; db =  7;      break;  // 21+7
    case SP_DEMONSPAWN:         sb =  4; ib =  4; db =  4;      break;  // 12+7

[11.1175182]

[11.1175342]

    case SP_DEMIGOD:            sb =  9; ib = 10; db =  9;      break;  // 28
    case SP_DEMONSPAWN:         sb =  6; ib =  7; db =  6;      break;  // 19

Replacement in crawl-ref/source/newgame.cc at line 2829 [11.1132300]
B:BD[11.1177468] → [11.1177468:1177504]
```
    modify_all_stats( sb, ib, db );
```
[11.1177468]
[11.1177504]
```
    modify_all_stats( sb+2, ib+2, db+2 );
```

Replacement in crawl-ref/source/newgame.cc at line 2843 [11.1132300]

B:BD[11.1177807] → [15.3101:3421]

    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;

[11.1177807]

[11.1178127]

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

Replacement in crawl-ref/source/newgame.cc at line 2848 [11.1132300]

B:BD[11.1178128] → [15.3422:3662]

    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;

[11.1178128]

[11.1178368]

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

Replacement in crawl-ref/source/newgame.cc at line 2852 [11.1132300]

B:BD[11.1178369] → [15.3663:3903]

    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;

[11.1178369]

[11.1178609]

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

Replacement in crawl-ref/source/newgame.cc at line 2856 [11.1132300]

B:BD[11.1178610] → [15.3904:4144]

    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;

[11.1178610]

[11.1178850]

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

Replacement in crawl-ref/source/newgame.cc at line 2860 [11.1132300]

B:BD[11.1178851] → [15.4145:4305]

    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;

[11.1178851]

[11.1179011]

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

Replacement in crawl-ref/source/newgame.cc at line 2863 [11.1132300]

B:BD[11.1179012] → [15.4306:4466]

    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;

[11.1179012]

[11.1179172]

    case JOB_MONK:              s =  3; i =  2; d =  7; hp = 13; mp = 0; break;
    case JOB_TRANSMUTER:        s =  2; i =  5; d =  5; hp = 12; mp = 1; break;

Replacement in crawl-ref/source/newgame.cc at line 2866 [11.1132300]

B:BD[11.1179173] → [15.4467:5267]

    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;

[11.1179173]

[11.1179973]

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

Replacement in crawl-ref/source/newgame.cc at line 2879 [11.1132300]

B:BD[8.3150] → [8.3150:3350]

        // Wanderers get 2 points per stat as a baseline, and 4 more are
        // randomly distributed.
                                s =  2; i =  2; d =  2;
        _assign_remaining_stats(4);

[8.3150]

[8.3350]

        // Wanderers get their stats randomly distributed.
        _wanderer_assign_remaining_stats(12);

Replacement in crawl-ref/source/newgame.cc at line 2884 [11.1132300]

B:BD[16.3223] → [6.3751:3831]

    case JOB_ARTIFICER:         s =  2; i =  3; d =  4; hp = 13; mp = 1; break;

[16.3223]

[15.5429]

    case JOB_ARTIFICER:         s =  3; i =  4; d =  5; hp = 13; mp = 1; break;

Deletion in crawl-ref/source/newgame.cc at line 5262 [11.1132300]
B:BD[11.1214801] → [2.212:288]
```
    int to_hit_bonus = 0;       // used for assigning primary weapons {dlb}
```

Replacement in crawl-ref/source/newgame.cc at line 5316 [11.1132300]

B:BD[11.1220792] → [17.2771:2845]

∅:D[17.2845] → [18.3229:3286]

B:BD[18.3229] → [18.3229:3286]

            _newgame_make_item(curr, EQ_NONE, OBJ_MISSILES, MI_STONE, -1,
                               10 + roll_dice( 2, 10 ));

[11.1220792]

[18.3286]

            _newgame_make_item(curr, EQ_NONE, OBJ_MISSILES, MI_STONE, -1, 20);

Replacement in crawl-ref/source/newgame.cc at line 5580 [11.1132300]

B:BD[18.5530] → [19.2927:2974]

                           1, 1 + random2(3));

[18.5530]

[20.6967]

                           1, 2);

Replacement in crawl-ref/source/newgame.cc at line 5738 [11.1132300]

B:BD[3.3501] → [3.3501:3652]

                           ARM_ROBE, 1, you.religion == GOD_XOM ? 1 + random2(3)
                                                                : 0);

[3.3501]

[18.9637]

                           ARM_ROBE, 1, you.religion == GOD_XOM ? 2 : 0);

Replacement in crawl-ref/source/newgame.cc at line 5743 [11.1132300]

B:BD[18.9749] → [21.2634:2695]

        you.skills[(coinflip() ? SK_ARMOUR : SK_DODGING)]++;

[18.9749]

[19.3192]

        if (species_skills( SK_ARMOUR, you.species ) > species_skills( SK_DODGING, you.species ))
            you.skills[SK_DODGING]++;
        else
            you.skills[SK_ARMOUR]++;

Replacement in crawl-ref/source/newgame.cc at line 5928 [11.1132300]

B:BD[18.14538] → [3.3773:3872]

            you.inv[0].plus  = 1 + random2(2);
            you.inv[0].plus2 = 3 - you.inv[0].plus;

[18.14538]

[18.14643]

            you.inv[0].plus  = 2;
            you.inv[0].plus2 = 2;

Replacement in crawl-ref/source/newgame.cc at line 6015 [11.1132300]

B:BD[3.4632] → [3.4632:4751]

        _newgame_make_item(4, EQ_NONE, OBJ_MISSILES, MI_DART, -1,
                           10 + roll_dice( 2, 10 ));

[3.4632]

[3.4751]

        _newgame_make_item(4, EQ_NONE, OBJ_MISSILES, MI_DART, -1, 20);

Replacement in crawl-ref/source/newgame.cc at line 6079 [11.1132300]

B:BD[19.6450] → [19.6450:6507]

                              8 + roll_dice( 2, 8 ), 1);

[19.6450]

[11.1241135]

                              16, 1);

Replacement in crawl-ref/source/newgame.cc at line 6119 [11.1132300]

B:BD[12.28179] → [22.6465:6532]

∅:D[22.6532] → [14.29224:29275]

B:BD[14.29224] → [14.29224:29275]

        _newgame_make_item(1, EQ_NONE, OBJ_MISSILES, MI_ARROW, -1,
                           6 + roll_dice( 3, 4 ));

[12.28179]

[14.29275]

        _newgame_make_item(1, EQ_NONE, OBJ_MISSILES, MI_ARROW, -1, 12);

Deletion in crawl-ref/source/newgame.cc at line 6197 [11.1132300]
B:BD[11.1258062] → [11.1258062:1258097]
```
        to_hit_bonus = random2(3);
```

Replacement in crawl-ref/source/newgame.cc at line 6198 [11.1132300]

B:BD[22.7114] → [22.7114:7187]

                           1, 1 + to_hit_bonus, 1 + (2 - to_hit_bonus));

[22.7114]

[14.31832]

                           1, 2, 2);

Replacement in crawl-ref/source/newgame.cc at line 6206 [11.1132300]
B:BD[11.1259210] → [12.31654:31691]
```
        you.skills[SK_DODGING]  = 1;
```
[11.1259210]
[12.31691]
```
        you.skills[SK_DODGING]  = 2;
```
Deletion in crawl-ref/source/newgame.cc at line 6209 [11.1132300]
B:BD[11.1259319] → [11.1259319:1259366]
```
        you.skills[SK_DODGING + random2(3)]++;
```

Replacement in crawl-ref/source/newgame.cc at line 6220 [11.1132300]

B:BD[18.17178] → [4.2625:2744]

        _newgame_make_item(4, EQ_NONE, OBJ_MISSILES, MI_DART, -1,
                           10 + roll_dice( 2, 10 ));

[18.17178]

[4.2744]

        _newgame_make_item(4, EQ_NONE, OBJ_MISSILES, MI_DART, -1, 20);

Replacement in crawl-ref/source/newgame.cc at line 6232 [11.1132300]

B:BD[18.17559] → [18.17559:17701]

        you.skills[SK_STABBING] = 1;
        // Increase one of Dodging/Stealth/Stabbing by 1.
        you.skills[SK_DODGING + random2(3)]++;

[18.17559]

[18.17701]

        you.skills[SK_STABBING] = 2;

Replacement in crawl-ref/source/newgame.cc at line 6239 [11.1132300]

B:BD[18.17850] → [18.17850:17923]

                           1, 1 + to_hit_bonus, 1 + (2 - to_hit_bonus));

[18.17850]

[18.17923]

                           1, 2, 2);

Replacement in crawl-ref/source/newgame.cc at line 6243 [11.1132300]

B:BD[18.18122] → [18.18122:18242]

        _newgame_make_item(4, EQ_NONE, OBJ_MISSILES, MI_NEEDLE, -1,
                              5 + roll_dice(2, 5));

[18.18122]

[18.18242]

        _newgame_make_item(4, EQ_NONE, OBJ_MISSILES, MI_NEEDLE, -1, 10);

Replacement in crawl-ref/source/newgame.cc at line 6245 [11.1132300]

B:BD[18.18311] → [18.18311:18426]

        _newgame_make_item(5, EQ_NONE, OBJ_MISSILES, MI_NEEDLE, -1,
                              1 + random2(4));

[18.18311]

[18.18426]

        _newgame_make_item(5, EQ_NONE, OBJ_MISSILES, MI_NEEDLE, -1, 3);

Replacement in crawl-ref/source/newgame.cc at line 6283 [11.1132300]

B:BD[18.19447] → [18.19447:19563]

            _newgame_make_item(2, EQ_NONE, OBJ_MISSILES, MI_THROWING_NET, -1,
                                  2);

[18.19447]

[18.19563]

            _newgame_make_item(2, EQ_NONE, OBJ_MISSILES, MI_THROWING_NET, -1, 2);

Replacement in crawl-ref/source/newgame.cc at line 6288 [11.1132300]

B:BD[18.19707] → [18.19707:19823]

            _newgame_make_item(2, EQ_NONE, OBJ_MISSILES, MI_THROWING_NET, -1,
                                  3);

[18.19707]

[18.19823]

            _newgame_make_item(2, EQ_NONE, OBJ_MISSILES, MI_THROWING_NET, -1, 3);

Replacement in crawl-ref/source/newgame.cc at line 6294 [11.1132300]

B:BD[18.19984] → [18.19984:20138]

            _newgame_make_item(2, EQ_NONE, OBJ_MISSILES, MI_SLING_BULLET, -1,
                               15 + random2avg(21, 5) + random2avg(15, 2));

[18.19984]

[23.4916]

            _newgame_make_item(2, EQ_NONE, OBJ_MISSILES, MI_SLING_BULLET, -1, 30);

Replacement in crawl-ref/source/newgame.cc at line 6303 [11.1132300]

B:BD[18.20261] → [18.20261:20387]

            _newgame_make_item(2, EQ_NONE, OBJ_MISSILES, MI_BOLT, -1,
                               15 + random2avg(21, 5));

[18.20261]

[23.4996]

            _newgame_make_item(2, EQ_NONE, OBJ_MISSILES, MI_BOLT, -1, 25);

Replacement in crawl-ref/source/newgame.cc at line 6311 [11.1132300]

B:BD[18.20490] → [18.20490:20617]

            _newgame_make_item(2, EQ_NONE, OBJ_MISSILES, MI_ARROW, -1,
                               15 + random2avg(21, 5));

[18.20490]

[23.5079]

            _newgame_make_item(2, EQ_NONE, OBJ_MISSILES, MI_ARROW, -1, 25);