Skip to content

Commit

Permalink
Remove redundant polearm proliferation
Browse files Browse the repository at this point in the history 
We had 14 different polearms (including the lance, which uses a
different skill but can "pound" at range like other polearms).

Now, there's 4 that spawn normally: halberd, ranseur, lance, partisan

Scythes can also be generated, but only in specific monster inventories.
  • Loading branch information
@RojjaCebolla
RojjaCebolla committed Oct 20, 2021
1 parent 8f46330 commit a733c47
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 22 deletions.
12 changes: 3 additions & 9 deletions src/makemon.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ m_initweap(register struct monst *mtmp)
case PM_WATCHMAN:
case PM_SOLDIER:
if (!rn2(3)) {
w1 = rn1(BEC_DE_CORBIN - NASTY_PIKE + 1, NASTY_PIKE);
w1 = rn2(2) ? HALBERD : NASTY_PIKE;
w2 = rn2(2) ? DAGGER : KNIFE;
} else
w1 = rn2(2) ? SPEAR : SHORT_SWORD;
Expand Down Expand Up @@ -707,19 +707,13 @@ m_initweap(register struct monst *mtmp)
break;
case S_TROLL:
if (!rn2(2))
switch (rn2(4)) {
switch (rn2(2)) {
case 0:
(void) mongets(mtmp, RANSEUR);
break;
case 1:
(void) mongets(mtmp, NASTY_PIKE);
break;
case 2:
(void) mongets(mtmp, GLAIVE);
break;
case 3:
(void) mongets(mtmp, SPETUM);
break;
}
break;
case S_KOBOLD:
Expand Down Expand Up @@ -885,7 +879,7 @@ m_initweap(register struct monst *mtmp)
break;
case 5:
if (strongmonst(ptr))
(void) mongets(mtmp, LUCERN_HAMMER);
(void) mongets(mtmp, HALBERD);
else
(void) mongets(mtmp, AKLYS);
break;
Expand Down
26 changes: 13 additions & 13 deletions src/objects.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,48 +246,48 @@ WEAPON("runesword", "runed broadsword",
/* polearms */
/* spear-type */
WEAPON("nasty pike", "vulgar polearm",
0, 0, 1, 5, 80, 10, 6, 6, 0, 0, P, P_POLEARMS, IRON, HI_METAL),
0, 0, 1, 15, 80, 10, 6, 6, 0, 0, P, P_POLEARMS, IRON, HI_METAL),
/* +1 large */
WEAPON("ranseur", "hilted polearm",
0, 0, 1, 5, 50, 6, 4, 4, 0, 0, P, P_POLEARMS, IRON, HI_METAL),
0, 0, 1, 15, 50, 6, 4, 4, 0, 0, P, P_POLEARMS, IRON, HI_METAL),
/* +d4 both */
WEAPON("spetum", "forked polearm",
0, 0, 1, 5, 50, 5, 6, 6, 0, 0, P, P_POLEARMS, IRON, HI_METAL),
0, 0, 1, 0, 50, 5, 6, 6, 0, 0, P, P_POLEARMS, IRON, HI_METAL),
/* +1 small, +d6 large */
WEAPON("glaive", "single-edged polearm",
0, 0, 1, 8, 75, 6, 6, 10, 0, 0, S, P_POLEARMS, IRON, HI_METAL),
0, 0, 1, 0, 75, 6, 6, 10, 0, 0, S, P_POLEARMS, IRON, HI_METAL),
WEAPON("lance", None,
1, 0, 0, 4, 180, 10, 6, 8, 0, 0, P, P_LANCE, IRON, HI_METAL),
1, 0, 0, 14, 180, 10, 6, 8, 0, 0, P, P_LANCE, IRON, HI_METAL),
/* +2d10 when jousting with lance as primary weapon */
/* axe-type */
WEAPON("halberd", "angled poleaxe",
0, 0, 1, 8, 150, 10, 10, 6, 0, 0, P|S, P_POLEARMS, IRON, HI_METAL),
0, 0, 1, 24, 150, 10, 10, 6, 0, 0, P|S, P_POLEARMS, IRON, HI_METAL),
/* +1d6 large */
WEAPON("bardiche", "long poleaxe",
0, 0, 1, 4, 120, 7, 4, 4, 0, 0, S, P_POLEARMS, IRON, HI_METAL),
0, 0, 1, 0, 120, 7, 4, 4, 0, 0, S, P_POLEARMS, IRON, HI_METAL),
/* +1d4 small, +2d4 large */
WEAPON("voulge", "pole cleaver",
0, 0, 1, 4, 125, 5, 4, 4, 0, 0, S, P_POLEARMS, IRON, HI_METAL),
0, 0, 1, 0, 125, 5, 4, 4, 0, 0, S, P_POLEARMS, IRON, HI_METAL),
/* +d4 both */
WEAPON("dwarvish mattock", "broad pick",
0, 0, 1, 13, 120, 50, 12, 8, -1, 0, B, P_PICK_AXE, IRON, HI_METAL),
/* curved/hooked */
WEAPON("fauchard", "pole sickle",
0, 0, 1, 6, 60, 5, 6, 8, 0, 0, P|S, P_POLEARMS, IRON, HI_METAL),
0, 0, 1, 0, 60, 5, 6, 8, 0, 0, P|S, P_POLEARMS, IRON, HI_METAL),
WEAPON("guisarme", "pruning hook",
0, 0, 1, 6, 80, 5, 4, 8, 0, 0, S, P_POLEARMS, IRON, HI_METAL),
0, 0, 1, 0, 80, 5, 4, 8, 0, 0, S, P_POLEARMS, IRON, HI_METAL),
/* +1d4 small */
WEAPON("bill-guisarme", "hooked polearm",
0, 0, 1, 4, 120, 7, 4, 10, 0, 0, P|S, P_POLEARMS, IRON, HI_METAL),
0, 0, 1, 0, 120, 7, 4, 10, 0, 0, P|S, P_POLEARMS, IRON, HI_METAL),
WEAPON("scythe", "curved polearm",
0, 0, 1, 0, 60, 5, 8, 10, 0, 0, S, P_POLEARMS, IRON, HI_METAL),
/* +1d4 small */
/* other */
WEAPON("lucern hammer", "pronged polearm",
0, 0, 1, 5, 150, 7, 4, 6, 2, 0, B|P, P_POLEARMS, IRON, HI_METAL),
0, 0, 1, 0, 150, 7, 4, 6, 2, 0, B|P, P_POLEARMS, IRON, HI_METAL),
/* +1d4 small */
WEAPON("bec de corbin", "beaked polearm",
0, 0, 1, 4, 100, 8, 8, 6, 2, 0, B|P, P_POLEARMS, IRON, HI_METAL),
0, 0, 1, 0, 100, 8, 8, 6, 2, 0, B|P, P_POLEARMS, IRON, HI_METAL),

/* bludgeons */
WEAPON("mace", None,
Expand Down

0 comments on commit a733c47

Please sign in to comment.