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

merge javelin and spear skills (trunk only)

Browse Source 
Part of "multi-shot throwing proposal" last January.  Unfortunately
some of the bits that I had implemented back then have vanished, so I'm
doing it over from scratch.  There were three main parts:
1) allow multi-shot volley throwing for all stackable weapons (affects
   knives, javelins, spears, and boomerangs; other weapons either don't
   stack or are already multi-shot);
2) make worm teeth and crysknives be stackable like ordinary knives;
3) merge spear and javelin skills, so that allocating skill points to
   their use becomes more attractive and they might get used more.
This patch only does #3.

     Since the monk skill set shrinks by more than any of the other roles,
I bumped max skill for escape spells (haste self, invisibility, jumping,
levitation, and teleport away) from basic to skilled; that's the only
skill adjustment included here.  For the couple of roles had different
max values for spear and javelin skill; this keeps the higher of the two.
This commit is contained in:
nethack.rankin
2006-12-15 04:54:22 +00:00
parent 1c70b6f777
commit 54bbb38ee0
8 changed files with 53 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/objects.c
View File

@@ -1,4 +1,4 @@
/* SCCS Id: @(#)objects.c 3.5 2006/02/22 */
/* SCCS Id: @(#)objects.c 3.5 2006/12/14 */
/* Copyright (c) Mike Threepoint, 1989. */
/* NetHack may be freely redistributed. See license for details. */
@@ -101,7 +101,10 @@ WEAPON("shuriken", "throwing star",
WEAPON("boomerang", (char *)0,
1, 1, 0, 15, 5, 20, 9, 9, 0, 0, -P_BOOMERANG, WOOD, HI_WOOD),
/* spears */
/* spears [note: javelin used to have a separate skill from spears,
because the latter are primarily stabbing weapons rather than
throwing ones; but for playability, they've been merged together
under spear skill and spears can now be thrown like javelins] */
WEAPON("spear", (char *)0,
1, 1, 0, 50, 30, 3, 6, 8, 0, P, P_SPEAR, IRON, HI_METAL),
WEAPON("elven spear", "runed spear",
@@ -113,7 +116,7 @@ WEAPON("dwarvish spear", "stout spear",
WEAPON("silver spear", (char *)0,
1, 1, 0, 2, 36, 40, 6, 8, 0, P, P_SPEAR, SILVER, HI_SILVER),
WEAPON("javelin", "throwing spear",
0, 1, 0, 10, 20, 3, 6, 6, 0, P, P_JAVELIN, IRON, HI_METAL),
0, 1, 0, 10, 20, 3, 6, 6, 0, P, P_SPEAR, IRON, HI_METAL),
WEAPON("trident", (char *)0,
1, 0, 0, 8, 25, 5, 6, 4, 0, P, P_TRIDENT, IRON, HI_METAL),