fiddlerwoaroof/crawl - Change OO5PVQJ7B3HMIV46B5BIEKJNBZHQSXL3DJOGINRLLSTGSM67KYZAC

* Nerf Dwarfs' Evocations aptitude 45 -> 67 (as e.g. Grey Elf).

Correct Evoc aptitude listed in aptitudes.txt for High Elf.
List max charges for wands in their descriptions.
Mention waypoint number when creating waypoints.

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

Created by j-p-e-g on December 29, 2008

OO5PVQJ7B3HMIV46B5BIEKJNBZHQSXL3DJOGINRLLSTGSM67KYZAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/travel.cc at line 3766 [5.39949]
[5.128100]
[5.128100]
```
    const bool overwrite = waypoints[waynum].is_valid();
```

Insertion in crawl-ref/source/travel.cc at line 3769 [5.39949]

[5.128166]


    mprf("%s waypoint %d to your current position.",
         overwrite ? "Reset" : "Set new", waynum);

Replacement in crawl-ref/source/skills2.cc at line 194 [7.647133]
∅:D[6.190] → [7.654924:654932]
B:BD[7.654924] → [7.654924:654932]
```
     },
```
[6.190]
[7.654932]
```
    },
```
Replacement in crawl-ref/source/skills2.cc at line 237 [7.647133]
∅:D[6.494] → [7.658875:658883]
B:BD[7.658875] → [7.658875:658883]
```
     },
```
[6.494]
[7.658883]
```
    },
```
Replacement in crawl-ref/source/skills2.cc at line 280 [7.647133]
∅:D[6.646] → [7.660853:660861]
B:BD[7.660853] → [7.660853:660861]
```
     },
```
[6.646]
[7.660861]
```
    },
```
Replacement in crawl-ref/source/skills2.cc at line 323 [7.647133]
∅:D[6.798] → [7.662831:662839]
B:BD[7.662831] → [7.662831:662839]
```
     },
```
[6.798]
[7.662839]
```
    },
```
Replacement in crawl-ref/source/skills2.cc at line 366 [7.647133]
∅:D[6.950] → [7.664811:664819]
B:BD[7.664811] → [7.664811:664819]
```
     },
```
[6.950]
[7.664819]
```
    },
```
Replacement in crawl-ref/source/skills2.cc at line 408 [7.647133]
B:BD[6.1205] → [8.686:735]
∅:D[8.735] → [7.668775:668783]
∅:D[6.1254] → [7.668775:668783]
B:BD[7.668775] → [7.668775:668783]
```
     (60 * 75) / 100,           // SK_EVOCATIONS
     },
```
[6.1205]
[7.668783]
```
     (90 * 75) / 100,           // SK_EVOCATIONS
    },
```
Replacement in crawl-ref/source/skills2.cc at line 452 [7.647133]
∅:D[6.1406] → [7.670753:670761]
B:BD[7.670753] → [7.670753:670761]
```
     },
```
[6.1406]
[7.670761]
```
    },
```
Replacement in crawl-ref/source/skills2.cc at line 495 [7.647133]
∅:D[6.1558] → [7.672732:672740]
B:BD[7.672732] → [7.672732:672740]
```
     },
```
[6.1558]
[7.672740]
```
    },
```
Replacement in crawl-ref/source/skills2.cc at line 538 [7.647133]
∅:D[6.1710] → [7.674709:674717]
B:BD[7.674709] → [7.674709:674717]
```
     },
```
[6.1710]
[7.674717]
```
    },
```
Replacement in crawl-ref/source/skills2.cc at line 581 [7.647133]
∅:D[6.1862] → [7.676685:676693]
B:BD[7.676685] → [7.676685:676693]
```
     },
```
[6.1862]
[7.676693]
```
    },
```
Replacement in crawl-ref/source/skills2.cc at line 624 [7.647133]
∅:D[6.2014] → [7.678660:678668]
B:BD[7.678660] → [7.678660:678668]
```
     },
```
[6.2014]
[7.678668]
```
    },
```
Replacement in crawl-ref/source/skills2.cc at line 667 [7.647133]
∅:D[6.2166] → [7.680636:680644]
B:BD[7.680636] → [7.680636:680644]
```
     },
```
[6.2166]
[7.680644]
```
    },
```
Replacement in crawl-ref/source/skills2.cc at line 710 [7.647133]
∅:D[2.1209] → [7.682611:682619]
∅:D[9.1423] → [7.682611:682619]
∅:D[6.2318] → [7.682611:682619]
B:BD[7.682611] → [7.682611:682619]
```
     },
```
[2.1209]
[7.682619]
```
    },
```
Replacement in crawl-ref/source/skills2.cc at line 753 [7.647133]
∅:D[6.2623] → [7.686568:686576]
B:BD[7.686568] → [7.686568:686576]
```
     },
```
[6.2470]
[7.686576]
```
    },
```
Replacement in crawl-ref/source/skills2.cc at line 796 [7.647133]
∅:D[6.2775] → [7.688552:688560]
B:BD[7.688552] → [7.688552:688560]
```
     },
```
[6.2775]
[7.688560]
```
    },
```
Replacement in crawl-ref/source/skills2.cc at line 839 [7.647133]
∅:D[6.2927] → [7.690538:690546]
B:BD[7.690538] → [7.690538:690546]
```
     },
```
[6.2927]
[7.690546]
```
    },
```
Replacement in crawl-ref/source/skills2.cc at line 882 [7.647133]
∅:D[6.3079] → [7.692524:692532]
B:BD[7.692524] → [7.692524:692532]
```
     },
```
[6.3079]
[7.692532]
```
    },
```
Replacement in crawl-ref/source/skills2.cc at line 925 [7.647133]
∅:D[6.3231] → [7.694511:694519]
B:BD[7.694511] → [7.694511:694519]
```
     },
```
[6.3231]
[7.694519]
```
    },
```
Replacement in crawl-ref/source/skills2.cc at line 968 [7.647133]
∅:D[6.3383] → [7.696496:696504]
B:BD[7.696496] → [7.696496:696504]
```
     },
```
[6.3383]
[7.696504]
```
    },
```
Replacement in crawl-ref/source/skills2.cc at line 1011 [7.647133]
∅:D[6.3535] → [7.698482:698490]
B:BD[7.698482] → [7.698482:698490]
```
     },
```
[6.3535]
[7.698490]
```
    },
```
Replacement in crawl-ref/source/skills2.cc at line 1054 [7.647133]
∅:D[6.3687] → [7.700469:700477]
B:BD[7.700469] → [7.700469:700477]
```
     },
```
[6.3687]
[7.700477]
```
    },
```
Replacement in crawl-ref/source/skills2.cc at line 1097 [7.647133]
∅:D[6.3839] → [7.702457:702465]
B:BD[7.702457] → [7.702457:702465]
```
     },
```
[6.3839]
[7.702465]
```
    },
```
Replacement in crawl-ref/source/skills2.cc at line 1140 [7.647133]
∅:D[6.4143] → [7.706427:706435]
B:BD[7.706427] → [7.706427:706435]
```
     },
```
[6.3991]
[7.706435]
```
    },
```
Replacement in crawl-ref/source/skills2.cc at line 1183 [7.647133]
∅:D[6.4447] → [7.710397:710405]
B:BD[7.710397] → [7.710397:710405]
```
     },
```
[6.4447]
[7.710405]
```
    },
```
Replacement in crawl-ref/source/skills2.cc at line 1226 [7.647133]
∅:D[6.4599] → [7.712375:712383]
B:BD[7.712375] → [7.712375:712383]
```
     },
```
[6.4599]
[7.712383]
```
    },
```
Replacement in crawl-ref/source/skills2.cc at line 1269 [7.647133]
∅:D[6.4751] → [7.714353:714361]
B:BD[7.714353] → [7.714353:714361]
```
     },
```
[6.4751]
[7.714361]
```
    },
```
Replacement in crawl-ref/source/skills2.cc at line 1312 [7.647133]
∅:D[6.4903] → [7.716332:716340]
B:BD[7.716332] → [7.716332:716340]
```
     },
```
[6.4903]
[7.716340]
```
    },
```
Replacement in crawl-ref/source/skills2.cc at line 1355 [7.647133]
∅:D[6.5055] → [7.718311:718319]
B:BD[7.718311] → [7.718311:718319]
```
     },
```
[6.5055]
[7.718319]
```
    },
```
Replacement in crawl-ref/source/skills2.cc at line 1398 [7.647133]
∅:D[6.5262] → [7.720291:720299]
B:BD[7.720291] → [7.720291:720299]
```
     },
```
[6.5262]
[7.720299]
```
    },
```
Replacement in crawl-ref/source/skills2.cc at line 1441 [7.647133]
∅:D[6.5414] → [7.722267:722275]
B:BD[7.722267] → [7.722267:722275]
```
     },
```
[6.5414]
[7.722275]
```
    },
```
Replacement in crawl-ref/source/skills2.cc at line 1484 [7.647133]
∅:D[6.5566] → [7.724243:724251]
B:BD[7.724243] → [7.724243:724251]
```
     },
```
[6.5566]
[7.724251]
```
    },
```
Replacement in crawl-ref/source/skills2.cc at line 1527 [7.647133]
∅:D[6.5718] → [7.726221:726229]
B:BD[7.726221] → [7.726221:726229]
```
     },
```
[6.5718]
[7.726229]
```
    },
```

Deletion in crawl-ref/source/skills2.cc at line 1584 [7.647133]

B:BD[7.726231] → [7.726231:726403]

B:BD[7.726403] → [10.2037:2082]

∅:D[10.2082] → [7.726448:726816]

B:BD[7.726448] → [7.726448:726816]

B:BD[7.726816] → [11.2284:2326]

∅:D[11.2326] → [7.726858:728100]

∅:D[12.161781] → [7.726858:728100]

B:BD[7.726858] → [7.726858:728100]


/* ******************************************************
// base draconian
    {
         90,               // SK_FIGHTING
        100,               // SK_SHORT_BLADES
        100,               // SK_LONG_BLADES
        100,               // SK_UNUSED_1
        100,               // SK_AXES
        100,               // SK_MACES_FLAILS
        100,               // SK_POLEARMS
        100,               // SK_STAVES
        120,               // SK_SLINGS
        120,               // SK_BOWS
        120,               // SK_CROSSBOWS
        120,               // SK_DARTS
        120,               // SK_THROWING
        200,               // SK_ARMOUR
        120,               // SK_DODGING
        120,               // SK_STEALTH
        100,               // SK_STABBING
        100,               // SK_SHIELDS
        100,               // SK_TRAPS_DOORS
        100,               // SK_UNARMED_COMBAT
        100,               // undefined
        100,               // undefined
        100,               // undefined
        100,               // undefined
        100,               // undefined
        100,               // SK_SPELLCASTING
        100,               // SK_CONJURATIONS
        120,               // SK_ENCHANTMENTS
        100,               // SK_SUMMONINGS
        100,               // SK_NECROMANCY
        100,               // SK_TRANSLOCATIONS
        100,               // SK_TRANSMIGRATION
        100,               // SK_DIVINATIONS
        100,               // SK_FIRE_MAGIC
        100,               // SK_ICE_MAGIC
        100,               // SK_AIR_MAGIC
        100,               // SK_EARTH_MAGIC
        100,               // SK_POISON_MAGIC
        100,               // SK_INVOCATIONS
        100,               // SK_EVOCATIONS
    },
****************************************************** */

Insertion in crawl-ref/source/itemprop.h at line 638 [12.641567]
[4.3632]
[13.4289]
```
int wand_charge_value(int type);
```

Insertion in crawl-ref/source/itemprop.cc at line 1339 [12.646661]

[13.4355]

// Max. charges are 3 times this value.
int wand_charge_value(int type)
{
    switch (type)
    {
    case WAND_INVISIBILITY:
    case WAND_FIREBALL:
    case WAND_TELEPORTATION:
    case WAND_HEALING:
    case WAND_HASTING:
        return 3;
    case WAND_LIGHTNING:
    case WAND_DRAINING:
        return 4;
    case WAND_FIRE:
    case WAND_COLD:
        return 5;
    default:
        return 8;
    }
}

Replacement in crawl-ref/source/effects.cc at line 1898 [7.3382105]
∅:D[14.1096] → [12.946261:946362]
B:BD[12.946261] → [12.946261:946362]
B:BD[12.946362] → [15.2664:2697]
∅:D[15.2697] → [12.946362:946389]
B:BD[12.946362] → [12.946362:946389]
B:BD[12.946389] → [16.17348:17375]
∅:D[16.17375] → [12.946409:946457]
B:BD[12.946409] → [12.946409:946457]
```
        switch (wand.sub_type)
        {
        case WAND_INVISIBILITY:
        case WAND_FIREBALL:
        case WAND_TELEPORTATION:
        case WAND_HEALING:
        case WAND_HASTING:
            charge_gain = 3;
            break;
```
[7.3425500]
[7.3425615]
```
        charge_gain = wand_charge_value(wand.sub_type);
```

Deletion in crawl-ref/source/effects.cc at line 1900 [7.3382105]

B:BD[7.3425616] → [12.946458:946563]

∅:D[12.946563] → [7.3425705:3425706]

B:BD[7.3425705] → [7.3425705:3425706]

B:BD[7.3425706] → [12.946564:946660]

∅:D[12.946660] → [7.3425786:3425787]

B:BD[7.3425786] → [7.3425786:3425787]

B:BD[7.3425787] → [12.946661:946737]

        case WAND_LIGHTNING:
        case WAND_DRAINING:
            charge_gain = 4;
            break;
        case WAND_FIRE:
        case WAND_COLD:
            charge_gain = 5;
            break;
        default:
            charge_gain = 8;
            break;
        }

Replacement in crawl-ref/source/effects.cc at line 1910 [7.3382105]

B:BD[12.946950] → [17.2921:2975]

        const bool charged = new_charges > wand.plus;

[12.946950]

[18.3379]

        const bool charged = (new_charges > wand.plus);

Replacement in crawl-ref/source/describe.cc at line 1881 [7.3736416]

B:BD[7.3841652] → [19.14837:14907]

B:BD[19.14907] → [20.7253:7322]

        if (item_ident( item, ISFLAG_KNOW_PLUSES ) && item.plus == 0)
            description << "Unfortunately, it has no charges left.";

[7.3841652]

[21.10720]

        if (item_type_known(item))
        {
            const int max_charges = 3 * wand_charge_value(item.sub_type);
            if (item.plus < max_charges)
            {
                description << "$It can have at most " << max_charges
                            << " charges.";
            }
            else
                description << "$It is fully charged.";
        }
        if (item_ident( item, ISFLAG_KNOW_PLUSES ) && item.plus == 0
            || item.plus2 == ZAPCOUNT_EMPTY)
        {
            description << "$Unfortunately, it has no charges left.";
        }

Replacement in crawl-ref/source/dat/database/help.txt at line 77 [22.4716]

B:BD[3.3135] → [3.3135:3206]

<w>Ctrl-W</w> : Set waypoint.
<w>W</w>      : Cycle through waypoints.

[3.3135]

[3.3206]

<w>Ctrl-W</w> : Set waypoint to current position.
<w>W</w>      : Cycle through all waypoints on the level.

Replacement in crawl-ref/docs/aptitudes.txt at line 39 [24.6039]

B:BD[23.2889] → [23.2889:2959]

High Elf        110  90  90 110 110 100    75  67                 150

[23.2889]

[23.2959]

High Elf        110  90  90 110 110 100    75  75                 150

Replacement in crawl-ref/docs/aptitudes.txt at line 43 [24.6039]

B:BD[23.3169] → [23.3169:3239]

Mountain Dwarf   60 110 150 130  70  80    75  45                 130

[23.3169]

[23.3239]

Mountain Dwarf   60 110 150 130  70  80    75  67                 130

* Nerf Dwarfs' Evocations aptitude 45 -> 67 (as e.g. Grey Elf).

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/travel.cc at line 3766 [5.39949]

Insertion in crawl-ref/source/travel.cc at line 3769 [5.39949]

Replacement in crawl-ref/source/skills2.cc at line 194 [7.647133]

Replacement in crawl-ref/source/skills2.cc at line 237 [7.647133]

Replacement in crawl-ref/source/skills2.cc at line 280 [7.647133]

Replacement in crawl-ref/source/skills2.cc at line 323 [7.647133]

Replacement in crawl-ref/source/skills2.cc at line 366 [7.647133]

Replacement in crawl-ref/source/skills2.cc at line 408 [7.647133]

Replacement in crawl-ref/source/skills2.cc at line 452 [7.647133]

Replacement in crawl-ref/source/skills2.cc at line 495 [7.647133]

Replacement in crawl-ref/source/skills2.cc at line 538 [7.647133]

Replacement in crawl-ref/source/skills2.cc at line 581 [7.647133]

Replacement in crawl-ref/source/skills2.cc at line 624 [7.647133]

Replacement in crawl-ref/source/skills2.cc at line 667 [7.647133]

Replacement in crawl-ref/source/skills2.cc at line 710 [7.647133]

Replacement in crawl-ref/source/skills2.cc at line 753 [7.647133]

Replacement in crawl-ref/source/skills2.cc at line 796 [7.647133]

Replacement in crawl-ref/source/skills2.cc at line 839 [7.647133]

Replacement in crawl-ref/source/skills2.cc at line 882 [7.647133]

Replacement in crawl-ref/source/skills2.cc at line 925 [7.647133]

Replacement in crawl-ref/source/skills2.cc at line 968 [7.647133]

Replacement in crawl-ref/source/skills2.cc at line 1011 [7.647133]

Replacement in crawl-ref/source/skills2.cc at line 1054 [7.647133]

Replacement in crawl-ref/source/skills2.cc at line 1097 [7.647133]

Replacement in crawl-ref/source/skills2.cc at line 1140 [7.647133]

Replacement in crawl-ref/source/skills2.cc at line 1183 [7.647133]

Replacement in crawl-ref/source/skills2.cc at line 1226 [7.647133]

Replacement in crawl-ref/source/skills2.cc at line 1269 [7.647133]

Replacement in crawl-ref/source/skills2.cc at line 1312 [7.647133]

Replacement in crawl-ref/source/skills2.cc at line 1355 [7.647133]

Replacement in crawl-ref/source/skills2.cc at line 1398 [7.647133]

Replacement in crawl-ref/source/skills2.cc at line 1441 [7.647133]

Replacement in crawl-ref/source/skills2.cc at line 1484 [7.647133]

Replacement in crawl-ref/source/skills2.cc at line 1527 [7.647133]