diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-25 13:09:43 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-25 13:09:43 +0000 |
| commit | 50631da761dc274499e8668d0a1e2f096e6da9d6 (patch) | |
| tree | 5b85e3912d09ae0f0e85dc4cfaab461a83bfbcef | |
| parent | 9d23f407afdd9d219ffa8d564717404db27d78da (diff) | |
| download | crawl-ref-50631da761dc274499e8668d0a1e2f096e6da9d6.tar.gz crawl-ref-50631da761dc274499e8668d0a1e2f096e6da9d6.zip | |
Species reordering. SP_MERFOLK takes the place of the former Elf,
and SP_KENKU of the former Hill Dwarf. (The goal is to cater to
finger memory for 0.3 - for trunk I'm in favour of a complete
reordering in the selection screen, at least.)
Breaks saves, obviously.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.3@2564 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/enum.h | 4 | ||||
| -rw-r--r-- | crawl-ref/source/skills2.cc | 174 |
2 files changed, 89 insertions, 89 deletions
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 2a72d1ba2b..9c64d76393 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -2186,10 +2186,12 @@ enum speed_type enum species_type { SP_HUMAN = 1, // 1 + SP_MERFOLK, SP_HIGH_ELF, SP_GREY_ELF, SP_DEEP_ELF, // 5 SP_SLUDGE_ELF, + SP_KENKU, SP_MOUNTAIN_DWARF, SP_HALFLING, SP_HILL_ORC, // 10 @@ -2218,8 +2220,6 @@ enum species_type SP_MINOTAUR, SP_DEMONSPAWN, SP_GHOUL, // 35 - SP_KENKU, - SP_MERFOLK, SP_VAMPIRE, SP_ELF, // (placeholder) SP_HILL_DWARF, // (placeholder) diff --git a/crawl-ref/source/skills2.cc b/crawl-ref/source/skills2.cc index 0778120d11..ec12a82986 100644 --- a/crawl-ref/source/skills2.cc +++ b/crawl-ref/source/skills2.cc @@ -170,6 +170,49 @@ const int spec_skills[ NUM_SPECIES ][40] = (100 * 75) / 100, // SK_EVOCATIONS }, + { // SP_MERFOLK (2) + 80, // SK_FIGHTING + 70, // SK_SHORT_BLADES + 90, // SK_LONG_SWORDS + 100, // SK_UNUSED_1 + 140, // SK_AXES + 150, // SK_MACES_FLAILS + 50, // SK_POLEARMS + 130, // SK_STAVES + 150, // SK_SLINGS + 140, // SK_BOWS + 140, // SK_CROSSBOWS + 100, // SK_DARTS + 100, // SK_THROWING + 160, // SK_ARMOUR + 60, // SK_DODGING + 90, // SK_STEALTH + 70, // SK_STABBING + 100, // SK_SHIELDS + 120, // SK_TRAPS_DOORS + 90, // SK_UNARMED_COMBAT + 100, // undefined + 100, // undefined + 100, // undefined + 100, // undefined + 100, // undefined + (100 * 130) / 100, // SK_SPELLCASTING + 140, // SK_CONJURATIONS + 90, // SK_ENCHANTMENTS + 100, // SK_SUMMONINGS + 150, // SK_NECROMANCY + 140, // SK_TRANSLOCATIONS + 60, // SK_TRANSMIGRATION + 80, // SK_DIVINATIONS + 160, // SK_FIRE_MAGIC + 80, // SK_ICE_MAGIC + 150, // SK_AIR_MAGIC + 150, // SK_EARTH_MAGIC + 80, // SK_POISON_MAGIC + (100 * 75) / 100, // SK_INVOCATIONS + (100 * 75) / 100, // SK_EVOCATIONS + }, + { // SP_HIGH_ELF (3) 100, // SK_FIGHTING 70, // SK_SHORT_BLADES @@ -342,6 +385,49 @@ const int spec_skills[ NUM_SPECIES ][40] = (110 * 75) / 100, // SK_EVOCATIONS }, + { // SP_KENKU (7) + 100, // SK_FIGHTING + 75, // SK_SHORT_BLADES + 75, // SK_LONG_SWORDS + 75, // SK_UNUSED_1 + 75, // SK_AXES + 75, // SK_MACES_FLAILS + 75, // SK_POLEARMS + 75, // SK_STAVES + 100, // SK_SLINGS + 80, // SK_BOWS + 80, // SK_CROSSBOWS + 90, // SK_DARTS + 90, // SK_THROWING + 90, // SK_ARMOUR + 90, // SK_DODGING + 100, // SK_STEALTH + 80, // SK_STABBING + 100, // SK_SHIELDS + 100, // SK_TRAPS_DOORS + 80, // SK_UNARMED_COMBAT + 100, // undefined + 100, // undefined + 100, // undefined + 100, // undefined + 100, // undefined + (100 * 130) / 100, // SK_SPELLCASTING + 60, // SK_CONJURATIONS + 160, // SK_ENCHANTMENTS + 70, // SK_SUMMONINGS + 80, // SK_NECROMANCY + 150, // SK_TRANSLOCATIONS + 150, // SK_TRANSMIGRATION + 180, // SK_DIVINATIONS + 90, // SK_FIRE_MAGIC + 120, // SK_ICE_MAGIC + 90, // SK_AIR_MAGIC + 120, // SK_EARTH_MAGIC + 100, // SK_POISON_MAGIC + (160 * 75) / 100, // SK_INVOCATIONS + (100 * 75) / 100, // SK_EVOCATIONS + }, + { // SP_MOUNTAIN_DWARF (8) 70, // SK_FIGHTING 80, // SK_SHORT_BLADES @@ -1546,93 +1632,7 @@ const int spec_skills[ NUM_SPECIES ][40] = (130 * 75) / 100, // SK_EVOCATIONS }, - { // SP_KENKU (36) - 100, // SK_FIGHTING - 75, // SK_SHORT_BLADES - 75, // SK_LONG_SWORDS - 75, // SK_UNUSED_1 - 75, // SK_AXES - 75, // SK_MACES_FLAILS - 75, // SK_POLEARMS - 75, // SK_STAVES - 100, // SK_SLINGS - 80, // SK_BOWS - 80, // SK_CROSSBOWS - 90, // SK_DARTS - 90, // SK_THROWING - 90, // SK_ARMOUR - 90, // SK_DODGING - 100, // SK_STEALTH - 80, // SK_STABBING - 100, // SK_SHIELDS - 100, // SK_TRAPS_DOORS - 80, // SK_UNARMED_COMBAT - 100, // undefined - 100, // undefined - 100, // undefined - 100, // undefined - 100, // undefined - (100 * 130) / 100, // SK_SPELLCASTING - 60, // SK_CONJURATIONS - 160, // SK_ENCHANTMENTS - 70, // SK_SUMMONINGS - 80, // SK_NECROMANCY - 150, // SK_TRANSLOCATIONS - 150, // SK_TRANSMIGRATION - 180, // SK_DIVINATIONS - 90, // SK_FIRE_MAGIC - 120, // SK_ICE_MAGIC - 90, // SK_AIR_MAGIC - 120, // SK_EARTH_MAGIC - 100, // SK_POISON_MAGIC - (160 * 75) / 100, // SK_INVOCATIONS - (100 * 75) / 100, // SK_EVOCATIONS - }, - - { // SP_MERFOLK (37) - 80, // SK_FIGHTING - 70, // SK_SHORT_BLADES - 90, // SK_LONG_SWORDS - 100, // SK_UNUSED_1 - 140, // SK_AXES - 150, // SK_MACES_FLAILS - 50, // SK_POLEARMS - 130, // SK_STAVES - 150, // SK_SLINGS - 140, // SK_BOWS - 140, // SK_CROSSBOWS - 100, // SK_DARTS - 100, // SK_THROWING - 160, // SK_ARMOUR - 60, // SK_DODGING - 90, // SK_STEALTH - 70, // SK_STABBING - 100, // SK_SHIELDS - 120, // SK_TRAPS_DOORS - 90, // SK_UNARMED_COMBAT - 100, // undefined - 100, // undefined - 100, // undefined - 100, // undefined - 100, // undefined - (100 * 130) / 100, // SK_SPELLCASTING - 140, // SK_CONJURATIONS - 90, // SK_ENCHANTMENTS - 100, // SK_SUMMONINGS - 150, // SK_NECROMANCY - 140, // SK_TRANSLOCATIONS - 60, // SK_TRANSMIGRATION - 80, // SK_DIVINATIONS - 160, // SK_FIRE_MAGIC - 80, // SK_ICE_MAGIC - 150, // SK_AIR_MAGIC - 150, // SK_EARTH_MAGIC - 80, // SK_POISON_MAGIC - (100 * 75) / 100, // SK_INVOCATIONS - (100 * 75) / 100, // SK_EVOCATIONS - }, - - { // SP_VAMPIRE (38) + { // SP_VAMPIRE (36) 110, // SK_FIGHTING 100, // SK_SHORT_BLADES 110, // SK_LONG_SWORDS |