Changeset 250

Timestamp:

07/02/07 14:02:56 (1 year ago)

Author:

ajps

Message:

Alter self_knowledge to study equipment and player flags instead of the current player state. This allows for a 'no-spoil' mode for the knowledge screens. Fixes #169.

Files:

• trunk/src/cmd4.c (modified) (2 diffs)
• trunk/src/externs.h (modified) (1 diff)
• trunk/src/spells2.c (modified) (7 diffs)
• trunk/src/use-obj.c (modified) (2 diffs)
• trunk/src/wizard2.c (modified) (1 diff)

trunk/src/cmd4.c

@@ -4007 +4007 @@
-
-
+void do_cmd_self_knowledge(void *obj, const char *name)
+{
+        /* display self knowledge we already know about. */
+        self_knowledge(FALSE);
+}
+
-/*
- * Definition of the "player knowledge" menu.
@@ -4017 +4023 @@
-        {{0, "Display object knowledge", (action_f)do_cmd_knowledge_objects, 0}, '4'},
-        {{0, "Display feature knowledge", (action_f)do_cmd_knowledge_features, 0}, '5'},
-(action_f)
+do_cmd_
-};
-

trunk/src/externs.h

@@ -518 +518 @@
-extern bool remove_all_curse(void);
-extern bool restore_level(void);
-void
+bool spoil
-extern bool lose_all_info(void);
-extern void set_recall(void);

trunk/src/spells2.c

@@ -385 +385 @@
- *
- * List various information about the player and/or his current equipment.
+ * See also "identify_fully()".
- *
-
+
+
- *
- * Use the "roff()" routines, perhaps.  XXX XXX XXX
@@ -394 +396 @@
- * This function cannot display more than 20 lines.  XXX XXX XXX
- */
-void
+bool spoil
-{
-        int i = 0, j, k;
+
+        u32b t1, t2, t3;
-
-        u32b f1 = 0L, f2 = 0L, f3 = 0L;
@@ -408 +412 @@
-        for (k = INVEN_WIELD; k < INVEN_TOTAL; k++)
-        {
-                u32b t1, t2, t3;
-
-                o_ptr = &inventory[k];
-
@@ -416 +418 @@
-
-                /* Extract the flags */
-
+
+
+
+
-
-                /* Extract flags */
@@ -424 +429 @@
-        }
-
+        /* And flags from the player */
+        player_flags(&t1, &t2, &t3);
+
+        /* Extract flags */
+        f1 |= t1;
+        f2 |= t2;
+        f3 |= t3;
+
-
-        if (p_ptr->timed[TMD_BLIND])
@@ -454 +467 @@
-        }
-
-p_ptr->aggravate
+f3 & TR3_AGGRAVATE
-        {
-                info[i++] = "You aggravate monsters.";
-        }
-p_ptr->teleport
+f3 & TR3_TELEPORT
-        {
-                info[i++] = "Your position is very uncertain.";
@@ -503 +516 @@
-                info[i++] = "You will soon be recalled.";
-        }
-p_ptr->see_infra
+rp_ptr->infra || f1 & TR1_INFRA
-        {
-                info[i++] = "Your eyes are sensitive to infrared light.";
-        }
-
-p_ptr->slow_digest
+f3 & TR3_SLOW_DIGEST
-        {
-                info[i++] = "Your appetite is small.";
-        }
-p_ptr->ffall
+f3 & TR3_FEATHER
-        {
-                info[i++] = "You land gently.";
-        }
-p_ptr->regenerate
+f3 & TR3_REGEN
-        {
-                info[i++] = "You regenerate quickly.";
-        }
-p_ptr->telepathy
+f3 & TR3_TELEPATHY
-        {
-                info[i++] = "You have ESP.";
-        }
-p_ptr->see_inv
+f3 & TR3_SEE_INVIS
-        {
-                info[i++] = "You can see invisible creatures.";
-        }
-p_ptr->free_act
+f3 & TR3_FREE_ACT
-        {
-                info[i++] = "You have free action.";
-        }
-p_ptr->hold_life
+f3 & TR3_HOLD_LIFE
-        {
-                info[i++] = "You have a firm hold on your life force.";
-        }
-
-p_ptr->immune_acid
+f2 & TR2_IM_ACID
-        {
-                info[i++] = "You are completely immune to acid.";
-        }
-p_ptr->resist_acid
+f2 & TR2_RES_ACID
-        {
-                info[i++] = "You resist acid exceptionally well.";
-        }
-p_ptr->resist_acid
+f2 & TR2_RES_ACID
-        {
-                info[i++] = "You are resistant to acid.";
-        }
-
-p_ptr->immune_elec
+f2 & TR2_IM_ELEC
-        {
-                info[i++] = "You are completely immune to lightning.";
-        }
-p_ptr->resist_elec
+f2 & TR2_RES_ELEC
-        {
-                info[i++] = "You resist lightning exceptionally well.";
-        }
-p_ptr->resist_elec
+f2 & TR2_RES_ELEC
-        {
-                info[i++] = "You are resistant to lightning.";
-        }
-
-p_ptr->immune_fire
+f2 & TR2_IM_FIRE
-        {
-                info[i++] = "You are completely immune to fire.";
-        }
-p_ptr->resist_fire
+f2 & TR2_RES_FIRE
-        {
-                info[i++] = "You resist fire exceptionally well.";
-        }
-p_ptr->resist_fire
+f2 & TR2_RES_FIRE
-        {
-                info[i++] = "You are resistant to fire.";
-        }
-
-p_ptr->immune_cold
+f2 & TR2_IM_COLD
-        {
-                info[i++] = "You are completely immune to cold.";
-        }
-p_ptr->resist_cold
+f2 & TR2_RES_COLD
-        {
-                info[i++] = "You resist cold exceptionally well.";
-        }
-p_ptr->resist_cold
+f2 & TR2_RES_COLD
-        {
-                info[i++] = "You are resistant to cold.";
-        }
-
-p_ptr->resist_pois
+f2 & TR2_RES_POIS
-        {
-                info[i++] = "You resist poison exceptionally well.";
-        }
-p_ptr->resist_pois
+f2 & TR2_RES_POIS
-        {
-                info[i++] = "You are resistant to poison.";
-        }
-
-p_ptr->resist_fear
+f2 & TR2_RES_FEAR
-        {
-                info[i++] = "You are completely fearless.";
-        }
-
-p_ptr->resist_lite
+f2 & TR2_RES_LITE
-        {
-                info[i++] = "You are resistant to bright light.";
-        }
-p_ptr->resist_dark
+f2 & TR2_RES_DARK
-        {
-                info[i++] = "You are resistant to darkness.";
-        }
-p_ptr->resist_blind
+f2 & TR2_RES_DARK
-        {
-                info[i++] = "Your eyes are resistant to blindness.";
-        }
-p_ptr->resist_confu
+f2 & TR2_RES_CONFU
-        {
-                info[i++] = "You are resistant to confusion.";
-        }
-p_ptr->resist_sound
+f2 & TR2_RES_SOUND
-        {
-                info[i++] = "You are resistant to sonic attacks.";
-        }
-p_ptr->resist_shard
+f2 & TR2_RES_SHARD
-        {
-                info[i++] = "You are resistant to blasts of shards.";
-        }
-p_ptr->resist_nexus
+f2 & TR2_RES_NEXUS
-        {
-                info[i++] = "You are resistant to nexus attacks.";
-        }
-p_ptr->resist_nethr
+f2 & TR2_RES_NETHR
-        {
-                info[i++] = "You are resistant to nether forces.";
-        }
-p_ptr->resist_chaos
+f2 & TR2_RES_CHAOS
-        {
-                info[i++] = "You are resistant to chaos.";
-        }
-p_ptr->resist_disen
+f2 & TR2_RES_DISEN
-        {
-                info[i++] = "You are resistant to disenchantment.";
-        }
-
-p_ptr->sustain_str
+f2 & TR2_SUST_STR
-        {
-                info[i++] = "Your strength is sustained.";
-        }
-p_ptr->sustain_int
+f2 & TR2_SUST_INT
-        {
-                info[i++] = "Your intelligence is sustained.";
-        }
-p_ptr->sustain_wis
+f2 & TR2_SUST_WIS
-        {
-                info[i++] = "Your wisdom is sustained.";
-        }
-p_ptr->sustain_dex
+f2 & TR2_SUST_DEX
-        {
-                info[i++] = "Your dexterity is sustained.";
-        }
-p_ptr->sustain_con
+f2 & TR2_SUST_CON
-        {
-                info[i++] = "Your constitution is sustained.";
-        }
-p_ptr->sustain_chr
+f2 & TR2_SUST_CHR
-        {
-                info[i++] = "Your charisma is sustained.";

trunk/src/use-obj.c

@@ -672 +672 @@
-                        (void)detect_objects_normal();
-                        identify_pack();
-
+TRUE
-                        *ident = TRUE;
-                        break;
@@ -681 +681 @@
-                        msg_print("You begin to know yourself a little better...");
-                        message_flush();
-
+TRUE
-                        *ident = TRUE;
-                        break;

trunk/src/wizard2.c

@@ -1613 +1613 @@
-                case 'k':
-                {
-
+TRUE
-                        break;
-                }