From: nethack.rankin <nethack.rankin>
Date: Thu, 23 Oct 2003 07:12:03 +0000 (+0000)
Subject: weapon skill tweak
X-Git-Tag: MOVE2GIT~1650
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5b9c03729c7c60c2e501e6ea2f814ba103bbd600;p=nethack

weapon skill tweak

     Barbarians start with either a two-handed sword and an ordinary axe
or a battle-axe and a short sword.  The latter combination was the only
one among all the roles where the player couldn't enhance skills for
starting weapons to expert.  Fix that by allowing barbarians to become
expert in short swords; reduce potential capability with pick-axe/mattock
from expert down to skilled to compensate for the increase.

     This also addresses an earlier complaint that monks are no better in
martial arts than samurai even though the latter have lots of choices for
good weapon skills.  Reduce the martial arts limit on samurai from grand
master to just master; likewise with bare-handed combat for barbarians
and cavemen.  In this case there didn't seem to be any need to bump the
limit on anything else as compensation.

     I still think non-rogues shouldn't be allowed to become expert in
daggers (which means that ranger and valkyrie starting gear would need
to change slightly) due to how powerful throwing them is, but I haven't
included that change here.

     For the skills which have lower upper limits than before, existing
characters who have #enhanced their skills high enough with the previous
code will retain their higher-than-max skill ranking with the new code.
Characters who have exercised enough to advance to the old max but
haven't done so yet will be limited to the new max.
---

diff --git a/doc/fixes34.3 b/doc/fixes34.3
index 0dc20adba..212fafacf 100644
--- a/doc/fixes34.3
+++ b/doc/fixes34.3
@@ -70,6 +70,9 @@ cutting a shopkeeper polymorphed in to a long worm would generate strange
 	messages and could cause a crash
 reading a cursed scroll of light in a corridor wouldn't display correctly
 	if lit_corridor option was disabled
+barbarians can become export in short sword skill
+samurai are now limited to master in martial arts skill; barbarians and
+	cavemen are now limited to master in bare-handed combat skill
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/src/u_init.c b/src/u_init.c
index 114893c50..77c92b0c5 100644
--- a/src/u_init.c
+++ b/src/u_init.c
@@ -1,4 +1,4 @@
-/*	SCCS Id: @(#)u_init.c	3.4	2002/03/02	*/
+/*	SCCS Id: @(#)u_init.c	3.4	2002/10/22	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -271,7 +271,7 @@ static const struct def_skill Skill_A[] = {
 
 static const struct def_skill Skill_B[] = {
     { P_DAGGER, P_BASIC },		{ P_AXE, P_EXPERT },
-    { P_PICK_AXE, P_EXPERT },		{ P_SHORT_SWORD, P_BASIC },
+    { P_PICK_AXE, P_SKILLED },	{ P_SHORT_SWORD, P_EXPERT },
     { 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_CLUB, P_SKILLED },
@@ -284,7 +284,7 @@ static const struct def_skill Skill_B[] = {
     { P_RIDING, P_BASIC },
 #endif
     { P_TWO_WEAPON_COMBAT, P_BASIC },
-    { P_BARE_HANDED_COMBAT, P_GRAND_MASTER },
+    { P_BARE_HANDED_COMBAT, P_MASTER },
     { P_NONE, 0 }
 };
 
@@ -299,7 +299,7 @@ static const struct def_skill Skill_C[] = {
     { P_BOW, P_SKILLED },		{ P_SLING, P_EXPERT },
     { P_ATTACK_SPELL, P_BASIC },	{ P_MATTER_SPELL, P_SKILLED },
     { P_BOOMERANG, P_EXPERT },		{ P_UNICORN_HORN, P_BASIC },
-    { P_BARE_HANDED_COMBAT, P_GRAND_MASTER },
+    { P_BARE_HANDED_COMBAT, P_MASTER },
     { P_NONE, 0 }
 };
 
@@ -422,7 +422,7 @@ static const struct def_skill Skill_S[] = {
     { P_RIDING, P_SKILLED },
 #endif
     { P_TWO_WEAPON_COMBAT, P_EXPERT },
-    { P_MARTIAL_ARTS, P_GRAND_MASTER },
+    { P_MARTIAL_ARTS, P_MASTER },
     { P_NONE, 0 }
 };