From 296a3ac246ae12218eccff46d3ef79f46eb9068f Mon Sep 17 00:00:00 2001 From: Kufat Date: Sat, 9 Jul 2022 19:32:00 -0400 Subject: [PATCH] Merge scimitar skill into saber skill Deleted scimitar skill, changed scimitar to use saber skill. Adjusted Barbarian's max saber mastery basic->skilled for consistency with former scimitar skill. --- include/objects.h | 2 +- include/skills.h | 61 +++++++++++++++++++++++------------------------ src/u_init.c | 10 +------- src/weapon.c | 9 ++++--- 4 files changed, 38 insertions(+), 44 deletions(-) diff --git a/include/objects.h b/include/objects.h index 8eb28681e..d489157dc 100644 --- a/include/objects.h +++ b/include/objects.h @@ -211,7 +211,7 @@ WEAPON("dwarvish short sword", "broad short sword", 0, 0, 0, 2, 30, 10, 7, 8, 0, P, P_SHORT_SWORD, IRON, HI_METAL, DWARVISH_SHORT_SWORD), WEAPON("scimitar", "curved sword", - 0, 0, 0, 15, 40, 15, 8, 8, 0, S, P_SCIMITAR, IRON, HI_METAL, + 0, 0, 0, 15, 40, 15, 8, 8, 0, S, P_SABER, IRON, HI_METAL, SCIMITAR), WEAPON("silver saber", NoDes, 1, 0, 0, 6, 40, 75, 8, 8, 0, S, P_SABER, SILVER, HI_SILVER, diff --git a/include/skills.h b/include/skills.h index c82dc4c0b..ecce9542d 100644 --- a/include/skills.h +++ b/include/skills.h @@ -29,42 +29,41 @@ enum p_skills { P_BROAD_SWORD = 6, P_LONG_SWORD = 7, P_TWO_HANDED_SWORD = 8, - P_SCIMITAR = 9, - P_SABER = 10, - P_CLUB = 11, /* Heavy-shafted bludgeon */ - P_MACE = 12, - P_MORNING_STAR = 13, /* Spiked bludgeon */ - P_FLAIL = 14, /* Two pieces hinged or chained together */ - P_HAMMER = 15, /* Heavy head on the end */ - P_QUARTERSTAFF = 16, /* Long-shafted bludgeon */ - P_POLEARMS = 17, /* attack two or three steps away */ - P_SPEAR = 18, /* includes javelin */ - P_TRIDENT = 19, - P_LANCE = 20, - P_BOW = 21, /* launchers */ - P_SLING = 22, - P_CROSSBOW = 23, - P_DART = 24, /* hand-thrown missiles */ - P_SHURIKEN = 25, - P_BOOMERANG = 26, - P_WHIP = 27, /* flexible, one-handed */ - P_UNICORN_HORN = 28, /* last weapon, two-handed */ + P_SABER = 9, /* Curved sword, includes scimitar */ + P_CLUB = 10, /* Heavy-shafted bludgeon */ + P_MACE = 11, + P_MORNING_STAR = 12, /* Spiked bludgeon */ + P_FLAIL = 13, /* Two pieces hinged or chained together */ + P_HAMMER = 14, /* Heavy head on the end */ + P_QUARTERSTAFF = 15, /* Long-shafted bludgeon */ + P_POLEARMS = 16, /* attack two or three steps away */ + P_SPEAR = 17, /* includes javelin */ + P_TRIDENT = 18, + P_LANCE = 19, + P_BOW = 20, /* launchers */ + P_SLING = 21, + P_CROSSBOW = 22, + P_DART = 23, /* hand-thrown missiles */ + P_SHURIKEN = 24, + P_BOOMERANG = 25, + P_WHIP = 26, /* flexible, one-handed */ + P_UNICORN_HORN = 27, /* last weapon, two-handed */ /* Spell Skills added by Larry Stewart-Zerba */ - P_ATTACK_SPELL = 29, - P_HEALING_SPELL = 30, - P_DIVINATION_SPELL = 31, - P_ENCHANTMENT_SPELL = 32, - P_CLERIC_SPELL = 33, - P_ESCAPE_SPELL = 34, - P_MATTER_SPELL = 35, + P_ATTACK_SPELL = 28, + P_HEALING_SPELL = 29, + P_DIVINATION_SPELL = 30, + P_ENCHANTMENT_SPELL = 31, + P_CLERIC_SPELL = 32, + P_ESCAPE_SPELL = 33, + P_MATTER_SPELL = 34, /* Other types of combat */ - P_BARE_HANDED_COMBAT = 36, /* actually weaponless; gloves are ok */ - P_TWO_WEAPON_COMBAT = 37, /* pair of weapons, one in each hand */ - P_RIDING = 38, /* How well you control your steed */ + P_BARE_HANDED_COMBAT = 35, /* actually weaponless; gloves are ok */ + P_TWO_WEAPON_COMBAT = 36, /* pair of weapons, one in each hand */ + P_RIDING = 37, /* How well you control your steed */ - P_NUM_SKILLS = 39 + P_NUM_SKILLS = 38 }; #define P_MARTIAL_ARTS P_BARE_HANDED_COMBAT /* Role distinguishes */ diff --git a/src/u_init.c b/src/u_init.c index c3f27aa82..652605fde 100644 --- a/src/u_init.c +++ b/src/u_init.c @@ -237,7 +237,6 @@ static const struct def_skill Skill_A[] = { { P_KNIFE, P_BASIC }, { P_PICK_AXE, P_EXPERT }, { P_SHORT_SWORD, P_BASIC }, - { P_SCIMITAR, P_SKILLED }, { P_SABER, P_EXPERT }, { P_CLUB, P_SKILLED }, { P_QUARTERSTAFF, P_SKILLED }, @@ -263,8 +262,7 @@ static const struct def_skill Skill_B[] = { { P_BROAD_SWORD, P_SKILLED }, { P_LONG_SWORD, P_SKILLED }, { P_TWO_HANDED_SWORD, P_EXPERT }, - { P_SCIMITAR, P_SKILLED }, - { P_SABER, P_BASIC }, + { P_SABER, P_SKILLED }, { P_CLUB, P_SKILLED }, { P_MACE, P_SKILLED }, { P_MORNING_STAR, P_SKILLED }, @@ -308,7 +306,6 @@ static const struct def_skill Skill_H[] = { { P_DAGGER, P_SKILLED }, { P_KNIFE, P_EXPERT }, { P_SHORT_SWORD, P_SKILLED }, - { P_SCIMITAR, P_BASIC }, { P_SABER, P_BASIC }, { P_CLUB, P_SKILLED }, { P_MACE, P_BASIC }, @@ -333,7 +330,6 @@ static const struct def_skill Skill_K[] = { { P_BROAD_SWORD, P_SKILLED }, { P_LONG_SWORD, P_EXPERT }, { P_TWO_HANDED_SWORD, P_SKILLED }, - { P_SCIMITAR, P_BASIC }, { P_SABER, P_SKILLED }, { P_CLUB, P_BASIC }, { P_MACE, P_SKILLED }, @@ -400,7 +396,6 @@ static const struct def_skill Skill_R[] = { { P_BROAD_SWORD, P_SKILLED }, { P_LONG_SWORD, P_SKILLED }, { P_TWO_HANDED_SWORD, P_BASIC }, - { P_SCIMITAR, P_SKILLED }, { P_SABER, P_SKILLED }, { P_CLUB, P_SKILLED }, { P_MACE, P_SKILLED }, @@ -454,7 +449,6 @@ static const struct def_skill Skill_S[] = { { P_BROAD_SWORD, P_SKILLED }, { P_LONG_SWORD, P_EXPERT }, { P_TWO_HANDED_SWORD, P_EXPERT }, - { P_SCIMITAR, P_BASIC }, { P_SABER, P_BASIC }, { P_FLAIL, P_SKILLED }, { P_QUARTERSTAFF, P_BASIC }, @@ -480,7 +474,6 @@ static const struct def_skill Skill_T[] = { { P_BROAD_SWORD, P_BASIC }, { P_LONG_SWORD, P_BASIC }, { P_TWO_HANDED_SWORD, P_BASIC }, - { P_SCIMITAR, P_SKILLED }, { P_SABER, P_SKILLED }, { P_MACE, P_BASIC }, { P_MORNING_STAR, P_BASIC }, @@ -515,7 +508,6 @@ static const struct def_skill Skill_V[] = { { P_BROAD_SWORD, P_SKILLED }, { P_LONG_SWORD, P_EXPERT }, { P_TWO_HANDED_SWORD, P_EXPERT }, - { P_SCIMITAR, P_BASIC }, { P_SABER, P_BASIC }, { P_HAMMER, P_EXPERT }, { P_QUARTERSTAFF, P_BASIC }, diff --git a/src/weapon.c b/src/weapon.c index d5132127f..c38855ddd 100644 --- a/src/weapon.c +++ b/src/weapon.c @@ -35,12 +35,15 @@ static void skill_advance(int); #define PN_MATTER_SPELL (-14) static NEARDATA const short skill_names_indices[P_NUM_SKILLS] = { + /* Weapon */ 0, DAGGER, KNIFE, AXE, PICK_AXE, SHORT_SWORD, BROADSWORD, LONG_SWORD, - TWO_HANDED_SWORD, SCIMITAR, PN_SABER, CLUB, MACE, MORNING_STAR, FLAIL, - PN_HAMMER, QUARTERSTAFF, PN_POLEARMS, SPEAR, TRIDENT, LANCE, BOW, SLING, - CROSSBOW, DART, SHURIKEN, BOOMERANG, PN_WHIP, UNICORN_HORN, + TWO_HANDED_SWORD, PN_SABER, CLUB, MACE, MORNING_STAR, FLAIL, PN_HAMMER, + QUARTERSTAFF, PN_POLEARMS, SPEAR, TRIDENT, LANCE, BOW, SLING, CROSSBOW, + DART, SHURIKEN, BOOMERANG, PN_WHIP, UNICORN_HORN, + /* Spell */ PN_ATTACK_SPELL, PN_HEALING_SPELL, PN_DIVINATION_SPELL, PN_ENCHANTMENT_SPELL, PN_CLERIC_SPELL, PN_ESCAPE_SPELL, PN_MATTER_SPELL, + /* Other */ PN_BARE_HANDED, PN_TWO_WEAPONS, PN_RIDING };