Fix: Redcaps were not generating with their scythes.

elunna · Jul 26, 2023 · 73df12a · 73df12a
1 parent f248af4
commit 73df12a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/hackem_changelog.txt b/hackem_changelog.txt
@@ -16,6 +16,7 @@
 
 Version 1.2.0 (unreleased)
 
+Fix: Redcaps were not generating with their scythes.
 Changed chakrams to more closely match dnethack.
 Fix: Bad fruit #0? (Cloning slime molds caused a panic). Fixes #404
 Light arrows have a weight of 1.

diff --git a/src/makemon.c b/src/makemon.c
@@ -1096,20 +1096,20 @@ register struct monst *mtmp;
     switch (ptr->mlet) {
     case S_GIANT:
         if (rn2(2))
-            (void) mongets(mtmp, (mm != PM_ETTIN) ? BOULDER : CLUB);
+            mongets(mtmp, (mm != PM_ETTIN) ? BOULDER : CLUB);
         if (mm == PM_HECATONCHEIRE) {
             for (hbold = 0; hbold < rn1(3, 4); hbold++)
-              (void) mongets(mtmp, BOULDER);
+                mongets(mtmp, BOULDER);
         }
         break;
     case S_IMP:
         if (mm == PM_REDCAP) {
-            (void) mongets(mtmp, SCYTHE);
+            mongets(mtmp, SCYTHE);
         }
         break;
     case S_HUMAN:
         if (mm == PM_SHOPKEEPER) {
-            mongets(mtmp,SHOTGUN);
+            mongets(mtmp, SHOTGUN);
             m_initthrow(mtmp, SHOTGUN_SHELL, 20);
             m_initthrow(mtmp, SHOTGUN_SHELL, 20);
         }

diff --git a/src/weapon.c b/src/weapon.c
@@ -976,6 +976,7 @@ static NEARDATA const int rwep[] = {
 
 static NEARDATA const int pwep[] = { 
     SPIKED_CHAIN,
+    SCYTHE,
     HALBERD,
     BARDICHE,
     SPETUM,
@@ -1215,7 +1216,8 @@ struct obj *obj;
 static const NEARDATA short hwep[] = {
     CORPSE, /* cockatrice corpse */
     SPIKED_CHAIN,
-    TSURUGI, 
+    SCYTHE,
+    TSURUGI,
     RUNESWORD, 
     ROD, 
     TRIPLE_HEADED_FLAIL,