Fix: artifact rings have a fixed material, take two.

k21971 · k21971 · commit f9ba45f94ac9 · 2024-04-04T23:51:57.000Z
Better way to do this - make two new ring types that will never spawn
randomly, make those the placeholders for the artifact rings. This way
their appearance and material won't confict with other ring types.

Had to add spawn probabilities to rings, all of the normal rings have a
probability of one, just as before.

There's a bit of an object lookup bit I'd like to tweak further, but I
hate objnam.c, so it can wait.
diff --git a/doc/evilhack-changelog.md b/doc/evilhack-changelog.md
@@ -3369,4 +3369,7 @@ The following changes to date are:
 - Fix: unique monsters are not bound by maximum hit point value in grow_up()
 - Fix: Infidels couldn't drop cursed loadstones
 - Fix: misbehavior by #adjust
+- Fix: artifact rings have a fixed material
+- Revert: artifact rings have a fixed material
+- Fix: artifact rings have a fixed material, take two
 
diff --git a/include/artilist.h b/include/artilist.h
@@ -301,7 +301,7 @@ STATIC_OVL NEARDATA struct artifact artilist[] = {
       0, MH_DEMON, PHYS(8, 8), DFNS(AD_MAGM), NO_CARY, 0, A_LAWFUL,
       NON_PM, PM_DWARF, 9000L, CLR_RED, MITHRIL),
     /* The One Ring, from J.R.R Tolkien lore */
-    A("The One Ring", RIN_INVISIBILITY,
+    A("The One Ring", RIN_LUSTROUS,
       (SPFX_NOGEN | SPFX_NOWISH | SPFX_RESTR | SPFX_INTEL | SPFX_STLTH
        | SPFX_SEARCH | SPFX_WARN | SPFX_DFLAGH),
       0, MH_WRAITH, NO_ATTK, NO_DFNS, NO_CARY, 0, A_NONE, NON_PM,
@@ -571,7 +571,7 @@ STATIC_OVL NEARDATA struct artifact artilist[] = {
      *      Barbarian artifact chaotic (why it was neutral before is a bit confusing
      *      to me as most vanilla Barbarian race/role combinations are chaotic).
      */
-    A("The Ring of P\'hul", RIN_FREE_ACTION,
+    A("The Ring of P\'hul", RIN_ANCIENT,
       (SPFX_NOGEN | SPFX_RESTR | SPFX_INTEL | SPFX_DEFN), 0, 0,
       NO_ATTK, DFNS(AD_MAGM), CARY(AD_DISE), 0, A_CHAOTIC, PM_BARBARIAN,
       NON_PM, 5000L, NO_COLOR, GEMSTONE),
diff --git a/src/do.c b/src/do.c
@@ -671,9 +671,11 @@ register struct obj *obj;
             pline_The("sink looks as good as new.");
             break;
         case RIN_INVISIBILITY:
+        case RIN_LUSTROUS:
             You("don't see anything happen to the sink.");
             break;
         case RIN_FREE_ACTION:
+        case RIN_ANCIENT:
             You_see("the ring slide right down the drain!");
             break;
         case RIN_SEE_INVISIBLE:
diff --git a/src/do_wear.c b/src/do_wear.c
@@ -1516,6 +1516,7 @@ register struct obj *obj;
     case RIN_POLYMORPH:
     case RIN_POLYMORPH_CONTROL:
     case RIN_FREE_ACTION:
+    case RIN_ANCIENT:
     case RIN_SLOW_DIGESTION:
     case RIN_SUSTAIN_ABILITY:
     case MEAT_RING:
@@ -1544,6 +1545,7 @@ register struct obj *obj;
         }
         break;
     case RIN_INVISIBILITY:
+    case RIN_LUSTROUS:
         if (!oldprop && !HInvis && !BInvis && !Blind) {
             learnring(obj, TRUE);
             newsym(u.ux, u.uy);
@@ -1632,6 +1634,7 @@ boolean gone;
     case RIN_POLYMORPH:
     case RIN_POLYMORPH_CONTROL:
     case RIN_FREE_ACTION:
+    case RIN_ANCIENT:
     case RIN_SLOW_DIGESTION:
     case RIN_SUSTAIN_ABILITY:
     case MEAT_RING:
@@ -1656,6 +1659,7 @@ boolean gone;
         }
         break;
     case RIN_INVISIBILITY:
+    case RIN_LUSTROUS:
         if (!Invis && !BInvis && !Blind) {
             newsym(u.ux, u.uy);
             Your("body seems to unfade%s.",
diff --git a/src/dogmove.c b/src/dogmove.c
@@ -179,6 +179,8 @@ boolean check_if_better, stashing;
              || otmp->otyp == RIN_PROTECTION
              || otmp->otyp == RIN_LEVITATION
              || otmp->otyp == RIN_FREE_ACTION
+             || otmp->otyp == RIN_ANCIENT
+             || otmp->otyp == RIN_LUSTROUS
              || otmp->otyp == FROST_HORN
              || otmp->otyp == FIRE_HORN
              || otmp->otyp == MAGIC_HARP
diff --git a/src/eat.c b/src/eat.c
@@ -2239,6 +2239,7 @@ struct obj *otmp;
                 }
                 break;
             case RIN_INVISIBILITY:
+            case RIN_LUSTROUS:
                 if (!oldprop && !EInvis && !BInvis && !See_invisible
                     && !Blind) {
                     newsym(u.ux, u.uy);
@@ -2298,6 +2299,7 @@ struct obj *otmp;
             context.botl = 1;
             break;
         case RIN_FREE_ACTION:
+        case RIN_ANCIENT:
             /* Give sleep resistance instead */
             if (how_resistant(SLEEP_RES) < 100) {
                 accessory_has_effect(otmp);
diff --git a/src/muse.c b/src/muse.c
@@ -3490,7 +3490,8 @@ struct obj *obj;
         || mon->data == &mons[PM_GHOST]) /* don't loot bones piles */
         return FALSE;
 
-    if (typ == WAN_MAKE_INVISIBLE || typ == POT_INVISIBILITY || typ == RIN_INVISIBILITY)
+    if (typ == WAN_MAKE_INVISIBLE || typ == POT_INVISIBILITY
+        || typ == RIN_INVISIBILITY || typ == RIN_LUSTROUS)
         return (boolean) (!mon->minvis && !mon->invis_blkd
                           && !attacktype(mon->data, AT_GAZE));
     if (typ == WAN_SPEED_MONSTER || typ == POT_SPEED)
@@ -3576,9 +3577,7 @@ struct obj *obj;
             return TRUE;
         break;
     case RING_CLASS:
-        /* Should match the list in m_dowear_type.
-         * Uniques don't go for invisibility or teleportation;
-         * it would probably be a waste of time. */
+        /* Should match the list in m_dowear_type */
         if (typ == RIN_PROTECTION
             || typ == RIN_INCREASE_DAMAGE
             || typ == RIN_INCREASE_ACCURACY)
@@ -3599,12 +3598,9 @@ struct obj *obj;
             return (!mon_prop(mon, REGENERATION));
         if (typ == RIN_LEVITATION)
             return (grounded(mon->data));
-        if (typ == RIN_FREE_ACTION)
+        if (typ == RIN_FREE_ACTION || typ == RIN_ANCIENT)
             return TRUE;
-        /* Below this line are off-limits to uniques */
-        if (mon->data->geno & G_UNIQ)
-            return (FALSE);
-        if (typ == RIN_INVISIBILITY)
+        if (typ == RIN_INVISIBILITY || typ == RIN_LUSTROUS)
             return !(mon->minvis);
         if (typ == RIN_TELEPORTATION)
             return (!mon_prop(mon, TELEPORT));
diff --git a/src/o_init.c b/src/o_init.c
@@ -211,6 +211,9 @@ int *lo_p, *hi_p; /* output: range that item belongs among */
         *hi_p = i - 1;
         break;
     case RING_CLASS:
+        if (otyp >= RIN_ADORNMENT && otyp <= RIN_PROTECTION_FROM_SHAPE_CHAN)
+            *lo_p = RIN_ADORNMENT, *hi_p = RIN_PROTECTION_FROM_SHAPE_CHAN;
+        break;
     case WAND_CLASS:
     case VENOM_CLASS:
         /* entire class */
diff --git a/src/objects.c b/src/objects.c
@@ -614,73 +614,77 @@ BOOTS("fumble boots", "riding boots",
 #undef ARMOR
 
 /* rings ... */
-/* note that prob = 1 for all rings and currently can't be specified
- * per ring without changing the RING definition */
-#define RING(name,stone,power,cost,mgc,spec,mohs,metal,color) \
-    OBJECT(OBJ(name, stone),                                          \
-           BITS(0, 0, spec, 0, mgc, spec, 0, 0, 0,                    \
-                HARDGEM(mohs), 0, P_NONE, metal),                     \
-           power, RING_CLASS, 1, 0, 3, cost, 0, 0, 0, 0, 15, color)
+/* note that prob = 1 for all normal rings */
+#define RING(name,stone,power,prob,cost,mgc,spec,mohs,metal,color) \
+    OBJECT(OBJ(name, stone),                                           \
+           BITS(0, 0, spec, 0, mgc, spec, 0, 0, 0,                     \
+                HARDGEM(mohs), 0, P_NONE, metal),                      \
+           power, RING_CLASS, prob, 0, 3, cost, 0, 0, 0, 0, 15, color)
 RING("adornment", "wooden",
-     ADORNED,                  100, 1, 1, 2, WOOD, HI_WOOD),
+     ADORNED,                  1, 100, 1, 1, 2, WOOD, HI_WOOD),
 RING("gain strength", "granite",
-     0,                        150, 1, 1, 7, MINERAL, HI_MINERAL),
+     0,                        1, 150, 1, 1, 7, MINERAL, HI_MINERAL),
 RING("gain constitution", "opal",
-     0,                        150, 1, 1, 7, MINERAL, HI_MINERAL),
+     0,                        1, 150, 1, 1, 7, MINERAL, HI_MINERAL),
 RING("increase accuracy", "clay",
-     0,                        150, 1, 1, 4, MINERAL, CLR_RED),
+     0,                        1, 150, 1, 1, 4, MINERAL, CLR_RED),
 RING("increase damage", "coral",
-     0,                        150, 1, 1, 4, MINERAL, CLR_ORANGE),
+     0,                        1, 150, 1, 1, 4, MINERAL, CLR_ORANGE),
 RING("protection", "black onyx",
-     PROTECTION,               100, 1, 1, 7, MINERAL, CLR_BLACK),
+     PROTECTION,               1, 100, 1, 1, 7, MINERAL, CLR_BLACK),
         /* 'PROTECTION' intrinsic enhances MC from worn armor by +1,
            regardless of ring's enchantment; wearing a second ring of
            protection (or even one ring of protection combined with
            cloak of protection) doesn't give a second MC boost */
 RING("regeneration", "moonstone",
-     REGENERATION,             200, 1, 0,  6, MINERAL, HI_MINERAL),
+     REGENERATION,             1, 200, 1, 0,  6, MINERAL, HI_MINERAL),
 RING("searching", "tiger eye",
-     SEARCHING,                200, 1, 0,  6, GEMSTONE, CLR_BROWN),
+     SEARCHING,                1, 200, 1, 0,  6, GEMSTONE, CLR_BROWN),
 RING("stealth", "jade",
-     STEALTH,                  100, 1, 0,  6, GEMSTONE, CLR_GREEN),
+     STEALTH,                  1, 100, 1, 0,  6, GEMSTONE, CLR_GREEN),
 RING("sustain ability", "bronze",
-     FIXED_ABIL,               100, 1, 0,  4, COPPER, HI_COPPER),
+     FIXED_ABIL,               1, 100, 1, 0,  4, COPPER, HI_COPPER),
 RING("levitation", "agate",
-     LEVITATION,               200, 1, 0,  7, GEMSTONE, CLR_RED),
+     LEVITATION,               1, 200, 1, 0,  7, GEMSTONE, CLR_RED),
 RING("hunger", "topaz",
-     HUNGER,                   100, 1, 0,  8, GEMSTONE, CLR_CYAN),
+     HUNGER,                   1, 100, 1, 0,  8, GEMSTONE, CLR_CYAN),
 RING("aggravate monster", "sapphire",
-     AGGRAVATE_MONSTER,        150, 1, 0,  9, GEMSTONE, CLR_BLUE),
+     AGGRAVATE_MONSTER,        1, 150, 1, 0,  9, GEMSTONE, CLR_BLUE),
 RING("conflict", "ruby",
-     CONFLICT,                 300, 1, 0,  9, GEMSTONE, CLR_RED),
+     CONFLICT,                 1, 300, 1, 0,  9, GEMSTONE, CLR_RED),
 RING("warning", "diamond",
-     WARNING,                  100, 1, 0, 10, GEMSTONE, CLR_WHITE),
+     WARNING,                  1, 100, 1, 0, 10, GEMSTONE, CLR_WHITE),
 RING("poison resistance", "pearl",
-     POISON_RES,               150, 1, 0,  4, BONE, CLR_WHITE),
+     POISON_RES,               1, 150, 1, 0,  4, BONE, CLR_WHITE),
 RING("fire resistance", "iron",
-     FIRE_RES,                 200, 1, 0,  5, IRON, HI_METAL),
+     FIRE_RES,                 1, 200, 1, 0,  5, IRON, HI_METAL),
 RING("cold resistance", "brass",
-     COLD_RES,                 150, 1, 0,  4, COPPER, HI_COPPER),
+     COLD_RES,                 1, 150, 1, 0,  4, COPPER, HI_COPPER),
 RING("shock resistance", "copper",
-     SHOCK_RES,                150, 1, 0,  3, COPPER, HI_COPPER),
+     SHOCK_RES,                1, 150, 1, 0,  3, COPPER, HI_COPPER),
 RING("free action", "twisted",
-     FREE_ACTION,              200, 1, 0,  6, METAL, HI_METAL),
+     FREE_ACTION,              1, 200, 1, 0,  6, METAL, HI_METAL),
 RING("slow digestion", "steel",
-     SLOW_DIGESTION,           200, 1, 0,  8, METAL, HI_METAL),
+     SLOW_DIGESTION,           1, 200, 1, 0,  8, METAL, HI_METAL),
 RING("teleportation", "silver",
-     TELEPORT,                 200, 1, 0,  3, SILVER, HI_SILVER),
+     TELEPORT,                 1, 200, 1, 0,  3, SILVER, HI_SILVER),
 RING("teleport control", "gold",
-     TELEPORT_CONTROL,         300, 1, 0,  3, GOLD, HI_GOLD),
+     TELEPORT_CONTROL,         1, 300, 1, 0,  3, GOLD, HI_GOLD),
 RING("polymorph", "ivory",
-     POLYMORPH,                300, 1, 0,  4, BONE, CLR_WHITE),
+     POLYMORPH,                1, 300, 1, 0,  4, BONE, CLR_WHITE),
 RING("polymorph control", "emerald",
-     POLYMORPH_CONTROL,        300, 1, 0,  8, GEMSTONE, CLR_BRIGHT_GREEN),
+     POLYMORPH_CONTROL,        1, 300, 1, 0,  8, GEMSTONE, CLR_BRIGHT_GREEN),
 RING("invisibility", "wire",
-     INVIS,                    150, 1, 0,  5, METAL, HI_METAL),
+     INVIS,                    1, 150, 1, 0,  5, METAL, HI_METAL),
 RING("see invisible", "engagement",
-     SEE_INVIS,                150, 1, 0,  5, GOLD, HI_METAL),
+     SEE_INVIS,                1, 150, 1, 0,  5, GOLD, HI_METAL),
 RING("protection from shape changers", "shiny",
-     PROT_FROM_SHAPE_CHANGERS, 100, 1, 0,  5, PLATINUM, CLR_BRIGHT_CYAN),
+     PROT_FROM_SHAPE_CHANGERS, 1, 100, 1, 0,  5, PLATINUM, CLR_BRIGHT_CYAN),
+/* placeholders for artifact rings; will not spawn randomly */
+RING("ancient", None,
+     FREE_ACTION,              0, 800, 1, 0,  8, GEMSTONE, CLR_BRIGHT_GREEN),
+RING("lustrous", None,
+     INVIS,                    0, 600, 1, 0,  3, GOLD, HI_GOLD),
 #undef RING
 
 /* amulets ... - THE Amulet comes last because it is special */
diff --git a/src/worn.c b/src/worn.c
@@ -919,7 +919,9 @@ boolean racialexception;
                     && obj->otyp != RIN_INCREASE_ACCURACY
                     && obj->otyp != RIN_PROTECTION
                     && obj->otyp != RIN_LEVITATION
-                    && obj->otyp != RIN_FREE_ACTION))
+                    && obj->otyp != RIN_FREE_ACTION
+                    && obj->otyp != RIN_ANCIENT
+                    && obj->otyp != RIN_LUSTROUS))
                 continue;
             if (mon->data == &mons[PM_NAZGUL]
                 && obj->otyp == RIN_INVISIBILITY)
@@ -1470,6 +1472,7 @@ struct obj *obj;
         rc = !mon_prop(mon, REGENERATION) ? 25 : 5;
         break;
     case RIN_INVISIBILITY:
+    case RIN_LUSTROUS:
         if (mon->mtame || mon->mpeaceful)
             /* Monsters actually don't know if you can
              * see invisible, but for tame or peaceful monsters
@@ -1501,6 +1504,7 @@ struct obj *obj;
         rc = grounded(mon->data) ? 20 : 0;
         break;
     case RIN_FREE_ACTION:
+    case RIN_ANCIENT:
         rc = 30;
         break;
     }
diff --git a/win/share/objects.txt b/win/share/objects.txt
