From 93de2b5b81324a9260aa84d78c7b4b0d10b39079 Mon Sep 17 00:00:00 2001 From: dshaligram Date: Thu, 10 Jan 2008 10:36:48 +0000 Subject: s/LONG_SWORDS/LONG_BLADES/ (cbus). Use skill_name() to describe weapon skills. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3239 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/describe.cc | 51 ++++------------------------- crawl-ref/source/enum.h | 2 +- crawl-ref/source/fight.cc | 4 +-- crawl-ref/source/itemprop.cc | 24 +++++++------- crawl-ref/source/makeitem.cc | 2 +- crawl-ref/source/newgame.cc | 8 ++--- crawl-ref/source/religion.cc | 2 +- crawl-ref/source/skills.cc | 4 +-- crawl-ref/source/skills2.cc | 76 ++++++++++++++++++++++---------------------- crawl-ref/source/tile2.cc | 2 +- 10 files changed, 69 insertions(+), 106 deletions(-) (limited to 'crawl-ref') diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index b53d77ac3b..e853a1cd0c 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -963,50 +963,13 @@ static std::string describe_weapon( const item_def &item, bool verbose) { description += "$It falls into the"; - switch (item.sub_type) - { - case WPN_SLING: - description += " 'slings' category. "; - break; - case WPN_BOW: - case WPN_LONGBOW: - description += " 'bows' category. "; - break; - case WPN_HAND_CROSSBOW: - case WPN_CROSSBOW: - description += " 'crossbows' category. "; - break; - case WPN_BLOWGUN: - description += " 'darts' category. "; - break; - default: - // Melee weapons - switch (weapon_skill(item.base_type, item.sub_type)) - { - case SK_SHORT_BLADES: - description += " 'short blades' category. "; - break; - case SK_LONG_SWORDS: - description += " 'long swords' category. "; - break; - case SK_AXES: - description += " 'axes' category. "; - break; - case SK_MACES_FLAILS: - description += " 'maces and flails' category. "; - break; - case SK_POLEARMS: - description += " 'polearms' category. "; - break; - case SK_STAVES: - description += " 'staves' category. "; - break; - default: - description += " 'bug' category. "; - DEBUGSTR("Unknown weapon type"); - break; - } - } + const skill_type skill = + is_range_weapon(item)? range_skill(item) : weapon_skill(item); + + description += + make_stringf(" '%s' category. ", + skill == SK_FIGHTING? "buggy" + : skill_name(skill)); } return (description); diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 476bd92e88..2d571f028b 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -2214,7 +2214,7 @@ enum skill_type { SK_FIGHTING, // 0 SK_SHORT_BLADES, - SK_LONG_SWORDS, + SK_LONG_BLADES, SK_UNUSED_1, // SK_GREAT_SWORDS - now unused SK_AXES, SK_MACES_FLAILS, // 5 diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 632a606213..29b87eea6f 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -1283,7 +1283,7 @@ int melee_attack::player_stab_weapon_bonus(int damage) damage += bonus; } // fall through - case SK_LONG_SWORDS: + case SK_LONG_BLADES: damage *= 10 + you.skills[SK_STABBING] / (stab_bonus + (wpn_skill == SK_SHORT_BLADES ? 0 : 1)); damage /= 10; @@ -3772,7 +3772,7 @@ int weapon_str_weight( object_class_type wpn_class, int wpn_type ) switch (wpn_skill) { case SK_SHORT_BLADES: ret = 2; break; - case SK_LONG_SWORDS: ret = 3; break; + case SK_LONG_BLADES: ret = 3; break; case SK_STAVES: ret = 3; break; // == 5 after 2-hand bonus case SK_POLEARMS: ret = 3; break; // most are +2 for 2-hands case SK_AXES: ret = 6; break; diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc index ff70a00594..2d35a8e5f5 100644 --- a/crawl-ref/source/itemprop.cc +++ b/crawl-ref/source/itemprop.cc @@ -238,31 +238,31 @@ static weapon_def Weapon_prop[NUM_WEAPONS] = // Long swords { WPN_FALCHION, "falchion", 8, 2, 13, 170, 4, - SK_LONG_SWORDS, HANDS_ONE, SIZE_MEDIUM, MI_NONE, false, + SK_LONG_BLADES, HANDS_ONE, SIZE_MEDIUM, MI_NONE, false, DAMV_SLICING, 10 }, // or perhaps DAMV_CHOPPING is more apt? { WPN_LONG_SWORD, "long sword", 10, 1, 14, 160, 3, - SK_LONG_SWORDS, HANDS_ONE, SIZE_MEDIUM, MI_NONE, false, + SK_LONG_BLADES, HANDS_ONE, SIZE_MEDIUM, MI_NONE, false, DAMV_SLICING, 10 }, { WPN_SCIMITAR, "scimitar", 11, -1, 14, 170, 3, - SK_LONG_SWORDS, HANDS_ONE, SIZE_MEDIUM, MI_NONE, false, + SK_LONG_BLADES, HANDS_ONE, SIZE_MEDIUM, MI_NONE, false, DAMV_SLICING, 10 }, { WPN_KATANA, "katana", 13, 2, 13, 160, 3, - SK_LONG_SWORDS, HANDS_HALF, SIZE_MEDIUM, MI_NONE, false, + SK_LONG_BLADES, HANDS_HALF, SIZE_MEDIUM, MI_NONE, false, DAMV_SLICING, 2 }, { WPN_DEMON_BLADE, "demon blade", 13, -1, 15, 200, 4, - SK_LONG_SWORDS, HANDS_ONE, SIZE_MEDIUM, MI_NONE, false, + SK_LONG_BLADES, HANDS_ONE, SIZE_MEDIUM, MI_NONE, false, DAMV_SLICING, 2 }, { WPN_BLESSED_BLADE, "blessed blade", 14, 0, 14, 200, 4, - SK_LONG_SWORDS, HANDS_ONE, SIZE_MEDIUM, MI_NONE, false, + SK_LONG_BLADES, HANDS_ONE, SIZE_MEDIUM, MI_NONE, false, DAMV_SLICING, 0 }, { WPN_DOUBLE_SWORD, "double sword", 15, -2, 16, 220, 5, - SK_LONG_SWORDS, HANDS_HALF, SIZE_MEDIUM, MI_NONE, false, + SK_LONG_BLADES, HANDS_HALF, SIZE_MEDIUM, MI_NONE, false, DAMV_SLICING, 2 }, { WPN_GREAT_SWORD, "great sword", 16, -3, 17, 250, 6, - SK_LONG_SWORDS, HANDS_TWO, SIZE_LARGE, MI_NONE, false, + SK_LONG_BLADES, HANDS_TWO, SIZE_LARGE, MI_NONE, false, DAMV_SLICING, 10 }, { WPN_TRIPLE_SWORD, "triple sword", 19, -4, 19, 260, 6, - SK_LONG_SWORDS, HANDS_TWO, SIZE_LARGE, MI_NONE, false, + SK_LONG_BLADES, HANDS_TWO, SIZE_LARGE, MI_NONE, false, DAMV_SLICING, 2 }, // Axes @@ -684,7 +684,7 @@ void set_equip_race( item_def &item, unsigned long flags ) || (weapon_skill(item) == SK_POLEARMS && item.sub_type != WPN_SPEAR && item.sub_type != WPN_TRIDENT) - || (weapon_skill(item) == SK_LONG_SWORDS + || (weapon_skill(item) == SK_LONG_BLADES && item.sub_type != WPN_FALCHION && item.sub_type != WPN_LONG_SWORD && item.sub_type != WPN_SCIMITAR) @@ -716,7 +716,7 @@ void set_equip_race( item_def &item, unsigned long flags ) { case OBJ_WEAPONS: if (weapon_skill(item) == SK_POLEARMS - || (weapon_skill(item) == SK_LONG_SWORDS + || (weapon_skill(item) == SK_LONG_BLADES && item.sub_type != WPN_FALCHION) || item.sub_type == WPN_QUICK_BLADE || item.sub_type == WPN_CLUB @@ -755,7 +755,7 @@ void set_equip_race( item_def &item, unsigned long flags ) switch (item.base_type) { case OBJ_WEAPONS: - if ((weapon_skill(item) == SK_LONG_SWORDS + if ((weapon_skill(item) == SK_LONG_BLADES && item.sub_type != WPN_FALCHION && item.sub_type != WPN_LONG_SWORD && item.sub_type != WPN_SCIMITAR diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc index d6031633d5..d80adf5e45 100644 --- a/crawl-ref/source/makeitem.cc +++ b/crawl-ref/source/makeitem.cc @@ -95,7 +95,7 @@ static int newwave_weapon_colour(const item_def &item) case SK_SHORT_BLADES: item_colour = CYAN; break; - case SK_LONG_SWORDS: + case SK_LONG_BLADES: item_colour = LIGHTCYAN; break; case SK_AXES: diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc index 6cdcc8dbc5..468f59bd15 100644 --- a/crawl-ref/source/newgame.cc +++ b/crawl-ref/source/newgame.cc @@ -2445,7 +2445,7 @@ static bool give_wanderer_weapon( int slot, int wpn_skill ) ret = true; break; - case SK_LONG_SWORDS: + case SK_LONG_BLADES: default: // all long swords are too good for a starting character... // especially this class where we have to be careful about @@ -2540,7 +2540,7 @@ static void create_wanderer( void ) { SK_SLINGS, SK_BOWS, SK_CROSSBOWS, SK_SPELLCASTING, SK_CONJURATIONS, SK_ENCHANTMENTS, SK_FIRE_MAGIC, SK_ICE_MAGIC, SK_AIR_MAGIC, SK_EARTH_MAGIC, - SK_FIGHTING, SK_SHORT_BLADES, SK_LONG_SWORDS, SK_AXES, + SK_FIGHTING, SK_SHORT_BLADES, SK_LONG_BLADES, SK_AXES, SK_MACES_FLAILS, SK_POLEARMS, SK_STAVES, SK_DARTS, SK_THROWING, SK_ARMOUR, SK_DODGING, SK_STEALTH, SK_STABBING, SK_SHIELDS, SK_TRAPS_DOORS, SK_UNARMED_COMBAT, @@ -2552,7 +2552,7 @@ static void create_wanderer( void ) SK_SLINGS, SK_BOWS, SK_CROSSBOWS, SK_SPELLCASTING, SK_CONJURATIONS, SK_ENCHANTMENTS, SK_FIRE_MAGIC, SK_ICE_MAGIC, SK_AIR_MAGIC, SK_EARTH_MAGIC, - SK_FIGHTING, SK_SHORT_BLADES, SK_LONG_SWORDS, SK_AXES, + SK_FIGHTING, SK_SHORT_BLADES, SK_LONG_BLADES, SK_AXES, SK_MACES_FLAILS, SK_POLEARMS, SK_STAVES, SK_DARTS, SK_THROWING, SK_ARMOUR, SK_DODGING, SK_STEALTH, SK_STABBING, SK_SHIELDS, SK_TRAPS_DOORS, SK_UNARMED_COMBAT, @@ -3577,7 +3577,7 @@ bool give_items_skills() you.skills[SK_DODGING] = 1; you.skills[(coinflip()? SK_ARMOUR : SK_DODGING)]++; you.skills[SK_SHIELDS] = 2; - you.skills[SK_LONG_SWORDS] = 3; + you.skills[SK_LONG_BLADES] = 3; you.skills[SK_INVOCATIONS] = 2; break; diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index f82c9b7c99..8d622730f4 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -3143,7 +3143,7 @@ void altar_prayer(void) const int wpn = get_player_wielded_weapon(); if (wpn != -1 - && weapon_skill( you.inv[wpn] ) == SK_LONG_SWORDS + && weapon_skill( you.inv[wpn] ) == SK_LONG_BLADES && get_weapon_brand( you.inv[wpn] ) != SPWPN_HOLY_WRATH) { if (bless_weapon( GOD_SHINING_ONE, SPWPN_HOLY_WRATH, YELLOW )) diff --git a/crawl-ref/source/skills.cc b/crawl-ref/source/skills.cc index 9f7a5eb2a1..6c57d4d257 100644 --- a/crawl-ref/source/skills.cc +++ b/crawl-ref/source/skills.cc @@ -193,9 +193,9 @@ static int exercise2( int exsk ) if (exsk < SK_ARMOUR) { /* blades to blades */ - if ((exsk == SK_SHORT_BLADES || exsk == SK_LONG_SWORDS) + if ((exsk == SK_SHORT_BLADES || exsk == SK_LONG_BLADES) && (you.skills[SK_SHORT_BLADES] > you.skills[exsk] - || you.skills[SK_LONG_SWORDS] > you.skills[exsk])) + || you.skills[SK_LONG_BLADES] > you.skills[exsk])) { bonus += random2(3); } diff --git a/crawl-ref/source/skills2.cc b/crawl-ref/source/skills2.cc index 3c8fe400df..8bd47b1f91 100644 --- a/crawl-ref/source/skills2.cc +++ b/crawl-ref/source/skills2.cc @@ -131,7 +131,7 @@ const int spec_skills[ NUM_SPECIES ][40] = { // SP_HUMAN (1) 100, // SK_FIGHTING 100, // SK_SHORT_BLADES - 100, // SK_LONG_SWORDS + 100, // SK_LONG_BLADES 100, // SK_UNUSED_1 100, // SK_AXES 100, // SK_MACES_FLAILS @@ -174,7 +174,7 @@ const int spec_skills[ NUM_SPECIES ][40] = { // SP_HIGH_ELF (3) 100, // SK_FIGHTING 70, // SK_SHORT_BLADES - 70, // SK_LONG_SWORDS + 70, // SK_LONG_BLADES 115, // SK_UNUSED_1 130, // SK_AXES 150, // SK_MACES_FLAILS @@ -217,7 +217,7 @@ const int spec_skills[ NUM_SPECIES ][40] = { // SP_GREY_ELF (4) 140, // SK_FIGHTING 90, // SK_SHORT_BLADES - 95, // SK_LONG_SWORDS + 95, // SK_LONG_BLADES 120, // SK_UNUSED_1 140, // SK_AXES 160, // SK_MACES_FLAILS @@ -260,7 +260,7 @@ const int spec_skills[ NUM_SPECIES ][40] = { // SP_DEEP_ELF (5) 150, // SK_FIGHTING 100, // SK_SHORT_BLADES - 105, // SK_LONG_SWORDS + 105, // SK_LONG_BLADES 120, // SK_UNUSED_1 150, // SK_AXES 165, // SK_MACES_FLAILS @@ -303,7 +303,7 @@ const int spec_skills[ NUM_SPECIES ][40] = { // SP_SLUDGE_ELF (6) 80, // SK_FIGHTING 110, // SK_SHORT_BLADES - 110, // SK_LONG_SWORDS + 110, // SK_LONG_BLADES 110, // SK_UNUSED_1 130, // SK_AXES 140, // SK_MACES_FLAILS @@ -346,7 +346,7 @@ const int spec_skills[ NUM_SPECIES ][40] = { // SP_MOUNTAIN_DWARF (8) 70, // SK_FIGHTING 80, // SK_SHORT_BLADES - 90, // SK_LONG_SWORDS + 90, // SK_LONG_BLADES 100, // SK_UNUSED_1 65, // SK_AXES 70, // SK_MACES_FLAILS @@ -389,7 +389,7 @@ const int spec_skills[ NUM_SPECIES ][40] = { // SP_HALFLING (9) 120, // SK_FIGHTING 60, // SK_SHORT_BLADES - 100, // SK_LONG_SWORDS + 100, // SK_LONG_BLADES 130, // SK_UNUSED_1 120, // SK_AXES 150, // SK_MACES_FLAILS @@ -432,7 +432,7 @@ const int spec_skills[ NUM_SPECIES ][40] = { // SP_HILL_ORC (10) 70, // SK_FIGHTING 100, // SK_SHORT_BLADES - 80, // SK_LONG_SWORDS + 80, // SK_LONG_BLADES 70, // SK_UNUSED_1 70, // SK_AXES 80, // SK_MACES_FLAILS @@ -475,7 +475,7 @@ const int spec_skills[ NUM_SPECIES ][40] = { // SP_KOBOLD (11) 80, // SK_FIGHTING 60, // SK_SHORT_BLADES - 100, // SK_LONG_SWORDS + 100, // SK_LONG_BLADES 120, // SK_UNUSED_1 110, // SK_AXES 140, // SK_MACES_FLAILS @@ -518,7 +518,7 @@ const int spec_skills[ NUM_SPECIES ][40] = { // SP_MUMMY (12) 100, // SK_FIGHTING 140, // SK_SHORT_BLADES - 140, // SK_LONG_SWORDS + 140, // SK_LONG_BLADES 140, // SK_UNUSED_1 140, // SK_AXES 140, // SK_MACES_FLAILS @@ -561,7 +561,7 @@ const int spec_skills[ NUM_SPECIES ][40] = { // SP_NAGA (13) 100, // SK_FIGHTING 100, // SK_SHORT_BLADES - 100, // SK_LONG_SWORDS + 100, // SK_LONG_BLADES 100, // SK_UNUSED_1 100, // SK_AXES 100, // SK_MACES_FLAILS @@ -604,7 +604,7 @@ const int spec_skills[ NUM_SPECIES ][40] = { // SP_GNOME (14) 100, // SK_FIGHTING 75, // SK_SHORT_BLADES - 100, // SK_LONG_SWORDS + 100, // SK_LONG_BLADES 130, // SK_UNUSED_1 100, // SK_AXES 130, // SK_MACES_FLAILS @@ -647,7 +647,7 @@ const int spec_skills[ NUM_SPECIES ][40] = { // SP_OGRE (15) 100, // SK_FIGHTING 140, // SK_SHORT_BLADES - 120, // SK_LONG_SWORDS + 120, // SK_LONG_BLADES 110, // SK_UNUSED_1 100, // SK_AXES 100, // SK_MACES_FLAILS @@ -690,7 +690,7 @@ const int spec_skills[ NUM_SPECIES ][40] = { // SP_TROLL (16) 140, // SK_FIGHTING 150, // SK_SHORT_BLADES - 150, // SK_LONG_SWORDS + 150, // SK_LONG_BLADES 150, // SK_UNUSED_1 150, // SK_AXES 130, // SK_MACES_FLAILS @@ -733,7 +733,7 @@ const int spec_skills[ NUM_SPECIES ][40] = { // SP_OGRE_MAGE (17) 100, // SK_FIGHTING 110, // SK_SHORT_BLADES - 100, // SK_LONG_SWORDS + 100, // SK_LONG_BLADES 100, // SK_UNUSED_1 100, // SK_AXES 100, // SK_MACES_FLAILS @@ -776,7 +776,7 @@ const int spec_skills[ NUM_SPECIES ][40] = { // SP_RED_DRACONIAN (18) 90, // SK_FIGHTING 100, // SK_SHORT_BLADES - 100, // SK_LONG_SWORDS + 100, // SK_LONG_BLADES 100, // SK_UNUSED_1 100, // SK_AXES 100, // SK_MACES_FLAILS @@ -819,7 +819,7 @@ const int spec_skills[ NUM_SPECIES ][40] = { // SP_WHITE_DRACONIAN (19) 90, // SK_FIGHTING 100, // SK_SHORT_BLADES - 100, // SK_LONG_SWORDS + 100, // SK_LONG_BLADES 100, // SK_UNUSED_1 100, // SK_AXES 100, // SK_MACES_FLAILS @@ -862,7 +862,7 @@ const int spec_skills[ NUM_SPECIES ][40] = { // SP_GREEN_DRACONIAN (20) 90, // SK_FIGHTING 100, // SK_SHORT_BLADES - 100, // SK_LONG_SWORDS + 100, // SK_LONG_BLADES 100, // SK_UNUSED_1 100, // SK_AXES 100, // SK_MACES_FLAILS @@ -905,7 +905,7 @@ const int spec_skills[ NUM_SPECIES ][40] = { // SP_YELLOW_DRACONIAN (21) 90, // SK_FIGHTING 100, // SK_SHORT_BLADES - 100, // SK_LONG_SWORDS + 100, // SK_LONG_BLADES 100, // SK_UNUSED_1 100, // SK_AXES 100, // SK_MACES_FLAILS @@ -948,7 +948,7 @@ const int spec_skills[ NUM_SPECIES ][40] = { // SP_GREY_DRACONIAN (22) 90, // SK_FIGHTING 100, // SK_SHORT_BLADES - 100, // SK_LONG_SWORDS + 100, // SK_LONG_BLADES 100, // SK_UNUSED_1 100, // SK_AXES 100, // SK_MACES_FLAILS @@ -991,7 +991,7 @@ const int spec_skills[ NUM_SPECIES ][40] = { // SP_BLACK_DRACONIAN (23) 90, // SK_FIGHTING 100, // SK_SHORT_BLADES - 100, // SK_LONG_SWORDS + 100, // SK_LONG_BLADES 100, // SK_UNUSED_1 100, // SK_AXES 100, // SK_MACES_FLAILS @@ -1034,7 +1034,7 @@ const int spec_skills[ NUM_SPECIES ][40] = { // SP_PURPLE_DRACONIAN (24) 90, // SK_FIGHTING 100, // SK_SHORT_BLADES - 100, // SK_LONG_SWORDS + 100, // SK_LONG_BLADES 100, // SK_UNUSED_1 100, // SK_AXES 100, // SK_MACES_FLAILS @@ -1077,7 +1077,7 @@ const int spec_skills[ NUM_SPECIES ][40] = { // SP_MOTTLED_DRACONIAN (25) 90, // SK_FIGHTING 100, // SK_SHORT_BLADES - 100, // SK_LONG_SWORDS + 100, // SK_LONG_BLADES 100, // SK_UNUSED_1 100, // SK_AXES 100, // SK_MACES_FLAILS @@ -1120,7 +1120,7 @@ const int spec_skills[ NUM_SPECIES ][40] = { // SP_PALE_DRACONIAN (26) 90, // SK_FIGHTING 100, // SK_SHORT_BLADES - 100, // SK_LONG_SWORDS + 100, // SK_LONG_BLADES 100, // SK_UNUSED_1 100, // SK_AXES 100, // SK_MACES_FLAILS @@ -1163,7 +1163,7 @@ const int spec_skills[ NUM_SPECIES ][40] = { // SP_UNK0_DRACONIAN (27) 90, // SK_FIGHTING 100, // SK_SHORT_BLADES - 100, // SK_LONG_SWORDS + 100, // SK_LONG_BLADES 100, // SK_UNUSED_1 100, // SK_AXES 100, // SK_MACES_FLAILS @@ -1206,7 +1206,7 @@ const int spec_skills[ NUM_SPECIES ][40] = { // SP_UNK1_DRACONIAN (28) 90, // SK_FIGHTING 100, // SK_SHORT_BLADES - 100, // SK_LONG_SWORDS + 100, // SK_LONG_BLADES 100, // SK_UNUSED_1 100, // SK_AXES 100, // SK_MACES_FLAILS @@ -1249,7 +1249,7 @@ const int spec_skills[ NUM_SPECIES ][40] = { // SP_BASE_DRACONIAN (29) 90, // SK_FIGHTING 100, // SK_SHORT_BLADES - 100, // SK_LONG_SWORDS + 100, // SK_LONG_BLADES 100, // SK_UNUSED_1 100, // SK_AXES 100, // SK_MACES_FLAILS @@ -1292,7 +1292,7 @@ const int spec_skills[ NUM_SPECIES ][40] = { // SP_CENTAUR (30) 100, // SK_FIGHTING 120, // SK_SHORT_BLADES - 110, // SK_LONG_SWORDS + 110, // SK_LONG_BLADES 110, // SK_UNUSED_1 110, // SK_AXES 110, // SK_MACES_FLAILS @@ -1335,7 +1335,7 @@ const int spec_skills[ NUM_SPECIES ][40] = { // SP_DEMIGOD (31) 110, // SK_FIGHTING 110, // SK_SHORT_BLADES - 110, // SK_LONG_SWORDS + 110, // SK_LONG_BLADES 110, // SK_UNUSED_1 110, // SK_AXES 110, // SK_MACES_FLAILS @@ -1378,7 +1378,7 @@ const int spec_skills[ NUM_SPECIES ][40] = { // SP_SPRIGGAN (32) 150, // SK_FIGHTING 90, // SK_SHORT_BLADES - 140, // SK_LONG_SWORDS + 140, // SK_LONG_BLADES 160, // SK_UNUSED_1 150, // SK_AXES 160, // SK_MACES_FLAILS @@ -1421,7 +1421,7 @@ const int spec_skills[ NUM_SPECIES ][40] = { // SP_MINOTAUR (33) 70, // SK_FIGHTING 70, // SK_SHORT_BLADES - 70, // SK_LONG_SWORDS + 70, // SK_LONG_BLADES 70, // SK_UNUSED_1 70, // SK_AXES 70, // SK_MACES_FLAILS @@ -1464,7 +1464,7 @@ const int spec_skills[ NUM_SPECIES ][40] = { // SP_DEMONSPAWN (34) 100, // SK_FIGHTING 110, // SK_SHORT_BLADES - 110, // SK_LONG_SWORDS + 110, // SK_LONG_BLADES 110, // SK_UNUSED_1 110, // SK_AXES 110, // SK_MACES_FLAILS @@ -1507,7 +1507,7 @@ const int spec_skills[ NUM_SPECIES ][40] = { // SP_GHOUL (35) 80, // SK_FIGHTING 110, // SK_SHORT_BLADES - 110, // SK_LONG_SWORDS + 110, // SK_LONG_BLADES 110, // SK_UNUSED_1 110, // SK_AXES 110, // SK_MACES_FLAILS @@ -1550,7 +1550,7 @@ const int spec_skills[ NUM_SPECIES ][40] = { // SP_KENKU (36) 100, // SK_FIGHTING 75, // SK_SHORT_BLADES - 75, // SK_LONG_SWORDS + 75, // SK_LONG_BLADES 75, // SK_UNUSED_1 75, // SK_AXES 75, // SK_MACES_FLAILS @@ -1593,7 +1593,7 @@ const int spec_skills[ NUM_SPECIES ][40] = { // SP_MERFOLK (37) 80, // SK_FIGHTING 70, // SK_SHORT_BLADES - 90, // SK_LONG_SWORDS + 90, // SK_LONG_BLADES 100, // SK_UNUSED_1 140, // SK_AXES 150, // SK_MACES_FLAILS @@ -1636,7 +1636,7 @@ const int spec_skills[ NUM_SPECIES ][40] = { // SP_VAMPIRE (38) 110, // SK_FIGHTING 100, // SK_SHORT_BLADES - 110, // SK_LONG_SWORDS + 110, // SK_LONG_BLADES 110, // SK_UNUSED_1 110, // SK_AXES 140, // SK_MACES_FLAILS @@ -1691,7 +1691,7 @@ const int spec_skills[ NUM_SPECIES ][40] = { 90, // SK_FIGHTING 100, // SK_SHORT_BLADES - 100, // SK_LONG_SWORDS + 100, // SK_LONG_BLADES 100, // SK_UNUSED_1 100, // SK_AXES 100, // SK_MACES_FLAILS @@ -1758,7 +1758,7 @@ JOB_PALADIN: static const skill_type skill_display_order[] = { - SK_FIGHTING, SK_SHORT_BLADES, SK_LONG_SWORDS, SK_AXES, + SK_FIGHTING, SK_SHORT_BLADES, SK_LONG_BLADES, SK_AXES, SK_MACES_FLAILS, SK_POLEARMS, SK_STAVES, SK_UNARMED_COMBAT, SK_BLANK_LINE, diff --git a/crawl-ref/source/tile2.cc b/crawl-ref/source/tile2.cc index bcbc8bdc2a..844439349a 100644 --- a/crawl-ref/source/tile2.cc +++ b/crawl-ref/source/tile2.cc @@ -2194,7 +2194,7 @@ void TileGhostInit(struct ghost_demon &ghost) doll.parts[TILEP_PART_HAND1] = p; } else - if (sk == SK_LONG_SWORDS) + if (sk == SK_LONG_BLADES) { if (dam>25) p = TILEP_HAND1_GREAT_SWORD_SLANT; else -- cgit v1.2.3-54-g00ecf