New conduct: never acquired magic resistance.

k21971 · k21971 · commit 8f0680af1a64 · 2024-05-16T21:42:20.000Z
This commit adds another conduct - never acquired magic resistance.
Decided to add this conduct now that someone (hi tinklebear) recently
ascended EvilHack without ever using MR. This conduct will not be easy,
at all. Some roles will need to get creative to achieve this, such as if
their quest artifact imparts MR just from holding it, or if their role
starts with MR. There's only one role that can never achieve this
conduct and win, and that's Infidel, as their quest artifact is required
to win the game.

There's some code formatting edits in here too.
diff --git a/doc/evilhack-changelog.md b/doc/evilhack-changelog.md
@@ -3420,4 +3420,5 @@ The following changes to date are:
 - New spells - burning hands, shocking grasp
 - Fix: repair armor spell will not randomly target the Hand of Vecna
 - Suppress livelogging whilst in explore mode
+- New conduct: never acquired magic resistance
 
diff --git a/include/you.h b/include/you.h
@@ -130,6 +130,7 @@ struct u_conduct {     /* number of times... */
     long artitouch;    /* touched an artifact */
     long pets;         /* obtained a pet */
     long forgedarti;   /* forged an artifact */
+    long antimagic;    /* acquired magic resistance */
     /* genocides already listed at end of game */
 };
 
diff --git a/src/artifact.c b/src/artifact.c
@@ -825,6 +825,7 @@ long wp_mask;
         mask = &EShock_resistance;
     } else if (dtyp == AD_MAGM) {
         mask = &EAntimagic;
+        u.uconduct.antimagic++;
     } else if (dtyp == AD_DISN) {
         mask = &EDisint_resistance;
     } else if (dtyp == AD_DRST) {
diff --git a/src/cmd.c b/src/cmd.c
@@ -3150,7 +3150,6 @@ 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)
@@ -3871,6 +3870,10 @@ int final;
         you_have_never("forged an artifact");
     }
 
+    if (!u.uconduct.antimagic) {
+        you_have_never("acquired magic resistance");
+    }
+
     show_achievements(final);
 
     /* Pop up the window and wait for a key */
diff --git a/src/do.c b/src/do.c
@@ -389,10 +389,10 @@ register struct obj *obj;
 
     if (obj->oclass != COIN_CLASS) {
         /* KMH, conduct */
-        if(!u.uconduct.gnostic++)
+        if (!u.uconduct.gnostic++)
             livelog_printf(LL_CONDUCT,
-                    "eschewed atheism, by dropping %s on an altar",
-                    doname(obj));
+                           "eschewed atheism, by dropping %s on an altar",
+                           doname(obj));
     } else {
         /* coins don't have bless/curse status */
         obj->blessed = obj->cursed = 0;
diff --git a/src/engrave.c b/src/engrave.c
@@ -1121,7 +1121,7 @@ doengrave()
 
     /* A single `x' is the traditional signature of an illiterate person */
     if (len != 1 || (!index(ebuf, 'x') && !index(ebuf, 'X')))
-        if(!u.uconduct.literate++)
+        if (!u.uconduct.literate++)
             livelog_printf(LL_CONDUCT,"became literate by engraving \"%s\"", ebuf);
 
 
diff --git a/src/polyself.c b/src/polyself.c
@@ -796,6 +796,10 @@ int mntmp;
     if (nohands(youmonst.data))
         make_glib(0);
 
+    /* no magic resistance conduct */
+    if (resists_mgc(youmonst.data))
+        u.uconduct.antimagic++;
+
     /*
     mlvl = adj_lev(&mons[mntmp]);
      * We can't do the above, since there's no such thing as an
diff --git a/src/potion.c b/src/potion.c
@@ -2397,7 +2397,7 @@ dodip()
             short save_dknown = obj->dknown;
 
             /* KMH, conduct */
-            if(!u.uconduct.polypiles++)
+            if (!u.uconduct.polypiles++)
                 livelog_printf(LL_CONDUCT, "polymorphed %s first item", uhis());
 
             obj = poly_obj(obj, STRANGE_OBJECT);
diff --git a/src/spell.c b/src/spell.c
@@ -498,9 +498,9 @@ register struct obj *spellbook;
 
             if (read_tribute("books", tribtitle, 0, (char *) 0, 0,
                              spellbook->o_id)) {
-                if(!u.uconduct.literate++)
+                if (!u.uconduct.literate++)
                     livelog_printf(LL_CONDUCT,
-                            "became literate by reading %s", tribtitle);
+                                   "became literate by reading %s", tribtitle);
                 check_unpaid(spellbook);
                 makeknown(booktype);
                 if (!u.uevent.read_tribute) {
diff --git a/src/topten.c b/src/topten.c
@@ -498,29 +498,30 @@ encode_extended_conducts()
     static char buf[BUFSZ];
 
     buf[0] = '\0';
-    add_achieveX(buf, "foodless",                  !u.uconduct.food);
-    add_achieveX(buf, "vegan",                     !u.uconduct.unvegan);
-    add_achieveX(buf, "vegetarian",                !u.uconduct.unvegetarian);
-    add_achieveX(buf, "atheist",                   !u.uconduct.gnostic);
-    add_achieveX(buf, "weaponless",                !u.uconduct.weaphit);
-    add_achieveX(buf, "pacifist",                  !u.uconduct.killer);
-    add_achieveX(buf, "illiterate",                !u.uconduct.literate);
-    add_achieveX(buf, "polyless",                  !u.uconduct.polypiles);
-    add_achieveX(buf, "polyselfless",              !u.uconduct.polyselfs);
-    add_achieveX(buf, "wishless",                  !u.uconduct.wishes);
-    add_achieveX(buf, "artiwishless",              !u.uconduct.wisharti);
-    add_achieveX(buf, "genocideless",              !num_genocides());
-    add_achieveX(buf, "never_had_a_pet",           !u.uconduct.pets);
-    add_achieveX(buf, "never_touched_an_artifact", !u.uconduct.artitouch);
-    add_achieveX(buf, "elberethless",              !u.uconduct.elbereth);
-    add_achieveX(buf, "blindfolded",                u.uroleplay.blind);
-    add_achieveX(buf, "nudist",                     u.uroleplay.nudist);
-    add_achieveX(buf, "hallucinating",              u.uroleplay.hallu);
-    add_achieveX(buf, "deaf",                       u.uroleplay.deaf);
-    add_achieveX(buf, "bonesless",                 !u.uroleplay.numbones);
-    add_achieveX(buf, "never_died",                 u.umortality == 0);
-    add_achieveX(buf, "never_abused_alignment",     u.ualign.abuse == 0);
-    add_achieveX(buf, "never_forged_an_artifact",  !u.uconduct.forgedarti);
+    add_achieveX(buf, "foodless",                        !u.uconduct.food);
+    add_achieveX(buf, "vegan",                           !u.uconduct.unvegan);
+    add_achieveX(buf, "vegetarian",                      !u.uconduct.unvegetarian);
+    add_achieveX(buf, "atheist",                         !u.uconduct.gnostic);
+    add_achieveX(buf, "weaponless",                      !u.uconduct.weaphit);
+    add_achieveX(buf, "pacifist",                        !u.uconduct.killer);
+    add_achieveX(buf, "illiterate",                      !u.uconduct.literate);
+    add_achieveX(buf, "polyless",                        !u.uconduct.polypiles);
+    add_achieveX(buf, "polyselfless",                    !u.uconduct.polyselfs);
+    add_achieveX(buf, "wishless",                        !u.uconduct.wishes);
+    add_achieveX(buf, "artiwishless",                    !u.uconduct.wisharti);
+    add_achieveX(buf, "genocideless",                    !num_genocides());
+    add_achieveX(buf, "never_had_a_pet",                 !u.uconduct.pets);
+    add_achieveX(buf, "never_touched_an_artifact",       !u.uconduct.artitouch);
+    add_achieveX(buf, "elberethless",                    !u.uconduct.elbereth);
+    add_achieveX(buf, "blindfolded",                      u.uroleplay.blind);
+    add_achieveX(buf, "nudist",                           u.uroleplay.nudist);
+    add_achieveX(buf, "hallucinating",                    u.uroleplay.hallu);
+    add_achieveX(buf, "deaf",                             u.uroleplay.deaf);
+    add_achieveX(buf, "bonesless",                       !u.uroleplay.numbones);
+    add_achieveX(buf, "never_died",                       u.umortality == 0);
+    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);
 
     return buf;
 }
@@ -594,6 +595,8 @@ encodeconduct()
         e |= 1L << 20;
     if (!u.uconduct.forgedarti)
         e |= 1L << 21;
+    if (!u.uconduct.antimagic)
+        e |= 1L << 22;
 
     return e;
 }
diff --git a/src/u_init.c b/src/u_init.c
@@ -1630,8 +1630,13 @@ register struct trobj *origtrop;
                 }
         }
 
-        /* nudist gets no armor */
-        if (u.uroleplay.nudist && obj->oclass == ARMOR_CLASS) {
+        /* nudist gets no armor. remove amulet for
+           wizards (giant and tortle races) in case
+           they want to try for the no magic resistance
+           conduct */
+        if (u.uroleplay.nudist
+            && (obj->oclass == ARMOR_CLASS
+                || (Role_if(PM_WIZARD) && obj->oclass == AMULET_CLASS))) {
             dealloc_obj(obj);
             origtrop++;
             memcpy(&temptrop, origtrop, sizeof(struct trobj));
diff --git a/src/worn.c b/src/worn.c
@@ -1645,6 +1645,10 @@ struct obj *armor;
     if (!prop && Is_dragon_armor(armor))
         return objects[Dragon_armor_to_scales(armor)].oc_oprop;
 
+    /* no magic resistance conduct */
+    if (prop == ANTIMAGIC)
+        u.uconduct.antimagic++;
+
     return prop;
 }
 
diff --git a/src/write.c b/src/write.c
@@ -227,9 +227,9 @@ register struct obj *pen;
     }
 
     /* KMH, conduct */
-    if(!u.uconduct.literate++)
+    if (!u.uconduct.literate++)
         livelog_printf(LL_CONDUCT,
-                "became literate by writing %s", an(typeword));
+                       "became literate by writing %s", an(typeword));
 
     new_obj = mksobj(i, FALSE, FALSE);
     new_obj->bknown = (paper->bknown && pen->bknown);
