Changeset 421

Timestamp:

08/01/07 10:47:10 (1 year ago)

Author:

takkaria

Message:

Potion changes (#313):

• !SInvis -> True Seeing: cure blind, see invisible
  
• LoseStat -> brawn, intellect, contemplation, nimbleness, toughness, pleasing (taken from Ey)
  

Files:

• trunk/lib/edit/object.txt (modified) (11 diffs)
• trunk/src/Makefile.inc (modified) (1 diff)
• trunk/src/cmd1.c (modified) (3 diffs)
• trunk/src/cmd2.c (modified) (2 diffs)
• trunk/src/effects.c (modified) (6 diffs)
• trunk/src/effects.h (modified) (2 diffs)
• trunk/src/externs.h (modified) (1 diff)
• trunk/src/melee1.c (modified) (7 diffs)
• trunk/src/spells2.c (modified) (2 diffs)

trunk/lib/edit/object.txt

@@ -1792 +1792 @@
-E:GAIN_STR
-
-Weakness
+Brawn
-G:!:d
-I:75:16:0
-W:3:0:4:0
- to 1
-
-LOSE_STR
+0 to 2
+
+BRAWN
-
-N:227:Restore Strength
@@ -1816 +1816 @@
-E:GAIN_INT
-
-Stupidity
+Intellect
-G:!:d
-I:75:17:0
@@ -1822 +1822 @@
-A:33:5 to 15
-F:EASY_KNOW
-LOSE_IN
+INTELLEC
-
-N:230:Restore Intelligence
@@ -1840 +1840 @@
-E:GAIN_WIS
-
-Naivety
+Contemplation
-G:!:d
-I:75:18:0
@@ -1846 +1846 @@
-A:33:5 to 15
-F:EASY_KNOW
-LOSE_WIS
+CONTEMPLATION
-
-N:233:Restore Wisdom
@@ -1864 +1864 @@
-E:GAIN_CHR
-
-Ugliness
+Pleasing
-G:!:d
-I:75:21:0
@@ -1870 +1870 @@
-A:33:1 to 15
-F:EASY_KNOW
-LOSE_CHR
+PLEASING
-
-N:236:Restore Charisma
@@ -1888 +1888 @@
-E:CURE_LIGHT
-
-Clumsi
+Nimble
-G:!:d
-I:75:19:0
@@ -1894 +1894 @@
-A:33:1 to 10
-F:EASY_KNOW
-LOSE_DEX
-
-Sickli
+NIMBLENESS
+
+Tough
-G:!:d
-I:75:20:0
@@ -1902 +1902 @@
-A:33:1 to 10
-F:EASY_KNOW
-LOSE_CON
+TOUGHNESS
-
-N:240:Cure Serious Wounds
@@ -2107 +2107 @@
-E:RESIST_COLD
-
-See Invisible
+True Seeing
-G:!:d
-I:75:25:0

trunk/src/Makefile.inc

@@ -26 +26 @@
-$(addsuffix .o, init1 init2 randart): init.h
-$(addsuffix .o, cmd4 files init1 init2 util squelch save load wizard1): z-file.h
-
+

trunk/src/cmd1.c

@@ -757 +757 @@
-                                dam = damroll(1, 4);
-                                take_hit(dam, name);
-
+, FALSE
-                        }
-                        else
@@ -773 +773 @@
-                                dam = damroll(1, 4);
-                                take_hit(dam, name);
-
+, FALSE
-                        }
-                        else
@@ -789 +789 @@
-                                dam = damroll(1, 4);
-                                take_hit(dam, name);
-
+, FALSE
-                        }
-                        else

trunk/src/cmd2.c

@@ -275 +275 @@
-                msg_print("A small needle has pricked you!");
-                take_hit(damroll(1, 4), "a poison needle");
-
+, FALSE
-        }
-
@@ -283 +283 @@
-                msg_print("A small needle has pricked you!");
-                take_hit(damroll(1, 4), "a poison needle");
-
+, FALSE
-        }
-

trunk/src/effects.c

@@ -400 +400 @@
-                }
-
+                case EF_BRAWN:
+                {
+                        if (do_inc_stat(A_STR)) *ident = TRUE;
+                        if (dec_stat(A_INT, 10, TRUE)) *ident = TRUE;
+                        return TRUE;
+                }
+
+                case EF_INTELLECT:
+                {
+                        if (do_inc_stat(A_INT)) *ident = TRUE;
+                        if (do_dec_stat(A_CON, TRUE)) *ident = TRUE;
+                        return TRUE;
+                }
+
+                case EF_CONTEMPLATION:
+                {
+                        if (do_inc_stat(A_WIS)) *ident = TRUE;
+                        if (do_dec_stat(A_DEX, TRUE)) *ident = TRUE;
+                        return TRUE;
+                }
+
+                case EF_TOUGHNESS:
+                {
+                        if (do_inc_stat(A_CON)) *ident = TRUE;
+                        if (do_dec_stat(A_CHR, TRUE)) *ident = TRUE;
+                        return TRUE;
+                }
+
+                case EF_NIMBLENESS:
+                {
+                        if (do_inc_stat(A_DEX)) *ident = TRUE;
+                        if (do_dec_stat(A_STR, TRUE)) *ident = TRUE;
+                        return TRUE;
+                }
+
+                case EF_PLEASING:
+                {
+                        if (do_inc_stat(A_CHR)) *ident = TRUE;
+                        if (do_dec_stat(A_WIS, TRUE)) *ident = TRUE;
+                        return TRUE;
+                }
+
-                case EF_LOSE_STR:
-                case EF_LOSE_INT:
@@ -410 +452 @@
-
-                        take_hit(damroll(5, 5), "stat drain");
-
+, FALSE
-                        *ident = TRUE;
-
@@ -419 +461 @@
-                {
-                        take_hit(damroll(10, 10), "poisonous food");
-
+, FALSE
-                        *ident = TRUE;
-
@@ -485 +527 @@
-                case EF_TMD_INFRA:
-                {
-
-
+
-                        return TRUE;
-                }
@@ -492 +533 @@
-                case EF_TMD_SINVIS:
-                {
-inc_timed(TMD_SINVIS, 12 + damroll(2, 6)))
-       
+clear_timed(TMD_BLIND)) *ident = TRUE;
+if (inc_timed(TMD_SINVIS, 12 + damroll(2, 6))) 
-                        return TRUE;
-                }
@@ -500 +541 @@
-                {
-                        if (clear_timed(TMD_BLIND)) *ident = TRUE;
-
-
+
-                        return TRUE;
-                }

trunk/src/effects.h

@@ -84 +84 @@
-        EFFECT(GAIN_CHR,       FALSE, "restores and increases your charisma")
-        EFFECT(GAIN_ALL,       FALSE, "restores and increases all your stats")
+        EFFECT(BRAWN,          FALSE, "raises your strength at the expense of your intelligence")
+        EFFECT(INTELLECT,      FALSE, "raises your intelligence at the expense of your constitution")
+        EFFECT(CONTEMPLATION,  FALSE, "raises your wisdom at the expense of your dexterity")
+        EFFECT(TOUGHNESS,      FALSE, "raises your constitution at the expense of your charisma")
+        EFFECT(NIMBLENESS,     FALSE, "raises your dexterity at the expense of your strength")
+        EFFECT(PLEASING,       FALSE, "raises your charisma at the expense of your wisdom")
-        EFFECT(LOSE_STR,       FALSE, "reduces your strength with damage 5d5")
-        EFFECT(LOSE_INT,       FALSE, "reduces your intelligence with damage 5d5")
@@ -102 +108 @@
-
-        EFFECT(TMD_INFRA,      FALSE, "extends your infravision by 50 feet for 4d25+100 turns")
-
-gives you telepathy for 6d6+12 turns and cures blindnes
+cures blindness and 
+cures blindness and gives you telepathy for 6d6+12 turn
-
-        EFFECT(ENLIGHTENMENT,  FALSE, "completely lights up and magically maps the level")

trunk/src/externs.h

@@ -518 +518 @@
-extern bool heal_player(int perc, int min);
-extern void warding_glyph(void);
-
+, bool perma
-extern bool do_res_stat(int stat);
-extern bool do_inc_stat(int stat);

trunk/src/melee1.c

@@ -965 +965 @@
-
-                                        /* Damage (stat) */
-
+, FALSE
-
-                                        break;
@@ -976 +976 @@
-
-                                        /* Damage (stat) */
-
+, FALSE
-
-                                        break;
@@ -987 +987 @@
-
-                                        /* Damage (stat) */
-
+, FALSE
-
-                                        break;
@@ -998 +998 @@
-
-                                        /* Damage (stat) */
-
+, FALSE
-
-                                        break;
@@ -1009 +1009 @@
-
-                                        /* Damage (stat) */
-
+, FALSE
-
-                                        break;
@@ -1020 +1020 @@
-
-                                        /* Damage (stat) */
-
+, FALSE
-
-                                        break;
@@ -1031 +1031 @@
-
-                                        /* Damage (stats) */
-
-
-
-
-
-
+, FALSE
+, FALSE
+, FALSE
+, FALSE
+, FALSE
+, FALSE
-
-                                        break;

trunk/src/spells2.c

@@ -151 +151 @@
- * Lose a "point"
- */
-
+, bool perma
-{
-        bool sust = FALSE;
@@ -178 +178 @@
-
-        /* Attempt to reduce the stat */
-FALSE
+perma
-        {
-                /* Message */