New conduct: never acquired reflection.

Yet another conduct - never acquired reflection. Not quite as difficult
as the 'never acquired magic resistance' conduct, but not exactly easy
either.

Author: k21971

doc/evilhack-changelog.md

@@ -3421,4 +3421,5 @@ The following changes to date are:
 - Fix: repair armor spell will not randomly target the Hand of Vecna
 - Suppress livelogging whilst in explore mode
 - New conduct: never acquired magic resistance
+- New conduct: never acquired reflection
 

include/you.h

@@ -131,6 +131,7 @@ struct u_conduct {     /* number of times... */
     long pets;         /* obtained a pet */
     long forgedarti;   /* forged an artifact */
     long antimagic;    /* acquired magic resistance */
+    long reflection;   /* acquired reflection */
     /* genocides already listed at end of game */
 };
 

src/artifact.c

@@ -1022,29 +1022,33 @@ long wp_mask;
     }
     if (spfx & SPFX_REFLECT) {
         if (otmp->oartifact == ART_MAGIC_MIRROR_OF_MERLIN) {
-            if (on)
+            if (on) {
                 EReflecting |= wp_mask;
-            else
+                u.uconduct.reflection++;
+            } else
                 EReflecting &= ~wp_mask;
         } else if (otmp
             && (otmp->oartifact == ART_LONGBOW_OF_DIANA
                 || otmp->oartifact == ART_CROSSBOW_OF_CARL)
             && (wp_mask & W_WEP)) { /* wielding various reflecting artifacts */
-            if (on)
+            if (on) {
                 EReflecting |= wp_mask;
-            else
+                u.uconduct.reflection++;
+            } else
                 EReflecting &= ~wp_mask;
         } else if (otmp && otmp->oartifact == ART_DRAGONBANE
             && (wp_mask & W_ARMG)) { /* or in Dragonbane's case, wear them */
-            if (on)
+            if (on) {
                 EReflecting |= wp_mask;
-            else
+                u.uconduct.reflection++;
+            } else
                 EReflecting &= ~wp_mask;
         } else if (otmp && otmp->oartifact == ART_GAUNTLETS_OF_PURITY
             && (wp_mask & W_ARMG)) { /* same */
-            if (on)
+            if (on) {
                 EReflecting |= wp_mask;
-            else
+                u.uconduct.reflection++;
+            } else
                 EReflecting &= ~wp_mask;
         }
     }

src/cmd.c

@@ -3150,6 +3150,7 @@ int final;
         you_are("invulnerable", from_what(INVULNERABLE));
     if (Antimagic)
         you_are("magic-protected", from_what(ANTIMAGIC));
+
     /* Partial intrinsic resistances */
     Sprintf(buf, "%d%% fire resistant", how_resistant(FIRE_RES));
     if (Fire_resistance)
@@ -3874,6 +3875,10 @@ int final;
         you_have_never("acquired magic resistance");
     }
 
+    if (!u.uconduct.reflection) {
+        you_have_never("acquired reflection");
+    }
+
     show_achievements(final);
 
     /* Pop up the window and wait for a key */

src/do_wear.c

@@ -848,7 +848,7 @@ Shield_on(VOID_ARGS)
 {
     /* no shield currently requires special handling when put on, but we
        keep this uncommented in case somebody adds a new one which does
-       [reflection is handled by setting u.uprops[REFLECTION].extrinsic
+       [reflection is handled by setting u.uprops[REFLECTING].extrinsic
        in setworn() called by armor_or_accessory_on() before Shield_on()] */
     switch (uarms->otyp) {
     case SMALL_SHIELD:

src/polyself.c

@@ -800,6 +800,13 @@ int mntmp;
     if (resists_mgc(youmonst.data))
         u.uconduct.antimagic++;
 
+    /* no reflection conduct. currently, the only monster
+       that has reflection that a player can polymorph
+       into is an adult silver dragon. should that ever
+       change, we'll need to revisit this bit of code */
+    if (youmonst.data == &mons[PM_SILVER_DRAGON])
+        u.uconduct.reflection++;
+
     /*
     mlvl = adj_lev(&mons[mntmp]);
      * We can't do the above, since there's no such thing as an

src/spell.c

@@ -869,6 +869,7 @@ register struct monst *mdef;
                              ? 250 : 100);
 
     if (youdefend) {
+        u.uconduct.reflection++;
         if (HReflecting) {
             if (!Blind)
 	        pline("The shimmering globe around you becomes slightly brighter.");

src/topten.c

@@ -522,6 +522,7 @@ encode_extended_conducts()
     add_achieveX(buf, "never_abused_alignment",           u.ualign.abuse == 0);
     add_achieveX(buf, "never_forged_an_artifact",        !u.uconduct.forgedarti);
     add_achieveX(buf, "never_acquired_magic_resistance", !u.uconduct.antimagic);
+    add_achieveX(buf, "never_acquired_reflection",       !u.uconduct.reflection);
 
     return buf;
 }
@@ -597,6 +598,8 @@ encodeconduct()
         e |= 1L << 21;
     if (!u.uconduct.antimagic)
         e |= 1L << 22;
+    if (!u.uconduct.reflection)
+        e |= 1L << 23;
 
     return e;
 }

src/worn.c

@@ -1646,9 +1646,13 @@ struct obj *armor;
         return objects[Dragon_armor_to_scales(armor)].oc_oprop;
 
     /* no magic resistance conduct */
-    if (prop == ANTIMAGIC)
+    if (obj_has_prop(armor, ANTIMAGIC))
         u.uconduct.antimagic++;
 
+    /* no reflection conduct */
+    if (obj_has_prop(armor, REFLECTING))
+        u.uconduct.reflection++;
+
     return prop;
 }