New upstream version 2.41-ah~0.git.20200131

10 files changed, 150 insertions, 321 deletions

diff --git a/lib/mods/theme/edit/a_info.txt b/lib/mods/theme/edit/a_info.txt
index 5d2e4bdf..b416a069 100644
--- a/lib/mods/theme/edit/a_info.txt
+++ b/lib/mods/theme/edit/a_info.txt
@@ -58,7 +58,6 @@ F:LITE3
 F:SEE_INVIS
 F:SPEED
 a:MAP_LIGHT
-Z:detect curses
 D:The shining Star of the West, a famed heirloom of Elendil's house.
 D:A white diamond set as a star in a silver fillet to be bound at the 
 D:forehead. 
@@ -412,17 +411,13 @@ N:15:of Orthanc
 I:39:106:0
 W:15:12:15:20000
 P:0:1d1:0:0:0
-F:ACTIVATE
-F:EASY_USE
 F:INSTA_ART
 F:LITE1
 F:SPECIAL_GENE
-a:STONE_LORE
-D:The key to the tower of Saruman, which fills your mind 
-D:with images of knowledge and dreadful understanding. It 
-D:is not a regular key - it is a perfectly round stone 
-D:that is meant to fit into a hole. It can be used to 
-D:light your way in the dungeon as well.
+D:The key to the tower of Saruman. It is not a regular 
+D:key - it is a perfectly round stone that is meant 
+D:to fit into a hole. It can be used to light your 
+D:way in the dungeon as well.
 
 # The Multi-Hued Dragon Scale Mail 'Lothronfaun'
 
@@ -2808,7 +2803,7 @@ F:SLAY_EVIL
 F:SPELL_CONTAIN
 F:WIELD_CAST
 F:WIS
-a:ID_PLAIN
+a:DETECT_ALL
 D:The radiant golden staff of an Istari of legend, this wizard's companion 
 D:grants keen sight and the knowledge of many hidden things.
 
@@ -3690,23 +3685,6 @@ D:Crafted of purest ice and held solid by powerful spells, this icy axe
 D:delivers a chill of death to its victims.
 
 
-# The Iron Helm of Knowledge
-
-N:160:of Knowledge
-I:32:5:-6
-W:20:5:75:100000
-P:6:1d3:0:0:20
-F:ACTIVATE
-F:AUTO_ID
-F:HIDE_TYPE
-F:LITE1
-F:LUCK
-F:SPECIAL_GENE
-a:KNOWLEDGE
-D:This helm, designed by Petty-Dwarves ages ago to act as the brain of a 
-D:long lost project, is made of finest glass.  Its light banishes all secrets, 
-D:and makes audible whispers from the deceased.
-
 # The Broken Sword 'Narsil'
 
 N:164:'Narsil'
@@ -4553,7 +4531,6 @@ F:SEE_INVIS
 F:WATER_BREATH
 F:WIS
 a:PALANTIR
-Z:detect curses
 D:This holy lamp once belonged to a seeress who warned Ar-Pharazon of 
 D:the dire fate Numenor would suffer for daring to break the ban against 
 D:mortals' entering the Blessed Realms alive.  The king had the seeress 
diff --git a/lib/mods/theme/edit/ba_info.txt b/lib/mods/theme/edit/ba_info.txt
index c8c7f9c5..2e853040 100644
--- a/lib/mods/theme/edit/ba_info.txt
+++ b/lib/mods/theme/edit/ba_info.txt
@@ -69,10 +69,6 @@ N:13:Game rules
 C:0:0:0
 I:13:0:r
 
-N:14:Research item
-C:1400:1300:1200
-I:1:0:a
-
 N:15:Town history
 C:0:0:0
 I:2:0:h
@@ -109,10 +105,6 @@ N:26:Recharge item
 C:350:300:75
 I:25:0:r
 
-N:27:Identify possessions
-C:900:800:100
-I:26:0:i
-
 N:28:Healing prayer
 C:600:400:0
 I:28:0:h
@@ -162,16 +154,6 @@ N:43:View fate
 C:500:500:500
 I:42:0:v
 
-#for The Mirror
-N:44:Research item
-C:1500:1500:1500
-I:1:0:a
-
-#for Star-Dome
-N:46:Identify possessions
-C:1200:1000:250
-I:26:0:i
-
 #for Star-Dome
 N:47:Recharge item
 C:1200:1000:150
diff --git a/lib/mods/theme/edit/d_info.txt b/lib/mods/theme/edit/d_info.txt
index 0f8680af..5266090a 100644
--- a/lib/mods/theme/edit/d_info.txt
+++ b/lib/mods/theme/edit/d_info.txt
@@ -56,6 +56,8 @@ F:NO_DESTROY
 F:NO_DOORS
 F:PRINCIPAL
 R:100:0
+@:14:B:10
+@:22:B:40
 
 N:2:Barad-Dur
 D:BDr:a door to the tower of Barad-Dur.
@@ -72,6 +74,7 @@ F:NO_RECALL
 F:NO_STREAMERS
 F:PRINCIPAL
 R:100:0
+@:31:B:5
 
 N:3:Angband
 D:Ang:an entrance to the Pits of Angband.
@@ -87,6 +90,33 @@ F:NO_EASY_MOVE
 F:NO_RECALL
 F:PRINCIPAL
 R:100:0
+@:3:N:Crypt
+@:3:U:s_crypt.map
+@:3:D:Looks like a forgotten crypt...
+@:3:F:NO_GENO
+@:3:F:NO_NEW_MONSTER
+@:3:F:SPECIAL
+@:3:F:NO_STAIR
+@:3:F:ASK_LEAVE
+@:3:F:NO_TELEPORT
+@:18:N:Dim Gates
+@:18:U:s_gates.map
+@:18:D:Visions of death fill your mind.
+@:18:F:NO_GENO
+@:18:F:NO_NEW_MONSTER
+@:18:F:SPECIAL
+@:18:F:NO_STAIR
+@:18:F:ASK_LEAVE
+@:18:F:NO_TELEPORT
+@:28:N:Nameless
+@:28:U:s_name.map
+@:28:D:You sense a powerful artifact here.
+@:28:F:NO_GENO
+@:28:F:NO_NEW_MONSTER
+@:28:F:SPECIAL
+@:28:F:NO_STAIR
+@:28:F:ASK_LEAVE
+@:28:F:NO_TELEPORT
 
 N:4:Barrow-Downs
 D:BDw:a way to the Barrow-Downs.
@@ -103,6 +133,7 @@ F:PRINCIPAL
 R:25:1
 M:UNDEAD
 R:75:0
+@:9:B:39
 
 # The Additional dungeons
 
@@ -123,6 +154,15 @@ F:NO_RECALL
 F:NO_STREAMERS
 R:100:1
 M:IM_FIRE
+@:14:N:Mt Doom
+@:14:S:mdm
+@:14:U:s_doom.map
+@:14:D:You finally reach the top of Mount Doom, here must lie the Great Fire.
+@:14:F:NO_GENO
+@:14:F:NO_NEW_MONSTER
+@:14:F:SPECIAL
+@:14:F:NO_STAIR
+@:14:F:NO_TELEPORT
 
 # Nether Realm
 # Levels 666-696 (!!!)
@@ -274,6 +314,8 @@ M:DRAGON
 M:NONLIVING
 M:SPIRIT
 M:UNDEAD
+@:20:B:6
+@:22:F:NO_GENO
 
 # TEST dungeon
 N:12:Test
@@ -312,7 +354,7 @@ M:UNDEAD
 
 # The Illusory Castle
 # levels 35-52
-# Guarded by The Glass Golem guarding The Helm of Knowledge
+# Guarded by The Glass Golem
 N:17:Illusory Castle
 D:Ill:an entrance to the Illusory Castle.
 W:35:52:10:24:100
@@ -321,7 +363,6 @@ A:56:50:189:50:56:0:57:58
 O:50:10:20:20
 E:6d2:6:CONFUSION
 F:FILL_METHOD_1
-F:FINAL_ARTIFACT_160
 F:FINAL_GUARDIAN_1033
 F:NO_STREAMERS
 F:RANDOM_TOWNS
@@ -344,6 +385,15 @@ S:BR_CONF
 S:CONF
 S:FORGET
 S:MULTIPLY
+@:15:N:Machine
+@:15:U:s_factory.map
+@:15:D:The clatter of strange machinery surrounds you.
+@:15:F:NO_GENO
+@:15:F:NO_NEW_MONSTER
+@:15:F:SPECIAL
+@:15:F:NO_STAIR
+@:15:F:ASK_LEAVE
+@:15:F:NO_TELEPORT
 
 # The Maze
 # Levels 25-37
@@ -386,6 +436,15 @@ R:50:3
 M:ORC
 M:R_CHAR_O
 M:R_CHAR_o
+@:11:N:Deathwatch
+@:11:U:s_death.map
+@:11:D:This level looks filled with evilness.
+@:11:F:NO_GENO
+@:11:F:NO_NEW_MONSTER
+@:11:F:SPECIAL
+@:11:F:NO_STAIR
+@:11:F:ASK_LEAVE
+@:11:F:NO_TELEPORT
 
 # Erebor
 # levels 60-72
@@ -412,6 +471,14 @@ M:R_CHAR_D
 R:30:1
 M:DRAGON
 M:R_CHAR_d
+@:1:N:Lower Halls
+@:1:U:s_smaug.map
+@:1:D:You can just make out a malevolent red glow at the end of the corridor.
+@:1:F:NO_GENO
+@:1:F:NO_NEW_MONSTER
+@:1:F:SPECIAL
+@:1:F:NO_STAIR
+@:1:F:ASK_LEAVE
 
 # The Old Forest
 # levels 13-25
@@ -463,6 +530,25 @@ M:TROLL
 R:20:3
 M:DEMON
 R:10:0
+@:5:N:Orc Town
+@:5:U:s_orc.map
+@:5:D:You hear orc warcries.
+@:5:F:NO_GENO
+@:5:F:NO_NEW_MONSTER
+@:5:F:SPECIAL
+@:5:F:NO_STAIR
+@:5:F:ASK_LEAVE
+@:5:F:NO_TELEPORT
+@:10:B:24
+@:20:N:The Bridge
+@:20:U:s_bridge.map
+@:20:D:You hear the beating of drums in the Deep.
+@:20:F:NO_GENO
+@:20:F:NO_NEW_MONSTER
+@:20:F:SPECIAL
+@:20:F:NO_STAIR
+@:20:F:ASK_LEAVE
+@:20:F:NO_TELEPORT
 
 # The tower of Dol Guldur
 # Levels 57-70
@@ -609,6 +695,15 @@ F:NO_STREAMERS
 F:WATER_RIVER
 R:100:1
 M:IM_COLD
+@:15:N:Galleon
+@:15:U:s_ship.map
+@:15:D:A ship of antique design lies jammed in the ice here.
+@:15:F:NO_GENO
+@:15:F:NO_NEW_MONSTER
+@:15:F:SPECIAL
+@:15:F:NO_STAIR
+@:15:F:ASK_LEAVE
+@:15:F:NO_TELEPORT
 
 # The Lost Temple of "..player.pgod.."
 # Generated in god quest.
@@ -797,6 +892,15 @@ R:50:3
 M:ORC
 M:R_CHAR_O
 M:R_CHAR_o
+@:5:N:Orthanc
+@:5:U:s_orthanc.map
+@:5:D:#BAnd here you shall stay, foolish adventurer, and die quickly. For I am Saruman the Wise, Saruman the Ring-maker, Saruman of Many Colours!#w
+@:5:F:NO_GENO
+@:5:F:NO_NEW_MONSTER
+@:5:F:SPECIAL
+@:5:F:NO_STAIR
+@:5:F:ASK_LEAVE
+@:5:F:NO_TELEPORT
 
 # Tol Eressea - of course you never actually set foot on Tol Eressea ;)
 # levels 40-45
@@ -857,6 +961,15 @@ F:FLAT
 R:25:1
 M:UNDEAD
 R:75:0
+@:0:N:Bilbo's trail
+@:0:U:s_bilbo.map
+@:0:D:#yYou hear someone shout, "I am in a frightful hurry, but Gandalf told me to leave this map for you! Find it, then seek Thorin in Mirkwood!"#w
+@:0:F:NO_GENO
+@:0:F:NO_NEW_MONSTER
+@:0:F:SPECIAL
+@:0:F:NO_STAIR
+@:0:F:ASK_LEAVE
+@:0:F:NO_TELEPORT
 
 # Thorin's trail in Mirkwood
 # just one special level that later becomes a different one, sans princess.
@@ -871,6 +984,15 @@ F:FLAT
 F:NO_DESTROY
 F:NO_DOORS
 R:100:0
+@:0:N:Thorin's trail
+@:0:U:s_thorin.map
+@:0:D:#yYou hear someone shout, "My mad kinsmen have taken the key to the Lonely Mountain! Get the key, then find that fool hobbit and my map! If you haven't already."#w
+@:0:F:NO_GENO
+@:0:F:NO_NEW_MONSTER
+@:0:F:SPECIAL
+@:0:F:NO_STAIR
+@:0:F:ASK_LEAVE
+@:0:F:NO_TELEPORT
 
 # N:<index>:<name>
 # D:<3 letter short name>:<long name>
diff --git a/lib/mods/theme/edit/k_info.txt b/lib/mods/theme/edit/k_info.txt
index 6cfe4dee..302759f2 100644
--- a/lib/mods/theme/edit/k_info.txt
+++ b/lib/mods/theme/edit/k_info.txt
@@ -1771,22 +1771,6 @@ A:15/1
 D:This scroll will try to enchant a piece of armour in your possession, making it more effective
 D:in protecting you. Highly enchanted armour is likely not to accept this enchantment, however.
 
-N:176:Identify
-G:?:d
-I:70:12:0
-W:1:0:5:50
-A:1/1:5/1:10/1:30/1
-D:If you read this scroll, the identity of an item you specify will be laid open to you.
-
-N:177:*Identify*
-G:?:d
-I:70:13:0
-W:30:0:5:1000
-A:30/1:50/2:80/1:100/1
-D:This scroll will allow you to gain insight into an object's special properties.
-D:Only the highly magical objects, like rare rings and amulets or very unusual weapons
-D:and armour possess abilities which warrant the use of this magic.
-
 N:178:Rumour
 G:?:d
 I:70:51:0
@@ -2895,13 +2879,6 @@ W:30:0:50:100
 A:30/1
 P:0:1d2:0:0:0
 
-N:313:Identify
-G:_:d
-I:55:14:-1:SPELL=Identify
-W:10:0:50:100
-A:10/1
-P:0:1d2:0:0:0
-
 N:314:Sense Hidden
 G:_:d
 I:55:15:-1:SPELL=Sense Hidden
@@ -3067,65 +3044,6 @@ D:A thick book with solid leather binding. It looks entirely
 D:unremarkable, but as you hold it, you feel strangely able 
 D:to learn the inner workings of things and creatures.
 
-##### Chests #####
-
-N:338:& Small wooden chest~
-G:~:s
-I:7:1:0
-W:5:0:250:20
-A:5/1
-P:0:2d3:0:0:0
-D:A small wooden box, locked and possibly trapped.
-
-N:339:& Large wooden chest~
-G:~:s
-I:7:5:0
-W:15:0:500:60
-A:15/1
-P:0:2d5:0:0:0
-D:A large wooden box, locked and possibly trapped
-
-N:340:& Small iron chest~
-G:~:s
-I:7:2:0
-W:25:0:300:100
-A:25/1
-P:0:2d4:0:0:0
-D:A small rectangular container made of wood and reinforced with iron corners and latches.
-D:It is locked and possibly trapped.
-
-N:341:& Large iron chest~
-G:~:s
-I:7:6:0
-W:35:0:1000:150
-A:35/1
-P:0:2d6:0:0:0
-D:A large container made of wood, with a heavy iron lock, and probably a trap.
-
-N:342:& Small steel chest~
-G:~:s
-I:7:3:0
-W:45:0:500:200
-A:45/1
-P:0:2d4:0:0:0
-D:A small wooden box with strong steel locks and reinforcements. It's likely to be trapped.
-
-N:343:& Large steel chest~
-G:~:s
-I:7:7:0
-W:55:0:1000:250
-A:55/1
-P:0:2d6:0:0:0
-D:A nearly indestructible chest of wood and steel. The lock doesn't look impenetrable, but it
-D:might be trapped.
-
-N:344:& Ruined chest~
-G:~:s
-I:7:0:0
-W:0:0:250:0
-A:75/1
-D:A broken, empty chest.
-
 ##### Various Stuff #####
 
 N:345:& Iron Spike~
@@ -3417,18 +3335,6 @@ F:IGNORE_ELEC
 F:IGNORE_FIRE
 D:This rod grants you knowledge of your surroundings.
 
-N:372:Perception
-G:-:d
-I:66:2:20
-W:50:0:15:13000
-A:50/8:100/8
-P:0:1d1:0:0:0
-F:IGNORE_ACID
-F:IGNORE_COLD
-F:IGNORE_ELEC
-F:IGNORE_FIRE
-D:This rod makes you insightful, laying open the identity of your possessions.
-
 N:373:Curing
 G:-:d
 I:66:8:35
@@ -5167,94 +5073,6 @@ A:40/3
 D:This parchment contains information about unique
 D:artifacts that are rumoured to exist upon Arda.
 
-N:594:Monstrous Compendium 1
-G:?:o
-I:8:9:0
-W:10:0:5:100
-A:10/2
-D:This parchment contains a small part of the collected
-D:lore concerning monsters inhabiting Arda.
-
-N:595:Monstrous Compendium 2
-G:?:o
-I:8:10:0
-W:11:0:5:200
-A:11/2
-D:This parchment contains a small part of the collected
-D:lore concerning monsters inhabiting Arda.
-
-N:596:Monstrous Compendium 3
-G:?:o
-I:8:11:0
-W:12:0:5:300
-A:12/2
-D:This parchment contains a small part of the collected
-D:lore concerning monsters inhabiting Arda.
-
-N:597:Monstrous Compendium 4
-G:?:o
-I:8:12:0
-W:13:0:5:400
-A:13/2
-D:This parchment contains a small part of the collected
-D:lore concerning monsters inhabiting Arda.
-
-N:598:Monstrous Compendium 5
-G:?:o
-I:8:13:0
-W:14:0:5:500
-A:14/2
-D:This parchment contains a small part of the collected
-D:lore concerning monsters inhabiting Arda.
-
-N:599:Monstrous Compendium 6
-G:?:o
-I:8:14:0
-W:15:0:5:600
-A:15/2
-D:This parchment contains a small part of the collected
-D:lore concerning monsters inhabiting Arda.
-
-N:600:Monstrous Compendium 7
-G:?:o
-I:8:15:0
-W:16:0:5:700
-A:16/2
-D:This parchment contains a small part of the collected
-D:lore concerning monsters inhabiting Arda.
-
-N:601:Monstrous Compendium 8
-G:?:o
-I:8:16:0
-W:17:0:5:800
-A:17/2
-D:This parchment contains a small part of the collected
-D:lore concerning monsters inhabiting Arda.
-
-N:602:Monstrous Compendium 9
-G:?:o
-I:8:17:0
-W:18:0:5:900
-A:18/2
-D:This parchment contains a small part of the collected
-D:lore concerning monsters inhabiting Arda.
-
-N:603:Monstrous Compendium 10
-G:?:o
-I:8:18:0
-W:19:0:5:1000
-A:19/2
-D:This parchment contains a small part of the collected
-D:lore concerning monsters inhabiting Arda.
-
-N:604:Monstrous Compendium 11
-G:?:o
-I:8:19:0
-W:20:0:5:1200
-A:20/2
-D:This parchment contains a small part of the collected
-D:lore concerning monsters inhabiting Arda.
-
 #### Here come the shape-shifting potions. ####
 
 N:605:& Morphic Oil~ of #
diff --git a/lib/mods/theme/edit/p_info.txt b/lib/mods/theme/edit/p_info.txt
index f8a3e25e..a78258d2 100644
--- a/lib/mods/theme/edit/p_info.txt
+++ b/lib/mods/theme/edit/p_info.txt
@@ -607,7 +607,7 @@ C:a:O:36:6:1d1
 C:a:k:+0:-100:Combat
 C:a:k:+0:-100:Weaponmastery
 C:a:k:+0:-300:Archery
-C:a:k:-1000:-700:Barehand-combat
+C:a:k:+0:-100:Barehand-combat
 C:a:k:+0:-200:Spirituality
 C:a:k:+1000:+300:Possession
 C:a:k:+0:+200:Corpse-preservation
@@ -806,7 +806,6 @@ C:D:1:Pope
 C:S:-1:-3:3:-1:0:2:0:0
 C:B:4:35:3
 C:P:2:20
-C:Z:detect curses
 C:G:GOD_FRIEND
 C:E:0:0:0:0:0:0
 C:k:+1000:+900:Magic
diff --git a/lib/mods/theme/edit/ra_info.txt b/lib/mods/theme/edit/ra_info.txt
index 5add55b4..99a675f0 100644
--- a/lib/mods/theme/edit/ra_info.txt
+++ b/lib/mods/theme/edit/ra_info.txt
@@ -1903,20 +1903,13 @@ C:0:0:0:0
 Z:magic map
 
 N:511
-X:30:1
-T:39:0:255
-W:20:1:24
-C:0:0:0:0
-Z:detect curses
-
-N:512
 X:25:1
 T:39:0:255
 W:20:1:17
 C:0:0:0:0
 Z:dazzle
 
-N:513
+N:512
 X:40:1
 T:39:0:255
 W:20:1:50
@@ -1924,7 +1917,7 @@ C:0:0:0:0
 Z:detect doors and traps
 
 # Magestaves can get % to life - Theme
-N:514
+N:513
 X:10:1
 T:6:0:255
 W:10:1:45
@@ -1932,7 +1925,7 @@ C:-40:-40:0:3
 F:LIFE
 
 # Magestaves, armour, lights and jewelry can get ability to store a spell - Theme
-N:515
+N:514
 X:10:1
 T:6:0:255
 T:30:0:255
@@ -1953,7 +1946,7 @@ F:SPELL_CONTAIN
 F:WIELD_CAST
 
 # High-level soft and hard armour and DSM can get nether immunity - Theme, adapted from FuryMod
-N:516
+N:515
 X:50:1
 T:36:11:255
 T:37:15:255
@@ -1963,7 +1956,7 @@ C:0:0:0:0
 F:IM_NETHER
 
 # Light weapons (no broken ones) can gain sentience - Theme, adapted from FuryMod
-N:517
+N:516
 X:20:1
 T:21:1:3
 T:22:2:4
diff --git a/lib/mods/theme/edit/set_info.txt b/lib/mods/theme/edit/set_info.txt
index 182618d4..a0c696e9 100644
--- a/lib/mods/theme/edit/set_info.txt
+++ b/lib/mods/theme/edit/set_info.txt
@@ -82,7 +82,6 @@ F:IM_FIRE
 F:SH_ELEC
 # The demonhorn of Gothmog
 P:183:3:0
-F:AUTO_ID
 F:ESP_EVIL
 F:ESP_GOOD
 
@@ -174,7 +173,6 @@ F:RES_POIS
 F:RES_SOUND
 # The Palantir of Orthanc
 P:202:3:0
-F:AUTO_ID
 
 # Heirlooms of the House of Elendil - set suggested by Massimiliano Marangio in the forums
 
@@ -254,8 +252,6 @@ F:RES_NETHER
 F:SLAY_DEMON
 # The Mithril Helm of Gil-Galad
 P:26:3:0
-#Why *shouldn't* warrior-types get a chance for AUTO_ID without penalties to luck before they kill Morgy?
-F:AUTO_ID
 
 # Dwarven Heritage
 # http://wiki.t-o-m-e.net/IdeaArchive_2fNew_20Item_20Set_3a_20Heritage_20of_20Khazad
@@ -293,8 +289,6 @@ F:SPEED
 F:SUST_DEX
 # The Quarterstaff of Thranduil
 P:74:3:0
-# What can I say. I love archers. :P
-F:AUTO_ID
 
 # Gimli's Gear (Gimli's shield, boots and axe)
 
diff --git a/lib/mods/theme/edit/st_info.txt b/lib/mods/theme/edit/st_info.txt
index 88303fff..17da3e7c 100644
--- a/lib/mods/theme/edit/st_info.txt
+++ b/lib/mods/theme/edit/st_info.txt
@@ -151,10 +151,6 @@ N:4:Alchemy shop
 I:100:Enchant Weapon To-Hit
 I:100:Enchant Weapon To-Dam
 I:100:Enchant Armour
-I:100:Identify
-I:100:Identify
-I:100:Identify
-I:100:Identify
 I:100:Light
 I:100:Phase Door
 I:100:Phase Door
@@ -180,13 +176,6 @@ I:100:Restore Dexterity
 #I:100:Restore Constitution
 T:100:71:46
 I:100:Restore Charisma
-I:100:Identify
-I:100:*Identify*
-I:100:*Identify*
-I:100:*Identify*
-I:100:*Identify*
-I:100:*Identify*
-I:100:*Identify*
 I:100:Light
 #I:100:Restore Strength
 T:100:71:42
@@ -214,7 +203,6 @@ I:100:Protection
 I:100:Charisma
 I:100:Slow Digestion
 T:100:40:7
-I:100:Searching
 I:100:Cure Light Wounds
 # Rods
 I:25:& Wooden Rod~ of#
@@ -313,11 +301,6 @@ F:RANDOM
 W:2
 
 N:13:Library
-I:100:Identify
-I:100:Identify
-I:100:Identify
-I:100:Identify
-I:100:Identify
 # starting parchment
 T:40:8:20
 # Khuzdul
@@ -334,7 +317,7 @@ T:15:8:107
 T:10:8:103
 # Advanced Sindarin
 T:5:8:104
-A:2:3:14:15:16:27
+A:2:3:0:15:16:0
 O:86:87:88:89
 G:+:U
 W:2
@@ -353,28 +336,6 @@ G:+:s
 W:0
 
 N:16:Beastmaster Shanty
-# Monstrous Compendium 1
-T:100:8:9
-# Monstrous Compendium 2
-T:100:8:10
-# Monstrous Compendium 3
-T:95:8:11
-# Monstrous Compendium 4
-T:90:8:12
-# Monstrous Compendium 5
-T:85:8:13
-# Monstrous Compendium 6
-T:80:8:14
-# Monstrous Compendium 7
-T:75:8:15
-# Monstrous Compendium 8
-T:70:8:16
-# Monstrous Compendium 9
-T:65:8:17
-# Monstrous Compendium 10
-T:60:8:18
-# Monstrous Compendium 11
-T:55:8:19
 A:0:2:21:22:3:0
 O:94:95:96:97
 G:+:g
@@ -387,7 +348,7 @@ G:+:s
 W:0
 
 N:18:Tower of Magery
-A:0:0:26:27:0:0
+A:0:0:26:0:0:0
 O:102:103:104:105
 G:+:b
 W:0
@@ -425,7 +386,7 @@ G:+:U
 W:0
 
 N:23:The Mirror
-A:0:0:44:15:16:43
+A:0:0:15:16:43:0
 O:51:51:51:51
 G:+:U
 W:0
@@ -437,7 +398,7 @@ G:+:U
 W:0
 
 N:25:Wizards Spire
-A:60:0:26:27:0:0
+A:60:0:26:0:0:0
 O:54:54:54:54
 G:+:U
 W:0
@@ -463,7 +424,6 @@ G:+:U
 W:0
 
 N:28:Library
-I:100:Identify
 # starting parchment
 T:40:8:20
 # Khuzdul
@@ -480,7 +440,7 @@ T:15:8:107
 T:10:8:103
 # Advanced Sindarin
 T:5:8:104
-A:0:0:14:15:16:2
+A:0:0:0:15:16:2
 O:58:58:58:58
 G:+:U
 W:12
@@ -523,7 +483,7 @@ G:+:U
 W:0
 
 N:33:Star-Dome
-A:0:0:46:47:0:0
+A:0:0:0:47:0:0
 O:63:63:63:63
 G:+:U
 W:0
@@ -677,7 +637,7 @@ T:100:122:256
 T:100:123:256
 T:100:124:256
 T:100:125:256
-A:27:0:1:2:3:4
+A:0:0:1:2:3:4
 O:150:151:152:153
 G:9:y
 F:DEPEND_LEVEL
@@ -702,7 +662,7 @@ T:100:122:256
 T:100:123:256
 T:100:124:256
 T:100:125:256
-A:27:0:1:2:3:4
+A:0:0:1:2:3:4
 O:150:151:152:153
 G:9:v
 F:DEEP_LEVEL
@@ -850,12 +810,6 @@ W:24
 ## Library quest in Minas Anor
 
 N:60:Library
-I:100:Identify
-I:100:Identify
-I:100:Identify
-I:100:Identify
-I:100:Identify
-I:100:Identify
 # starting parchment
 T:40:8:20
 # Khuzdul
@@ -872,7 +826,7 @@ T:15:8:107
 T:10:8:103
 # Advanced Sindarin
 T:5:8:104
-A:61:0:14:15:16:2
+A:61:0:0:15:16:2
 O:210:210:210:210
 G:+:U
 W:12
@@ -914,8 +868,8 @@ W:24
 
 # Music store
 N:64:Music Store
-I:20:& Horn~ 
-I:20:& Drum~ 
+I:20:& Horn~
+I:20:& Drum~
 I:20:& Harp~
 A:0:0:1:2:3:4
 O:194:195:196:197
diff --git a/lib/mods/theme/edit/t_bree.txt b/lib/mods/theme/edit/t_bree.txt
index c6b50340..6be8671a 100644
--- a/lib/mods/theme/edit/t_bree.txt
+++ b/lib/mods/theme/edit/t_bree.txt
@@ -126,12 +126,7 @@ D:#    ^^^^^^^^^^^^^^                                                      .
 D:######################################################################################################################################################################################################
 
 
-############### Starting positions ###############
+############### Starting position ###############
 
-# Standard starting position for normal races
-?:[AND [EQU $LEAVING_QUEST 0] [NOT [EQU $RACE Vampire] ] ]
+?:[EQU $LEAVING_QUEST 0]
 P:33:131
-
-# Standard starting position for vampires (at the dungeon entrance)
-?:[AND [EQU $LEAVING_QUEST 0] [EQU $RACE Vampire] ]
-P:31:150
diff --git a/lib/mods/theme/edit/t_d_bree.txt b/lib/mods/theme/edit/t_d_bree.txt
index 92fde41f..f9212b49 100644
--- a/lib/mods/theme/edit/t_d_bree.txt
+++ b/lib/mods/theme/edit/t_d_bree.txt
@@ -80,12 +80,7 @@ D:#    ^^^^^^^^^^^^^^   HDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD  .DDDD
 D:######################################################################################################################################################################################################
 
 
-############### Starting positions ###############
+############### Starting position ###############
 
-# Standard starting position for normal races
-?:[AND [EQU $LEAVING_QUEST 0] [NOT [EQU $RACE Vampire] ] ]
+?:[EQU $LEAVING_QUEST 0]
 P:33:131
-
-# Standard starting position for vampires (at the dungeon entrance)
-?:[AND [EQU $LEAVING_QUEST 0] [EQU $RACE Vampire] ]
-P:31:150