nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Merge scimitar skill into saber skill

Browse Source 
Deleted scimitar skill, changed scimitar to use saber skill.
Adjusted Barbarian's max saber mastery basic->skilled for consistency
with former scimitar skill.
This commit is contained in:
Kufat
2022-07-09 19:32:00 -04:00
committed by PatR
parent d3f0a1fcde
commit 296a3ac246
4 changed files with 38 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/u_init.c
View File

@@ -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 },

9
src/weapon.c
View File

@@ -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
};