Remove TR_SEARCH object flag

Since the removal of traps its only effect was diluting the list of
flags "available" for randarts and sentient items.

7 files changed, 11 insertions, 68 deletions

diff --git a/src/defines.h b/src/defines.h
index 7da8e038..1cd16b89 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -1207,7 +1207,6 @@
 #define SV_AMULET_ADORNMENT              2
 #define SV_AMULET_SLOW_DIGEST            3
 #define SV_AMULET_RESIST_ACID            4
-#define SV_AMULET_SEARCHING              5
 #define SV_AMULET_BRILLANCE              6
 #define SV_AMULET_CHARISMA               7
 #define SV_AMULET_THE_MAGI               8
@@ -1258,7 +1257,6 @@
 #define SV_RING_RESIST_POIS             20
 #define SV_RING_FREE_ACTION             21
 #define SV_RING_SEE_INVIS               22
-#define SV_RING_SEARCHING               23
 #define SV_RING_STR                     24
 #define SV_RING_INT                     25
 #define SV_RING_DEX                     26
diff --git a/src/object1.cc b/src/object1.cc
index 1eb9b484..ad82f20f 100644
--- a/src/object1.cc
+++ b/src/object1.cc
@@ -1950,12 +1950,6 @@ static std::string object_desc_aux(object_type const *o_ptr, int pref, int mode)
 			t += " to stealth";
 		}
 
-		/* Search */
-		else if (flags & TR_SEARCH)
-		{
-			t += " to searching";
-		}
-
 		/* Infravision */
 		else if (flags & TR_INFRA)
 		{
@@ -2667,7 +2661,6 @@ bool_ object_out_desc(object_type *o_ptr, FILE *fff, bool_ trim_down, bool_ wait
 		if (flags & TR_DEX) vp[vn++] = "dexterity";
 		if (flags & TR_CON) vp[vn++] = "constitution";
 		if (flags & TR_CHR) vp[vn++] = "charisma";
-		if (flags & TR_SEARCH) vp[vn++] = "searching";
 		if (flags & TR_INFRA) vp[vn++] = "infravision";
 		if (flags & TR_TUNNEL) vp[vn++] = "ability to tunnel";
 		if (flags & TR_SPEED) vp[vn++] = "speed";
diff --git a/src/object2.cc b/src/object2.cc
index 6a584ffc..95fcf041 100644
--- a/src/object2.cc
+++ b/src/object2.cc
@@ -874,7 +874,6 @@ s32b flag_cost(object_type const *o_ptr, int plusses)
 	if (flags & TR_CHAOTIC) total += 10000;
 	if (flags & TR_VAMPIRIC) total += 13000;
 	if (flags & TR_STEALTH) total += (250 * plusses);
-	if (flags & TR_SEARCH) total += (100 * plusses);
 	if (flags & TR_INFRA) total += (150 * plusses);
 	if (flags & TR_TUNNEL) total += (175 * plusses);
 	if ((flags & TR_SPEED) && (plusses > 0))
@@ -1201,7 +1200,6 @@ s32b object_value_real(object_type const *o_ptr)
 
 			/* Give credit for stealth and searching */
 			if (flags & TR_STEALTH) value += (o_ptr->pval * 100L);
-			if (flags & TR_SEARCH) value += (o_ptr->pval * 100L);
 
 			/* Give credit for infra-vision and tunneling */
 			if (flags & TR_INFRA) value += (o_ptr->pval * 50L);
@@ -2896,25 +2894,6 @@ static void a_m_aux_3(object_type *o_ptr, int level, int power)
 				}
 				break;
 
-				/* Searching */
-			case SV_RING_SEARCHING:
-				{
-					/* Bonus to searching */
-					o_ptr->pval = 1 + m_bonus(5, level);
-
-					/* Cursed */
-					if (power < 0)
-					{
-						/* Cursed */
-						o_ptr->ident |= (IDENT_CURSED);
-
-						/* Reverse pval */
-						o_ptr->pval = 0 - (o_ptr->pval);
-					}
-
-					break;
-				}
-
 				/* Flames, Acid, Ice */
 			case SV_RING_FLAMES:
 			case SV_RING_ACID:
@@ -3124,24 +3103,6 @@ static void a_m_aux_3(object_type *o_ptr, int level, int power)
 				}
 				break;
 
-				/* Amulet of searching */
-			case SV_AMULET_SEARCHING:
-				{
-					o_ptr->pval = randint(5) + m_bonus(5, level);
-
-					/* Cursed */
-					if (power < 0)
-					{
-						/* Cursed */
-						o_ptr->ident |= (IDENT_CURSED);
-
-						/* Reverse bonuses */
-						o_ptr->pval = 0 - (o_ptr->pval);
-					}
-
-					break;
-				}
-
 				/* Amulet of the Magi -- never cursed */
 			case SV_AMULET_THE_MAGI:
 				{
@@ -3770,24 +3731,21 @@ void add_random_ego_flag(object_type *o_ptr, ego_flag_set const &fego, bool_ *li
 	{
 		/* Add a random pval-affected ability */
 		/* This might cause boots with + to blows */
-		switch (randint(6))
+		switch (randint(5))
 		{
 		case 1:
 			o_ptr->art_flags |= TR_STEALTH;
 			break;
 		case 2:
-			o_ptr->art_flags |= TR_SEARCH;
-			break;
-		case 3:
 			o_ptr->art_flags |= TR_INFRA;
 			break;
-		case 4:
+		case 3:
 			o_ptr->art_flags |= TR_TUNNEL;
 			break;
-		case 5:
+		case 4:
 			o_ptr->art_flags |= TR_SPEED;
 			break;
-		case 6:
+		case 5:
 			o_ptr->art_flags |= TR_BLOWS;
 			break;
 		}
diff --git a/src/object_flag_list.hpp b/src/object_flag_list.hpp
index 696b590c..a7aef7d4 100644
--- a/src/object_flag_list.hpp
+++ b/src/object_flag_list.hpp
@@ -30,13 +30,12 @@ TR(1,  5, TR_CHR                , CHR                , "Add Chr"   ,  0,  0,  5,
 TR(1,  6, TR_MANA               , MANA               , "Mul Mana"  ,  0,  0,  6, BINARY    , 0, false, false)
 TR(1,  7, TR_SPELL              , SPELL              , "Mul SPower",  0,  0,  7, BINARY    , 0, true , false)
 TR(1,  8, TR_STEALTH            , STEALTH            , "Add Stea." ,  0,  0,  8, NUMERIC   , 0, true , false)
-TR(1,  9, TR_SEARCH             , SEARCH             , "Add Sear." ,  0,  0,  9, NUMERIC   , 0, true , false)
-TR(1, 10, TR_INFRA              , INFRA              , "Add Infra" ,  0,  0, 10, NUMERIC   , 0, true , false)
-TR(1, 11, TR_TUNNEL             , TUNNEL             , "Add Tun.." ,  0,  0, 11, NUMERIC   , 0, true , false)
-TR(1, 12, TR_SPEED              , SPEED              , "Add Speed" ,  0,  0, 12, NUMERIC   , 0, true , false)
-TR(1, 13, TR_BLOWS              , BLOWS              , "Add Blows" ,  0,  0, 13, NUMERIC   , 0, true , false)
-TR(1, 14, TR_CHAOTIC            , CHAOTIC            , "Chaotic"   ,  0,  0, 14, BINARY    , 0, false, false)
-TR(1, 15, TR_VAMPIRIC           , VAMPIRIC           , "Vampiric"  ,  0,  0, 15, BINARY    , 0, false, false)
+TR(1, 10, TR_INFRA              , INFRA              , "Add Infra" ,  0,  0,  9, NUMERIC   , 0, true , false)
+TR(1, 11, TR_TUNNEL             , TUNNEL             , "Add Tun.." ,  0,  0, 10, NUMERIC   , 0, true , false)
+TR(1, 12, TR_SPEED              , SPEED              , "Add Speed" ,  0,  0, 11, NUMERIC   , 0, true , false)
+TR(1, 13, TR_BLOWS              , BLOWS              , "Add Blows" ,  0,  0, 12, NUMERIC   , 0, true , false)
+TR(1, 14, TR_CHAOTIC            , CHAOTIC            , "Chaotic"   ,  0,  0, 13, BINARY    , 0, false, false)
+TR(1, 15, TR_VAMPIRIC           , VAMPIRIC           , "Vampiric"  ,  0,  0, 14, BINARY    , 0, false, false)
 TR(1, 16, TR_SLAY_ANIMAL        , SLAY_ANIMAL        , "Slay Anim.",  0,  1,  0, BINARY    , 0, false, false)
 TR(1, 17, TR_SLAY_EVIL          , SLAY_EVIL          , "Slay Evil" ,  0,  1,  1, BINARY    , 0, false, false)
 TR(1, 18, TR_SLAY_UNDEAD        , SLAY_UNDEAD        , "Slay Und." ,  0,  1,  2, BINARY    , 0, false, false)
diff --git a/src/q_wight.cc b/src/q_wight.cc
index 01272aea..f635ed29 100644
--- a/src/q_wight.cc
+++ b/src/q_wight.cc
@@ -78,7 +78,6 @@ static bool_ quest_wight_gen_hook(void *, void *, void *)
 
 					q_ptr->art_flags |=
 						TR_INT |
-						TR_SEARCH |
 						TR_RES_BLIND |
 						TR_SENS_FIRE |
 						TR_RES_CONF |
diff --git a/src/spells2.cc b/src/spells2.cc
index fdf8cd27..2eb8889b 100644
--- a/src/spells2.cc
+++ b/src/spells2.cc
@@ -1596,10 +1596,6 @@ void self_knowledge(FILE *fff)
 	{
 		info[i++] = "Your stealth is affected by your equipment.";
 	}
-	if (flags & TR_SEARCH)
-	{
-		info[i++] = "Your searching ability is affected by your equipment.";
-	}
 	if (flags & TR_INFRA)
 	{
 		info[i++] = "Your infravision is affected by your equipment.";
diff --git a/src/tables.cc b/src/tables.cc
index e2eb5ff1..b091d764 100644
--- a/src/tables.cc
+++ b/src/tables.cc
@@ -2393,7 +2393,7 @@ extern std::vector<flags_group> const &flags_groups()
 			"Mind",
 			TERM_YELLOW,
 			7,
-	                TR_INT | TR_SEARCH | TR_SUST_INT | TR_RES_CONF | TR_RES_FEAR |
+			TR_INT | TR_SUST_INT | TR_RES_CONF | TR_RES_FEAR |
 			ESP_ORC | ESP_TROLL | ESP_GIANT | ESP_ANIMAL | ESP_UNIQUE | ESP_SPIDER | ESP_DEMON,
 		},
 		flags_group {