Changeset 387

Timestamp:

07/27/07 18:26:04 (1 year ago)

Author:

takkaria

Message:

• Add 'K' command to "mark item kind as squelch" (#250)
  
• Add squelch_worthless option which does what it says on the tin. (#299)
  

Files:

• branches/angband-3.0.8/src/cmd0.c (modified) (1 diff)
• branches/angband-3.0.8/src/cmd2.c (modified) (1 diff)
• branches/angband-3.0.8/src/cmds.h (modified) (1 diff)
• branches/angband-3.0.8/src/defines.h (modified) (1 diff)
• branches/angband-3.0.8/src/externs.h (modified) (1 diff)
• branches/angband-3.0.8/src/object1.c (modified) (1 diff)
• branches/angband-3.0.8/src/squelch.c (modified) (2 diffs)
• branches/angband-3.0.8/src/tables.c (modified) (4 diffs)

branches/angband-3.0.8/src/cmd0.c

@@ -108 +108 @@
-        { "Drop an item",              'd', do_cmd_drop },
-        { "Destroy an item",           'k', do_cmd_destroy },
+        { "Mark an item as squelch",   'K', do_cmd_mark_squelch },
-        { "Examine an item",           'I', do_cmd_observe },
-        { "Inscribe an object",        '{', do_cmd_inscribe },

branches/angband-3.0.8/src/cmd2.c

@@ -2979 +2979 @@
-        drop_near(i_ptr, j, y, x);
-}
+
+
+/*
+ * See if one can squelch a given kind of item.
+ */
+static bool squelchable_hook(const object_type *o_ptr)
+{
+        object_kind *k_ptr = &k_info[o_ptr->k_idx];
+
+        /* No point in double-squelching things */
+        if (k_ptr->squelch) return FALSE;
+
+        /* Don't squelch bad tvals */
+        if (!squelch_tval(o_ptr->tval)) return FALSE;
+
+        /* Only allow if aware */
+        return object_aware_p(o_ptr);
+}
+
+
+
+/*
+ * Mark item as "squelch".
+ */
+void do_cmd_mark_squelch()
+{
+        const char *q = "Squelch which item kind? ";
+        const char *s = "You have nothing you can squelch.";
+
+        object_type *o_ptr;
+        object_kind *k_ptr;
+        int item;
+
+        /* Get an item */
+        item_tester_hook = squelchable_hook;
+        if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))) return;
+
+        /* Get the object */
+        if (item >= 0)
+                o_ptr = &inventory[item];
+        else
+                o_ptr = &o_list[0 - item];
+
+        /* Get object kind */
+        k_ptr = &k_info[o_ptr->k_idx];
+
+        /* Set squelch flag */
+        k_ptr->squelch = TRUE;
+}

branches/angband-3.0.8/src/cmds.h

@@ -27 +27 @@
-extern void do_cmd_fire(void);
-extern void do_cmd_throw(void);
+extern void do_cmd_mark_squelch(void);
-
-/* cmd3.c */

branches/angband-3.0.8/src/defines.h

@@ -2422 +2422 @@
-#define OPT_show_piles                          67
-#define OPT_center_player                       68
-
-
+
-#define OPT_hp_changes_color            74
-#define OPT_hide_squelchable            75
+#define OPT_squelch_worthless           76
-#define OPT_mouse_movement              77
-

branches/angband-3.0.8/src/externs.h

@@ -600 +600 @@
-void autoinscribe_pack(void);
-
+bool squelch_tval(int tval);
-bool squelch_item_ok(const object_type *o_ptr);
-bool squelch_hide_item(object_type *o_ptr);

branches/angband-3.0.8/src/object1.c

@@ -759 +759 @@
-
-        /* Hack -- mark-to-squelch worthless items XXX */
-
+ && OPTION(squelch_worthless)
-        {
-                if (object_value(o_ptr) == 0)

branches/angband-3.0.8/src/squelch.c

@@ -313 +313 @@
-
-/*
+ * Determines whether a tval is eligable for sval-squelch.
+ */
+bool squelch_tval(int tval)
+{
+        size_t i;
+
+        /* Only squelch if the tval's allowed */
+        for (i = 0; i < N_ELEMENTS(sval_dependent); i++)
+        {
+                if (tval == sval_dependent[i].tval)
+                        return TRUE;
+        }
+
+        return FALSE;
+}
+
+
+/*
- * Determines if an object is eligable for squelching.
- */
@@ -342 +360 @@
-        if (k_ptr->squelch && (k_ptr->flavor == 0 || k_ptr->aware))
-        {
-
-
-
-
-
-
+
+
-        }
-

branches/angband-3.0.8/src/tables.c

@@ -1473 +1473 @@
-        "hp_changes_color",                     /* OPT_hp_changes_color */
-        "hide_squelchable",                     /* OPT_hide_squelchable */
-NULL,                                          /* xxx
+"squelch_worthless",                   /* OPT_squelch_worthless
-        "mouse_movement",                       /* OPT_mouse_movement */
-        NULL,                                           /* xxx */
@@ -1737 +1737 @@
-        "Player color indicates low hit points",        /* OPT_hp_changes_color */
-        "Hide items set as squelchable",                        /* OPT_hide_squelchable */
-NULL,                                                                          /* xxx
+"Automatically squelch worthless items",       /* OPT_squelch_worthless
-        "Allow mouse clicks to move the player",        /* OPT_mouse_movement */
-        NULL,                                                                           /* xxx */
@@ -2001 +2001 @@
-        FALSE,          /* OPT_hp_changes_color */
-        FALSE,          /* OPT_hide_squelchable */
-xxx
+OPT_squelch_worthless
-        FALSE,          /* OPT_mouse_movement */
-        FALSE,          /* xxx */
@@ -2198 +2198 @@
-                OPT_pickup_detail,
-                OPT_hide_squelchable,
+                OPT_squelch_worthless,
-                OPT_easy_alter,
-                OPT_easy_open,
-                OPT_mouse_movement,
-                OPT_NONE,
-                OPT_NONE,
-                OPT_NONE,