summaryrefslogtreecommitdiff
path: root/lib/edit
diff options
context:
space:
mode:
Diffstat (limited to 'lib/edit')
-rw-r--r--lib/edit/a_info.txt52
-rw-r--r--lib/edit/ab_info.txt7
-rw-r--r--lib/edit/d_info.txt1
-rw-r--r--lib/edit/e_info.txt144
-rw-r--r--lib/edit/k_info.txt115
-rw-r--r--lib/edit/p_info.txt82
-rw-r--r--lib/edit/r_info.txt26
-rw-r--r--lib/edit/re_info.txt1
-rw-r--r--lib/edit/s_info.txt27
-rw-r--r--lib/edit/st_info.txt1
10 files changed, 8 insertions, 448 deletions
diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt
index 4f52a413..6ab4bf5d 100644
--- a/lib/edit/a_info.txt
+++ b/lib/edit/a_info.txt
@@ -3708,58 +3708,6 @@ 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.
-
-### Trapping Kits ###
-
-### note prices and rarities may have to be adjusted ###
-
-# The Catapult Trap Set of Ahromarwar
-
-N:161:of Ahromarwar
-I:46:1:3
-W:20:10:40:20000
-P:0:0d0:25:15:30
-F:AUTOMATIC_99
-F:HIDE_TYPE
-F:STEALTH
-F:XTRA_MIGHT
-D:A trap that can almost never be detected. Its missiles may be mere pebbles,
-D:but fired at an incredibly high velocity to penetrate even the toughest
-D:hide or armour.
-
-
-# The Device Trap Set 'Hanisbroner's Surprise'
-
-N:162:'Hanisbroner's Surprise'
-I:46:6:3
-W:20:20:40:20000
-P:0:0d0:0:0:25
-F:AUTOMATIC_99
-F:HIDE_TYPE
-F:STEALTH
-F:TELEPORT_TO
-F:XTRA_SHOTS
-D:A magical trap, armed with a wand. Unaccountably, its victims keep
-D:on coming back for more...
-
-
-# The Bolt Trap Set 'Merlion Karc's Demonbane'
-
-N:163:'Merlion Karc's Demonbane'
-I:46:3:2
-W:20:20:200:20000
-P:0:0d0:17:27:37
-F:HIDE_TYPE
-F:ONLY_DEMON
-F:STEALTH
-F:XTRA_MIGHT
-F:XTRA_SHOTS
-D:A snare set not for animals, or people, but for demons alone, and
-D:enchanted so that whenever the demon sets foot or claw into the
-D:(hidden) pentagram, its hide is immediately pierced by many magical
-D:crossbow bolts.
-
-
# The Broken Sword 'Narsil'
N:164:'Narsil'
diff --git a/lib/edit/ab_info.txt b/lib/edit/ab_info.txt
index ec878c67..579368f4 100644
--- a/lib/edit/ab_info.txt
+++ b/lib/edit/ab_info.txt
@@ -84,13 +84,6 @@ A:102:Far reaching attack
k:15:Combat
k:15:Polearm-mastery
-N:9:Trapping
-D:Ability to set monster traps
-D:Prereq: Disarming@15
-I:10
-A:14:Set trap
-k:15:Disarming
-
N:10:Undead Form
D:Ability to turn into a weak undead being when you "die".
D:You must then kill enough monsters to absorb enough life energy
diff --git a/lib/edit/d_info.txt b/lib/edit/d_info.txt
index 1029f547..fe20c276 100644
--- a/lib/edit/d_info.txt
+++ b/lib/edit/d_info.txt
@@ -343,7 +343,6 @@ S:BR_CONF
S:CONF
S:FORGET
S:MULTIPLY
-S:TRAPS
# The Maze
# Levels 25-37
diff --git a/lib/edit/e_info.txt b/lib/edit/e_info.txt
index 0116d47c..0b85ce93 100644
--- a/lib/edit/e_info.txt
+++ b/lib/edit/e_info.txt
@@ -2150,150 +2150,6 @@ R:1
F:PVAL_M3
F:PVAL_M5
-
-### Trapping Kits ###
-
-N:151:of Extra Might
-X:A:0:5
-T:46:1:3
-W:0:1:10:1000
-C:20:20:0:2
-R:100
-F:XTRA_MIGHT
-f:XTRA_MIGHT
-
-N:152:of Extra Shots
-X:A:0:10
-T:46:0:99
-W:0:1:10:2000
-C:20:20:0:3
-R:100
-F:XTRA_SHOTS
-f:XTRA_SHOTS
-
-N:153:Automatic
-X:B:0:15
-T:46:0:99
-W:0:1:10:3000
-C:10:10:0:0
-R:100
-F:AUTOMATIC_5
-F:IGNORE_ACID
-F:IGNORE_COLD
-F:IGNORE_ELEC
-F:IGNORE_FIRE
-f:AUTOMATIC_5
-
-N:154:Fully Automatic
-X:B:0:15
-T:46:0:99
-W:0:1:15:5000
-C:10:10:0:0
-R:100
-F:AUTOMATIC_99
-F:IGNORE_ACID
-F:IGNORE_COLD
-F:IGNORE_ELEC
-F:IGNORE_FIRE
-f:AUTOMATIC_99
-
-N:155:Well-hidden
-X:B:0:5
-T:46:0:99
-W:0:1:8:1000
-C:15:15:5:12
-R:100
-F:HIDE_TYPE
-F:IGNORE_ACID
-F:IGNORE_COLD
-F:IGNORE_ELEC
-F:IGNORE_FIRE
-F:STEALTH
-f:STEALTH
-
-N:156:Complicated
-X:B:0:10
-T:46:0:99
-W:0:1:12:2000
-C:15:15:30:0
-R:100
-F:IGNORE_ACID
-F:IGNORE_COLD
-F:IGNORE_ELEC
-F:IGNORE_FIRE
-
-N:157:Obvious
-X:B:0:0
-T:46:0:99
-W:0:1:1:0
-C:-20:-20:-20:-20
-R:100
-F:CURSED
-F:HIDE_TYPE
-F:STEALTH
-f:STEALTH
-
-N:158:for Dragons
-X:A:0:5
-T:46:0:99
-W:0:3:10:500
-C:20:20:10:4
-R:100
-F:HIDE_TYPE
-F:IGNORE_ACID
-F:IGNORE_FIRE
-F:ONLY_DRAGON
-F:STEALTH
-F:XTRA_SHOTS
-
-N:159:for Demons
-X:A:0:5
-T:46:0:99
-W:0:3:10:500
-C:20:20:10:4
-R:100
-F:HIDE_TYPE
-F:IGNORE_ACID
-F:IGNORE_FIRE
-F:ONLY_DEMON
-F:STEALTH
-F:XTRA_SHOTS
-
-N:160:for Animals
-X:A:0:5
-T:46:0:99
-W:0:3:10:500
-C:20:20:10:4
-R:100
-F:HIDE_TYPE
-F:ONLY_ANIMAL
-F:STEALTH
-F:XTRA_SHOTS
-
-N:161:for Undead
-X:A:0:5
-T:46:0:99
-W:0:3:10:500
-C:20:20:10:4
-R:100
-F:HIDE_TYPE
-F:KILL_GHOST
-F:ONLY_UNDEAD
-F:STEALTH
-F:XTRA_SHOTS
-
-N:162:for Evil
-X:A:0:5
-T:46:0:99
-W:0:3:10:500
-C:20:20:10:4
-R:100
-F:HIDE_TYPE
-F:KILL_GHOST
-F:ONLY_EVIL
-F:STEALTH
-F:XTRA_SHOTS
-
# Lite ego
N:163:of the Magi
X:A:0:0
diff --git a/lib/edit/k_info.txt b/lib/edit/k_info.txt
index 7bc01b5e..e998ac71 100644
--- a/lib/edit/k_info.txt
+++ b/lib/edit/k_info.txt
@@ -2015,14 +2015,6 @@ A:0/1
D:This scroll shows nearby objects to you. It only makes you aware of items on the floor,
D:however, not those carried by creatures.
-N:194:Trap Detection
-G:?:d
-I:70:28:0
-W:5:0:5:35
-A:5/1:10/1
-D:This scroll is very helpful, because it reveals the locations of nearby snares and traps which you
-D:might otherwise blunder into.
-
##### Extra ammunition #####
N:195:& Sheaf Arrow~
@@ -2095,22 +2087,6 @@ W:5:0:5:0
A:5/1
D:This nasty scroll will make a loud noise, waking up foes in your vicinity.
-N:203:Trap Creation
-G:?:d
-I:70:7:0
-W:10:0:5:0
-A:10/1
-D:If you read this rather annoying scroll, snares and pitfalls will magically be planted all around
-D:you, ready to do nasty things to you once you walk onto them.
-
-N:204:Trap/Door Destruction
-G:?:d
-I:70:39:0
-W:10:0:5:50
-A:10/1
-D:A very specifically destructive spell is written on this scroll. It will smash all traps and all
-D:doors immediately next to you.
-
N:205:Artifact Creation
G:?:d
I:70:52:0
@@ -2982,13 +2958,6 @@ W:30:0:50:100
A:30/1
P:0:1d2:0:0:0
-N:307:Disarm
-G:_:d
-I:55:8:-1:SPELL=Disarm
-W:2:0:50:100
-A:2/1
-P:0:1d2:0:0:0
-
N:308:Teleportation
G:_:d
I:55:9:-1:SPELL=Teleportation
@@ -3330,14 +3299,6 @@ A:15/1
P:0:1d1:0:0:0
D:When fuelled with enough ambient mana, this rod can detect nearby passages.
-N:352:Trap Location
-G:-:d
-I:66:29:8
-W:5:0:15:100
-A:5/1:10/1:20/1
-P:0:1d1:0:0:0
-D:Zapping this rod will release a minor detection magic, alerting you of nearby pits and snares.
-
N:354:Recall
G:-:d
I:66:3:80
@@ -3427,14 +3388,6 @@ A:45/2
P:0:1d1:0:0:0
D:This rod of movement will displace its target to another location.
-N:365:Disarming
-G:-:d
-I:66:14:50
-W:35:0:15:2100
-A:35/1
-P:0:1d1:0:0:0
-D:This rod will clear a path for you, triggering and thus rendering harmless all traps on the way.
-
N:366:Lightning Balls
G:-:d
I:66:25:50
@@ -4960,27 +4913,6 @@ f:MUST2H
D:This is a larger version of the curved oriental blade.
D:Runes of war decorate its golden hilt.
-
-### Trapping Kits
-
-N:549:Arrow
-G:`:r
-I:46:2:0
-W:10:0:60:150
-A:10/2:50/2
-F:SHOW_MODS
-D:It must be loaded with arrows, which will be
-D:fired at the monster who triggers the trap.
-
-N:550:Bolt
-G:`:o
-I:46:3:0
-W:20:0:220:300
-A:20/2:50/2
-F:SHOW_MODS
-D:It must be loaded with crossbow bolts, which will
-D:be fired at the monster who triggers the trap.
-
N:551:& Fauchard~
G:/:s
I:22:6:0
@@ -5028,17 +4960,6 @@ D:This is a two-edged dagger with a long blade. A favourite among travellers
D:and warriors alike, it can be worn comfortably with plain clothes
D:as well as armour.
-### Trapping Kits
-
-N:555:Catapult
-G:`:R
-I:46:1:0
-W:1:0:50:40
-A:1/2:20/2
-F:SHOW_MODS
-D:It must be loaded with sling bullets, which will
-D:be fired at the monster who triggers the trap.
-
N:556:& Ring Mail~
G:[:s
I:37:2:0
@@ -5075,16 +4996,6 @@ P:4:1d1:0:0:0
D:Heavy, multi-layered cloth sewn together to cover the body,
D:with extra padding between layers.
-### Trapping Kits
-
-N:560:Fumes
-G:`:G
-I:46:4:0
-W:2:0:20:50
-A:2/2:30/2
-D:It must be loaded with potions, which will splatter
-D:over the monster who triggers the trap.
-
N:561:& Stone and Hide Armour~
G:(:U
I:36:15:0
@@ -5093,32 +5004,6 @@ A:35/7
P:15:1d1:-1:0:0
D:A primitive armour made from a thick hide reinforced by stone shards.
-### Trapping Kits
-
-N:562:Magic
-G:`:g
-I:46:5:0
-W:5:0:20:50
-A:5/2:40/2
-F:IGNORE_ACID
-F:IGNORE_COLD
-F:IGNORE_ELEC
-F:IGNORE_FIRE
-D:It must be loaded with scrolls, which will release
-D:their spells at the monster who triggers the trap.
-
-N:563:Device
-G:`:v
-I:46:6:0
-W:20:0:20:50
-A:20/2:40/2:60/2
-F:IGNORE_ACID
-F:IGNORE_COLD
-F:IGNORE_ELEC
-F:IGNORE_FIRE
-D:It must be loaded with a magic device (wand, staff, or rod), which
-D:will fire its spell at the monster who triggers the trap.
-
N:564:Nothing
G:?:d
I:70:53:0
diff --git a/lib/edit/p_info.txt b/lib/edit/p_info.txt
index 8fdfb96e..dd78db25 100644
--- a/lib/edit/p_info.txt
+++ b/lib/edit/p_info.txt
@@ -78,9 +78,7 @@ C:k:+0:+400:Axe-mastery
C:k:+0:+400:Hafted-mastery
C:k:+0:+400:Polearm-mastery
C:k:+1000:+600:Archery
-C:k:+1000:+900:Sneakiness
C:k:+0000:+400:Stealth
-C:k:+1000:+900:Disarming
C:k:+1000:+300:Magic
C:k:+1000:+400:Spirituality
C:k:+0:+550:Antimagic
@@ -169,8 +167,6 @@ C:a:k:=0:=0:Axe-mastery
C:a:k:=0:=0:Hafted-mastery
C:a:k:=0:=0:Polearm-mastery
C:a:k:+1000:-200:Archery
-C:a:k:+1000:+900:Sneakiness
-C:a:k:+1000:+900:Disarming
C:a:k:+1000:+400:Magic
C:a:k:+1000:+300:Spirituality
C:a:k:=0:=0:Antimagic
@@ -216,7 +212,6 @@ C:k:+0:+700:Thaumaturgy
C:k:+1000:+550:Spirituality
C:k:+1000:+200:Combat
C:k:+700:+500:Weaponmastery
-C:k:+1000:+900:Sneakiness
C:k:+0000:+400:Stealth
C:b:1:Perfect casting
C:g:All Gods
@@ -358,9 +353,7 @@ C:k:+0:+300:Crossbow-mastery
C:k:+0:+300:Sling-mastery
C:k:+0:+300:Boomerang-mastery
C:k:+0:%150:Boulder-throwing
-C:k:+1000:+900:Sneakiness
C:k:+0000:+400:Stealth
-C:k:+1000:+900:Disarming
C:k:+1000:+300:Magic
C:k:+0:+100:Magic-Device
C:k:+1000:+400:Spirituality
@@ -388,8 +381,6 @@ C:a:k:+0:+400:Magic
C:a:k:+0:+500:Nature
C:a:k:+0:+500:Divination
C:a:k:+0:+500:Conveyance
-C:a:k:+0:+700:Disarming
-C:a:k:+0:+50:Sneakiness
C:a:k:+0:+200:Monster-lore
C:a:O:19:12:1d1
C:a:O:17:1:10d3
@@ -401,7 +392,7 @@ C:a:g:Yavanna Kementari
C:N:3:2:Rogue
C:D:0:Rogues are masters of tricks. They can steal from shops and monsters,
-C:D:0:and lure monsters into deadly monster traps.
+C:D:0:and excel at stealthily exploring the dungeon.
C:D:1:Cutpurse
C:D:1:Robber
C:D:1:Burglar
@@ -460,9 +451,7 @@ C:k:+0:+500:Conveyance
C:k:+0:+500:Divination
C:k:+0:+500:Temporal
C:k:+1000:+700:Spirituality
-C:k:+1000:+2000:Sneakiness
C:k:+1000:+1500:Stealth
-C:k:+1000:+2000:Disarming
C:k:+1000:+1000:Backstab
C:k:+1000:+2000:Stealing
C:k:+1000:+2000:Dodging
@@ -472,8 +461,6 @@ C:b:10:Extra Max Blow(1)
C:a:N:Rogue
C:a:D:Rogues are masters of tricks. They can steal from shops and monsters,
C:a:D:and lure monsters into deadly monster traps.
-C:a:b:1:Trapping
-C:a:O:46:1:1d1
C:a:N:Assassin
C:a:D:Assassins are stealthy killers.
@@ -487,7 +474,6 @@ C:a:k:+0:-400:Conveyance
C:a:k:+0:-400:Divination
C:a:k:+0:-300:Temporal
C:a:k:+0:+500:Stealth
-C:a:k:+0:-1000:Disarming
C:a:k:+0:+1000:Backstab
C:a:k:+0:-1800:Stealing
C:a:k:+0:-800:Magic-Device
@@ -513,9 +499,7 @@ C:k:+1000:+700:Weaponmastery
C:k:+1000:+700:Archery
C:k:+1000:+700:Barehand-combat
C:k:+0:+600:Magic
-C:k:+1000:+700:Sneakiness
C:k:+1000:+700:Stealth
-C:k:+1000:+700:Disarming
C:k:+1000:+700:Spirituality
C:k:+1000:+600:Monster-lore
C:k:+0:+500:Possession
@@ -544,7 +528,6 @@ 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:-200:Disarming
C:a:k:+0:-200:Spirituality
C:a:k:+1000:+300:Possession
C:a:k:+0:+200:Corpse-preservation
@@ -562,7 +545,6 @@ C:a:k:+0:+100:Combat
C:a:k:+0:+100:Weaponmastery
C:a:k:+0:-100:Barehand-combat
C:a:k:+1000:+100:Magic
-C:a:k:+0:+100:Sneakiness
C:a:k:+0:+100:Stealth
C:a:k:+0:-200:Spirituality
C:a:k:+0:-400:Possession
@@ -580,7 +562,6 @@ C:a:k:+0:+100:Combat
C:a:k:+0:+100:Weaponmastery
C:a:k:+0:-100:Barehand-combat
C:a:k:+1000:+100:Magic
-C:a:k:+0:+100:Sneakiness
C:a:k:+0:+100:Stealth
C:a:k:+0:-200:Spirituality
C:a:k:+0:-400:Possession
@@ -599,9 +580,7 @@ C:a:k:+0:-100:Weaponmastery
C:a:k:+0:-300:Archery
C:a:k:-1000:-700:Barehand-combat
C:a:k:+1000:+200:Magic
-C:a:k:+0:+0:Sneakiness
C:a:k:+0:+0:Stealth
-C:a:k:+0:-200:Disarming
C:a:k:+0:-200:Spirituality
C:a:k:+15000:+100:Monster-lore
C:a:k:+0:-500:Possession
@@ -620,9 +599,7 @@ C:a:k:-1000:-400:Weaponmastery
C:a:k:-1000:-300:Archery
C:a:k:+0:+200:Barehand-combat
C:a:k:+0:+0:Magic
-C:a:k:+0:+200:Sneakiness
C:a:k:+0:+200:Stealth
-C:a:k:+0:+200:Disarming
C:a:k:+0:+200:Spirituality
C:a:k:+0:-400:Possession
C:a:k:+0:-200:Corpse-preservation
@@ -644,7 +621,6 @@ C:a:O:14:59:1d1
C:a:k:+1000:+0:Magic
C:a:k:-1000:-700:Archery
C:a:k:+0:-100:Barehand-combat
-C:a:k:+0:-100:Disarming
C:a:k:+0:+100:Spirituality
C:a:k:+0:-500:Possession
C:a:k:+0:-100:Summoning
@@ -679,8 +655,6 @@ C:k:+1000:+1000:Spirituality
C:k:+1000:+700:Prayer
C:k:+2000:+700:Combat
C:k:+1000:+700:Weaponmastery
-C:k:+1000:+900:Sneakiness
-C:k:+0000:+900:Disarming
C:k:+0000:+400:Stealth
C:k:+0:+50:Magic-Device
C:b:1:Perfect casting
@@ -748,7 +722,6 @@ C:a:g:Yavanna Kementari
C:a:k:+0:-300:Prayer
C:a:k:+0:-200:Necromancy
C:a:k:+1000:+300:Mindcraft
-C:a:k:+0:+200:Sneakiness
C:a:k:+0:+100:Magic-Device
@@ -802,11 +775,9 @@ R:C:Priest
R:C:Rogue
R:C:Warrior
R:G:ELF
-R:k:+200:+000:Disarming
R:k:+300:+000:Magic-Device
R:k:+1500:+000:Spirituality
R:k:+1000:+000:Stealth
-R:k:+600:+000:Sneakiness
R:k:-100:+000:Weaponmastery
R:k:+500:+000:Archery
@@ -825,11 +796,9 @@ R:C:Mage
R:C:Priest
R:C:Warrior
R:G:ELF
-R:k:+500:+000:Disarming
R:k:+600:+000:Magic-Device
R:k:+3000:+000:Spirituality
R:k:+2000:+000:Stealth
-R:k:+800:+000:Sneakiness
R:k:-500:+000:Weaponmastery
R:k:+1500:+000:Archery
@@ -850,11 +819,9 @@ R:C:Mage
R:C:Rogue
R:C:Warrior
R:k:+0:+300:Sling-mastery
-R:k:+1500:+000:Disarming
R:k:+1800:+000:Magic-Device
R:k:+9000:+000:Spirituality
R:k:+5000:+000:Stealth
-R:k:+1200:+000:Sneakiness
R:k:-1000:+000:Weaponmastery
R:k:+2000:+000:Archery
@@ -870,11 +837,9 @@ R:F:FREE_ACT
R:C:Mage
R:C:Rogue
R:C:Warrior
-R:k:+1000:+000:Disarming
R:k:+1200:+000:Magic-Device
R:k:+6000:+000:Spirituality
R:k:+3000:+000:Stealth
-R:k:+600:+000:Sneakiness
R:k:-800:+000:Weaponmastery
R:k:+1200:+000:Archery
@@ -890,11 +855,9 @@ R:F:RES_BLIND
R:C:Priest
R:C:Warrior
R:k:+0:+200:Axe-mastery
-R:k:+200:+000:Disarming
R:k:+900:+000:Magic-Device
R:k:+5000:+000:Spirituality
R:k:-1000:+000:Stealth
-R:k:+700:+000:Sneakiness
R:k:+1500:+000:Weaponmastery
R:k:+500:+000:Archery
@@ -910,11 +873,9 @@ R:C:Archer
R:C:Priest
R:C:Rogue
R:C:Warrior
-R:k:-300:+000:Disarming
R:k:-300:+000:Magic-Device
R:k:-1000:+000:Spirituality
R:k:-1000:+000:Stealth
-R:k:+000:+000:Sneakiness
R:k:+1200:+000:Weaponmastery
R:k:-500:+000:Archery
@@ -930,11 +891,9 @@ R:F:SUST_STR
R:R:15:0
R:F:REGEN
R:C:Warrior
-R:k:-500:+000:Disarming
R:k:-800:+000:Magic-Device
R:k:-4000:+000:Spirituality
R:k:-2000:+000:Stealth
-R:k:-100:+000:Sneakiness
R:k:+2000:+000:Weaponmastery
R:k:-1000:+000:Archery
@@ -953,11 +912,9 @@ R:C:Mage
R:C:Priest
R:C:Rogue
R:C:Warrior
-R:k:+400:+000:Disarming
R:k:+500:+000:Magic-Device
R:k:+2500:+000:Spirituality
R:k:+2000:+000:Stealth
-R:k:+800:+000:Sneakiness
R:k:+1500:+000:Weaponmastery
R:k:+1000:+000:Archery
@@ -977,11 +934,9 @@ R:C:Loremaster
R:C:Mage
R:C:Priest
R:C:Warrior
-R:k:+400:+000:Disarming
R:k:+2000:+000:Magic-Device
R:k:+10000:+000:Spirituality
R:k:+4000:+000:Stealth
-R:k:+300:+000:Sneakiness
R:k:+1000:+000:Weaponmastery
R:k:+2500:+000:Archery
@@ -997,11 +952,9 @@ R:F:RES_DARK
R:F:SUST_STR
R:C:Priest
R:C:Warrior
-R:k:-300:+000:Disarming
R:k:-500:+000:Magic-Device
R:k:-2500:+000:Spirituality
R:k:-2000:+000:Stealth
-R:k:-100:+000:Sneakiness
R:k:+2000:+000:Weaponmastery
R:k:+000:+000:Archery
@@ -1020,11 +973,9 @@ R:C:Loremaster
R:C:Rogue
R:C:Warrior
R:k:+1000:+1000:Bearform-combat
-R:k:-600:+000:Disarming
R:k:-800:+000:Magic-Device
R:k:-3000:+000:Spirituality
R:k:-2000:+000:Stealth
-R:k:-100:+000:Sneakiness
R:k:+2500:+000:Weaponmastery
R:k:+500:+000:Archery
@@ -1039,11 +990,9 @@ R:F:RES_POIS
R:C:Archer
R:C:Rogue
R:C:Warrior
-R:k:-200:+000:Disarming
R:k:-300:+000:Magic-Device
R:k:-1000:+000:Spirituality
R:k:-1000:+000:Stealth
-R:k:+100:+000:Sneakiness
R:k:+1000:+000:Weaponmastery
R:k:-800:+000:Archery
@@ -1059,11 +1008,9 @@ R:F:RES_DARK
R:F:RES_DISEN
R:C:Rogue
R:C:Warrior
-R:k:+300:+000:Disarming
R:k:+500:+000:Magic-Device
R:k:+5000:+000:Spirituality
R:k:+1000:+000:Stealth
-R:k:+500:+000:Sneakiness
R:k:+000:+000:Weaponmastery
R:k:+000:+000:Archery
@@ -1086,11 +1033,9 @@ R:C:Rogue
R:C:Warrior
R:G:ELF
R:k:+0:+200:Magic
-R:k:+500:+000:Disarming
R:k:+1500:+000:Magic-Device
R:k:+10000:+000:Spirituality
R:k:+3000:+000:Stealth
-R:k:+800:+000:Sneakiness
R:k:-500:+000:Weaponmastery
R:k:+1000:+000:Archery
@@ -1121,11 +1066,9 @@ R:O:70:32:2d3
R:b:1:Tree walking
R:k:+0:+200:Barehand-combat
R:k:+0:+600:Boulder-throwing
-R:k:+500:+000:Disarming
R:k:+500:+000:Magic-Device
R:k:+10000:+000:Spirituality
R:k:-6000:+000:Stealth
-R:k:+500:+000:Sneakiness
R:k:-300:+000:Weaponmastery
R:k:-200:+000:Archery
@@ -1158,14 +1101,11 @@ R:R:45:1
R:F:SPEED
R:C:Priest
R:C:Warrior
-R:k:+1000:+000:Disarming
R:k:+500:+000:Magic-Device
R:k:+2500:+000:Spirituality
R:k:-8000:+000:Stealth
-R:k:+100:+000:Sneakiness
R:k:+100:+200:Weaponmastery
R:k:+500:+000:Archery
-
R:N:17:Thunderlord
R:D:A thunderlord is a Great Eagle of Manwe, ridden by a Maia of Manwe.
R:D:They carry the power of wind and thunder.
@@ -1193,11 +1133,9 @@ R:C:Archer
R:C:Mage
R:C:Priest
R:C:Warrior
-R:k:+600:+000:Disarming
R:k:+000:+000:Magic-Device
R:k:+5000:+000:Spirituality
R:k:-16000:+000:Stealth
-R:k:+3000:+000:Sneakiness
R:k:+1500:+000:Weaponmastery
R:k:+500:+000:Archery
@@ -1217,11 +1155,9 @@ R:F:RES_NEXUS
R:C:Mage
R:C:Priest
R:k:+0:+200:Necromancy
-R:k:+1500:+000:Disarming
R:k:-500:+000:Magic-Device
R:k:+7500:+000:Spirituality
R:k:+25000:+000:Stealth
-R:k:+000:+000:Sneakiness
R:k:+2500:+000:Weaponmastery
R:k:+2500:+000:Archery
@@ -1236,11 +1172,9 @@ R:C:Mage
R:C:Priest
R:C:Rogue
R:C:Warrior
-R:k:-500:+000:Disarming
R:k:-500:+000:Magic-Device
R:k:-2500:+000:Spirituality
R:k:-5000:+000:Stealth
-R:k:-500:+000:Sneakiness
R:k:-500:+000:Weaponmastery
R:k:-500:+000:Archery
@@ -1262,11 +1196,9 @@ R:C:Warrior
R:G:ELF
R:k:+0:+200:Archery
R:b:1:Tree walking
-R:k:+500:+000:Disarming
R:k:+600:+000:Magic-Device
R:k:+3000:+000:Spirituality
R:k:+5000:+000:Stealth
-R:k:+800:+000:Sneakiness
R:k:-2500:+000:Weaponmastery
R:k:+4000:+000:Archery
@@ -1340,12 +1272,10 @@ R:F:WIS
R:C:Archer
R:C:Mage
R:C:Warrior
-R:k:+000:+000:Disarming
R:k:+000:+000:Magic-Device
R:k:+000:+000:Spirituality
R:k:=0:=0:Prayer
R:k:+000:+000:Stealth
-R:k:+000:+000:Sneakiness
R:k:+000:+000:Weaponmastery
R:k:+000:+000:Archery
@@ -1465,11 +1395,9 @@ S:F:RES_POIS
S:F:SEE_INVIS
S:F:SLOW_DIGEST
S:O:70:32:2d3
-S:k:+200:+000:Disarming
S:k:+800:+000:Magic-Device
S:k:+700:+000:Spirituality
S:k:+2000:+000:Stealth
-S:k:+200:+000:Sneakiness
S:k:-500:+000:Weaponmastery
S:k:-200:+000:Archery
@@ -1509,11 +1437,9 @@ S:F:SEE_INVIS
S:R:10:0
S:F:RES_COLD
S:O:70:32:2d3
-S:k:-500:+000:Disarming
S:k:-500:+000:Magic-Device
S:k:+500:+000:Spirituality
S:k:-1000:+000:Stealth
-S:k:-100:+000:Sneakiness
S:k:+800:+000:Weaponmastery
S:k:+000:+000:Archery
@@ -1552,11 +1478,9 @@ S:F:SLOW_DIGEST
S:R:5:0
S:F:RES_COLD
S:O:70:32:2d3
-S:k:-200:+000:Disarming
S:k:-200:+000:Magic-Device
S:k:+500:+000:Spirituality
S:k:-1000:+000:Stealth
-S:k:-100:+000:Sneakiness
S:k:+500:+000:Weaponmastery
S:k:+000:+000:Archery
@@ -1574,11 +1498,9 @@ S:A:Troll
S:C:F:Mage
S:R:10:0
S:F:RES_FEAR
-S:k:-200:+000:Disarming
S:k:-1000:+000:Magic-Device
S:k:+200:+000:Spirituality
S:k:-2000:+000:Stealth
-S:k:+000:+000:Sneakiness
S:k:+1200:+000:Weaponmastery
S:k:+500:+000:Archery
@@ -1607,11 +1529,9 @@ S:A:Wood-Elf
S:A:Yeek
S:C:F:Archer
S:C:F:Warrior
-S:k:+500:+000:Disarming
S:k:+1000:+000:Magic-Device
S:k:+500:+000:Spirituality
S:k:+3000:+000:Stealth
-S:k:+400:+000:Sneakiness
S:k:-500:+000:Weaponmastery
S:k:-500:+000:Archery
diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt
index 9c9c852e..8af0e634 100644
--- a/lib/edit/r_info.txt
+++ b/lib/edit/r_info.txt
@@ -3059,7 +3059,6 @@ S:BA_POIS
S:BO_COLD
S:HEAL
S:SLOW
-S:TRAPS
D:He's been spying for Saruman. He is a snivelling wretch with no morals.
N:138:Robin Hood, the Outlaw
@@ -3095,7 +3094,6 @@ F:ZANGBAND
S:1_IN_5
S:ARROW_2
S:HEAL
-S:TRAPS
D:The legendary archer steals from the rich (you qualify).
N:139:Nurgling
@@ -9384,7 +9382,6 @@ S:S_MONSTER
S:S_UNDEAD
S:TELE_AWAY
S:TELE_TO
-S:TRAPS
D:Nobody has ever seen It.
N:394:Banshee
@@ -9802,7 +9799,6 @@ S:SCARE
S:SLOW
S:S_KIN
S:S_UNDEAD
-S:TRAPS
D:He is out to have revenge on those who have desecrated his tomb.
N:410:Gwaihir the Windlord
@@ -10264,7 +10260,6 @@ S:CONF
S:HASTE
S:HOLD
S:SHRIEK
-S:TRAPS
D:This creature look like a pillar of rock. However, a closer
D:inspection reveals a glaring eye and powerful tentacles,
D:which crush its prey and feed it to the creature's hungry
@@ -11824,7 +11819,6 @@ S:HEAL
S:SCARE
S:SLOW
S:S_SPIDER
-S:TRAPS
D:Shelob is an enormous bloated spider, the last daughter of Ungoliant the
D:Unlight. Her poison is legendary, as is her ego. She normally guards the
D:pass through Cirith Ungol, but occasionally goes out foraging for food to
@@ -12316,7 +12310,6 @@ S:FORGET
S:HASTE
S:HOLD
S:SCARE
-S:TRAPS
D:An embodiment of all the cardinal vices, he beholds you scornfully.
N:498:Chaos master
@@ -12932,7 +12925,6 @@ F:TAKE_ITEM
S:1_IN_6
S:ARROW_2
S:BLINK
-S:TRAPS
D:Cool and confident, fast and lithe; protect your possessions quickly!
N:517:The Watcher in the Water
@@ -15484,7 +15476,6 @@ S:BO_ELEC
S:BO_FIRE
S:BO_ICEE
S:HEAL
-S:TRAPS
D:A Black Numenorean who usurped the throne of Gondor, he is treacherous and
D:evil.
@@ -16841,7 +16832,6 @@ S:S_DRAGON
S:S_MONSTER
S:S_UNDEAD
S:TELE_TO
-S:TRAPS
D:A human figure in robes, he moves with magically improved speed, and his
D:hands are ablur with spell casting.
@@ -19050,7 +19040,6 @@ S:BLINK
S:CONF
S:TELE_TO
S:TPORT
-S:TRAPS
D:A class of its own: you are already too late to protect your possessions -
D:and he seems to have studied magic too, and is a master of setting traps.
@@ -20351,7 +20340,6 @@ F:TAKE_ITEM
F:UNIQUE
S:1_IN_6
S:S_BUG
-S:TRAPS
D:He may not code worth a dime, but he certainly knows how to make money.
N:733:Santa Claus
@@ -20402,7 +20390,6 @@ S:S_HI_UNDEAD
S:S_UNDEAD
S:S_UNIQUE
S:TELE_AWAY
-S:TRAPS
D:Why would anybody want to kill Santa Claus? To get all the presents,
D:of course!
@@ -20638,7 +20625,6 @@ S:S_HI_DRAGON
S:S_MONSTER
S:S_UNDEAD
S:TELE_TO
-S:TRAPS
D:A human figure in robes, he moves with magically improved speed, and his
D:hands are ablur with spell casting. You stagger at the mighty sound of his
D:spells as they echo hollowly through the dungeon.
@@ -21138,7 +21124,6 @@ S:CAUSE_4
S:MIND_BLAST
S:SLOW
S:S_UNDEAD
-S:TRAPS
D:A glowing skull possessed by sorcerous power. It need not move, but
D:merely blast you with mighty magic.
@@ -22137,7 +22122,6 @@ S:S_HI_DRAGON
S:S_UNDEAD
S:TELE_AWAY
S:TPORT
-S:TRAPS
D:Originally known as the White, Saruman fell prey to Sauron's wiles. He
D:searches forever for the One Ring, to become a mighty Sorcerer-King of the
D:world.
@@ -22170,7 +22154,6 @@ F:TAKE_ITEM
F:UNIQUE
S:1_IN_6
S:TELE_TO
-S:TRAPS
D:He is a master of disguise, an expert of stealth, a genius at traps, and
D:moves with blinding speed. Check your pockets!
@@ -23511,7 +23494,6 @@ S:S_KIN
S:S_MONSTERS
S:S_UNDEAD
S:TELE_TO
-S:TRAPS
D:A stench of corruption and decay surrounds this sorcerer, who has clearly
D:risen from the dead to continue his foul plots and schemes.
@@ -24165,7 +24147,6 @@ S:HOLD
S:S_HI_DEMON
S:S_HI_UNDEAD
S:TELE_TO
-S:TRAPS
D:The Mouth of Sauron is a mighty spell caster. So old that even he cannot
D:remember his own name, his power and evil are undeniable. He believes
D:unshakeably that he is unbeatable and laughs as he weaves his awesome
@@ -24218,7 +24199,6 @@ S:HAND_DOOM
S:HOLD
S:S_HI_UNDEAD
S:TELE_TO
-S:TRAPS
D:The dark master of the terrible fortress of southern Mirkwood. It is
D:rumoured that this is in fact none other than Sauron in disguise:
D:although if this is so, he has yet to reveal his full power - and perhaps
@@ -26366,7 +26346,6 @@ S:S_RNG
S:S_THUNDERLORD
S:TELE_TO
S:TPORT
-S:TRAPS
D:He is the master of coding; none can match his skill. He created the
D:Variant Maintainer, the RNGs, and the software bugs. Bull Gates is
D:nothing next to him. Do not think that since he loves the novels of
@@ -28273,7 +28252,6 @@ S:S_KIN
S:S_MONSTERS
S:TELE_AWAY
S:TPORT
-S:TRAPS
D:The wizard who opposed Sauron and, in the end, was the only
D:one of the Istari to succeed in his task. Gandalf is very
D:wise and specialises in fire magic.
@@ -29844,7 +29822,6 @@ S:S_ANGEL
S:S_UNIQUE
S:TELE_TO
S:TPORT
-S:TRAPS
D:A woman of mind-shattering beauty, none can match her beauty. She is perfect,
D:and totally evil. She loves nothing but herself and her evil is as
D:great as her beauty. No one can stand against her, even DarkGod.
@@ -31914,7 +31891,6 @@ S:SCARE
S:SHRIEK
S:S_KIN
S:S_MONSTER
-S:TRAPS
D:A strange creature that disguises itself as an object to lure
D:unsuspecting adventurers within reach of its venomous claws.
@@ -32364,7 +32340,6 @@ S:HEAL
S:SCARE
S:SHRIEK
S:TELE_AWAY
-S:TRAPS
D:Hopefully you will kill this spirit before you realise it exists.
# Spirit of ickyness
@@ -32616,7 +32591,6 @@ S:ARROW_3
S:BLINK
S:CONF
S:TELE_TO
-S:TRAPS
D:There is something attractive about this spirit, and it seems
D:to have a full purse.
diff --git a/lib/edit/re_info.txt b/lib/edit/re_info.txt
index 2b111067..9b89f19d 100644
--- a/lib/edit/re_info.txt
+++ b/lib/edit/re_info.txt
@@ -284,7 +284,6 @@ S:HEAL
S:HOLD
S:S_MONSTER
S:TPORT
-S:TRAPS
N:10:Archer
G:*:W
diff --git a/lib/edit/s_info.txt b/lib/edit/s_info.txt
index b6c195dc..d708f177 100644
--- a/lib/edit/s_info.txt
+++ b/lib/edit/s_info.txt
@@ -338,19 +338,10 @@ E:Thaumaturgy:Antimagic
################################## SNEAKINESS SKILLS ###############################
-N:35:Sneakiness
-D:General ability at the sneakiness skills.
-D:It also affects the searching abilities
-F:RANDOM_GAIN
-
N:36:Stealth
D:Ability to move unnoticed, silently
F:RANDOM_GAIN
-N:37:Disarming
-D:Ability to disarm the various traps
-F:RANDOM_GAIN
-
N:40:Stealing
D:Ability to steal objects
A:15:Steal object
@@ -359,11 +350,9 @@ N:46:Dodging
D:Ability to dodge blows and bolts
A:16:Check dodge chance
-f:Stealth:Sneakiness%15
-f:Disarming:Sneakiness%10
-f:Backstab:Sneakiness%5
-f:Stealing:Sneakiness%15
-f:Dodging:Sneakiness%10
+f:Backstab:Stealth%5
+f:Stealing:Stealth%15
+f:Dodging:Stealth%10
################################## MONSTER SKILLS ################################
@@ -426,12 +415,10 @@ T:Combat:Bearform-combat
T:Combat:Boulder-throwing
T:Combat:Antimagic
-T:Main:Sneakiness
-T:Sneakiness:Stealth
-T:Sneakiness:Disarming
-T:Sneakiness:Backstab
-T:Sneakiness:Stealing
-T:Sneakiness:Dodging
+T:Main:Stealth
+T:Stealth:Backstab
+T:Stealth:Stealing
+T:Stealth:Dodging
T:Main:Magic
T:Magic:Magic-Device
diff --git a/lib/edit/st_info.txt b/lib/edit/st_info.txt
index f2e6f281..b5ae29cf 100644
--- a/lib/edit/st_info.txt
+++ b/lib/edit/st_info.txt
@@ -165,7 +165,6 @@ I:100:Monster Confusion
I:100:Magic Mapping
I:100:Treasure Detection
I:100:Object Detection
-I:100:Trap Detection
I:100:Detect Invisible
I:100:Recharging
I:100:Satisfy Hunger
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 06:47:05 +0000