Changeset 681

Timestamp:

02/01/08 05:51:15 (9 months ago)

Author:

takkaria

Message:

Fix #428:

• Make torches always be found at 5000 turns
  
• Make lanterns always be found at 7500 turns
  

Files:

• trunk/src/defines.h (modified) (1 diff)
• trunk/src/obj-make.c (modified) (1 diff)
• trunk/src/store.c (modified) (2 diffs)

trunk/src/defines.h

@@ -274 +274 @@
- * Refueling constants
- */
-6
+5
-#define FUEL_LAMP       15000   /* Maximum amount of fuel in a lantern */
-

trunk/src/obj-make.c

@@ -948 +948 @@
-                case TV_LITE:
-                {
-Hack -- Torches & lanterns -- random fuel at 1/2 max
+Torches and lanterns get half-fuel
-                        if (o_ptr->sval == SV_LITE_TORCH)
-
-
-
-
+
-                        else if (o_ptr->sval == SV_LITE_LANTERN)
-
-
-
+
-
-                        break;

trunk/src/store.c

@@ -1268 +1268 @@
-                /* Apply some "low-level" magic (no artifacts) */
-                apply_magic(i_ptr, level, FALSE, FALSE, FALSE);
-
+
-                /* The object is "known" and belongs to a store */
-                object_known(i_ptr);
@@ -1289 +1289 @@
-                if (i_ptr->tval == TV_LITE)
-                {
- / 2
+
-                        if (i_ptr->sval == SV_LITE_LANTERN) i_ptr->timeout = FUEL_LAMP / 2;
-                }