Remove traps

Credit goes mostly to "miramor" <danlev@norwoodlight.com> who did most
of the actual work. I just did a few minor tweaks and fixes + rebased
onto master.

1 files changed, 0 insertions, 33 deletions

diff --git a/lib/mods/theme/edit/r_info.txt b/lib/mods/theme/edit/r_info.txt
index 4d53dd1d..4c83746f 100644
--- a/lib/mods/theme/edit/r_info.txt
+++ b/lib/mods/theme/edit/r_info.txt
@@ -2513,7 +2513,6 @@ S:ROCKET
 S:SCARE
 S:TELE_AWAY
 S:TPORT
-S:TRAPS
 D:This annoying little gnome won't stop bragging about his great 
 D:magical powers and shiny new equipment--unless someone silences 
 D:him permanently.  Unfortunately, your own weapons and spells  
@@ -3289,7 +3288,6 @@ S:BA_POIS
 S:BO_COLD
 S:HEAL
 S:SLOW
-S:TRAPS
 D:He was once the chief counsellor to King Theoden of Rohan. 
 D:He betrayed king and country by becoming a spy for the 
 D:corrupted Istari Saruman. 
@@ -3327,7 +3325,6 @@ F:WILD_WOOD
 S:1_IN_5
 S:ARROW_2
 S:HEAL
-S:TRAPS
 D:The legendary archer who steals from the rich (you qualify). 
 
 # New monster added by furiosity for the Theme module
@@ -6698,7 +6695,6 @@ F:WILD_TOO
 S:1_IN_3
 S:CONF
 S:SCARE
-S:TRAPS
 D:The fourth son of Feanor, who turned on his own kind because of the 
 D:Oath of his father. He searches forever for the Silmarils of Feanor.
 
@@ -6755,7 +6751,6 @@ S:BLINK
 S:TELE_AWAY
 S:TELE_TO
 S:TPORT
-S:TRAPS
 D:The fifth son of Feanor, closely associated with his elder 
 D:brother Celegorm. Bound by the Oath of Feanor, he searches 
 D:forever for the Silmarils.
@@ -8911,7 +8906,6 @@ S:S_KIN
 S:S_MONSTERS
 S:TELE_AWAY
 S:TPORT
-S:TRAPS
 D:He is dressed in blue from head to toe. He is one of the five Istari 
 D:who came to the northwest of Middle-earth in the Third Age; he 
 D:journeyed into the east with Pallando, and never returned to the western 
@@ -9122,7 +9116,6 @@ S:S_HI_DRAGON
 S:S_HI_UNDEAD
 S:TELE_AWAY
 S:TPORT
-S:TRAPS
 D:He is dressed in blue from head to toe. He is one of the five Istari 
 D:who came to the northwest of Middle-earth in the Third Age; he 
 D:journeyed into the east with Alatar, and never returned to the western 
@@ -9950,7 +9943,6 @@ S:S_MONSTER
 S:S_UNDEAD
 S:TELE_AWAY
 S:TELE_TO
-S:TRAPS
 D:Nobody has ever seen It. 
 
 N:394:Banshee
@@ -10868,7 +10860,6 @@ S:S_KIN
 S:TELE_AWAY
 S:TELE_TO
 S:TPORT
-S:TRAPS
 D:The proud former 'king' of Gondor, he has been driven mad 
 D:by his contact with Sauron through the Palantir. You see 
 D:the glint of a terrible fire in his eyes. 
@@ -10992,7 +10983,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 
@@ -12261,7 +12251,6 @@ S:BA_POIS
 S:BO_COLD
 S:HEAL
 S:SLOW
-S:TRAPS
 D:He's a trustworthy man... or is he? Morgoth seem's sending spies in 
 D:disguise, and perhaps this is one of them.
 
@@ -12555,7 +12544,6 @@ S:HEAL
 S:SCARE
 S:S_ANIMAL
 S:TPORT
-S:TRAPS
 D:Sometimes belittled as a bird-loving fool, Radagast is weaker 
 D:mentally and magically than his fellows among the Istari.  
 D:Nonetheless, his knowledge of woodcraft and command over the 
@@ -12699,7 +12687,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.  She normally guards the pass through Cirith Ungol, but 
 D:occasionally goes out foraging for food to feed her voracious appetite. 
@@ -13960,7 +13947,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
@@ -15819,7 +15805,6 @@ S:CAUSE_2
 S:MIND_BLAST
 S:SLOW
 S:S_UNDEAD
-S:TRAPS
 # Spells chez thaumaturgy and having killed Morgy:
 S:BR_DISI
 S:BR_MANA
@@ -16751,7 +16736,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. 
 
@@ -17986,7 +17970,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 spellcasting. 
 
@@ -19881,7 +19864,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. 
 
@@ -21310,7 +21292,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 spellcasting. You stagger at the mighty sound of his 
 D:spells as they echo hollowly through the dungeon. 
@@ -21746,7 +21727,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. 
 
@@ -22500,7 +22480,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. 
@@ -22533,7 +22512,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. 
 
@@ -23793,7 +23771,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 
 D:risen from the dead to continue his foul plots and schemes. 
 
@@ -24394,7 +24371,6 @@ S:HOLD
 S:S_HI_DEMON
 S:S_HI_UNDEAD
 S:TELE_TO
-S:TRAPS
 D:The Mouth of Sauron is a mighty spellcaster. So old that even he cannot 
 D:remember his own name, his power and evil are undeniable. He believes 
 D:unshakably that he is unbeatable and laughs as he weaves his awesome 
@@ -24449,7 +24425,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 
@@ -25895,7 +25870,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 
@@ -27836,7 +27810,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. 
@@ -29371,7 +29344,6 @@ S:SLOW
 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 totaly evil. She loves nothing but herself and her evilness is as 
 D:great as her beauty. No one can stand against her, even DarkGod. 
@@ -29957,7 +29929,6 @@ S:SCARE
 S:SHRIEK
 S:SLOW
 S:S_KIN
-S:TRAPS
 D:A twisted elemental spirit, this creature serves the Dark with 
 D:perversions of the magics of nature. 
 
@@ -30316,7 +30287,6 @@ F:TAKE_ITEM
 S:1_IN_6
 S:ARROW_2
 S:BLINK
-S:TRAPS
 D:A little gnome, fast and stealthy. He is eyeing your backpack.
 
 N:1012:Vermicious Knid
@@ -31251,7 +31221,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. 
 
@@ -31707,7 +31676,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
@@ -31959,7 +31927,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.