summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2016-10-16 12:28:53 +0200
committerBardur Arantsson <bardur@scientician.net>2016-10-16 12:28:53 +0200
commit54bd76ebab55ed5e090407747e6c7af402acf82b (patch)
tree0004d7a3049ccdd4f7aa9863bbdb5eb020e6d2a8
parent5144951fc78046fb91445c1ffb2b9a157b59f488 (diff)
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.
-rw-r--r--lib/edit/a_info.txt26
-rw-r--r--lib/edit/e_info.txt4
-rw-r--r--lib/edit/k_info.txt22
-rw-r--r--lib/edit/ra_info.txt2
-rw-r--r--lib/mods/theme/edit/a_info.txt32
-rw-r--r--lib/mods/theme/edit/e_info.txt6
-rw-r--r--lib/mods/theme/edit/k_info.txt22
-rw-r--r--lib/mods/theme/edit/p_info.txt10
-rw-r--r--lib/mods/theme/edit/ra_info.txt2
-rw-r--r--lib/mods/theme/edit/set_info.txt1
-rw-r--r--src/defines.h2
-rw-r--r--src/object1.cc7
-rw-r--r--src/object2.cc50
-rw-r--r--src/object_flag_list.hpp13
-rw-r--r--src/q_wight.cc1
-rw-r--r--src/spells2.cc4
-rw-r--r--src/tables.cc2
17 files changed, 11 insertions, 195 deletions
diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt
index 6ab4bf5d..c1ab7fa1 100644
--- a/lib/edit/a_info.txt
+++ b/lib/edit/a_info.txt
@@ -37,7 +37,6 @@ F:HIDE_TYPE
F:INSTA_ART
F:LITE3
F:LUCK
-F:SEARCH
a:LIGHT
D:A small crystal phial, with the light of Earendil's Star contained inside.
D:Its light is imperishable, and near it darkness cannot endure.
@@ -116,7 +115,6 @@ F:INT
F:RES_ACID
F:RES_COLD
F:RES_ELEC
-F:SEARCH
F:SEE_INVIS
F:WIS
a:DISP_EVIL
@@ -160,7 +158,6 @@ F:FLY
F:HIDE_TYPE
F:IM_FIRE
F:INSTA_ART
-F:SEARCH
F:SEE_INVIS
F:STR
a:DIM_DOOR
@@ -185,7 +182,6 @@ F:INSTA_ART
F:INT
F:RES_DARK
F:RES_POIS
-F:SEARCH
F:SEE_INVIS
F:STEALTH
F:STR
@@ -742,7 +738,6 @@ F:HIDE_TYPE
F:INT
F:RES_DARK
F:RES_LITE
-F:SEARCH
F:SPEED
F:STEALTH
Z:panic hit
@@ -991,7 +986,6 @@ F:ACTIVATE
F:HIDE_TYPE
F:INT
F:RES_BLIND
-F:SEARCH
F:SEE_INVIS
F:WIS
a:DETECT_ALL
@@ -1019,7 +1013,6 @@ F:RES_DISEN
F:RES_FEAR
F:RES_FIRE
F:RES_POIS
-F:SEARCH
F:SEE_INVIS
F:SHOW_MODS
F:TELEPORT
@@ -1080,7 +1073,6 @@ F:RES_DARK
F:RES_LITE
F:RES_SHARDS
F:RES_SOUND
-F:SEARCH
F:SEE_INVIS
F:SPEED
D:A crown of massive gold, set with wondrous jewels of thought and warding,
@@ -1497,7 +1489,6 @@ F:DEX
F:FREE_ACT
F:HIDE_TYPE
F:RES_DARK
-F:SEARCH
F:SEE_INVIS
F:SHOW_MODS
F:SLAY_EVIL
@@ -1673,7 +1664,6 @@ F:LITE1
F:RANDOM_RES_OR_POWER
F:RES_FIRE
F:RES_LITE
-F:SEARCH
F:SHOW_MODS
F:SLAY_DEMON
F:SLAY_EVIL
@@ -1701,7 +1691,6 @@ F:RES_BLIND
F:RES_ELEC
F:RES_FEAR
F:RES_FIRE
-F:SEARCH
F:SHOW_MODS
F:SLAY_GIANT
F:SLAY_ORC
@@ -1727,7 +1716,6 @@ F:RANDOM_RES_OR_POWER
F:RES_COLD
F:RES_COLD
F:RES_DARK
-F:SEARCH
F:SHOW_MODS
F:SLAY_DRAGON
F:SLAY_EVIL
@@ -2301,7 +2289,6 @@ F:INT
F:RES_FEAR
F:RES_FIRE
F:RES_LITE
-F:SEARCH
F:SEE_INVIS
F:SHOW_MODS
F:SLAY_DEMON
@@ -2485,7 +2472,6 @@ F:RES_COLD
F:RES_ELEC
F:RES_FEAR
F:RES_FIRE
-F:SEARCH
F:SHOW_MODS
F:SLAY_EVIL
F:SLAY_GIANT
@@ -2850,7 +2836,6 @@ F:INT
F:RANDOM_POWER
F:RES_FIRE
F:RES_NETHER
-F:SEARCH
F:SEE_INVIS
F:SHOW_MODS
F:SLAY_EVIL
@@ -3098,7 +3083,6 @@ F:RES_ACID
F:RES_COLD
F:RES_ELEC
F:RES_FIRE
-F:SEARCH
F:SEE_INVIS
F:SPELL_CONTAIN
F:SUST_INT
@@ -3283,7 +3267,6 @@ F:ACTIVATE
F:INFRA
F:RES_DARK
F:RES_POIS
-F:SEARCH
F:STEALTH
F:WIELD_CAST
a:DRUEDAIN
@@ -3448,7 +3431,6 @@ P:0:0d0:20:0:0
F:ACTIVATE
F:HIDE_TYPE
F:INFRA
-F:SEARCH
F:SHOW_MODS
F:SPECIAL_GENE
F:XTRA_SHOTS
@@ -3622,7 +3604,6 @@ F:ACTIVATE
F:COULD2H
F:DEX
F:HIDE_TYPE
-F:SEARCH
F:SHOW_MODS
F:SLAY_ORC
f:COULD2H
@@ -3792,7 +3773,6 @@ F:RES_COLD
F:RES_DARK
F:RES_ELEC
F:RES_FIRE
-F:SEARCH
F:STEALTH
D:Familiar with the secret ways hidden in darkness, this leather cuirass is
D:truly more than it appears.
@@ -3814,7 +3794,6 @@ F:RES_ACID
F:RES_DARK
F:RES_DISEN
F:RES_ELEC
-F:SEARCH
F:SUST_CHR
F:SUST_DEX
F:SUST_WIS
@@ -3838,7 +3817,6 @@ F:RES_ACID
F:RES_DISEN
F:RES_FIRE
F:RES_SHARDS
-F:SEARCH
F:SPELL
a:CELEBRIMBOR
D:This once belonged to Celebrimbor, maker of the Rings of Power. One who
@@ -3928,7 +3906,6 @@ F:INFRA
F:RES_ACID
F:RES_DARK
F:RES_DISEN
-F:SEARCH
F:SLAY_DRAGON
F:SLAY_GIANT
F:SLAY_ORC
@@ -4064,7 +4041,6 @@ P:4:1d1:5:5:10
F:CLIMB
F:HIDE_TYPE
F:INFRA
-F:SEARCH
F:TUNNEL
Z:magic map
D:A set of iron-shod boots stamped by Gimli's combat prowess, a peerless
@@ -4199,7 +4175,6 @@ F:INSTA_ART
F:INT
F:LITE2
F:RES_BLIND
-F:SEARCH
F:SEE_INVIS
F:WIS
a:PALANTIR
@@ -4406,7 +4381,6 @@ F:ESP_ORC
F:ESP_TROLL
F:INFRA
F:LUCK
-F:SEARCH
F:SLAY_ORC
F:SLAY_TROLL
F:TUNNEL
diff --git a/lib/edit/e_info.txt b/lib/edit/e_info.txt
index 0b85ce93..8174e41b 100644
--- a/lib/edit/e_info.txt
+++ b/lib/edit/e_info.txt
@@ -485,9 +485,7 @@ T:33:0:99
T:115:57:57
R:100
F:RES_BLIND
-F:SEARCH
F:SEE_INVIS
-f:SEARCH
R:20
F:ESP_ALL
@@ -1474,7 +1472,6 @@ F:KILL_DRAGON
F:REGEN
F:RES_NEXUS
F:R_HIGH
-F:SEARCH
F:SLAY_EVIL
F:SLOW_DIGEST
F:TELEPORT
@@ -2301,7 +2298,6 @@ F:FEATHER
F:FREE_ACT
F:HIDE_TYPE
F:IGNORE_ACID
-F:SEARCH
F:SHOW_MODS
R:10
F:SPEED
diff --git a/lib/edit/k_info.txt b/lib/edit/k_info.txt
index e998ac71..7ac6d9ac 100644
--- a/lib/edit/k_info.txt
+++ b/lib/edit/k_info.txt
@@ -993,7 +993,6 @@ F:IGNORE_COLD
F:IGNORE_ELEC
F:IGNORE_FIRE
F:LUCK
-F:SEARCH
F:STEALTH
f:STEALTH
D:A wonderfully light cloak coloured in brown and green hues. Its colouring
@@ -1432,16 +1431,6 @@ F:SPEED
f:SPEED
D:This wonderful ring grants you additional energy, allowing you to act faster.
-N:137:Searching
-G:=:d
-I:45:23:0
-W:5:0:2:250
-A:5/1
-F:HIDE_TYPE
-F:SEARCH
-f:SEARCH
-D:This ring magically improves your attention, so you can detect hidden things better.
-
# New : It can be activated but at the cost of its destruction
N:138:Teleportation
G:=:d
@@ -1739,16 +1728,6 @@ F:HIDE_TYPE
f:CHR
D:This amulet grants beauty beyond mere looks.
-N:165:Searching
-G:":d
-I:40:5:0
-W:15:0:3:600
-A:15/1
-F:HIDE_TYPE
-F:SEARCH
-f:SEARCH
-D:This amulet grants keen sight, finding things that are hidden.
-
N:166:Teleportation
G:":d
I:40:1:0
@@ -1816,7 +1795,6 @@ F:IGNORE_FIRE
F:INT
F:RES_BLIND
F:RES_CONF
-F:SEARCH
F:SPELL_CONTAIN
F:SUST_INT
F:WIELD_CAST
diff --git a/lib/edit/ra_info.txt b/lib/edit/ra_info.txt
index 4452c682..6ac58484 100644
--- a/lib/edit/ra_info.txt
+++ b/lib/edit/ra_info.txt
@@ -1799,7 +1799,6 @@ T:40:0:255
T:45:0:255
W:1:1:12
C:0:0:0:6
-F:SEARCH
N:460
X:10:1
@@ -1881,7 +1880,6 @@ X:12:1
T:39:0:255
W:1:1:10
C:0:0:0:4
-F:SEARCH
N:508
X:12:1
diff --git a/lib/mods/theme/edit/a_info.txt b/lib/mods/theme/edit/a_info.txt
index 65e931c1..5d2e4bdf 100644
--- a/lib/mods/theme/edit/a_info.txt
+++ b/lib/mods/theme/edit/a_info.txt
@@ -38,7 +38,6 @@ F:HIDE_TYPE
F:INSTA_ART
F:LITE3
F:LUCK
-F:SEARCH
a:LIGHT
D:A small crystal phial, with the light of Earendil's Star contained inside.
D:Its light is imperishable, and near it darkness cannot endure.
@@ -121,7 +120,6 @@ F:INT
F:RES_ACID
F:RES_COLD
F:RES_ELEC
-F:SEARCH
F:SEE_INVIS
F:WIS
a:DISP_EVIL
@@ -203,7 +201,6 @@ F:INSTA_ART
F:INT
F:RES_DARK
F:RES_POIS
-F:SEARCH
F:SEE_INVIS
F:STEALTH
F:STR
@@ -682,7 +679,6 @@ F:HIDE_TYPE
F:INFRA
F:LITE2
F:LITE3
-F:SEARCH
a:SUNLIGHT
D:The shining helm that Gil-galad, legendary Elven-king, wore in battle.
@@ -742,7 +738,6 @@ F:HIDE_TYPE
F:INT
F:RES_DARK
F:RES_LITE
-F:SEARCH
F:SPEED
F:STEALTH
Z:panic hit
@@ -991,7 +986,6 @@ F:ACTIVATE
F:HIDE_TYPE
F:INT
F:RES_BLIND
-F:SEARCH
F:SEE_INVIS
F:WIS
a:DETECT_ALL
@@ -1019,7 +1013,6 @@ F:RES_DISEN
F:RES_FEAR
F:RES_FIRE
F:RES_POIS
-F:SEARCH
F:SEE_INVIS
F:SHOW_MODS
F:TELEPORT
@@ -1080,7 +1073,6 @@ F:RES_DARK
F:RES_LITE
F:RES_SHARDS
F:RES_SOUND
-F:SEARCH
F:SEE_INVIS
F:SPEED
D:A crown of massive gold, set with wondrous jewels of thought and warding,
@@ -1505,7 +1497,6 @@ F:FREE_ACT
F:HIDE_TYPE
F:LUCK
F:RES_DARK
-F:SEARCH
F:SEE_INVIS
F:SHOW_MODS
F:SLAY_EVIL
@@ -1684,7 +1675,6 @@ F:LITE1
F:RANDOM_RES_OR_POWER
F:RES_FIRE
F:RES_LITE
-F:SEARCH
F:SHOW_MODS
F:SLAY_DEMON
F:SLAY_EVIL
@@ -1729,7 +1719,6 @@ F:RANDOM_RES_OR_POWER
F:RES_COLD
F:RES_COLD
F:RES_DARK
-F:SEARCH
F:SHOW_MODS
F:SLAY_DRAGON
F:SLAY_EVIL
@@ -2305,7 +2294,6 @@ F:INT
F:RES_FEAR
F:RES_FIRE
F:RES_LITE
-F:SEARCH
F:SEE_INVIS
F:SHOW_MODS
F:SLAY_DEMON
@@ -2488,7 +2476,6 @@ F:RES_COLD
F:RES_ELEC
F:RES_FEAR
F:RES_FIRE
-F:SEARCH
F:SHOW_MODS
F:SLAY_EVIL
F:SLAY_GIANT
@@ -2842,7 +2829,6 @@ F:INT
F:RANDOM_POWER
F:RES_FIRE
F:RES_NETHER
-F:SEARCH
F:SEE_INVIS
F:SHOW_MODS
F:SLAY_EVIL
@@ -3086,7 +3072,6 @@ F:INT
F:RES_ACID
F:RES_COLD
F:RES_ELEC
-F:SEARCH
F:SEE_INVIS
F:SPELL_CONTAIN
F:SUST_INT
@@ -3311,7 +3296,6 @@ F:ACTIVATE
F:INFRA
F:RES_DARK
F:RES_POIS
-F:SEARCH
F:STEALTH
a:DRUEDAIN
D:The fabled Drum of the Druedain that will protect those who play it
@@ -3471,7 +3455,6 @@ P:0:0d0:20:0:0
F:ACTIVATE
F:HIDE_TYPE
F:INFRA
-F:SEARCH
F:SHOW_MODS
F:SPECIAL_GENE
F:XTRA_SHOTS
@@ -3641,7 +3624,6 @@ F:ACTIVATE
F:COULD2H
F:DEX
F:HIDE_TYPE
-F:SEARCH
F:SHOW_MODS
F:SLAY_ORC
f:COULD2H
@@ -3820,7 +3802,6 @@ F:RES_COLD
F:RES_DARK
F:RES_ELEC
F:RES_FIRE
-F:SEARCH
F:STEALTH
D:Familiar with the secret ways hidden in darkness, this leather cuirass is
D:truly more than it appears.
@@ -3842,7 +3823,6 @@ F:RES_ACID
F:RES_DARK
F:RES_DISEN
F:RES_ELEC
-F:SEARCH
F:SUST_CHR
F:SUST_DEX
F:SUST_WIS
@@ -3866,7 +3846,6 @@ F:RES_ACID
F:RES_DISEN
F:RES_FIRE
F:RES_SHARDS
-F:SEARCH
F:SPELL
a:CELEBRIMBOR
D:This once belonged to Celebrimbor, maker of the Rings of Power. One who
@@ -3956,7 +3935,6 @@ F:INFRA
F:RES_ACID
F:RES_DARK
F:RES_DISEN
-F:SEARCH
F:SLAY_DRAGON
F:SLAY_GIANT
F:SLAY_ORC
@@ -4090,7 +4068,6 @@ P:4:1d1:5:5:10
F:CLIMB
F:HIDE_TYPE
F:INFRA
-F:SEARCH
F:TUNNEL
Z:magic map
D:A set of iron-shod boots stamped by Gimli's combat prowess, a peerless
@@ -4168,7 +4145,6 @@ F:DEX
F:HIDE_TYPE
F:INVIS
F:LUCK
-F:SEARCH
F:STEALTH
a:CURE_HUNGER
D:This simple-looking cloak, dyed in hues that blend into the woodlands, was a gift
@@ -4194,7 +4170,6 @@ F:LIFE
F:LUCK
F:RES_FEAR
F:RES_SOUND
-F:SEARCH
F:SEE_INVIS
F:STEALTH
F:SUST_CHR
@@ -4224,7 +4199,6 @@ F:RES_COLD
F:RES_ELEC
F:RES_FIRE
F:RES_MORGUL
-F:SEARCH
F:SEE_INVIS
F:SHOW_MODS
F:SLAY_ANIMAL
@@ -4262,7 +4236,6 @@ F:LUCK
F:RES_CONF
F:RES_FEAR
F:RES_SOUND
-F:SEARCH
F:SEE_INVIS
F:STEALTH
a:VALAROMA
@@ -4290,7 +4263,6 @@ F:MAGIC_BREATH
F:RES_COLD
F:RES_DARK
F:RES_LITE
-F:SEARCH
F:SEE_INVIS
F:SUST_CHR
a:GILGALAD
@@ -4438,7 +4410,6 @@ F:HIDE_TYPE
F:INFRA
F:INSTA_ART
F:LITE3
-F:SEARCH
Z:dazzle
D:It was a gift from the Falas-Elves to the Naugrim who built Menegroth,
D:the abode of Thingol and Melian. It shines like starlight on the waves
@@ -4578,7 +4549,6 @@ F:LITE2
F:LITE3
F:RES_BLIND
F:RES_LITE
-F:SEARCH
F:SEE_INVIS
F:WATER_BREATH
F:WIS
@@ -4617,7 +4587,6 @@ F:INSTA_ART
F:INT
F:LITE2
F:RES_BLIND
-F:SEARCH
F:SEE_INVIS
F:WIS
a:PALANTIR
@@ -5010,7 +4979,6 @@ F:LITE1
F:LUCK
F:RES_BLIND
F:RES_DARK
-F:SEARCH
F:STEALTH
F:WATER_BREATH
D:This pearl-trimmed blue robe was created by a Maia loremaster in
diff --git a/lib/mods/theme/edit/e_info.txt b/lib/mods/theme/edit/e_info.txt
index 9fe63b5d..6361c33e 100644
--- a/lib/mods/theme/edit/e_info.txt
+++ b/lib/mods/theme/edit/e_info.txt
@@ -491,9 +491,7 @@ T:33:0:99
T:115:57:57
R:100
F:RES_BLIND
-F:SEARCH
F:SEE_INVIS
-f:SEARCH
R:20
F:ESP_ALL
@@ -1486,7 +1484,6 @@ F:FREE_ACT
F:KILL_DRAGON
F:REGEN
F:RES_MORGUL
-F:SEARCH
F:SLAY_EVIL
F:SLOW_DIGEST
F:TELEPORT
@@ -2330,7 +2327,6 @@ F:FEATHER
F:FREE_ACT
F:HIDE_TYPE
F:IGNORE_ACID
-F:SEARCH
F:SHOW_MODS
R:10
F:SPEED
@@ -2545,8 +2541,6 @@ r:F:HEAVY_CURSE
T:30:2:3
Z:panic hit
R:100
-F:SEARCH
-f:SEARCH
R:50
F:STEALTH
f:STEALTH
diff --git a/lib/mods/theme/edit/k_info.txt b/lib/mods/theme/edit/k_info.txt
index 30700595..ed99d177 100644
--- a/lib/mods/theme/edit/k_info.txt
+++ b/lib/mods/theme/edit/k_info.txt
@@ -1003,7 +1003,6 @@ F:IGNORE_COLD
F:IGNORE_ELEC
F:IGNORE_FIRE
F:LUCK
-F:SEARCH
F:STEALTH
f:STEALTH
D:A wonderfully light cloak coloured in brown and green hues. Its colouring
@@ -1449,16 +1448,6 @@ F:SPEED
f:SPEED
D:This wonderful ring grants you additional energy, allowing you to act faster.
-N:137:Searching
-G:=:d
-I:45:23:0
-W:5:0:2:250
-A:5/1
-F:HIDE_TYPE
-F:SEARCH
-f:SEARCH
-D:This ring magically improves your attention, so you can detect hidden things better.
-
# New : It can be activated but at the cost of its destruction
N:138:Teleportation
G:=:d
@@ -1679,16 +1668,6 @@ F:HIDE_TYPE
f:CHR
D:This amulet grants beauty beyond mere looks.
-N:165:Searching
-G:":d
-I:40:5:0
-W:15:0:3:600
-A:15/1
-F:HIDE_TYPE
-F:SEARCH
-f:SEARCH
-D:This amulet grants keen sight, finding things that are hidden.
-
N:166:Teleportation
G:":d
I:40:1:0
@@ -1742,7 +1721,6 @@ F:IGNORE_FIRE
F:INT
F:RES_BLIND
F:RES_CONF
-F:SEARCH
F:SPELL_CONTAIN
F:SUST_INT
F:WIELD_CAST
diff --git a/lib/mods/theme/edit/p_info.txt b/lib/mods/theme/edit/p_info.txt
index 5cf09fea..dca8ff4b 100644
--- a/lib/mods/theme/edit/p_info.txt
+++ b/lib/mods/theme/edit/p_info.txt
@@ -2172,27 +2172,22 @@ S:R:5:0
S:F:ESP_ANIMAL
S:R:10:1
S:F:ESP_ORC
-S:F:SEARCH
S:R:15:0
S:F:ESP_TROLL
S:R:20:1
S:F:ESP_DRAGON
-S:F:SEARCH
S:R:25:0
S:F:ESP_UNDEAD
S:R:30:1
S:F:ESP_NONLIVING
-S:F:SEARCH
S:R:35:0
S:F:ESP_EVIL
S:R:40:1
S:F:ESP_GOOD
-S:F:SEARCH
S:R:45:0
S:F:ESP_DEMON
S:R:50:1
S:F:ESP_ALL
-S:F:SEARCH
S:Z:smell monsters
S:Z:smell metal
R:k:+500:+300:Stealth
@@ -2284,27 +2279,22 @@ S:R:4:0
S:F:ESP_ANIMAL
S:R:8:1
S:F:ESP_ORC
-S:F:SEARCH
S:R:12:0
S:F:ESP_TROLL
S:R:16:1
S:F:ESP_DRAGON
-S:F:SEARCH
S:R:20:0
S:F:ESP_UNDEAD
S:R:24:1
S:F:ESP_NONLIVING
-S:F:SEARCH
S:R:28:0
S:F:ESP_EVIL
S:R:32:1
S:F:ESP_GOOD
-S:F:SEARCH
S:R:36:0
S:F:ESP_DEMON
S:R:40:1
S:F:ESP_ALL
-S:F:SEARCH
S:R:50:0
S:F:PRECOGNITION
S:Z:smell monsters
diff --git a/lib/mods/theme/edit/ra_info.txt b/lib/mods/theme/edit/ra_info.txt
index bbf28db3..5add55b4 100644
--- a/lib/mods/theme/edit/ra_info.txt
+++ b/lib/mods/theme/edit/ra_info.txt
@@ -1799,7 +1799,6 @@ T:40:0:255
T:45:0:255
W:1:1:12
C:0:0:0:6
-F:SEARCH
N:460
X:10:1
@@ -1881,7 +1880,6 @@ X:12:1
T:39:0:255
W:1:1:10
C:0:0:0:4
-F:SEARCH
N:508
X:12:1
diff --git a/lib/mods/theme/edit/set_info.txt b/lib/mods/theme/edit/set_info.txt
index 716bf66d..182618d4 100644
--- a/lib/mods/theme/edit/set_info.txt
+++ b/lib/mods/theme/edit/set_info.txt
@@ -220,7 +220,6 @@ D:It is one of two items rumoured to defy the Shadow.
# The Soft Leather Armour 'Hithlomir'
P:168:2:2
F:RES_BLIND
-F:SEARCH
# The Set of Leather Gloves 'Cammithrim'
P:53:2:2
F:DEX
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 {