diff --git a/lib/gamedata/artifact.txt b/lib/gamedata/artifact.txt index 2090fef39a..85ab90e437 100644 --- a/lib/gamedata/artifact.txt +++ b/lib/gamedata/artifact.txt @@ -187,7 +187,7 @@ desc:it rests upon the bearer. #F:LIGHT #E:CLAIRVOYANCE:50+d50 #M:The {kind} glow{s} a deep green... -#V:INT[2] | WIS[2] | SEARCH[3] | INFRA[3] | LIGHT[3] | RES_CHAOS[1] +#V:INT[2] | WIS[2] | INFRA[3] | LIGHT[3] | RES_CHAOS[1] #desc:A great globe with a heart of fire, the Palantír provides the wearer with #desc:sight of far places - at a cost, for those espied upon are aware of it. @@ -580,7 +580,7 @@ base-object:helm:Metal Cap info:55:20:45000 alloc:8:55 to 100 power:3:1d1:0:0:18 -values:SEARCH[3] | INT[2] | DEX[2] +values:INT[2] | DEX[2] values:RES_FIRE[1] | RES_ACID[1] | RES_DISEN[1] | RES_SHARD[1] desc:A metal cap forged by the greatest Noldorin smith of the Second Age, desc:this helm serves equally well in battle or at the forge, and its @@ -674,7 +674,7 @@ power:7:1d3:0:0:10 flags:PROT_BLIND | PROT_CONF | SEE_INVIS act:DETECT_ALL time:55+d55 -values:INT[2] | WIS[2] | SEARCH[2] +values:INT[2] | WIS[2] desc:A famous forged iron helm granting extraordinary powers of mind and desc:awareness. @@ -687,7 +687,7 @@ power:7:1d3:8:8:10 # F: DRAIN_HP | flags:PROT_FEAR | flags:SEE_INVIS | FREE_ACT | AGGRAVATE | LIGHT_CURSE | HEAVY_CURSE -values:SEARCH[-5] | INT[-3] | WIS[-3] +values:INT[-3] | WIS[-3] desc:A headpiece, gaudy and barbaric, that betrayed a warrior when he most desc:needed succor. @@ -715,7 +715,7 @@ power:0:1d1:0:0:18 # F: DRAIN_MANA flags:SEE_INVIS | FREE_ACT | PROT_STUN | PROT_BLIND # A:ANALYZE:50 -values:INT[3] | SEARCH[3] | DEX[2] | LIGHT[1] +values:INT[3] | DEX[2] | LIGHT[1] values:RES_SHARD[1] | RES_COLD[1] | RES_LIGHT[1] | RES_DARK[1] desc:A massive golden crown, set with wondrous jewels of thought and warding, desc:once worn by the kings of ancient Númenor. @@ -1101,7 +1101,7 @@ info:20:150:40000 alloc:5:20 to 80 power:0:2d5:10:15:0 flags:BLESSED | SLOW_DIGEST -values:SEARCH[1] | LIGHT[1] | BRAND_FIRE[3] | SLAY_ORC[3] | SLAY_DEMON[3] | +values:LIGHT[1] | BRAND_FIRE[3] | SLAY_ORC[3] | SLAY_DEMON[3] | values:SLAY_EVIL[2] | RES_FIRE[1] | RES_LIGHT[1] desc:This fiery, shining blade, mate to Orcrist, earned its sobriquet "Beater" desc:from dying orcs who dared to behold hidden Gondolin. @@ -1113,7 +1113,7 @@ info:20:150:45000 alloc:3:20 to 100 power:0:2d5:12:16:0 flags:BLESSED | PROT_BLIND | SLOW_DIGEST -values:SEARCH[1] | LIGHT[1] | BRAND_ELEC[3] | SLAY_ORC[3] | SLAY_TROLL[3] | +values:LIGHT[1] | BRAND_ELEC[3] | SLAY_ORC[3] | SLAY_TROLL[3] | values:SLAY_GIANT[3] | RES_ELEC[1] desc:Like unto Orcrist and Glamdring, and like them long lost, this sword is desc:continually covered in tiny arcs of captive lightning that flash and dance @@ -1126,7 +1126,7 @@ info:20:150:40000 alloc:5:20 to 80 power:0:2d5:10:15:0 flags:BLESSED | SLOW_DIGEST -values:SEARCH[3] | LIGHT[1] | BRAND_COLD[3] | SLAY_EVIL[2] | SLAY_ORC[3] | +values:LIGHT[1] | BRAND_COLD[3] | SLAY_EVIL[2] | SLAY_ORC[3] | values:SLAY_DRAGON[3] | RES_COLD[1] | RES_DARK[1] desc:This coldly gleaming blade, mate to Glamdring, is called simply "Biter" desc:by orcs who came to know its power all too well. @@ -1853,7 +1853,7 @@ alloc:12:60 to 100 power:0:2d8:12:18:0 act:STONE_TO_MUD time:2 -values:TUNNEL[6] | INFRA[4] | SEARCH[4] | STR[4] | SLAY_ORC[3] | SLAY_TROLL[3] +values:TUNNEL[6] | INFRA[4] | STR[4] | SLAY_ORC[3] | SLAY_TROLL[3] values:SLAY_GIANT[3] | SLAY_DRAGON[3] | RES_DARK[1] | RES_DISEN[1] desc:A mighty Dwarven mattock, as good for hewing orc-necks as for hewing desc:stone. Náin, King of the Iron Hills, brought his mattock-wielding @@ -1973,7 +1973,7 @@ desc: the main host. #info:65:3:90000 #alloc:3:60 to 127 #flags:PROT_FEAR | PROT_BLIND | PROT_STUN | PROT_CONF -#values:SEARCH[4] | SPEED[2] | RES_ELEC[1] | RES_COLD[1] +#values:SPEED[2] | RES_ELEC[1] | RES_COLD[1] #desc:The pendant of Amandil, the last Lord of Andúnië, and mighty #desc: ship-captain of Númenor. First among Númenóreans to see #desc: Sauron for what he was. diff --git a/lib/gamedata/class.txt b/lib/gamedata/class.txt index e6f128c53a..ff1a7b0554 100644 --- a/lib/gamedata/class.txt +++ b/lib/gamedata/class.txt @@ -40,11 +40,11 @@ # 'stats' is for the stat modifiers - strength, intelligence, wisdom, # dexterity, constitution. -# 'skill-' is for skills - disarming, magic devices, saving throws, -# stealth, searching ability, searching frequency, to hit (normal), -# to hit (bows), to hit (throwing), digging. The base entry is what the -# gets added to the character's skills at birth, the increments are added to -# the base skill every ten levels. +# 'skill-' is for skills - physical and magical disarming, +# magic devices, saving throws, stealth, to hit (normal), to hit (bows), +# to hit (throwing), digging. The base entry is what gets added to the +# character's skills at birth, the increments are added to the base skill +# every ten levels. # 'info' is for extra info - max. hitpoints gained per level, experience # factor in percent, base chance for pseudo-id (smaller is better), diff --git a/lib/gamedata/ego_item.txt b/lib/gamedata/ego_item.txt index e1da07aaf6..5cc813a3b3 100644 --- a/lib/gamedata/ego_item.txt +++ b/lib/gamedata/ego_item.txt @@ -353,8 +353,6 @@ info:0:2:2000:8 alloc:50:10 to 60 type:helm flags:PROT_BLIND | SEE_INVIS -values:SEARCH[d5] -min-values:SEARCH[0] name:31:of Infravision info:0:2:500:11 @@ -516,8 +514,8 @@ combat:d8:d3:0 item:gloves:Set of Leather Gloves item:gloves:Set of Alchemist's Gloves flags:FEATHER | FREE_ACT -values:DEX[1+M4] | SEARCH[1+d2M3] -min-values:DEX[1] | SEARCH[2] +values:DEX[1+M4] +min-values:DEX[1] name:53:of Combat info:50:12:7000:22 diff --git a/lib/gamedata/object.txt b/lib/gamedata/object.txt index f192efc1f5..c897e4e30f 100644 --- a/lib/gamedata/object.txt +++ b/lib/gamedata/object.txt @@ -1315,15 +1315,9 @@ alloc:40:75 to 100 flags:GOOD values:SPEED[4+M6] -name:195:Searching -graphics:=:d -type:ring -properties:5:2:250 -alloc:20:5 to 90 -values:SEARCH[1+M5] - -### 196, sval 7 -### 197, sval 8 +### 195 +### 196 +### 197 ### Stat sustain rings ### @@ -1341,7 +1335,7 @@ properties:30:2:600 alloc:20:30 to 100 flags:SUST_STR | SUST_INT | SUST_WIS | EASY_KNOW -### 200, sval 11 +### 200 ### Resistance rings ### @@ -1362,8 +1356,8 @@ alloc:50:10 to 50 flags:IGNORE_COLD | IGNORE_FIRE | EASY_KNOW values:RES_FIRE[1] | RES_COLD[1] -### 203, sval 14 -### 204, sval 15 +### 203 +### 204 ### Elemental rings ### @@ -1372,9 +1366,9 @@ graphics:=:d type:ring properties:0:2:400 alloc:20:25 to 100 -values:SEARCH[1+M5] | LIGHT[1] | RES_LIGHT[1] +values:LIGHT[1] | RES_LIGHT[1] -### 206, sval 17 +### 206 name:207:Flames graphics:=:d @@ -1436,7 +1430,7 @@ effect:TIMED_INC:OPP_ELEC dice:20+1d20 time:50+d50 -### 211, sval 22 +### 211 ### Combat rings ### @@ -1528,7 +1522,7 @@ alloc:50:10 to 50 flags:PROT_FEAR | EASY_KNOW values:STEALTH[-2] -### 222, sval 33 +### 222 ### Misc rings ### @@ -1585,7 +1579,7 @@ alloc:50:20 to 90 flags:SUST_WIS | values:WIS[1+M5] -### 231, sval 2 +### 231 ### Resistances ### @@ -1633,7 +1627,7 @@ alloc:10:70 to 100 combat:0:0d0:0:0:d5M5 flags:FREE_ACT | SEE_INVIS | SUST_INT | PROT_BLIND | GOOD flags:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD -values:SEARCH[1+M3] | INT[1+M3] +values:INT[1+M3] name:237:ESP graphics:":d @@ -1642,7 +1636,6 @@ properties:50:3:25000 alloc:10:60 to 100 flags:TELEPATHY flags:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | -values:SEARCH[d5M5] name:238:Devotion graphics:":d @@ -1667,12 +1660,12 @@ type:amulet properties:70:3:30000 alloc:10:70 to 100 flags:SUST_DEX | GOOD -values:DEX[1+M4] | SPEED[1+M2] | STEALTH[1+M2] | SEARCH[1+d3M3] | INFRA[1+d3M3] +values:DEX[1+M4] | SPEED[1+M2] | STEALTH[1+M2] | INFRA[1+d3M3] values:RES_NEXUS[1] | RES_POIS[1] -# 241 -# 242 -# 243 +### 241 +### 242 +### 243 ### Ability boosts ### @@ -1690,12 +1683,7 @@ properties:10:3:200 alloc:30:10 to 70 values:INFRA[1+M5] -name:246:Searching -graphics:":d -type:amulet -properties:15:3:600 -alloc:20:10 to 40 -values:SEARCH[d5M5] +### 246 ### Powers ### @@ -1908,7 +1896,7 @@ pile:25:2 power:20 effect:REMOVE_ALL_CURSE -### 277, sval 18 +### 277 ### Summoning ### @@ -2227,7 +2215,7 @@ power:20000 effect:RESTORE_STAT:CON effect:GAIN_STAT:CON -### 315, sval 6 +### 315 name:316:Augmentation graphics:!:d diff --git a/lib/gamedata/p_race.txt b/lib/gamedata/p_race.txt index 874f2d40d3..63e96333b9 100644 --- a/lib/gamedata/p_race.txt +++ b/lib/gamedata/p_race.txt @@ -31,10 +31,9 @@ # 'stats' is for the stat modifiers - strength, intelligence, wisdom, # dexterity, constitution. -# 'skill-' is for skills that get added at birth.- disarming, -# magic devices, saving throws, stealth, searching ability, -# searching frequency, to hit (normal), to hit (bows), to hit (throwing), -# digging. +# 'skill-' is for skills that get added at birth - physical +# and magical disarming, magic devices, saving throws, stealth, +# to hit (normal), to hit (bows), to hit (throwing), digging. # 'info' is for gameplay info - max. hitpoints gained per level, experience # factor in percent, range of infravision in 10 feet. diff --git a/lib/gamedata/store.txt b/lib/gamedata/store.txt index 79352435ea..2dd20727dd 100644 --- a/lib/gamedata/store.txt +++ b/lib/gamedata/store.txt @@ -196,7 +196,6 @@ always:magic book:[Magic for Beginners] always:magic book:[Conjurings and Tricks] always:magic book:[Incantations and Illusions] always:magic book:[Sorcery and Evocations] -normal:ring:Searching normal:ring:Feather Falling normal:ring:Protection normal:amulet:Slow Digestion diff --git a/src/list-object-modifiers.h b/src/list-object-modifiers.h index 650d0f4706..4f26a30121 100644 --- a/src/list-object-modifiers.h +++ b/src/list-object-modifiers.h @@ -1,6 +1,6 @@ /** - \file list-object-modifiers.h - \brief object modifiers (plusses and minuses) for all objects + * \file list-object-modifiers.h + * \brief object modifiers (plusses and minuses) for all objects * * index: the mod number * power: base power rating for the mod (0 means it is unused or derived) @@ -10,7 +10,6 @@ */ /* index power mult name */ OBJ_MOD(STEALTH, 8, 12, "stealth") -OBJ_MOD(SEARCH, 2, 5, "searching skill") OBJ_MOD(INFRA, 4, 8, "infravision") OBJ_MOD(TUNNEL, 3, 8, "tunneling") OBJ_MOD(SPEED, 20, 6, "speed") diff --git a/src/obj-randart.c b/src/obj-randart.c index 21e70ca296..b75bef99e1 100644 --- a/src/obj-randart.c +++ b/src/obj-randart.c @@ -107,7 +107,6 @@ static s16b art_idx_gen[] = { ART_IDX_GEN_STAT, ART_IDX_GEN_SUST, ART_IDX_GEN_STEALTH, - ART_IDX_GEN_SEARCH, ART_IDX_GEN_INFRA, ART_IDX_GEN_SPEED, ART_IDX_GEN_IMMUNE, @@ -1056,12 +1055,6 @@ static void parse_frequencies(void) /* Done with stealth */ } - if (art->modifiers[OBJ_MOD_SEARCH] > 0) { - /* Handle searching bonus - fully generic this time */ - file_putf(log_file, "Adding 1 for search bonus - general.\n"); - (artprobs[ART_IDX_GEN_SEARCH])++; - } - if (art->modifiers[OBJ_MOD_INFRA] > 0) { /* Handle infravision bonus - fully generic */ file_putf(log_file, "Adding 1 for infravision bonus - general.\n"); @@ -2174,10 +2167,6 @@ static void add_ability_aux(struct artifact *art, int r, s32b target_power) add_sustain(art); break; - case ART_IDX_GEN_SEARCH: - add_pval_mod(art, OBJ_MOD_SEARCH); - break; - case ART_IDX_GEN_INFRA: add_pval_mod(art, OBJ_MOD_INFRA); break; diff --git a/src/obj-randart.h b/src/obj-randart.h index b4c2394895..97e7a4b6b3 100644 --- a/src/obj-randart.h +++ b/src/obj-randart.h @@ -113,7 +113,6 @@ enum { ART_IDX_GEN_STAT, ART_IDX_GEN_SUST, ART_IDX_GEN_STEALTH, - ART_IDX_GEN_SEARCH, ART_IDX_GEN_INFRA, ART_IDX_GEN_SPEED, ART_IDX_GEN_IMMUNE, diff --git a/src/tests/unit-test-data.h b/src/tests/unit-test-data.h index 461fefc958..199c3f7ad0 100644 --- a/src/tests/unit-test-data.h +++ b/src/tests/unit-test-data.h @@ -89,7 +89,6 @@ static struct object_kind TEST_DATA test_longsword = { [OBJ_MOD_DEX] = { 0, 0, 0, 0 }, [OBJ_MOD_CON] = { 0, 0, 0, 0 }, [OBJ_MOD_STEALTH] = { 0, 0, 0, 0 }, - [OBJ_MOD_SEARCH] = { 0, 0, 0, 0 }, [OBJ_MOD_INFRA] = { 0, 0, 0, 0 }, [OBJ_MOD_TUNNEL] = { 0, 0, 0, 0 }, [OBJ_MOD_SPEED] = { 0, 0, 0, 0 }, @@ -188,7 +187,6 @@ static struct object_kind TEST_DATA test_torch = { [OBJ_MOD_DEX] = { 0, 0, 0, 0 }, [OBJ_MOD_CON] = { 0, 0, 0, 0 }, [OBJ_MOD_STEALTH] = { 0, 0, 0, 0 }, - [OBJ_MOD_SEARCH] = { 0, 0, 0, 0 }, [OBJ_MOD_INFRA] = { 0, 0, 0, 0 }, [OBJ_MOD_TUNNEL] = { 0, 0, 0, 0 }, [OBJ_MOD_SPEED] = { 0, 0, 0, 0 }, @@ -313,7 +311,6 @@ static struct object_kind TEST_DATA test_lantern = { [OBJ_MOD_DEX] = { 0, 0, 0, 0 }, [OBJ_MOD_CON] = { 0, 0, 0, 0 }, [OBJ_MOD_STEALTH] = { 0, 0, 0, 0 }, - [OBJ_MOD_SEARCH] = { 0, 0, 0, 0 }, [OBJ_MOD_INFRA] = { 0, 0, 0, 0 }, [OBJ_MOD_TUNNEL] = { 0, 0, 0, 0 }, [OBJ_MOD_SPEED] = { 0, 0, 0, 0 }, @@ -408,7 +405,6 @@ static struct object_kind TEST_DATA test_flask = { [OBJ_MOD_DEX] = { 0, 0, 0, 0 }, [OBJ_MOD_CON] = { 0, 0, 0, 0 }, [OBJ_MOD_STEALTH] = { 0, 0, 0, 0 }, - [OBJ_MOD_SEARCH] = { 0, 0, 0, 0 }, [OBJ_MOD_INFRA] = { 0, 0, 0, 0 }, [OBJ_MOD_TUNNEL] = { 0, 0, 0, 0 }, [OBJ_MOD_SPEED] = { 0, 0, 0, 0 }, @@ -477,7 +473,6 @@ static struct object_kind TEST_DATA test_rod_treasure_location = { [OBJ_MOD_DEX] = { 0, 0, 0, 0 }, [OBJ_MOD_CON] = { 0, 0, 0, 0 }, [OBJ_MOD_STEALTH] = { 0, 0, 0, 0 }, - [OBJ_MOD_SEARCH] = { 0, 0, 0, 0 }, [OBJ_MOD_INFRA] = { 0, 0, 0, 0 }, [OBJ_MOD_TUNNEL] = { 0, 0, 0, 0 }, [OBJ_MOD_SPEED] = { 0, 0, 0, 0 }, @@ -545,7 +540,6 @@ static struct object_kind TEST_DATA test_gold = { [OBJ_MOD_DEX] = { 0, 0, 0, 0 }, [OBJ_MOD_CON] = { 0, 0, 0, 0 }, [OBJ_MOD_STEALTH] = { 0, 0, 0, 0 }, - [OBJ_MOD_SEARCH] = { 0, 0, 0, 0 }, [OBJ_MOD_INFRA] = { 0, 0, 0, 0 }, [OBJ_MOD_TUNNEL] = { 0, 0, 0, 0 }, [OBJ_MOD_SPEED] = { 0, 0, 0, 0 }, @@ -945,7 +939,7 @@ static struct object TEST_DATA test_player_knowledge = { .pval = 0, .weight = 0, - .modifiers = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + .modifiers = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, .el_info = { { 0, 0 }, { 0, 0 }, diff --git a/src/ui-player.c b/src/ui-player.c index 1c307e4c08..1aed40db77 100644 --- a/src/ui-player.c +++ b/src/ui-player.c @@ -269,7 +269,6 @@ static const struct player_flag_record player_flag_table[RES_ROWS * 4] = { { "Aggrv", -1, OF_AGGRAVATE, -1, -1 }, { "Stea.", OBJ_MOD_STEALTH, -1, -1, -1 }, - { "Sear.", OBJ_MOD_SEARCH, -1, -1, -1 }, { "Infra", OBJ_MOD_INFRA, -1, -1, TMD_SINFRA }, { "Tunn.", OBJ_MOD_TUNNEL, -1, -1, -1 }, { "Speed", OBJ_MOD_SPEED, -1, -1, TMD_FAST }, @@ -277,6 +276,7 @@ static const struct player_flag_record player_flag_table[RES_ROWS * 4] = { { "Shots", OBJ_MOD_SHOTS, -1, -1, -1 }, { "Might", OBJ_MOD_MIGHT, -1, -1, -1 }, { "Light", OBJ_MOD_LIGHT, -1, -1, -1 }, + { "", -1, -1, -1, -1 }, }; static void display_resistance_panel(const struct player_flag_record *rec,