Ticket #88: lanterns.patch

lib/edit/artifact.txt

@@ -83 +83 @@
-I:39:4:0
-W:5:5:10:10000
-P:0:1d1:0:0:0
-
+NO_FUEL |
-F:INSTA_ART
-A:ILLUMINATION:10:10
-D:A small crystal phial, with the light of Earendil's Star contained inside.  
@@ -96 +96 @@
-I:39:5:0
-W:30:25:5:30000
-P:0:1d1:0:0:0
-
+NO_FUEL |
-F:INSTA_ART
-A:MAGIC_MAP:50:50
-D:The shining Star of the West, a treasured heirloom of Elendil's house.
@@ -107 +107 @@
-I:39:6:0
-W:50:50:5:50000
-P:0:1d1:0:0:0
-
+NO_FUEL |
-F:INSTA_ART
-A:DETECT:30:30
-D:A great globe seemingly filled with moonlight, the famed Heart of the 
@@ -162 +162 @@
-W:75:60:200:100000
-P:0:10d10:0:0:0
-# F:DRAIN_MANA | 
-
+NO_FUEL |
-F:INT | WIS | SEARCH | INFRA | SEE_INVIS | TELEPATHY | 
-F:RES_CHAOS | RES_BLIND | AGGRAVATE | DRAIN_EXP | 
-F:INSTA_ART | HIDE_TYPE

lib/edit/ego_item.txt

@@ -754 +754 @@
-T:23:0:99
-F:CON | KILL_DRAGON | RES_FEAR
-
-# 96 (unused)
-
- 97 (unused)
+## Lanterns/torches
-
-
+
+
+
+
+
+
-
-
+
+
+
+
+
+
-
+N:98:(Everburning)
+X:10:0
+W:0:3:0:2500 (imported from S)
+C:0:0:0:0
+T:39:1:1 (lanterns only)
+F:NO_FUEL
+
+N:99:of True Sight
+X:10:0
+#W:depth:rarity:extra weight:cost
+W:20:8:0:6000 (imported from S)
+C:0:0:0:0
+T:39:0:1
+F:RES_BLIND | SEE_INVIS
+
+
-### Digging Tools
-
-N:100:of Digging

lib/edit/object.txt

@@ -3136 +3136 @@
-N:347:& Brass Lantern~
-G:~:U
-I:39:1:0
-3
+6
-A:3/1
-P:0:1d1:0:0:0
-F:EASY_KNOW | IGNORE_FIRE

src/defines.h

@@ -298 +298 @@
-/*
- * Refueling constants
- */
-5
+6
-#define FUEL_LAMP       15000   /* Maximum amount of fuel in a lantern */
-
-
@@ -454 +454 @@
-        TMD_AFRAID, TMD_IMAGE, TMD_POISONED, TMD_CUT, TMD_STUN, TMD_PROTEVIL,
-        TMD_INVULN, TMD_HERO, TMD_SHERO, TMD_SHIELD, TMD_BLESSED, TMD_SINVIS,
-        TMD_SINFRA, TMD_OPP_ACID, TMD_OPP_ELEC, TMD_OPP_FIRE, TMD_OPP_COLD,
-
+ TMD_LIGHT_AURA,
-
-        TMD_MAX
-};
@@ -1887 +1887 @@
-#define TR3_SEE_INVIS       0x00000020L /* See Invis */
-#define TR3_FREE_ACT        0x00000040L /* Free action */
-#define TR3_HOLD_LIFE       0x00000080L /* Hold life */
-XXX1            0x00000100L
+NO_FUEL         0x00000100L /* Light source uses no fuel */
-#define TR3_XXX2            0x00000200L
-#define TR3_XXX3            0x00000400L
-#define TR3_XXX4            0x00000800L
@@ -3029 +3029 @@
-#define MSG_KILL_KING       147
-#define MSG_DRAIN_STAT      148
-#define MSG_MULTIPLY        149
+#define MSG_LIGHT_AURA      150
-
-0
+1
-
-/*
- * Hack -- maximum known sounds

src/dungeon.c

@@ -901 +901 @@
-        /* Burn some fuel in the current lite */
-        if (o_ptr->tval == TV_LITE)
-        {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                {
-                        /* Decrease life-span */
-                        o_ptr->timeout--;

src/init1.c

@@ -448 +448 @@
-        "SEE_INVIS",
-        "FREE_ACT",
-        "HOLD_LIFE",
-XXX1
+NO_FUEL
-        "XXX2",
-        "XXX3",
-        "XXX4",

src/object1.c

@@ -1310 +1310 @@
-        if (mode < 2) goto object_desc_done;
-
-        /* Hack -- Process Lanterns/Torches */
-(!artifact_p(o_ptr)
+!(f3 & TR3_NO_FUEL
-        {
-                /* Hack -- Turns of light for normal lites */
-                object_desc_str_macro(t, " (with ");

src/spells2.c

@@ -496 +496 @@
-        {
-                info[i++] = "You are temporarily invulnerable.";
-        }
+        if (p_ptr->timed[TMD_INVULN])
+        {
+                info[i++] = "You are surrounded by an unearthly light.";
+        }
-        if (p_ptr->confusing)
-        {
-                info[i++] = "Your hands are glowing dull red.";
@@ -525 +529 @@
-        {
-                info[i++] = "You land gently.";
-        }
-        if (p_ptr->lite)
-        {
-                info[i++] = "You are glowing with light.";
-        }
-        if (p_ptr->regenerate)
-        {
-                info[i++] = "You regenerate quickly.";

src/store.c

@@ -250 +250 @@
-                        /* Analyze the type */
-                        switch (o_ptr->tval)
-                        {
-                                case TV_FOOD:
-                                case TV_LITE:
-                                case TV_FLASK:
-                                case TV_SPIKE:
-                                case TV_SHOT:
-                                case TV_ARROW:
-                                case TV_BOLT:
-                                case TV_DIGGING:
-                                case TV_CLOAK:
-
+
+
+
+
+
+
-                                default:
-
+       
-                        }
-                        break;
-                }
@@ -281 +283 @@
-                                case TV_SOFT_ARMOR:
-                                case TV_HARD_ARMOR:
-                                case TV_DRAG_ARMOR:
-
+
+
-                                default:
-
+       
-                        }
-                        break;
-                }
@@ -302 +305 @@
-                                case TV_HAFTED:
-                                case TV_POLEARM:
-                                case TV_SWORD:
-
+
+
-                                default:
-
+       
-                        }
-                        break;
-                }
@@ -319 +323 @@
-                                case TV_SCROLL:
-                                case TV_POTION:
-                                case TV_HAFTED:
-
+
+
-                                case TV_POLEARM:
-                                case TV_SWORD:
-                                {
-                                        /* Known blessed blades are accepted too */
-                                        if (is_blessed(o_ptr) && object_known_p(o_ptr)) break;
-                                }
+
-                                default:
-
+       
-                        }
-                        break;
-                }
@@ -340 +346 @@
-                        {
-                                case TV_SCROLL:
-                                case TV_POTION:
-
+
+
-                                default:
-
+       
-                        }
-                        break;
-                }
@@ -361 +368 @@
-                                case TV_ROD:
-                                case TV_SCROLL:
-                                case TV_POTION:
-
+
+
-                                default:
-
+       
-                        }
-                        break;
-                }
@@ -1047 +1055 @@
- * stores have, unless it is an ego-item or has various bonuses.
- *
- * Based on a suggestion by Lee Vogt <lvogt@cig.mcel.mot.com>.
- *
- * If the stores ever become truly externalised, i.e. if Lua becomes more
- * integrated, then there should be some way to get this out of the compiled
- * code, as it is a little hacky.  XXX
- */
-static bool black_market_ok(const object_type *o_ptr)
-{
-        int i, j;
-
-        /* Ego items are always fine */
-o_ptr->name2
+ego_item_p(o_ptr)
-
-        /* Good items are normally fine */
-        if (o_ptr->to_a > 2) return (TRUE);
@@ -1278 +1282 @@
-        { TV_FOOD, SV_FOOD_JERKY, MAKE_NORMAL },
-        { TV_FOOD, SV_FOOD_PINT_OF_WINE, MAKE_NORMAL },
-        { TV_LITE, SV_LITE_TORCH, MAKE_NORMAL },
-        { TV_LITE, SV_LITE_LANTERN, MAKE_NORMAL },
-        { TV_FLASK, 0, MAKE_NORMAL },
-        { TV_SPIKE, 0, MAKE_NORMAL },
-        { TV_SHOT, SV_AMMO_NORMAL, MAKE_MAX },

src/types.h

@@ -1020 +1020 @@
-
-        bool slow_digest;       /* Slower digestion */
-        bool ffall;                     /* Feather falling */
-        bool lite;                      /* Permanent light */
-        bool regenerate;        /* Regeneration */
-        bool telepathy;         /* Telepathy */
-        bool see_inv;           /* See invisible */

src/variable.c

@@ -372 +372 @@
-        "kill_king",
-        "drain_stat",
-        "multiply",
+        "light_aura",
-};
-
-

src/xtra1.c

@@ -841 +841 @@
-
-
-/*
-                    -CJS-
+
- */
-static void prt_speed(int row, int col)
-{
-        int i = p_ptr->pspeed;
-
-        byte attr = TERM_WHITE;
+        const char *type = NULL;
-        char buf[32] = "";
-
-        /* Hack -- Visually "undo" the Search Mode Slowdown */
@@ -857 +858 @@
-        if (i > 110)
-        {
-                attr = TERM_L_GREEN;
-strnfmt(buf, sizeof(buf), "Fast (+%d)", (i - 110))
+type = "Fast"
-        }
-
-        /* Slow */
-        else if (i < 110)
-        {
-                attr = TERM_L_UMBER;
-strnfmt(buf, sizeof(buf), "Slow (-%d)", (110 - i))
+type = "Slow"
-        }
-
+        if (type)
+                strnfmt(buf, sizeof(buf), "%s (%+d)", type, (i - 110));
+
-        /* Display the speed */
-        c_put_str(attr, format("%-14s", buf), row, col);
-}
@@ -1643 +1647 @@
-
-
-/*
-
+
+
+
+
+
+
- */
-static void calc_torch(void)
-{
-        int i;
-        object_type *o_ptr;
-        u32b f1, f2, f3;
-
-        s16b old_lite = p_ptr->cur_lite;
+        s16b new_lite = 0;
+        bool burn_light = TRUE;
-
-
-
-
+
+
+
-
-
+
+
-        for (i = INVEN_WIELD; i < INVEN_TOTAL; i++)
-        {
-o_ptr = &inventory[i]
+u32b f1, f2, f3
-
+                int amt = 0;
+                object_type *o_ptr = &inventory[i];
+
-                /* Skip empty slots */
-                if (!o_ptr->k_idx) continue;
-
+                /* Extract the flags */
+                object_flags(o_ptr, &f1, &f2, &f3);
+
+                /* LITE flag on an object always increases radius */
+                if (f3 & TR3_LITE) amt++;
+
+                /* Cursed objects emit no light */
+                if (o_ptr->ident & IDENT_CURSED)
+                {
+                        amt = 0;
+                }
+
-                /* Examine actual lites */
-
+else 
-                {
-, bright, lite
+ bright light
-                        if (artifact_p(o_ptr))
+                                amt += 3;
+
+                        /* Non-artifact lights and those without fuel provide no light */
+                        else if (!burn_light || o_ptr->timeout == 0)
+                            amt = 0;
+
+                        /* All lit lights provide at least radius 2 light */
+                        else
-                        {
-
-
+
+
+
+
+
-                        }
-                        
-                        /* Lanterns (with fuel) provide more lite */
-                        if ((o_ptr->sval == SV_LITE_LANTERN) && (o_ptr->timeout > 0))
-                        {
-                                p_ptr->cur_lite += 2;
-                                continue;
-                        }
-                        
-                        /* Torches (with fuel) provide some lite */
-                        if ((o_ptr->sval == SV_LITE_TORCH) && (o_ptr->timeout > 0))
-                        {
-                                p_ptr->cur_lite += 1;
-                                continue;
-                        }
-                }
-                else
-                {
-                        /* Extract the flags */
-                        object_flags(o_ptr, &f1, &f2, &f3);
-
-       /* does this item glow?
-       if (f3 & TR3_LITE) p_ptr->cur_lite++;
-}
+/* Alter p_ptr->cur_lite if reasonable
+if (new_lite < amt)
+    new_lite = amt;
-        }
-
-
-
-
+
+
+
-
-
+        /* Limit light radius (paranoia) */
+        new_lite = MIN(new_lite, 4);
+        new_lite = MAX(new_lite, 0);
+
-        /* Notice changes in the "lite radius" */
-p_ptr->cur
+new
-        {
-                /* Update the visuals */
+                p_ptr->cur_lite = new_lite;
-                p_ptr->update |= (PU_UPDATE_VIEW | PU_MONSTERS);
-        }
-}
@@ -1843 +1868 @@
-        p_ptr->ffall = FALSE;
-        p_ptr->hold_life = FALSE;
-        p_ptr->telepathy = FALSE;
-        p_ptr->lite = FALSE;
-        p_ptr->sustain_str = FALSE;
-        p_ptr->sustain_int = FALSE;
-        p_ptr->sustain_wis = FALSE;
@@ -1915 +1939 @@
-        /* Good flags */
-        if (f3 & (TR3_SLOW_DIGEST)) p_ptr->slow_digest = TRUE;
-        if (f3 & (TR3_FEATHER)) p_ptr->ffall = TRUE;
-        if (f3 & (TR3_LITE)) p_ptr->lite = TRUE;
-        if (f3 & (TR3_REGEN)) p_ptr->regenerate = TRUE;
-        if (f3 & (TR3_TELEPATHY)) p_ptr->telepathy = TRUE;
-        if (f3 & (TR3_SEE_INVIS)) p_ptr->see_inv = TRUE;

src/xtra2.c

@@ -57 +57 @@
-        { "Your eyes feel very sensitive!", "Your eyes feel less sensitive.", 0, 0, (PU_BONUS | PU_MONSTERS), MSG_SEE_INVIS },
-        { "Your eyes begin to tingle!", "Your eyes stop tingling.", 0, 0, (PU_BONUS | PU_MONSTERS), MSG_INFRARED },
-        { "You feel resistant to poison!", "You feel less resistant to poison", PR_OPPOSE_ELEMENTS, 0, 0, MSG_RES_POIS },
+        { "A soft, unearthly light surrounds you.", "The light fades.", 0, 0, PU_TORCH, MSG_LIGHT_AURA },
-};
-
-/*