Changeset 898 for trunk

Timestamp:

05/12/08 00:21:54 (5 days ago)

Author:

takkaria

Message:

Add a temporary confusion resist.

Files:

• trunk/src/defines.h (modified) (4 diffs)
• trunk/src/xtra1.c (modified) (1 diff)
• trunk/src/xtra2.c (modified) (4 diffs)
• trunk/src/xtra3.c (modified) (3 diffs)

trunk/src/defines.h

@@ -230 +230 @@
- *
- * STORE_MAX_KEEP must be < STORE_INVEN_MAX.
- *
- */
-#define STORE_INVEN_MAX 24              /* Max number of discrete objs in inven */
@@ -436 +435 @@
-        TMD_INVULN, TMD_HERO, TMD_SHERO, TMD_SHIELD, TMD_BLESSED, TMD_SINVIS,
-        TMD_SINFRA, TMD_OPP_ACID, TMD_OPP_ELEC, TMD_OPP_FIRE, TMD_OPP_COLD,
-
+OPP_CONF, TMD_
-
-        TMD_MAX
@@ -1810 +1809 @@
-          k_info[(T)->k_idx].aware))
-
+
-/*
- * Determine if the attr and char should consider the item's flavor
@@ -1875 +1875 @@
-         (flavor_info[k_info[(T)->k_idx].flavor].d_char) : \
-         (k_info[(T)->k_idx].d_char))
-
-
-/*

trunk/src/xtra1.c

@@ -1120 +1120 @@
-                p_ptr->telepathy = TRUE;
-
+        /* Temporary resist confusion */
+        if (p_ptr->timed[TMD_OPP_CONF])
+                p_ptr->resist_confu = TRUE;
+
-
-

trunk/src/xtra2.c

@@ -33 +33 @@
-static bool set_oppose_fire(int v);
-static bool set_oppose_cold(int v);
+static bool set_oppose_conf(int v);
-static bool set_stun(int v);
-static bool set_cut(int v);
@@ -68 +69 @@
-        { "", "", 0, 0, 0 },  /* fire -- handled seperately */
-        { "", "", 0, 0, 0 },  /* cold -- handled seperately */
+        { "", "", 0, 0, 0 },  /* conf -- handled seperately */
-        { "You feel resistant to poison!", "You feel less resistant to poison.", 0, 0, MSG_RES_POIS },
-        { "You feel your memories fade.", "Your memories come flooding back.", 0, 0, MSG_GENERIC },
@@ -92 +94 @@
-        else if (idx == TMD_OPP_FIRE) return set_oppose_fire(v);
-        else if (idx == TMD_OPP_COLD) return set_oppose_cold(v);
+        else if (idx == TMD_OPP_CONF) return set_oppose_conf(v);
-
-        /* Find the effect */
@@ -354 +357 @@
-
-        /* Redraw */
+        p_ptr->redraw |= PR_STATUS;
+
+        /* Handle stuff */
+        handle_stuff();
+
+        /* Result */
+        return (TRUE);
+}
+
+
+/*
+ * Set "p_ptr->timed[TMD_OPP_CONF]", notice observable changes
+ */
+static bool set_oppose_conf(int v)
+{
+        bool notice = FALSE;
+
+        /* Hack -- Force good values */
+        v = (v > 10000) ? 10000 : (v < 0) ? 0 : v;
+
+        /* Open */
+        if (v)
+        {
+                if (!p_ptr->timed[TMD_OPP_CONF] && !p_ptr->resist_confu)
+                {
+                        message(MSG_RES_ELEC, 0, "You feel remarkably clear-headed!");
+                        notice = TRUE;
+                }
+        }
+
+        /* Shut */
+        else
+        {
+                if (p_ptr->timed[TMD_OPP_CONF] && !p_ptr->resist_confu)
+                {
+                        message(MSG_RECOVER, 0, "You feel less clear-headed.");
+                        notice = TRUE;
+                }
+        }
+
+        /* Use the value */
+        p_ptr->timed[TMD_OPP_CONF] = v;
+
+        /* Nothing to notice */
+        if (!notice) return (FALSE);
+
+        /* Disturb */
+        if (disturb_state) disturb(0, 0);
+
+        /* Redraw */
+        p_ptr->update |= PU_BONUS;
-        p_ptr->redraw |= PR_STATUS;
-

trunk/src/xtra3.c

@@ -1 +1 @@
-/*
- * File: xtra3.c
- 
+
- *          things that are displayed by the game.
- *
@@ -24 +24 @@
-
-#include "tvalsval.h"
-
-
-/* 
@@ -668 +667 @@
-        { TMD_OPP_COLD,  S("RCold"),      TERM_WHITE },
-        { TMD_OPP_POIS,  S("RPois"),      TERM_GREEN },
+        { TMD_OPP_CONF,  S("RConf"),      TERM_VIOLET },
-        { TMD_AMNESIA,   S("Amnesiac"),   TERM_ORANGE },
-};