Renamed giant robe to great robe - avoids lookup conflicts with giants.

If unknown, you'll also learn the identity of the great robe if you try and can't put it on.
elunna · Sep 27, 2023 · cb1c861 · cb1c861
1 parent 163fd71
commit cb1c861
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/include/obj.h b/include/obj.h
@@ -242,7 +242,7 @@ struct obj {
      || otmp->otyp == SPIKED_BARDING || otmp->otyp == BARDING_OF_REFLECTION)
 #define is_robe(otmp) \
     (otmp->otyp == ROBE \
-     || otmp->otyp == GIANT_ROBE \
+     || otmp->otyp == GREAT_ROBE \
      || otmp->otyp == ROBE_OF_POWER \
      || otmp->otyp == ROBE_OF_PROTECTION \
      || otmp->otyp == ROBE_OF_WEAKNESS)

diff --git a/include/objclass.h b/include/objclass.h
@@ -104,7 +104,7 @@ struct objclass {
      || is_wood(otmp) || is_bone(otmp) || is_stone(otmp))
 
 #define giant_sized(otmp) \
-    (otmp->otyp == GIANT_ROBE || otmp->otyp == LARGE_SPLINT_MAIL)
+    (otmp->otyp == GREAT_ROBE || otmp->otyp == LARGE_SPLINT_MAIL)
 
 /* primary damage: fire/rust/--- */
 /* is_flammable(otmp), is_rottable(otmp) in mkobj.c */

diff --git a/src/do_wear.c b/src/do_wear.c
@@ -2669,6 +2669,7 @@ boolean noisy;
                    && otmp && giant_sized(otmp)) {
             if (noisy)
                 You("are too small to wear such a suit of armor.");
+            makeknown(otmp->otyp);
             err++;
         } else
             *mask = W_ARM;

diff --git a/src/objects.c b/src/objects.c
@@ -558,7 +558,7 @@ ARMOR("jacket", None,
 /* Robes */
 ARMOR("robe", "red robe",
       0, 0, 0, 0,           1, 1, 40, 25, 9, 0, ARM_SUIT, LEATHER, CLR_RED),
-ARMOR("giant robe", None,
+ARMOR("great robe", None,
       0, 0, 0, 0,           1, 1, 60, 25, 9, 0, ARM_SUIT, LEATHER, CLR_RED),
 ARMOR("robe of protection", "blue robe",                        /* Slash'EM */
       0, 1, 0, 0,           1, 1, 40, 50, 5, 1, ARM_SUIT, LEATHER, CLR_BLUE),

diff --git a/src/u_init.c b/src/u_init.c
@@ -409,11 +409,11 @@ struct inv_sub {
     { PM_VAMPIRIC, FOOD_RATION, POT_VAMPIRE_BLOOD     },
     { PM_VAMPIRIC, CRAM_RATION, POT_VAMPIRE_BLOOD     },
     /* Giants have special considerations */
-    { PM_GIANT, ROBE, GIANT_ROBE },
-    { PM_GIANT, ROBE_OF_POWER, GIANT_ROBE },
+    { PM_GIANT, ROBE, GREAT_ROBE },
+    { PM_GIANT, ROBE_OF_POWER, GREAT_ROBE },
     { PM_GIANT, RING_MAIL, HELMET },
     { PM_GIANT, LIGHT_ARMOR, HELMET },
-    { PM_GIANT, CLOAK_OF_MAGIC_RESISTANCE, GIANT_ROBE },
+    { PM_GIANT, CLOAK_OF_MAGIC_RESISTANCE, GREAT_ROBE },
     { PM_GIANT, RIN_STEALTH, RIN_SEARCHING },
     { PM_GIANT, SPLINT_MAIL, LARGE_SPLINT_MAIL },
     { PM_GIANT, CHAIN_MAIL, LOW_BOOTS },

diff --git a/win/share/objects.txt b/win/share/objects.txt
@@ -3181,7 +3181,7 @@ Z = (195, 195, 195)
   ....OOOOOOOOA...
   ................
 }
-# tile 166 (giant robe)
+# tile 166 (great robe)
 {
   ................
   ......XXX.......