Some minor player monster armor tweaks.

k21971 · Mar 27, 2022 · 0af6485 · 0af6485
1 parent 907b771
commit 0af6485
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/doc/evilhack-changelog.md b/doc/evilhack-changelog.md
@@ -2197,4 +2197,5 @@ The following changes to date are:
 - Invoking the Staff of Aesculapius cures withering
 - Implement new dragon armor system: DSM replaced by scaled armor (dtsund)
 - Fix: a couple small issues with dtsund-DSM implementation
+- Some minor player monster armor tweaks
 
diff --git a/src/makemon.c b/src/makemon.c
@@ -370,7 +370,7 @@ struct trobj Level20KitMonk2[] = {
 /* end monk structs */
 
 struct trobj Level20Kit1[] = {
-        { RING_MAIL, (4 | RND_SPE), ARMOR_CLASS, 1, 1 },
+        { CRYSTAL_PLATE_MAIL, (4 | RND_SPE), ARMOR_CLASS, 1, 1 },
         { GAUNTLETS_OF_POWER, (4 | RND_SPE), ARMOR_CLASS, 1, 1 },
         { CLOAK_OF_MAGIC_RESISTANCE, (4 | RND_SPE), ARMOR_CLASS, 1, 1 },
         { SPEED_BOOTS, (4 | RND_SPE), ARMOR_CLASS, 1, 1 },
@@ -610,11 +610,12 @@ unsigned short chance;
                 }
                 if (mtmp->m_lev > 19) {
                     if (objects[obj->otyp].oc_armcat == ARM_SUIT) {
-                        obj->dragonscales = rnd_class(FIRST_DRAGON_SCALES, LAST_DRAGON_SCALES - 1);
+                        obj->dragonscales = rnd_class(FIRST_DRAGON_SCALES,
+                                                      LAST_DRAGON_SCALES - 1);
                         if (monsndx(mtmp->data) == PM_WIZARD) {
                             /* Wizards have a guaranteed cloak of magic resistance. */
-                            obj->dragonscales = rn2(2) ? BLACK_DRAGON_SCALES
-                                                       : SILVER_DRAGON_SCALES;
+                            obj->dragonscales = rnd_class(FIRST_DRAGON_SCALES + 1,
+                                                          LAST_DRAGON_SCALES - 1);
                         }
                     }
                 }

diff --git a/src/mplayer.c b/src/mplayer.c
@@ -355,11 +355,12 @@ short typ;
     if (objects[obj->otyp].oc_armcat == ARM_SUIT) {
         /* make sure player monsters don't spawn with a set of
            chromatic dragon scales... */
-        obj->dragonscales = rnd_class(FIRST_DRAGON_SCALES, LAST_DRAGON_SCALES - 1);
+        obj->dragonscales = rnd_class(FIRST_DRAGON_SCALES,
+                                      LAST_DRAGON_SCALES - 1);
         if (monsndx(mon->data) == PM_WIZARD) {
             /* Wizards have a guaranteed cloak of magic resistance. */
-            obj->dragonscales = rn2(2) ? BLACK_DRAGON_SCALES
-                                       : SILVER_DRAGON_SCALES;
+            obj->dragonscales = rnd_class(FIRST_DRAGON_SCALES + 1,
+                                          LAST_DRAGON_SCALES - 1);
         }
     }
     /* Most players who get to the endgame who have cursed equipment

diff --git a/src/objnam.c b/src/objnam.c
@@ -4496,7 +4496,7 @@ struct obj *no_wish;
             typ = SPE_BLANK_PAPER;
             break;
         case CHROMATIC_DRAGON_SCALES:
-            typ = rnd_class(GRAY_DRAGON_SCALES, YELLOW_DRAGON_SCALES);
+            typ = rnd_class(FIRST_DRAGON_SCALES, LAST_DRAGON_SCALES - 1);
             break;
         default:
             /* catch any other non-wishable objects (venom) */