Changeset 555

Timestamp:

09/14/07 14:48:59 (1 year ago)

Author:

takkaria

Message:

Make the light-source descriptions more accurate. (closes #359)

Files:

• trunk/lib/edit/object.txt (modified) (2 diffs)
• trunk/src/obj-info.c (modified) (2 diffs)

trunk/lib/edit/object.txt

@@ -2814 +2814 @@
-P:0:1d1:0:0:0
-F:EASY_KNOW
-D:It is equippable as a light source with a radius of 1 square.
-D:  It may also be used to fuel another torch, up to a maximum of 5000
-D: turns of light.
-
-N:347:& Lantern~
@@ -2825 +2822 @@
-P:0:1d1:0:0:0
-F:EASY_KNOW | IGNORE_FIRE
-D:It is equippable as a light source with a radius of 2 squares.
-D:  It may also be used to fuel another lantern.
-
-N:348:& Flask~ of oil

trunk/src/obj-info.c

@@ -442 +442 @@
-                text_out(".  ");
-
+                if (o_ptr->tval == TV_LITE)
+                {
+                        const char *name = (o_ptr->sval == SV_LITE_TORCH) ? "torch" : "lantern";
+                        int turns = (o_ptr->sval == SV_LITE_TORCH) ? FUEL_TORCH : FUEL_LAMP;
+
+                        text_out("It can refill another %s, up to %d turns of fuel.  ", name, turns);
+                }
+
-                something = TRUE;
-        }
@@ -451 +459 @@
-        if (f3 & (TR3_FEATHER))     good[gc++] = "makes you fall like a feather";
-        if (f3 & (TR3_REGEN))       good[gc++] = "speeds your regeneration";
-
-        if ((o_ptr->tval == TV_LITE) || (f3 & TR3_LITE))
-                good[gc++] = "lights the dungeon around you";
-        if (f3 & TR3_NO_FUEL)       good[gc++] = "does not require fuel";
-
-        /* Describe */