Changeset 415

Timestamp:

07/31/07 11:36:09 (1 year ago)

Author:

takkaria

Message:

Fix mushrooms (see #311); also

• combine Paranoia and Confusion as Clear Mind
  
• add some basic savefile conversion stuff for items that've been removed
  
• add timed ESP effect
  
• remove "slow poison" effect, and LOSE_STR2 (mushroom of disease)
  
• fix compiler warning in effects.h
  

Files:

• trunk/lib/edit/object.txt (modified) (8 diffs)
• trunk/src/defines.h (modified) (1 diff)
• trunk/src/effects.c (modified) (4 diffs)
• trunk/src/effects.h (modified) (4 diffs)
• trunk/src/load.c (modified) (2 diffs)
• trunk/src/xtra1.c (modified) (3 diffs)
• trunk/src/xtra2.c (modified) (1 diff)

trunk/lib/edit/object.txt

@@ -50 +50 @@
-# are currently hard-coded.) 
-
-
-
-
-
-
+
+
+
-
-# 'P' is for power information. The items base armor class, its base
@@ -93 +91 @@
-##### Mushrooms #####
-
+# Removed in 3.1: Naivety, Disease, Sickness, Paralysis.  These were
+# introduced in 2.7.8 as replacements for duplicated effects between
+# some mushrooms and "hairy molds".
+
+# Changed in 3.1: Cure Paranoia + Cure Confusion now "Clear Mind"
+# Added in 3.1: Mending, which cures cut/stun/poison/blindness (idea from S)
+#               Second Sight, which gives temp ESP and cures blindness
+
+## Basic "bad" kinds
+
-N:1:Blindness
-G:,:d
-I:80:1:500
-W:5:0:1:0
-100:5 to 100
+75:10 to 15
-F:EASY_KNOW
-E:BLIND
@@ -105 +113 @@
-I:80:2:500
-W:5:0:1:0
-100:5 to 100
+75:10 to 15
-F:EASY_KNOW
-E:SCARE
@@ -113 +121 @@
-I:80:3:500
-W:5:0:1:0
-100:5 to 100
+75:10 to 15
-F:EASY_KNOW
-E:CONFUSE
@@ -121 +129 @@
-I:80:4:500
-W:10:0:1:0
-100:10 to 100
+75:10 to 15
-F:EASY_KNOW
-E:HALLUC
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-G:,:d
-I:80:12:500
-W:10:0:1:60
-
+
+
-F:EASY_KNOW
-E:CURE_POISON
-
-6
+11
-G:,:d
-I:80:13:500
-W:10:0:1:50
-
+
+
-F:EASY_KNOW
-E:CURE_BLINDNESS
-
-7:Cure Paranoia
+12:Clear Mind
-G:,:d
-I:80:14:500
-25
+90
-A:100:10 to 100
-
-
-
-
+
+
+
+
+
-G:,:d
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-G:,:d
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-G:,:d
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-G:,:d
-I:80:18:500
-W:20:0:1:350
-10
+5
-F:EASY_KNOW
-E:RESTORE_CON
-
-2
+8
-G:,:d
-I:80:19:500
@@ -191 +244 @@
-E:RESTORE_ALL
-
-
+
+
+
-G:,:d
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
@@ -276 +276 @@
-I:80:36:2500
-W:1:0:2:2
-00:1 to 10
+10:5 to 6
-M:100:2d3
-F:EASY_KNOW
@@ -285 +285 @@
-I:80:37:7500
-W:5:0:3:10
-100:25
+90:30
-F:EASY_KNOW
-E:FOOD_WAYBREAD

trunk/src/defines.h

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

trunk/src/effects.c

@@ -201 +201 @@
-                }
-
-                case EF_CURE_POISON2:
-                {
-                        if (set_timed(TMD_POISONED, p_ptr->timed[TMD_POISONED] / 2)) *ident = TRUE;
-                        return TRUE;
-                }
-
-                case EF_CURE_BLINDNESS:
-                {
@@ -224 +218 @@
-                        return TRUE;
-                }
+
+                case EF_CURE_MIND:
+                {
+                        if (clear_timed(TMD_CONFUSED)) *ident = TRUE;
+                        if (clear_timed(TMD_AFRAID)) *ident = TRUE;
+                        return TRUE;
+                }
+
+                case EF_CURE_BODY:
+                {
+                        if (clear_timed(TMD_STUN)) *ident = TRUE;
+                        if (clear_timed(TMD_CUT)) *ident = TRUE;
+                        if (clear_timed(TMD_POISONED)) *ident = TRUE;
+                        if (clear_timed(TMD_BLIND)) *ident = TRUE;
+                        return TRUE;
+                }
+
-
-                case EF_CURE_LIGHT:
@@ -390 +401 @@
-                        take_hit(damroll(5, 5), "stat drain");
-                        (void)do_dec_stat(stat);
-                        *ident = TRUE;
-
-                        return TRUE;
-                }
-
-                case EF_LOSE_STR2:
-                {
-                        take_hit(damroll(10, 10), "poisonous food");
-                        (void)do_dec_stat(A_STR);
-                        *ident = TRUE;
-
@@ -484 +486 @@
-                        return TRUE;
-                }
+
+                case EF_TMD_ESP:
+                {
+                        if (clear_timed(TMD_BLIND)) *ident = TRUE;
+                        if (inc_timed(TMD_TELEPATHY, 12 + damroll(6, 6)))
+                                *ident = TRUE;
+                        return TRUE;
+                }
+
-
-                case EF_ENLIGHTENMENT:

trunk/src/effects.h

@@ -33 +33 @@
-        #include "effects.h"
-
-FECT(MAX, FALSE, NULL)
+_MAX
-} effect_type;
-
@@ -54 +54 @@
-
-        EFFECT(CURE_POISON,    FALSE, "neutralizes poison")
-        EFFECT(CURE_POISON2,   FALSE, "halves the severity of any poisoning")
-        EFFECT(CURE_BLINDNESS, FALSE, "cures blindness")
-        EFFECT(CURE_PARANOIA,  FALSE, "removes your fear")
-        EFFECT(CURE_CONFUSION, FALSE, "cures confusion")
+        EFFECT(CURE_MIND,      FALSE, "cures confusion and removes fear")
+        EFFECT(CURE_BODY,      FALSE, "heals cut damage, and cures stunning, poison and blindness")
-
-        EFFECT(CURE_LIGHT,     FALSE, "restores 2d8 hit points, heals some cut damage and cures blindness")
@@ -89 +90 @@
-        EFFECT(LOSE_CON,       FALSE, "reduces your constitution with damage 5d5")
-        EFFECT(LOSE_CHR,       FALSE, "reduces your intelligence with damage 5d5")
-        EFFECT(LOSE_STR2,      FALSE, "reduces your strength with damage 10d10")
-        EFFECT(LOSE_CON2,      FALSE, "reduces your constitution with damage 10d10")
-        EFFECT(RESTORE_STR,    FALSE, "restores your strength")
@@ -103 +103 @@
-        EFFECT(TMD_INFRA,      FALSE, "extends your infravision by 50 feet for 4d25+100 turns")
-        EFFECT(TMD_SINVIS,     FALSE, "allows you to see invisible things for 2d6+12 turns")
+        EFFECT(TMD_ESP,        FALSE, "gives you telepathy for 6d6+12 turns and cures blindness")
-
-        EFFECT(ENLIGHTENMENT,  FALSE, "completely lights up and magically maps the level")

trunk/src/load.c

@@ -143 +143 @@
-
-
+/* A wonderful savefile conversion function. Temporary only. */
+void convert_kind(byte *tval, byte *sval)
+{
+        switch (*tval)
+        {
+                case TV_FOOD:
+                {
+                        /* Cure Paranoia + Cure Confusion -> Clear Mind */
+                        if (*sval == 15) *sval = 16;
+
+                        /* Sickness -> Weakness */
+                        if (*sval == 7) *sval = 6;
+
+                        /* LoseWis -> Stupidity */
+                        if (*sval == 9) *sval = 8;
+
+                        /* Paralysis -> Poison */
+                        if (*sval == 5) *sval = 0;
+
+                        /* Disease -> Unhealth */
+                        if (*sval == 11) *sval = 10;
+
+                        break;
+                }
+        }
+}
+
+
-/*
- * The following functions are used to load the basic building blocks
@@ -316 +344 @@
-        if (buf[0]) o_ptr->note = quark_add(buf);
-
+
+        /* Convert tval/sval */
+        convert_kind(&o_ptr->tval, &o_ptr->sval);
-
-        /* Lookup item kind */

trunk/src/xtra1.c

@@ -649 +649 @@
-        { TMD_POISONED,  S("Poisoned"),   TERM_ORANGE },
-        { TMD_PROTEVIL,  S("ProtEvil"),   TERM_L_GREEN },
+        { TMD_TELEPATHY, S("ESP"),        TERM_L_BLUE },
-        { TMD_INVULN,    S("Invuln"),     TERM_L_GREEN },
-        { TMD_HERO,      S("Hero"),       TERM_L_GREEN },
@@ -2119 +2120 @@
-                p_ptr->to_h += 12;
-                p_ptr->dis_to_h += 12;
+                p_ptr->resist_fear = TRUE;
-        }
-
@@ -2128 +2130 @@
-                p_ptr->to_a -= 10;
-                p_ptr->dis_to_a -= 10;
+                p_ptr->resist_fear = TRUE;
-        }
-
-        /* Temporary "fast" */
-        if (p_ptr->timed[TMD_FAST])
-        {
-                p_ptr->pspeed += 10;
-        }
-
-        /* Temporary "slow" */
-        if (p_ptr->timed[TMD_SLOW])
-        {
-                p_ptr->pspeed -= 10;
-
+
-
-        /* Temporary see invisible */
-        if (p_ptr->timed[TMD_SINVIS])
-        {
-                p_ptr->see_inv = TRUE;
-        }
-
-        /* Temporary infravision boost */
-        if (p_ptr->timed[TMD_SINFRA])
-        {
-                p_ptr->see_infra += 5;
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-

trunk/src/xtra2.c

@@ -62 +62 @@
-        { "You feel resistant to poison!", "You feel less resistant to poison", 0, 0, 0, MSG_RES_POIS },
-        { "You feel your memories fade.", "Your memories come flooding back.", 0, 0, 0, MSG_GENERIC },
+        { "Your mind expands.", "Your horizons are once more limited.", 0, 0, PU_BONUS, MSG_GENERIC },
-};
-