Changeset 158

Timestamp:

06/06/07 11:49:02 (1 year ago)

Author:

takkaria

Message:

#126: Make amnesia a timed effect, with a chance of affecting the ability to use staffs/wands/rods/books/artifacts. Almost certainly requires tweaking.

Files:

• trunk/src/cmd5.c (modified) (2 diffs)
• trunk/src/cmd6.c (modified) (8 diffs)
• trunk/src/defines.h (modified) (1 diff)
• trunk/src/melee2.c (modified) (1 diff)
• trunk/src/spells2.c (modified) (1 diff)
• trunk/src/use-obj.c (modified) (3 diffs)
• trunk/src/xtra1.c (modified) (1 diff)
• trunk/src/xtra2.c (modified) (1 diff)

trunk/src/cmd5.c

@@ -914 +914 @@
-        }
-
+        /* Check for amnesia */
+        else if (rand_int(3) != 0 && p_ptr->timed[TMD_AMNESIA])
+        {
+                /* Can't remember how */
+                if (flush_failure) flush();
+                msg_print("The words are meaningless; you cannot remember how to read.");
+        }
+
-        /* Process spell */
-        else
@@ -1084 +1092 @@
-        }
-
+        /* Check for amnesia */
+        else if (rand_int(3) != 0 && p_ptr->timed[TMD_AMNESIA])
+        {
+                /* Can't remember how */
+                if (flush_failure) flush();
+                msg_print("The words are meaningless; you cannot remember how to read.");
+        }
+
-        /* Success */
-        else

trunk/src/cmd6.c

@@ -258 +258 @@
-                return;
-        }
+
-        if (p_ptr->timed[TMD_CONFUSED])
-        {
@@ -263 +264 @@
-                return;
-        }
-
-
-        /* Restrict choices to scrolls */
@@ -289 +289 @@
-        p_ptr->energy_use = 100;
-
+        /* Check for amnesia */
+        if (rand_int(4) != 0 && p_ptr->timed[TMD_AMNESIA])
+        {
+                /* Can't remember how */
+                msg_print("You can't remember how to read!");
+                return;
+        }
+
-        /* Not identified yet */
-        ident = FALSE;
@@ -385 +393 @@
-        /* Take a turn */
-        p_ptr->energy_use = 100;
+
+        /* Check for amnesia */
+        if (rand_int(4) != 0 && p_ptr->timed[TMD_AMNESIA])
+        {
+                /* Can't remember how */
+                msg_print("You can't remember how to use the staff!");
+                return;
+        }
-
-        /* Not identified yet */
@@ -525 +541 @@
-        }
-
+        /* Check for amnesia */
+        if (rand_int(4) != 0 && p_ptr->timed[TMD_AMNESIA])
+        {
+                /* Can't remember how */
+                p_ptr->energy_use = 100;
+                msg_print("You can't remember how to activate the wand!");
+                return;
+        }
+
+
-        /* Aim the wand */
-        if (!use_object(o_ptr, &ident)) return;
@@ -571 +597 @@
-
-/*
-Activate (zap)
+Zap
- *
- * Unstack fully charged rods as needed.
@@ -694 +720 @@
-        p_ptr->energy_use = 100;
-
+        /* Check for amnesia */
+        if (rand_int(3) && p_ptr->timed[TMD_AMNESIA])
+        {
+                /* Can't remember how */
+                if (flush_failure) flush();
+                msg_print("You can't remember how to activate that.");
+                return;
+        }
+
-        /* Extract the item level */
-        lev = k_info[o_ptr->k_idx].level;
@@ -708 +743 @@
-        /* High level objects are harder */
-        chance = chance - ((lev > 50) ? 50 : lev);
+
-
-        /* Give everyone a (slight) chance */

trunk/src/defines.h

@@ -450 +450 @@
-        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,
-
+ TMD_AMNESIA,
-
-        TMD_MAX

trunk/src/melee2.c

@@ -1959 +1959 @@
-
-                        if (rand_int(100) < p_ptr->skills[SKILL_SAV])
-                        {
-                                msg_print("You resist the effects!");
-
-
-
-
-
+
+
+
-                        break;
-                }

trunk/src/spells2.c

@@ -863 +863 @@
-        /* Load screen */
-        screen_load();
-}
-
-
-
-
-
-
-/*
- * Forget everything
- */
-bool lose_all_info(void)
-{
-        int i;
-
-        /* Forget info about objects */
-        for (i = 0; i < INVEN_TOTAL; i++)
-        {
-                object_type *o_ptr = &inventory[i];
-
-                /* Skip non-objects */
-                if (!o_ptr->k_idx) continue;
-
-                /* Allow "protection" by the MENTAL flag */
-                if (o_ptr->ident & (IDENT_MENTAL)) continue;
-
-                /* Remove special inscription, if any */
-                if (o_ptr->pseudo) o_ptr->pseudo = 0;
-
-                /* Hack -- Clear the "felt" flag */
-                o_ptr->ident &= ~(IDENT_SENSE);
-
-                /* Hack -- Clear the "known" flag */
-                o_ptr->ident &= ~(IDENT_KNOWN);
-
-                /* Hack -- Clear the "empty" flag */
-                o_ptr->ident &= ~(IDENT_EMPTY);
-        }
-
-        /* Recalculate bonuses */
-        p_ptr->update |= (PU_BONUS);
-
-        /* Combine / Reorder the pack (later) */
-        p_ptr->notice |= (PN_COMBINE | PN_REORDER);
-
-        /* Window stuff */
-        p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER_0 | PW_PLAYER_1);
-
-        /* Mega-Hack -- Forget the map */
-        wiz_dark();
-
-        /* It worked */
-        return (TRUE);
-}
-

trunk/src/use-obj.c

@@ -503 +503 @@
-                        if (clear_timed(TMD_STUN)) *ident = TRUE;
-                        if (clear_timed(TMD_CUT)) *ident = TRUE;
+                        if (clear_timed(TMD_AMNESIA)) *ident = TRUE;
-                        break;
-                }
@@ -514 +515 @@
-                        if (clear_timed(TMD_STUN)) *ident = TRUE;
-                        if (clear_timed(TMD_CUT)) *ident = TRUE;
+                        if (clear_timed(TMD_AMNESIA)) *ident = TRUE;
-                        break;
-                }
@@ -527 +529 @@
-                        (void)clear_timed(TMD_STUN);
-                        (void)clear_timed(TMD_CUT);
+                        (void)clear_timed(TMD_AMNESIA);
-                        (void)do_res_stat(A_STR);
-                        (void)do_res_stat(A_CON);

trunk/src/xtra1.c

@@ -685 +685 @@
-static void prt_confused(int row, int col)
-{
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-

trunk/src/xtra2.c

@@ -58 +58 @@
-        { "Your eyes begin to tingle!", "Your eyes stop tingling.", 0, 0, (PU_BONUS | PU_MONSTERS), MSG_INFRARED },
-        { "You feel resistant to poison!", "You feel less resistant to poison", PR_OPPOSE_ELEMENTS, 0, 0, MSG_RES_POIS },
+        { "You feel your memories fade.", "Suddenly you can remember things again.", PR_CONFUSED, 0, 0, MSG_GENERIC },
-};
-