Fix: Flame mages and Ice mages could two-weapon. This was due to them…

… having two AT_WEAP attacks in their monst.c definitions.
elunna · Oct 27, 2023 · 0354cf3 · 0354cf3
1 parent 2b6de39
commit 0354cf3
Showing 1 changed file with 7 additions and 12 deletions.
diff --git a/src/monst.c b/src/monst.c
@@ -7498,10 +7498,8 @@ struct permonst _mons2[] = {
         MH_HUMAN, 12, CLR_YELLOW),
     MON("flame mage", S_HUMAN,                                  /* Slash'EM */
         LVL(10, 12, 10, 3, 0), G_NOGEN,
-        A(ATTK(AT_WEAP, AD_PHYS, 1, 6), 
-          ATTK(AT_WEAP, AD_PHYS, 1, 6),
-          ATTK(AT_MAGC, AD_SPEL, 0, 0), 
-          NO_ATTK, NO_ATTK, NO_ATTK),
+        A(ATTK(AT_WEAP, AD_PHYS, 1, 6),
+          NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK),
         SIZ(WT_HUMAN, 400, MS_HUMANOID, MZ_HUMAN), 0, 0,
         M1_HUMANOID | M1_OMNIVORE,
         M2_NOPOLY | M2_STRONG | M2_COLLECT | M2_MAGIC | M2_HOSTILE,
@@ -7516,10 +7514,8 @@ struct permonst _mons2[] = {
         MH_HUMAN, 12, CLR_YELLOW),
     MON("ice mage", S_HUMAN,                                    /* Slash'EM */
         LVL(10, 12, 10, 3, 0), G_NOGEN,
-        A(ATTK(AT_WEAP, AD_PHYS, 1, 6), 
-          ATTK(AT_WEAP, AD_PHYS, 1, 6),
-          ATTK(AT_MAGC, AD_SPEL, 0, 0), 
-          NO_ATTK, NO_ATTK, NO_ATTK),
+        A(ATTK(AT_WEAP, AD_PHYS, 1, 6),
+          NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK),
         SIZ(WT_HUMAN, 400, MS_HUMANOID, MZ_HUMAN), 0, 0,
         M1_HUMANOID | M1_OMNIVORE,
         M2_NOPOLY | M2_STRONG | M2_COLLECT | M2_MAGIC | M2_HOSTILE,
@@ -7561,9 +7557,8 @@ struct permonst _mons2[] = {
         M3_INFRAVISIBLE, 0, MH_HUMAN, 12, CLR_YELLOW),
     MON("necromancer", S_HUMAN,                                 /* Slash'EM */
         LVL(10, 12, 10, 3, 0), G_NOGEN,
-        A(ATTK(AT_WEAP, AD_PHYS, 1, 6), 
-          ATTK(AT_MAGC, AD_SPEL, 0, 0), 
-          NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK),
+        A(ATTK(AT_WEAP, AD_PHYS, 1, 6),
+          NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK),
         SIZ(WT_HUMAN, 400, MS_HUMANOID, MZ_HUMAN), MR_DRAIN | MR_SICK, 0,
         M1_HUMANOID | M1_OMNIVORE,
         M2_NOPOLY | M2_STRONG | M2_COLLECT | M2_MAGIC | M2_HOSTILE,
@@ -7633,7 +7628,7 @@ struct permonst _mons2[] = {
         A(ATTK(AT_WEAP, AD_PHYS, 1, 6),
           ATTK(AT_WEAP, AD_PHYS, 1, 6),
           NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK),
-        SIZ(WT_HUMAN, 400, MS_HUMANOID, MZ_HUMAN), MR_DRAIN  | MR_SICK, 0,
+        SIZ(WT_HUMAN, 400, MS_HUMANOID, MZ_HUMAN), MR_DRAIN | MR_SICK, 0,
         M1_HUMANOID | M1_OMNIVORE,
         M2_NOPOLY | M2_STRONG | M2_FEMALE | M2_COLLECT | M2_HOSTILE,
         M3_INFRAVISIBLE, 0, MH_HUMAN, 12, CLR_BLACK),