Changeset 899 for trunk

Timestamp:

05/16/08 10:57:27 (4 months ago)

Author:

takkaria

Message:

• Add "terror" timed effect. This is fear + small speed boost.
  
• Add "stoneskin" timed effect. This is +40AC + small speed penalty.
  
• (#351) Mushrooms of Clear Mind now cures hallu and gives temp rConf.
  
• (#522, #369) Tone down CSW and CCW.
  
• Add "deep descent" effect, which lowers recall depth by 2 dungeon levels and teleports/recalls there.
  
• Add "line of sight confusion" effect, analagous to the slow/sleep effects.
  
• Add few new effects for mushrooms, one commented out.
  

Files:

• trunk/src/attack.c (modified) (1 diff)
• trunk/src/defines.h (modified) (1 diff)
• trunk/src/dungeon.c (modified) (1 diff)
• trunk/src/effects.c (modified) (6 diffs)
• trunk/src/externs.h (modified) (1 diff)
• trunk/src/list-effects.h (modified) (4 diffs)
• trunk/src/spells2.c (modified) (2 diffs)
• trunk/src/types.h (modified) (1 diff)
• trunk/src/xtra1.c (modified) (3 diffs)
• trunk/src/xtra2.c (modified) (1 diff)
• trunk/src/xtra3.c (modified) (2 diffs)

trunk/src/attack.c

@@ -450 +450 @@
-
-        /* Handle player fear */
-timed[TMD_AFRAID]
+afraid
-        {
-                /* Message */

trunk/src/defines.h

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

trunk/src/dungeon.c

@@ -1073 +1073 @@
-                            !p_ptr->timed[TMD_BLIND] && !p_ptr->timed[TMD_CONFUSED] &&
-                            !p_ptr->timed[TMD_POISONED] && !p_ptr->timed[TMD_AFRAID] &&
+                            !p_ptr->timed[TMD_TERROR] &&
-                            !p_ptr->timed[TMD_STUN] && !p_ptr->timed[TMD_CUT] &&
-                            !p_ptr->timed[TMD_SLOW] && !p_ptr->timed[TMD_PARALYZED] &&

trunk/src/effects.c

@@ -242 +242 @@
-                        if (clear_timed(TMD_CONFUSED)) *ident = TRUE;
-                        if (clear_timed(TMD_AFRAID)) *ident = TRUE;
+                        if (clear_timed(TMD_IMAGE)) *ident = TRUE;
+                        if (!p_ptr->resist_confu && inc_timed(TMD_OPP_CONF, damroll(4, 10)))
-                        return TRUE;
-                }
@@ -267 +269 @@
-                case EF_CURE_SERIOUS:
-                {
-5
+0
-                        if (clear_timed(TMD_CUT)) *ident = TRUE;
-                        if (clear_timed(TMD_BLIND)) *ident = TRUE;
@@ -277 +279 @@
-                case EF_CURE_CRITICAL:
-                {
-33, 33
+25, 30
-                        if (clear_timed(TMD_BLIND)) *ident = TRUE;
-                        if (clear_timed(TMD_CONFUSED)) *ident = TRUE;
@@ -961 +963 @@
-                }
-
+                case EF_DEEP_DESCENT:
+                {
+                        int i = 2;
+                        int new_max = p_ptr->max_depth;
+
+                        do
+                        {
+                                if (is_quest(new_max)) continue;
+                                if (new_max >= MAX_DEPTH-1) continue;
+                                new_max++;
+                        } while (--i);
+
+                        if (new_max == p_ptr->max_depth)
+                                return TRUE;
+
+                        p_ptr->max_depth = new_max;
+                        *ident = TRUE;
+
+                        if (p_ptr->depth == 0)
+                        {
+                                set_recall();
+                                msg_print("The lower reaches of the dungeon beckon.");
+                        }
+                        else
+                        {
+                                message(MSG_TPLEVEL, 0, "You sink through the floor...");
+                                p_ptr->depth = p_ptr->max_depth;
+                                p_ptr->leaving = TRUE;
+                        }
+
+                        *ident = TRUE;
+                        return TRUE;
+                }
+
-                case EF_LOSHASTE:
-                {
@@ -976 +1012 @@
-                {
-                        if (slow_monsters()) *ident = TRUE;
+                        return TRUE;
+                }
+
+                case EF_LOSCONF:
+                {
+                        if (confuse_monsters()) *ident = TRUE;
-                        return TRUE;
-                }
@@ -1575 +1617 @@
-                }
-
+                case EF_SHROOM_EMERGENCY:
+                {
+                        (void)set_timed(TMD_IMAGE, rand_spread(250, 50));
+                        (void)set_timed(TMD_OPP_FIRE, rand_spread(30, 10));
+                        (void)set_timed(TMD_OPP_COLD, rand_spread(30, 10));
+                        (void)hp_player(200);
+                        *ident = TRUE;
+                        return TRUE;
+                }
+
+                case EF_SHROOM_TERROR:
+                {
+                        if (set_timed(TMD_TERROR, rand_spread(100, 20)))
+                                *ident = TRUE;
+                        return TRUE;
+                }
+
+                case EF_SHROOM_STONE:
+                {
+                        if (set_timed(TMD_STONESKIN, rand_spread(80, 20)))
+                                *ident = TRUE;
+                        return TRUE;
+                }
+
+                case EF_SHROOM_DEBILITY:
+                {
+                        int stat = one_in_(2) ? A_STR : A_CON;
+
+                        if (p_ptr->csp < p_ptr->msp)
+                        {
+                                p_ptr->csp = p_ptr->msp;
+                                p_ptr->csp_frac = 0;
+                                msg_print("Your feel your head clear.");
+                                p_ptr->redraw |= (PR_MANA);
+                                *ident = TRUE;
+                        }
+
+                        (void)do_dec_stat(stat, FALSE);
+
+                        *ident = TRUE;
+                }
+
+#if 0
+                case EF_SHROOM_MANIA:
+                {
+EFFECT(SHROOM_MANIA,     FALSE, "makes you subject to manic fits")
+                        of mania (see Sangband)
+                }
+#endif
+
-                case EF_RING_ACID:
-                {

trunk/src/externs.h

@@ -493 +493 @@
-extern bool speed_monsters(void);
-extern bool slow_monsters(void);
+extern bool confuse_monsters(void);
-extern bool sleep_monsters(void);
-extern bool banish_evil(int dist);

trunk/src/list-effects.h

@@ -18 +18 @@
-EFFECT(CURE_PARANOIA,  FALSE, "removes your fear")
-EFFECT(CURE_CONFUSION, FALSE, "cures confusion")
-removes fear
+hallucination, removes fear and grants you temporary resistance to confusion
-EFFECT(CURE_BODY,      FALSE, "heals cut damage, and cures stunning, poison and blindness")
-
-EFFECT(CURE_LIGHT,     FALSE, "heals you a little (15% of your wounds, minimum 15HP), heals some cut damage, makes you a little less confused, and cures blindness")
-4
-3 of your wounds, minimum 33HP), heals cut damage, and cures
+5
+4 of your wounds, minimum 30HP), heals cut damage, and cures stunning,
-EFFECT(CURE_FULL,      FALSE, "restores 300 hit points, heals cut damage, and cures stunning, poisoning, blindness, and confusion")
-EFFECT(CURE_FULL2,     FALSE, "restores 1200 hit points, heals cut damage, and cures stunning, poisoning, blindness, and confusion")
@@ -127 +127 @@
-EFFECT(BLESSING3,      FALSE, "increases your AC and to-hit bonus for 1d48+24 turns")
-EFFECT(RECALL,         FALSE, "returns you from the dungeon or takes you to the dungeon after a short delay")
+EFFECT(DEEP_DESCENT,   FALSE, "transports you two or three levels below your maximum dungeon depth")
-
-EFFECT(EARTHQUAKES,    FALSE, "causes an earthquake around you")
@@ -134 +135 @@
-EFFECT(LOSSLOW,        FALSE, "slows all non-unique monsters within line of sight")
-EFFECT(LOSSLEEP,       FALSE, "sleeps all non-unique creatures within line of sight")
+EFFECT(LOSCONF,        FALSE, "confuses all non-unique creatures within line of sight")
-EFFECT(LOSKILL,        FALSE, "removes all non-unique monsters within 20 squares, dealing you damage in the process")
-EFFECT(ILLUMINATION,   FALSE, "lights up the surrounding area, hurting light-sensitive creatures")
@@ -218 +220 @@
-EFFECT(FOOD_GOOD,      FALSE, NULL)
-EFFECT(FOOD_WAYBREAD,  FALSE, "restores 4d8 hit points and neutralizes poison")
-
+
+
+
+
+
-EFFECT(RING_ACID,      TRUE,  "grants acid resistance for d20+20 turns and creates an acid ball of damage 70")
-EFFECT(RING_FLAMES,    TRUE,  "grants fire resistance for d20+20 turns and creates a fire ball of damage 80")

trunk/src/spells2.c

@@ -467 +467 @@
-                info[i++] = "You are terrified.";
-        }
+        if (p_ptr->timed[TMD_TERROR])
+        {
+                info[i++] = "You are terrified and feel the need to run away.";
+        }
-        if (p_ptr->timed[TMD_CUT])
-        {
@@ -2109 +2113 @@
-{
-        return (project_los(GF_OLD_SLEEP, p_ptr->lev));
+}
+
+/*
+ * Confuse monsters
+ */
+bool confuse_monsters(void)
+{
+        return (project_los(GF_OLD_CONF, p_ptr->lev));
-}
-

trunk/src/types.h

@@ -959 +959 @@
-        bool free_act;          /* Free action */
-        bool hold_life;         /* Hold life */
+        bool afraid;            /* Afraid */
-
-        bool impact;            /* Earthquake blows */

trunk/src/xtra1.c

@@ -769 +769 @@
-        p_ptr->ffall = FALSE;
-        p_ptr->hold_life = FALSE;
+        p_ptr->afraid = FALSE;
-        p_ptr->telepathy = FALSE;
-        p_ptr->sustain_str = FALSE;
@@ -1081 +1082 @@
-        }
-
+        /* Temporary stoneskin */
+        if (p_ptr->timed[TMD_STONESKIN])
+        {
+                p_ptr->to_a += 40;
+                p_ptr->dis_to_a += 40;
+                p_ptr->pspeed -= 5;
+        }
+
-        /* Temporary "Hero" */
-        if (p_ptr->timed[TMD_HERO])
@@ -1124 +1133 @@
-                p_ptr->resist_confu = TRUE;
-
+        /* Fear */
+        if (p_ptr->timed[TMD_AFRAID] || p_ptr->timed[TMD_TERROR])
+                p_ptr->afraid = TRUE;
+
+        if (p_ptr->timed[TMD_TERROR])
+                p_ptr->pspeed += 5;
-
-

trunk/src/xtra2.c

@@ -73 +73 @@
-        { "You feel your memories fade.", "Your memories come flooding back.", 0, 0, MSG_GENERIC },
-        { "Your mind expands.", "Your horizons are once more limited.", 0, PU_BONUS, MSG_GENERIC },
+        { "Your skin turns to stone.", "A fleshy shade returns to your skin.", 0, PU_BONUS, MSG_GENERIC },
+        { "You feel the need to run away, and fast!", "The urge to run dissipates.", 0, PU_BONUS, MSG_AFRAID },
-};
-

trunk/src/xtra3.c

@@ -651 +651 @@
-        { TMD_CONFUSED,  S("Confused"),   TERM_ORANGE },
-        { TMD_AFRAID,    S("Afraid"),     TERM_ORANGE },
+        { TMD_AFRAID,    S("Terror"),     TERM_ORANGE },
-        { TMD_IMAGE,     S("Halluc"),     TERM_ORANGE },
-        { TMD_POISONED,  S("Poisoned"),   TERM_ORANGE },
@@ -658 +659 @@
-        { TMD_HERO,      S("Hero"),       TERM_L_GREEN },
-        { TMD_SHERO,     S("Berserk"),    TERM_L_GREEN },
+        { TMD_STONESKIN, S("Stone"),      TERM_L_GREEN },
-        { TMD_SHIELD,    S("Shield"),     TERM_L_GREEN },
-        { TMD_BLESSED,   S("Blssd"),      TERM_L_GREEN },