Changeset 374

Timestamp:

07/26/07 10:49:37 (1 year ago)

Author:

ajps

Message:

Import spell description changes from the [367] on the trunk, and an imporved object.txt. Closes #283.

Files:

• branches/angband-3.0.8/lib/edit/object.txt (modified) (7 diffs)
• branches/angband-3.0.8/lib/edit/spell.txt (modified) (12 diffs)
• branches/angband-3.0.8/src/x-spell.c (modified) (2 diffs)

branches/angband-3.0.8/lib/edit/object.txt

@@ -1534 +1534 @@
-A:25/1:40/1:70/1
-F:EASY_KNOW
-
-
-
+
-D:  (The spell may be aborted without using up the scroll.)
-
@@ -1750 +1748 @@
-D:  If successful, a wand or staff gains 2+1d(60/((level of
-D: wand/staff)+2)+1) charges; failure occurs 1 time in (160-(level of
-uncharges the wand or staff
+destroys one wand or staff from the stack
-
-N:207:Banishment
@@ -2097 +2095 @@
-F:EASY_KNOW
-D:It cures 6d8 points of damage, cures all stunning, heals all cut
- and confusion
+, confusion, and amnesia
-D:  It also provides nourishment for about 50 turns under normal
-D: conditions.
@@ -2109 +2107 @@
-F:EASY_KNOW
-D:It cures 300 points of damage, cures all stunning, heals all cut
- and confusion
+, confusion, and amnesia
-D:  It also provides nourishment for about 100 turns under normal
-D: conditions.
@@ -3130 +3128 @@
-P:0:1d1:0:0:0
-F:EASY_KNOW
-
-
+
+
+
-D: turns of light.
-
@@ -3799 +3798 @@
-F:EASY_KNOW
-D:It cures 1200 points of damage, cures all stunning, heals all cut
- and confusion
+, confusion, and amnesia
-
-N:420:Life
@@ -3810 +3809 @@
-D:It restores experience and all stats to maximum, cures 5000 points of
-D: damage, cures all stunning, heals all cut damage, neutralizes poison,
- and confusion
+, confusion, and amnesia
-
-N:421:Self Knowledge

branches/angband-3.0.8/lib/edit/spell.txt

@@ -60 +60 @@
-D:Teleports you randomly up to 10 squares away.
-
+# Damage should probably be displayed on screen
-N:3:Light Area
-I:90:0:3
-D:Lights up all squares in a level-dependant area, and hurts
-
-
+
-D:  If you are in a room, the entire room will be lit up as well.
-
@@ -149 +149 @@
-I:90:1:6
-D:Fires a beam that lights up each square and hurts each
- for 6d8 points of damage
+
-
-N:21:Turn Stone to Mud
@@ -159 +159 @@
-N:22:Door Creation
-I:90:6:0
-(closed) door is created on each empty floor space that is
-directly adjacent to you.
+door is created on each empty floor space that is directly
+ adjacent to you.  These doors are closed, but not locked
-
-N:23:Earthquake
@@ -225 +225 @@
-D:Teleports you from the dungeon to the town or from the town to the
-D: deepest level you have visited in the dungeon.
+
-D:  The recall effect is not immediate; it is delayed by 14+1d20 turns.
-D:  During that delay, the spell can be canceled by invoking the spell
@@ -239 +240 @@
-I:90:5:0
-D:Shoots a radius-2 sound ball.
-attempts
+has a chance
-D: each monster in the area of effect.
-
@@ -258 +259 @@
-I:90:8:1
-D:Shoots a radius-4 confusion ball that doesn't cause physical
-attempts
+has a chance
-D:  Uniques or monsters that resist confusion are not affected.
-
@@ -321 +322 @@
-D:  Chance of success and number of charges gained increase with your
-D: level and decrease with level of wand or staff and number of charges.
-rains all charges
+estroys one wand or staff
-
-N:51:Enchant Armor
@@ -337 +338 @@
-D: level and decrease with level of wand or staff and number of charges,
-D: but are overall much better than for the spell Lesser Recharging.
-rains all charges
+estroys one wand or staff
-
-N:54:Elemental Brand
@@ -387 +388 @@
-N:62:Rift
-I:90:5:6
-,
-then attempts to teleport
+
+and has a chance of teleporting
-
-N:63:Mana Storm
@@ -415 +416 @@
-D:Removes fear.
-
+# Damage should probably be displayed on screen
-N:68:Call Light
-I:91:0:4
-D:Lights up all squares in a level-dependant area, and hurts
-
-
+
-D:  If you are in a room, the entire room will be lit up as well.
-
@@ -606 +607 @@
-N:107:Banish Evil
-I:91:8:2
-each evil monster within line of sight away
+away each evil monster within line of sight
-
-N:108:Word of Destruction
@@ -632 +633 @@
-D:  Chance of success and number of charges gained increase with your
-D: level and decrease with level of wand or staff and number of charges.
-rains all charges
+estroys one wand or staff
-
-N:112:Dispel Curse

branches/angband-3.0.8/src/x-spell.c

@@ -214 +214 @@
-                        strnfmt(p, len, " range 10");
-                        break;
+                case SPELL_LIGHT_AREA:
+                        strnfmt(p, len, " dam 2d%d", (plev / 2));
+                        break; 
-                case SPELL_CURE_LIGHT_WOUNDS:
-                        strnfmt(p, len, " heal 2d8");
@@ -315 +318 @@
-                                my_strcpy(p, " dur 12+d12", len);
-                                break;
+                        case PRAYER_CALL_LIGHT:
+                                strnfmt(p, len, " dam 2d%d", (plev / 2));
+                                break; 
-                        case PRAYER_PORTAL:
-                                strnfmt(p, len, " range %d", 3 * plev);