Changeset 137

Timestamp:

05/14/07 04:47:59 (1 year ago)

Author:

takkaria

Message:

Finish up S-style object handling: (Leon Marrick)

• Make the game correctly update the view before prompting to pick up
  
• Compress the treasure pickup messages
  
• List a single object in the message line instead of showing a list just for it
  

Closes #54.

Files:

• trunk/src/cave.c (modified) (1 diff)
• trunk/src/cmd1.c (modified) (8 diffs)
• trunk/src/defines.h (modified) (3 diffs)
• trunk/src/dungeon.c (modified) (2 diffs)
• trunk/src/randname.c (modified) (1 diff)
• trunk/src/types.h (modified) (1 diff)

trunk/src/cave.c

@@ -4141 +4141 @@
-        }
-
+        /* Cancel auto-pickup if badly wounded  XXX XXX */
+        if ((p_ptr->notice & (PN_PICKUP0 | PN_PICKUP1)) &&
+            (p_ptr->chp < (p_ptr->mhp * op_ptr->hitpoint_warn / 10)))
+        {
+                p_ptr->auto_pickup_okay = FALSE;
+        }
+
-        /* Flush the input if requested */
-        if (flush_disturb) flush();

trunk/src/cmd1.c

@@ -667 +667 @@
-        bool msg = TRUE;
-
+        s32b total_gold = 0L;
+        byte *treasure;
+
-
-        /* Nothing to pick up -- return */
@@ -675 +678 @@
-
-
-
+
+
+
+
+
-        for (this_o_idx = cave_o_idx[py][px]; this_o_idx; this_o_idx = next_o_idx)
-        {
+                int gold_type;
+
-                /* Get the object */
-                o_ptr = &o_list[this_o_idx];
@@ -687 +696 @@
-                if (!o_ptr->marked) continue;
-
+                /* Ignore if not legal treasure */
+                if ((o_ptr->tval != TV_GOLD) ||
+                    (o_ptr->sval >= SV_GOLD_MAX)) continue;
+
+                /* Hack -- adjust treasure type (to avoid picking up "gold, gold, and gold") */
+                gold_type = o_ptr->sval;
+                if ((gold_type == SV_COPPER2) || (gold_type == SV_COPPER3))
+                        gold_type = SV_COPPER1;
+                if ((gold_type == SV_SILVER2) || (gold_type == SV_SILVER3))
+                        gold_type = SV_SILVER1;
+                if ((gold_type == SV_GOLD2)   || (gold_type == SV_GOLD3))
+                        gold_type = SV_GOLD1;
+                if (gold_type == SV_GARNETS2)
+                        gold_type = SV_GARNETS1;
+
+                /* Note that we have this kind of treasure */
+                treasure[gold_type]++;
+
+                /* Increment total value */
+                total_gold += (s32b)o_ptr->pval;
+
+                /* Delete the gold */
+                delete_object_idx(this_o_idx);
+        }
+
+        /* Pick up the gold, if present */
+        if (total_gold)
+        {
+                char buf[1024];
+                char tmp[80];
+                int i, count, total, k_idx;
+
+                /* Build a message */
+                (void)strnfmt(buf, sizeof(buf), "You have found %ld gold pieces worth of ",  total_gold);
+
+                /* Count the types of treasure present */
+                for (total = 0, i = 0; i < SV_GOLD_MAX; i++)
+                {
+                        if (treasure[i]) total++;
+                }
+
+                /* List the treasure types */
+                for (count = 0, i = 0; i < SV_GOLD_MAX; i++)
+                {
+                        /* Skip if no treasure of this type */
+                        if (!treasure[i]) continue;
+
+                        /* Get this object index */
+                        k_idx = lookup_kind(TV_GOLD, i);
+
+                        /* Skip past errors  XXX */
+                        if (k_idx <= 0) continue;
+
+                        /* Get the object name */
+                        strip_name(tmp, k_idx, TRUE);
+
+                        /* Build up the pickup string */
+                        my_strcat(buf, tmp, sizeof(buf));
+
+                        /* Added another kind of treasure */
+                        count++;
+
+                        /* Add a comma if necessary */
+                        if ((total > 2) && (count < total)) strcat(buf, ",");
+
+                        /* Add an "and" if necessary */
+                        if ((total >= 2) && (count == total-1)) strcat(buf, " and");
+
+                        /* Add a space or period if necessary */
+                        if (count < total) strcat(buf, " ");
+                        else               strcat(buf, ".");
+                }
+
+                /* Determine which sound to play */
+                if      (total_gold < 200) sound_msg = MSG_MONEY1;
+                else if (total_gold < 600) sound_msg = MSG_MONEY2;
+                else                       sound_msg = MSG_MONEY3;
+
+                /* Display the message */
+                message_format(sound_msg, 0, "%s", buf);
+
+                /* Add gold to purse */
+                p_ptr->au += total_gold;
+
+                /* Redraw gold */
+                p_ptr->redraw |= (PR_GOLD);
+
+                /* Window stuff */
+                p_ptr->window |= (PW_PLAYER_0 | PW_PLAYER_1);
+        }
+
+        /* Free the gold array */
+        FREE(treasure);
+
+
+        /* Scan the remaining objects */
+        for (this_o_idx = cave_o_idx[py][px]; this_o_idx; this_o_idx = next_o_idx)
+        {
+                /* Get the object */
+                o_ptr = &o_list[this_o_idx];
+
+                /* Get the next object */
+                next_o_idx = o_ptr->next_o_idx;
+
+                /* Ignore all hidden objects */
+                if (!o_ptr->marked) continue;
+
-                /* Paranoia -- ignore all dead objects  XXX */
-                if (!o_ptr->k_idx) continue;
@@ -694 +810 @@
-
-
-                /* Pick up gold */
-                if (o_ptr->tval == TV_GOLD)
-                {
-                        /* Determine which sound to play */
-                        if ((long)o_ptr->pval < 200) sound_msg = MSG_MONEY1;
-                        else if ((long)o_ptr->pval < 600) sound_msg = MSG_MONEY2;
-                        else sound_msg = MSG_MONEY3;
-                        
-                        /* Describe the object */
-                        object_desc(o_name, sizeof(o_name), o_ptr, TRUE, 3);
-
-                        /* Message */
-                        message_format(sound_msg, 0, "You have found %s worth %ld gold pieces.",
-                                o_name, (long)o_ptr->pval);
-
-                        /* Collect the gold */
-                        p_ptr->au += o_ptr->pval;
-
-                        /* Redraw gold */
-                        p_ptr->redraw |= (PR_GOLD);
-
-                        /* Window stuff */
-                        p_ptr->window |= (PW_PLAYER_0 | PW_PLAYER_1);
-
-                        /* Delete the gold */
-                        delete_object_idx(this_o_idx);
-
-                        /* Check the next object */
-                        continue;
-                }
-
-                /* Automatically pick up items into the backpack */
-
+_ptr->auto_pickup_okay) && (p
-                {
-                        /* Pick up the object (with a message) */
@@ -765 +850 @@
-        {
-                /* Optionally, display more information about floor items */
-query_floor
+(query_floor) && (floor_num > 1)
-                {
-                        /* Scan all marked objects in the grid */
@@ -899 +984 @@
-                 * potentially unsafe, ask the player to confirm all pickups.
-                 */
-query_floor
+(query_floor) || (!p_ptr->auto_pickup_okay)
-                {
-                        /* Save screen */
@@ -1591 +1676 @@
-                }
-
-                /* Handle objects now.  XXX XXX XXX */
-                p_ptr->energy_use += py_pickup(do_pickup) * 10;
-
-                /*
-                 * The correct thing to do is to pick up objects *after* the map
-                 * display updates post-move.  This involves about 30 lines of code
-                 * and will be done on request.  -LM-
-                 */
-
-
-                /* Handle "store doors" */
@@ -1613 +1689 @@
-                        /* Free turn XXX XXX XXX */
-                        p_ptr->energy_use = 0;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-                /* Discover invisible traps */
-else 
+
-                {
-                        /* Disturb */

trunk/src/defines.h

@@ -1363 +1363 @@
-#define SV_FOOD_PINT_OF_WINE    39
-
+/* The "sval" codes for TV_GOLD */
+#define SV_COPPER1                        1
+#define SV_COPPER2                        2
+#define SV_COPPER3                        3
+#define SV_SILVER1                        4
+#define SV_SILVER2                        5
+#define SV_SILVER3                        6
+#define SV_GARNETS1                       7
+#define SV_GARNETS2                       8
+#define SV_GOLD1                          9
+#define SV_GOLD2                         10
+#define SV_GOLD3                         11
+#define SV_OPALS                         12
+#define SV_SAPPHIRES                     13
+#define SV_RUBIES                        14
+#define SV_DIAMONDS                      15
+#define SV_EMERALDS                      16
+#define SV_MITHRIL                       17
+#define SV_ADAMANTITE                    18
+
+#define SV_GOLD_MAX                      19
+
+
-
-/*
@@ -1400 +1423 @@
- */
-#define SQUELCH_NEVER               0 /* Allow pickup, defer to OPT_always_pickup */
- 
+
-#define NO_SQUELCH_ALWAYS_PICKUP    2 /* Always pickup, override all other options */
-#define SQUELCH_ALWAYS              3 /* Destroy when player walks over */
@@ -1576 +1599 @@
-#define PN_REORDER              0x00000002L     /* Reorder the pack */
-#define PN_AUTOINSCRIBE 0x00000004L     /* Autoinscribe items */
+#define PN_PICKUP0      0x00000008L     /* Notice stuff (allow pickup) */
+#define PN_PICKUP1      0x00000010L     /* Pick up stuff */
-/* xxx (many) */
-

trunk/src/dungeon.c

@@ -1262 +1262 @@
-                }
-
+                /* Picking up objects */
+                else if (p_ptr->notice & (PN_PICKUP1))
+                {
+                        /* Recursively call the pickup function, use energy */
+                        p_ptr->energy_use = py_pickup(1) * 10;
+                        p_ptr->notice &= ~(PN_PICKUP0 | PN_PICKUP1);
+                }
+
+                /* Noticing objects (allow pickup) */
+                else if (p_ptr->notice & (PN_PICKUP0))
+                {
+                        /* Recursively call the pickup function, use energy */
+                        p_ptr->energy_use = py_pickup(0) * 10;
+                        p_ptr->notice &= ~(PN_PICKUP0 | PN_PICKUP1);
+                }
+
-                /* Resting */
-                else if (p_ptr->resting)
@@ -1455 +1471 @@
-                }
-        }
+
-        while (!p_ptr->energy_use && !p_ptr->leaving);
+
+
+        /* Allowed to automatically pick up things again */
+        p_ptr->auto_pickup_okay = TRUE;
-}
-

trunk/src/randname.c

@@ -1 +1 @@
-/*
-randname.c - random name generation
-Copyright (c) 2007 Antony Sidwell and others,
+File: randname.c
+Purpose: Random name generation
- * Based on W. Sheldon Simms name generator originally in randart.c
- *
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
- */
-#include "angband.h"

trunk/src/types.h

@@ -953 +953 @@
-        bool run_break_left;    /* Looking for a break (left) */
-
+        bool auto_pickup_okay;      /* Allow automatic pickup */
+
-        s16b command_cmd;               /* Gives identity of current command */
-        s16b command_arg;               /* Gives argument of current command */