diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2013-05-29 04:13:03 +0200 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2013-05-29 04:13:03 +0200 |
| commit | bad48d64c2a38978bf4ccf19931ea0483f60c843 (patch) | |
| tree | 9a752b043b13500799e3f8ba404f253fef404612 /crawl-ref/source/aptitudes.h | |
| parent | 42993c7a02bf24d02280df06c7140851e8cabb1a (diff) | |
| parent | aff44e3dcf63bf0a5426c8d6998c8954bb44d26d (diff) | |
| download | crawl-ref-bad48d64c2a38978bf4ccf19931ea0483f60c843.tar.gz crawl-ref-bad48d64c2a38978bf4ccf19931ea0483f60c843.zip | |
Merge branch 'lava_orcs' into lava_djinn
Waiting for Grotesks and the Forest to go live!
Diffstat (limited to 'crawl-ref/source/aptitudes.h')
| -rw-r--r-- | crawl-ref/source/aptitudes.h | 40 |
1 files changed, 37 insertions, 3 deletions
diff --git a/crawl-ref/source/aptitudes.h b/crawl-ref/source/aptitudes.h index ae65f5942c..c0f1060bfe 100644 --- a/crawl-ref/source/aptitudes.h +++ b/crawl-ref/source/aptitudes.h @@ -1248,9 +1248,6 @@ static const species_skill_aptitude species_skill_aptitudes[] = APT(SP_DJINNI, SK_ARMOUR, 1), APT(SP_DJINNI, SK_DODGING, -1), APT(SP_DJINNI, SK_STEALTH, -1), -#if TAG_MAJOR_VERSION == 34 - APT(SP_DJINNI, SK_STABBING, -1), -#endif APT(SP_DJINNI, SK_SHIELDS, 0), APT(SP_DJINNI, SK_TRAPS, -1), APT(SP_DJINNI, SK_UNARMED_COMBAT, -1), @@ -1269,6 +1266,43 @@ static const species_skill_aptitude species_skill_aptitudes[] = APT(SP_DJINNI, SK_POISON_MAGIC, -1), APT(SP_DJINNI, SK_INVOCATIONS, 1), APT(SP_DJINNI, SK_EVOCATIONS, 2), + + // SP_LAVA_ORC + APT(SP_LAVA_ORC, SK_FIGHTING, 2), + APT(SP_LAVA_ORC, SK_SHORT_BLADES, 0), + APT(SP_LAVA_ORC, SK_LONG_BLADES, 1), + APT(SP_LAVA_ORC, SK_AXES, 2), + APT(SP_LAVA_ORC, SK_MACES_FLAILS, 1), + APT(SP_LAVA_ORC, SK_POLEARMS, 1), + APT(SP_LAVA_ORC, SK_STAVES, -1), + APT(SP_LAVA_ORC, SK_SLINGS, -2), + APT(SP_LAVA_ORC, SK_BOWS, -2), + APT(SP_LAVA_ORC, SK_CROSSBOWS, -2), + APT(SP_LAVA_ORC, SK_THROWING, -1), + APT(SP_LAVA_ORC, SK_ARMOUR, 1), + APT(SP_LAVA_ORC, SK_DODGING, -2), + APT(SP_LAVA_ORC, SK_STEALTH, -1), +#if TAG_MAJOR_VERSION == 34 + APT(SP_LAVA_ORC, SK_STABBING, 2), +#endif + APT(SP_LAVA_ORC, SK_SHIELDS, 1), + APT(SP_LAVA_ORC, SK_TRAPS, 0), + APT(SP_LAVA_ORC, SK_UNARMED_COMBAT, 1), + APT(SP_LAVA_ORC, SK_SPELLCASTING, -3), + APT(SP_LAVA_ORC, SK_CONJURATIONS, 0), + APT(SP_LAVA_ORC, SK_HEXES, 0), + APT(SP_LAVA_ORC, SK_CHARMS, -1), + APT(SP_LAVA_ORC, SK_SUMMONINGS, 0), + APT(SP_LAVA_ORC, SK_NECROMANCY, 0), + APT(SP_LAVA_ORC, SK_TRANSLOCATIONS, -2), + APT(SP_LAVA_ORC, SK_TRANSMUTATIONS, 3), + APT(SP_LAVA_ORC, SK_FIRE_MAGIC, 2), + APT(SP_LAVA_ORC, SK_ICE_MAGIC, -4), + APT(SP_LAVA_ORC, SK_AIR_MAGIC, -3), + APT(SP_LAVA_ORC, SK_EARTH_MAGIC, 1), + APT(SP_LAVA_ORC, SK_POISON_MAGIC, -1), + APT(SP_LAVA_ORC, SK_INVOCATIONS, 3), + APT(SP_LAVA_ORC, SK_EVOCATIONS, 1), }; #endif |