Changeset 377

Timestamp:

07/27/07 11:59:49 (1 year ago)

Author:

takkaria

Message:

Fixes for #253 and #218:

• Give items that provide light descriptions in obj-info.c.
  
• Describe the NO_FUEL flag.
  

Files:

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

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

@@ -3128 +3128 @@
-P:0:1d1:0:0:0
-F:EASY_KNOW
-
-
-
+
-D: turns of light.
-
@@ -3140 +3138 @@
-P:0:1d1:0:0:0
-F:EASY_KNOW | IGNORE_FIRE
-
-
+
-
-N:348:& Flask~ of oil

branches/angband-3.0.8/src/obj-info.c

@@ -381 +381 @@
-        bool something = FALSE;
-
+        /* Describe lights */
+        if (o_ptr->tval == TV_LITE || (f3 & TR3_LITE))
+        {
+                bool artifact = artifact_p(o_ptr);
+                bool no_fuel = (f3 & TR3_NO_FUEL) ? TRUE : FALSE;
+                int rad = 0;
+
+                if (artifact)
+                        rad = 3;
+                else if (o_ptr->tval == TV_LITE)
+                        rad = 2;
+
+                if (f3 & TR3_LITE) rad++;
+
+                p_text_out("It usually provides light of radius ");
+                text_out_c(TERM_L_GREEN, format("%d", rad));
+                if (no_fuel && !artifact)
+                        text_out(", and never needs refuelling");
+                else if (o_ptr->tval == TV_LITE && o_ptr->sval == SV_LITE_TORCH)
+                        text_out(", though this is reduced when running of out fuel");
+                text_out(".  ");
+
+                something = TRUE;
+        }
+
-        /* Collect stuff which can't be categorized */
-        if (f3 & (TR3_BLESSED))     good[gc++] = "is blessed by the gods";
@@ -386 +411 @@
-        if (f3 & (TR3_SLOW_DIGEST)) good[gc++] = "slows your metabolism";
-        if (f3 & (TR3_FEATHER))     good[gc++] = "makes you fall like a feather";
-        if (((o_ptr->tval == TV_LITE) && artifact_p(o_ptr)) || (f3 & (TR3_LITE)))
-                good[gc++] = "lights the dungeon around you";
-        if (f3 & (TR3_REGEN))       good[gc++] = "speeds your regeneration";
-