Changeset 163

Timestamp:

06/06/07 18:20:49 (3 years ago)

Author:

takkaria

Message:

Code for #88 (lantern/torch behaviour and features).

Normal stores no longer sell lanterns, and no longer buy back food or non-ego/artifact lights. Lights don't use up any fuel during the daytime in the town.

Introduce the following ego-items:

• of Brightness; LITE (+1 radius light)
  
• (Everburning); NO_FUEL
  

Also add these, commented out until the ID issue can be fixed:

• of Shadows; STEALTH | RES_LITE (may eventually have a chance of being cursed)
  
  • of True Sight; RES_BLIND | SEE_INVIS
    

Files:

• trunk/COPYING (modified) (1 diff)
• trunk/lib/edit/artifact.txt (modified) (4 diffs)
• trunk/lib/edit/ego_item.txt (modified) (1 diff)
• trunk/lib/edit/object.txt (modified) (2 diffs)
• trunk/src/defines.h (modified) (2 diffs)
• trunk/src/dungeon.c (modified) (1 diff)
• trunk/src/init1.c (modified) (1 diff)
• trunk/src/main-sdl.c (modified) (1 diff)
• trunk/src/object1.c (modified) (1 diff)
• trunk/src/spells2.c (modified) (1 diff)
• trunk/src/store.c (modified) (11 diffs)
• trunk/src/types.h (modified) (1 diff)
• trunk/src/variable.c (modified) (1 diff)
• trunk/src/xtra1.c (modified) (7 diffs)
• trunk/src/xtra2.c (modified) (1 diff)

trunk/COPYING

@@ -24 +24 @@
-   otherwise, would be much appreciated.  Note that as a result of these
-   remaining restrictions, the game itself is not quite GPL-clean.
+
+ * The SDL runtime libraries (if provided with your copy of the game) are under
+   the following licence:
+
+     The Simple DirectMedia Layer (SDL for short) is a cross-platfrom library
+     designed to make it easy to write multi-media software, such as games and
+     emulators.
+
+     The Simple DirectMedia Layer library source code is available from:
+     http://www.libsdl.org/
+
+     This library is distributed under the terms of the GNU LGPL license:
+     http://www.gnu.org/copyleft/lesser.html
-
- * Adam Bolt's (16x16) graphics may be redistributed and used for any purpose, 

trunk/lib/edit/artifact.txt

@@ -84 +84 @@
-W:5:5:10:10000
-P:0:1d1:0:0:0
-
+NO_FUEL |
-F:INSTA_ART
-A:ILLUMINATION:10:10
@@ -97 +97 @@
-W:30:25:5:30000
-P:0:1d1:0:0:0
-
+NO_FUEL |
-F:INSTA_ART
-A:MAGIC_MAP:50:50
@@ -108 +108 @@
-W:50:50:5:50000
-P:0:1d1:0:0:0
-
+NO_FUEL |
-F:INSTA_ART
-A:DETECT:30:30
@@ -163 +163 @@
-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 | 

trunk/lib/edit/ego_item.txt

@@ -755 +755 @@
-F:CON | KILL_DRAGON | RES_FEAR
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-### Digging Tools

trunk/lib/edit/object.txt

@@ -3134 +3134 @@
-D: turns of light.
-
-Brass 
+
-G:~:U
-I:39:1:0
@@ -3151 +3151 @@
-P:0:2d6:0:0:0
-F:EASY_KNOW
-brass 
+
-D: a maximum of 15000 turns of light.
-D:  When thrown, it is considered lit, so it does more than nominal

trunk/src/defines.h

@@ -288 +288 @@
- * Refueling constants
- */
-5
+6
-#define FUEL_LAMP       15000   /* Maximum amount of fuel in a lantern */
-
@@ -1850 +1850 @@
-#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

trunk/src/dungeon.c

@@ -896 +896 @@
-        if (o_ptr->tval == TV_LITE)
-        {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                {
-                        /* Decrease life-span */

trunk/src/init1.c

@@ -449 +449 @@
-        "FREE_ACT",
-        "HOLD_LIFE",
-XXX1
+NO_FUEL
-        "XXX2",
-        "XXX3",

trunk/src/main-sdl.c

@@ -3478 +3478 @@
-        while (my_dread(dir, buf, sizeof buf))
-        {
-                /* Check for at least an extension */
-                signed extension_pos = strlen(buf) - 4;
-                if (extension_pos <= 0) continue;
-
-                /* Check for file extension */
-trcmp((buf + extension_pos), ".fon") == 0
+uffix(buf, ".fon")
-                        FontList[num_fonts++] = string_make(buf);
-

trunk/src/object1.c

@@ -1310 +1310 @@
-        if (mode < 2) goto object_desc_done;
-
-Hack -- Process Lanterns/Torches
-(!artifact_p(o_ptr)
-
-Hack -- 
-with 
+Fuelled light sources get number of remaining turns appended
+!(f3 & TR3_NO_FUEL
+
+
+
-                object_desc_num_macro(t, o_ptr->timeout);
- of light
+
-        }
-

trunk/src/spells2.c

@@ -515 +515 @@
-        {
-                info[i++] = "You land gently.";
-        }
-        if (p_ptr->lite)
-        {
-                info[i++] = "You are glowing with light.";
-        }
-        if (p_ptr->regenerate)

trunk/src/store.c

@@ -251 +251 @@
-                        switch (o_ptr->tval)
-                        {
-                                case TV_FOOD:
-                                case TV_LITE:
-                                case TV_FLASK:
-                                case TV_SPIKE:
-                                case TV_SHOT:
@@ -260 +257 @@
-                                case TV_DIGGING:
-                                case TV_CLOAK:
-
+
+
+
+
+
+
-                                default:
-
+       
-                        }
-                        break;
@@ -282 +284 @@
-                                case TV_HARD_ARMOR:
-                                case TV_DRAG_ARMOR:
-
+
+
-                                default:
-
+       
-                        }
-                        break;
@@ -303 +306 @@
-                                case TV_POLEARM:
-                                case TV_SWORD:
-
+
+
-                                default:
-
+       
-                        }
-                        break;
@@ -320 +324 @@
-                                case TV_POTION:
-                                case TV_HAFTED:
-
+
+
-                                case TV_POLEARM:
-                                case TV_SWORD:
@@ -327 +332 @@
-                                        if (is_blessed(o_ptr) && object_known_p(o_ptr)) break;
-                                }
+
-                                default:
-
+       
-                        }
-                        break;
@@ -341 +347 @@
-                                case TV_SCROLL:
-                                case TV_POTION:
-
+
+
-                                default:
-
+       
-                        }
-                        break;
@@ -362 +369 @@
-                                case TV_SCROLL:
-                                case TV_POTION:
-
+
+
-                                default:
-
+       
-                        }
-                        break;
@@ -1048 +1056 @@
- *
- * 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)
@@ -1058 +1062 @@
-
-        /* Ego items are always fine */
-o_ptr->name2
+ego_item_p(o_ptr)
-
-        /* Good items are normally fine */
@@ -1279 +1283 @@
-        { 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 },

trunk/src/types.h

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

trunk/src/variable.c

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

trunk/src/xtra1.c

@@ -847 +847 @@
-
-/*
-                    -CJS-
+
- */
-static void prt_speed(int row, int col)
@@ -854 +854 @@
-
-        byte attr = TERM_WHITE;
+        const char *type = NULL;
-        char buf[32] = "";
-
@@ -863 +864 @@
-        {
-                attr = TERM_L_GREEN;
-strnfmt(buf, sizeof(buf), "Fast (+%d)", (i - 110))
+type = "Fast"
-        }
-
@@ -870 +871 @@
-        {
-                attr = TERM_L_UMBER;
-
-
+
+
+
+
+
-
-        /* Display the speed */
@@ -1649 +1653 @@
-
-/*
-
+
+
+
+
+
+
- */
-static void calc_torch(void)
-{
-        int i;
-        object_type *o_ptr;
-        u32b f1, f2, f3;
-
-        s16b old_lite = p_ptr->cur_lite;
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        for (i = INVEN_WIELD; i < INVEN_TOTAL; 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 */
-
-
-, bright, lite
+else 
+
+ 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
-                        {
-
-
+
+
+
+
+
-                        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-        /* 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);
-        }
@@ -1849 +1868 @@
-        p_ptr->hold_life = FALSE;
-        p_ptr->telepathy = FALSE;
-        p_ptr->lite = FALSE;
-        p_ptr->sustain_str = FALSE;
-        p_ptr->sustain_int = FALSE;
@@ -1921 +1939 @@
-        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;

trunk/src/xtra2.c

@@ -58 +58 @@
-        { "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 },
-Suddenly you can remember things again
+Your memories come flooding back
-};
-