Mindcraft: Psycometry is normal ID regardless of level.

5 files changed, 2 insertions, 87 deletions

diff --git a/src/cmd7.c b/src/cmd7.c
index b6c20985..c814ab30 100644
--- a/src/cmd7.c
+++ b/src/cmd7.c
@@ -619,15 +619,7 @@ void do_cmd_mindcraft(void)
 			/* Psychometry */
 		case 7:
 			{
-				if (plev < 40)
-				{
-					psychometry();
-				}
-				else
-				{
-					ident_spell();
-				}
-
+				ident_spell();
 				break;
 			}
 
diff --git a/src/dungeon.c b/src/dungeon.c
index c6eb7551..e7c88c03 100644
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -796,81 +796,6 @@ static void regen_monsters(void)
 
 
 /*
- * Forcibly pseudo-identify an object in the inventory
- * (or on the floor)
- */
-bool psychometry(void)
-{
-	int item;
-
-	object_type *o_ptr;
-
-	char o_name[80];
-
-	byte feel;
-
-	cptr q, s;
-
-
-	/* Get an item */
-	q = "Meditate on which item? ";
-	s = "You have nothing appropriate.";
-	if (!get_item(&item, q, s, (USE_EQUIP | USE_INVEN | USE_FLOOR))) return (FALSE);
-
-	/* Get the item (in the pack) */
-	if (item >= 0)
-	{
-		o_ptr = &p_ptr->inventory[item];
-	}
-
-	/* Get the item (on the floor) */
-	else
-	{
-		o_ptr = &o_list[0 - item];
-	}
-
-	/* It is fully known, no information needed */
-	if ((object_known_p(o_ptr)) || (o_ptr->ident & IDENT_SENSE))
-	{
-		msg_print("You cannot find out anything more about that.");
-		return (TRUE);
-	}
-
-	/* Check for a feeling */
-	feel = value_check_aux1_magic(o_ptr);
-	if (feel == SENSE_NONE) feel = value_check_aux1(o_ptr);
-
-	/* Get an object description */
-	object_desc(o_name, o_ptr, FALSE, 0);
-
-	/* Skip non-feelings */
-	if (!feel)
-	{
-		msg_format("You do not perceive anything unusual about the %s.", o_name);
-		return (TRUE);
-	}
-
-	msg_format("You feel that the %s %s %s...",
-	           o_name, ((o_ptr->number == 1) ? "is" : "are"), sense_desc[feel]);
-
-	/* We have "felt" it */
-	o_ptr->ident |= (IDENT_SENSE);
-
-	/* Set sense property */
-	o_ptr->sense = feel;
-
-	/* Combine / Reorder the pack (later) */
-	p_ptr->notice |= (PN_COMBINE | PN_REORDER);
-
-	/* Window stuff */
-	p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
-
-	/* Something happened */
-	return (TRUE);
-}
-
-
-/*
  * Does an object decay?
  *
  * Should belong to object1.c, renamed to object_decays() -- pelpel
diff --git a/src/externs.h b/src/externs.h
index 73b9f20a..4022dace 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -880,7 +880,6 @@ extern byte value_check_aux2(object_type *o_ptr);
 extern byte value_check_aux2_magic(object_type *o_ptr);
 extern void play_game(bool new_game);
 extern void sense_inventory();
-extern bool psychometry(void);
 
 /* files.c */
 extern void html_screenshot(cptr name);
diff --git a/src/object.pkg b/src/object.pkg
index feb9a712..a89dad9a 100644
--- a/src/object.pkg
+++ b/src/object.pkg
@@ -1165,6 +1165,5 @@ extern byte value_check_aux1(object_type *o_ptr);
 extern byte value_check_aux1_magic(object_type *o_ptr);
 extern byte value_check_aux2(object_type *o_ptr);
 extern byte value_check_aux2_magic(object_type *o_ptr);
-extern bool psychometry(void);
 
 extern bool remove_curse_object(object_type *o_ptr, bool all);
diff --git a/src/tables.c b/src/tables.c
index 2f05b7ca..44973287 100644
--- a/src/tables.c
+++ b/src/tables.c
@@ -2559,7 +2559,7 @@ magic_power mindcraft_powers[MAX_MINDCRAFT_POWERS] =
 	{
 		15, 12, 60,
 		"Psychometry",
-		"Senses/identifies objects."
+		"Identifies objects."
 	},
 	{
 		/* Ball -> LOS */