393 files changed, 48805 insertions, 117334 deletions

diff --git a/lib/.gitignore b/lib/.gitignore
new file mode 100644
index 00000000..2de989fd
--- /dev/null
+++ b/lib/.gitignore
@@ -0,0 +1,2 @@
+*.raw
+
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 44d7d1ee..15591830 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -1,25 +1,19 @@
-INSTALL(FILES
-  module.lua
-  DESTINATION ${DEFAULT_PATH}
-)
 INSTALL(DIRECTORY 
   apex
   cmov
-  core
   data
   dngn
   edit
   file
   help
   info
-  mods
   note
   pref
   save
-  scpt
   user
   xtra
   DESTINATION ${DEFAULT_PATH}
-  PATTERN "*.raw" EXCLUDE
   PATTERN "delete.me" EXCLUDE
   )
+
+ADD_SUBDIRECTORY (mods)
diff --git a/lib/apex/.cvsignore b/lib/apex/.cvsignore
deleted file mode 100644
index dfa43964..00000000
--- a/lib/apex/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-scores.raw
diff --git a/lib/core/auto.lua b/lib/core/auto.lua
deleted file mode 100644
index b758db52..00000000
--- a/lib/core/auto.lua
+++ /dev/null
@@ -1,859 +0,0 @@
--- This file is the core of the Automatizer
--- Please do not touch unless you know what you are doing
-
-__rules = {}
-__rules_max = 0
-
-rule_aux = {}
-
--- Rule apply function, does .. nothing
-function auto_nothing(obj, item)
-	return
-end
-
-function auto_inscribe(obj, item, note)
-	if obj.note ~= 0 then return end
-	msg_print("<Auto-Inscribe {"..note.."}>")
-	obj.note = quark_add(note)
-	return TRUE
-end
-
--- Rule apply function, pickup object
-function auto_pickup(obj, item)
-	if item >= 0 then return end
-	if inven_carry_okay(obj) == FALSE then return end
-	msg_print("<Auto-pickup>")
-	object_pickup(-item)
-	return TRUE
-end
-
--- Rule apply function, destroy item
-function auto_destroy(obj, item)
-	-- be carefull to what we can destroy
-	-- Unaware things won't be destroyed.
-	if is_aware(obj) == FALSE then return end
-
-	-- Inscribed things won't be destroyed!
-	if obj.note ~= 0 then return end
-
-	-- Keep Artifacts -- they cannot be destroyed anyway
-	if is_artifact(obj) == TRUE then return end
-
-	-- Cannot destroy CURSE_NO_DROP objects
-	local f1, f2, f3, f4, f5, esp = object_flags(obj);
-	if band(f4, TR4_CURSE_NO_DROP) ~= 0 and band(obj.ident, IDENT_CURSED) then return end
-
-	msg_print("<Auto-destroy>")
-
-	-- Eliminate the item (from the pack)
-	if item >= 0 then
-		inven_item_increase(item, -obj.number)
-		inven_item_describe(item)
-		inven_item_optimize(item)
-	-- Eliminate the item (from the floor)
-	else
-		floor_item_increase(0 - item, -obj.number)
-		floor_item_describe(0 - item)
-		floor_item_optimize(0 - item)
-	end
-	return TRUE
-end
-
--- Report the status of an object
-function object_status(obj)
-	local sense =
-	{
-		[SENSE_CURSED] = "bad",
-		[SENSE_WORTHLESS] = "very bad",
-		[SENSE_AVERAGE] = "average",
-		[SENSE_GOOD_LIGHT] = "good",
-		[SENSE_GOOD_HEAVY] = "good",
-		[SENSE_EXCELLENT] = "very good",
-		[SENSE_SPECIAL] = "special",
-		[SENSE_TERRIBLE] = "terrible",
-	}
-
-	if is_known(obj) == FALSE then
-		if sense[obj.sense] then
-			return sense[obj.sense]
-		else
-			return ""
-		end
-	else
-if nil then -- test
-		local osense = -1
-		local type = select_sense(obj, TRUE, TRUE)
-		if type == 1 then
-			osense = value_check_aux1(obj)
-		elseif type == 2 then
-			osense = value_check_aux1_magic(obj)
-		end
-print("type : "..type)
-		if sense[osense] then
-		print("sense: "..sense[osense])
-			return sense[osense]
-		else
-		print("sense: ")
-			return ""
-		end
-
-else -- the real one
-
-		local slot = wield_slot_ideal(obj, TRUE)
-
-		-- Arts items
-		if is_artifact(obj) == TRUE then
-			if band(obj.ident, IDENT_CURSED) == 0 then return "special"
-			else return "terrible" end
-		-- Ego items
-		elseif (obj.name2 > 0 or obj.name2b > 0) then
-			if band(obj.ident, IDENT_CURSED) == 0 then return "very good"
-			else return "very bad" end
-		-- weapon
-		elseif (slot == INVEN_WIELD) or (slot == INVEN_BOW) or (slot == INVEN_AMMO) or (slot == INVEN_TOOL) then
-		    if obj.to_h + obj.to_d < 0 then
-			 return "bad"
-		    elseif obj.to_h + obj.to_d > 0 then
-			 return "good"
-		    else
-			 return "average"
-		    end
-		-- armor
-		elseif (slot >= INVEN_BODY) and (slot <= INVEN_FEET) then
-		    if obj.to_a < 0 then
-			 return "bad"
-		    elseif obj.to_a > 0 then
-			 return "good"
-		    else
-			 return "average"
-		    end
-		-- ring
-		elseif slot == INVEN_RING then
-		    if (obj.to_d + obj.to_h < 0) or (obj.to_a < 0) or (obj.pval < 0) then
-			 return "bad"
-		    else
-			 return "average"
-		    end
-		-- amulet
-		elseif slot == INVEN_NECK then
-		    if (obj.pval < 0) then
-			 return "bad"
-		    else
-			 return "average"
-		    end
-		-- chests
-			 elseif obj.tval == TV_CHEST then
-			 	if obj.pval == 0 then
-					return "empty"
-				elseif obj.pval < 0 then
-					return "disarmed"
-				else
-					return "average"
-				end
-		else
-		    return "average"
-		end
-end
-	end
-end
-
--- Recursive function to generate a rule function tree
-function gen_rule_fct(r)
-	-- It is a test rule (or, and, ...)
-	if r.label == "and" or r.label == "or" then
-		local i
-		local fct_tbl = {}
-		for i = 1, getn(r) do
-			if r[i].label ~= "comment" then
-				tinsert(fct_tbl, gen_rule_fct(r[i]))
-			end
-		end
-		if r.label == "and" then
-			return function(object)
-				local fcts = %fct_tbl
-				local i
-				for i = 1, getn(fcts) do
-					if not fcts[i](object) then return end
-				end
-				return TRUE
-			end
-		elseif r.label == "or" then
-			return function(object)
-				local fcts = %fct_tbl
-				local i
-				for i = 1, getn(fcts) do
-					if fcts[i](object) then return TRUE end
-				end
-			end
-		end
-	-- It is a condition rule (name, type, level, ...)
-	else
-		if r.label == "not" then
-			local f
-			if not r[1] then
-				f = function (object) return TRUE end
-			else
-				f = gen_rule_fct(r[1])
-			end
-			return function(object) return not %f(object) end
-		elseif r.label == "inventory" then
-			local f
-			if not r[1] then
-				f = function(object) return end
-			else
-				f = gen_rule_fct(r[1])
-			end
-			return function(object)
-				local i = 0
-				while i < INVEN_WIELD do
-					if %f(player.inventory(i)) then
-						return TRUE
-					end
-					i = i + 1
-				end
-			end
-		elseif r.label == "equipment" then
-			local f
-			if not r[1] then
-				f = function(object) return end
-			else
-				f = gen_rule_fct(r[1])
-			end
-			return function(object)
-				local i = INVEN_WIELD
-				while i < INVEN_TOTAL do
-					if %f(player.inventory(i)) then
-						return TRUE
-					end
-					i = i + 1
-				end
-			end
-		elseif r.label == "name" then
-			return function(object) if strlower(object_desc(object, -1, 0)) == strlower(%r[1]) then return TRUE end end
-		elseif r.label == "contain" then
-			return function(object) if strfind(strlower(object_desc(object, -1, 0)), strlower(%r[1])) then return TRUE end end
-		elseif r.label == "symbol" then
-			return function(object) if strchar(get_kind(object).d_char) == %r[1] then return TRUE end end
-		elseif r.label == "inscribed" then
-			return function(object) if object.note ~= 0 and strfind(strlower(quark_str(object.note)), strlower(%r[1])) then return TRUE end end
-		elseif r.label == "discount" then
-			local d1 = r.args.min
-			local d2 = r.args.max
-			if tonumber(d1) == nil then d1 = getglobal(d1) else d1 = tonumber(d1) end
-			if tonumber(d2) == nil then d2 = getglobal(d2) else d2 = tonumber(d2) end
-			return function(object) if is_aware(object) == TRUE and object.discount >= %d1 and object.discount <= %d2 then return TRUE end end
-		elseif r.label == "tval" then
-			local tv = r[1]
-			if tonumber(tv) == nil then tv = getglobal(tv) else tv = tonumber(tv) end
-			return function(object) if object.tval == %tv then return TRUE end end
-		elseif r.label == "sval" then
-			assert(r.args.min and r.args.max, "sval rule lacks min or max")
-			local sv1 = r.args.min
-			local sv2 = r.args.max
-			if tonumber(sv1) == nil then sv1 = getglobal(sv1) else sv1 = tonumber(sv1) end
-			if tonumber(sv2) == nil then sv2 = getglobal(sv2) else sv2 = tonumber(sv2) end
-			return function(object) if is_aware(object) == TRUE and object.sval >= %sv1 and object.sval <= %sv2 then return TRUE end end
-		elseif r.label == "status" then
-			return function(object) if object_status(object) == strlower(%r[1]) then return TRUE end end
-		elseif r.label == "state" then
-			if r[1] == "identified" then
-				return function(object) if is_known(object) == TRUE then return TRUE end end
-			else
-				return function(object) if is_known(object) == FALSE then return TRUE end end
-			end
-		elseif r.label == "race" then
-			return function(object) if strlower(get_race_name()) == strlower(%r[1]) then return TRUE end end
-		elseif r.label == "subrace" then
-			return function(object) if strlower(get_subrace_name()) == strlower(%r[1]) then return TRUE end end
-		elseif r.label == "class" then
-			return function(object) if strlower(get_class_name()) == strlower(%r[1]) then return TRUE end end
-		elseif r.label == "level" then
-			assert(r.args.min and r.args.max, "level rule lacks min or max")
-			return function(object) if player.lev >= tonumber(%r.args.min) and player.lev <= tonumber(%r.args.max) then return TRUE end end
-		elseif r.label == "skill" then
-			assert(r.args.min and r.args.max, "skill rule lacks min or max")
-			local s = find_skill_i(r[1])
-			assert(s ~= -1, "no skill "..r[1])
-			return function(object) if get_skill(%s) >= tonumber(%r.args.min) and get_skill(%s) <= tonumber(%r.args.max) then return TRUE end end
-		elseif r.label == "ability" then
-			local s = find_ability(r[1])
-			assert(s ~= -1, "no ability "..r[1])
-			return function(object) if has_ability(%s) == TRUE then return TRUE end end
-		end
-	end
-end
-
-function auto_inscribe_maker(inscription)
-    return function(...)
-	arg.n = arg.n + 1
-	arg[getn(arg)] = %inscription
-	return call(auto_inscribe, arg)
-    end
-end
-
--- Generate a rule from a table
-function gen_full_rule(t)
-	-- only honor rules for this module
-	if not t.args.module then
-		t.args.module = "ToME"
-	end
-
-	if not ((t.args.module == "all") or (t.args.module == game_module)) then
-		return function() end
-	end
-
-	-- Check for which action to do
-	local apply_fct = auto_nothing
-	if t.args.type == "destroy" then apply_fct = auto_destroy
-	elseif t.args.type == "pickup" then apply_fct = auto_pickup
-	elseif t.args.type == "inscribe" then apply_fct = auto_inscribe_maker(t.args.inscription)
-	end
-
-	-- create the function tree
-	local rf
-	if t[1] then
-		rf = gen_rule_fct(t[1])
-	else
-		rf = function (object) end
-	end
-
-	-- create the final function
-	return function(...)
-		local rf = %rf
-		if rf(arg[1]) then
-			if call(%apply_fct, arg) == TRUE then return TRUE end
-		end
-	end
-end
-
--- Create a function that checks for the rules(passed in xml form)
-function add_ruleset(s)
-	local tbl = xml:collect(s)
-	local i
-
-	-- Add all rules
-	for i = 1, getn(tbl) do
-		local t = tbl[i]
-
-		if t.label == "rule" then
-			-- Create the function tree
-			local fct = gen_full_rule(t)
-
-			-- Create the test function
-			__rules[__rules_max] =
-			{
-				["table"] =	t,
-				["fct"] =	fct
-			}
-			__rules_max = __rules_max + 1
-		end
-	end
-end
-
--- Apply the current rules to an object
--- call with at least (object, idx)
-function apply_rules(...)
-	local i
-	for i = 0, __rules_max - 1 do
-		if call(__rules[i].fct, arg) then return TRUE end
-	end
-	return FALSE
-end
-
--- Clear the current rules
-function clean_ruleset()
-	__rules_max = 0
-	__rules = {}
-end
-
------- helper fonctions for the GUI
-
-auto_aux = {}
-auto_aux.stack = { n = 0 }
-auto_aux.idx = 1
-auto_aux.rule = 1
-function auto_aux:go_right()
-	if auto_aux.rule[1] and type(auto_aux.rule[1]) == "table" then
-		tinsert(auto_aux.stack, auto_aux.idx)
-		tinsert(auto_aux.stack, auto_aux.rule)
-		auto_aux.rule = auto_aux.rule[1]
-		auto_aux.idx = 1
-	end
-end
-
-function auto_aux:go_left(sel)
-	local n = getn(auto_aux.stack)
-
-	if n > 0 then
-		auto_aux.idx = auto_aux.stack[n - 1]
-		auto_aux.rule = auto_aux.stack[n]
-		tremove(auto_aux.stack)
-		tremove(auto_aux.stack)
-	end
-end
-
-function auto_aux:go_down()
-	if getn(auto_aux.stack) > 1 then
-		if auto_aux.stack[getn(auto_aux.stack)][auto_aux.idx + 1] then
-			auto_aux.idx = auto_aux.idx + 1
-			auto_aux.rule = auto_aux.stack[getn(auto_aux.stack)][auto_aux.idx]
-		end
-	end
-end
-
-function auto_aux:go_up()
-	if getn(auto_aux.stack) > 1 then
-		if auto_aux.stack[getn(auto_aux.stack)][auto_aux.idx - 1] then
-			auto_aux.idx = auto_aux.idx - 1
-			auto_aux.rule = auto_aux.stack[getn(auto_aux.stack)][auto_aux.idx]
-		end
-	end
-end
-
-function auto_aux:scroll_up()
-	xml.write_off_y = xml.write_off_y - 1
-end
-
-function auto_aux:scroll_down()
-	xml.write_off_y = xml.write_off_y + 1
-end
-
-function auto_aux:scroll_left()
-	xml.write_off_x = xml.write_off_x + 1
-end
-
-function auto_aux:scroll_right()
-	xml.write_off_x = xml.write_off_x - 1
-end
-
-function auto_aux:adjust_current(sel)
-	if __rules_max == 0 then return end
-
-	xml.write_off_y = 0
-	xml.write_off_x = 0
-	auto_aux.idx = 1
-	auto_aux.stack = { n = 0 }
-	auto_aux.rule = __rules[sel].table
-end
-
-function auto_aux:move_up(sel)
-	if sel > 0 then
-		local u = __rules[sel - 1]
-		local d = __rules[sel]
-		__rules[sel - 1] = d
-		__rules[sel] = u
-		return sel - 1
-	end
-	return sel
-end
-
-function auto_aux:move_down(sel)
-	if sel < __rules_max - 1 then
-		local u = __rules[sel]
-		local d = __rules[sel + 1]
-		__rules[sel + 1] = u
-		__rules[sel] = d
-		return sel + 1
-	end
-	return sel
-end
-
-function auto_aux:new_rule(sel, nam, typ, arg)
-	local r
-
-
-	-- nam can also directly be the table itself
-	if type(nam) == "table" then
-		r =
-		{
-			["table"] = nam,
-			["fct"] = function (object) end
-		}
-	elseif typ == "inscribe" then
-		if arg == "" then
-		    arg = input_box("Inscription?", 79)
-		end
-		r =
-		{
-			["table"] =
-			{
-				label = "rule",
-				args = { name = nam, type = typ, inscription = arg, module = game_module },
-			},
-			["fct"] = function (object) end
-		}
-	else
-		r =
-		{
-			["table"] =
-			{
-				label = "rule",
-				args = { name = nam, type = typ, module = game_module },
-			},
-			["fct"] = function (object) end
-		}
-	end
-	tinsert(__rules, sel, r)
-	__rules_max = __rules_max + 1
-end
-
-function auto_aux:rename_rule(sel, nam)
-	if sel >= 0 and sel < __rules_max then
-		__rules[sel].table.args.name = nam
-	end
-end
-
-function auto_aux:save_ruleset()
-	xml.write = xml.write_file
-
-	print_hook("clean_ruleset()\nadd_ruleset\n[[\n")
-	local i
-	for i = 0, __rules_max - 1 do
-		xml:print_xml(__rules[i].table, '')
-	end
-	print_hook("]]\n")
-
-	xml.write = xml.write_screen
-end
-
-function auto_aux:del_self(sel)
-	if auto_aux.rule.label == "rule" then
-		tremove(__rules, sel)
-		__rules_max = __rules_max - 1
-		return sel - 1
-	else
-		local idx = auto_aux.idx
-		auto_aux:go_left(sel)
-		tremove(auto_aux.rule, idx)
-		return sel
-	end
-end
-
-auto_aux.types_desc =
-{
-	["and"] =
-	{
-		"Check is true if all rules within it are true",
-		xml:collect([[<and><foo1>...</foo1><foo2>...</foo2><foo3>...</foo3></and>]]),
-		function ()
-			return xml:collect("<and></and>")
-		end,
-	},
-	["or"] =
-	{
-		"Check is true if at least one rule within it is true",
-		xml:collect([[<or><foo1>...</foo1><foo2>...</foo2><foo3>...</foo3></or>]]),
-		function ()
-			return xml:collect("<or></or>")
-		end,
-	},
-	["not"] =
-	{
-		"Invert the result of its child rule",
-		xml:collect([[<not><foo1>...</foo1></not>]]),
-		function ()
-			return xml:collect("<not></not>")
-		end,
-	},
-	["comment"] =
-	{
-		"Comments are meaningless",
-		xml:collect([[<comment>Comment explaining something</comment>]]),
-		function ()
-			local n = input_box("Comment?", 79)
-			if n == "" then return end
-			return xml:collect("<comment>"..n.."</comment>")
-	       	end,
-	},
-	["name"] =
-	{
-		"Check is true if object name matches name",
-		xml:collect([[<name>potion of healing</name>]]),
-		function ()
-			local n = input_box("Object name to match?", 79)
-			if n == "" then return end
-			return xml:collect("<name>"..n.."</name>")
-	       	end,
-	},
-	["contain"] =
-	{
-		"Check is true if object name contains word",
-		xml:collect([[<contain>healing</contain>]]),
-		function ()
-			local n = input_box("Word to find in object name?", 79)
-			if n == "" then return end
-			return xml:collect("<contain>"..n.."</contain>")
-	       	end,
-	},
-	["inscribed"] =
-	{
-		"Check is true if object inscription contains word",
-		xml:collect([[<inscribed>=g</inscribed>]]),
-		function ()
-			local n = input_box("Word to find in object inscription?", 79)
-			if n == "" then return end
-			return xml:collect("<inscribed>"..n.."</inscribed>")
-	       	end,
-	},
-	["discount"] =
-	{
-		"Check is true if object discount is between 2 values",
-		xml:collect([[<sval min='50' max='100'></sval>]]),
-		function ()
-			local s = "<discount "
-
-			local n = input_box("Min discount?", 79)
-			if n == "" then return end
-			s = s.."min='"..n.."' "
-
-			n = input_box("Max discount?", 79)
-			if n == "" then return end
-			s = s.."max='"..n.."'></discount>"
-			return xml:collect(s)
-	       	end,
-	},
-	["symbol"] =
-	{
-		"Check is true if object symbol is ok",
-		xml:collect([[<symbol>!</symbol>]]),
-		function ()
-			local n = input_box("Symbol to match?", 1)
-			if n == "" then return end
-			return xml:collect("<symbol>"..n.."</symbol>")
-	       	end,
-	},
-	["status"] =
-	{
-		"Check is true if object status is ok",
-		xml:collect([[<status>good</status>]]),
-		function ()
-			local n = msg_box("[t]errible, [v]ery bad, [b]ad, [a]verage, [G]ood, [V]ery good, [S]pecial?")
-			local t =
-			{
-				["t"] = "terrible",
-				["v"] = "very bad",
-				["b"] = "bad",
-				["a"] = "average",
-				["G"] = "good",
-				["V"] = "very good",
-				["S"] = "special",
-			}
-			if not t[strchar(n)] then return end
-			return xml:collect("<status>"..t[strchar(n)].."</status>")
-	       	end,
-	},
-	["state"] =
-	{
-		"Check is true if object is identified/unidentified",
-		xml:collect([[<state>identified</state>]]),
-		function ()
-			local n = msg_box("[i]dentified, [n]on identified?")
-			local t =
-			{
-				["i"] = "identified",
-				["n"] = "not identified",
-			}
-			if not t[strchar(n)] then return end
-			return xml:collect("<state>"..t[strchar(n)].."</state>")
-	       	end,
-	},
-	["tval"] =
-	{
-		"Check is true if object tval(from k_info.txt) is ok",
-		xml:collect([[<tval>55</tval>]]),
-		function ()
-			local n = input_box("Tval to match?", 79)
-			if n == "" then return end
-			return xml:collect("<tval>"..n.."</tval>")
-	       	end,
-	},
-	["sval"] =
-	{
-		{
-			"Check is true if object sval(from k_info.txt) is between",
-			"2 values",
-		},
-		xml:collect([[<sval min='0' max='100'></sval>]]),
-		function ()
-			local s = "<sval "
-
-			local n = input_box("Min sval?", 79)
-			if n == "" then return end
-			s = s.."min='"..n.."' "
-
-			n = input_box("Max sval?", 79)
-			if n == "" then return end
-			s = s.."max='"..n.."'></sval>"
-			return xml:collect(s)
-	       	end,
-	},
-	["race"] =
-	{
-		"Check is true if player race is ok",
-		xml:collect([[<race>dunadan</race>]]),
-		function ()
-			local n = input_box("Player race to match?", 79)
-			if n == "" then return end
-			return xml:collect("<race>"..n.."</race>")
-	       	end,
-	},
-	["subrace"] =
-	{
-		"Check is true if player subrace is ok",
-		xml:collect([[<subrace>vampire</subrace>]]),
-		function ()
-			local n = input_box("Player subrace to match?", 79)
-			if n == "" then return end
-			return xml:collect("<subrace>"..n.."</subrace>")
-	       	end,
-	},
-	["class"] =
-	{
-		"Check is true if player class is ok",
-		xml:collect([[<class>sorceror</class>]]),
-		function ()
-			local n = input_box("Player class to match?", 79)
-			if n == "" then return end
-			return xml:collect("<class>"..n.."</class>")
-	       	end,
-	},
-	["level"] =
-	{
-		"Check is true if player level is between 2 values",
-		xml:collect([[<level min='20' max='50'></level>]]),
-		function ()
-			local s = "<level "
-
-			local n = input_box("Min player level?", 79)
-			if n == "" then return end
-			s = s.."min='"..n.."' "
-
-			n = input_box("Max player level?", 79)
-			if n == "" then return end
-			s = s.."max='"..n.."'></level>"
-
-			return xml:collect(s)
-	       	end,
-	},
-	["skill"] =
-	{
-		"Check is true if player skill level is between 2 values",
-		xml:collect([[<skill min='10' max='20'>Divination</skill>]]),
-		function ()
-			local s = "<skill "
-
-			local n = input_box("Min skill level?", 79)
-			if n == "" then return end
-			s = s.."min='"..n.."' "
-
-			n = input_box("Max skill level?", 79)
-			if n == "" then return end
-			s = s.."max='"..n.."'>"
-
-			n = input_box("Skill name?", 79)
-			if n == "" then return end
-			if find_skill_i(n) == -1 then return end
-			s = s..n.."</skill>"
-
-			return xml:collect(s)
-	       	end,
-	},
-	["ability"] =
-	{
-		"Check is true if player has the ability",
-		xml:collect([[<ability>Ammo creation</ability>]]),
-		function()
-			local n = input_box("Ability name?", 79)
-			if n == "" then return end
-			if find_ability(n) == -1 then return end
-			return xml:collect("<ability>"..n.."</ability>")
-		end,
-	},
-	["inventory"] =
-	{
-		{
-			"Check is true if something in player's inventory matches",
-			"the contained rule",
-		},
-		xml:collect([[<inventory><foo1>...</foo1></inventory>]]),
-		function ()
-			return xml:collect("<inventory></inventory>")
-		end,
-	},
-	["equipment"] =
-	{
-		{
-			"Check is true if something in player's equipment matches",
-			"the contained rule",
-		},
-		xml:collect([[<equipment><foo1>...</foo1></equipment>]]),
-		function ()
-			return xml:collect("<equipment></equipment>")
-		end,
-	},
-}
-
-function auto_aux:display_desc(sel)
-	local d = auto_aux.types_desc[sel][1]
-	if type(d) == "string" then
-		c_prt(TERM_WHITE, d, 1, 17)
-	else
-		local k, e, i
-		i = 0
-		for k, e in d do
-			c_prt(TERM_WHITE, e, 1 + i, 17)
-			i = i + 1
-		end
-	end
-end
-
-function auto_aux:add_child(sel)
-	-- <rule> and <not> contain only one match
-	if (auto_aux.rule.label == "rule" or auto_aux.rule.label == "not") and auto_aux.rule[1] then return end
-	if (auto_aux.rule.label == "rule" or auto_aux.rule.label == "equipment") and auto_aux.rule[1] then return end
-	if (auto_aux.rule.label == "rule" or auto_aux.rule.label == "inventory") and auto_aux.rule[1] then return end
-
-	-- Only <and> and <or> can contain
-	if auto_aux.rule.label ~= "rule" and auto_aux.rule.label ~= "and" and auto_aux.rule.label ~= "or"  and auto_aux.rule.label ~= "not" and  auto_aux.rule.label ~= "equipment" and auto_aux.rule.label ~= "inventory" then return end
-
-	-- get it
-	local r = auto_aux.types_desc[sel][3]()
-	if not r then return end
-
-	-- Ok add it
-	tinsert(auto_aux.rule, r[1])
-end
-
-function auto_aux.regen_ruleset()
-	local i
-	for i = 0, __rules_max - 1 do
-		__rules[i].fct = gen_full_rule(__rules[i].table)
-	end
-end
-
-
--- Easily add new rules
-function easy_add_rule(typ, mode, do_status, obj)
-	local detect_rule
-
-	if mode == "tval" then
-		detect_rule = "<tval>"..obj.tval.."</tval>"
-	elseif mode == "tsval" then
-		detect_rule = "<and><tval>"..obj.tval.."</tval><sval min='"..obj.sval.."' max='"..obj.sval.."'></sval></and>"
-	elseif mode == "name" then
-		detect_rule = "<name>"..strlower(object_desc(obj, -1, 0)).."</name>"
-	end
-
-	if do_status == TRUE then
-		local status = object_status(obj)
-		if status and not (status == "") then
-			detect_rule = "<and>"..detect_rule.."<status>"..status.."</status></and>"
-		end
-	end
-
-	local rule = "<rule module='"..game_module.."' name='"..typ.."' type='"..typ.."'>"..detect_rule.."</rule>"
-	auto_aux:new_rule(0, xml:collect(rule)[1], '')
-	auto_aux.regen_ruleset()
-	msg_print("Rule added. Please go to the Automatizer screen (press = then T)")
-	msg_print("to save the modified ruleset.")
-end
diff --git a/lib/core/building.lua b/lib/core/building.lua
deleted file mode 100644
index 8e88888a..00000000
--- a/lib/core/building.lua
+++ /dev/null
@@ -1,15 +0,0 @@
-__building_actions = {}
-
-function add_building_action(a)
-	assert(a.index, "No building action index")
-	assert(a.action, "No building action action")
-	__building_actions[a.index] = a.action
-end
-
-function __bact_activate(bact)
-	if __building_actions[bact] then
-		return __building_actions[bact]()
-	end
-end
-
-add_hook_script(HOOK_BUILDING_ACTION, "__bact_activate", "__bact_activate")
diff --git a/lib/core/crpt_aux.lua b/lib/core/crpt_aux.lua
deleted file mode 100644
index 97f8d4b6..00000000
--- a/lib/core/crpt_aux.lua
+++ /dev/null
@@ -1,182 +0,0 @@
--- Core functions for corruptions
-
-__corruptions = {}
-__corruptions_max = 0
-__corruptions_callbacks_max = 0
-
--- Get the corruption
-function player.corruption(c, set)
-	if set then
-		player.corruptions_aux[c + 1] = set
-		player.redraw = bor(player.redraw, PR_BASIC)
-		player.update = bor(player.update, PU_BONUS, PU_TORCH, PU_BODY, PU_POWERS)
-		if (set == TRUE) and (__corruptions[c].gain) then
-			__corruptions[c].gain()
-		end
-		if (set == FALSE) and (__corruptions[c].lose) then
-			__corruptions[c].lose()
-		end
-	else
-		return player.corruptions_aux[c + 1]
-	end
-end
-
--- Test if we have that corruption
--- We must:
--- 1) have it or be willing to get it
--- 2) have all its dependancies
--- 3) have none of its opposing corruptions
--- 4) pass the possible tests
-function test_depend_corrupt(corrupt, can_gain)
-	local i, c
-
-	if not can_gain then can_gain = FALSE end
-
-	if can_gain == TRUE then
-		if (player.corruption(corrupt) ~= FALSE) then
-			return FALSE
-		end
-	else
-		if (player.corruption(corrupt) ~= TRUE) then
-			return FALSE
-		end
-	end
-
-	for c, i in __corruptions[corrupt].depends do
-		if test_depend_corrupt(c) ~= TRUE then
-			return FALSE
-		end
-	end
-
-	for c, i in __corruptions[corrupt].oppose do
-		if test_depend_corrupt(c) ~= FALSE then
-			return FALSE
-		end
-	end
-
-	-- are we even allowed to get it?
-	if __corruptions[corrupt].can_gain and (not __corruptions[corrupt].can_gain()) then
-		return FALSE
-	end
-
-	return TRUE
-end
-
--- Gain a new corruption
-function gain_corruption(group)
-	local i, max
-	local pos = {}
-
-	-- Get the list of all possible ones
-	max = 0
-	for i = 0, __corruptions_max - 1 do
-		if __corruptions[i].group == group and test_depend_corrupt(i, TRUE) == TRUE and __corruptions[i].random == TRUE and __corruptions[i].allow() then
-			pos[max] = i
-			max = max + 1
-		end
-	end
-
-	-- Ok now get one of them
-	if (max > 0) then
-		local ret = rand_int(max)
-
-		player.corruption(pos[ret], TRUE)
-		cmsg_print(TERM_L_RED, __corruptions[pos[ret]].get_text)
-
-		return pos[ret]
-	else
-		return -1
-	end
-end
-
--- Lose an existing corruption
-function lose_corruption()
-	local i, max
-	local pos = {}
-
-	-- Get the list of all possible ones
-	max = 0
-	for i = 0, __corruptions_max - 1 do
-		if test_depend_corrupt(i) == TRUE and __corruptions[i].removable == TRUE then
-			pos[max] = i
-			max = max + 1
-		end
-	end
-
-	-- Ok now get one of them
-	if (max > 0) then
-		local ret = rand_int(max)
-
-		player.corruption(pos[ret], FALSE)
-		cmsg_print(TERM_L_RED, __corruptions[pos[ret]].lose_text)
-
-		-- Ok now lets see if it broke some dependancies
-		for i = 0, max - 1 do
-			if player.corruption(pos[i]) ~= test_depend_corrupt(pos[i]) then
-				player.corruption(pos[i], FALSE)
-				cmsg_print(TERM_L_RED, __corruptions[pos[i]].lose_text)
-			end
-		end
-
-		return pos[ret]
-	else
-		return -1
-	end
-end
-
--- Lose all corruptions (for e.g. Potion of New Life)
-function lose_all_corruptions()
-	local i;
-	for i = 0, __corruptions_max - 1 do
-		lose_corruption()
-	end
-	return -1
-end
-
--- Creates a new corruption
-function add_corruption(c)
-	assert(c.color, "No corruption color")
-	assert(c.name, "No corruption name")
-	assert(c.get_text, "No corruption get_text")
-	assert(c.lose_text, "No corruption lose_text")
-	assert(c.desc, "No corruption desc")
-	assert(c.hooks, "Nothing to do for corruption")
-	if not c.random then c.random = TRUE end
-	if not c.removable then c.removable = TRUE end
-	if not c.allow then c.allow = function() return not nil end end
-
-	if c.depends == nil then c.depends = {} end
-	if c.oppose == nil then c.oppose = {} end
-
-	-- We must make sure the other ones opposes too
-	local o, i
-	for o, i in c.oppose do
-		__corruptions[o].oppose[__corruptions_max] = TRUE
-	end
-
-	local index, h
-	for index, h in c.hooks do
-		add_hook_script(index, "__lua__corrupt_callback"..__corruptions_callbacks_max, "__lua__corrupt_callback"..__corruptions_callbacks_max)
-		setglobal("__lua__corrupt_callback"..__corruptions_callbacks_max,
-			function (...)
-				if test_depend_corrupt(%__corruptions_max) == TRUE then
-					return call(%h, arg)
-				end
-			end
-		)
-		__corruptions_callbacks_max = __corruptions_callbacks_max + 1
-	end
-
-	if type(c.desc) == "table" then
-		local new_desc = ""
-		for index, h in c.desc do
-			new_desc = new_desc..h.."\n"
-		end
-		c.desc = new_desc
-	end
-
-	__corruptions[__corruptions_max] = c
-	__corruptions_max = __corruptions_max + 1
-	return (__corruptions_max - 1)
-end
-
diff --git a/lib/core/dungeon.lua b/lib/core/dungeon.lua
deleted file mode 100644
index d91d785b..00000000
--- a/lib/core/dungeon.lua
+++ /dev/null
@@ -1,55 +0,0 @@
--- Internal lua file in charge of dungeon stuff
-
-function place_dungeon(y, x, d_idx)
-	if d_idx then
-		wild_map(y, x).entrance = 1000 + d_idx
-       	else
-		wild_map(y, x).entrance = 0
-	end
-end
-
-function dungeon(d_idx)
-	return d_info[1 + d_idx]
-end
-
-function wild_feat(wild)
-	return wf_info[1 + wild.feat]
-end
-
-function explode_dir(dir)
-	return ddy[dir + 1], ddx[dir + 1]
-end
-
-function rotate_dir(dir, mov)
-	if mov > 0 then
-		if dir == 7 then dir = 8
-		elseif dir == 8 then dir = 9
-		elseif dir == 9 then dir = 6
-		elseif dir == 6 then dir = 3
-		elseif dir == 3 then dir = 2
-		elseif dir == 2 then dir = 1
-		elseif dir == 1 then dir = 4
-		elseif dir == 4 then dir = 7
-		end
-	elseif mov < 0 then
-		if dir == 7 then dir = 4
-		elseif dir == 4 then dir = 1
-		elseif dir == 1 then dir = 2
-		elseif dir == 2 then dir = 3
-		elseif dir == 3 then dir = 6
-		elseif dir == 6 then dir = 9
-		elseif dir == 9 then dir = 8
-		elseif dir == 8 then dir = 7
-		end
-	end
-
-	return dir
-end
-
--- Place a trap for a specific level
-function place_trap(y, x, level)
-	local old_dun = dun_level
-	dun_level = level
-	%place_trap(y, x)
-	dun_level = old_dun
-end
diff --git a/lib/core/gen_idx.lua b/lib/core/gen_idx.lua
deleted file mode 100644
index 5f3af435..00000000
--- a/lib/core/gen_idx.lua
+++ /dev/null
@@ -1,261 +0,0 @@
--- Place here the list of files to parse
-files =
-{
-	"birth.txt",
-	"experien.hlp",
-	"gods.txt",
-	"explore.hlp",
-	"newbie.hlp",
-	"advanced.hlp",
-	"help.hlp",
-	"general.txt",
-	"whattome.txt",
-	"dungeon.txt",
-	"spoiler.hlp",
-	"g_melkor.txt",
-	"skills.txt",
-	"c_bard.txt",
-	"c_druid.txt",
-	"c_lorema.txt",
-	"c_mage.txt",
-	"c_mimic.txt",
-	"c_mindcr.txt",
-	"c_monk.txt",
-	"c_palad.txt",
-	"c_posses.txt",
-	"c_pr_drk.txt",
-	"c_pr_eru.txt",
-	"c_pr_man.txt",
-	"c_symbia.txt",
-	"c_alchem.txt",
-	"c_archer.txt",
-	"c_assass.txt",
-	"c_axemas.txt",
-	"c_demono.txt",
-	"c_geoman.txt",
-	"c_hafted.txt",
-	"c_necro.txt",
-	"c_polear.txt",
-	"c_ranger.txt",
-	"c_rogue.txt",
-	"c_runecr.txt",
-	"c_sorcer.txt",
-	"c_swordm.txt",
-	"c_thaum.txt",
-	"c_unbel.txt",
-	"c_warper.txt",
-	"c_warrio.txt",
-	"m_meta.txt",
-	"rm_skel.txt",
-	"rm_zomb.txt",
-	"luckspoi.txt",
-	"m_air.txt",
-	"dunspoil.txt",
-	"g_eru.txt",
-	"g_manwe.txt",
-	"g_tulkas.txt",
-	"m_divin.txt",
-	"m_mimic.txt",
-	"m_water.txt",
-	"magic.txt",
-	"r_drkelf.txt",
-	"r_dwarf.txt",
-	"r_elf.txt",
-	"r_hielf.txt",
-	"r_hobbit.txt",
-	"r_pettyd.txt",
-	"r_wodelf.txt",
-	"rm_spec.txt",
-	"tome_faq.txt",
-	"ability.txt",
-	"automat.txt",
-	"c_summon.txt",
-	"command.txt",
-	"corspoil.txt",
-	"debug.txt",
-	"m_music.txt",
-	"rm_barb.txt",
-	"macrofaq.txt",
-	"m_necrom.txt",
-	"m_mindcr.txt",
-	"m_symbio.txt",
-	"m_thaum.txt",
-	"magic.hlp",
-	"m_convey.txt",
-	"m_fire.txt",
-	"m_mana.txt",
-	"m_mind.txt",
-	"m_nature.txt",
-	"m_tempo.txt",
-	"m_udun.txt",
-	"m_geoman.txt",
-	"essences.txt",
-	"r_ent.txt",
-	"g_yavann.txt",
-	"defines.txt",
-	"rm_vamp.txt",
-	"inscrip.txt",
-	"m_earth.txt",
-	"option.txt",
-	"attack.txt",
-	"version.txt",
-	"m_demono.txt",
-	"r_beorn.txt",
-	"r_deathm.txt",
-	"r_rohank.txt",
-	"r_hafogr.txt",
-	"r_human.txt",
-	"r_kobold.txt",
-	"r_maia.txt",
-	"r_orc.txt",
-	"r_thlord.txt",
-	"r_troll.txt",
-	"r_yeek.txt",
-	"rm_class.txt",
-	"rm_herm.txt",
-	"rm_lsoul.txt",
-	"wishing.txt",
-	"c_priest.txt",
-	"fatespoi.txt",
-	"gambling.txt",
-	"r_dunad.txt",
-	"r_gnome.txt",
-	"r_hafelf.txt",
-	"c_merch.txt",	
-        "spoil_faq.txt",
-}
-
-out_file = "index.txt"
-
-index = {}
-
-function parse_file(file)
-	local fff = openfile(path_build(ANGBAND_DIR_HELP, file), "r")
-	local line
-
-	line = read(fff, "*l")
-	while line do
-		local i, j, anchor, name, subname = strfind(line, "~~~~~(%d+)|([%d%a -]+)|([%d%a -]+)")
-		if not i then
-			i, j, anchor, name = strfind(line, "~~~~~(%d+)|([%d%a -]+)")
-
-			subname = nil
-		end
-
-		if i then
-			if not index[name] then
-				index[name] = {}
-			end
-			if subname then
-				tinsert(index[name], { __name__ = subname, __file__ = file, __anchor__ = anchor})
-			else
-				tinsert(index[name], { __name__ = "__primary__", __file__ = file, __anchor__ = anchor})
-			end
-		end
-
-		line = read(fff, "*l")
-	end
-
-	closefile(fff)
-end
-
-function sort_fct(a, b)
-	local i, len
-
-	a = a.__name__
-	b = b.__name__
-
-	if strlen(a) > strlen(b) then len = strlen(b) else len = strlen(a) end
-
-	for i = 1, len do
-		local ac = strbyte(a, i)
-		local bc = strbyte(b, i)
-
-		if ac < bc then
-			return not nil
-		elseif ac > bc then
-			return nil
-		end
-	end
-	if strlen(a) > strlen(b) then return nil else return not nil end
-end
-
-function generate_index()
-	local k, e, index_list
-	for _, e in files do
-		parse_file(e)
-	end
-
-	index_list = {}
-	for k, e in index do
-		-- Ok either my sort function or lua sort function sucks ass ..
-		sort(e, sort_fct)
-		sort(e, sort_fct)
-		sort(e, sort_fct)
-		sort(e, sort_fct)
-		sort(e, sort_fct)
-		tinsert(index_list, {__name__= k, __table__ = e})
-	end
-
-	-- Ok either my sort function or lua sort function sucks ass ..
-	sort(index_list, sort_fct)
-	sort(index_list, sort_fct)
-	sort(index_list, sort_fct)
-	sort(index_list, sort_fct)
-	sort(index_list, sort_fct)
-	index = index_list
-end
-
-function out_link(fff, space, name, file, anchor)
-	write(fff, space.."*****"..file.."*"..anchor.."["..name.."]\n")
-end
-
-function print_index()
-	local i, j, c, new_c
-	local fff = openfile(path_build(ANGBAND_DIR_HELP, out_file), "w")
-
-	write(fff,
-[[|||||oy
-#####R	     /----------------------------------------\
-#####R	    <                Help Index                >
-#####R	     \----------------------------------------/
-
-This is the index of everything in the T.o.M.E. documentation.
-
-#####BHit a letter key to jump to the entries for that letter.
-
-Some entries in the index link to the same place as other entries. This is 
-intentional, so that the information you want is easy to find.
-
-Don't forget you can browse the help from the *****help.hlp*02[Main menu].
-
-#####sSpotted a problem with the help files, or some content thats missing? 
-#####sContact fearoffours@t-o-m-e.net .
-
-]])
-
-	c = ' '
-	for i = 1, getn(index) do
-		new_c = strbyte(index[i].__name__, 1)
-		if c ~= new_c then
-			c = new_c
-			write(fff, "~~~~~"..c.."\n")
-			write(fff, "*****/"..strchar(c)..out_file.."*"..c.."["..strchar(c).."]\n")
-		end
-		for j = 1, getn(index[i].__table__) do
-			if index[i].__table__[j].__name__ == "__primary__" then
-				out_link(fff, "  ", index[i].__name__, index[i].__table__[j].__file__, index[i].__table__[j].__anchor__)
-			end
-		end
-		for j = 1, getn(index[i].__table__) do
-			if index[i].__table__[j].__name__ ~= "__primary__" then
-				out_link(fff, "    ", index[i].__table__[j].__name__, index[i].__table__[j].__file__, index[i].__table__[j].__anchor__)
-			end
-		end
-	end
-	closefile(fff)
-end
-
-generate_index()
-
-print_index()
diff --git a/lib/core/gods.lua b/lib/core/gods.lua
deleted file mode 100644
index 77e0aad5..00000000
--- a/lib/core/gods.lua
+++ /dev/null
@@ -1,40 +0,0 @@
--- Gods helper files
-
--- Gods structs
-
-__gods_hook = {}
-__gods_callbacks = {}
-__gods_callbacks_max = 0
-
-function add_god(q)
-	local i, index, d, z, qq
-	
-	assert(q.name, "No god name")
-	assert(q.desc, "No god desc")
-	assert(q.hooks, "No god hooks")
-	
-	i = add_new_gods(q.name);
-
-	z = 0
-	for index, d in q.desc do
-		desc_god(i, z, d);
-		z = z + 1
-	end
-
-	__gods_hook[i] = q.hooks
-	for index, d in q.hooks do
-		add_hook_script(index, "__lua__gods_callback"..__gods_callbacks_max, "__lua__gods_callback"..__gods_callbacks_max)
-		setglobal("__lua__gods_callback"..__gods_callbacks_max, d)
-		__gods_callbacks_max = __gods_callbacks_max + 1
-	end
-	if q.data then
-		for index, d in q.data do
-			-- Besure it exists
-			setglobal(index, d)
-
-			-- Make it save & load
-	     		add_loadsave(index, d)
-		end
-	end
-	return i
-end
diff --git a/lib/core/help.lua b/lib/core/help.lua
deleted file mode 100644
index a581fe63..00000000
--- a/lib/core/help.lua
+++ /dev/null
@@ -1,141 +0,0 @@
--- Ingame contextual help
-
--- We use our own hook list as to not overburn the hook proccessor
--- with many hooks that would slow down things
--- It would be very meaningless if the option is not even on
-__ingame_hooks = {}
-
-__ingame_help_max = 0
-
-function ingame_help(t, ...)
-	-- This function can also be used to call the callbacks
-	if type(t) == "string" then
-		local f = getglobal("__ingame_help_fct_"..t)
-		call(f, arg)
-		return
-	end
-
-	assert(t.desc or t.fct, "no ingame help desc/fct")
-	assert(t.hook or t.callback, "no ingame help hook/callback")
-	if t.hook then assert(t.event, "no ingame hepl event needed by hook") end
-
-	-- Set it to only trigger once
-	setglobal("__ingame_help_activated_"..__ingame_help_max, FALSE)
-	-- Save/load it
-	add_loadsave("__ingame_help_activated_"..__ingame_help_max, FALSE)
-
-	if t.hook then
-		-- If the hok list didnt exist yet, add it
-		if not __ingame_hooks[t.hook] then
-			-- Set it to empty, we'll fill it later
-			__ingame_hooks[t.hook] = {}
-			-- Add the global hook
-			add_hooks
-			{
-				[t.hook] = function (...)
-					if option_ingame_help ~= TRUE then return end
-					local k, e
-					for k, e in __ingame_hooks[%t.hook] do
-						if k ~= "n" then
-							call(e, arg)
-						end
-					end
-				end
-			}
-		end
-		if t.desc then
-			tinsert(__ingame_hooks[t.hook],
-				function (...)
-					local tbl = %t
-					if getglobal("__ingame_help_activated_"..%__ingame_help_max) == FALSE then
-						if call(tbl.event, arg) == TRUE then
-							local k, e
-							for k, e in tbl.desc do
-								msg_print(TERM_YELLOW, e)
-							end
-							setglobal("__ingame_help_activated_"..%__ingame_help_max, TRUE)
-						end
-					end
-				end
-			)
-		elseif t.fct then
-			tinsert(__ingame_hooks[t.hook],
-				function (...)
-					local tbl = %t
-					if getglobal("__ingame_help_activated_"..%__ingame_help_max) == FALSE then
-						if call(tbl.event, arg) == TRUE then
-							if tbl.fct() == TRUE then
-								setglobal("__ingame_help_activated_"..%__ingame_help_max, TRUE)
-							end
-						end
-					end
-				end
-			)
-		end
-	else
-		local no_test = FALSE
-		if t.no_test == TRUE then no_test = TRUE end
-		if t.desc then
-			setglobal
-			(
-				"__ingame_help_fct_"..(t.callback),
-				function (...)
-					local tbl = %t
-					if ((option_ingame_help == TRUE) or (%no_test == TRUE)) and (getglobal("__ingame_help_activated_"..%__ingame_help_max) == FALSE) then
-						local k, e
-						for k, e in tbl.desc do
-							msg_print(TERM_YELLOW, e)
-						end
-						setglobal("__ingame_help_activated_"..%__ingame_help_max, TRUE)
-					end
-				end
-			)
-		elseif t.fct then
-			setglobal
-			(
-				"__ingame_help_fct_"..(t.callback),
-				function (...)
-					local tbl = %t
-					if ((option_ingame_help == TRUE) or (%no_test == TRUE)) and (getglobal("__ingame_help_activated_"..%__ingame_help_max) == FALSE) then
-						if call(tbl.fct, arg) == TRUE then
-							setglobal("__ingame_help_activated_"..%__ingame_help_max, TRUE)
-						end
-					end
-				end
-			)
-		end
-	end
-
-	__ingame_help_max = __ingame_help_max + 1
-end
-
--- Clean up the ingame help seen at birth
-add_hooks
-{
-	[HOOK_BIRTH_OBJECTS] = function()
-		local i
-		for i = 0, __ingame_help_max - 1 do
-			setglobal("__ingame_help_activated_"..i, FALSE)
-		end
-	end
-}
-
-function ingame_clean()
-	local i
-	for i = 0, __ingame_help_max - 1 do
-		setglobal("__ingame_help_activated_"..i, FALSE)
-	end
-end
-
--- helper function, brings up a doc
-function ingame_help_doc(name, anchor)
-	-- Save screen
-	screen_save();
-
-	-- Peruse the help file
-	if not anchor then anchor = 0 end
-	show_file(name, 0, -anchor, 0)
-
-	-- Load screen
-	screen_load()
-end
diff --git a/lib/core/init.lua b/lib/core/init.lua
deleted file mode 100644
index 11b812d5..00000000
--- a/lib/core/init.lua
+++ /dev/null
@@ -1,83 +0,0 @@
---
--- This file is loaded at the initialisation of ToME
--- Load the system functions
---
-
--- Name of globals to save
-tome_dofile_anywhere(ANGBAND_DIR_CORE, "load.lua")
-
--- Very thin xml parser(49 lines ;)
-tome_dofile_anywhere(ANGBAND_DIR_CORE, "xml.lua")
-
--- various vital helper code
-tome_dofile_anywhere(ANGBAND_DIR_CORE, "util.lua")
-tome_dofile_anywhere(ANGBAND_DIR_CORE, "player.lua")
-tome_dofile_anywhere(ANGBAND_DIR_CORE, "objects.lua")
-tome_dofile_anywhere(ANGBAND_DIR_CORE, "monsters.lua")
-tome_dofile_anywhere(ANGBAND_DIR_CORE, "building.lua")
-tome_dofile_anywhere(ANGBAND_DIR_CORE, "dungeon.lua")
-tome_dofile_anywhere(ANGBAND_DIR_CORE, "s_aux.lua")
-tome_dofile_anywhere(ANGBAND_DIR_CORE, "crpt_aux.lua")
-tome_dofile_anywhere(ANGBAND_DIR_CORE, "mimc_aux.lua")
-tome_dofile_anywhere(ANGBAND_DIR_CORE, "quests.lua")
-tome_dofile_anywhere(ANGBAND_DIR_CORE, "gods.lua")
-
--- Load the ingame contextual help
-tome_dofile_anywhere(ANGBAND_DIR_CORE, "help.lua")
-
--- let the store specific stuff happen!
-tome_dofile_anywhere(ANGBAND_DIR_CORE, "stores.lua")
-
---------------------------------------------------------------
---------------------------------------------------------------
---------------------------------------------------------------
--------------Here we load the non vital scripts---------------
------------------------from lib/scpt--------------------------
---------------------------------------------------------------
---------------------------------------------------------------
-tome_dofile("init.lua")
-
--- The dofile functions for each patch
-patch_dofile = {}
-
--- Now load patches
-function load_patches()
-	scansubdir(ANGBAND_DIR_PATCH)
-	for i = 0, scansubdir_max - 1 do
-		if (scansubdir_result[i + 1] ~= ".") and (scansubdir_result[i + 1] ~= "..") then
-			local dir = path_build(ANGBAND_DIR_PATCH, scansubdir_result[i + 1])
-			local file = path_build(dir, "patch.lua")
-			if file_exist(file) == TRUE then
-				patch_init = nil
-				tome_dofile_anywhere(dir, "patch.lua", TRUE)
-				unset_safe_globals()
-				if patch_init == nil then
-					set_safe_globals()
-					quit("Patch in "..file.." did not include a patch_init() function")
-				else
-					set_safe_globals()
-
-					-- create the dofile function
-					patch_dofile[scansubdir_result[i + 1]] = function(f)
-						tome_dofile_anywhere(%dir, f, TRUE)
-					end
-
-					local name, version = patch_init()
-					if name == nil or version == nil then
-						quit("Patch in "..file.." did not return valid name or version.\nIt must return name, version")
-					end
-					patch_version(name, version)
-				end
-			end
-		end
-	end
-end
-load_patches()
-
---------------------------------------------------------------
---------------------------------------------------------------
---------------------------------------------------------------
---
--- Do not thouch after this line
---
-tome_dofile_anywhere(ANGBAND_DIR_CORE, "load2.lua")
diff --git a/lib/core/load.lua b/lib/core/load.lua
deleted file mode 100644
index 9522ec91..00000000
--- a/lib/core/load.lua
+++ /dev/null
@@ -1,37 +0,0 @@
--- Savefile stuff
--- Do not meddle in the affairs of savefiles for they are subtle and quick to be become incompatible
-
-__loadsave_name = {}
-__loadsave_max = 0
-__loadsave_tmp = 0
-
-function add_loadsave(name, default)
-	assert(name, "No variable name to save")
-	assert(default, "No default value")
-
-	-- if it is a table we must create many entries
-	if type(default) == "table" then
-		for k, e in default do
-			add_loadsave(name.."."..k, e)
-		end
-	else
-		__loadsave_name[__loadsave_max] = { name = name, default = default }
-		__loadsave_max = __loadsave_max + 1
-	end
-end
-
--- Example of how to save a table
--- NOTE: { 1, 2, 3 } will NOT work, the key MUST be a string
---[[
-add_loadsave("t",
-{
-	foo = 7,
-	tab = {
-		a = 1,
-		b = 2,
-		tab = {
-			a=1, b=2, c=3,
-		},
-	},
-})
-]]
diff --git a/lib/core/load2.lua b/lib/core/load2.lua
deleted file mode 100644
index 7e151d91..00000000
--- a/lib/core/load2.lua
+++ /dev/null
@@ -1,56 +0,0 @@
--- Savefile helpers
-
--- function called when a key in the variable part ofthe savefile is read
--- if the key matches what we need, we use it, otehrwise just ignore it
-function __savefile_load(key, val)
-	local index, elem
-	
-	for index, elem in __loadsave_name do
-		if (key == elem.name) then
-			dostring(elem.name.." = "..val)
-	       	end
-	end
-end
-
--- called when the game is saved, can only save numbers
--- assosiate a key with them to allow the loading code to recognize them
-function __savefile_save()
-	local index, elem
-	for index, elem in __loadsave_name do
-		dostring("__loadsave_tmp = "..elem.name)
-		save_number_key(elem.name, __loadsave_tmp);
-	end
-end
-
-register_savefile(__loadsave_max)
-add_hook_script(HOOK_LOAD_GAME, "__savefile_load", "__hook_load")
-add_hook_script(HOOK_SAVE_GAME, "__savefile_save", "__hook_save")
-
--- Parse a flattened(i.e: foo.bar.zog) table path and recrate tables
-function reconstruct_table(name)
-	for i = 1, strlen(name) - 1 do
-		if strsub(name, i, i) == "." then
-			local tbl = strsub(name, 1, i - 1)
-
-			if dostring("return "..tbl) == nil then
-				dostring(tbl.."={}")
-			end
-		end
-	end
-end
-
--- Automagically set unkown variables, otherwise the savefile code
--- might get VERY upset
-do
-	local k, e
-	-- We need to be able to check for unknown globals
-	unset_safe_globals()
-	for k, e in __loadsave_name do
-		reconstruct_table(e.name)
-		if dostring("return "..(e.name)) == nil then
-			dostring((e.name).." = "..(e.default))
-		end
-	end
-	-- Now taht we did, we set it back, for it is usefull ;)
-	set_safe_globals()
-end
diff --git a/lib/core/mimc_aux.lua b/lib/core/mimc_aux.lua
deleted file mode 100644
index cea1f4dc..00000000
--- a/lib/core/mimc_aux.lua
+++ /dev/null
@@ -1,96 +0,0 @@
--- Mimic shapes helper file
-
-__mimics = {}
-__mimics_max = 1
-__mimics_names = {}
-
-function add_mimic_shape(t)
-	assert(t.name, "no mimic name")
-	assert(t.desc, "no mimic desc")
-	assert(t.calc, "no mimic calc")
-	assert(t.level, "no mimic level")
-	assert(t.duration, "no mimic duration")
-
-	if not t.limit then t.limit = 0 end
-
-	if not t.obj_name then
-		t.obj_name = t.name
-	end
-
-	t.show_name = '['..t.name..']'
-
-	-- if it needs hooks, add them
-	if t.hooks then
-		add_hooks(t.hooks)
-	end
-
-	-- Add it in a name to index hash table
-	__mimics_names[t.name] = __mimics_max
-
-	__mimics[__mimics_max] = t
-	__mimics_max = __mimics_max + 1
-end
-
-function resolve_mimic_name(name)
-	if __mimics_names[name] then
-		return __mimics_names[name]
-	else
-		return -1
-	end
-end
-
-function find_random_mimic_shape(level, limit, realm)
-	local mimic, tries
-
-	tries = 1000
-	while tries > 0 do
-		tries = tries - 1
-		mimic = rand_range(1, __mimics_max - 1)
-		if (not realm) or (__mimics[mimic].realm == realm) then
-			if limit >= __mimics[mimic].limit then
-				if (rand_int(__mimics[mimic].level * 3) < level) and (__mimics[mimic].rarity < 100)  and (magik(100 - __mimics[mimic].rarity) == TRUE) then
-					break
-				end
-			end
-		end
-	end
-	if tries > 0 then
-		return mimic
-	else
-		return resolve_mimic_name("Abomination")
-	end
-end
-
-function get_mimic_info(mimic, info)
-	if not __mimics[mimic] then return 0 end
-	return __mimics[mimic][info]
-end
-
-function get_mimic_rand_dur(mimic)
-	return rand_range(__mimics[mimic].duration[1], __mimics[mimic].duration[2])
-end
-
-function calc_mimic(mimic)
-	return __mimics[mimic].calc()
-end
-
-function calc_mimic_power(mimic)
-	if __mimics[mimic].power then __mimics[mimic].power() end
-end
-
---- Here comes the only vital shape
-
-add_mimic_shape
-{
-	["name"] =      "Abomination",
-	["obj_name"] =  "Abominable Cloak",
-	["desc"] = 	"Abominations are failed experiments of powerful wizards.",
-	["realm"] =     nil,
-	["level"] =     1,
-	["rarity"] =    101,
-	["duration"] =  {20, 100},
-	["calc"] =      function ()
-			apply_flags(TR1_SPEED + TR1_STR + TR1_INT + TR1_WIS + TR1_DEX + TR1_CON + TR1_CHR, 0, 0, 0, 0, 0, -10)
-			player.xtra_f3 = bor(player.xtra_f3, TR3_AGGRAVATE)
-       	end,
-}
diff --git a/lib/core/monsters.lua b/lib/core/monsters.lua
deleted file mode 100644
index ca2851a0..00000000
--- a/lib/core/monsters.lua
+++ /dev/null
@@ -1,16 +0,0 @@
--- SYSTEM FILE
---
--- Monster stuff, do not touch
---
-
-function summon_monster(y, x, lev, friend, typ)
-	if type(typ) == "number" then
-		if friend == TRUE then
-			return summon_specific_friendly(y, x, lev, typ, FALSE)
-		else
-			return summon_specific(y, x, lev, typ)
-		end
-	else
-		return summon_monster_aux(y, x, lev, friend, typ)
-	end
-end
diff --git a/lib/core/objects.lua b/lib/core/objects.lua
deleted file mode 100644
index 97320b82..00000000
--- a/lib/core/objects.lua
+++ /dev/null
@@ -1,45 +0,0 @@
--- SYSTEM FILE
---
--- Lua object funtions
---
-
-function create_object(tval, sval)
-	local obj = new_object()
-	object_prep(obj, lookup_kind(tval, sval))
-	return (obj)
-end
-
-function set_item_tester(tester)
-	if tolua.type(tester) == "number" then
-		lua_set_item_tester(tester, "")
-	end
-	if tolua.type(tester) == "string" then
-		lua_set_item_tester(0, tester)
-	end
-	if tolua.type(tester) == "function" then
-		__get_item_hook_default = tester
-		lua_set_item_tester(0, "__get_item_hook_default")
-	end
-end
-
-function create_artifact(a_idx)
-	local obj
-	local tval, sval
-
-	tval = a_info[a_idx + 1].tval
-	sval = a_info[a_idx + 1].sval
-	obj = create_object(tval, sval)
-	obj.name1 = a_idx
-	apply_magic(obj, -1, TRUE, TRUE, TRUE)
-
-	return (obj)
-end
-
-function get_kind(obj)
-	return k_info[obj.k_idx + 1]
-end
-
-function get_item(ask, deny, flags, mask)
-	set_item_tester(mask)
-	return get_item_aux(0, ask, deny, flags)
-end
diff --git a/lib/core/player.lua b/lib/core/player.lua
deleted file mode 100644
index 16878228..00000000
--- a/lib/core/player.lua
+++ /dev/null
@@ -1,135 +0,0 @@
--- SYSTEM FILE
---
--- Lua player funtions
---
-
--- Gods
-function deity(i)
-	return deity_info[1 + i]
-end
-
--------- skill stuff ---------
-
--- Easy skill access
-function skill(i)
-	return s_info[i + 1]
-end
-
--- Sart a lasting spell
-function player.start_lasting_spell(spl)
-	player.music_extra = -spl
-end
-
--- stat mods
-function player.modify_stat(stat, inc)
-	player.stat_add[1 + stat] = player.stat_add[1 + stat] + inc
-end
-
--- powers mods
-function player.add_power(pow)
-	player.powers[1 + pow] = TRUE
-end
-
--- easier inventory access
-function player.inventory(i)
-	return player.inventory_real[i + 1]
-end
-
--- modify mana
--- returns TRUE if there is a pb
-function increase_mana(amt)
-	player.csp = player.csp + amt
-	player.redraw = bor(player.redraw, PR_MANA)
-	if (player.csp < 0) then
-		player.csp = 0
-		return TRUE
-	end
-	if (player.csp > player.msp) then
-		player.csp = player.msp
-	end
-	return FALSE
-end
-
-
--- Return the coordinates of the player whether in wild or not
-function player.get_wild_coord()
-	if player.wild_mode == TRUE then
-		return player.py, player.px
-	else
-		return player.wilderness_y, player.wilderness_x
-	end
-end
-
--- Create a new power
-__power_fct = {}
-function add_power(p)
-	local i
-
-	assert(p.name, "No power name!")
-	assert(p.desc, "No power desc!")
-	assert(p.desc_get, "No power desc get!")
-	assert(p.desc_lose, "No power desc lose!")
-	assert(p.stat, "No power stat!")
-	assert(p.level, "No power level!")
-	assert(p.cost, "No power cost!")
-	assert(p.fail, "No power fail!")
-	assert(p.power, "No power power!")
-
-	i = add_new_power(p.name, p.desc, p.desc_get, p.desc_lose, p.level, p.cost, p.stat, p.fail)
-	__power_fct[i] = p.power
-	return i
-end
-
-function __power_fct_activate(power)
-	if __power_fct[power] then
-		__power_fct[power]()
-		return TRUE
-	else
-		return FALSE
-	end
-end
-
--- Register in the hook list
-add_hook_script(HOOK_ACTIVATE_POWER, "__power_fct_activate", "__power_fct_activate")
-
-
---- Mkeys
-
--- Create a new power
-__mkey_fct = {}
-function add_mkey(p)
-	local i
-
-	assert(p.mkey, "No mkey mkey!")
-	assert(p.fct, "No mkeey fct!")
-
-	__mkey_fct[p.mkey] = p.fct
-end
-
-function __mkey_fct_activate(power)
-	if __mkey_fct[power] then
-		__mkey_fct[power]()
-		return TRUE
-	else
-		return FALSE
-	end
-end
-
--- Register in the hook list
-add_hook_script(HOOK_MKEY, "__mkey_fct_activate", "__mkey_fct_activate")
-
-
--- Subraces
-function subrace(racem)
-	return race_mod_info[racem + 1]
-end
-
-function subrace_add_power(subrace, power)
-	for i = 1, 4 do
-		if subrace.powers[i] == -1 then
-			subrace.powers[i] = power
-			return not nil
-		end
-	end
-	return nil
-end
diff --git a/lib/core/quests.lua b/lib/core/quests.lua
deleted file mode 100644
index dfe9db51..00000000
--- a/lib/core/quests.lua
+++ /dev/null
@@ -1,57 +0,0 @@
--- Quest helper files
-
--- Quest structs
-
-__quest_hook = {}
-__quest_callbacks = {}
-__quest_callbacks_max = 0
-__quest_dynamic_desc = {}
-
-function add_quest(q)
-	local i, index, d, z, qq
-	
-	assert(q.global, "No quest global name")
-	assert(q.name, "No quest name")
-	assert(q.desc, "No quest desc")
-	assert(q.level, "No quest level")
-	assert(q.hooks, "No quest hooks")
-	
-	i = new_quest(q.name);
-	setglobal(q.global, i)
-
-	-- Make it save & load
-	add_loadsave("quest("..q.global..").status", QUEST_STATUS_UNTAKEN)
-
-	if type(q.desc) == "table" then
-		z = 0
-		for index, d in q.desc do
-			quest_desc(i, z, d);
-			z = z + 1
-		end
-	else
-		__quest_dynamic_desc[i] = q.desc
-		quest(i).dynamic_desc = TRUE
-	end
-	quest(i).level = q.level
-	if not q.silent then
-		quest(i).silent = FALSE
-	else
-		quest(i).silent = q.silent
-	end
-	__quest_hook[i] = q.hooks
-	for index, d in q.hooks do
-		add_hook_script(index, "__lua__quest_callback"..__quest_callbacks_max, "__lua__quest_callback"..__quest_callbacks_max)
-		setglobal("__lua__quest_callback"..__quest_callbacks_max, d)
-		__quest_callbacks_max = __quest_callbacks_max + 1
-	end
-	if q.data then
-		for index, d in q.data do
-			-- Besure it exists
-			setglobal(index, d)
-
-			-- Make it save & load
-	     		add_loadsave(index, d)
-		end
-	end
-	return i
-end
diff --git a/lib/core/s_aux.lua b/lib/core/s_aux.lua
deleted file mode 100644
index ec609b04..00000000
--- a/lib/core/s_aux.lua
+++ /dev/null
@@ -1,716 +0,0 @@
--- Functions to help with spells, do not touch
-
-__schools = {}
-__schools_num = 0
-
-__tmp_spells = {}
-__tmp_spells_num = 0
-
-function add_school(s)
-	__schools[__schools_num] = s
-	
-	__schools_num = __schools_num + 1
-	return (__schools_num - 1)
-end
-
-function finish_school(i)
-	local s
-	
-	s = __schools[i]
-	assert(s.name, "No school name!")
-	assert(s.skill, "No school skill!")
-
-	-- Need hooks?
-	if s.hooks then
-		add_hooks(s.hooks)
-	end
-
-	new_school(i, s.name, s.skill)
-end
-
-function add_spell(s)
-	__tmp_spells[__tmp_spells_num] = s
-	
-	__tmp_spells_num = __tmp_spells_num + 1
-	return (__tmp_spells_num - 1)
-end
-
-function finish_spell(must_i)
-	local i, s
-	
-	s = __tmp_spells[must_i]
-	assert(s.name, "No spell name!")
-	assert(s.school, "No spell school!")
-	assert(s.level, "No spell level!")
-	assert(s.mana, "No spell mana!")
-	if not s.mana_max then s.mana_max = s.mana end
-	assert(s.fail, "No spell failure rate!")
-	assert(s.spell, "No spell function!")
-	if not s.info then s.info = function() return "" end end
-	assert(s.desc, "No spell desc!")
-	if not s.random then s.random = SKILL_MAGIC end
-	if s.lasting then
-		assert(type(s.lasting) == "function", "Spell lasting is not function")
-	end
-	if s.stick then
-		local k, e
-		for k, e in s.stick do
-			if type(k) == "table" then
-				assert(e.base_level, "Arg no stick base level")
-				assert(e.max_level, "Arg no stick max level")
-			end
-		end
-	end
-
-	i = new_spell(must_i, s.name)
-	assert(i == must_i, "ACK ! i != must_i ! please contact the maintainer")
-	if type(s.school) == "number" then __spell_school[i] = {s.school}
-	else __spell_school[i] = s.school end
-	spell(i).mana = s.mana
-	spell(i).mana_max = s.mana_max
-	spell(i).fail = s.fail
-	spell(i).skill_level = s.level
-	__spell_spell[i] = s.spell
-	__spell_info[i] = s.info
-	__spell_desc[i] = s.desc
-	return i
-end
-
--- Creates the school books array
-__spell_spell = {}
-__spell_info = {}
-__spell_desc = {}
-__spell_school = {}
-school_book = {}
-
--- Find a spell by name
-function find_spell(name)
-	local i
-
-	i = 0
-	while (i < __tmp_spells_num) do
-		if __tmp_spells[i].name == name then return i end
-		i = i + 1
-	end
-	return -1
-end
-
--- Find if the school is under the influence of a god, returns nil or the level
-function get_god_level(sch)
-	if __schools[sch].gods[player.pgod] then
-		return (s_info[__schools[sch].gods[player.pgod].skill + 1].value * __schools[sch].gods[player.pgod].mul) / __schools[sch].gods[player.pgod].div
-	else
-		return nil
-	end
-end
-
--- Change this fct if I want to switch to learnable spells
-function get_level_school(s, max, min)
-	local lvl, sch, index, num, bonus
-	local allow_spell_power = TRUE
-
-	lvl = 0
-	num = 0
-	bonus = 0
-
-	-- No max specified ? assume 50
-	if not max then
-		max = 50
-	end
-	if not min then
-		min = 1
-	end
-
-	-- Do we pass tests?
-	if __tmp_spells[s].depend then
-		if __tmp_spells[s].depend() ~= TRUE then
-			return min, "n/a"
-		end
-	end
-
-	for index, sch in __spell_school[s] do
-		local r, s, p, ok = 0, 0, 0, 0
-
-		-- Does it require we worship a specific god?
-		if __schools[sch].god then
-			if __schools[sch].god ~= player.pgod then
-				if min then return min, "n/a"
-				else return 1, "n/a" end
-			end
-		end
-
-		-- Take the basic skill value
-		r = s_info[(school(sch).skill) + 1].value
-
-		-- Do we pass tests?
-		if __schools[sch].depend then
-			if __schools[sch].depend() ~= TRUE then
-				return min, "n/a"
-			end
-		end
-
-		-- Are we under sorcery effect ?
-		if __schools[sch].sorcery then
-			s = s_info[SKILL_SORCERY + 1].value
-		end
-
-		-- Are we affected by spell power ?
-		-- All teh schools must allow it for it to work
-		if not __schools[sch].spell_power then
-			allow_spell_power = nil
-		end
-
-		-- Are we under a god effect ?
-		if __schools[sch].gods then
-			p = get_god_level(sch)
-			if not p then p = 0 end
-		end
-		
-		-- Find the higher
-		ok = r
-		if ok < s then ok = s end
-		if ok < p then ok = p end
-
-		-- Do we need to add a special bonus ?
-		if __schools[sch].bonus_level then
-			bonus = bonus + (__schools[sch].bonus_level() * (SKILL_STEP / 10))
-		end
-
-		-- All schools must be non zero to be able to use it
-		if ok == 0 then return min, "n/a" end
-
-		-- Apply it
-		lvl = lvl + ok
-		num = num + 1
-	end
-
-	-- Add the Spellpower skill as a bonus
-	if allow_spell_power then
-		bonus = bonus + (get_skill_scale(SKILL_SPELL, 20) * (SKILL_STEP / 10))
-	end
-
-	-- Add bonus from objects
-	bonus = bonus + (player.to_s * (SKILL_STEP / 10))
-
-	-- / 10 because otherwise we can overflow a s32b and we can use a u32b because the value can be negative
-	-- The loss of information should be negligible since 1 skill = 1000 internally
-	lvl = (lvl / num) / 10
-	lvl = lua_get_level(s, lvl, max, min, bonus)
-
-	return lvl, nil
-end
-
--- This is the function to use when casting through a stick
-function get_level_device(s, max, min)
-	local lvl
-
-	-- No max specified ? assume 50
-	if not max then
-		max = 50
-	end
-
-	lvl = s_info[SKILL_DEVICE + 1].value
-	lvl = lvl + (get_level_use_stick * SKILL_STEP)
-
-	-- Sticks are limited
-	if lvl - ((spell(s).skill_level + 1) * SKILL_STEP) >= get_level_max_stick * SKILL_STEP then
-		lvl = (get_level_max_stick + spell(s).skill_level - 1) * SKILL_STEP
-	end
-
-	-- / 10 because otherwise we can overflow a s32b and we can use a u32b because the value can be negative
-	-- The loss of information should be negligible since 1 skill = 1000 internally
-	lvl = lvl / 10
-	if not min then
-		lvl = lua_get_level(s, lvl, max, 1, 0)
-	else
-		lvl = lua_get_level(s, lvl, max, min, 0)
-	end
-
-	return lvl
-end
-
--- The real get_level, works for schooled magic and for innate powers
-get_level_use_stick = -1
-get_level_max_stick = -1
-function get_level(s, max, min)
-	if type(s) == "number" then
-		-- Ahah shall we use Magic device instead ?
-		if get_level_use_stick > -1 then
-			return get_level_device(s, max, min)
-		else
-			local lvl, na = get_level_school(s, max, min)
-			return lvl
-		end
-	else
-		return get_level_power(s, max, min)
-	end
-end
-
--- Can we cast the spell ?
-function is_ok_spell(s, obj)
-	if get_level(s, 50, 0) == 0 then return nil end
-	if __tmp_spells[s].pval and obj.pval < __tmp_spells[s].pval then return nil end
-	return 1
-end
-
--- Get the amount of mana(or power) needed
-function get_mana(s)
-	return spell(s).mana + get_level(s, spell(s).mana_max - spell(s).mana, 0)
-end
-
--- Return the amount of power(mana, piety, whatever) for the spell
-function get_power(s)
-	if check_affect(s, "piety", FALSE) then
-		return player.grace
-	else
-		return player.csp
-	end
-end
-
--- Return the amount of power(mana, piety, whatever) for the spell
-function get_power_name(s)
-	if check_affect(s, "piety", FALSE) then
-		return "piety"
-	else
-		return "mana"
-	end
-end
-
--- Get the level of a power
-function get_level_power(s, max, min)
-	if not max then max = 50 end
-	if not min then min = 1 end
-
-	return value_scale(s.get_current_level(), 50, max, min)
-end
-
--- Changes the amount of power(mana, piety, whatever) for the spell
-function adjust_power(s, x)
-	if check_affect(s, "piety", FALSE) then
-		inc_piety(GOD_ALL, x)
-	else
-		increase_mana(x)
-	end
-end
-
--- Get spell school name(s) as a /-separated string.
-function spell_school_name(s)
-	local xx, sch_str
-	xx = nil
-	sch_str = ""
-	for index, sch in __spell_school[s] do
-		if xx then
-			sch_str = sch_str.."/"..school(sch).name
-		else
-			xx = 1
-			sch_str = sch_str..school(sch).name
-		end
-	end
-	return sch_str
-end
-
--- Print the book and the spells
-function print_book(book, spl, obj)
-	local x, y, index, sch, size, s
-
-	x = 0
-	y = 2
-	size = 0
-
-	-- Hack if the book is 255 it is a random book
-	if book == 255 then
-		school_book[book] = {spl}
-	end
-
-	-- Parse all spells
-	for index, s in school_book[book] do
-		local color = TERM_L_DARK
-		local lvl, na = get_level_school(s, 50, -50)
-		local xx, sch_str
-
-		if is_ok_spell(s, obj) then
-			if get_mana(s) > get_power(s) then color = TERM_ORANGE
-			else color = TERM_L_GREEN end
-		end
-		
-		sch_str = spell_school_name(s)
-
-		if na then
-			c_prt(color, format("%c) %-20s%-16s   %3s %4s %3d%s %s", size + strbyte("a"), spell(s).name, sch_str, na, get_mana(s), spell_chance(s), "%", __spell_info[s]()), y, x)
-		else
-			c_prt(color, format("%c) %-20s%-16s   %3d %4s %3d%s %s", size + strbyte("a"), spell(s).name, sch_str, lvl, get_mana(s), spell_chance(s), "%", __spell_info[s]()), y, x)
-		end
-		y = y + 1
-		size = size + 1
-	end
-	prt(format("   %-20s%-16s Level Cost Fail Info", "Name", "School"), 1, x)
-	return y
-end
-
--- Output the describtion when it is used as a spell
-function print_spell_desc(s, y)
-	local index, desc, x
-	
-	x = 0
-
-	if type(__spell_desc[s]) == "string" then c_prt(TERM_L_BLUE, __spell_desc[s], y, x)
-	else
-		for index, desc in __spell_desc[s] do
-			c_prt(TERM_L_BLUE, desc, y, x)
-			y = y + 1
-		end
-	end
-	if check_affect(s, "piety", FALSE) then
-		c_prt(TERM_L_WHITE, "It uses piety to cast.", y, x)
-		y = y + 1
-	end
-	if not check_affect(s, "blind") then
-		c_prt(TERM_ORANGE, "It is castable even while blinded.", y, x)
-		y = y + 1
-	end
-	if not check_affect(s, "confusion") then
-		c_prt(TERM_ORANGE, "It is castable even while confused.", y, x)
-		y = y + 1
-	end
-end
-
--- Output the desc when sued as a device
-function print_device_desc(s)
-	local index, desc
-
-	if type(__spell_desc[s]) == "string" then text_out(__spell_desc[s])
-	else
-		for index, desc in __spell_desc[s] do
-			text_out("\n" .. desc)
-		end
-	end
-end
-
-function book_spells_num(book)
-	local size, index, sch
-
-	size = 0
-
-	-- Hack if the book is 255 it is a random book
-	if book == 255 then
-		return 1
-	end
-
-	-- Parse all spells
-	for index, s in school_book[book] do
-		size = size + 1
-	end
-	return size
-end
-
-function spell_x(book, spl, s)
-	if book == 255 then
-		return spl
-	else
-		local i, x, val
-
-		i, val = next(school_book[book], nil)
-		x = 0
-		while x < s do
-			i, val = next(school_book[book], i)
-			x = x + 1
-		end
-		return val
-	end
-end
-
-function spell_in_book(book, spell)
-	local i, s
-
-	for i, s in school_book[book] do
-		if s == spell then return TRUE end
-	end
-	return FALSE
-end
-
--- Returns spell chance of failure for spell
-function spell_chance(s)
-	local chance, s_ptr
-
-	s_ptr = spell(s)
-
-	-- Extract the base spell failure rate
-	if get_level_use_stick > -1 then
-		chance = lua_spell_device_chance(s_ptr.fail, get_level(s, 50), s_ptr.skill_level)
-	else
-		chance = lua_spell_chance(s_ptr.fail, get_level(s, 50), s_ptr.skill_level, get_mana(s), get_power(s), get_spell_stat(s))
-	end
-
-	-- Return the chance
-	return chance
-end
-
-function check_affect(s, name, default)
-	local s_ptr = __tmp_spells[s]
-	local a
-
-	if type(s_ptr[name]) == "number" then
-		a = s_ptr[name]
-	else
-		a = default
-	end
-	if a == FALSE then
-		return nil
-	else
-		return TRUE
-	end
-end
-
--- Returns the stat to use for the spell, INT by default
-function get_spell_stat(s)
-	if not __tmp_spells[s].stat then return A_INT
-	else return __tmp_spells[s].stat end
-end
-
-function cast_school_spell(s, s_ptr, no_cost)
-	local use = FALSE
-
-	-- No magic
-	if (player.antimagic > 0) then
-		msg_print("Your anti-magic field disrupts any magic attempts.")
-		return
-	end
-
-	-- No magic
-	if (player.anti_magic == TRUE) then
-		msg_print("Your anti-magic shell disrupts any magic attempts.")
-		return
-	end
-
-	-- if it costs something then some condition must be met
-	if not no_cost then
-	 	-- Require lite
-		if (check_affect(s, "blind")) and ((player.blind > 0) or (no_lite() == TRUE)) then
-			msg_print("You cannot see!")
-			return
-		end
-
-		-- Not when confused
-		if (check_affect(s, "confusion")) and (player.confused > 0) then
-			msg_print("You are too confused!")
-			return
-		end
-
-		-- Enough mana
-		if (get_mana(s) > get_power(s)) then
-			if (get_check("You do not have enough "..get_power_name(s)..", do you want to try anyway?") == FALSE) then return end
-		end
-	
-		-- Invoke the spell effect
-		if (magik(spell_chance(s)) == FALSE) then
-			if (__spell_spell[s]() ~= nil) then
-				use  = TRUE
-			end
-		else
-			local index, sch
-
-			-- added because this is *extremely* important --pelpel
-			if (flush_failure) then flush() end
-
-			msg_print("You failed to get the spell off!")
-			for index, sch in __spell_school[s] do
-				if __schools[sch].fail then
-					__schools[sch].fail(spell_chance(s))
-				end
-			end
-			use  = TRUE
-		end
-	else
-		__spell_spell[s]()
-	end
-
-	if use == TRUE then
-		-- Reduce mana
-		adjust_power(s, -get_mana(s))
-
-		-- Take a turn
-		if is_magestaff() == TRUE then energy_use = 80
-		else energy_use = 100 end
-	end
-
-	player.redraw = bor(player.redraw, PR_MANA)
-	player.window = bor(player.window, PW_PLAYER)
-end
-
-
--- Can the spell be randomly found(in random books)
-function can_spell_random(i)
-	return __tmp_spells[i].random
-end
-
--- Find a random spell
-function get_random_spell(typ, level)
-	local spl, tries
-
-	tries = 1000
-	while tries > 0 do
-		tries = tries - 1
-		spl = rand_int(__tmp_spells_num)
-		if (can_spell_random(spl) == typ) and (rand_int(spell(spl).skill_level * 3) < level) then
-			break
-		end
-	end
-	if tries > 0 then
-		return spl
-	else
-		return -1
-	end
-end
-
--- Execute a lasting spell
-function exec_lasting_spell(spl)
-	assert(__tmp_spells[spl].lasting, "No lasting effect for spell "..__tmp_spells[spl].name.." but called as such")
-	return __tmp_spells[spl].lasting()
-end
-
--- Helper function for spell effect to know if they are or not obvious
-function is_obvious(effect, old)
-	if old then
-		if old == TRUE or effect == TRUE then
-			return TRUE
-		else
-			return FALSE
-		end
-	else
-		return effect
-	end
-end
-
--------------------------Sticks-------------------------
-
--- Fire off the spell
-function activate_stick(spl)
-	local ret = __spell_spell[spl]()
-	local charge, obvious
-	if not ret then
-		charge = FALSE
-		obvious = FALSE
-	else
-		charge = TRUE
-		obvious = ret
-	end
-	return obvious, charge
-end
-
------------------------------------ Wand, Staves, Rods specific functions ----------------------------
-
--- Get a spell for a given stick(wand, staff, rod)
-function get_random_stick(stick, level)
-	local spl, tries
-
-	tries = 1000
-	while tries > 0 do
-		tries = tries - 1
-		spl = rand_int(__tmp_spells_num)
-		if __tmp_spells[spl].stick and (type(__tmp_spells[spl].stick[stick]) == "table") then
-			if (rand_int(spell(spl).skill_level * 3) < level) and (magik(100 - __tmp_spells[spl].stick[stick].rarity) == TRUE) then
-				break
-			end
-		end
-	end
-	if tries > 0 then
-		return spl
-	else
-		return -1
-	end
-end
-
--- Get a random base level
-function get_stick_base_level(stick, level, spl)
-	-- Paranoia
-	if spl < 0 or spl >= __tmp_spells_num or not __tmp_spells[spl].stick[stick] then return 0 end
-
-	local min, max = __tmp_spells[spl].stick[stick].base_level[1], __tmp_spells[spl].stick[stick].base_level[2]
-	local range = max - min;
-
-	-- Ok the basic idea is to have a max possible level of half the dungeon level
-	if range * 2 > level then range = level / 2 end
-
-	-- Randomize a bit
-	range = m_bonus(range, dun_level)
-
-	-- And get the result
-	return min + range
-end
-
--- Get a random max level
-function get_stick_max_level(stick, level, spl)
-	-- Paranoia
-	if spl < 0 or spl >= __tmp_spells_num or not __tmp_spells[spl].stick[stick] then return 0 end
-
-	local min, max = __tmp_spells[spl].stick[stick].max_level[1], __tmp_spells[spl].stick[stick].max_level[2]
-	local range = max - min;
-
-	-- Ok the basic idea is to have a max possible level of half the dungeon level
-	if range * 2 > level then range = level / 2 end
-
-	-- Randomize a bit
-	range = m_bonus(range, dun_level)
-
-	-- And get the result
-	return min + range
-end
-
--- Get the number of desired charges
-function get_stick_charges(spl)
-	return __tmp_spells[spl].stick.charge[1] + randint(__tmp_spells[spl].stick.charge[2]);
-end
-
--- Get activation desc
-function get_activation_desc(spl)
-	local turns
-	if type(__tmp_spells[spl].activate) == 'number' then
-		turns = __tmp_spells[spl].activate
-	else
-		turns = __tmp_spells[spl].activate[1] .. '+d' .. __tmp_spells[spl].activate[2]
-	end
-	return __tmp_spells[spl].desc[1] .. ' every ' .. turns .. ' turns'
-end
-
--- Compute the timeout of an activation
-function get_activation_timeout(spl)
-	if type(__tmp_spells[spl].activate) == 'number' then
-		return __tmp_spells[spl].activate
-	else
-		return __tmp_spells[spl].activate[1] + randint(__tmp_spells[spl].activate[2])
-	end
-end
-
--- Fire off the spell
-function activate_activation(spl, item)
-	__spell_spell[spl](item)
-end
-
-
-------- Add new GF type ----------
-max_gf = MAX_GF
-function add_spell_type(t)
-	t.index = max_gf
-	max_gf = max_gf + 1
-	assert(t.color, "No GF color")
-	if not t.monster then t.monster = function() end end
-	if not t.angry then t.angry = function() end end
-	if not t.object then t.object = function() end end
-	if not t.player then t.player = function() end end
-	if not t.grid then t.grid = function() end end
-
-	add_hooks
-	{
-		[HOOK_GF_COLOR] = function (gf, new_gfx)
-			local t = %t
-			if gf == t.index then return TRUE, t.color[new_gfx + 1] end
-		end,
-		[HOOK_GF_EXEC] = function (action, who, gf, dam, rad, y, x, extra)
-			local t = %t
-			if t.index == gf then
-				return t[action](who, dam, rad, y, x, extra)
-			end
-		end,
-	}
-	return t.index
-end
diff --git a/lib/core/stores.lua b/lib/core/stores.lua
deleted file mode 100644
index d4a63168..00000000
--- a/lib/core/stores.lua
+++ /dev/null
@@ -1,32 +0,0 @@
--- Take care of all concerning stores
-function store_buy_list(t)
-	assert(type(t) == "table", "store_buy_list got no table")
-	add_hooks
-	{
-		[HOOK_STORE_BUY] = function (index, name, obj)
-			local tbl = %t
-			local elt = tbl[index]
-			if not elt then
-				elt = tbl[name]
-			end
-			if elt then
-				if elt then
-					if type(elt) == "function" then
-						return TRUE, elt(obj)
-					elseif type(elt) == "table" then
-						local k, e
-						for k, e in elt do
-							if type(e) == "number" then
-								if obj.tval == e then return TRUE, TRUE end
-							else
-								if (obj.tval == e[1]) and (obj.sval >= e[2])  and (obj.sval <= e[3]) then return TRUE, TRUE end
-							end
-						end
-					elseif elt == -1 then
-						return TRUE, FALSE
-					end
-				end
-			end
-		end,
-	}
-end
diff --git a/lib/core/util.lua b/lib/core/util.lua
deleted file mode 100644
index eea13014..00000000
--- a/lib/core/util.lua
+++ /dev/null
@@ -1,158 +0,0 @@
--- various stuff to make scripters life easier
-
--- Beware of the scary undefined globals
-function safe_getglobal(x)
-	local v = rawget(globals(), x)
-
-	if v then
-		return v
-	else
-		error("undefined global variable '"..x.."'")
-	end
-end
-
-function set_safe_globals()
-	settagmethod(tag(nil), "getglobal", safe_getglobal)
-end
-function unset_safe_globals()
-	settagmethod(tag(nil), "getglobal", nil)
-end
-
-set_safe_globals()
-
--- Patch modules
-__patch_modules = {}
-
-function patch_version(name, version)
-	assert(not __patch_modules[name], "Patch " .. name .. " already loaded!!!")
-	__patch_modules[name] = version
-end
-
-function patchs_list()
-	local k, e, first
-	first = FALSE
-	for k, e in __patch_modules do
-		if first == FALSE then print_hook("\n\n  [Patch modules]\n") first = TRUE end
-		print_hook("\n "..k.." version "..e)
-	end
-	if first == TRUE then print_hook("\n") end
-end
-
-function patchs_display()
-	local k, e
-	for k, e in __patch_modules do
-		msg_print("Patch: "..k.." version "..e)
-	end
-end
-
-
--- Better hook interface
-__hooks_list_callback = {}
-__hooks_list_callback_max = 0
-
-function add_hooks(h_table, name_prefix)
-	local k, e
-
-	if not name_prefix then name_prefix = "" end
-	for k, e in h_table do
-		add_hook_script(k, "__"..name_prefix.."__hooks_list_callback"..__hooks_list_callback_max, "__"..name_prefix.."__hooks_list_callback"..__hooks_list_callback_max)
-		setglobal("__"..name_prefix.."__hooks_list_callback"..__hooks_list_callback_max, e)
-		__hooks_list_callback_max = __hooks_list_callback_max + 1
-	end
-end
-
--- Wrapper for the real msg_print and cmsg_print
--- it understands if we want color or not
-function msg_print(c, m)
-	if type(c) == "number" then
-		cmsg_print(c, m)
-	else
-		call(%msg_print, { c })
-	end
-end
-
--- better timer add function
-__timers_callback_max = 0
-
-function new_timer(t)
-	assert(t.delay > 0, "no timer delay")
-	assert(t.enabled, "no timer enabled state")
-	assert(t.callback, "no timer callback")
-
-	local timer
-	if type(t.callback) == "function" then
-		setglobal("__timers_callback_"..__timers_callback_max, t.callback)
-		timer = %new_timer("__timers_callback_"..__timers_callback_max, t.delay)
-		__timers_callback_max = __timers_callback_max + 1
-	else
-		timer = %new_timer(t.callback, t.delay)
-	end
-
-	timer.enabled = t.enabled
-
-	return timer
-end
-
--- saves all timer values
-function save_timer(name)
-	add_loadsave(name..".enabled", FALSE)
-	add_loadsave(name..".delay", 1)
-	add_loadsave(name..".countdown", 1)
-end
-
-
--- displays a scrolling list
-function display_list(y, x, h, w, title, list, begin, sel, sel_color)
-	local l = create_list(getn(list))
-
-	for i = 1, getn(list) do
-		add_to_list(l, i - 1, list[i])
-	end
-
-	%display_list(y, x, h, w, title, l, getn(list), begin - 1, sel - 1, sel_color)
-
-	delete_list(l, getn(list))
-end
-
--- Easier access to special gene stuff
-function set_monster_generation(monster, state)
-	if type(monster) == "string" then
-		m_allow_special[test_monster_name(monster) + 1] = state
-	else
-		m_allow_special[monster + 1] = state
-	end
-end
-function set_object_generation(obj, state)
-	if type(obj) == "string" then
-		m_allow_special[test_item_name(obj) + 1] = state
-	else
-		m_allow_special[obj + 1] = state
-	end
-end
-function set_artifact_generation(obj, state)
-	m_allow_special[obj + 1] = state
-end
-
--- Strings
-function strcap(str)
-	if strlen(str) > 1 then
-		return strupper(strsub(str, 1, 1))..strsub(str, 2)
-	elseif strlen(str) == 1 then
-		return strupper(str)
-	else
-		return str
-	end
-end
-
-function msg_format(...)
-	msg_print(call(format, arg))
-end
-
--- A way to  check if the game is now running(as opposed to initialization/character gen)
-game = {}
-add_hooks
-{
-	[HOOK_GAME_START] = function ()
-		game.started = TRUE
-	end
-}
diff --git a/lib/core/xml.lua b/lib/core/xml.lua
deleted file mode 100644
index 14f0511f..00000000
--- a/lib/core/xml.lua
+++ /dev/null
@@ -1,375 +0,0 @@
--- The xml module
-xml = {}
-
-function xml:parseargs (s)
-  local arg = {}
-  gsub(s, "(%w+)=([\"'])(.-)%2", function (w, _, a)
-    %arg[w] = a
-  end)
-  return arg
-end
-
--- s is a xml stream, returns a table
-function xml:collect (s)
-  local stack = {n=0}
-  local top = {n=0}
-  tinsert(stack, top)
-  local ni,c,label,args, empty
-  local i, j = 1, 1
-  while 1 do
-    ni,j,c,label,args, empty = strfind(s, "<(%/?)(%w+)(.-)(%/?)>", j)
-    if not ni then break end
-    local text = strsub(s, i, ni-1)
-    if not strfind(text, "^%s*$") then
-      tinsert(top, text)
-    end
-    if empty == "/" then  -- empty element tag
-      tinsert(top, {n=0, label=label, args=xml:parseargs(args), empty=1})
-    elseif c == "" then   -- start tag
-      top = {n=0, label=label, args=xml:parseargs(args)}
-      tinsert(stack, top)   -- new level
-    else  -- end tag
-      local toclose = tremove(stack)  -- remove top
-      top = stack[stack.n]
-      if stack.n < 1 then
-	error("nothing to close with "..label)
-      end
-      if toclose.label ~= label then
-	error("trying to close "..toclose.label.." with "..label)
-      end
-      tinsert(top, toclose)
-    end 
-    i = j+1
-  end
-  local text = strsub(s, i)
-  if not strfind(text, "^%s*$") then
-    tinsert(stack[stack.n], text)
-  end
-  if stack.n > 1 then
-    error("unclosed "..stack[stack.n].label)
-  end
-  return stack[1]
-end
-
--- Viewport coordinates
-xml.write_out_y = 0
-xml.write_out_x = 0
-xml.write_out_h = 24
-xml.write_out_w = 80
-
--- Offsets
-xml.write_off_y = 0
-xml.write_off_x = 0
-
--- Current position
-xml.write_y = 0
-xml.write_x = 0
-
-xml.write_screen = function(color, s)
-	local i
-	for i = 1, strlen(s) do
-		local c = strsub(s, i, i + 1)
-		if c ~= "\n" then
-			if xml.write_y - xml.write_off_y >= 0 and xml.write_y - xml.write_off_y < xml.write_out_h and xml.write_x - xml.write_off_x >= 0 and xml.write_x - xml.write_off_x < xml.write_out_w then
-				Term_putch(xml.write_x - xml.write_off_x + xml.write_out_x, xml.write_y - xml.write_off_y + xml.write_out_y, color, strbyte(c))
-			end
-			xml.write_x = xml.write_x + 1
-		else
-			xml.write_x = 0
-			xml.write_y = xml.write_y + 1
-		end
-	end
-end
-
-xml.write_file = function (color, s)
-	print_hook(s)
-end
-
-xml.write = xml.write_screen
-
-xml.rule2string = {
-    ['name'] = {"Its ", "name", " is"},
-    ['contain'] = {"Its ", "name", " contains"},
-    ['symbol'] = {"Its ", "symbol", " is"},
-    ['inscribed'] = {"Its ", "inscription", " contains"},
-    ['state'] = {"Its ", "state", " is"},
-    ['status'] = {"Its ", "status", " is"},
-    ['tval'] = {"Its ", "tval", " is"},
-    ['race'] = {"Your ", "race", " is"},
-    ['subrace'] = {"Your ", "subrace", " is"},
-    ['class'] = {"Your ", "class", " is"},
-    ['foo1'] = {"The result of ", "test 1 ", "is"},
-    ['foo2'] = {"The result of ", "test 2 ", "is"},
-    ['foo3'] = {"The result of ", "test 3 ", "is"},
-}
-
-xml.display_english = 1
-function xml:display_xml(t, tab)
-    if xml.display_english then
-	xml:english_xml(t, tab)
-    else
-	xml:print_xml(t, tab)
-    end
-end
-
-function xml:english_xml(t, tab, not_flag)
-	local i, k, e
-	local pre, post, recurse
-	local children_not_flag
-	local nextlevel
-	local bcol, ecol = TERM_L_GREEN, TERM_GREEN
-
-	if xml.write_active and t == auto_aux.rule then bcol, ecol = TERM_VIOLET, TERM_VIOLET end
-
-	nextlevel = tab .. "    "
-
-	recurse = 1
-
-	if t.label == "rule" then
-	    if t.args.type == "inscribe" then
-		xml.write(TERM_WHITE, tab)
-		xml.write(ecol, "A rule named \"")
-		xml.write(TERM_WHITE, tostring(t.args.name))
-		xml.write(ecol, "\" to ")
-		xml.write(bcol, "inscribe")
-		xml.write(ecol, " an item with \"")
-		xml.write(TERM_WHITE, t.args.inscription)
-		xml.write(ecol, "\" when")
-		xml.write(TERM_WHITE, "\n")
-	    else	
-		xml.write(TERM_WHITE, tab)
-		xml.write(ecol, "A rule named \"")
-		xml.write(TERM_WHITE, tostring(t.args.name))
-		xml.write(ecol, "\" to ")
-		xml.write(bcol, t.args.type)
-		xml.write(ecol, " when")
-		xml.write(TERM_WHITE, "\n")
-	    end
-	elseif t.label == "and" then
-	    if not_flag then
-		xml.write(TERM_WHITE, tab)
-		xml.write(ecol, "At least one of the following is false:")
-		xml.write(TERM_WHITE, "\n")
-	    else
-		xml.write(TERM_WHITE, tab)
-		xml.write(ecol, "All of the following are true:")
-		xml.write(TERM_WHITE, "\n")
-	    end
-	elseif t.label == "or" then
-	    if not_flag then
-		xml.write(TERM_WHITE, tab)
-		xml.write(ecol, "All of the following are false:")
-		xml.write(TERM_WHITE, "\n")
-	    else
-		xml.write(TERM_WHITE, tab)
-		xml.write(ecol, "At least one of the following are true:")
-		xml.write(TERM_WHITE, "\n")
-	    end
-	elseif t.label == "not" then
-	    if bcol == TERM_VIOLET or getn(t) == 0 then
-		xml.write(ecol, "(a negating rule)")
-		xml.write(TERM_WHITE, "\n")
-	    else
-		nextlevel = tab
-	    end
-	    children_not_flag = not nil
-	elseif t.label == "inventory" then
-	    if not_flag then
-		xml.write(TERM_WHITE, tab)
-		xml.write(ecol, "Nothing in your ")
-		xml.write(bcol, "inventory")
-		xml.write(ecol, " matches the following:")
-		xml.write(TERM_WHITE, "\n")
-	    else
-		xml.write(TERM_WHITE, tab)
-		xml.write(ecol, "Something in your ")
-		xml.write(bcol, "inventory")
-		xml.write(ecol, " matches the following:")
-		xml.write(TERM_WHITE, "\n")
-	    end
-	elseif t.label == "equipment" then
-	    if not_flag then
-		xml.write(TERM_WHITE, tab)
-		xml.write(ecol, "Nothing in your ")
-		xml.write(bcol, "equipment")
-		xml.write(ecol, " matches the following:")
-		xml.write(TERM_WHITE, "\n")
-	    else
-		xml.write(TERM_WHITE, tab)
-		xml.write(ecol, "Something in your ")
-		xml.write(bcol, "equipment")
-		xml.write(ecol, " matches the following:")
-		xml.write(TERM_WHITE, "\n")
-	    end
-	elseif t.label == "comment" then
-		xml.write(TERM_WHITE, tab)
-		xml.write(TERM_WHITE, "(" .. t[1] .. ")")
-		xml.write(TERM_WHITE, "\n")
-	elseif t.label == "skill" then
-	    local s = t[1]
-	    if not_flag then
-		xml.write(TERM_WHITE, tab)
-		xml.write(ecol, "Your skill in ")
-		xml.write(bcol, s)
-		xml.write(ecol, " is not from ")
-		xml.write(TERM_WHITE, tostring(t.args.min))
-		xml.write(ecol, " to ")
-		xml.write(TERM_WHITE, tostring(t.args.max))
-		xml.write(TERM_WHITE, "\n")
-	    else
-		xml.write(TERM_WHITE, tab)
-		xml.write(ecol, "Your skill in ")
-		xml.write(bcol, s)
-		xml.write(ecol, " is from ")
-		xml.write(TERM_WHITE, tostring(t.args.min))
-		xml.write(ecol, " to ")
-		xml.write(TERM_WHITE, tostring(t.args.max))
-		xml.write(TERM_WHITE, "\n")
-	    end
-	elseif t.label == "ability" then
-	    local s = t[1]
-	    if not_flag then
-		xml.write(TERM_WHITE, tab)
-		xml.write(ecol, "You do not have the ")
-		xml.write(bcol, s)
-		xml.write(ecol, " ability")
-		xml.write(TERM_WHITE, "\n")
-	    else
-		xml.write(TERM_WHITE, tab)
-		xml.write(ecol, "You have the ")
-		xml.write(bcol, s)
-		xml.write(ecol, " ability")
-		xml.write(TERM_WHITE, "\n")
-	    end
-	elseif t.label == "level" then
-	    if not_flag then
-		xml.write(TERM_WHITE, tab)
-		xml.write(ecol, "Your ")
-		xml.write(bcol, "level")
-		xml.write(ecol, " is not from ")
-		xml.write(TERM_WHITE, tostring(t.args.min))
-		xml.write(ecol, " to ")
-		xml.write(TERM_WHITE, tostring(t.args.max))
-		xml.write(TERM_WHITE, "\n")
-	    else
-		xml.write(TERM_WHITE, tab)
-		xml.write(ecol, "Your ")
-		xml.write(bcol, "level")
-		xml.write(ecol, " is from ")
-		xml.write(TERM_WHITE, tostring(t.args.min))
-		xml.write(ecol, " to ")
-		xml.write(TERM_WHITE, tostring(t.args.max))
-		xml.write(TERM_WHITE, "\n")
-	    end
-	elseif t.label == "sval" then
-	    if not_flag then
-		xml.write(TERM_WHITE, tab)
-		xml.write(ecol, "Its ")
-		xml.write(bcol, "sval")
-		xml.write(ecol, " is not from ")
-		xml.write(TERM_WHITE, tostring(t.args.min))
-		xml.write(ecol, " to ")
-		xml.write(TERM_WHITE, tostring(t.args.max))
-		xml.write(TERM_WHITE, "\n")
-	    else
-		xml.write(TERM_WHITE, tab)
-		xml.write(ecol, "Its ")
-		xml.write(bcol, "sval")
-		xml.write(ecol, " is from ")
-		xml.write(TERM_WHITE, tostring(t.args.min))
-		xml.write(ecol, " to ")
-		xml.write(TERM_WHITE, tostring(t.args.max))
-		xml.write(TERM_WHITE, "\n")
-	    end
-	elseif t.label == "discount" then
-	    if not_flag then
-		xml.write(TERM_WHITE, tab)
-		xml.write(ecol, "Its ")
-		xml.write(bcol, "discount")
-		xml.write(ecol, " is not from ")
-		xml.write(TERM_WHITE, tostring(t.args.min))
-		xml.write(ecol, " to ")
-		xml.write(TERM_WHITE, tostring(t.args.max))
-		xml.write(TERM_WHITE, "\n")
-	    else
-		xml.write(TERM_WHITE, tab)
-		xml.write(ecol, "Its ")
-		xml.write(bcol, "discount")
-		xml.write(ecol, " is from ")
-		xml.write(TERM_WHITE, tostring(t.args.min))
-		xml.write(ecol, " to ")
-		xml.write(TERM_WHITE, tostring(t.args.max))
-		xml.write(TERM_WHITE, "\n")
-	    end
-	else 
-	    if xml.rule2string[t.label] then
-		local rule = xml.rule2string[t.label]
-		a, b, c = rule[1], rule[2], rule[3]
-		if not_flag then c = c .. " not" end
-		xml.write(TERM_WHITE, tab)
-		xml.write(ecol, a) 
-		xml.write(bcol, b) 
-		xml.write(ecol, c) 
-		xml.write(ecol, " \"") 
-		xml.write(TERM_WHITE, t[1])
-		xml.write(ecol, "\"") 
-		xml.write(TERM_WHITE, "\n")
-	    else
-		if not_flag then
-		    xml.write(bcol, "Not:\n")
-		    tab = tab .. "    "
-		xml:print_xml(t, tab)
-		return
-		end
-	    end
-	end
-
-	for i = 1, getn(t) do
-		if type(t[i]) == "string" then
-			-- xml.write(TERM_WHITE, t[i].."\n")
-		else
-			xml:english_xml(t[i], nextlevel, children_not_flag)
-		end
-	end
-end
-
-function xml:print_xml(t, tab)
-	local i, k, e
-	local inside = nil
-	local bcol, ecol = TERM_L_GREEN, TERM_GREEN
-
-	if xml.write_active and t == auto_aux.rule then bcol, ecol = TERM_VIOLET, TERM_VIOLET end
-
-	xml.write(bcol, tab.."<"..t.label)
-	for k, e in t.args do
-		xml.write(TERM_L_BLUE, " "..k)
-		xml.write(TERM_WHITE, "=\"")
-		xml.write(TERM_YELLOW, e)
-		xml.write(TERM_WHITE, "\"")
-	end
-	xml.write(bcol, ">")
-
-	for i = 1, getn(t) do
-		if type(t[i]) == "string" then
-			xml.write(TERM_WHITE, t[i])
-		else
-			if not inside then xml.write(TERM_WHITE, "\n") end
-			inside = not nil
-			xml:print_xml(t[i], tab.."    ")
-		end
-	end
-
-	if not inside then
-		xml.write(ecol, "</"..t.label..">\n")
-	else
-		xml.write(ecol, tab.."</"..t.label..">\n")
-	end
-end
-
--- t is a table representing xml, outputs the xml code via xml.write()
-function xml:output(t)
-	local i
-	for i = 1, getn(t) do
-		xml:print_xml(t[i], "")
-	end
-end
diff --git a/lib/data/.cvsignore b/lib/data/.cvsignore
deleted file mode 100644
index 82490963..00000000
--- a/lib/data/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.cvsignore
-*.raw
\ No newline at end of file
diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt
index 427d5060..c1ab7fa1 100644
--- a/lib/edit/a_info.txt
+++ b/lib/edit/a_info.txt
@@ -24,10 +24,6 @@
 #                                            -Leon Marrick
 # Contributors: Jeff Butler, Neal Hackler, Ethan Sicotte, Pat Tracy, Divia
 
-# Version stamp (required)
-
-V:2.0.0
-
 
 
 # The Phial of Galadriel
@@ -36,9 +32,12 @@ N:1:of Galadriel
 I:39:100:4
 W:20:10:10:10000
 P:0:1d1:0:0:0
-F:ACTIVATE | SEARCH | LITE3 | LUCK
-F:INSTA_ART | HIDE_TYPE
-a:HARDCORE=LIGHT
+F:ACTIVATE
+F:HIDE_TYPE
+F:INSTA_ART
+F:LITE3
+F:LUCK
+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.
 
@@ -49,9 +48,15 @@ N:2:of Elendil
 I:39:101:1
 W:30:25:5:32500
 P:0:1d1:0:0:0
-F:ACTIVATE | SEE_INVIS | HOLD_LIFE |
-F:INSTA_ART | SPEED | LITE3 | LITE1 | HIDE_TYPE
-a:HARDCORE=MAP_LIGHT
+F:ACTIVATE
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:INSTA_ART
+F:LITE1
+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.
 
@@ -63,9 +68,19 @@ N:3:of Thrain
 I:39:102:3
 W:50:50:5:50000
 P:0:1d1:0:0:0
-F:ACTIVATE | SEE_INVIS | HOLD_LIFE | RES_CHAOS | HIDE_TYPE | LUCK
-F:INSTA_ART | SPEED | RES_LITE | RES_DARK | ESP_ORC | LITE3
-a:HARDCORE=THRAIN
+F:ACTIVATE
+F:ESP_ORC
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:INSTA_ART
+F:LITE3
+F:LUCK
+F:RES_CHAOS
+F:RES_DARK
+F:RES_LITE
+F:SEE_INVIS
+F:SPEED
+a:THRAIN
 D:A great globe seemingly filled with moonlight, the famed Heart of the 
 D:Mountain, which splinters the light that falls upon it into a thousand 
 D:glowing shards.
@@ -76,10 +91,12 @@ D:glowing shards.
 N:4:of Carlammas
 I:40:10:2
 W:50:10:3:60000
-F:CON | HIDE_TYPE | 
-F:ACTIVATE | RES_FIRE | 
+F:ACTIVATE
+F:CON
+F:HIDE_TYPE
 F:INSTA_ART
-a:HARDCORE=PROT_EVIL
+F:RES_FIRE
+a:PROT_EVIL
 D:A fiery circle of bronze, with mighty spells to ward off evil.
 
 
@@ -88,11 +105,19 @@ D:A fiery circle of bronze, with mighty spells to ward off evil.
 N:5:of Ingwe
 I:40:11:3
 W:65:30:3:90000
-F:INT | WIS | CHR | SEARCH | INFRA | HIDE_TYPE | 
-F:SEE_INVIS | FREE_ACT | ACTIVATE | 
-F:RES_ACID | RES_COLD | RES_ELEC | 
+F:ACTIVATE
+F:CHR
+F:FREE_ACT
+F:HIDE_TYPE
+F:INFRA
 F:INSTA_ART
-a:HARDCORE=DISP_EVIL
+F:INT
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:SEE_INVIS
+F:WIS
+a:DISP_EVIL
 D:The ancient heirloom of Ingwe, high lord of the Vanyar, against whom nothing 
 D:of evil could stand.
 
@@ -102,9 +127,18 @@ D:of evil could stand.
 N:6:'Nauglamir'
 I:40:12:3
 W:70:50:3:75000
-F:STR | CON | DEX | INFRA | HIDE_TYPE | RES_FEAR | 
-F:SEE_INVIS | FREE_ACT | REGEN | LITE3 | SPEED | 
+F:CON
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:INFRA
 F:INSTA_ART
+F:LITE3
+F:REGEN
+F:RES_FEAR
+F:SEE_INVIS
+F:SPEED
+F:STR
 D:A carencet of gold, set with a multitude of shining gems of 
 D:Valinor.  Despite its size, its weight seems as that of gossamer.
 
@@ -116,11 +150,17 @@ D:Valinor.  Despite its size, its weight seems as that of gossamer.
 N:7:of Flare
 I:45:52:3
 W:50:35:2:75000
-F:STR | CON | CHR | HIDE_TYPE |
-F:IM_FIRE | ACTIVATE | SEARCH |
-F:ESP_THUNDERLORD | SEE_INVIS | FLY |
+F:ACTIVATE
+F:CHR
+F:CON
+F:ESP_THUNDERLORD
+F:FLY
+F:HIDE_TYPE
+F:IM_FIRE
 F:INSTA_ART
-a:HARDCORE=DIM_DOOR
+F:SEE_INVIS
+F:STR
+a:DIM_DOOR
 Z:swap position
 D:The mighty ring of the Thunderlord Flare that makes the wearer 
 D:strong and healthy.  Once a ring of power, it was
@@ -133,10 +173,20 @@ D:of Thunderlords.
 N:8:of Barahir
 I:45:32:1
 W:50:25:2:75000
-F:STR | INT | WIS | DEX | CON | CHR | STEALTH | HIDE_TYPE | 
-F:RES_POIS | RES_DARK | ACTIVATE | SEE_INVIS | SEARCH |
+F:ACTIVATE
+F:CHR
+F:CON
+F:DEX
+F:HIDE_TYPE
 F:INSTA_ART
-a:HARDCORE=BARAHIR
+F:INT
+F:RES_DARK
+F:RES_POIS
+F:SEE_INVIS
+F:STEALTH
+F:STR
+F:WIS
+a:BARAHIR
 D:A ring shaped into twinned serpents with eyes of emerald meeting beneath 
 D:a crown of flowers, an ancient treasure of Isildur's house.
 
@@ -146,10 +196,15 @@ D:a crown of flowers, an ancient treasure of Isildur's house.
 N:9:of Tulkas
 I:45:33:4
 W:70:50:2:175000
-F:STR | DEX | CON | HIDE_TYPE | 
-F:ACTIVATE | SPEED | ESP_EVIL | 
+F:ACTIVATE
+F:CON
+F:DEX
+F:ESP_EVIL
+F:HIDE_TYPE
 F:INSTA_ART
-a:HARDCORE=TULKAS
+F:SPEED
+F:STR
+a:TULKAS
 D:The treasure of Tulkas, most fleet and wrathful of the Valar.
 
 
@@ -159,12 +214,29 @@ N:10:of Power 'Narya'
 I:45:34:1
 W:70:30:2:100000
 P:0:1d1:6:6:0
-F:STR | INT | WIS | DEX | CON | CHR | SPEED | HIDE_TYPE | LUCK
-F:ACTIVATE | FREE_ACT | SEE_INVIS | 
-F:SUST_STR | SUST_CON | SUST_WIS | SUST_CHR | SPECIAL_GENE |
-F:IM_FIRE | RES_NETHER | RES_FEAR | REGEN | 
+F:ACTIVATE
+F:CHR
+F:CON
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:IM_FIRE
 F:INSTA_ART
-a:HARDCORE=NARYA
+F:INT
+F:LUCK
+F:REGEN
+F:RES_FEAR
+F:RES_NETHER
+F:SEE_INVIS
+F:SPECIAL_GENE
+F:SPEED
+F:STR
+F:SUST_CHR
+F:SUST_CON
+F:SUST_STR
+F:SUST_WIS
+F:WIS
+a:NARYA
 D:The Ring of Fire, set with a ruby that glows like flame.  Narya is one 
 D:of the three Rings of Power created by the Elves and hidden by them from 
 D:Sauron.
@@ -176,12 +248,29 @@ N:11:of Power 'Nenya'
 I:45:35:2
 W:80:40:2:200000
 P:0:1d1:9:9:0
-F:STR | INT | WIS | DEX | CON | CHR | SPEED | HIDE_TYPE | LUCK 
-F:ACTIVATE | HOLD_LIFE | FREE_ACT | SEE_INVIS | 
-F:SUST_INT | SUST_WIS | SUST_CHR |
-F:IM_COLD | RES_BLIND | STEALTH | ESP_ALL | 
+F:ACTIVATE
+F:CHR
+F:CON
+F:DEX
+F:ESP_ALL
+F:FREE_ACT
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:IM_COLD
 F:INSTA_ART
-a:HARDCORE=NENYA
+F:INT
+F:LUCK
+F:RANDOM_POWER
+F:RES_BLIND
+F:SEE_INVIS
+F:SPEED
+F:STEALTH
+F:STR
+F:SUST_CHR
+F:SUST_INT
+F:SUST_WIS
+F:WIS
+a:NENYA
 D:The Ring of Adamant, with a pure white stone as centrepiece.  Nenya is one 
 D:of the three Rings of Power created by the Elves and hidden by them from 
 D:Sauron.
@@ -193,13 +282,31 @@ N:12:of Power 'Vilya'
 I:45:36:3
 W:90:50:2:300000
 P:0:1d1:12:12:0
-F:STR | INT | WIS | DEX | CON | CHR | SPEED | HIDE_TYPE | LUCK 
-F:ACTIVATE | HOLD_LIFE | FREE_ACT | SEE_INVIS | 
-F:FEATHER | SLOW_DIGEST | REGEN | 
-F:SUST_STR | SUST_DEX | SUST_CON | 
-F:IM_ELEC | RES_POIS | RES_DISEN | 
+F:ACTIVATE
+F:CHR
+F:CON
+F:DEX
+F:FEATHER
+F:FREE_ACT
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:IM_ELEC
 F:INSTA_ART
-a:HARDCORE=VILYA
+F:INT
+F:LUCK
+F:RANDOM_POWER
+F:REGEN
+F:RES_DISEN
+F:RES_POIS
+F:SEE_INVIS
+F:SLOW_DIGEST
+F:SPEED
+F:STR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_STR
+F:WIS
+a:VILYA
 D:The Ring of Sapphire, with clear blue gems that shine like stars, 
 D:glittering untouchable despite all that Sauron ever wrought.  Vilya is 
 D:one of the three Rings of Power created by the Elves and hidden by them 
@@ -212,16 +319,48 @@ N:13:of Power 'The One Ring'
 I:45:37:5
 W:100:100:2:5000000
 P:0:1d1:15:15:0
-F:STR | INT | WIS | DEX | CON | CHR | SPEED | HIDE_TYPE | 
-F:ACTIVATE | AUTO_CURSE | HEAVY_CURSE | INVIS | SPELL | MANA |
-F:SEE_INVIS | REGEN | FREE_ACT | CURSED | CURSE_NO_DROP | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_ACID | PERMA_CURSE |
-F:SUST_STR | SUST_DEX | SUST_CON | 
-F:SUST_INT | SUST_WIS | SUST_CHR | 
-F:RES_BLIND | RES_POIS | RES_DISEN | RES_NETHER | ESP_ALL | 
-F:DRAIN_MANA | DRAIN_HP | DRAIN_EXP | 
+F:ACTIVATE
+F:AUTO_CURSE
+F:CHR
+F:CON
+F:CURSED
+F:CURSE_NO_DROP
+F:DEX
+F:DRAIN_EXP
+F:DRAIN_HP
+F:DRAIN_MANA
+F:ESP_ALL
+F:FREE_ACT
+F:HEAVY_CURSE
+F:HIDE_TYPE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
 F:INSTA_ART
-a:HARDCORE=POWER
+F:INT
+F:INVIS
+F:MANA
+F:PERMA_CURSE
+F:RANDOM_POWER
+F:RANDOM_RESIST
+F:REGEN
+F:RES_BLIND
+F:RES_DISEN
+F:RES_NETHER
+F:RES_POIS
+F:SEE_INVIS
+F:SPEED
+F:SPELL
+F:STR
+F:SUST_CHR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_INT
+F:SUST_STR
+F:SUST_WIS
+F:WIS
+a:POWER
 Z:change the world
 D:"Ash nazg durbatuluk, ash nazg gimbatul, ash nazg thrakatuluk agh 
 D:burzum-ishi krimpatul". Unadorned, made of massive gold, 
@@ -235,7 +374,8 @@ N:14:of Space-Time
 I:39:105:0
 W:30:12:15:50000
 P:0:1d1:0:0:0
-F:INSTA_ART | LITE1
+F:INSTA_ART
+F:LITE1
 D:A powerful stone that provides a strong light for any who 
 D:wields it. It is rumoured that it may even protect the wearer from 
 D:the passing of time.
@@ -250,9 +390,12 @@ N:15:of Lore
 I:39:106:0
 W:15:12:15:20000
 P:0:1d1:0:0:0
-F:ACTIVATE | SPECIAL_GENE | EASY_USE | LITE1 | 
+F:ACTIVATE
+F:EASY_USE
 F:INSTA_ART
-a:HARDCORE=STONE_LORE
+F:LITE1
+F:SPECIAL_GENE
+a:STONE_LORE
 D:A great emerald that fills your mind with images of knowledge and dreadful 
 D:understanding as you stare into its depths.
 
@@ -263,11 +406,20 @@ N:16:'Razorback'
 I:38:6:0
 W:90:9:500:400000
 P:30:2d4:-4:0:25
-F:FREE_ACT | IM_ELEC | SPECIAL_GENE |
-F:RES_FIRE | RES_COLD | RES_POIS | RES_LITE | RES_DARK | 
-F:LITE1 | SEE_INVIS | AGGRAVATE | ESP_DRAGON
 F:ACTIVATE
-a:HARDCORE=RAZORBACK
+F:AGGRAVATE
+F:ESP_DRAGON
+F:FREE_ACT
+F:IM_ELEC
+F:LITE1
+F:RES_COLD
+F:RES_DARK
+F:RES_FIRE
+F:RES_LITE
+F:RES_POIS
+F:SEE_INVIS
+F:SPECIAL_GENE
+a:RAZORBACK
 D:A massive suit of heavy dragon scales deeply saturated with many colours.  
 D:It throbs with angry energies, and you feel the raw elemental might of 
 D:untamed Lightning as you put it on.
@@ -280,13 +432,34 @@ N:17:of Eternity
 I:38:30:0
 W:100:16:600:500000
 P:50:2d4:-8:0:35
-F:HOLD_LIFE | REGEN | ESP_DRAGON | 
-F:RES_ACID | RES_FIRE | RES_COLD | RES_ELEC | RES_POIS | FEATHER | FLY |
-F:RES_NETHER | RES_NEXUS | RES_CHAOS | RES_LITE | RES_DARK | ULTIMATE | 
-F:RES_SHARDS | RES_SOUND | RES_DISEN | RES_BLIND | RES_CONF |
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | SPECIAL_GENE
 F:ACTIVATE
-a:HARDCORE=BLADETURNER
+F:ESP_DRAGON
+F:FEATHER
+F:FLY
+F:HOLD_LIFE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:REGEN
+F:RES_ACID
+F:RES_BLIND
+F:RES_CHAOS
+F:RES_COLD
+F:RES_CONF
+F:RES_DARK
+F:RES_DISEN
+F:RES_ELEC
+F:RES_FIRE
+F:RES_LITE
+F:RES_NETHER
+F:RES_NEXUS
+F:RES_POIS
+F:RES_SHARDS
+F:RES_SOUND
+F:SPECIAL_GENE
+F:ULTIMATE
+a:BLADETURNER
 D:A suit of adamant, set with scales of every colour, surrounded in a nimbus 
 D:of perfectly untramelled yet inextricably intermingled and utterly mastered 
 D:powers elemental and ethereal.
@@ -298,9 +471,20 @@ N:18:of Melkor
 I:22:2:-4
 W:65:45:200:100000
 P:0:4d6:12:24:0
-F:STEALTH | WIS | CURSED | HEAVY_CURSE | TY_CURSE | ESP_GOOD | 
-F:DRAIN_MANA | DRAIN_HP | 
-F:RES_DARK | RES_BLIND | RES_LITE | RES_NETHER | BRAND_POIS | RES_CONF
+F:BRAND_POIS
+F:CURSED
+F:DRAIN_HP
+F:DRAIN_MANA
+F:ESP_GOOD
+F:HEAVY_CURSE
+F:RES_BLIND
+F:RES_CONF
+F:RES_DARK
+F:RES_LITE
+F:RES_NETHER
+F:STEALTH
+F:TY_CURSE
+F:WIS
 D:The mighty spear used once by Melkor to slay the trees of Valinor.
 
 
@@ -310,11 +494,20 @@ N:19:'Soulkeeper'
 I:37:30:2
 W:75:9:420:300000
 P:40:2d4:-4:0:20
-F:CON | 
-F:HOLD_LIFE | SUST_CON | ESP_UNDEAD | RES_CONF | RES_FEAR | 
-F:RES_ACID | RES_COLD | RES_DARK | RES_NETHER | RES_NEXUS | RES_CHAOS | 
 F:ACTIVATE
-a:HARDCORE=CURE_1000
+F:CON
+F:ESP_UNDEAD
+F:HOLD_LIFE
+F:RES_ACID
+F:RES_CHAOS
+F:RES_COLD
+F:RES_CONF
+F:RES_DARK
+F:RES_FEAR
+F:RES_NETHER
+F:RES_NEXUS
+F:SUST_CON
+a:CURE_1000
 D:A suit of imperishable adamant, with unconquerable strength to endure evil 
 D:and disruptive magics, that protects the life force of its wearer as 
 D:nothing else can.
@@ -326,9 +519,14 @@ N:20:of Isildur
 I:37:15:1
 W:30:3:300:50000
 P:25:2d4:0:0:25
-F:CON | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
-F:RES_SOUND | RES_CONF | RES_NEXUS
+F:CON
+F:RES_ACID
+F:RES_COLD
+F:RES_CONF
+F:RES_ELEC
+F:RES_FIRE
+F:RES_NEXUS
+F:RES_SOUND
 D:A gleaming steel suit covering the wearer from neck to foot, with runes of 
 D:warding and stability deeply engraved into its surface.
 
@@ -339,8 +537,18 @@ N:21:of the Rohirrim
 I:37:9:2
 W:30:3:200:30000
 P:19:1d4:0:0:15
-F:STR | DEX | SPEED | HIDE_TYPE | RES_FEAR | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_CONF | RES_SOUND
+F:DEX
+F:HIDE_TYPE
+F:RANDOM_RESIST
+F:RES_ACID
+F:RES_COLD
+F:RES_CONF
+F:RES_ELEC
+F:RES_FEAR
+F:RES_FIRE
+F:RES_SOUND
+F:SPEED
+F:STR
 D:A stiff suit of armour composed of small metal plates sewn to an 
 D:inner layer of heavy canvas, and covered with a second layer of 
 D:cloth.  Within it is the spirit of Eorl the Young, matchless in combat.
@@ -352,12 +560,20 @@ N:22:'Belegennon'
 I:37:20:4
 W:40:10:150:135000
 P:28:1d4:-1:0:20
-F:STEALTH | WIS | INT |
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_POIS |
-F:HOLD_LIFE | RES_DARK | RES_FEAR |
-F:SEE_INVIS |
 F:ACTIVATE
-a:HARDCORE=BELEGENNON
+F:HOLD_LIFE
+F:INT
+F:RES_ACID
+F:RES_COLD
+F:RES_DARK
+F:RES_ELEC
+F:RES_FEAR
+F:RES_FIRE
+F:RES_POIS
+F:SEE_INVIS
+F:STEALTH
+F:WIS
+a:BELEGENNON
 D:This wondrous suit of fine-linked chain shimmers as though of pure silver.  
 D:It stands untouched amidst the fury of the elements, and a power of 
 D:concealment rests within.
@@ -369,10 +585,19 @@ N:23:of Celeborn
 I:37:25:4
 W:40:3:250:150000
 P:35:2d4:-3:0:25
-F:STR | CHR | HIDE_TYPE | ESP_ORC
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_DARK | 
-F:RES_DISEN | ACTIVATE
-a:HARDCORE=GENOCIDE
+F:ACTIVATE
+F:CHR
+F:ESP_ORC
+F:HIDE_TYPE
+F:RANDOM_RESIST
+F:RES_ACID
+F:RES_COLD
+F:RES_DARK
+F:RES_DISEN
+F:RES_ELEC
+F:RES_FIRE
+F:STR
+a:GENOCIDE
 D:A shimmering suit of true-silver, forged long ago by dwarven smiths of 
 D:legend.  It gleams with purest white as you gaze upon it, and mighty are 
 D:its powers to protect and banish.
@@ -384,8 +609,16 @@ N:24:of Arvedui
 I:37:4:2
 W:20:3:220:32000
 P:14:1d4:-2:0:15
-F:STR | CHR | HIDE_TYPE | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_SHARDS | RES_NEXUS
+F:CHR
+F:HIDE_TYPE
+F:RANDOM_RESIST
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_NEXUS
+F:RES_SHARDS
+F:STR
 D:A hauberk, leggings, and sleeves of interlocking steel rings, well padded 
 D:with leather. You feel strong and tall as Arvedui, last king of Arnor, 
 D:as you put it on.
@@ -397,9 +630,16 @@ N:25:of Caspanion
 I:37:6:3
 W:25:9:270:40000
 P:16:1d4:-2:0:20
-F:INT | WIS | CON | HIDE_TYPE | 
-F:RES_ACID | RES_POIS | RES_CONF | ACTIVATE
-a:HARDCORE=DEST_DOOR
+F:ACTIVATE
+F:CON
+F:HIDE_TYPE
+F:INT
+F:RANDOM_RESIST
+F:RES_ACID
+F:RES_CONF
+F:RES_POIS
+F:WIS
+a:DEST_DOOR
 D:A hauberk, leggings, and sleeves of interlocking steel rings, strategically 
 D:reinforced at vital locations with a second layer of chain.  Magics to 
 D:enhance body and mind lie within, and no door can hope to resist the wearer.
@@ -411,11 +651,28 @@ N:26:of Marda
 I:36:16:5
 W:70:3:80:80000
 P:9:0d0:0:0:25
-F:FREE_ACT | RES_BLIND | RES_CONF | RES_FEAR | DRAIN_MANA | 
-F:REFLECT | RES_NEXUS | SH_FIRE | SUST_INT | SUST_CON | SUST_CHR |
-F:ESP_THUNDERLORD | CON | CHR | INT | 
-F:RES_ACID | RES_ELEC | IM_COLD | RES_COLD | AGGRAVATE | HEAVY_CURSE |
+F:AGGRAVATE
+F:CHR
+F:CON
 F:CURSED
+F:DRAIN_MANA
+F:ESP_THUNDERLORD
+F:FREE_ACT
+F:HEAVY_CURSE
+F:IM_COLD
+F:INT
+F:REFLECT
+F:RES_ACID
+F:RES_BLIND
+F:RES_COLD
+F:RES_CONF
+F:RES_ELEC
+F:RES_FEAR
+F:RES_NEXUS
+F:SH_FIRE
+F:SUST_CHR
+F:SUST_CON
+F:SUST_INT
 D:The flying suit of Marda, very powerful armour that protects 
 D:the wearer from cold.  Wonderful as this mighty 
 D:armour is, beware wearing it, for it has been cursed by a 
@@ -429,9 +686,21 @@ N:27:of Trone
 I:36:16:4
 W:30:3:80:65000
 P:9:0d0:0:0:20
-F:REFLECT | RES_NEXUS | SH_FIRE | FLY | SPECIAL_GENE | 
-F:STEALTH | ESP_THUNDERLORD | CON | INT | SPEED | 
-F:RES_ACID | RES_ELEC | IM_FIRE | RES_COLD
+F:CON
+F:ESP_THUNDERLORD
+F:FLY
+F:IM_FIRE
+F:INT
+F:RANDOM_RESIST
+F:REFLECT
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_NEXUS
+F:SH_FIRE
+F:SPECIAL_GENE
+F:SPEED
+F:STEALTH
 D:The flying suit of Trone.  It protects the user from fire and 
 D:imps are said to be less annoying with this on.
 
@@ -442,8 +711,13 @@ N:28:'Thalkettoth'
 I:36:11:3
 W:20:3:60:25000
 P:11:1d1:-1:0:25
-F:DEX | SPEED | HIDE_TYPE | SPECIAL_GENE |
-F:RES_ACID | RES_SHARDS
+F:DEX
+F:HIDE_TYPE
+F:RANDOM_RESIST
+F:RES_ACID
+F:RES_SHARDS
+F:SPECIAL_GENE
+F:SPEED
 D:A tunic and skirt sewn with thick, overlapping scales of hardened 
 D:leather whose wearer moves with agility and assurance.
 
@@ -454,8 +728,18 @@ N:29:of Wormtongue
 I:30:2:3
 W:40:20:20:50000
 P:2:1d1:-10:-10:10
-F:INT | DEX | CHR | STEALTH | SEARCH | SPEED | HIDE_TYPE | 
-F:FREE_ACT | FEATHER | RES_DARK | RES_LITE | ESP_GOOD | ESP_UNIQUE
+F:CHR
+F:DEX
+F:ESP_GOOD
+F:ESP_UNIQUE
+F:FEATHER
+F:FREE_ACT
+F:HIDE_TYPE
+F:INT
+F:RES_DARK
+F:RES_LITE
+F:SPEED
+F:STEALTH
 Z:panic hit
 D:The pair of boots used by Grima son of Galmod, also named the Wormtongue:  
 D:a treacherous but persuasive counsellor, ever ready to betray, sneak, 
@@ -468,9 +752,15 @@ N:30:of Thorin
 I:34:3:4
 W:30:6:65:60000
 P:3:1d2:0:0:25
-F:STR | CON | HIDE_TYPE | 
-F:FREE_ACT | IM_ACID | RES_SOUND | 
-F:RES_CHAOS | ESP_ORC
+F:CON
+F:ESP_ORC
+F:FREE_ACT
+F:HIDE_TYPE
+F:IM_ACID
+F:RANDOM_RESIST
+F:RES_CHAOS
+F:RES_SOUND
+F:STR
 D:Invoking the strength and endurance of Thorin, King under the Mountain, 
 D:this little metal shield is proof against the Element of Earth.
 
@@ -481,7 +771,13 @@ N:31:of Celegorm
 I:34:4:0
 W:30:3:60:12000
 P:4:1d2:0:0:20
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_LITE | RES_DARK
+F:RANDOM_RESIST
+F:RES_ACID
+F:RES_COLD
+F:RES_DARK
+F:RES_ELEC
+F:RES_FIRE
+F:RES_LITE
 D:This shield emblazoned with a multitude of creatures not seen for ages 
 D:once protected Celegorm, lord of Himlad; around it lies a mystic balance 
 D:that contains the conflicts of the elements.
@@ -493,8 +789,18 @@ N:32:of Anarion
 I:34:5:0
 W:40:9:120:160000
 P:5:1d3:0:0:20
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | SUST_STR | SUST_INT | 
-F:SUST_WIS | SUST_DEX | SUST_CON | SUST_CHR | ESP_EVIL
+F:ESP_EVIL
+F:RANDOM_RESIST
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:SUST_CHR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_INT
+F:SUST_STR
+F:SUST_WIS
 D:The great metal-bound shield of Anarion, son of Elendil, who Sauron found 
 D:himself powerless to wither or diminish.
 
@@ -505,11 +811,21 @@ N:33:of Hurin
 I:22:10:3
 W:20:15:180:90000
 P:0:2d6:12:20:0
-F:STR | CON | HIDE_TYPE | BRAND_ACID | RES_ACID | LITE1 | DRAIN_MANA | 
-F:SLAY_ORC | KILL_DEMON | SLAY_TROLL | ACTIVATE | SHOW_MODS
+F:ACTIVATE
+F:BRAND_ACID
+F:CON
+F:DRAIN_MANA
+F:HIDE_TYPE
+F:KILL_DEMON
+F:LITE1
 F:MUST2H
+F:RES_ACID
+F:SHOW_MODS
+F:SLAY_ORC
+F:SLAY_TROLL
+F:STR
 f:MUST2H
-a:HARDCORE=HURIN
+a:HURIN
 D:Wielded by Hurin Thalion in the Fifth Battle of Beleriand, this 
 D:troll-bane smoked in the black blood of Gothmog's guards.
 
@@ -520,12 +836,32 @@ N:34:of Morgoth
 I:33:50:125
 W:100:1:20:10000000
 P:0:1d1:0:0:0
-F:STR | INT | WIS | DEX | CON | CHR | INFRA | HIDE_TYPE | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_POIS | 
-F:RES_LITE | RES_DARK | RES_CONF | RES_NEXUS | RES_NETHER | 
-F:LITE1 | SEE_INVIS | ESP_ALL |
-F:CURSED | HEAVY_CURSE | PERMA_CURSE |
-F:INSTA_ART | SPECIAL_GENE
+F:CHR
+F:CON
+F:CURSED
+F:DEX
+F:ESP_ALL
+F:HEAVY_CURSE
+F:HIDE_TYPE
+F:INFRA
+F:INSTA_ART
+F:INT
+F:LITE1
+F:PERMA_CURSE
+F:RES_ACID
+F:RES_COLD
+F:RES_CONF
+F:RES_DARK
+F:RES_ELEC
+F:RES_FIRE
+F:RES_LITE
+F:RES_NETHER
+F:RES_NEXUS
+F:RES_POIS
+F:SEE_INVIS
+F:SPECIAL_GENE
+F:STR
+F:WIS
 D:Two Silmarils of Feanor blaze from the thunderous crown of twisted 
 D:iron. The corrupted metal feels at once as infernal as hellfire 
 D:and as chilling as the Outer Darkness. One protrusion from the 
@@ -538,9 +874,19 @@ N:35:of Beruthiel
 I:33:10:-5
 W:40:12:20:0
 P:0:1d1:0:0:20
-F:STR | DEX | CON | HIDE_TYPE | 
-F:FREE_ACT | SEE_INVIS | ESP_ANIMAL | ESP_EVIL | ESP_NONLIVING | ESP_ALL | 
-F:CURSED | AUTO_CURSE
+F:AUTO_CURSE
+F:CON
+F:CURSED
+F:DEX
+F:ESP_ALL
+F:ESP_ANIMAL
+F:ESP_EVIL
+F:ESP_NONLIVING
+F:FREE_ACT
+F:HIDE_TYPE
+F:RANDOM_POWER
+F:SEE_INVIS
+F:STR
 D:The midnight-hued steel circlet of the sorceress-queen Beruthiel, which 
 D:grants extraordinary powers of sight and awareness at a terrible physical 
 D:cost.
@@ -552,8 +898,14 @@ N:36:of Thranduil
 I:32:2:2
 W:20:2:15:50000
 P:2:0d0:0:0:10
-F:INT | WIS | HIDE_TYPE | 
-F:RES_BLIND | ESP_ORC | ESP_EVIL | ESP_TROLL
+F:ESP_EVIL
+F:ESP_ORC
+F:ESP_TROLL
+F:HIDE_TYPE
+F:INT
+F:RANDOM_RESIST
+F:RES_BLIND
+F:WIS
 D:The hunting cap of King Thranduil, to whose ears come all the secrets of 
 D:his forest domain.
 
@@ -564,7 +916,11 @@ N:37:of Thengel
 I:32:3:3
 W:10:2:20:22000
 P:3:1d1:0:0:12
-F:WIS | CHR | RES_CONF | HIDE_TYPE | LUCK
+F:CHR
+F:HIDE_TYPE
+F:LUCK
+F:RES_CONF
+F:WIS
 D:A ridged helmet made of steel, and embossed with scenes of valour in fine-
 D:engraved silver.  It grants the wearer nobility, clarity of thought and 
 D:understanding.
@@ -576,9 +932,20 @@ N:38:of Hammerhand
 I:32:6:3
 W:20:2:60:45000
 P:6:1d3:0:0:20
-F:STR | DEX | CON | HIDE_TYPE | SPECIAL_GENE | RES_FEAR | 
-F:SUST_STR | SUST_DEX | SUST_CON | 
-F:RES_ACID | RES_NEXUS | RES_COLD | RES_DARK | SLOW_DIGEST | 
+F:CON
+F:DEX
+F:HIDE_TYPE
+F:RES_ACID
+F:RES_COLD
+F:RES_DARK
+F:RES_FEAR
+F:RES_NEXUS
+F:SLOW_DIGEST
+F:SPECIAL_GENE
+F:STR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_STR
 Z:berserk
 D:A great helm as steady as the heroes of the Westdike. Mighty were the 
 D:blows of Helm, the Hammerhand!
@@ -590,10 +957,22 @@ N:39:of Dor-Lomin
 I:32:7:4
 W:40:12:75:300000
 P:8:1d3:0:0:20
-F:STR | DEX | CON | HIDE_TYPE | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_LITE | RES_BLIND | 
-F:LITE1 | SEE_INVIS | ESP_DRAGON | ESP_THUNDERLORD | ACTIVATE
-a:HARDCORE=GORLIM
+F:ACTIVATE
+F:CON
+F:DEX
+F:ESP_DRAGON
+F:ESP_THUNDERLORD
+F:HIDE_TYPE
+F:LITE1
+F:RES_ACID
+F:RES_BLIND
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_LITE
+F:SEE_INVIS
+F:STR
+a:GORLIM
 D:The legendary dragon helm of Turin Turambar, an object of dread to the 
 D:servants of Morgoth.
 
@@ -603,9 +982,13 @@ N:40:'Holhenneth'
 I:32:5:2
 W:20:5:75:100000
 P:5:1d3:0:0:10
-F:INT | WIS | SEARCH | HIDE_TYPE | 
-F:RES_BLIND | SEE_INVIS | ACTIVATE
-a:HARDCORE=DETECT_ALL
+F:ACTIVATE
+F:HIDE_TYPE
+F:INT
+F:RES_BLIND
+F:SEE_INVIS
+F:WIS
+a:DETECT_ALL
 D:A famous helm of forged iron granting extraordinary powers of mind and 
 D:awareness.
 
@@ -616,12 +999,26 @@ N:41:of Gorlim
 I:32:5:-5
 W:20:5:75:0
 P:5:1d3:25:25:10
-F:INT | WIS | SEARCH | HIDE_TYPE | SHOW_MODS |
-F:SEE_INVIS | NO_MAGIC | HEAVY_CURSE | TY_CURSE
-F:RES_DISEN | RES_FEAR | FREE_ACT | RES_ACID | RES_FIRE | RES_POIS |
-F:IM_COLD | ACTIVATE | DRAIN_HP | 
-F:TELEPORT | CURSED
-a:HARDCORE=GORLIM
+F:ACTIVATE
+F:CURSED
+F:DRAIN_HP
+F:FREE_ACT
+F:HEAVY_CURSE
+F:HIDE_TYPE
+F:IM_COLD
+F:INT
+F:NO_MAGIC
+F:RES_ACID
+F:RES_DISEN
+F:RES_FEAR
+F:RES_FIRE
+F:RES_POIS
+F:SEE_INVIS
+F:SHOW_MODS
+F:TELEPORT
+F:TY_CURSE
+F:WIS
+a:GORLIM
 D:A headpiece, gaudy and barbaric, that betrayed a warrior when he most 
 D:needed succor.
 
@@ -632,10 +1029,26 @@ N:42:of Gondor
 I:33:11:3
 W:40:40:30:125000
 P:0:1d1:0:0:15
-F:STR | WIS | CON | HIDE_TYPE | SPEED | RES_CONF | RES_SOUND | 
-F:RES_COLD | RES_FIRE | RES_LITE | RES_BLIND | RES_ELEC | RES_CHAOS |
-F:LITE1 | SEE_INVIS | REGEN | ACTIVATE
-a:HARDCORE=CURE_700
+F:ACTIVATE
+F:CON
+F:HIDE_TYPE
+F:LITE1
+F:RANDOM_POWER
+F:RANDOM_RESIST
+F:REGEN
+F:RES_BLIND
+F:RES_CHAOS
+F:RES_COLD
+F:RES_CONF
+F:RES_ELEC
+F:RES_FIRE
+F:RES_LITE
+F:RES_SOUND
+F:SEE_INVIS
+F:SPEED
+F:STR
+F:WIS
+a:CURE_700
 D:The shining winged circlet brought by Elendil from dying Numenor, emblem of 
 D:Gondor through an age of the world.
 
@@ -647,11 +1060,21 @@ N:43:of Numenor
 I:33:12:3
 W:60:30:40:50000
 P:0:1d1:0:0:18
-F:INT | DEX | CHR | SEARCH | SPEED | HIDE_TYPE | 
-F:SEE_INVIS | FREE_ACT | RES_DARK | RES_BLIND | 
-F:RES_SHARDS | RES_SOUND | RES_LITE | RES_COLD | 
-F:LITE1 | ACTIVATE | DRAIN_MANA
-a:HARDCORE=NUMENOR
+F:CHR
+F:DEX
+F:DRAIN_MANA
+F:FREE_ACT
+F:HIDE_TYPE
+F:INT
+F:LITE1
+F:RES_BLIND
+F:RES_COLD
+F:RES_DARK
+F:RES_LITE
+F:RES_SHARDS
+F:RES_SOUND
+F:SEE_INVIS
+F:SPEED
 D:A crown of massive gold, set with wondrous jewels of thought and warding, 
 D:worn by the kings of ancient Numenor.  Its wearer may go into battle 
 D:always knowing what he faces - unless his own folly blinds him to the 
@@ -664,8 +1087,14 @@ N:44:'Colluin'
 I:35:1:0
 W:5:45:10:40000
 P:1:0d0:0:0:20
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_POIS | ACTIVATE | ESP_GOOD
-a:HARDCORE=COLLUIN
+F:ACTIVATE
+F:ESP_GOOD
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_POIS
+a:COLLUIN
 D:A cape worn by a hero from Valinor, a land utterly beyond the strife 
 D:of Elements.
 
@@ -676,9 +1105,14 @@ N:45:'Holcolleth'
 I:35:1:2
 W:5:25:10:13000
 P:1:0d0:0:0:4
-F:INT | WIS | SPEED | STEALTH | HIDE_TYPE | 
-F:RES_ACID | ACTIVATE
-a:HARDCORE=SLEEP
+F:ACTIVATE
+F:HIDE_TYPE
+F:INT
+F:RES_ACID
+F:SPEED
+F:STEALTH
+F:WIS
+a:SLEEP
 D:This elven-grey mantle possesses great powers of tranquility and of 
 D:concealment, and grants the wearer the knowledge and understanding of 
 D:the Sindar.
@@ -690,9 +1124,16 @@ N:46:of Thingol
 I:35:1:3
 W:10:50:10:35000
 P:1:0d0:0:0:18
-F:DEX | CHR | HIDE_TYPE | 
-F:FREE_ACT | RES_ACID | RES_FIRE | RES_COLD | ACTIVATE
-a:HARDCORE=RECHARGE
+F:ACTIVATE
+F:CHR
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:RANDOM_POWER
+F:RES_ACID
+F:RES_COLD
+F:RES_FIRE
+a:RECHARGE
 D:A sable-hued cloak, with glowing elven-runes to restore magic showing calm 
 D:and clear as moonlight on still water.
 
@@ -703,7 +1144,10 @@ N:47:of Thorongil
 I:35:1:0
 W:5:10:10:8000
 P:1:0d0:0:0:10
-F:FREE_ACT | RES_ACID | SEE_INVIS | RES_FEAR
+F:FREE_ACT
+F:RES_ACID
+F:RES_FEAR
+F:SEE_INVIS
 D:A cloak of shimmering green and brown that grants sight beyond sight and 
 D:shakes off holding magics, worn by Aragorn son of Arathorn in his youth 
 D:as he adventured under the name of Thorongil.
@@ -715,9 +1159,12 @@ N:48:'Colannon'
 I:35:1:3
 W:5:20:10:11000
 P:1:0d0:0:0:15
-F:STEALTH | SPEED | RES_NEXUS | 
-F:RES_ACID | ACTIVATE
-a:HARDCORE=TELEPORT
+F:ACTIVATE
+F:RES_ACID
+F:RES_NEXUS
+F:SPEED
+F:STEALTH
+a:TELEPORT
 D:A crystal-blue cape of fine silk worn by a silent messenger of 
 D:the forces of Law. Somehow, its wearer is always able to escape 
 D:trouble.
@@ -729,9 +1176,23 @@ N:49:of Luthien
 I:35:6:2
 W:40:40:5:55000
 P:6:0d0:0:0:20
-F:INT | WIS | CHR | HIDE_TYPE | SPEED | STEALTH | INVIS | LUCK
-F:RES_ACID | RES_FIRE | RES_COLD | SPECIAL_GENE | ACTIVATE | SPELL_CONTAIN | WIELD_CAST
-a:HARDCORE=REST_LIFE
+F:ACTIVATE
+F:CHR
+F:HIDE_TYPE
+F:INT
+F:INVIS
+F:LUCK
+F:RANDOM_RESIST
+F:RES_ACID
+F:RES_COLD
+F:RES_FIRE
+F:SPECIAL_GENE
+F:SPEED
+F:SPELL_CONTAIN
+F:STEALTH
+F:WIELD_CAST
+F:WIS
+a:REST_LIFE
 D:The opaque midnight folds, inset with a multitude of tiny diamonds, of 
 D:this cloak swirl around you and you feel a hint, a fragment of the 
 D:knowledge and power to restore that lay in Luthien, the most beautiful 
@@ -744,8 +1205,15 @@ N:50:of Tuor
 I:35:6:4
 W:40:40:5:35000
 P:6:0d0:0:0:12
-F:STEALTH | DEX | HIDE_TYPE | INVIS | WATER_BREATH
-F:FREE_ACT | IM_ACID | SEE_INVIS | CLIMB
+F:CLIMB
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:IM_ACID
+F:INVIS
+F:SEE_INVIS
+F:STEALTH
+F:WATER_BREATH
 D:From the ruin of Gondolin did Tuor escape, through secret ways and travail, 
 D:shielded by his cloak from a multitude of hostile eyes.
 
@@ -755,7 +1223,10 @@ N:51:of Azaghal
 I:23:5:0
 W:15:30:30:40000
 P:0:2d5:12:14:0
-F:KILL_DRAGON | IM_FIRE | ESP_DRAGON | RES_FEAR
+F:ESP_DRAGON
+F:IM_FIRE
+F:KILL_DRAGON
+F:RES_FEAR
 D:The weapon of Azaghal when he wounded Glaurung.  It is deadly 
 D:when fighting dragons and is said to make the breaths of fire 
 D:completely harmless.
@@ -767,8 +1238,11 @@ N:52:'Cambeleg'
 I:31:1:2
 W:10:6:5:36000
 P:1:0d0:8:8:15
-F:STR | CON | HIDE_TYPE | 
-F:FREE_ACT | SHOW_MODS
+F:CON
+F:FREE_ACT
+F:HIDE_TYPE
+F:SHOW_MODS
+F:STR
 D:A hero's handgear that lends great prowess in battle.
 
 
@@ -778,9 +1252,13 @@ N:53:'Cammithrim'
 I:31:1:0
 W:10:3:5:30000
 P:1:0d0:0:0:10
-F:FREE_ACT | RES_LITE | SUST_CON | LITE1 | ACTIVATE
+F:ACTIVATE
+F:FREE_ACT
+F:LITE1
+F:RES_LITE
 F:SPECIAL_GENE
-a:HARDCORE=BO_MISS_1
+F:SUST_CON
+a:BO_MISS_1
 D:These gloves glow so brightly as to light the way for their owner and cast 
 D:magical bolts with great frequency.
 
@@ -791,8 +1269,11 @@ N:54:'Paurhach'
 I:31:2:0
 W:10:5:25:15000
 P:2:1d1:0:0:15
-F:RES_FIRE | ACTIVATE | SPELL_CONTAIN | WIELD_CAST
-a:HARDCORE=BO_FIRE_1
+F:ACTIVATE
+F:RES_FIRE
+F:SPELL_CONTAIN
+F:WIELD_CAST
+a:BO_FIRE_1
 D:A fiery set of gauntlets that can even shoot fire from the user's 
 D:hands.
 
@@ -803,9 +1284,14 @@ N:55:'Paurnimmen'
 I:31:2:4
 W:10:5:25:33000
 P:2:1d1:0:0:15
-F:RES_COLD | ACTIVATE
-F:SUST_CON | CON | REGEN | SPELL_CONTAIN | WIELD_CAST
-a:HARDCORE=BO_COLD_1
+F:ACTIVATE
+F:CON
+F:REGEN
+F:RES_COLD
+F:SPELL_CONTAIN
+F:SUST_CON
+F:WIELD_CAST
+a:BO_COLD_1
 D:A set of handgear so icy as to be able to fire frost bolts.
 
 
@@ -815,8 +1301,11 @@ N:56:'Pauraegen'
 I:31:2:0
 W:10:5:25:11000
 P:2:1d1:0:0:15
-F:RES_ELEC | ACTIVATE | SPELL_CONTAIN | WIELD_CAST
-a:HARDCORE=BO_ELEC_1
+F:ACTIVATE
+F:RES_ELEC
+F:SPELL_CONTAIN
+F:WIELD_CAST
+a:BO_ELEC_1
 D:A set of handgear with sparks surrounding it, able to fire 
 D:bolts of electricity.
 
@@ -827,8 +1316,11 @@ N:57:'Paurnen'
 I:31:2:0
 W:10:5:25:12000
 P:2:1d1:0:0:15
-F:RES_ACID | ACTIVATE | SPELL_CONTAIN | WIELD_CAST
-a:HARDCORE=BO_ACID_1
+F:ACTIVATE
+F:RES_ACID
+F:SPELL_CONTAIN
+F:WIELD_CAST
+a:BO_ACID_1
 D:A set of handgear so corrosive that it may fire bolts of acid.
 
 
@@ -838,9 +1330,22 @@ N:58:'Camlost'
 I:31:2:-3
 W:10:20:25:0
 P:2:1d1:-11:-12:0
-F:STR | DEX | HIDE_TYPE | DRAIN_MANA | 
-F:RES_POIS | IM_FIRE | IM_COLD | RES_DISEN | RES_NETHER | FREE_ACT | 
-F:AGGRAVATE | SHOW_MODS | HEAVY_CURSE | TY_CURSE | TELEPORT | CURSED
+F:AGGRAVATE
+F:CURSED
+F:DEX
+F:DRAIN_MANA
+F:FREE_ACT
+F:HEAVY_CURSE
+F:HIDE_TYPE
+F:IM_COLD
+F:IM_FIRE
+F:RES_DISEN
+F:RES_NETHER
+F:RES_POIS
+F:SHOW_MODS
+F:STR
+F:TELEPORT
+F:TY_CURSE
 D:A pair of gauntlets that sap combat ability, named after the empty hand 
 D:of Beren that once clasped a Silmaril.
 
@@ -851,9 +1356,15 @@ N:59:of Fingolfin
 I:31:5:4
 W:40:15:40:110000
 P:5:1d1:10:10:20
-F:DEX | HIDE_TYPE | LUCK
-F:FREE_ACT | RES_ACID | ACTIVATE | SHOW_MODS
-a:HARDCORE=BO_MISS_2
+F:ACTIVATE
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:LUCK
+F:RANDOM_POWER
+F:RES_ACID
+F:SHOW_MODS
+a:BO_MISS_2
 Z:magic missile
 D:The hand-sheathing of Fingolfin, warrior-king of Elves and Men, who gave 
 D:Morgoth seven mighty wounds and pain that will last forever.
@@ -865,9 +1376,11 @@ N:60:of Feanor
 I:30:3:15
 W:40:120:40:300000
 P:3:1d1:0:0:20
-F:SPEED | HIDE_TYPE | 
-F:RES_NEXUS | ACTIVATE
-a:HARDCORE=SPEED
+F:ACTIVATE
+F:HIDE_TYPE
+F:RES_NEXUS
+F:SPEED
+a:SPEED
 D:This wondrous pair of leather boots once sped Feanor, creator of the 
 D:Silmarils and the mightiest of the Eldar, along the Grinding Ice and to 
 D:Middle-earth at last.
@@ -879,10 +1392,17 @@ N:61:'Dal-i-thalion'
 I:30:2:5
 W:10:25:20:40000
 P:2:1d1:0:0:15
-F:DEX | HIDE_TYPE | CHR | SUST_CHR |
-F:ACTIVATE | FREE_ACT |
-F:RES_NETHER | RES_CHAOS | RES_CONF | SUST_CON
-a:HARDCORE=CURE_POISON
+F:ACTIVATE
+F:CHR
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:RES_CHAOS
+F:RES_CONF
+F:RES_NETHER
+F:SUST_CHR
+F:SUST_CON
+a:CURE_POISON
 D:A pair of high-laced shoes, strong against the powers of corruption and 
 D:withering, that grant the wearer extraordinary agility.
 
@@ -893,7 +1413,13 @@ N:62:of Thror
 I:30:6:3
 W:30:25:80:15000
 P:6:1d1:0:0:20
-F:STR | CON | HIDE_TYPE | SPEED | RES_FEAR | CLIMB
+F:CLIMB
+F:CON
+F:HIDE_TYPE
+F:RANDOM_RESIST
+F:RES_FEAR
+F:SPEED
+F:STR
 D:Sturdy footwear of leather and steel as enduring as the long-suffering 
 D:Dwarven King-in-exile who wore them.  Of dwarven make, these boots will
 D:make their wearer completely at home in the mountains.
@@ -911,9 +1437,20 @@ N:63:of Bard
 I:17:2:0
 W:55:30:2:50000
 P:0:8d4:20:15:0
-F:SLAY_ANIMAL | SLAY_EVIL | SLAY_UNDEAD | SLAY_DEMON | 
-F:SLAY_ORC | SLAY_TROLL | SLAY_GIANT | SLAY_DRAGON | KILL_DRAGON | 
-F:BRAND_ACID | BRAND_ELEC | BRAND_FIRE | BRAND_COLD | BRAND_POIS
+F:BRAND_ACID
+F:BRAND_COLD
+F:BRAND_ELEC
+F:BRAND_FIRE
+F:BRAND_POIS
+F:KILL_DRAGON
+F:SLAY_ANIMAL
+F:SLAY_DEMON
+F:SLAY_DRAGON
+F:SLAY_EVIL
+F:SLAY_GIANT
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SLAY_UNDEAD
 D:Deadliest of arrows, imbued with elemental strength, this shaft is 
 D:feared especially by the wyrmkin.
 
@@ -924,8 +1461,17 @@ N:64:of Maedhros
 I:23:5:3
 W:15:30:30:22500
 P:0:2d5:12:15:0
-F:INT | DEX | HIDE_TYPE | SPEED | SPECIAL_GENE
-F:SLAY_TROLL | SLAY_GIANT | FREE_ACT | SEE_INVIS | SHOW_MODS
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:INT
+F:RANDOM_RES_OR_POWER
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_GIANT
+F:SLAY_TROLL
+F:SPECIAL_GENE
+F:SPEED
 D:A short thrusting blade with a large guard worn by Maedhros the Tall, 
 D:eldest son of Feanor, and wielded with his left hand after the loss of 
 D:his right hand in the pits of Thangorodrim.
@@ -937,10 +1483,19 @@ N:65:'Angrist'
 I:23:4:4
 W:20:80:12:125000
 P:0:2d4:10:15:5
-F:DEX | HIDE_TYPE | STEALTH | SEARCH | BRAND_POIS | 
-F:SLAY_EVIL | SLAY_TROLL | SLAY_ORC | BRAND_ACID |
-F:FREE_ACT | RES_DARK | SUST_DEX | SEE_INVIS |
+F:BRAND_ACID
+F:BRAND_POIS
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:RES_DARK
+F:SEE_INVIS
 F:SHOW_MODS
+F:SLAY_EVIL
+F:SLAY_ORC
+F:SLAY_TROLL
+F:STEALTH
+F:SUST_DEX
 D:Forged from meteoric iron, this long chopping dagger slices through 
 D:ordinary metal as easily as its title, "Iron Cleaver", suggests.
 
@@ -951,8 +1506,14 @@ N:66:'Narthanc'
 I:23:4:0
 W:4:100:12:12000
 P:0:1d4:4:6:0
-F:BRAND_FIRE | RES_FIRE | ACTIVATE | SHOW_MODS | LITE1 | LEVELS
-a:HARDCORE=BO_FIRE_1
+F:ACTIVATE
+F:BRAND_FIRE
+F:LEVELS
+F:LITE1
+F:RANDOM_RESIST
+F:RES_FIRE
+F:SHOW_MODS
+a:BO_FIRE_1
 D:A fiery dagger finely balanced for deadly throws.
 
 
@@ -962,8 +1523,13 @@ N:67:'Nimthanc'
 I:23:4:0
 W:3:100:12:11000
 P:0:1d4:4:6:0
-F:BRAND_COLD | RES_COLD | ACTIVATE | SHOW_MODS | LEVELS
-a:HARDCORE=BO_COLD_1
+F:ACTIVATE
+F:BRAND_COLD
+F:LEVELS
+F:RANDOM_RESIST
+F:RES_COLD
+F:SHOW_MODS
+a:BO_COLD_1
 D:A frosty dagger finely balanced for deadly throws.
 
 
@@ -973,8 +1539,13 @@ N:68:'Dethanc'
 I:23:4:0
 W:5:100:12:13000
 P:0:1d4:4:6:0
-F:BRAND_ELEC | RES_ELEC | ACTIVATE | SHOW_MODS | LEVELS
-a:HARDCORE=BO_ELEC_1
+F:ACTIVATE
+F:BRAND_ELEC
+F:LEVELS
+F:RANDOM_RESIST
+F:RES_ELEC
+F:SHOW_MODS
+a:BO_ELEC_1
 D:A dagger covered in sparks and finely balanced for deadly throws.
 
 
@@ -984,8 +1555,13 @@ N:69:of Rilia
 I:23:4:0
 W:5:40:12:35000
 P:0:2d4:4:3:0
-F:SLAY_ORC | RES_POIS | RES_DISEN | ACTIVATE | SHOW_MODS | BRAND_POIS
-a:HARDCORE=BA_POIS_1
+F:ACTIVATE
+F:BRAND_POIS
+F:RES_DISEN
+F:RES_POIS
+F:SHOW_MODS
+F:SLAY_ORC
+a:BA_POIS_1
 D:A large stiletto dagger that glistens with odourless poison, to which the 
 D:wearer seems oddly immune.
 
@@ -996,11 +1572,19 @@ N:70:'Belangil'
 I:23:4:2
 W:10:40:12:50000
 P:0:2d4:6:9:0
-F:DEX | HIDE_TYPE | SPEED | BLOWS |
-F:BRAND_COLD | RES_COLD |
-F:SEE_INVIS | SLOW_DIGEST | REGEN |
-F:ACTIVATE | SHOW_MODS | BRAND_POIS
-a:HARDCORE=BELANGIL
+F:ACTIVATE
+F:BLOWS
+F:BRAND_COLD
+F:BRAND_POIS
+F:DEX
+F:HIDE_TYPE
+F:REGEN
+F:RES_COLD
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLOW_DIGEST
+F:SPEED
+a:BELANGIL
 D:A frosty dagger surrounded in a nimbus of ice with a hilt of elk horn and 
 D:an edge to wound the wind.
 
@@ -1011,11 +1595,22 @@ N:71:'Calris'
 I:23:21:5
 W:30:15:140:100000
 P:0:5d4:-20:20:0
-F:CON | HIDE_TYPE | DRAIN_HP | 
-F:KILL_DRAGON | SLAY_EVIL | SLAY_DEMON | SLAY_TROLL | RES_DISEN | 
-F:AGGRAVATE | CURSED | HEAVY_CURSE | SHOW_MODS | ESP_DRAGON | ESP_DEMON
+F:AGGRAVATE
 F:AUTO_CURSE
+F:CON
 F:COULD2H
+F:CURSED
+F:DRAIN_HP
+F:ESP_DEMON
+F:ESP_DRAGON
+F:HEAVY_CURSE
+F:HIDE_TYPE
+F:KILL_DRAGON
+F:RES_DISEN
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_EVIL
+F:SLAY_TROLL
 f:COULD2H
 D:This sword has runes of power incised on its ornate hilt and a single 
 D:blood channel that gleams coldly blue as you grasp this mighty weapon of 
@@ -1028,13 +1623,28 @@ N:72:'Aranruth'
 I:23:16:4
 W:20:45:150:125000
 P:0:3d5:20:12:0
-F:STR | DEX | CON | SUST_CON | SUST_STR
-F:REGEN | FREE_ACT | SEE_INVIS |
-F:RES_CHAOS | RES_NETHER | HOLD_LIFE | RES_FEAR |
-F:RES_COLD |
-F:SLAY_DEMON | SLAY_EVIL | SLAY_DRAGON | SLAY_UNDEAD |
-F:BRAND_COLD |
-F:SLOW_DIGEST | SHOW_MODS | HIDE_TYPE | BLESSED
+F:BLESSED
+F:BRAND_COLD
+F:CON
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:REGEN
+F:RES_CHAOS
+F:RES_COLD
+F:RES_FEAR
+F:RES_NETHER
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_DRAGON
+F:SLAY_EVIL
+F:SLAY_UNDEAD
+F:SLOW_DIGEST
+F:STR
+F:SUST_CON
+F:SUST_STR
 D:The beautiful sword of Thingol with a hilt of gold and silver inlay, 
 D:glistening icily enough to freeze the hearts of demons.  You feel supple 
 D:and lightfooted as you hold it.
@@ -1046,9 +1656,20 @@ N:73:'Glamdring'
 I:23:16:1
 W:20:20:150:40000
 P:0:2d5:10:15:0
-F:SEARCH | HIDE_TYPE | BLESSED | SLAY_DEMON | 
-F:SLAY_EVIL | BRAND_FIRE | SLAY_ORC | RES_FIRE | RES_LITE | LITE1 | 
-F:SLOW_DIGEST | SHOW_MODS | ESP_ORC | SPECIAL_GENE |
+F:BLESSED
+F:BRAND_FIRE
+F:ESP_ORC
+F:HIDE_TYPE
+F:LITE1
+F:RANDOM_RES_OR_POWER
+F:RES_FIRE
+F:RES_LITE
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_EVIL
+F:SLAY_ORC
+F:SLOW_DIGEST
+F:SPECIAL_GENE
 D:This fiery, shining blade earned its sobriquet "Foe-Hammer" from dying orcs 
 D:who dared to come near hidden Gondolin.
 
@@ -1059,10 +1680,22 @@ N:74:'Aeglin'
 I:23:16:4
 W:20:90:150:95000
 P:0:2d5:12:16:0
-F:SEARCH | BLESSED | LITE1 | HIDE_TYPE | 
-F:BRAND_ELEC | SLAY_ORC | SLAY_GIANT | SLAY_TROLL | RES_FEAR |
-F:RES_ELEC | RES_FIRE | RES_BLIND | ESP_ORC | ESP_GIANT | ESP_TROLL | 
-F:SLOW_DIGEST | SHOW_MODS
+F:BLESSED
+F:BRAND_ELEC
+F:ESP_GIANT
+F:ESP_ORC
+F:ESP_TROLL
+F:HIDE_TYPE
+F:LITE1
+F:RES_BLIND
+F:RES_ELEC
+F:RES_FEAR
+F:RES_FIRE
+F:SHOW_MODS
+F:SLAY_GIANT
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SLOW_DIGEST
 D:Like unto Orcrist and Glamdring, and like them long lost, this sword is 
 D:continually coved in tiny arcs of captive lightning that flash and dance 
 D:eerily in the globe of light they create.
@@ -1074,9 +1707,20 @@ N:75:'Orcrist'
 I:23:16:3
 W:20:20:150:40000
 P:0:2d5:10:15:0
-F:SEARCH | ESP_ORC | SLAY_DRAGON | ESP_DRAGON | RES_COLD | HIDE_TYPE | 
-F:SLAY_EVIL | BRAND_COLD | SLAY_ORC | RES_COLD | LITE1 | RES_DARK | 
-F:SLOW_DIGEST | SHOW_MODS
+F:BRAND_COLD
+F:ESP_DRAGON
+F:ESP_ORC
+F:HIDE_TYPE
+F:LITE1
+F:RANDOM_RES_OR_POWER
+F:RES_COLD
+F:RES_COLD
+F:RES_DARK
+F:SHOW_MODS
+F:SLAY_DRAGON
+F:SLAY_EVIL
+F:SLAY_ORC
+F:SLOW_DIGEST
 D:This coldly gleaming blade is called simply "Biter", by orcs who came to 
 D:know its power all too well.
 
@@ -1087,10 +1731,23 @@ N:76:'Gurthang'
 I:23:25:2
 W:30:30:200:100000
 P:0:3d6:13:17:0
-F:STR | HIDE_TYPE | VORPAL | ESP_DRAGON | DRAIN_HP | 
-F:RES_FIRE | RES_POIS | BRAND_FIRE | BRAND_POIS | 
-F:KILL_DRAGON | SLAY_TROLL | FREE_ACT | SLOW_DIGEST | REGEN | SHOW_MODS
+F:BRAND_FIRE
+F:BRAND_POIS
+F:DRAIN_HP
+F:ESP_DRAGON
+F:FREE_ACT
+F:HIDE_TYPE
+F:KILL_DRAGON
 F:MUST2H
+F:RANDOM_RES_OR_POWER
+F:REGEN
+F:RES_FIRE
+F:RES_POIS
+F:SHOW_MODS
+F:SLAY_TROLL
+F:SLOW_DIGEST
+F:STR
+F:VORPAL
 f:MUST2H
 D:A giant sword once wielded by mighty Turin, and a great dragonbane which 
 D:bathed in Glaurung's blood:  but beware, it will drink the blood of those 
@@ -1103,11 +1760,29 @@ N:77:'Zarcuthra'
 I:23:25:4
 W:30:180:250:205000
 P:0:4d6:19:21:0
-F:STR | CHR | INFRA | HIDE_TYPE | VORPAL | DRAIN_MANA | 
-F:KILL_DRAGON | SLAY_ANIMAL | SLAY_EVIL | BRAND_FIRE |
-F:SLAY_UNDEAD | SLAY_DEMON | SLAY_TROLL | SLAY_GIANT | SLAY_ORC | 
-F:RES_FIRE | RES_CHAOS | FREE_ACT | SEE_INVIS | AGGRAVATE | SHOW_MODS
+F:AGGRAVATE
+F:BRAND_FIRE
+F:CHR
+F:DRAIN_MANA
+F:FREE_ACT
+F:HIDE_TYPE
+F:INFRA
+F:KILL_DRAGON
 F:MUST2H
+F:RANDOM_RES_OR_POWER
+F:RES_CHAOS
+F:RES_FIRE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_DEMON
+F:SLAY_EVIL
+F:SLAY_GIANT
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SLAY_UNDEAD
+F:STR
+F:VORPAL
 f:MUST2H
 D:Dark and deadly runes stand stark against the naked steel of this awesome 
 D:weapon, and you feel a stunning power of slaying and rending as you 
@@ -1120,10 +1795,25 @@ N:78:'Mormegil'
 I:23:33:2
 W:30:15:250:0
 P:0:6d7:0:0:-20
-F:SPEED | IM_FIRE | RES_FIRE | BRAND_FIRE | RES_DISEN | RES_FEAR |
-F:AGGRAVATE | CURSED | HEAVY_CURSE | SHOW_MODS | LEVELS | TY_CURSE | 
-F:BLOWS | SLAY_DRAGON | RES_CHAOS | ANTIMAGIC_50 | 
-F:DRAIN_MANA | DRAIN_HP | DRAIN_EXP
+F:AGGRAVATE
+F:ANTIMAGIC_50
+F:BLOWS
+F:BRAND_FIRE
+F:CURSED
+F:DRAIN_EXP
+F:DRAIN_HP
+F:DRAIN_MANA
+F:HEAVY_CURSE
+F:IM_FIRE
+F:LEVELS
+F:RES_CHAOS
+F:RES_DISEN
+F:RES_FEAR
+F:RES_FIRE
+F:SHOW_MODS
+F:SLAY_DRAGON
+F:SPEED
+F:TY_CURSE
 D:A foul, twisted sword with blackened spines and knobs, whose very name is a 
 D:curse upon the lips of Elves and Men.
 
@@ -1134,9 +1824,17 @@ N:79:'Gondricam'
 I:23:12:3
 W:20:8:110:28000
 P:0:1d7:10:11:0
-F:DEX | STEALTH | HIDE_TYPE | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | FEATHER | 
-F:SEE_INVIS | REGEN | SHOW_MODS
+F:DEX
+F:FEATHER
+F:HIDE_TYPE
+F:REGEN
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:SEE_INVIS
+F:SHOW_MODS
+F:STEALTH
 D:Famed sea-defender of Lebennin.  A short, slightly curved chopping blade  
 D:with a perfect edge shining cleanly in the sun, an object of hate to the 
 D:men of Umbar who met it in combat.
@@ -1148,9 +1846,18 @@ N:80:'Crisdurian'
 I:23:28:0
 W:40:15:260:111000
 P:0:4d5:18:19:0
-F:SLAY_DRAGON | SLAY_EVIL | SLAY_UNDEAD | SLAY_TROLL | SLAY_GIANT | 
-F:SLAY_ORC | SEE_INVIS | SHOW_MODS | VORPAL | BRAND_POIS | WOUNDING
+F:BRAND_POIS
 F:MUST2H
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_DRAGON
+F:SLAY_EVIL
+F:SLAY_GIANT
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SLAY_UNDEAD
+F:VORPAL
+F:WOUNDING
 f:MUST2H
 D:A giant's weapon, with a long blade tall and straight thrusting out from a 
 D:massive double-pronged hilt.  On its blade are written doomspells against 
@@ -1163,9 +1870,13 @@ N:81:'Aglarang'
 I:23:20:5
 W:35:25:50:40000
 P:0:8d4:0:0:0
-F:DEX | TUNNEL | SPEED | HIDE_TYPE | 
-F:SUST_DEX | SHOW_MODS
 F:COULD2H
+F:DEX
+F:HIDE_TYPE
+F:SHOW_MODS
+F:SPEED
+F:SUST_DEX
+F:TUNNEL
 f:COULD2H
 D:An utterly perfect, cleanly chiselled sword, with a edge that effortlessly 
 D:slices rock and bone, and spells to render the wearer lithe and nimble.  It 
@@ -1178,11 +1889,25 @@ N:82:'Ringil'
 I:23:17:10
 W:20:120:130:300000
 P:0:4d5:22:25:0
-F:SPEED | HIDE_TYPE | RES_FEAR | BLESSED | 
-F:SLAY_EVIL | BRAND_COLD | SLAY_UNDEAD | KILL_DEMON | SLAY_TROLL | 
-F:FREE_ACT | RES_COLD | RES_LITE | LITE1 | SEE_INVIS | SLOW_DIGEST | REGEN | 
-F:ACTIVATE | SHOW_MODS
-a:HARDCORE=BA_COLD_2
+F:ACTIVATE
+F:BLESSED
+F:BRAND_COLD
+F:FREE_ACT
+F:HIDE_TYPE
+F:KILL_DEMON
+F:LITE1
+F:REGEN
+F:RES_COLD
+F:RES_FEAR
+F:RES_LITE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_EVIL
+F:SLAY_TROLL
+F:SLAY_UNDEAD
+F:SLOW_DIGEST
+F:SPEED
+a:BA_COLD_2
 D:The weapon of Fingolfin, High King of the Noldor; it shines like a column 
 D:of ice lit by light unquenchable.  Morgoth came but unwillingly to meet it 
 D:of old; his lame foot will remind him of its might should he meet it again.
@@ -1194,11 +1919,28 @@ N:83:'Anduril'
 I:23:17:4
 W:20:40:130:100000
 P:0:3d5:10:15:5
-F:STR | DEX | HIDE_TYPE | RES_FEAR | FREE_ACT | BLESSED | LUCK
-F:SLAY_EVIL | BRAND_FIRE | SLAY_TROLL | SLAY_ORC | FREE_ACT | 
-F:RES_FIRE | SUST_DEX | SEE_INVIS | ACTIVATE | SHOW_MODS | LITE1
-F:RES_DISEN | SPECIAL_GENE
-a:HARDCORE=BA_FIRE_1
+F:ACTIVATE
+F:BLESSED
+F:BRAND_FIRE
+F:DEX
+F:FREE_ACT
+F:FREE_ACT
+F:HIDE_TYPE
+F:LITE1
+F:LUCK
+F:RANDOM_RES_OR_POWER
+F:RES_DISEN
+F:RES_FEAR
+F:RES_FIRE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_EVIL
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SPECIAL_GENE
+F:STR
+F:SUST_DEX
+a:BA_FIRE_1
 D:The famed "Flame of the West", the sword that was broken and is forged 
 D:again.  It glows with the essence of fire, its wearer is mighty in combat, 
 D:and no creature of Sauron can withstand it.  It will never be stained or 
@@ -1211,10 +1953,23 @@ N:84:'Anguirel'
 I:23:17:2
 W:20:30:130:40000
 P:0:2d5:8:12:0
-F:STR | CON | SPEED | HIDE_TYPE | 
-F:SLAY_EVIL | BRAND_ELEC | SLAY_DEMON | FREE_ACT | RES_ELEC | 
-F:RES_LITE | RES_DARK | SEE_INVIS | SHOW_MODS | VORPAL | WOUNDING
-F:AGGRAVATE | CURSED
+F:AGGRAVATE
+F:BRAND_ELEC
+F:CON
+F:CURSED
+F:FREE_ACT
+F:HIDE_TYPE
+F:RES_DARK
+F:RES_ELEC
+F:RES_LITE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_EVIL
+F:SPEED
+F:STR
+F:VORPAL
+F:WOUNDING
 D:Forged of black galvorn by the Dark-Elven smith Eol, this blade has the 
 D:living lightning trapped inside.
 
@@ -1225,8 +1980,17 @@ N:85:'Elvagil'
 I:23:17:2
 W:20:8:130:20000
 P:0:2d5:5:7:0
-F:DEX | CHR | STEALTH | HIDE_TYPE | ESP_ORC | ESP_TROLL
-F:SLAY_TROLL | SLAY_ORC | FEATHER | SEE_INVIS | SHOW_MODS
+F:CHR
+F:DEX
+F:ESP_ORC
+F:ESP_TROLL
+F:FEATHER
+F:HIDE_TYPE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_ORC
+F:SLAY_TROLL
+F:STEALTH
 D:The "Singing Blade", whose wearer can slay Orcs and Trolls in the hidden 
 D:and secret places of the earth.
 
@@ -1237,7 +2001,11 @@ N:86:'Forasgil'
 I:23:7:0
 W:15:8:40:15000
 P:0:1d6:12:19:0
-F:SLAY_ANIMAL | BRAND_COLD | RES_COLD | RES_LITE | SHOW_MODS
+F:BRAND_COLD
+F:RES_COLD
+F:RES_LITE
+F:SHOW_MODS
+F:SLAY_ANIMAL
 D:A slender, tapered blade whose wielder strikes icy blows with deadly 
 D:accuracy.
 
@@ -1248,9 +2016,17 @@ N:87:'Careth Asdriag'
 I:23:11:2
 W:15:8:50:25000
 P:0:2d7:6:8:0
-F:DEX | BLOWS | SPEED | CON | 
-F:SLAY_DRAGON | SLAY_ANIMAL | SLAY_TROLL | SLAY_GIANT | 
-F:SLAY_ORC | SHOW_MODS | ESP_ANIMAL
+F:BLOWS
+F:CON
+F:DEX
+F:ESP_ANIMAL
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_DRAGON
+F:SLAY_GIANT
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SPEED
 D:An heirloom of the Lords of Rhun far to the east, and a name of 
 D:dismay to creatures natural and unnatural.
 
@@ -1261,10 +2037,25 @@ N:88:'Sting'
 I:23:8:2
 W:20:205:75:100000
 P:0:1d6:7:8:0
-F:STR | DEX | CON | BLOWS | SPEED | LEVELS | 
-F:ESP_ORC | ESP_UNDEAD | ESP_SPIDER | 
-F:SLAY_EVIL | SLAY_UNDEAD | SLAY_ORC | SLAY_ANIMAL | LITE1 | 
-F:FREE_ACT | RES_LITE | SEE_INVIS | SHOW_MODS | 
+F:BLOWS
+F:CON
+F:DEX
+F:ESP_ORC
+F:ESP_SPIDER
+F:ESP_UNDEAD
+F:FREE_ACT
+F:LEVELS
+F:LITE1
+F:RANDOM_RESIST
+F:RES_LITE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_EVIL
+F:SLAY_ORC
+F:SLAY_UNDEAD
+F:SPEED
+F:STR
 D:"I will give you a name, and I shall call you Sting."  The perfect size 
 D:for Bilbo, and stamped forever by the courage he found in Mirkwood, this 
 D:sturdy little blade grants the wearer combat prowess and survival 
@@ -1277,11 +2068,21 @@ N:89:'Haradekket'
 I:23:18:2
 W:20:8:130:111111
 P:0:2d5:9:11:0
-F:INT | WIS | BLOWS |
-F:SLAY_ANIMAL | SLAY_EVIL | SLAY_UNDEAD | SLAY_DRAGON | SLAY_DEMON |
-F:RES_CHAOS | RES_DISEN | RES_NEXUS | 
-F:SEE_INVIS | BLESSED |
+F:BLESSED
+F:BLOWS
+F:INT
+F:RANDOM_RES_OR_POWER
+F:RES_CHAOS
+F:RES_DISEN
+F:RES_NEXUS
+F:SEE_INVIS
 F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_DEMON
+F:SLAY_DRAGON
+F:SLAY_EVIL
+F:SLAY_UNDEAD
+F:WIS
 D:A damascened scimitar that seems wondrously easy to hold.  Famed in song as 
 D:the "Sickle of Harad", and a deadly foe to the undead.
 
@@ -1292,8 +2093,14 @@ N:90:'Gilettar'
 I:23:10:2
 W:20:8:80:35000
 P:0:1d7:3:7:0
-F:BLOWS | HIDE_TYPE | 
-F:SLAY_ANIMAL | SLOW_DIGEST | REGEN | SHOW_MODS | SEE_INVIS | RES_DISEN
+F:BLOWS
+F:HIDE_TYPE
+F:REGEN
+F:RES_DISEN
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLOW_DIGEST
 D:A stubby blade worn by Beren, whose horn sounded of old in the glades of 
 D:Brethil.
 
@@ -1304,10 +2111,27 @@ N:91:'Doomcaller'
 I:23:30:0
 W:70:25:180:250000
 P:0:6d5:18:28:-50
-F:KILL_DRAGON | SLAY_ANIMAL | SLAY_EVIL | BRAND_COLD | SLAY_TROLL | 
-F:SLAY_ORC | FREE_ACT | RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
-F:RES_CHAOS | SEE_INVIS | ESP_EVIL | AGGRAVATE | SHOW_MODS | 
-F:CHAOTIC | VORPAL | BRAND_FIRE | BRAND_POIS | SPECIAL_GENE
+F:AGGRAVATE
+F:BRAND_COLD
+F:BRAND_FIRE
+F:BRAND_POIS
+F:CHAOTIC
+F:ESP_EVIL
+F:FREE_ACT
+F:KILL_DRAGON
+F:RES_ACID
+F:RES_CHAOS
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_EVIL
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SPECIAL_GENE
+F:VORPAL
 D:This weapon of wrath, cursed with a violent anger, dives hungrily 
 D:into the flesh of its enemies. It gathers shadows of death into its 
 D:owner as they inflict wounds that will never heal.
@@ -1319,8 +2143,16 @@ N:92:'Vorpal Blade'
 I:23:17:2
 W:50:30:150:250000
 P:0:5d5:32:32:0
-F:VORPAL | SLAY_EVIL | WOUNDING
-F:FREE_ACT | SEE_INVIS | SLOW_DIGEST | REGEN | SPEED | STR | DEX
+F:DEX
+F:FREE_ACT
+F:REGEN
+F:SEE_INVIS
+F:SLAY_EVIL
+F:SLOW_DIGEST
+F:SPEED
+F:STR
+F:VORPAL
+F:WOUNDING
 D:"One, two! One, two!  And through, and through, the vorpal blade 
 D:went snicker-snack!"
 
@@ -1331,9 +2163,16 @@ N:93:of Theoden
 I:22:10:3
 W:20:15:180:40000
 P:0:2d6:8:10:0
-F:WIS | CON | HIDE_TYPE | 
-F:SLAY_DRAGON | ESP_EVIL | ESP_UNDEAD | SLOW_DIGEST | ACTIVATE | SHOW_MODS
-a:HARDCORE=DRAIN_2
+F:ACTIVATE
+F:CON
+F:ESP_EVIL
+F:ESP_UNDEAD
+F:HIDE_TYPE
+F:SHOW_MODS
+F:SLAY_DRAGON
+F:SLOW_DIGEST
+F:WIS
+a:DRAIN_2
 D:The narrow axe head of this weapon, finely balanced by a crow's beak, 
 D:would pierce even the armour of Smaug, and its wielder becomes aware of 
 D:the minds of their enemies.
@@ -1345,8 +2184,10 @@ N:94:of Pain
 I:22:13:0
 W:30:155:190:50000
 P:0:9d6:0:30:0
-F:SHOW_MODS | LEVELS | DRAIN_MANA
 F:COULD2H
+F:DRAIN_MANA
+F:LEVELS
+F:SHOW_MODS
 f:COULD2H
 D:The massive chopper that crowns this glaive glows blood-red and black; 
 D:fell spells of annihilation swirl and dance as you swing death's myrmidon 
@@ -1359,10 +2200,18 @@ N:95:'Osondir'
 I:22:15:3
 W:20:8:190:22000
 P:0:3d5:6:9:0
-F:CHR | HIDE_TYPE | 
-F:BRAND_FIRE | SLAY_UNDEAD | SLAY_GIANT | RES_FIRE | RES_SOUND | 
-F:FEATHER | SEE_INVIS | SHOW_MODS | ESP_GIANT
+F:BRAND_FIRE
+F:CHR
 F:COULD2H
+F:ESP_GIANT
+F:FEATHER
+F:HIDE_TYPE
+F:RES_FIRE
+F:RES_SOUND
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_GIANT
+F:SLAY_UNDEAD
 f:COULD2H
 D:Lordly and tall did Osondir stand against the wrath of giants, and 
 D:clear-eyed in barrows fell, wielding a halberd glowing ruby red.
@@ -1374,10 +2223,20 @@ N:96:'Til-i-arc'
 I:22:8:2
 W:20:15:160:32000
 P:0:2d5:10:12:10
-F:INT | HIDE_TYPE | 
-F:BRAND_COLD | BRAND_FIRE | SLAY_DEMON | SLAY_TROLL | SLAY_GIANT | ESP_GIANT
-F:RES_FIRE | RES_COLD | SUST_INT | SLOW_DIGEST | SHOW_MODS |
+F:BRAND_COLD
+F:BRAND_FIRE
 F:COULD2H
+F:ESP_GIANT
+F:HIDE_TYPE
+F:INT
+F:RES_COLD
+F:RES_FIRE
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_GIANT
+F:SLAY_TROLL
+F:SLOW_DIGEST
+F:SUST_INT
 f:COULD2H
 D:Within this long thrusting spear lie the spirits of frost giants and fire 
 D:demons, who war forever, trapped by magely spells.
@@ -1389,12 +2248,25 @@ N:97:'Aeglos'
 I:22:2:4
 W:15:45:50:180000
 P:0:3d6:15:25:5
-F:DEX | WIS | HIDE_TYPE |
-F:BRAND_COLD | BRAND_ELEC | LITE1 | 
-F:SLAY_TROLL | SLAY_ORC | SLAY_GIANT | KILL_UNDEAD | 
-F:FREE_ACT | RES_COLD | RES_ELEC | RES_LITE |
-F:SLOW_DIGEST | ACTIVATE | BLESSED | SHOW_MODS |
-a:HARDCORE=BA_ELEC_2
+F:ACTIVATE
+F:BLESSED
+F:BRAND_COLD
+F:BRAND_ELEC
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:KILL_UNDEAD
+F:LITE1
+F:RES_COLD
+F:RES_ELEC
+F:RES_LITE
+F:SHOW_MODS
+F:SLAY_GIANT
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SLOW_DIGEST
+F:WIS
+a:BA_ELEC_2
 D:The mighty spear of Gil-galad, famed as "Snow-point" in the songs of 
 D:Elves, against which all the foul corruptions of Sauron dashed in vain.
 
@@ -1405,14 +2277,29 @@ N:98:of Orome
 I:22:2:4
 W:15:45:50:77777
 P:0:4d6:15:15:0
-F:INT | WIS | SPEED | TUNNEL | INFRA | HIDE_TYPE | SEARCH |
-F:BRAND_FIRE |
-F:SLAY_GIANT | SLAY_EVIL | SLAY_DEMON | SLAY_UNDEAD | SLAY_DRAGON |
-F:RES_FIRE | RES_LITE | HOLD_LIFE | RES_FEAR |
-F:FEATHER | ESP_GIANT
-F:SEE_INVIS |
-F:ACTIVATE | BLESSED | SHOW_MODS
-a:HARDCORE=STONE_MUD
+F:ACTIVATE
+F:BLESSED
+F:BRAND_FIRE
+F:ESP_GIANT
+F:FEATHER
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:INFRA
+F:INT
+F:RES_FEAR
+F:RES_FIRE
+F:RES_LITE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_DRAGON
+F:SLAY_EVIL
+F:SLAY_GIANT
+F:SLAY_UNDEAD
+F:SPEED
+F:TUNNEL
+F:WIS
+a:STONE_MUD
 D:The thrusting spear of wise Orome the Vala, strong against giants of frost, 
 D:which can melt rock or flesh with ease.
 
@@ -1423,8 +2310,16 @@ N:99:'Nimloth'
 I:22:2:3
 W:15:12:50:30000
 P:0:1d6:11:13:0
-F:STEALTH | RES_DARK | INFRA | SPEED | BLESSED | 
-F:BRAND_COLD | SLAY_UNDEAD | RES_COLD | SEE_INVIS | SHOW_MODS
+F:BLESSED
+F:BRAND_COLD
+F:INFRA
+F:RES_COLD
+F:RES_DARK
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_UNDEAD
+F:SPEED
+F:STEALTH
 D:A thin spike of thrice-forged steel caps a straight sylvan shaft cut from 
 D:a legendary tree; spells to break the will of the undead and strike cold 
 D:fear into the hearts of foes lie on this perfectly balanced spear.
@@ -1436,9 +2331,17 @@ N:100:of Eorlingas
 I:22:20:2
 W:20:23:360:55000
 P:0:3d8:3:21:0
-F:STR | DEX | SPEED | HIDE_TYPE | RES_FEAR | 
-F:SLAY_EVIL | SLAY_TROLL | SLAY_ORC | SEE_INVIS | SHOW_MODS
+F:DEX
+F:HIDE_TYPE
 F:MUST2H
+F:RES_FEAR
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_EVIL
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SPEED
+F:STR
 f:MUST2H
 D:"Forth Eorlingas!"  To the field of Cormallen came Eorl the Young 
 D:to save beleaguered Gondor, and from his lance fled massive trolls 
@@ -1451,11 +2354,26 @@ N:101:of Durin
 I:24:25:3
 W:30:90:230:150000
 P:0:4d4:10:20:15
-F:STR | CON | TUNNEL | HIDE_TYPE | ESP_EVIL | RES_FEAR | 
-F:SLAY_DRAGON | KILL_DEMON | SLAY_TROLL | SLAY_ORC | FREE_ACT | 
-F:RES_ACID | RES_FIRE | RES_LITE | RES_DARK | RES_CHAOS | SHOW_MODS | 
-F:BRAND_ACID | BRAND_FIRE
+F:BRAND_ACID
+F:BRAND_FIRE
+F:CON
+F:ESP_EVIL
+F:FREE_ACT
+F:HIDE_TYPE
+F:KILL_DEMON
 F:MUST2H
+F:RES_ACID
+F:RES_CHAOS
+F:RES_DARK
+F:RES_FEAR
+F:RES_FIRE
+F:RES_LITE
+F:SHOW_MODS
+F:SLAY_DRAGON
+F:SLAY_ORC
+F:SLAY_TROLL
+F:STR
+F:TUNNEL
 f:MUST2H
 D:The twin massive axe heads of this ancient demon's dread gleam with 
 D:mithril inlay, which tell sagas of endurance, invoking the powers of 
@@ -1468,11 +2386,26 @@ N:102:of Eonwe
 I:24:25:2
 W:30:120:230:200000
 P:0:4d4:15:18:8
-F:STR | INT | WIS | DEX | CON | CHR | HIDE_TYPE | 
-F:SLAY_EVIL | BRAND_COLD | KILL_DEMON | SLAY_UNDEAD | ESP_NONLIVING
-F:SLAY_ORC | FREE_ACT | IM_COLD | SEE_INVIS | ACTIVATE | 
-F:BLESSED | SHOW_MODS
-a:HARDCORE=MASS_GENO
+F:ACTIVATE
+F:BLESSED
+F:BRAND_COLD
+F:CHR
+F:CON
+F:DEX
+F:ESP_NONLIVING
+F:FREE_ACT
+F:HIDE_TYPE
+F:IM_COLD
+F:INT
+F:KILL_DEMON
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_EVIL
+F:SLAY_ORC
+F:SLAY_UNDEAD
+F:STR
+F:WIS
+a:MASS_GENO
 D:The axe of Eonwe, leader of the Hosts of the West before the gates of 
 D:Thangorodrim, strikes with icy wrath at the undead, disperses hosts of 
 D:evil at a word, and grants Maia-like powers of body and mind.
@@ -1484,11 +2417,25 @@ N:103:of Balli Stonehand
 I:22:22:3
 W:30:15:170:90000
 P:0:3d8:8:11:5
-F:STR | CON | STEALTH | HIDE_TYPE | ESP_NONLIVING
-F:SLAY_DEMON | SLAY_TROLL | SLAY_ORC | FREE_ACT | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_BLIND | FEATHER | 
-F:SEE_INVIS | REGEN | SHOW_MODS
+F:CON
 F:COULD2H
+F:ESP_NONLIVING
+F:FEATHER
+F:FREE_ACT
+F:HIDE_TYPE
+F:REGEN
+F:RES_ACID
+F:RES_BLIND
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_ORC
+F:SLAY_TROLL
+F:STEALTH
+F:STR
 f:COULD2H
 D:The twin blades of this weapon were forged in Belegost, and powerful forces 
 D:to resist and endure lie ready for he who shall wield it once more.
@@ -1500,9 +2447,14 @@ N:104:'Lotharang'
 I:22:22:1
 W:30:15:170:21000
 P:0:2d8:4:3:0
-F:STR | DEX | HIDE_TYPE | 
-F:SLAY_TROLL | SLAY_ORC | ACTIVATE | SHOW_MODS
-a:HARDCORE=CURE_MW
+F:ACTIVATE
+F:DEX
+F:HIDE_TYPE
+F:SHOW_MODS
+F:SLAY_ORC
+F:SLAY_TROLL
+F:STR
+a:CURE_MW
 D:A superbly crafted double-bladed axe that slays the creatures of earth and 
 D:allows rapid recovery from their blows.
 
@@ -1513,10 +2465,17 @@ N:105:of the Dwarves
 I:22:28:10
 W:30:8:250:80000
 P:0:3d8:12:17:0
-F:SLAY_EVIL | TUNNEL | INFRA | SEARCH | SLAY_GIANT |
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_FEAR |
-F:SHOW_MODS
 F:COULD2H
+F:INFRA
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FEAR
+F:RES_FIRE
+F:SHOW_MODS
+F:SLAY_EVIL
+F:SLAY_GIANT
+F:TUNNEL
 f:COULD2H
 D:A massive axe with twin razor-sharp heads, so large that it usually 
 D:requires two hands to wield, intricately engraved in gold with spells 
@@ -1529,10 +2488,15 @@ N:106:'Barukkheled'
 I:24:11:3
 W:20:8:160:50000
 P:0:2d6:13:19:0
-F:CON | HIDE_TYPE | 
-F:SLAY_EVIL | SLAY_TROLL | SLAY_GIANT | SLAY_ORC | 
-F:SEE_INVIS | SHOW_MODS
+F:CON
 F:COULD2H
+F:HIDE_TYPE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_EVIL
+F:SLAY_GIANT
+F:SLAY_ORC
+F:SLAY_TROLL
 f:COULD2H
 D:A royal heirloom of the southern coast, strong in combat against evil 
 D:creatures of the earth.
@@ -1544,10 +2508,19 @@ N:107:of Wrath
 I:22:5:2
 W:15:35:300:90000
 P:0:3d8:16:18:0
-F:STR | DEX | HIDE_TYPE | CHAOTIC | DRAIN_MANA | 
-F:SLAY_EVIL | KILL_UNDEAD | RES_LITE | RES_DARK | SEE_INVIS | 
-F:BLESSED | SHOW_MODS
+F:BLESSED
+F:CHAOTIC
 F:COULD2H
+F:DEX
+F:DRAIN_MANA
+F:HIDE_TYPE
+F:KILL_UNDEAD
+F:RES_DARK
+F:RES_LITE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_EVIL
+F:STR
 f:COULD2H
 D:A massive triple-pronged spear, so great it normally requires two hands to 
 D:wield, evoking the spirit of Osse who with it pierced legions of 
@@ -1560,11 +2533,23 @@ N:108:of Ulmo
 I:22:5:4
 W:30:90:70:120000
 P:0:4d8:15:19:0
-F:DEX | HIDE_TYPE | 
-F:SLAY_DRAGON | SLAY_ANIMAL | FREE_ACT | HOLD_LIFE | IM_ACID | 
-F:RES_NETHER | SEE_INVIS | SLOW_DIGEST | REGEN | ACTIVATE | 
-F:BLESSED | SHOW_MODS | WATER_BREATH
-a:HARDCORE=TELE_AWAY
+F:ACTIVATE
+F:BLESSED
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:IM_ACID
+F:RANDOM_POWER
+F:REGEN
+F:RES_NETHER
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_DRAGON
+F:SLOW_DIGEST
+F:WATER_BREATH
+a:TELE_AWAY
 D:The awesome weapon of the Vala Ulmo, Lord of Waters.  Mightiest of all the 
 D:powers of good save Manwe himself, Ulmo laughs in scorn at the dread powers 
 D:of the undead, and is utterly in command of the element of water.
@@ -1576,12 +2561,21 @@ N:109:'Avavir'
 I:22:17:3
 W:40:8:250:18000
 P:0:5d3:8:8:10
-F:DEX | CHR | HIDE_TYPE | 
-F:BRAND_COLD | BRAND_FIRE | FREE_ACT | RES_FIRE | RES_COLD | 
-F:RES_LITE | SEE_INVIS | ACTIVATE | SHOW_MODS
+F:ACTIVATE
+F:BRAND_COLD
+F:BRAND_FIRE
+F:CHR
 F:COULD2H
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:RES_COLD
+F:RES_FIRE
+F:RES_LITE
+F:SEE_INVIS
+F:SHOW_MODS
 f:COULD2H
-a:HARDCORE=RECALL
+a:RECALL
 D:With elemental powers whose struggles turn this weapon red and purest 
 D:white, this shining reaper bears within it a power of going forth and 
 D:returning.
@@ -1593,10 +2587,27 @@ N:110:of the Dawn
 I:23:17:3
 W:40:160:130:250000
 P:0:3d5:20:20:0
-F:ACTIVATE | BRAND_FIRE | FREE_ACT | RES_FIRE | INFRA | LEVELS |
-F:SLAY_EVIL | SLAY_DRAGON | SLAY_UNDEAD | SLAY_DEMON | VORPAL | CLONE |
-F:CHR | SUST_CHR | RES_FEAR | RES_LITE | RES_BLIND | REGEN | SHOW_MODS
-a:HARDCORE=DAWN
+F:ACTIVATE
+F:BRAND_FIRE
+F:CHR
+F:CLONE
+F:FREE_ACT
+F:INFRA
+F:LEVELS
+F:RANDOM_RES_OR_POWER
+F:REGEN
+F:RES_BLIND
+F:RES_FEAR
+F:RES_FIRE
+F:RES_LITE
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_DRAGON
+F:SLAY_EVIL
+F:SLAY_UNDEAD
+F:SUST_CHR
+F:VORPAL
+a:DAWN
 D:Forged in the farthest East by a race of mighty spellcasters, this 
 D:shiny pale sword gleams with the rays of rising sun as you invoke 
 D:its power of commanding legions of powerful immortal warriors...
@@ -1608,13 +2619,30 @@ N:111:'Grond'
 I:21:50:2
 W:100:1:1000:500000
 P:0:9d9:25:25:10
-F:KILL_DRAGON | SLAY_ANIMAL | SLAY_EVIL | IMPACT | KILL_UNDEAD | NO_MAGIC |
-F:KILL_DEMON | SLAY_TROLL | SLAY_ORC | RES_ACID | RES_ELEC | RES_FIRE | 
-F:RES_COLD | SEE_INVIS | ESP_ALL | AGGRAVATE | SHOW_MODS | INSTA_ART |
-F:LEVELS | ACTIVATE | SPECIAL_GENE
+F:ACTIVATE
+F:AGGRAVATE
+F:ESP_ALL
+F:IMPACT
+F:INSTA_ART
+F:KILL_DEMON
+F:KILL_DRAGON
+F:KILL_UNDEAD
+F:LEVELS
 F:MUST2H
+F:NO_MAGIC
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_EVIL
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SPECIAL_GENE
 f:MUST2H
-a:HARDCORE=GROND
+a:GROND
 D:The mighty Hammer of the Underworld, blackened by doomspells of shattering, 
 D:whose wielder holds the lives of all Morgoth's servants in his hand.
 
@@ -1625,12 +2653,17 @@ N:112:'Totila'
 I:21:13:2
 W:20:8:150:55000
 P:0:3d6:6:8:0
-F:STEALTH | 
-F:SLAY_EVIL | BRAND_FIRE | RES_FIRE | RES_CONF | ACTIVATE | 
-F:SHOW_MODS | LITE1
+F:ACTIVATE
+F:BRAND_FIRE
 F:COULD2H
+F:LITE1
+F:RES_CONF
+F:RES_FIRE
+F:SHOW_MODS
+F:SLAY_EVIL
+F:STEALTH
 f:COULD2H
-a:HARDCORE=CONFUSE
+a:CONFUSE
 D:A flail whose head befuddles those who stare as you whirl it around, and 
 D:becomes a fiery comet as you bring it down.
 
@@ -1641,10 +2674,20 @@ N:113:'Thunderfist'
 I:21:18:4
 W:45:38:300:160000
 P:0:3d6:5:18:0
-F:STR | CON | HIDE_TYPE | RES_FEAR | 
-F:SLAY_ANIMAL | BRAND_FIRE | BRAND_ELEC | SLAY_TROLL | SLAY_ORC | 
-F:RES_ELEC | RES_FIRE | RES_DARK | SHOW_MODS |
+F:BRAND_ELEC
+F:BRAND_FIRE
+F:CON
+F:HIDE_TYPE
 F:MUST2H
+F:RES_DARK
+F:RES_ELEC
+F:RES_FEAR
+F:RES_FIRE
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_ORC
+F:SLAY_TROLL
+F:STR
 f:MUST2H
 D:The long-lost weapon of Kzurin, Dwarven champion of ancient Belegost, 
 D:with runes of strength in its handle, and flames and sparks that roar and 
@@ -1657,9 +2700,15 @@ N:114:'Bloodspike'
 I:21:12:4
 W:20:30:150:30000
 P:0:2d6:8:22:0
-F:STR | HIDE_TYPE | BRAND_POIS | 
-F:SLAY_ANIMAL | SLAY_TROLL | SLAY_ORC | RES_NEXUS | SEE_INVIS | 
+F:BRAND_POIS
+F:HIDE_TYPE
+F:RES_NEXUS
+F:SEE_INVIS
 F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_ORC
+F:SLAY_TROLL
+F:STR
 D:You feel strong and firm of foot as you whip the chain-suspended spiked orb 
 D:around - and bathe it in the blood of your foes.
 
@@ -1670,8 +2719,12 @@ N:115:'Firestar'
 I:21:12:0
 W:20:100:150:35000
 P:0:2d6:5:7:2
-F:BRAND_FIRE | IM_FIRE | ACTIVATE | SHOW_MODS | LITE1
-a:HARDCORE=FIRESTAR
+F:ACTIVATE
+F:BRAND_FIRE
+F:IM_FIRE
+F:LITE1
+F:SHOW_MODS
+a:FIRESTAR
 D:A famed battle-lord of old, with a ruddy head, coloured as embers are that 
 D:can yet rise up in wrath.
 
@@ -1682,10 +2735,14 @@ N:116:'Taratol'
 I:21:5:0
 W:20:15:200:50000
 P:0:3d4:12:12:0
-F:KILL_DRAGON | BRAND_ELEC | IM_ELEC | ACTIVATE | SHOW_MODS
+F:ACTIVATE
+F:BRAND_ELEC
 F:COULD2H
+F:IM_ELEC
+F:KILL_DRAGON
+F:SHOW_MODS
 f:COULD2H
-a:HARDCORE=SPEED
+a:SPEED
 D:A great ridged mace that calls around you a nimbus of living lightning; 
 D:you remain utterly untouched even as fat sparks arc around your 
 D:fingers and eyebrows.
@@ -1697,11 +2754,26 @@ N:117:of Aule
 I:21:8:4
 W:40:75:120:250000
 P:0:9d3:19:21:5
-F:WIS | TUNNEL | HIDE_TYPE | RES_FEAR | 
-F:KILL_DRAGON | SLAY_EVIL | BRAND_ELEC | SLAY_UNDEAD | SLAY_DEMON | 
-F:FREE_ACT | RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_NEXUS | 
-F:SEE_INVIS | SHOW_MODS
+F:BRAND_ELEC
 F:COULD2H
+F:FREE_ACT
+F:HIDE_TYPE
+F:KILL_DRAGON
+F:RANDOM_POWER
+F:RANDOM_RESIST
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FEAR
+F:RES_FIRE
+F:RES_NEXUS
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_EVIL
+F:SLAY_UNDEAD
+F:TUNNEL
+F:WIS
 f:COULD2H
 D:The wondrous hammer of Aule, creator of the wise Dwarven lords of old.  
 D:It bears magics of demolishing that no serpent or demon can withstand, and 
@@ -1714,9 +2786,13 @@ N:118:'Nar-i-vagil'
 I:21:3:3
 W:20:18:150:70000
 P:0:1d9:10:20:0
-F:INT | HIDE_TYPE | 
-F:SLAY_ANIMAL | BRAND_FIRE | RES_FIRE | SHOW_MODS
+F:BRAND_FIRE
 F:COULD2H
+F:HIDE_TYPE
+F:INT
+F:RES_FIRE
+F:SHOW_MODS
+F:SLAY_ANIMAL
 f:COULD2H
 D:Named for a fiery star and set with gems of great worth binding mystic 
 D:virtues of protection and thought.
@@ -1728,9 +2804,18 @@ N:119:'Eriril'
 I:21:3:4
 W:20:18:150:20000
 P:0:1d9:3:5:0
-F:INT | WIS | HIDE_TYPE | ESP_EVIL | SPELL_CONTAIN | WIELD_CAST
-F:SLAY_EVIL | RES_LITE | SEE_INVIS | ACTIVATE | SHOW_MODS
-a:HARDCORE=ID_PLAIN
+F:ACTIVATE
+F:ESP_EVIL
+F:HIDE_TYPE
+F:INT
+F:RES_LITE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_EVIL
+F:SPELL_CONTAIN
+F:WIELD_CAST
+F:WIS
+a:ID_PLAIN
 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.
 
@@ -1741,10 +2826,25 @@ N:120:of Olorin
 I:21:3:4
 W:30:105:150:140000
 P:0:2d9:10:13:0
-F:INT | WIS | CHR | HIDE_TYPE | SEARCH | BRAND_FIRE | 
-F:SLAY_EVIL | BRAND_FIRE | SLAY_TROLL | SLAY_ORC | SPELL_CONTAIN | WIELD_CAST
-F:HOLD_LIFE | RES_FIRE | RES_NETHER | SEE_INVIS | ACTIVATE | SHOW_MODS
-a:HARDCORE=DETECT_XTRA
+F:ACTIVATE
+F:BRAND_FIRE
+F:BRAND_FIRE
+F:CHR
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:INT
+F:RANDOM_POWER
+F:RES_FIRE
+F:RES_NETHER
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_EVIL
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SPELL_CONTAIN
+F:WIELD_CAST
+F:WIS
+a:DETECT_XTRA
 D:A staff tall and sturdy, with rough-hewn runes that invoke the element of 
 D:Earth, and which strikes down all creatures who live in the shadow of 
 D:mountains.
@@ -1756,11 +2856,25 @@ N:121:'Deathwreaker'
 I:21:20:6
 W:80:38:400:444444
 P:0:7d8:18:18:0
-F:STR | TUNNEL | HIDE_TYPE | NO_TELE | DRAIN_MANA | 
-F:SLAY_DRAGON | SLAY_ANIMAL | SLAY_EVIL | KILL_UNDEAD | BRAND_FIRE | 
-F:IM_FIRE | RES_DARK | RES_CHAOS | RES_DISEN | AGGRAVATE |
-F:SHOW_MODS | BRAND_POIS | VAMPIRIC
+F:AGGRAVATE
+F:BRAND_FIRE
+F:BRAND_POIS
+F:DRAIN_MANA
+F:HIDE_TYPE
+F:IM_FIRE
+F:KILL_UNDEAD
 F:MUST2H
+F:NO_TELE
+F:RES_CHAOS
+F:RES_DARK
+F:RES_DISEN
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_DRAGON
+F:SLAY_EVIL
+F:STR
+F:TUNNEL
+F:VAMPIRIC
 f:MUST2H
 D:A weapon so massive it seems beyond the strength of mortals, yet you feel 
 D:the might of giants within you as you heft it.  As you grip the handle 
@@ -1775,12 +2889,23 @@ N:122:'Turmil'
 I:21:10:4
 W:20:15:120:30000
 P:0:2d5:10:6:8
-F:WIS | INFRA | HIDE_TYPE | 
-F:BRAND_COLD | SLAY_ORC | RES_COLD | RES_LITE | REGEN | 
-F:ACTIVATE | SHOW_MODS | ESP_ORC | ESP_TROLL | ESP_GIANT
+F:ACTIVATE
+F:BRAND_COLD
 F:COULD2H
+F:ESP_GIANT
+F:ESP_ORC
+F:ESP_TROLL
+F:HIDE_TYPE
+F:INFRA
+F:RANDOM_RESIST
+F:REGEN
+F:RES_COLD
+F:RES_LITE
+F:SHOW_MODS
+F:SLAY_ORC
+F:WIS
 f:COULD2H
-a:HARDCORE=TURMIL
+a:TURMIL
 D:Wielded by the High Priest of Meneltarma, this great mace gleams coldly as 
 D:though moonlit, and it can strike as mighty a blow spiritually as 
 D:physically.
@@ -1792,11 +2917,26 @@ N:123:of Gothmog
 I:21:2:-2
 W:20:15:120:100000
 P:0:3d6:15:16:0
-F:INT | DEX | INFRA | HIDE_TYPE | DRAIN_HP | 
-F:HEAVY_CURSE | CURSED | AGGRAVATE | 
-F:BRAND_FIRE | SLAY_ANIMAL | SLAY_DEMON | RES_FIRE | ESP_SPIDER
-F:VORPAL | RES_LITE | LITE1 | REGEN | ESP_DEMON | WOUNDING
+F:AGGRAVATE
+F:BRAND_FIRE
+F:CURSED
+F:DEX
+F:DRAIN_HP
+F:ESP_DEMON
+F:ESP_SPIDER
+F:HEAVY_CURSE
+F:HIDE_TYPE
+F:INFRA
+F:INT
+F:LITE1
+F:REGEN
+F:RES_FIRE
+F:RES_LITE
 F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_DEMON
+F:VORPAL
+F:WOUNDING
 D:With this unbearably bright whip of flame, the Balrog Gothmog has become 
 D:known for never having lost in combat.
 
@@ -1807,8 +2947,12 @@ N:124:'Belthronding'
 I:19:13:3
 W:40:20:40:35000
 P:0:0d0:20:22:0
-F:DEX | STEALTH | HIDE_TYPE | 
-F:RES_DISEN | XTRA_SHOTS | SHOW_MODS
+F:DEX
+F:HIDE_TYPE
+F:RES_DISEN
+F:SHOW_MODS
+F:STEALTH
+F:XTRA_SHOTS
 D:The great bow of Beleg, made of black yew and strung with elven hair that 
 D:faintly shines a pale clear gold.
 
@@ -1819,8 +2963,13 @@ N:125:of Bard
 I:19:13:2
 W:30:20:40:20000
 P:0:0d0:17:19:0
-F:DEX | HIDE_TYPE | ESP_DRAGON | LUCK
-F:FREE_ACT | XTRA_MIGHT | SHOW_MODS
+F:DEX
+F:ESP_DRAGON
+F:FREE_ACT
+F:HIDE_TYPE
+F:LUCK
+F:SHOW_MODS
+F:XTRA_MIGHT
 D:The great yew bow of grim-faced Bard, who shot the mightiest arrow that 
 D:songs record.
 
@@ -1831,9 +2980,13 @@ N:126:'Cubragol'
 I:19:23:10
 W:50:25:110:50000
 P:0:0d0:10:14:0
-F:SPEED | HIDE_TYPE | 
-F:RES_FIRE | ACTIVATE | SHOW_MODS
-a:HARDCORE=CUBRAGOL
+F:ACTIVATE
+F:HIDE_TYPE
+F:RANDOM_RES_OR_POWER
+F:RES_FIRE
+F:SHOW_MODS
+F:SPEED
+a:CUBRAGOL
 D:A crossbow that grants fiery speed to he who finds it, and from which 
 D:shoot bolts that blaze with flame unquenchable.
 
@@ -1846,13 +2999,31 @@ N:127:of Eternity
 I:6:1:12
 W:127:220:20:9000000
 P:0:1d4:-19:-19:0
-F:INT | CHR | WIS | MANA | SPELL | ACTIVATE |
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | LUCK | SPECIAL_GENE
-F:SEE_INVIS | ESP_EVIL | ESP_DEMON | NEVER_BLOW | INFRA
-F:PRECOGNITION | IM_FIRE | ULTIMATE | SPELL_CONTAIN | WIELD_CAST
+F:ACTIVATE
+F:CHR
 F:COULD2H
+F:ESP_DEMON
+F:ESP_EVIL
+F:IM_FIRE
+F:INFRA
+F:INT
+F:LUCK
+F:MANA
+F:NEVER_BLOW
+F:PRECOGNITION
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:SEE_INVIS
+F:SPECIAL_GENE
+F:SPELL
+F:SPELL_CONTAIN
+F:ULTIMATE
+F:WIELD_CAST
+F:WIS
 f:COULD2H
-a:HARDCORE=GANDALF
+a:GANDALF
 D:A simple, wooden wizard's staff.  Unremarkable in all aspects... 
 D:except that it pulses with overwhelming power.
 
@@ -1864,8 +3035,12 @@ N:128:of Beor
 I:15:4:4
 W:20:10:20:40000
 P:0:4d5:8:12:0
-F:DEX | SPEED | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD
+F:DEX
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:SPEED
 D:Beor's boomerang makes its wielder as agile as the winds, 
 D:and as hard to harm.
 
@@ -1876,8 +3051,20 @@ N:129:'Glimdrir'
 I:15:4:3
 W:40:20:20:60000
 P:0:5d5:15:16:0
-F:DEX | SPEED | FREE_ACT | BRAND_POIS | SLAY_EVIL | SLAY_UNDEAD | REGEN
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_SOUND | NO_TELE | CURSED
+F:BRAND_POIS
+F:CURSED
+F:DEX
+F:FREE_ACT
+F:NO_TELE
+F:REGEN
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_SOUND
+F:SLAY_EVIL
+F:SLAY_UNDEAD
+F:SPEED
 D:A powerful boomerang that makes one agile and fast, with a thirst for 
 D:evil and undead creatures, but demands its wielder not teleport, for fear 
 D:of desertion.
@@ -1889,9 +3076,19 @@ N:130:of Incanus
 I:36:2:3
 W:30:20:20:60000
 P:2:0d0:0:0:20
-F:INT | WIS | SEARCH | HIDE_TYPE | SPELL_CONTAIN | WIELD_CAST
-F:SUST_INT | SUST_WIS | FREE_ACT | SEE_INVIS | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
+F:FREE_ACT
+F:HIDE_TYPE
+F:INT
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:SEE_INVIS
+F:SPELL_CONTAIN
+F:SUST_INT
+F:SUST_WIS
+F:WIELD_CAST
+F:WIS
 Z:weigh magic
 D:Gandalf's long, flowing robe.  It provides insight and allows the 
 D:wearer to see things not seen by all.
@@ -1903,8 +3100,13 @@ N:131:of the Thain
 I:19:2:4
 W:40:20:40:35000
 P:0:0d0:15:15:0
-F:HIDE_TYPE | DEX | CON
-F:RES_NETHER | XTRA_SHOTS | XTRA_MIGHT | SHOW_MODS
+F:CON
+F:DEX
+F:HIDE_TYPE
+F:RES_NETHER
+F:SHOW_MODS
+F:XTRA_MIGHT
+F:XTRA_SHOTS
 D:This sling was crafted by Faramir I, Thain of the Shire, just in case 
 D:the nasties of his father's stories ever dare to enter the Shire again.
 
@@ -1915,9 +3117,16 @@ N:134:'Lasher'
 I:21:2:3
 W:20:5:30:50000
 P:0:1d6:12:15:0
-F:DEX | BLOWS | HIDE_TYPE | 
-F:SLAY_ANIMAL | SLAY_ORC | BRAND_POIS | VORPAL | 
-F:RES_POIS | FREE_ACT | ESP_ORC
+F:BLOWS
+F:BRAND_POIS
+F:DEX
+F:ESP_ORC
+F:FREE_ACT
+F:HIDE_TYPE
+F:RES_POIS
+F:SLAY_ANIMAL
+F:SLAY_ORC
+F:VORPAL
 D:A powerful whip that is deadly against orcs.  It poisons your foes 
 D:and is said to go "snicker snack".
 
@@ -1928,9 +3137,19 @@ N:135:'Bullseye'
 I:17:2:0
 W:45:1:2:50000
 P:0:7d4:20:15:0
-F:SLAY_ANIMAL | SLAY_EVIL | SLAY_UNDEAD | KILL_DEMON | 
-F:SLAY_ORC | SLAY_TROLL | SLAY_GIANT | SLAY_DRAGON | 
-F:BRAND_ACID | BRAND_ELEC | BRAND_FIRE | BRAND_COLD | BRAND_POIS
+F:BRAND_ACID
+F:BRAND_COLD
+F:BRAND_ELEC
+F:BRAND_FIRE
+F:BRAND_POIS
+F:KILL_DEMON
+F:SLAY_ANIMAL
+F:SLAY_DRAGON
+F:SLAY_EVIL
+F:SLAY_GIANT
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SLAY_UNDEAD
 D:A powerful arrow that is feared by even the mightiest demons.
 
 
@@ -1940,7 +3159,11 @@ N:136:'Travak'
 I:16:0:0
 W:5:1:2:5000
 P:0:3d6:8:5:0
-F:BRAND_ACID | BRAND_ELEC | BRAND_FIRE | BRAND_COLD | BRAND_POIS
+F:BRAND_ACID
+F:BRAND_COLD
+F:BRAND_ELEC
+F:BRAND_FIRE
+F:BRAND_POIS
 D:A rounded pebble imbued with the powers of the elements.
 
 
@@ -1950,8 +3173,19 @@ N:137:of Maglor
 I:14:59:3
 W:60:10:20:100000
 P:0:3d4:0:0:0
-F:CHR | SPEED | WIS | SEE_INVIS | RES_SOUND | STEALTH | LUCK
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | ESP_UNIQUE | WIELD_CAST
+F:CHR
+F:ESP_UNIQUE
+F:LUCK
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_SOUND
+F:SEE_INVIS
+F:SPEED
+F:STEALTH
+F:WIELD_CAST
+F:WIS
 D:This harp that once belonged to Maglor makes those who use it seem 
 D:more forceful and convincing.  It is also said that those who have 
 D:used it found themselves walking faster, as if to an unheard beat.
@@ -1963,8 +3197,18 @@ N:138:of the Sky
 I:14:58:2
 W:40:10:15:80000
 P:0:3d4:0:0:0
-F:CHR | SPEED | WIS | SEE_INVIS | RES_SOUND | STEALTH | LUCK
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | WIELD_CAST
+F:CHR
+F:LUCK
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_SOUND
+F:SEE_INVIS
+F:SPEED
+F:STEALTH
+F:WIELD_CAST
+F:WIS
 D:The drum is decorated with the images of the stars, the clouds, the 
 D:Sun guided by Arien and the Moon with Tilion.  It imparts to the 
 D:wearer an echo of the beauty of the sky, and protects him from the 
@@ -1978,8 +3222,17 @@ N:139:of Daeron
 I:14:59:1
 W:20:10:10:50000
 P:0:3d4:0:0:0
-F:CHR | SPEED | WIS | RES_SOUND | STEALTH | LUCK
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | WIELD_CAST
+F:CHR
+F:LUCK
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_SOUND
+F:SPEED
+F:STEALTH
+F:WIELD_CAST
+F:WIS
 D:A pretty harp that makes those who play it beautiful, wise and 
 D:fast.
 
@@ -1990,9 +3243,17 @@ N:140:of Erebor
 I:20:6:5
 W:50:15:200:55000
 P:0:3d4:0:0:0
-F:STR | TUNNEL | SUST_STR | HIDE_TYPE | LITE1 | ACTIVATE | CLIMB
-F:RES_CHAOS | RES_LITE | RES_DARK
-a:HARDCORE=EREBOR
+F:ACTIVATE
+F:CLIMB
+F:HIDE_TYPE
+F:LITE1
+F:RES_CHAOS
+F:RES_DARK
+F:RES_LITE
+F:STR
+F:SUST_STR
+F:TUNNEL
+a:EREBOR
 D:A pick that provides a magical light by which to see while tunnelling.
 
 
@@ -2002,8 +3263,13 @@ N:141:of the Druedain
 I:14:58:4
 W:19:10:15:10000
 P:0:3d4:0:0:0
-F:ACTIVATE | STEALTH | SEARCH | INFRA | RES_POIS | RES_DARK | WIELD_CAST
-a:HARDCORE=DRUEDAIN
+F:ACTIVATE
+F:INFRA
+F:RES_DARK
+F:RES_POIS
+F:STEALTH
+F:WIELD_CAST
+a:DRUEDAIN
 D:The fabled Drum of the Druedain that will protect those who play it 
 D:from darkness and poison attacks.  It also aids in the seeing of 
 D:warm-blooded creatures.
@@ -2015,8 +3281,12 @@ N:142:of Rohan
 I:14:60:2
 W:14:10:15:80000
 P:0:3d4:0:0:0
-F:ACTIVATE | CHR | WIS | ESP_DRAGON | WIELD_CAST
-a:HARDCORE=ROHAN
+F:ACTIVATE
+F:CHR
+F:ESP_DRAGON
+F:WIELD_CAST
+F:WIS
+a:ROHAN
 D:A horn carved from the bones of the Dragon of Ered-Mithrin, this 
 D:heirloom of the House of Eorl bestows to its user the gifts of 
 D:courage and command.
@@ -2028,8 +3298,14 @@ N:143:of Helm
 I:14:60:2
 W:16:10:15:15000
 P:0:3d4:0:0:0
-F:ACTIVATE | STR | CON | IM_COLD | RES_NETHER | RES_FEAR | WIELD_CAST
-a:HARDCORE=HELM
+F:ACTIVATE
+F:CON
+F:IM_COLD
+F:RES_FEAR
+F:RES_NETHER
+F:STR
+F:WIELD_CAST
+a:HELM
 D:Heedless of cold, fearless of darkness -- besiegers fled at the wind 
 D:of the solitary coming of King Helm Hammerhand, proclaimed by a single 
 D:horn-blast in the dead of winter.
@@ -2041,8 +3317,14 @@ N:144:of Boromir
 I:14:60:3
 W:18:10:15:18000
 P:0:3d4:0:0:0
-F:ACTIVATE | STR | CON | RES_FEAR | RES_FIRE | AGGRAVATE | WIELD_CAST
-a:HARDCORE=BOROMIR
+F:ACTIVATE
+F:AGGRAVATE
+F:CON
+F:RES_FEAR
+F:RES_FIRE
+F:STR
+F:WIELD_CAST
+a:BOROMIR
 D:Boromir's horn gives courage and endurance to the wearer, provided he does 
 D:not wish to travel in secrecy: for it must always sound when its wielder 
 D:sets forth on a journey.  "Loud and clear it sounds in the valleys of the 
@@ -2055,8 +3337,14 @@ N:145:of Gothmog
 I:22:28:-4
 W:30:8:250:30000
 P:0:3d8:14:19:0
-F:BRAND_FIRE | IM_FIRE | CHR | ACTIVATE | SHOW_MODS | CURSED | TY_CURSE
-a:HARDCORE=AXE_GOTHMOG
+F:ACTIVATE
+F:BRAND_FIRE
+F:CHR
+F:CURSED
+F:IM_FIRE
+F:SHOW_MODS
+F:TY_CURSE
+a:AXE_GOTHMOG
 D:The black axe of Gothmog, which struck Fingon at Nirnaeth.  Mighty 
 D:spells of evil make it unsafe in any hands but those of its original wielder.
 
@@ -2067,7 +3355,8 @@ N:146:of Gondor
 I:17:2:0
 W:20:5:3:25000
 P:0:10d8:10:20:0
-F:SLAY_EVIL | SLAY_DEMON
+F:SLAY_DEMON
+F:SLAY_EVIL
 D:An arrow that was created to rid the world of demons.
 
 
@@ -2078,14 +3367,41 @@ N:147:of Eternity
 I:23:17:10
 W:127:220:130:9000000
 P:0:5d6:21:26:50
-F:LIFE | CON | CHR | LUCK
-F:SUST_STR | SUST_INT | SUST_WIS | SUST_DEX | SUST_CON | SUST_CHR |
-F:BRAND_FIRE | BRAND_COLD | BRAND_ELEC | VORPAL | IM_COLD |
-F:SLAY_EVIL | SLAY_UNDEAD | SLAY_DEMON | SLAY_TROLL | SLAY_DEMON |
-F:FREE_ACT | RES_FIRE | RES_DARK | LITE1 | SEE_INVIS | SLOW_DIGEST | REGEN | 
-F:ACTIVATE | SHOW_MODS | BLESSED |
-F:PRECOGNITION | NO_MAGIC | ULTIMATE | SPECIAL_GENE
-a:HARDCORE=ERU
+F:ACTIVATE
+F:BLESSED
+F:BRAND_COLD
+F:BRAND_ELEC
+F:BRAND_FIRE
+F:CHR
+F:CON
+F:FREE_ACT
+F:IM_COLD
+F:LIFE
+F:LITE1
+F:LUCK
+F:NO_MAGIC
+F:PRECOGNITION
+F:REGEN
+F:RES_DARK
+F:RES_FIRE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_DEMON
+F:SLAY_EVIL
+F:SLAY_TROLL
+F:SLAY_UNDEAD
+F:SLOW_DIGEST
+F:SPECIAL_GENE
+F:SUST_CHR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_INT
+F:SUST_STR
+F:SUST_WIS
+F:ULTIMATE
+F:VORPAL
+a:ERU
 D:A warm light bathes this translucent blade.  The power of the fates are 
 D:at the command of its wielder as the weapon passes Supreme Judgment on 
 D:the inhabitants of Angband.
@@ -2097,8 +3413,11 @@ N:148:of Great Luck
 I:36:2:60
 W:50:120:20:60000
 P:-30:0d0:0:0:-20
-F:LUCK | HIDE_TYPE |
-F:FREE_ACT | DRAIN_HP | DRAIN_MANA
+F:DRAIN_HP
+F:DRAIN_MANA
+F:FREE_ACT
+F:HIDE_TYPE
+F:LUCK
 D:A powerful wizard once created this robe to grant him incredible luck....
 D:It seems he forgot to wear it.
 
@@ -2109,9 +3428,13 @@ N:149:of Farmer Maggot
 I:19:2:2
 W:10:10:5:20000
 P:0:0d0:20:0:0
-F:INFRA | SEARCH | HIDE_TYPE | 
-F:XTRA_SHOTS | SHOW_MODS | ACTIVATE | SPECIAL_GENE
-a:SPELL=Artifact Maggot
+F:ACTIVATE
+F:HIDE_TYPE
+F:INFRA
+F:SHOW_MODS
+F:SPECIAL_GENE
+F:XTRA_SHOTS
+a:MAGGOT
 D:This ordinary seeming leather sling has been raised to legendary 
 D:status amongst generations of hobbit children.  Farmer Maggot's 
 D:ability to notice and strike any mushroom thief anywhere within 
@@ -2127,10 +3450,25 @@ N:150:of Angmar
 I:23:17:-10
 W:20:40:130:30000
 P:0:4d5:-22:-25:0
-F:SPEED | STR | WIS | CHR | ESP_UNDEAD
-F:BRAND_FIRE | SEE_INVIS | SLOW_DIGEST | FREE_ACT |
-F:VAMPIRIC | NO_TELE | AGGRAVATE | WRAITH | INVIS |
-F:CURSED | HEAVY_CURSE | DG_CURSE | SHOW_MODS | CLONE |
+F:AGGRAVATE
+F:BRAND_FIRE
+F:CHR
+F:CLONE
+F:CURSED
+F:DG_CURSE
+F:ESP_UNDEAD
+F:FREE_ACT
+F:HEAVY_CURSE
+F:INVIS
+F:NO_TELE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLOW_DIGEST
+F:SPEED
+F:STR
+F:VAMPIRIC
+F:WIS
+F:WRAITH
 D:Dark flames wreath the naked steel of the Witch-King of Angmar.  
 D:A mighty curse to all those who wield it apart from its master, 
 D:the torture of the wraithworld awaits those who dare.
@@ -2142,9 +3480,19 @@ N:151:of Feanor
 I:18:2:0
 W:127:220:130:100000
 P:0:5d5:5:6:0
-F:BRAND_COLD | BRAND_FIRE | BRAND_ELEC | BRAND_ACID | BRAND_POIS |
-F:SLAY_DRAGON | SLAY_GIANT | SLAY_TROLL | KILL_UNDEAD | SLAY_ORC |
-F:SLAY_DEMON | SLAY_EVIL | SPECIAL_GENE
+F:BRAND_ACID
+F:BRAND_COLD
+F:BRAND_ELEC
+F:BRAND_FIRE
+F:BRAND_POIS
+F:KILL_UNDEAD
+F:SLAY_DEMON
+F:SLAY_DRAGON
+F:SLAY_EVIL
+F:SLAY_GIANT
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SPECIAL_GENE
 D:Made during the war against Morgoth by Feanor, this powerful 
 D:bolt is the bane of Morgoth's power, and has especial strength 
 D:against those foes who are already dead.
@@ -2157,11 +3505,38 @@ N:152:of Eternity
 I:19:24:5
 W:127:220:130:8000000
 P:0:0d0:36:28:0
-F:SEE_INVIS | SLOW_DIGEST | FREE_ACT | SPEED | DEX | CON | FLY | LUCK
-F:XTRA_MIGHT | XTRA_SHOTS | IM_ELEC | REFLECT | INVIS | STEALTH |
-F:SUST_STR | SUST_INT | SUST_WIS | SUST_DEX | SUST_CON | SUST_CHR |
-F:RES_CHAOS | RES_DISEN | RES_CONF | RES_BLIND | INFRA | ESP_ORC | ESP_TROLL | ESP_EVIL |
-F:PRECOGNITION | NO_MAGIC | ULTIMATE | SPECIAL_GENE
+F:CON
+F:DEX
+F:ESP_EVIL
+F:ESP_ORC
+F:ESP_TROLL
+F:FLY
+F:FREE_ACT
+F:IM_ELEC
+F:INFRA
+F:INVIS
+F:LUCK
+F:NO_MAGIC
+F:PRECOGNITION
+F:REFLECT
+F:RES_BLIND
+F:RES_CHAOS
+F:RES_CONF
+F:RES_DISEN
+F:SEE_INVIS
+F:SLOW_DIGEST
+F:SPECIAL_GENE
+F:SPEED
+F:STEALTH
+F:SUST_CHR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_INT
+F:SUST_STR
+F:SUST_WIS
+F:ULTIMATE
+F:XTRA_MIGHT
+F:XTRA_SHOTS
 D:Designed to be used with the Seeker Bolt of Feanor, this Crossbow 
 D:is perfect against the terrible powers of Morgoth.
 
@@ -2172,8 +3547,16 @@ N:153:of the Sandworm
 I:36:4:5
 W:30:3:80:65000
 P:30:0d0:0:0:0
-F:RES_POIS | RES_ELEC | RES_FIRE | RES_ACID | SPECIAL_GENE
-F:TUNNEL | STR | STEALTH | INFRA | ESP_ANIMAL
+F:ESP_ANIMAL
+F:INFRA
+F:RES_ACID
+F:RES_ELEC
+F:RES_FIRE
+F:RES_POIS
+F:SPECIAL_GENE
+F:STEALTH
+F:STR
+F:TUNNEL
 D:This powerful piece of armour was made using the remains of 
 D:the Sandworm Queen.
 
@@ -2184,8 +3567,14 @@ N:154:'Dragonbane'
 I:22:28:2
 W:70:20:260:33000
 P:0:3d8:20:20:0
-F:BLOWS | KILL_DRAGON | RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
-F:RES_POIS | SHOW_MODS
+F:BLOWS
+F:KILL_DRAGON
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_POIS
+F:SHOW_MODS
 D:Forged by the Dwarves to defend their home of Khazad-dum from dragons, 
 D:this axe has been lost to time... until now.
 
@@ -2196,7 +3585,11 @@ N:155:'Limbslicer'
 I:24:8:4
 W:15:3:140:12000
 P:0:2d5:12:15:0
-F:DEX | VORPAL | HIDE_TYPE | SHOW_MODS | WOUNDING
+F:DEX
+F:HIDE_TYPE
+F:SHOW_MODS
+F:VORPAL
+F:WOUNDING
 D:The Petty-dwarves of Bathak forged this blade, and it shares their thirst 
 D:for blood.
 
@@ -2207,10 +3600,14 @@ N:156:'Orchast'
 I:24:11:4
 W:15:2:170:12000
 P:0:2d7:20:14:0
-F:DEX | SEARCH | SLAY_ORC | ACTIVATE | HIDE_TYPE | SHOW_MODS
+F:ACTIVATE
 F:COULD2H
+F:DEX
+F:HIDE_TYPE
+F:SHOW_MODS
+F:SLAY_ORC
 f:COULD2H
-a:HARDCORE=ORCHAST
+a:ORCHAST
 D:Forged by the dwarves of Khazad-dum in a time of desperation, 
 D:this axe turned many a battle against the invading orcs.
 
@@ -2221,9 +3618,17 @@ N:157:of the Night
 I:24:1:4
 W:45:20:45:34000
 P:0:2d6:34:22:0
-F:DEX | STEALTH | VAMPIRIC | KILL_UNDEAD | RES_DARK | HIDE_TYPE | 
-F:SHOW_MODS | SEE_INVIS | ACTIVATE | DRAIN_EXP
-a:HARDCORE=NIGHT
+F:ACTIVATE
+F:DEX
+F:DRAIN_EXP
+F:HIDE_TYPE
+F:KILL_UNDEAD
+F:RES_DARK
+F:SEE_INVIS
+F:SHOW_MODS
+F:STEALTH
+F:VAMPIRIC
+a:NIGHT
 D:Found on an unmarked grave after a violent storm, this hatchet 
 D:has a sinister aura of darkness and decay.
 
@@ -2234,9 +3639,17 @@ N:158:'Naturebane'
 I:24:30:3
 W:70:20:300:28400
 P:0:5d7:31:27:0
-F:STR | SLAY_ANIMAL | SUST_STR | RES_SHARDS | RES_NEXUS | FEATHER | 
-F:HIDE_TYPE | SHOW_MODS | ACTIVATE | DRAIN_HP
-a:HARDCORE=NATUREBANE
+F:ACTIVATE
+F:DRAIN_HP
+F:FEATHER
+F:HIDE_TYPE
+F:RES_NEXUS
+F:RES_SHARDS
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:STR
+F:SUST_STR
+a:NATUREBANE
 D:Used by the orcs in their battle at Dagor Bragollach against the elves, this 
 D:axe has a bloodthirst for nature.
 
@@ -2247,8 +3660,14 @@ N:159:of Ice
 I:24:8:3
 W:30:25:140:26550
 P:0:2d5:3:15:0
-F:INT | CHR | SUST_DEX | BRAND_COLD | IM_COLD | RES_NEXUS | HIDE_TYPE | 
+F:BRAND_COLD
+F:CHR
+F:HIDE_TYPE
+F:IM_COLD
+F:INT
+F:RES_NEXUS
 F:SHOW_MODS
+F:SUST_DEX
 D:Crafted of purest ice and held solid by powerful spells, this icy axe 
 D:delivers a chill of death to its victims.
 
@@ -2259,62 +3678,30 @@ N:160:of Knowledge
 I:32:5:-6
 W:20:5:75:100000
 P:6:1d3:0:0:20
-F:LITE1 | HIDE_TYPE | SPECIAL_GENE | LUCK
-F:AUTO_ID | ACTIVATE
-a:HARDCORE=KNOWLEDGE
+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.
 
-
-### 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:STEALTH | AUTOMATIC_99 | XTRA_MIGHT | HIDE_TYPE
-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:STEALTH | XTRA_SHOTS | TELEPORT_TO | HIDE_TYPE | AUTOMATIC_99
-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:STEALTH | XTRA_SHOTS | XTRA_MIGHT | HIDE_TYPE | ONLY_DEMON
-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'
 I:23:2:2
 W:20:5:30:2000
 P:0:3d2:6:10:0
-F:STR | DEX | HIDE_TYPE | BLESSED | 
-F:SLAY_ORC | SLAY_TROLL | RES_FIRE
+F:BLESSED
+F:DEX
+F:HIDE_TYPE
+F:RES_FIRE
+F:SLAY_ORC
+F:SLAY_TROLL
+F:STR
 D:The sword that was broken shall be reforged...
 
 
@@ -2327,7 +3714,8 @@ I:32:6:0
 W:20:15:15:25000
 P:20:0d0:0:0:80
 F:ACTIVATE
-a:SPELL=Artifact Lebauhaum
+F:EASY_USE
+a:LEBOHAUM
 D:With the Helm 'Lebohaum' your head is safe!
 
 
@@ -2337,12 +3725,23 @@ N:166:'Mediator'
 I:38:30:0
 W:95:12:500:400000
 P:50:2d4:-8:0:35
-F:FEATHER | FLY | ESP_DRAGON |
-F:RES_NEXUS | RES_CHAOS | AGGRAVATE | REGEN | 
-F:RES_SHARDS | RES_SOUND | RES_DISEN | RES_CONF |
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD |
 F:ACTIVATE
-a:HARDCORE=MEDIATOR
+F:AGGRAVATE
+F:ESP_DRAGON
+F:FEATHER
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:REGEN
+F:RES_CHAOS
+F:RES_CONF
+F:RES_DISEN
+F:RES_NEXUS
+F:RES_SHARDS
+F:RES_SOUND
+a:MEDIATOR
 D:A mighty suit of dragon armour, set with the scales of dragons of both 
 D:Law and Chaos, and with power over both.
 
@@ -2353,8 +3752,11 @@ N:167:of Himring
 I:36:6:0
 W:50:20:100:35000
 P:6:0d0:0:0:15
-F:RES_CHAOS | RES_NETHER | RES_POIS | ACTIVATE
-a:HARDCORE=PROT_EVIL
+F:ACTIVATE
+F:RES_CHAOS
+F:RES_NETHER
+F:RES_POIS
+a:PROT_EVIL
 D:Contained within this studded cuirass of pliable leather is the memory of 
 D:unvanquished Himring, defiant fortress surrounded by the legions of Morgoth.
 
@@ -2365,8 +3767,13 @@ N:168:'Hithlomir'
 I:36:4:4
 W:20:3:80:45000
 P:4:0d0:0:0:20
-F:STEALTH | HIDE_TYPE | SEARCH | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_DARK
+F:HIDE_TYPE
+F:RES_ACID
+F:RES_COLD
+F:RES_DARK
+F:RES_ELEC
+F:RES_FIRE
+F:STEALTH
 D:Familiar with the secret ways hidden in darkness, this leather cuirass is 
 D:truly more than it appears.
 
@@ -2378,11 +3785,20 @@ N:169:of Gil-galad
 I:34:10:5
 W:70:4:80:65000
 P:10:1d3:0:0:20
-F:ACTIVATE | 
-F:LITE1 | WIS | CHR | SEARCH | LUCK
-F:RES_ELEC | RES_ACID | RES_DISEN | RES_DARK | HIDE_TYPE | 
-F:SUST_WIS | SUST_DEX | SUST_CHR
-a:HARDCORE=GILGALAD
+F:ACTIVATE
+F:CHR
+F:HIDE_TYPE
+F:LITE1
+F:LUCK
+F:RES_ACID
+F:RES_DARK
+F:RES_DISEN
+F:RES_ELEC
+F:SUST_CHR
+F:SUST_DEX
+F:SUST_WIS
+F:WIS
+a:GILGALAD
 D:The legendary shield of Gil-Galad, who fought his way to the gates of 
 D:the Dark Tower, and with whom came light even to Gorgoroth.
 
@@ -2393,10 +3809,16 @@ N:170:of Celebrimbor
 I:32:3:3
 W:55:12:20:45000
 P:3:1d1:0:0:18
-F:INT | DEX | CHR | SPELL | SEARCH | 
-F:RES_FIRE | RES_ACID | RES_DISEN | RES_SHARDS | 
 F:ACTIVATE
-a:HARDCORE=CELEBRIMBOR
+F:CHR
+F:DEX
+F:INT
+F:RES_ACID
+F:RES_DISEN
+F:RES_FIRE
+F:RES_SHARDS
+F:SPELL
+a:CELEBRIMBOR
 D:This once belonged to Celebrimbor, maker of the Rings of Power.  One who 
 D:knows both fire and acid, from the business of forging and engraving, will 
 D:fear neither: nor have his enchantments ever faded.  Celebrimbor was even 
@@ -2410,10 +3832,18 @@ N:171:of Umbar
 I:19:24:2
 W:60:20:200:35000
 P:0:4d1:18:18:0
-F:STR | CON | XTRA_MIGHT | AGGRAVATE | 
-F:RES_LITE | RES_DARK | RES_BLIND | RES_ELEC | 
-F:HIDE_TYPE | ACTIVATE | SHOW_MODS
-a:HARDCORE=UMBAR
+F:ACTIVATE
+F:AGGRAVATE
+F:CON
+F:HIDE_TYPE
+F:RES_BLIND
+F:RES_DARK
+F:RES_ELEC
+F:RES_LITE
+F:SHOW_MODS
+F:STR
+F:XTRA_MIGHT
+a:UMBAR
 D:A great brazen arbalest with arms of gleaming steel, shooting quarrels with 
 D:speed and power for those brave enough to risk betrayal.
 
@@ -2425,8 +3855,13 @@ N:172:of Amrod
 I:19:12:2
 W:25:10:30:9000
 P:0:0d0:12:15:0
-F:STR | CON | XTRA_MIGHT | 
-F:RES_FIRE | RES_ELEC | RES_COLD | REGEN
+F:CON
+F:REGEN
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:STR
+F:XTRA_MIGHT
 D:This bow, and its twin, belonged to Feanor's last two twin sons, Amrod 
 D:and Amras, who both hunted with the Green-elves for a time.  Like the 
 D:twins, the bows are similar, for both protect their wielders from the 
@@ -2440,8 +3875,16 @@ N:173:of Amras
 I:19:12:1
 W:25:10:30:9000
 P:0:0d0:12:15:0
-F:INT | WIS | DEX | XTRA_SHOTS | XTRA_MIGHT | SPEED | 
-F:RES_FIRE | RES_ELEC | RES_COLD | SLOW_DIGEST
+F:DEX
+F:INT
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:SLOW_DIGEST
+F:SPEED
+F:WIS
+F:XTRA_MIGHT
+F:XTRA_SHOTS
 D:This bow, and its twin, belonged to Feanor's last two twin sons, Amrod 
 D:and Amras, who both hunted with the Green-elves for a time.  Like the 
 D:twins, the bows are similar, for both protect their wielders from the 
@@ -2455,11 +3898,21 @@ N:174:of Nain
 I:20:7:6
 W:60:5:250:30000
 P:0:3d8:12:18:0
-F:TUNNEL | INFRA | SEARCH | STR | ESP_ORC | CLIMB | 
-F:SLAY_ORC | SLAY_TROLL | SLAY_GIANT | SLAY_DRAGON | 
-F:BRAND_ACID | RES_ACID | RES_DARK | RES_DISEN | 
 F:ACTIVATE
-a:HARDCORE=STONE_MUD
+F:BRAND_ACID
+F:CLIMB
+F:ESP_ORC
+F:INFRA
+F:RES_ACID
+F:RES_DARK
+F:RES_DISEN
+F:SLAY_DRAGON
+F:SLAY_GIANT
+F:SLAY_ORC
+F:SLAY_TROLL
+F:STR
+F:TUNNEL
+a:STONE_MUD
 D:Wielded by Nain of the Iron Hills at the Battle of Azanulbizar, this great 
 D:mattock brought victory to the Dwarves over Azog's Orcs - though Nain 
 D:himself fell at the last, even with victory already assured.
@@ -2471,13 +3924,22 @@ N:175:of Fundin Bluecloak
 I:21:6:4
 W:25:100:130:60000
 P:0:5d4:13:17:10
-F:STR | WIS | SPEED | LITE1 | HIDE_TYPE | 
-F:SLAY_EVIL | SLAY_UNDEAD | 
-F:RES_FIRE | RES_ELEC | RES_NETHER | RES_DISEN | HOLD_LIFE | 
 F:ACTIVATE
 F:COULD2H
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:LITE1
+F:RES_DISEN
+F:RES_ELEC
+F:RES_FIRE
+F:RES_NETHER
+F:SLAY_EVIL
+F:SLAY_UNDEAD
+F:SPEED
+F:STR
+F:WIS
 f:COULD2H
-a:HARDCORE=FUNDIN
+a:FUNDIN
 D:The weapon of one of the great dwarven priests, with powers 
 D:to preserve body, soul and enchantments, and the bane of those 
 D:who seek life beyond death.
@@ -2489,10 +3951,17 @@ N:176:of the Haradrim
 I:34:4:2
 W:35:12:120:25000
 P:4:1d2:0:0:15
-F:ACTIVATE | 
-F:STR | CON | SUST_STR | SUST_CON | HIDE_TYPE | 
-F:RES_FEAR | RES_BLIND | RES_POIS | AGGRAVATE
-a:HARDCORE=HARADRIM
+F:ACTIVATE
+F:AGGRAVATE
+F:CON
+F:HIDE_TYPE
+F:RES_BLIND
+F:RES_FEAR
+F:RES_POIS
+F:STR
+F:SUST_CON
+F:SUST_STR
+a:HARADRIM
 D:A great shield from the far lands of the South, whose wielder 
 D:will go charging into battle heedless of danger, with the 
 D:strength and endurance of a madman.  Nor will he fear poison, for 
@@ -2505,14 +3974,24 @@ N:177:'Skullcleaver'
 I:21:15:5
 W:30:15:500:60000
 P:0:5d4:11:23:20
-F:STR | TUNNEL | INFRA | HIDE_TYPE | 
-F:CURSED | AGGRAVATE | NO_MAGIC | 
-F:RES_NEXUS | RES_BLIND | RES_SOUND | 
-F:KILL_DRAGON | SLAY_ANIMAL | BRAND_POIS | BRAND_ELEC | 
 F:ACTIVATE
+F:AGGRAVATE
+F:BRAND_ELEC
+F:BRAND_POIS
 F:COULD2H
+F:CURSED
+F:HIDE_TYPE
+F:INFRA
+F:KILL_DRAGON
+F:NO_MAGIC
+F:RES_BLIND
+F:RES_NEXUS
+F:RES_SOUND
+F:SLAY_ANIMAL
+F:STR
+F:TUNNEL
 f:COULD2H
-a:HARDCORE=SKULLCLEAVER
+a:SKULLCLEAVER
 D:This mighty bludgeon brings destruction to all around it, and is the 
 D:bane of dragons and magic.
 
@@ -2523,9 +4002,18 @@ N:178:of Eol
 I:31:2:3
 W:55:35:25:40000
 P:3:1d1:0:0:15
-F:INT | MANA | FREE_ACT | FEATHER | RES_ELEC | RES_DARK | RES_POIS | ACTIVATE
-F:LUCK | SPELL_CONTAIN | WIELD_CAST
-a:HARDCORE=EOL
+F:ACTIVATE
+F:FEATHER
+F:FREE_ACT
+F:INT
+F:LUCK
+F:MANA
+F:RES_DARK
+F:RES_ELEC
+F:RES_POIS
+F:SPELL_CONTAIN
+F:WIELD_CAST
+a:EOL
 D:The iron-shod gauntlets of the Dark Elven smith Eol, tingling with magics 
 D:that he could channel in battle.
 
@@ -2536,7 +4024,10 @@ N:179:of Nevrast
 I:30:3:3
 W:20:8:40:35000
 P:3:1d1:0:0:13
-F:STEALTH | CON | SPEED | HIDE_TYPE
+F:CON
+F:HIDE_TYPE
+F:SPEED
+F:STEALTH
 D:Footgear made of bear leather and set with opals, which grant the wearer 
 D:silent, hasted movement.
 
@@ -2547,7 +4038,10 @@ N:180:of Gimli
 I:30:6:4
 W:40:8:60:22500
 P:4:1d1:5:5:10
-F:INFRA | SEARCH | TUNNEL | CLIMB | HIDE_TYPE
+F:CLIMB
+F:HIDE_TYPE
+F:INFRA
+F:TUNNEL
 Z:magic map
 D:A set of iron-shod boots stamped by Gimli's combat prowess, a peerless 
 D:ally to those journeying through halls of stone under mountains.
@@ -2560,9 +4054,19 @@ N:181:of Gothmog
 I:115:55:-20
 W:10:0:150:500
 P:0:7d6:13:13:0
-F:SHOW_MODS | SLAY_DEMON | SLAY_EVIL | BRAND_FIRE | BRAND_POIS
-F:LUCK | CHAOTIC | LITE1 | WOUNDING | RES_MORGUL | WIELD_CAST
-F:HEAVY_CURSE | AUTO_CURSE
+F:AUTO_CURSE
+F:BRAND_FIRE
+F:BRAND_POIS
+F:CHAOTIC
+F:HEAVY_CURSE
+F:LITE1
+F:LUCK
+F:RES_MORGUL
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_EVIL
+F:WIELD_CAST
+F:WOUNDING
 
 
 # The Demonshield of Gothmog
@@ -2571,9 +4075,18 @@ N:182:of Gothmog
 I:115:56:4
 W:15:0:70:500
 P:13:1d1:0:0:13
-F:DEX | INVIS | SUST_STR | SUST_CON | SUST_DEX
-F:FEATHER | SH_FIRE | FREE_ACT | HOLD_LIFE
-F:HEAVY_CURSE | AUTO_CURSE | WIELD_CAST
+F:AUTO_CURSE
+F:DEX
+F:FEATHER
+F:FREE_ACT
+F:HEAVY_CURSE
+F:HOLD_LIFE
+F:INVIS
+F:SH_FIRE
+F:SUST_CON
+F:SUST_DEX
+F:SUST_STR
+F:WIELD_CAST
 
 
 # The Demonhorn of Gothmog
@@ -2582,9 +4095,15 @@ N:183:of Gothmog
 I:115:57:-5
 W:20:0:30:500
 P:2:1d1:0:0:13
-F:LITE2 | REGEN | ESP_DEMON
-F:CHR | SLOW_DIGEST | SEE_INVIS
-F:HEAVY_CURSE | AUTO_CURSE | WIELD_CAST
+F:AUTO_CURSE
+F:CHR
+F:ESP_DEMON
+F:HEAVY_CURSE
+F:LITE2
+F:REGEN
+F:SEE_INVIS
+F:SLOW_DIGEST
+F:WIELD_CAST
 
 
 # The Long Sword 'Durandil'
@@ -2594,9 +4113,12 @@ N:184:'Durandil'
 I:23:17:3
 W:5:10:130:500
 P:0:2d5:5:6:0
-F:RES_FEAR | LUCK
-F:ACTIVATE | SHOW_MODS
-a:SPELL=Artifact Durandil
+F:ACTIVATE
+F:EASY_USE
+F:LUCK
+F:RES_FEAR
+F:SHOW_MODS
+a:DURANDIL
 D:Don't go adventuring without your Durandil sword!
 
 
@@ -2606,10 +4128,22 @@ N:200:of Undeath
 I:39:103:-5
 W:20:10:10:0
 P:0:1d1:0:0:0
-F:CURSED | INT | WIS | CON | DEX | CHR | STR | ACTIVATE |
-F:LITE3 | LITE2 | LUCK | MAGIC_BREATH
-F:INSTA_ART | DG_CURSE | ESP_UNDEAD |
-a:HARDCORE=UNDEATH
+F:ACTIVATE
+F:CHR
+F:CON
+F:CURSED
+F:DEX
+F:DG_CURSE
+F:ESP_UNDEAD
+F:INSTA_ART
+F:INT
+F:LITE2
+F:LITE3
+F:LUCK
+F:MAGIC_BREATH
+F:STR
+F:WIS
+a:UNDEATH
 D:It appears like the Phial of Galadriel at first - but wait! It 
 D:is a cursed phial created by an evil wizard to lure adventurers 
 D:into wielding it unknowingly.
@@ -2621,7 +4155,8 @@ N:201:
 I:9:1:0
 W:200:1:10:0
 P:0:1d1:0:0:0
-F:INSTA_ART | SPECIAL_GENE
+F:INSTA_ART
+F:SPECIAL_GENE
 
 
 # The Palantir of Orthanc
@@ -2630,10 +4165,19 @@ N:202:of Orthanc
 I:39:104:2
 W:75:60:200:100000
 P:0:10d10:0:0:0
-F:WIS | INT | SEARCH | INFRA | HIDE_TYPE | ACTIVATE | ESP_ALL | 
-F:SEE_INVIS | RES_BLIND | AGGRAVATE | DRAIN_MANA | LITE2
+F:ACTIVATE
+F:AGGRAVATE
+F:DRAIN_MANA
+F:ESP_ALL
+F:HIDE_TYPE
+F:INFRA
 F:INSTA_ART
-a:HARDCORE=PALANTIR
+F:INT
+F:LITE2
+F:RES_BLIND
+F:SEE_INVIS
+F:WIS
+a:PALANTIR
 D:A shining white ball of unbreakable crystal, the ancient Palantiri 
 D:were used by kings of Numenor and later by the Exiles for rapid 
 D:communication between distant lands.  Nothing is hidden from one who 
@@ -2648,10 +4192,19 @@ N:203:of Phasing
 I:45:55:15
 W:110:0:2:3000000
 P:0:1d1:0:0:0
-F:SPEED | SEE_INVIS | LUCK | MAGIC_BREATH
-F:CURSED | HEAVY_CURSE | REGEN
-F:WRAITH | IM_NETHER | DRAIN_EXP | HOLD_LIFE | SPECIAL_GENE |
+F:CURSED
+F:DRAIN_EXP
+F:HEAVY_CURSE
+F:HOLD_LIFE
+F:IM_NETHER
 F:INSTA_ART
+F:LUCK
+F:MAGIC_BREATH
+F:REGEN
+F:SEE_INVIS
+F:SPECIAL_GENE
+F:SPEED
+F:WRAITH
 Z:teleport
 D:Imbued with the screams of the victims of undead everywhere, this 
 D:ring is more a hole in reality than anything else.  Strange forces ripple over 
@@ -2666,12 +4219,26 @@ N:204:'Toris Mejistos'
 I:40:18:2
 W:50:10:3:60000
 Z:restore life
-F:INT | WIS | HIDE_TYPE | MANA | LUCK
-F:SUST_INT | SUST_WIS | LITE1 | REGEN
-F:SLOW_DIGEST | AUTO_CURSE | HEAVY_CURSE
-F:ESP_GOOD | ESP_EVIL | HOLD_LIFE
-F:INSTA_ART | SPECIAL_GENE | WATER_BREATH
-F:SPELL_CONTAIN | WIELD_CAST
+F:AUTO_CURSE
+F:ESP_EVIL
+F:ESP_GOOD
+F:HEAVY_CURSE
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:INSTA_ART
+F:INT
+F:LITE1
+F:LUCK
+F:MANA
+F:REGEN
+F:SLOW_DIGEST
+F:SPECIAL_GENE
+F:SPELL_CONTAIN
+F:SUST_INT
+F:SUST_WIS
+F:WATER_BREATH
+F:WIELD_CAST
+F:WIS
 D:A blue stone, with an incredible number of incredibly small runes of power 
 D:on it.  It carries many secrets.
 
@@ -2681,10 +4248,26 @@ D:on it.  It carries many secrets.
 N:205:of Durin
 I:45:57:2
 W:70:70:2:65000
-F:CON | CHR | STR | SUST_CHR | SUST_CON | SUST_STR | HIDE_TYPE | 
-F:ESP_EVIL | AGGRAVATE | HEAVY_CURSE | HOLD_LIFE | DRAIN_EXP | 
-F:RES_DARK | RES_CHAOS | RES_NETHER | RES_COLD | RES_ACID | 
-F:INSTA_ART | SPECIAL_GENE | CURSED
+F:AGGRAVATE
+F:CHR
+F:CON
+F:CURSED
+F:DRAIN_EXP
+F:ESP_EVIL
+F:HEAVY_CURSE
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:INSTA_ART
+F:RES_ACID
+F:RES_CHAOS
+F:RES_COLD
+F:RES_DARK
+F:RES_NETHER
+F:SPECIAL_GENE
+F:STR
+F:SUST_CHR
+F:SUST_CON
+F:SUST_STR
 Z:Midas touch
 D:The greatest of the Seven Rings of the Dwarf-lords, and the last to be 
 D:lost.  Alone among the Seven, it was not taken by Sauron when he made 
@@ -2699,10 +4282,19 @@ N:206:'Elessar'
 I:40:19:4
 W:60:60:3:40000
 P:0:0d0:7:7:10
-F:STR | WIS | CHR | SPEED | LITE3 | INSTA_ART | 
-F:RES_FEAR | RES_FIRE | RES_POIS | RES_DISEN | HIDE_TYPE | 
 F:ACTIVATE
-a:HARDCORE=ELESSAR
+F:CHR
+F:HIDE_TYPE
+F:INSTA_ART
+F:LITE3
+F:RES_DISEN
+F:RES_FEAR
+F:RES_FIRE
+F:RES_POIS
+F:SPEED
+F:STR
+F:WIS
+a:ELESSAR
 D:This green gem glows with inner light.  Aragorn son of Arathorn wore 
 D:it at the Battle of the Pelennor Fields, and he was himself given the 
 D:name of 'Elessar' by the people of Gondor because of this.
@@ -2713,10 +4305,19 @@ D:name of 'Elessar' by the people of Gondor because of this.
 N:207:'Evenstar'
 I:40:20:3
 W:50:50:3:35000
-F:HOLD_LIFE | SUST_CON | SUST_WIS | SUST_INT | LITE1 | CON | 
-F:RES_DARK | RES_COLD | RES_NETHER | REGEN | INSTA_ART | 
 F:ACTIVATE
-a:HARDCORE=REST_ALL
+F:CON
+F:HOLD_LIFE
+F:INSTA_ART
+F:LITE1
+F:REGEN
+F:RES_COLD
+F:RES_DARK
+F:RES_NETHER
+F:SUST_CON
+F:SUST_INT
+F:SUST_WIS
+a:REST_ALL
 D:A pure white jewel, the last gift of Queen Arwen Undomiel to Frodo 
 D:Baggins, intended to be worn around his neck on the chain that had 
 D:once borne the One Ring.
@@ -2728,10 +4329,21 @@ N:208:of Minas Ithil
 I:39:107:-3
 W:75:60:200:0
 P:0:10d10:0:0:-30
-F:LIFE | CON | INT | WIS | ESP_ALL | LITE3 | LITE1
-F:CURSED | HEAVY_CURSE | TY_CURSE | DRAIN_EXP | 
-F:RES_BLIND | SEE_INVIS | ACTIVATE
-a:HARDCORE=PALANTIR
+F:ACTIVATE
+F:CON
+F:CURSED
+F:DRAIN_EXP
+F:ESP_ALL
+F:HEAVY_CURSE
+F:INT
+F:LIFE
+F:LITE1
+F:LITE3
+F:RES_BLIND
+F:SEE_INVIS
+F:TY_CURSE
+F:WIS
+a:PALANTIR
 D:A shining white ball of unbreakable crystal, the ancient Palantiri 
 D:were used by kings of Numenor and later by the Exiles for rapid 
 D:communication between distant lands.  This Palantir, however, was 
@@ -2746,8 +4358,12 @@ N:209:'Balefire'
 I:18:3:0
 W:55:30:2:50000
 P:0:6d5:20:15:0
-F:ESP_DEMON | ESP_UNDEAD | LITE1 |
-F:BRAND_FIRE | KILL_DEMON | KILL_UNDEAD |
+F:BRAND_FIRE
+F:ESP_DEMON
+F:ESP_UNDEAD
+F:KILL_DEMON
+F:KILL_UNDEAD
+F:LITE1
 D:This silver-tipped bolt, ablaze with undying celestial fire, 
 D:is especially potent against undead and creatures of the 
 D:netherworld; it even points the way to places where such 
@@ -2760,9 +4376,14 @@ N:210:'Stone-biter'
 I:18:3:3
 W:55:30:2:50000
 P:0:6d5:20:15:0
-F:ESP_ORC | ESP_TROLL |
-F:INFRA | SEARCH | TUNNEL | LUCK
-F:BRAND_ACID | SLAY_ORC | SLAY_TROLL |
+F:BRAND_ACID
+F:ESP_ORC
+F:ESP_TROLL
+F:INFRA
+F:LUCK
+F:SLAY_ORC
+F:SLAY_TROLL
+F:TUNNEL
 D:Wherever it strikes, this silver-tipped bolt eats through rock 
 D:and metal as easily as through flesh.  The dwarf-smith who 
 D:crafted Stone-biter also inscribed the shaft with powerful 
@@ -2776,7 +4397,9 @@ N:211:'Heart's Blood'
 I:18:2:5
 W:85:40:3:35000
 P:0:8d5:15:20:0
-F:VORPAL | WOUNDING | CRIT |
+F:CRIT
+F:VORPAL
+F:WOUNDING
 D:The barbed head of this bolt glows deep red with terrible runes 
 D:of destruction; legend has it that Heart's Blood cannot hit its 
 D:mark without causing a mortal wound.
@@ -2788,8 +4411,9 @@ N:212:'Scale-piercer'
 I:18:2:0
 W:85:40:3:35000
 P:0:8d5:15:20:0
-F:ESP_DRAGON | RES_FEAR |
-F:KILL_DRAGON |
+F:ESP_DRAGON
+F:KILL_DRAGON
+F:RES_FEAR
 D:This bolt, crafted from the bones of a Great Wyrm, is less famous 
 D:and less powerful than Bard's black arrow.  Nonetheless it enables 
 D:the owner to find dragons unerringly, face them bravely, and kill 
@@ -2806,10 +4430,20 @@ N:213:of Forochel
 I:6:1:3
 W:65:70:60:60000
 P:0:3d4:-12:-8:0
-F:INT | WIS | MANA | SPELL | INFRA | SEE_INVIS
-F:SUST_INT | SUST_WIS | RES_BLIND | IM_COLD | SENS_FIRE
-F:SPECIAL_GENE | WIELD_CAST
 F:COULD2H
+F:IM_COLD
+F:INFRA
+F:INT
+F:MANA
+F:RES_BLIND
+F:SEE_INVIS
+F:SENS_FIRE
+F:SPECIAL_GENE
+F:SPELL
+F:SUST_INT
+F:SUST_WIS
+F:WIELD_CAST
+F:WIS
 f:COULD2H
 D:A shaft of pure, invincible crystal cut from the heart of one 
 D:of the great glaciers ringing the Ice-Bay of Forochel. 
@@ -2822,8 +4456,16 @@ N:214:of Mellyrn
 I:35:2:4
 W:40:40:5:65000
 P:4:0d0:0:0:20
-F:HIDE_TYPE | INVIS | DEX |  SPEED | STEALTH | LUCK
-F:SUST_DEX | RES_LITE | RES_DARK | SPECIAL_GENE
+F:DEX
+F:HIDE_TYPE
+F:INVIS
+F:LUCK
+F:RES_DARK
+F:RES_LITE
+F:SPECIAL_GENE
+F:SPEED
+F:STEALTH
+F:SUST_DEX
 D:Bearing the same lyrical name as the great trees of Lothlorien 
 D:and containing in its close-woven folds the speed and skill of 
 D:the Galadrim, this grey cloak is ideal for those who travel in 
@@ -2836,9 +4478,18 @@ N:215:of Ephel Duath
 I:23:31:-3
 W:60:60:50:30000
 P:0:2d6:-20:-18:0
-F:STR | WIS | CHR | BRAND_POIS | VAMPIRIC | VORPAL
-F:INVIS | AGGRAVATE | CURSED | HEAVY_CURSE | SHOW_MODS
+F:AGGRAVATE
+F:BRAND_POIS
+F:CHR
+F:CURSED
+F:HEAVY_CURSE
+F:INVIS
+F:SHOW_MODS
 F:SPECIAL_GENE
+F:STR
+F:VAMPIRIC
+F:VORPAL
+F:WIS
 D:This filthy orc-blade is famed for vile deeds of torture and blood, 
 D:and its wielder will never cease to fear treachery.
 
@@ -2849,10 +4500,22 @@ N:216:'Garachoth'
 I:24:30:2
 W:70:300:400:91000
 P:0:7d5:18:18:-20
-F:STR | CON | SPEED | LEVELS | BLACK_BREATH
-F:KILL_DEMON | SLAY_ANIMAL |  BRAND_FIRE | VORPAL
-F:RES_FEAR | RES_FIRE | RES_CHAOS | RES_NETHER 
-F:HIDE_TYPE | SHOW_MODS | SPECIAL_GENE
+F:BLACK_BREATH
+F:BRAND_FIRE
+F:CON
+F:HIDE_TYPE
+F:KILL_DEMON
+F:LEVELS
+F:RES_CHAOS
+F:RES_FEAR
+F:RES_FIRE
+F:RES_NETHER
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SPECIAL_GENE
+F:SPEED
+F:STR
+F:VORPAL
 D:A ghastly axe with the soul of a demon lord trapped inside, this horrifying 
 D:creation reverberates with the screams of the damned.  As you gaze into its 
 D:glassy, translucent blade, it seems that endless sulphrous wastelands 
@@ -2865,9 +4528,20 @@ N:217:'Skycleaver'
 I:31:5:1
 W:40:45:40:100000
 P:5:1d1:16:7:16
-F:STR | CON | DEX | CHR | LUCK | FLY
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_POIS
-F:HIDE_TYPE | SHOW_MODS | SPECIAL_GENE
+F:CHR
+F:CON
+F:DEX
+F:FLY
+F:HIDE_TYPE
+F:LUCK
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_POIS
+F:SHOW_MODS
+F:SPECIAL_GENE
+F:STR
 D:The handgear of a legendary dragonslaying hero.  The wearer of these 
 D:wyrmskin gauntlets will be versed in all aerial ways, and will fear no 
 D:dragon that walks or flies.
@@ -2880,9 +4554,16 @@ N:218:of the Machine
 I:30:6:3
 W:30:100:170:19000
 P:6:1d1:0:0:24
-F:INT | SPEED | TUNNEL | AGGRAVATE 
-F:RES_CHAOS | RES_SHARDS | RES_CONF
-F:ESP_NONLIVING | HIDE_TYPE | SPECIAL_GENE
+F:AGGRAVATE
+F:ESP_NONLIVING
+F:HIDE_TYPE
+F:INT
+F:RES_CHAOS
+F:RES_CONF
+F:RES_SHARDS
+F:SPECIAL_GENE
+F:SPEED
+F:TUNNEL
 D:A massive pair of adamantine boots studded with gold, the final and 
 D:greatest product of the petty-dwarven magical forge.  Despite 
 D:the great powers they contain, they are heavy and awkward enough to 
diff --git a/lib/edit/ab_info.txt b/lib/edit/ab_info.txt
index 7b9aa152..579368f4 100644
--- a/lib/edit/ab_info.txt
+++ b/lib/edit/ab_info.txt
@@ -20,25 +20,17 @@
 # S:level(linear mode):stats
 # a:needed ability
 
-# E:excluding ability:excluding ability
-
-# If you need more sophisticated prereqs use the HOOK_LEARN_ABILITY
-
-# Version stamp (required)
-
 # Do not forget to update misc.txt with an entry like the following :
 # Maximum number of traits in ab_info.txt
 # M:b:50
 
-V:2.2.0
-
 N:0:Spread blows
 D:If a monster dies to your attack but you still have blows left
 D:you won't lose the full turn, allowing you to attack some other
 D:monster in the same turn
-D:Prereq: Weaponmastery skill@30, Dex@17
+D:Prereq: Combat@30, Dex@17
 I:5
-k:30:Weaponmastery
+k:30:Combat
 S:17:DEX
 
 N:1:Tree walking
@@ -83,15 +75,6 @@ k:40:Combat
 S:30:DEX
 S:30:STR
 
-N:7:Artifact Creation
-D:In combination with a high alchemy skill this ability will let you
-D:design your very own artifacts
-D:Prereq: Alchemy@40, INT@35, WIS@35
-I:70
-k:40:Alchemy
-S:35:INT
-S:35:WIS
-
 N:8:Far reaching attack
 D:You can attack an enemy one square far using a long polearm.
 D:At high levels of Polearm-mastery skill, you can even hit two enemies at once.
@@ -101,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/al_info.txt b/lib/edit/al_info.txt
deleted file mode 100644
index fbd4c9a0..00000000
--- a/lib/edit/al_info.txt
+++ /dev/null
@@ -1,2097 +0,0 @@
-# File: al_info.txt
-
-
-# This file is used to initialize the "lib/raw/al_info.raw" file, which is
-# used as the alchemist recipes in ToME
-
-# Do not modify this file unless you know exactly what you are doing,
-# unless you wish to risk possible system crashes.
-
-# Version stamp (required)
-
-V:2.0.0
-
-
-#Note: when you add anything to this file, you also need to change the M:a
-#line of misc.txt. Unlike other files, there is no 'count' entry. The
-#easiest and fastest way to find out what to say in misc.txt is:
-#
-#	grep '^[Ia]:' <al.txt | wc -l
-#   you need to add one to the result of the above statement.
-#
-# Which only works on unix systems. But if you have the misfortune not to
-#be working on a unix system, you can use an editor and to a global search
-#and replace, searching for I: and then for a:, which will give you a count
-#that's a few high, but will still work.
-
-
-#Format: There's only one kind of line here, and that's the
-# Item line. Goes like this:
-
-
-# I:tval:sval:Qty:essence
-#
-# The problem here is that it doesn't matter what order things are in.
-# Since the tval and sval are specified on each line, the lines that
-# describe a particular recipe for a particular item don't have to be
-# anywhere even close to each other in the file. This could cause a problem:
-# if the same item has two different entries for the same essence, it will
-# find one, assume that the player has enough, and display that one in green.
-# But when the player goes to make it, they may not have enough. It would also
-# cause weird recipe displays, with one essence listed twice. Funny-looking
-
-
-
-# Some special tvals:
-# 0  Not a tval, used internally by the parser to store the artifact flag essences.
-#    We don't currently have any mechanism to control which tvals flags are used on.
-# 1  Not actually a tval, used for ego items, in which  case the 'sval' is the e_idx
-#    We don't need tvals or svals for ego items, because that information is
-#    contained in the e_info record, which the e_idx points us to.
-#
-# 40 Amulet
-# 45 ring
-# 55 staff
-# 65 wand
-# 66 rod tip
-# 70 scroll
-# 71 potion
-# 40 Amulet
-# 45 ring
-# 55 staff
-# 65 wand
-# 66 rod tip
-# 70 scroll
-# 71 potion
-# 72 potion2
-# 80 Food ('shrooms, etc)
-
-# I:tval:sval:Qty:essence
-
-#**********************Mushrooms***********************
-
-#SV_FOOD_POISON                   0
-I:80:0:1:LIFE
-I:80:0:8:POISON
-
-#SV_FOOD_BLINDNESS                1
-I:80:1:1:LIFE
-I:80:1:6:DARKNESS
-I:80:1:2:LITE
-
-#SV_FOOD_PARANOIA                 2
-I:80:2:1:LIFE
-I:80:2:4:KNOWLEDGE
-I:80:2:4:CONFUSION
-
-#SV_FOOD_CONFUSION                3
-I:80:3:1:LIFE
-I:80:3:8:CONFUSION
-
-#SV_FOOD_HALLUCINATION            4
-I:80:4:1:LIFE
-I:80:4:4:CONFUSION
-I:80:4:4:MANA
-I:80:4:4:TELEPORT
-
-#SV_FOOD_PARALYSIS                5
-I:80:5:1:LIFE
-I:80:5:8:FORCE
-
-#SV_FOOD_WEAKNESS                 6
-I:80:6:1:LIFE
-I:80:6:4:POISON
-I:80:6:4:FORCE
-
-#SV_FOOD_SICKNESS                 7
-I:80:7:8:LIFE
-I:80:7:1:POISON
-
-#SV_FOOD_STUPIDITY                8
-I:80:8:1:LIFE
-I:80:8:1:MANA
-I:80:8:8:KNOWLEDGE
-
-#SV_FOOD_NAIVETY                  9
-I:80:9:1:LIFE
-I:80:9:1:MANA
-I:80:9:4:CONFUSION
-I:80:9:4:KNOWLEDGE
-
-#SV_FOOD_UNHEALTH                10
-I:80:10:8:LIFE
-I:80:10:1:FORCE
-I:80:10:1:POISON
-
-#SV_FOOD_DISEASE                 11
-I:80:11:1:LIFE
-I:80:11:1:TIME
-I:80:11:8:POISON
-
-#SV_FOOD_CURE_POISON             12
-I:80:12:1:LIFE
-I:80:12:8:POISON
-
-#SV_FOOD_CURE_BLINDNESS          13
-I:80:13:1:LIFE
-I:80:13:6:LITE
-I:80:13:2:DARKNESS
-
-#SV_FOOD_CURE_PARANOIA           14
-I:80:14:1:LIFE
-I:80:14:1:TIME
-
-#SV_FOOD_CURE_CONFUSION          15
-I:80:15:1:LIFE
-I:80:15:12:KNOWLEDGE
-
-#SV_FOOD_CURE_SERIOUS            16
-I:80:16:8:LIFE
-
-#SV_FOOD_RESTORE_STR             17
-I:80:17:20:LIFE
-I:80:17:2:TIME
-
-#SV_FOOD_RESTORE_CON             18
-I:80:18:20:LIFE
-I:80:18:2:TIME
-
-#SV_FOOD_RESTORING               19
-I:80:19:40:LIFE
-I:80:19:4:TIME
-
-#/* many missing mushrooms */
-#Note - the comment below appears on the list in defines.h, but I can't find
-#any more mushrooms in k_info.txt
-
-#define SV_FOOD_BISCUIT                 32
-#define SV_FOOD_JERKY                   33
-#define SV_FOOD_RATION                  35
-#define SV_FOOD_SLIME_MOLD              36
-#define SV_FOOD_WAYBREAD                37
-#define SV_FOOD_PINT_OF_ALE             38
-#define SV_FOOD_PINT_OF_WINE            39
-#define SV_FOOD_ATHELAS                 40
-#define SV_FOOD_GREAT_HEALTH            41
-#define SV_FOOD_FORTUNE_COOKIE          42
-
-
-
-#***************************Artifact Flags************************************
-# 
-#A:Group:tval:sval:pval:pval?:level:xp
-#  The first three describe the required item, they can be left unspecified
-#  for no object, or specify starting with tval for increasingly specific
-#  objects. 
-#  Note: pval? is boolean (0 or 1) if true, then this flag has a
-#  variable effect, and we should require more experience and times for 
-#  increasing pvals.
-#  Note:for tval=TV_CORPSE, sval=corpse type, pval=monster idx,
-#  or use f:moster_race_flags, or leave all blank for any corpse at all.
-#F:object flag to be set
-#D:Description of flag
-#x:Description of activation (instead of description of flag, see below)
-#d:Description of required item
-#p:Description of required item (plural, optional. Illegal if pval != 1)
-#a:qty:object_flag_to_be_set Essence_name (not used)
-
-# Note that like I: lines, a: lines can be anywhere and in any order.
-# Note: 'flag' is the flag name from a_info.txt, 
-#       'monster_race_flag' is from r_info.txt
-
-#The group numbers are 1-5, and the descriptions of the groups
-#are hard coded. see cmd7.c
-
-
-A:1:45:24:1:1:40:5000
-F:STR
-D:Add to Strength
-d:Ring of Strength
-p:Rings of Strength
-
-A:1:45:25:1:1:43:5000
-F:INT
-D:Add to Intelligence
-d:Ring of Intelligence
-p:Rings of Intelligence
-
-A:1:40:28:1:1:46:5000
-F:WIS
-D:Add to Wisdom
-d:Amulet of Wisdom
-p:Amulets of Wisdom
-
-A:1:45:26:1:1:46:5000
-F:DEX
-D:Add to Dexterity
-d:Ring of Dexterity
-p:Rings of Dexterity
-
-A:1:45:27:1:1:42:5000
-F:CON
-D:Add to Constitution
-d:Ring of Constitution
-p:Rings of Constitution
-
-A:1:40:2:0:1:30:5000
-F:CHR
-D:Add to Charisma
-d:Amulet of Adornment
-p:Amulets of Adornment
-
-A:1:45:10:0:0:32:1000
-F:SUST_STR
-D:Sustain Strength
-d:Ring of Sustain Strength
-
-A:1:45:11:0:0:34:1000
-F:SUST_INT
-D:Sustain Intelligence
-d:Ring of Sustain Intelligence
-
-A:1:45:12:0:0:28:1000
-F:SUST_WIS
-D:Sustain Wisdom
-d:Ring of Sustain Wisdom
-
-A:1:45:14:0:0:36:1000
-F:SUST_DEX
-D:Sustain Dexterity
-d:Ring of Sustain Dexterity
-
-A:1:45:13:0:0:36:1000
-F:SUST_CON
-D:Sustain Constitution
-d:Ring of Sustain Constitution
-
-A:1:45:15:0:0:25:1000
-F:SUST_CHR
-D:Sustain Charisma
-d:Ring of Sustain Charisma
-
-A:1:45:31:1:1:40:50000
-F:SPEED
-D:Speed
-d:Ring of Speed
-p:Rings of Speed
-
-A:1:45:49:1:1:38:150000
-F:BLOWS
-D:Extra Attacks
-d:Ring of Extra Attacks
-p:Rings of Extra Attacks
-
-A:1:30:2:0:1:32:5000
-F:STEALTH
-D:Stealthy
-d:Left Insole from a Used Soft Boot
-p:Left Insoles from Used Soft Boots
-
-A:1:36:1:0:1:29:2000
-F:SEARCH
-D:Adds to Searching
-d:Filthy Rag
-p:Filthy Rags
-
-A:1:39:1:0:1:6:1000
-F:INFRA
-D:Helps Infravision
-d:Brass Lantern
-p:Brass Lanterns
-
-A:1:9:-1:5:1:30:1000
-F:LUCK
-D:Lucky
-d:Rabbit's Left Forefoot
-p:Rabbit's Left Forefeet
-
-A:1:20:4:0:1:25:30000
-F:TUNNEL
-D:Aids in digging
-d:Pick
-p:Picks
-
-A:1:9:1:0:1:40:50000
-F:LIFE
-f:TROLL
-D:Multiplies Life
-d:Troll's Heart
-p:Troll's Hearts
-
-A:2:71:8:0:0:20:15000
-F:INVIS
-D:Invisibility
-d:Potion of Invisibility
-
-A:2:71:8:0:0:20:4000
-F:SEE_INVIS
-D:See Invisible
-d:Potion of Invisibility
-
-A:2:5:0:0:0:20:30000
-F:FREE_ACT
-D:Free Action
-d:Iron Spike
-
-A:2:34:5:0:0:38:90000
-F:REFLECT
-D:Reflection
-d:Large Metal Shield
-
-A:2:9:1:644:0:20:30000
-F:SH_FIRE
-D:Aura of Fire
-d:Lungs from an Ancient Red Dragon
-
-A:2:9:1:601:0:25:30000
-F:SH_ELEC
-D:Aura of Lightning
-d:Lungs from an Ancient Blue Dragon
-
-A:2:39:2:0:0:8:1000
-F:LITE1
-D:Light
-d:Everburning Torch
-
-A:2:39:3:0:0:20:10000
-F:LITE2
-D:Bright Light
-d:Dwarven Lantern
-
-A:2:39:4:0:0:40:100000
-F:LITE3
-D:Sunlight
-d:Feanorian Lamp
-
-A:2:38:-1:0:0:40:200000
-F:FLY
-D:Flight
-d:Suit of Dragon Armour (any colour)
-
-A:2:9:-1:862:0:50:10000000
-F:AUTO_ID
-D:Automatically IDs
-d:Morgoth's Testicles
-
-A:2:40:14:0:0:29:2000
-F:NO_TELE
-D:Anti-Teleportation
-d:Teleport Inhibiting Amulet
-
-A:2:40:13:0:0:34:2000
-F:NO_MAGIC
-D:Anti-Magic
-d:Magic Inhibiting Amulet
-
-A:2:71:62:0:0:50:100000
-F:WRAITH
-D:Wraith Form
-d:Potion of Invulnerability
-
-A:2:71:33:0:0:15:1000
-F:FEATHER
-D:Levitation
-d:Potion of Berserk Strength
-
-A:2:80:37:0:0:20:10000
-F:SLOW_DIGEST
-D:Slow Digestion
-d:Lembas Wafer
-
-A:2:80:10:0:0:32:20000
-F:REGEN
-D:Regenerate
-d:Mushroom of Unhealth
-
-A:2:80:3:0:0:12:20000
-F:TELEPORT
-D:Teleport
-d:Mushroom of Confusion
-
-A:3:21:2:0:1:30:20000
-F:CRIT
-D:Extra Critical Hits
-d:Whip
-p:Whips
-
-A:3:23:30:0:0:30:30000
-F:WOUNDING
-D:Wounds Monsters
-d:Blade of Chaos
-
-A:3:66:18:0:1:26:6000
-F:VAMPIRIC
-D:Vampiric
-d:Rod Tip of Drain Life
-
-A:3:9:1:0:0:16:2000
-F:SLAY_ANIMAL
-f:ANIMAL
-D:Slay Animal
-d:Dead Animal's Body
-
-A:3:9:-1:0:0:25:2000
-F:SLAY_EVIL
-f:EVIL
-D:Slay Evil
-d:Evil Dead Thing's Remains
-
-A:3:9:-1:0:0:30:2000
-F:SLAY_UNDEAD
-f:UNDEAD
-D:Slay Undead
-d:Remains of Undead Monster
-
-A:3:9:1:0:0:40:1500
-F:SLAY_DEMON
-f:DEMON
-D:Slay Demon
-d:Demon's Corpse
-
-A:3:9:1:0:0:10:700
-F:SLAY_ORC
-f:ORC
-D:Slay Orc
-d:Dead Orc
-
-A:3:9:1:0:0:16:700
-F:SLAY_TROLL
-f:TROLL
-D:Slay Troll
-d:Dead Troll
-
-A:3:9:1:0:0:25:900
-F:SLAY_GIANT
-f:GIANT
-D:Slay Giant
-d:Dead Giant
-
-A:3:9:1:0:0:33:2000
-F:SLAY_DRAGON
-f:DRAGON
-D:Slay Dragon
-d:Dead Dragon (any size will do)
-
-A:3:9:-1:593:0:41:5000
-F:KILL_DRAGON
-D:*Slay* Dragon
-d:Mature Multi-Hued Dragon's Remains
-
-A:3:9:-1:0:0:41:90000
-F:KILL_UNDEAD
-f:S_HI_UNDEAD
-D:*Slay* Undead
-d:Dead Summoner of Greater Undead
-
-A:3:9:-1:996:0:41:90000
-F:KILL_DEMON
-D:*Slay* Demon
-d:Lesser Balrog's Corpse
-
-A:3:0:0:0:0:36:20000
-F:VORPAL
-D:Vorpal
-
-A:3:0:0:0:0:40:90000
-F:IMPACT
-D:Earthquakes
-
-A:3:0:0:0:0:3:2000
-F:BRAND_POIS
-D:Poison Brand
-
-A:3:0:0:0:0:12:2000
-F:BRAND_ACID
-D:Acid Brand
-
-A:3:0:0:0:0:10:2000
-F:BRAND_ELEC
-D:Lightning Brand
-
-A:3:0:0:0:0:6:2000
-F:BRAND_FIRE
-D:Fire Brand
-
-A:3:0:0:0:0:8:2000
-F:BRAND_COLD
-D:Frost Brand
-
-A:3:0:0:0:1:30:3000
-F:XTRA_MIGHT
-D:Extra Might (Bows Only)
-
-A:3:0:0:0:1:35:3000
-F:XTRA_SHOTS
-D:Extra Shots (Bows Only)
-
-A:4:9:1:624:0:49:500000
-F:IM_ACID
-D:Immune to Acid
-d:Ancient Black Dragon's Foreskin
-
-A:4:9:1:601:0:50:500000
-F:IM_ELEC
-D:Immune to Lightning
-d:Ancient Blue Dragon's Foreskin
-
-A:4:9:1:644:0:49:500000
-F:IM_FIRE
-D:Immune to Fire
-d:Ancient Red Dragon's Foreskin
-
-A:4:9:1:617:0:50:500000
-F:IM_COLD
-D:Immune to Cold
-d:Ancient White Dragon's Foreskin
-
-A:4:40:8:0:0:30:30000
-F:HOLD_LIFE
-D:Hold Life
-d:Amulet of the Magi
-
-A:4:45:17:0:0:12:10000
-F:RES_ACID
-D:Resist Acid
-d:Ring of Acid
-
-A:4:45:56:0:0:15:10000
-F:RES_ELEC
-D:Resist Lightning
-d:Ring of Lightning
-
-A:4:71:30:0:0:13:10000
-F:RES_FIRE
-D:Resist Fire
-d:Potion of Resist Heat
-
-A:4:71:31:0:0:14:10000
-F:RES_COLD
-D:Resist Cold
-d:Potion of Resist Cold
-
-A:4:71:27:0:0:25:30000
-F:RES_POIS
-D:Resist Poison
-d:Potion of Cure Poison
-
-A:4:45:38:0:0:26:10000
-F:RES_FEAR
-D:Resist Fear
-d:Ring of Fear Resistance
-
-A:4:45:39:0:0:31:60000
-F:RES_LITE
-D:Resist Light
-d:Ring of Light and Darkness Resistance
-
-A:4:45:39:0:0:31:60000
-F:RES_DARK
-D:Resist Darkness
-d:Ring of Light and Darkness Resistance
-
-A:4:45:47:0:0:30:30000
-F:RES_BLIND
-D:Resist Blindness
-d:Ring of Blindness Resistance
-
-A:4:45:43:0:0:30:30000
-F:RES_CONF
-D:Resist Confusion
-d:Ring of Confusion Resistance
-
-A:4:45:42:0:0:30:60000
-F:RES_SOUND
-D:Resist Sound
-d:Ring of Sound Resistance
-
-A:4:45:44:0:0:30:60000
-F:RES_SHARDS
-D:Resist Shards
-d:Ring of Shard Resistance
-
-A:4:45:40:0:0:30:60000
-F:RES_NETHER
-D:Resist Nether
-d:Ring of Nether Resistance
-
-A:4:45:41:0:0:30:60000
-F:RES_NEXUS
-D:Resist Nexus
-d:Ring of Nexus Resistance
-
-A:4:45:46:0:0:30:60000
-F:RES_CHAOS
-D:Resist Chaos
-d:Ring of Chaos Resistance
-
-A:4:45:45:0:0:30:60000
-F:RES_DISEN
-D:Resist Disenchantment
-d:Ring of Disenchantment Resistance
-
-A:5:9:1:0:0:50:-100000
-F:TEMPORARY
-D:Temporary Item
-d:Corpse, any corpse
-
-A:5:36:1:0:0:10:-2000
-F:AUTO_CURSE
-D:Self-Cursing
-d:Filthy Rag
-
-A:5:80:40:0:0:45:-10000
-F:BLACK_BREATH
-D:Causes the Black Breath
-d:Sprig of Athelas
-
-A:5:70:15:0:0:40:-5000
-F:TY_CURSE
-D:Ancient Curse
-d:Scroll of *Remove Curse*
-
-A:5:0:0:0:0:40:-5000
-F:DRAIN_EXP
-D:Drains your Experience
-
-A:5:0:0:0:0:30:-5000
-F:AGGRAVATE
-D:Aggravates Monsters
-
-A:5:70:14:0:0:30:-500
-F:CURSED
-D:Curse
-d:Scroll of Remove Curse
-
-#Removed for balance - allows you to trade two essences of extra life,
-# and 25+ magic essence for 10000xp on your artifact, which isn't
-# anything to sneeze at. Curse, above, has the same problem, but
-# for 1000xp, I figure it's a fair trade.
-#A:5:70:15:0:0:40:-10000
-#D:Heavy Curse
-#F:HEAVY_CURSE
-#d:Scroll of *Remove Curse*
-
-A:5:0:0:0:0:50:-5000
-F:PERMA_CURSE
-D:Permanently Cursed
-
-A:5:0:0:0:0:35:-2000
-F:CURSE_NO_DROP
-D:Can't be Dropped
-
-A:5:0:0:0:0:45:-5000
-F:DRAIN_HP
-D:Drains your Hit Points
-
-A:5:0:0:0:0:20:-50000
-F:IMMOVABLE
-D:Wielder Can't Move
-
-#/* Floating eye corpse for esp all :) other ESP's don't require anything at all...*/
-A:5:9:1:32:0:40:20000
-F:ESP_ALL
-D:Telepathy
-d:Formerly Floating Eye
-
-A:5:0:0:0:0:25:3000
-F:ESP_ORC
-D:Sense Orcs
-
-A:5:0:0:0:0:25:3000
-F:ESP_TROLL
-D:Sense Trolls
-
-A:5:0:0:0:0:25:5000
-F:ESP_DRAGON
-D:Sense Dragons
-
-A:5:0:0:0:0:25:5000
-F:ESP_GIANT
-D:Sense Giants
-
-A:5:0:0:0:0:25:5000
-F:ESP_DEMON
-D:Sense Demons
-
-A:5:0:0:0:0:25:5000
-F:ESP_UNDEAD
-D:Sense Undead
-
-A:5:0:0:0:0:25:5000
-F:ESP_EVIL
-D:Sense Evil
-
-A:5:0:0:0:0:25:5000
-F:ESP_ANIMAL
-D:Sense Animals
-
-A:5:0:0:0:0:25:5000
-F:ESP_THUNDERLORD
-D:Sense Thunderlords
-
-A:5:0:0:0:0:25:5000
-F:ESP_GOOD
-D:Sense Good
-
-A:5:0:0:0:0:25:5000
-F:ESP_NONLIVING
-D:Sense Nonliving
-
-A:5:0:0:0:0:25:5000
-F:ESP_UNIQUE
-D:Sense Unique Monsters
-
-A:5:0:0:0:0:25:2000
-F:ESP_SPIDER
-D:Sense Spiders
-
-
-#***************************Activations for artifacts***********************
-# Activations follow all of the rules for artifact flags.
-# except: group number and pval are IGNORED
-#         They MUST come after ALL artifact flags in this file!!!
-#         There is no way (currently) to require essences...
-# 
-# They use a LOWER CASE x: instead of the F: object flag
-# 
-# all ACT_ constants are supported, anything else must be coded into init1.c
-# Internally, they are assigned the magic group number of '88'
-#   and a NEGATIVE flag number (which is the activation number)
-# Note that although you can use the p: to give activations a plural 
-#   item description, it will never be used, because pval is forced to 0.
-#
-#A:<îgnored>:tval:sval:<ignored>:<ignored>:level:xp
-#  tval and sval describe the required item, they can be left unspecified
-#  for no object, or specify starting with tval for increasingly specific
-#  objects. 
-#F:object flag to be set
-#D:Description of flag
-#x:Description of activation (instead of description of flag)
-#d:Description of required item
-#p:Description of required item (plural, not used for activations)
-#a:qty:object_flag_to_be_set Essence_name
-
-#define ACT_PET_SUMMON          150
-#define ACT_CURE_PARA           151
-#define ACT_CURE_HALLU          152
-#define ACT_CURE_POIS           153
-#define ACT_CURE_HUNGER         154
-#define ACT_CURE_STUN           155
-#define ACT_CURE_CUTS           156
-#define ACT_CURE_FEAR           157
-#define ACT_CURE_CONF           158
-#define ACT_CURE_BLIND          159
-#define ACT_CURING              160
-#define ACT_ACQUIREMENT         163
-#define ACT_MUT                 166
-#define ACT_CURE_INSANITY       167
-#define ACT_CURE_MUT            168
-#define ACT_REST_LIFE            84
-#define ACT_REST_ALL             85
-#define ACT_CURE_LW              81
-#define ACT_CURE_MW              82
-#define ACT_CURE_POISON          83
-#define ACT_CURE_700             86
-#define ACT_CURE_1000            87  
-
-#define ACT_LIGHT               111
-
-#define ACT_SUNLIGHT              1
-A:0:70:15:0:0:40:40000
-x:SUNLIGHT
-D:Sunlight
-d:Brass Lantern
-
-#define ACT_MAP_LIGHT           112
-#define ACT_DETECT_ALL          113
-#define ACT_DETECT_XTRA         114
-#define ACT_ID_FULL             115
-#define ACT_ID_PLAIN            116
-
-#define ACT_GROW_MOLD           197
-
-
-#define ACT_BO_MISS_1             2
-A:0:0:0:0:0:20:4000
-x:BO_MISS_1
-D:Magic Missile (1)
-
-#define ACT_BO_MISS_2            15
-A:0:0:0:0:0:30:300000
-x:BO_MISS_2
-D:Magic Missile (2)
-
-#define ACT_BA_MISS_3            24
-A:0:0:0:0:0:40:400000
-x:BA_MISS_3
-D:Ball of Missiles
-
-#define ACT_BO_ELEC_1             4
-A:0:0:0:0:0:30:300000
-x:BO_ELEC_1
-D:Bolt of Lightning
-
-#define ACT_BA_ELEC_2            12
-A:0:0:0:0:0:30:300000
-x:BA_ELEC_2
-D:Ball of Lightning
-
-#define ACT_BA_ELEC_3            18
-A:0:0:0:0:0:35:350000
-x:BA_ELEC_3
-D:Ball of Lightning(2)
-
-#define ACT_BA_ELEC_H           172         
-A:0:0:0:0:0:40:400000
-x:BA_ELEC_H
-D:Ball of Lightning(3)
-
-#define ACT_BA_ELEC_4           183         
-A:0:0:0:0:0:40:400000
-x:BA_ELEC_4
-D:Ball of Lightning(4)
-
-#define ACT_BR_ELEC             184       
-A:0:0:0:0:0:45:450000
-x:BR_ELEC
-D:Breathe Lightning  
-
-#define ACT_BO_ACID_1           5
-#define ACT_BA_COLD_1           8
-#define ACT_BA_ACID_H           173         
-#define ACT_BA_ACID_4           182         
-#define ACT_BR_ACID             187       
-#define ACT_BO_COLD_1           6
-#define ACT_BA_COLD_2           11
-#define ACT_BA_COLD_3           17
-#define ACT_BA_COLD_H           171         
-#define ACT_BA_COLD_4           180          
-#define ACT_BR_COLD             185       
-#define ACT_BO_FIRE_1           7
-#define ACT_BA_FIRE_1           9
-#define ACT_BA_FIRE_2           16
-#define ACT_BA_FIRE_H           170
-#define ACT_BA_FIRE_4           181          
-#define ACT_BR_FIRE             186       
-#define ACT_BA_POIS_1           3
-#define ACT_BA_POIS_4           179          
-#define ACT_BR_POIS             188       
-#define ACT_BR_MANY             189       
-#define ACT_BR_CONF             190       
-#define ACT_BR_SOUND            191        
-#define ACT_BR_CHAOS            192        
-#define ACT_BR_SHARD            193        
-#define ACT_BR_BALANCE          194          
-#define ACT_BR_LIGHT            195        
-#define ACT_BR_POWER            196        
-#define ACT_ROCKET              22
-A:0:0:0:0:0:50:40000
-x:ROCKET
-D:Fire a Rocket
-
-#define ACT_JUMP                177    
-#define ACT_WHIRLWIND           19
-#define ACT_CALL_CHAOS          21
-#define ACT_DISP_EVIL           23
-#define ACT_DISP_GOOD           25
-#define ACT_DAWN                61          
-#define ACT_CHARM_ANIMAL        65
-#define ACT_CHARM_UNDEAD        66
-#define ACT_CHARM_OTHER         67
-#define ACT_CHARM_ANIMALS       68
-#define ACT_CHARM_OTHERS        69
-#define ACT_SUMMON_ANIMAL       70
-#define ACT_SUMMON_PHANTOM      71
-#define ACT_SUMMON_ELEMENTAL    72
-#define ACT_SUMMON_DEMON        73
-#define ACT_SUMMON_UNDEAD       74
-#define ACT_RUNE_EXPLO          117
-#define ACT_RUNE_PROT           118
-#define ACT_SATIATE             119
-#define ACT_DEST_DOOR          120
-#define ACT_STONE_MUD           121
-#define ACT_RECHARGE            122
-#define ACT_ALCHEMY             123
-#define ACT_DIM_DOOR            124
-#define ACT_TELEPORT            125
-#define ACT_RECALL              126
-
-#define ACT_SPIN                174    
-#define ACT_NOLDOR              175      
-#define ACT_SPECTRAL            176        
-#define ACT_DEST_TELE           178         
-#define ACT_DRAIN_1             10
-#define ACT_DRAIN_2             13
-#define ACT_VAMPIRE_1           14
-#define ACT_VAMPIRE_2           20
-#define ACT_GILGALAD            26
-#define ACT_CELEBRIMBOR         27
-#define ACT_SKULLCLEAVER        28
-#define ACT_HARADRIM            29
-#define ACT_FUNDIN              30              
-#define ACT_EOL                 31                       
-#define ACT_UMBAR               32                       
-#define ACT_NUMENOR             33                         
-#define ACT_KNOWLEDGE           34                        
-#define ACT_UNDEATH             35                        
-#define ACT_THRAIN              36                      
-#define ACT_BARAHIR             37             
-#define ACT_TULKAS              38            
-#define ACT_NARYA               39           
-#define ACT_NENYA               40           
-#define ACT_VILYA               41           
-#define ACT_POWER               42           
-#define ACT_STONE_LORE          43                
-#define ACT_RAZORBACK           44               
-#define ACT_BLADETURNER         45                 
-#define ACT_MEDIATOR            46              
-#define ACT_BELEGENNON          47                
-#define ACT_GORLIM              48            
-#define ACT_COLLUIN             49             
-#define ACT_BELANGIL            50              
-#define ACT_CONFUSE             51
-#define ACT_SLEEP               52
-#define ACT_QUAKE               53
-#define ACT_TERROR              54
-#define ACT_TELE_AWAY           55
-#define ACT_BANISH_EVIL         56
-#define ACT_GENOCIDE            57
-#define ACT_MASS_GENO           58
-#define ACT_ANGUIREL            59              
-#define ACT_ERU                 60         
-#define ACT_FIRESTAR            62              
-#define ACT_TURMIL              63            
-#define ACT_CUBRAGOL            64              
-#define ACT_ELESSAR             75             
-#define ACT_GANDALF             76             
-#define ACT_MARDA               77           
-#define ACT_PALANTIR            78              
-#define ACT_ROBINTON            79              
-#define ACT_PIEMUR              80            
-#define ACT_MENOLLY             88             
-#define ACT_EREBOR              89            
-#define ACT_DRUEDAIN            90              
-#define ACT_ESP                 91
-#define ACT_BERSERK             92
-#define ACT_PROT_EVIL           93
-#define ACT_RESIST_ALL          94
-#define ACT_SPEED               95
-#define ACT_XTRA_SPEED          96
-#define ACT_WRAITH              97
-#define ACT_INVULN              98
-#define ACT_ROHAN               99           
-#define ACT_HELM                100          
-#define ACT_BOROMIR             101            
-#define ACT_HURIN               102          
-#define ACT_AXE_GOTHMOG         103                
-#define ACT_MELKOR              104           
-#define ACT_GROND               105          
-#define ACT_NATUREBANE          106               
-#define ACT_NIGHT               107          
-#define ACT_ORCHAST             108            
-
-#define ACT_DEATH               127
-#define ACT_RUINATION           128
-#define ACT_DESTRUC             129
-#define ACT_UNINT               130
-#define ACT_UNSTR               131
-#define ACT_UNCON               132
-#define ACT_UNCHR               133
-#define ACT_UNDEX               134
-#define ACT_UNWIS               135
-#define ACT_STATLOSS            136
-#define ACT_HISTATLOSS          137
-#define ACT_EXPLOSS             138
-#define ACT_HIEXPLOSS           139
-#define ACT_SUMMON_MONST        140
-#define ACT_PARALYZE            141
-#define ACT_HALLU               142
-#define ACT_POISON              143
-#define ACT_HUNGER              144
-#define ACT_STUN                145
-#define ACT_CUTS                146
-#define ACT_PARANO              147
-#define ACT_CONFUSION           148
-#define ACT_BLIND               149
-#define ACT_DARKNESS            161
-#define ACT_LEV_TELE            162
-#define ACT_WEIRD               164
-#define ACT_AGGRAVATE           165
-#define ACT_LIGHT_ABSORBTION    169
-#define ACT_MUSIC               200  
-
-
-#***************************Amulets***********************
-
-#SV_AMULET_ADORNMENT
-I:40:2:4:DARKNESS
-
-#SV_AMULET_BRILLANCE
-I:40:6:1:KNOWLEDGE
-I:40:6:2:CONFUSION
-
-#SV_AMULET_CHARISMA
-I:40:7:4:DARKNESS
-
-#SV_AMULET_DEVOTION
-I:40:25:1:MAGIC
-I:40:25:2:CONFUSION
-I:40:25:8:KNOWLEDGE
-
-#SV_AMULET_ESP
-I:40:22:4:KNOWLEDGE
-
-#SV_AMULET_INFRA
-I:40:26:1:LITE
-
-#SV_AMULET_NO_MAGIC
-I:40:13:4:MAGIC
-
-#SV_AMULET_NO_TELE
-I:40:14:8:TELEPORT
-
-#SV_AMULET_REFLECTION
-I:40:9:10:FORCE
-I:40:9:10:MANA
-
-#SV_AMULET_REGENERATION
-I:40:30:4:LIFE
-
-#SV_AMULET_RESISTANCE
-I:40:15:4:ACID
-I:40:15:4:COLD
-I:40:15:4:FIRE
-I:40:15:4:LIGHTNING
-
-#SV_AMULET_RESIST_ACID
-I:40:4:4:ACID
-
-#SV_AMULET_RESIST_ELEC
-I:40:29:4:LIGHTNING
-
-#SV_AMULET_SEARCHING
-I:40:5:4:KNOWLEDGE
-I:40:5:4:LITE
-
-#SV_AMULET_SERPENT
-I:40:17:1:MANA
-I:40:17:4:ACID
-
-#SV_AMULET_SLOW_DIGEST
-I:40:3:4:LIFE
-
-#SV_AMULET_SUSTENANCE
-I:40:21:8:LIFE
-
-#SV_AMULET_TELEPORT
-I:40:1:8:TELEPORT
-
-#SV_AMULET_THE_MAGI
-I:40:8:1:MAGIC
-I:40:8:4:KNOWLEDGE
-
-#SV_AMULET_TRICKERY
-#I:40:23:1:MAGIC
-I:40:23:8:CONFUSION
-
-#SV_AMULET_WEAPONMASTERY
-I:40:24:12:EXPLOSION
-I:40:24:1:MAGIC
-
-#SV_AMULET_WISDOM
-I:40:28:1:KNOWLEDGE
-I:40:28:2:CONFUSION
-
-#*********Potions******************************
-#Note that these first few potions are the ones which
-#can be thrown for much damage, and are thus an integral part of
-#the alchemist's arsenal.
-
-#SV_POTION_DETONATIONS
-I:71:22:6:EXPLOSION
-
-#SV_POTION_DEATH
-I:71:23:10:LIFE
-
-#SV_POTION_RUINATION
-I:71:15:5:DARKNESS
-
-#SV_POTION_APPLE_JUICE
-I:71:1:1:LIFE
-
-#SV_POTION_AUGMENTATION
-I:71:55:16:POISON
-I:71:55:24:CONFUSION
-I:71:55:6:MAGIC
-I:71:55:8:EXPLOSION
-I:71:55:16:LIFE
-I:71:55:8:LIGHTNING
-I:71:55:16:DARKNESS
-
-#SV_POTION_BESERK_STRENGTH
-I:71:33:1:FIRE
-
-#SV_POTION_BLINDNESS
-I:71:7:1:DARKNESS
-
-#SV_POTION_BOLDNESS
-I:71:28:1:LITE
-
-#SV_POTION_CONFUSION
-I:71:9:1:CONFUSION
-
-#SV_POTION_CURE_CRITICAL
-I:71:36:4:LIFE
-
-#SV_POTION_CURE_LIGHT
-I:71:34:1:LIFE
-
-#SV_POTION_CURE_SERIOUS
-I:71:35:2:LIFE
-
-#SV_POTION_CURING
-I:71:61:1:LIFE
-
-#SV_POTION_DEC_CHR
-I:71:21:1:MANA
-I:71:21:8:DARKNESS
-I:71:21:8:CONFUSION
-
-#SV_POTION_DEC_CON
-I:71:20:1:MANA
-I:71:20:8:LIFE
-I:71:20:8:POISON
-
-#SV_POTION_DEC_DEX
-I:71:19:1:MANA
-I:71:19:8:LIGHTNING
-I:71:19:8:DARKNESS
-
-#SV_POTION_DEC_INT
-I:71:17:1:MANA
-I:71:17:8:CONFUSION
-I:71:17:8:KNOWLEDGE
-
-#SV_POTION_DEC_STR
-I:71:16:1:MANA
-I:71:16:8:EXPLOSION
-I:71:16:8:POISON
-
-#SV_POTION_DEC_WIS
-I:71:18:1:MANA
-I:71:18:8:CONFUSION
-I:71:18:8:LIFE
-
-#SV_POTION_DETECT_INVIS
-I:71:25:1:DARKNESS
-I:71:25:1:LITE
-
-#SV_POTION_ENLIGHTENMENT
-I:71:56:8:KNOWLEDGE
-
-#SV_POTION_EXPERIENCE
-I:71:59:30:EXTRALIFE
-
-#SV_POTION_HEALING
-I:71:37:1:EXTRALIFE
-
-#SV_POTION_HEROISM
-I:71:32:1:COLD
-
-#SV_POTION_INC_CHR
-I:71:53:1:MAGIC
-I:71:53:8:DARKNESS
-I:71:53:8:CONFUSION
-
-#SV_POTION_INC_CON
-I:71:52:1:MAGIC
-I:71:52:8:LIFE
-I:71:52:8:POISON
-
-#Potion of Slow Poison
-I:71:26:1:POISON
-
-#Potion of Cure Poison
-I:71:27:2:POISON
-
-#Potion of Poison
-I:71:6:1:POISON
-
-#SV_POTION_INC_DEX
-I:71:51:1:MAGIC
-I:71:51:8:LIGHTNING
-I:71:51:8:DARKNESS
-
-#SV_POTION_INC_INT
-I:71:49:1:MAGIC
-I:71:49:8:KNOWLEDGE
-I:71:49:8:CONFUSION
-
-#SV_POTION_INC_STR
-I:71:48:1:MAGIC
-I:71:48:8:EXPLOSION
-I:71:48:8:POISON
-
-#SV_POTION_INC_WIS
-I:71:50:1:MAGIC
-I:71:50:8:CONFUSION
-I:71:50:8:LIFE
-
-#SV_POTION_INFRAVISION
-I:71:24:1:LITE
-
-#SV_POTION_INVIS
-I:71:8:4:DARKNESS
-
-#SV_POTION_INVULNERABILITY
-I:71:62:10:FORCE
-I:71:62:4:MAGIC
-
-#SV_POTION_LIFE
-I:71:39:8:EXTRALIFE
-
-#SV_POTION_LOSE_MEMORIES
-I:71:13:20:DARKNESS
-
-#SV_POTION_MUTATION
-I:71:10:12:CHAOS
-
-#SV_POTION_NEW_LIFE
-I:71:63:16:EXTRALIFE
-
-#SV_POTION_RESISTANCE
-I:71:60:2:ACID
-I:71:60:2:COLD
-I:71:60:2:FIRE
-I:71:60:2:LIGHTNING
-
-#SV_POTION_RESIST_COLD
-I:71:31:1:COLD
-
-#SV_POTION_RESIST_HEAT
-I:71:30:1:FIRE
-
-#SV_POTION_RESTORE_EXP
-I:71:41:8:LIFE
-I:71:41:3:KNOWLEDGE
-
-#SV_POTION_RESTORE_MANA
-I:71:40:12:MANA
-
-#SV_POTION_RES_CHR
-I:71:47:12:LIFE
-
-#SV_POTION_RES_CON
-I:71:46:12:LIFE
-
-#SV_POTION_RES_DEX
-I:71:45:12:LIFE
-
-#SV_POTION_RES_INT
-I:71:43:12:LIFE
-
-#SV_POTION_RES_STR
-I:71:42:12:LIFE
-
-#SV_POTION_RES_WIS
-I:71:44:12:LIFE
-
-#SV_POTION_SALT_WATER
-I:71:5:1:LIGHTNING
-
-#SV_POTION_SELF_KNOWLEDGE
-I:71:58:2:KNOWLEDGE
-
-#SV_POTION_SLEEP
-I:71:11:1:MANA
-
-#SV_POTION_SLIME_MOLD
-I:71:2:1:LIFE
-
-#SV_POTION_SLOWNESS
-I:71:4:1:MANA
-
-#SV_POTION_SPEED
-I:71:29:1:TIME
-
-#SV_POTION_STAR_ENLIGHTENMENT
-I:71:57:12:KNOWLEDGE
-
-#SV_POTION_STAR_HEALING
-I:71:38:4:EXTRALIFE
-
-#SV_POTION_WATER
-I:71:0:1:LIFE
-
-#********************************Potion 2*********************************
-
-#SV_POTION2_MIMIC                 1
-I:72:1:2:LIFE
-#SV_POTION2_CURE_LIGHT_SANITY     14
-I:72:14:1:CONFUSION
-I:72:14:1:DARKNESS
-#SV_POTION2_CURE_SERIOUS_SANITY   15
-I:72:15:2:CONFUSION
-I:72:15:2:DARKNESS
-#SV_POTION2_CURE_CRITICAL_SANITY  16
-I:72:16:4:CONFUSION
-I:72:16:4:DARKNESS
-#SV_POTION2_CURE_SANITY           17
-I:72:17:8:CONFUSION
-I:72:17:8:DARKNESS
-#SV_POTION2_CURE_WATER            18
-#I:72:18:4:EXPLOSION
-#I:72:18:4:POISON
-#I:72:18:2:EXTRALIFE
-
-#************Rod Tips.****************************
-
-#SV_ROD_ACID_BALL
-I:66:24:1:MAGIC
-I:66:24:8:ACID
-
-#SV_ROD_ACID_BOLT
-I:66:20:4:ACID
-
-#SV_ROD_COLD_BALL
-I:66:27:1:MAGIC
-I:66:27:8:COLD
-
-#SV_ROD_COLD_BOLT
-I:66:23:4:COLD
-
-#SV_ROD_CURING
-I:66:8:3:LIFE
-
-#SV_ROD_DETECTION
-I:66:6:8:KNOWLEDGE
-
-#SV_ROD_DETECT_DOOR
-I:66:1:1:KNOWLEDGE
-
-#SV_ROD_DETECT_TRAP
-I:66:29:1:KNOWLEDGE
-
-#SV_ROD_DISARMING
-I:66:14:4:TELEPORT
-
-#SV_ROD_DRAIN_LIFE
-I:66:18:10:LIFE
-
-#SV_ROD_ELEC_BALL
-I:66:25:1:MAGIC
-I:66:25:8:LIGHTNING
-
-#SV_ROD_ELEC_BOLT
-I:66:21:4:LIGHTNING
-
-#SV_ROD_FIRE_BALL
-I:66:26:1:MAGIC
-I:66:26:8:FIRE
-
-#SV_ROD_FIRE_BOLT
-I:66:22:4:FIRE
-
-#SV_ROD_HAVOC
-I:66:28:5:CHAOS
-
-#SV_ROD_HEALING
-I:66:9:4:EXTRALIFE
-
-#SV_ROD_IDENTIFY
-I:66:2:4:MANA
-I:66:2:4:KNOWLEDGE
-
-#SV_ROD_ILLUMINATION
-I:66:4:4:LITE
-
-#SV_ROD_LITE
-I:66:15:1:LITE
-
-#SV_ROD_MAPPING
-I:66:5:1:KNOWLEDGE
-I:66:5:8:LITE
-
-#SV_ROD_POLYMORPH
-I:66:19:1:CHAOS
-
-#SV_ROD_PROBING
-I:66:7:20:KNOWLEDGE
-I:66:7:3:MANA
-
-#SV_ROD_RECALL
-I:66:3:3:FORCE
-I:66:3:9:TELEPORT
-
-#SV_ROD_RESTORATION
-I:66:10:30:LIFE
-
-#SV_ROD_SLEEP_MONSTER
-I:66:16:1:MANA
-
-#SV_ROD_SLOW_MONSTER
-I:66:17:1:TIME
-
-#SV_ROD_SPEED
-I:66:11:10:TIME
-
-#SV_ROD_TELEPORT_AWAY
-I:66:13:8:TELEPORT
-
-#**************************Scrolls ********************
-
-#SV_SCROLL_ACQUIREMENT
-I:70:46:10:MAGIC
-
-#SV_SCROLL_ARTIFACT
-I:70:52:99:MAGIC
-
-#SV_SCROLL_BLESSING
-I:70:33:1:LIFE
-
-#SV_SCROLL_CHAOS
-I:70:50:2:CHAOS
-
-#SV_SCROLL_DARKNESS
-I:70:0:1:DARKNESS
-
-#SV_SCROLL_DETECT_DOOR
-I:70:29:1:KNOWLEDGE
-
-#SV_SCROLL_DETECT_GOLD
-I:70:26:1:KNOWLEDGE
-
-#SV_SCROLL_DETECT_INVIS
-I:70:30:1:DARKNESS
-I:70:30:1:KNOWLEDGE
-
-#SV_SCROLL_DETECT_ITEM
-I:70:27:2:KNOWLEDGE
-
-#SV_SCROLL_DETECT_TRAP
-I:70:28:1:KNOWLEDGE
-
-#SV_SCROLL_DISPEL_UNDEAD
-I:70:42:1:EXTRALIFE
-
-#SV_SCROLL_ENCHANT_ARMOR
-I:70:16:3:EXPLOSION
-
-#SV_SCROLL_ENCHANT_WEAPON_PVAL
-I:70:19:10:MAGIC
-
-#SV_SCROLL_ENCHANT_WEAPON_TO_DAM
-I:70:18:3:EXPLOSION
-
-#SV_SCROLL_ENCHANT_WEAPON_TO_HIT
-I:70:17:3:LITE
-
-#SV_SCROLL_FIRE
-I:70:48:1:FIRE
-
-#SV_SCROLL_GENOCIDE
-I:70:44:1:FORCE
-I:70:44:5:DARKNESS
-
-#SV_SCROLL_HOLY_CHANT
-I:70:34:2:LIFE
-
-#SV_SCROLL_HOLY_PRAYER
-I:70:35:3:LIFE
-
-#SV_SCROLL_ICE
-I:70:49:1:COLD
-
-#SV_SCROLL_IDENTIFY
-I:70:12:1:KNOWLEDGE
-
-#SV_SCROLL_LIGHT
-I:70:24:1:LITE
-
-#SV_SCROLL_MAPPING
-I:70:25:2:KNOWLEDGE
-I:70:25:5:LITE
-
-#SV_SCROLL_MASS_GENOCIDE
-I:70:45:1:FORCE
-I:70:45:30:DARKNESS
-
-#SV_SCROLL_MONSTER_CONFUSION
-I:70:36:1:CONFUSION
-
-#SV_SCROLL_PHASE_DOOR
-I:70:8:1:TELEPORT
-
-#SV_SCROLL_PROTECTION_FROM_EVIL
-I:70:37:1:MANA
-I:70:37:9:LIFE
-
-#SV_SCROLL_RECHARGING
-I:70:22:4:LIGHTNING
-
-#SV_SCROLL_REMOVE_CURSE
-I:70:14:1:LIFE
-
-#SV_SCROLL_RESET_RECALL
-I:70:23:1:FORCE
-
-#SV_SCROLL_RUMOR
-I:70:51:1:LIGHTNING
-
-#SV_SCROLL_RUNE_OF_PROTECTION
-I:70:38:1:EXTRALIFE
-I:70:38:6:FORCE
-
-#SV_SCROLL_SATISFY_HUNGER
-I:70:32:1:LIFE
-
-#SV_SCROLL_STAR_ACQUIREMENT
-I:70:47:20:MAGIC
-
-#SV_SCROLL_STAR_DESTRUCTION
-I:70:41:12:FORCE
-
-#SV_SCROLL_STAR_ENCHANT_ARMOR
-I:70:20:9:EXPLOSION
-
-#SV_SCROLL_STAR_ENCHANT_WEAPON
-I:70:21:9:EXPLOSION
-I:70:21:9:LITE
-
-#SV_SCROLL_STAR_IDENTIFY
-I:70:13:1:MAGIC
-I:70:13:20:KNOWLEDGE
-
-#SV_SCROLL_STAR_REMOVE_CURSE
-I:70:15:1:EXTRALIFE
-
-#SV_SCROLL_TELEPORT
-I:70:9:1:TELEPORT
-
-#SV_SCROLL_TELEPORT_LEVEL
-I:70:10:5:TELEPORT
-
-#SV_SCROLL_TRAP_CREATION
-I:70:7:1:CONFUSION
-I:70:7:1:TELEPORT
-
-#SV_SCROLL_TRAP_DOOR_DESTRUCTION
-I:70:39:1:FORCE
-
-#SV_SCROLL_WORD_OF_RECALL
-I:70:11:1:FORCE
-I:70:11:3:TELEPORT
-
-#***************************Staves************************
-
-#Globe of Light
-I:55:3:1:LITE
-#Fiery Shield
-I:55:4:2:FIRE
-I:55:4:1:MANA
-#Remove Curse
-I:55:5:2:LIFE
-#Wings of Winds
-I:55:6:1:FORCE
-#Shake
-I:55:7:4:FORCE
-#Disarm
-I:55:8:1:FORCE
-I:55:8:1:KNOWLEDGE
-#Teleportation
-I:55:9:1:TELEPORT
-#Probability Travel
-I:55:10:1:MANA
-I:55:10:1:TELEPORT
-#11 Recovery
-I:55:11:1:LIFE
-#12 Healing
-I:55:12:1:EXTRALIFE
-#13 Vision
-I:55:13:1:LITE
-#Identify
-I:55:14:1:KNOWLEDGE
-I:55:14:1:MANA
-#Sense Hidden
-I:55:15:1:KNOWLEDGE
-#Reveal Ways
-I:55:16:1:KNOWLEDGE
-#Sense Monsters
-I:55:17:1:KNOWLEDGE
-#Genocide
-I:55:18:1:FORCE
-I:55:18:5:DARKNESS
-#19 Summon
-I:55:19:1:LIFE
-I:55:19:1:TELEPORT
-#Wish
-I:55:20:99:MAGIC
-#Mana
-I:55:21:1:MANA
-#Sterilize
-I:55:24:1:POISON
-I:55:24:1:MANA
-
-#********************Wands*****************
-
-#MannaThrust
-I:65:3:4:MANA
-
-#FireFlash
-I:65:4:1:FIRE
-
-#FireWall
-I:65:5:4:FIRE
-I:65:5:1:MANA
-
-#Tidal Wave
-I:65:6:1:POISON
-I:65:6:1:ACID
-I:65:6:1:COLD
-
-#Ice Storm
-I:65:7:4:COLD
-I:65:7:1:MANA
-
-#Wand of Noxious Cloud
-I:65:8:1:POISON
-
-#Poison Blood
-I:65:9:2:POISON
-I:65:9:1:LIFE
-
-#Thunderstorm
-I:65:10:4:LIGHTNING
-
-#DIG
-I:65:11:1:FORCE
-
-#Stone Prison
-I:65:12:3:FORCE
-I:65:12:1:MANA
-
-#Strike
-I:65:13:1:FORCE
-#Teleport Away
-I:65:14:1:TELEPORT
-#Summon Animal
-I:65:15:4:LIFE
-I:65:15:1:MANA
-#MageLock
-I:65:16:1:FORCE
-#Slow Monster
-I:65:17:1:MANA
-#Essence of Speed
-I:65:18:1:TIME
-#Banishment
-I:65:19:2:TELEPORT
-#20 Disperse Magic
-I:65:20:4:LIFE
-I:65:20:4:MANA
-#Charm
-I:65:21:1:MANA
-I:65:21:1:LIFE
-#Confuse
-I:65:22:1:CONFUSION
-#Deamon Blade
-I:65:23:1:FORCE
-I:65:23:1:FIRE
-#Heal Monster
-I:65:24:1:LIFE
-#25 Haste Monster
-I:65:25:1:MANA
-
-
-
-#RINGS*********************************************************
-
-#ring of poison resistance
-I:45:20:8:POISON
-
-#Ring of Critical Hits
-I:45:59:8:MANA
-
-#Damage
-I:45:29:1:EXPLOSION
-
-#Slaying
-I:45:30:8:EXPLOSION
-I:45:30:8:LITE
-
-#Sound Resistance
-I:45:42:4:EXPLOSION
-I:45:42:4:LITE
-
-#Shard Resistance
-I:45:44:4:EXPLOSION
-I:45:44:4:TELEPORT
-
-#Flying
-I:45:54:12:TELEPORT
-
-#Extra Attacks
-I:45:49:8:TELEPORT
-I:45:49:4:TIME
-
-#Teleportation
-I:45:4:8:TELEPORT
-
-#Lordly Protection
-I:45:48:4:TELEPORT
-I:45:48:12:LITE
-I:45:48:1:EXTRALIFE
-
-#Ring of Ice
-I:45:19:8:COLD
-
-#Ring of Cold Resistance
-I:45:9:4:COLD
-
-#Ring of Flames
-I:45:18:8:FIRE
-
-#Ring of Fire Resistance
-I:45:8:4:FIRE
-
-#Ring of Acid
-I:45:17:8:ACID
-
-#Ring of Disenchantment Resistance
-I:45:45:8:ACID
-I:45:45:2:CHAOS
-
-#Ring of slow digestion
-I:45:6:4:LIFE
-I:45:6:1:TIME
-
-#ring of confusion resistance
-I:45:43:8:CONFUSION
-
-#Ring of Stupidity
-I:45:3:1:CONFUSION
-
-#Ring of Blindness Resistance
-I:45:47:8:LITE
-
-#Ring of Accuracy
-I:45:28:1:LITE
-
-#Ring of Searching
-I:45:23:4:LITE
-I:45:23:3:KNOWLEDGE
-
-#Ring of Chaos
-I:45:46:8:LITE
-
-#Ring of Light and Darkness Resistance
-I:45:39:8:LITE
-I:45:39:8:DARKNESS
-
-#Ring of Speed
-I:45:31:12:TIME
-
-#ring of Weakness
-I:45:2:1:POISON
-
-#ring of Constitution
-I:45:27:2:POISON
-I:45:27:8:LIFE
-
-#ring of Strength
-I:45:24:1:POISON
-I:45:24:1:EXPLOSION
-
-#Ring of Dexterity
-I:45:26:1:KNOWLEDGE
-I:45:26:1:LIGHTNING
-
-#ring of Sustain Constitution
-I:45:13:1:POISON
-I:45:13:4:LIFE
-I:45:13:1:MANA
-
-#ring of Sustain Strength
-I:45:10:1:POISON
-I:45:10:1:EXPLOSION
-I:45:10:1:MANA
-
-#ring of Sustain Intelligence
-I:45:11:1:CONFUSION
-I:45:11:1:MANA
-
-#ring of Intelligence
-I:45:25:1:CONFUSION
-I:45:25:12:KNOWLEDGE
-
-#Ring of Sustain Wisdom
-I:45:12:1:MANA
-I:45:12:4:CONFUSION
-
-#Ring of Sustain Dexterity
-I:45:14:1:MANA
-I:45:14:1:LIGHTNING
-
-#Ring of Sustain Charisma
-I:45:15:1:MANA
-I:45:15:1:DARKNESS
-
-#Ring of See Invisible
-I:45:22:8:DARKNESS
-
-#Ring of Invisibility
-I:45:53:8:DARKNESS
-
-#Ring of Fear resistance
-I:45:38:1:MAGIC
-
-#Ring of Levitation
-I:45:7:1:MANA
-
-#Ring of Nether Resistance
-I:45:40:1:MANA
-I:45:40:12:LIFE
-
-#Ring of Nexus Resistance
-I:45:41:1:MANA
-
-#Ring of Free Action
-I:45:21:1:FORCE
-
-#Ring of Protection
-I:45:16:10:FORCE
-
-#Ring of Lightning
-I:45:56:12:LIGHTNING
-
-#EGO ITEMS, in order by e_idx
-I:1:1:1:MAGIC		},/*of Mana*/
-I:1:2:2:MAGIC		},/*of Power*/
-I:1:3:3:MAGIC		},/*of Wizardry*/
-I:1:4:2:MAGIC		},/*of Spell*/
-I:1:5:4:ACID		},/*of Resist Acid*/
-I:1:6:4:LIGHTNING		},/*of Resist Lightning*/
-I:1:7:4:FIRE		},/*of Resist Fire*/
-I:1:8:4:COLD		},/*of Resist Cold*/
-I:1:9:4:ACID		},/*of Resistance*/
-I:1:9:4:COLD		},/*of Resistance*/
-I:1:9:4:FIRE		},/*of Resistance*/
-I:1:9:4:LIGHTNING		},/*of Resistance*/
-I:1:10:5:ACID		},/*Elven*/
-I:1:10:5:COLD		},/*Elven*/
-I:1:10:5:FIRE		},/*Elven*/
-I:1:10:5:LIGHTNING		},/*Elven*/
-I:1:11:1:MAGIC		},/*of Permanence*/
-I:1:11:6:ACID		},/*of Permanence*/
-I:1:11:6:COLD		},/*of Permanence*/
-I:1:11:6:FIRE		},/*of Permanence*/
-I:1:11:6:LIGHTNING		},/*of Permanence*/
-I:1:12:1:POISON       },/*of Leprousness*/
-I:1:13:3:MAGIC		},/*of Immunity*/
-I:1:14:5:MAGIC		},/*of Defense*/
-I:1:15:4:TELEPORT		},/*of Jumping*/
-I:1:16:4:ACID		},/*of Resist Acid*/
-I:1:17:4:LIGHTNING		},/*of Resist Lightning*/
-I:1:18:4:FIRE		},/*of Resist Fire*/
-I:1:19:4:COLD		},/*of Resist Cold*/
-I:1:20:4:ACID		},/*of Resistance*/
-I:1:20:4:COLD		},/*of Resistance*/
-I:1:20:4:FIRE		},/*of Resistance*/
-I:1:20:4:LIGHTNING		},/*of Resistance*/
-I:1:21:12:FORCE		},/*of Reflection*/
-I:1:22:8:LIGHTNING		},/*of Electricity*/
-I:1:23:4:DARKNESS		},/*of the Noldor*/
-I:1:24:4:KNOWLEDGE		},/*of Intelligence*/
-I:1:25:4:KNOWLEDGE		},/*of Wisdom*/
-I:1:26:4:KNOWLEDGE		},/*of Beauty*/
-I:1:27:12:KNOWLEDGE		},/*of the Magi*/
-I:1:28:12:EXPLOSION		},/*of Might*/
-I:1:29:4:MANA		},/*of Lordliness*/
-I:1:30:8:KNOWLEDGE		},/*of Seeing*/
-I:1:31:1:LITE		},/*of Infravision*/
-I:1:32:1:LITE		},/*of Light*/
-I:1:33:8:KNOWLEDGE		},/*of Telepathy*/
-I:1:34:4:LIFE		},/*of Regeneration*/
-I:1:35:4:TELEPORT		},/*of Teleportation*/
-I:1:40:8:EXPLOSION		},/*Dwarven*/
-I:1:40:8:FIRE		},/*Dwarven*/
-I:1:40:8:LIFE		},/*Dwarven*/
-I:1:40:8:LITE		},/*Dwarven*/
-I:1:40:8:MANA		},/*Dwarven*/
-I:1:41:4:FORCE		},/*of Protection*/
-I:1:42:4:DARKNESS		},/*of Stealth*/
-I:1:43:4:ACID		},/*of Aman*/
-I:1:43:4:COLD		},/*of Aman*/
-I:1:43:4:DARKNESS		},/*of Aman*/
-I:1:43:4:FIRE		},/*of Aman*/
-I:1:43:4:LIGHTNING		},/*of Aman*/
-I:1:44:8:FIRE		},/*of Immolation*/
-I:1:48:8:LIGHTNING		},/*of Electricity*/
-I:1:49:1:FORCE		},/*of Free Action*/
-I:1:50:4:FORCE		},/*of Slaying*/
-I:1:50:4:LITE		},/*of Slaying*/
-I:1:51:4:LIGHTNING		},/*of Agility*/
-I:1:52:4:EXPLOSION		},/*of Power*/
-I:1:54:2:DARKNESS		},/*of Charming*/
-I:1:57:3:DARKNESS		},/*of Levitation*/
-I:1:58:3:DARKNESS		},/*of Stealth*/
-I:1:59:3:DARKNESS		},/*of Free Action*/
-I:1:60:5:TIME		},/*of Speed*/
-I:1:61:2:DARKNESS		},/*of Dwarvish Endurance*/
-I:1:61:2:EXPLOSION		},/*of Dwarvish Endurance*/
-I:1:65:4:ACID		},/*of Aman*/
-I:1:65:4:COLD		},/*of Aman*/
-I:1:65:4:DARKNESS		},/*of Aman*/
-I:1:65:4:FIRE		},/*of Aman*/
-I:1:65:4:LIGHTNING		},/*of Aman*/
-I:1:66:1:MAGIC		},/*(Defender)*/
-I:1:66:4:ACID		},/*(Defender)*/
-I:1:66:4:COLD		},/*(Defender)*/
-I:1:66:4:FIRE		},/*(Defender)*/
-I:1:66:4:LIGHTNING		},/*(Defender)*/
-I:1:67:8:KNOWLEDGE		},/*Blessed*/
-I:1:68:12:LIFE		},/*of Greater Life*/
-I:1:68:2:MAGIC		},/*of Greater Life*/
-I:1:69:4:DARKNESS		},/*of Westernesse*/
-I:1:69:4:EXPLOSION		},/*of Westernesse*/
-I:1:69:4:LIGHTNING		},/*of Westernesse*/
-I:1:69:4:LITE		},/*of Westernesse*/
-I:1:70:2:TIME		},/*of Extra Attacks*/
-I:1:71:4:FORCE		},/*of Slaying*/
-I:1:71:4:LITE		},/*of Slaying*/
-I:1:72:4:EXPLOSION		},/*of Spinning*/
-I:1:72:4:LIGHTNING		},/*of Spinning*/
-I:1:73:4:ACID		},/*Acidic*/
-I:1:74:4:LIGHTNING		},/*Shocking*/
-I:1:75:4:FIRE		},/*Fiery*/
-I:1:76:4:COLD		},/*Frozen*/
-I:1:77:4:POISON       },/*Venomous*/
-I:1:78:4:CHAOS		},/*Chaotic*/
-I:1:79:4:FORCE		},/*Sharp*/
-I:1:80:4:FORCE		},/*of Earthquakes*/
-I:1:81:8:CHAOS		},/*of Slay Animal*/
-I:1:82:8:CHAOS		},/*of Slay Evil*/
-I:1:83:8:CHAOS		},/*of Slay Undead*/
-I:1:84:8:CHAOS		},/*of Slay Demon*/
-I:1:85:8:CHAOS		},/*of Slay Orc*/
-I:1:86:8:CHAOS		},/*of Slay Troll*/
-I:1:87:8:CHAOS		},/*of Slay Giant*/
-I:1:88:8:CHAOS		},/*of Slay Dragon*/
-I:1:89:12:CHAOS		},/*of *Slay Animal**/
-I:1:90:12:CHAOS		},/*of *Slay Evil**/
-I:1:91:12:CHAOS		},/*of *Slay Undead**/
-I:1:92:12:CHAOS		},/*of *Slay Demon**/
-I:1:93:12:CHAOS		},/*of *Slay Orc**/
-I:1:94:12:CHAOS		},/*of *Slay Troll**/
-I:1:95:12:CHAOS		},/*of *Slay Giant**/
-I:1:96:12:CHAOS		},/*of *Slay Dragon**/
-I:1:97:8:LIFE		},/*Vampiric*/
-I:1:98:4:MAGIC		},/*(*Defender*)*/
-I:1:98:8:ACID		},/*(*Defender*)*/
-I:1:98:8:COLD		},/*(*Defender*)*/
-I:1:98:8:FIRE		},/*(*Defender*)*/
-I:1:98:8:LIGHTNING		},/*(*Defender*)*/
-I:1:98:8:POISON       },/*(*Defender*)*/
-I:1:99:12:TELEPORT		},/*of the Thunderlords*/
-I:1:100:12:KNOWLEDGE		},/*of Gondolin*/
-I:1:100:1:MAGIC		},/*of Gondolin*/
-I:1:101:1:FORCE		},/*of Digging*/
-I:1:102:12:LIFE		},/*Spectral*/
-I:1:102:4:MANA		},/*Spectral*/
-I:1:105:1:LITE		},/*of Accuracy*/
-I:1:106:2:FORCE		},/*of Power*/
-I:1:107:2:FORCE		},/*of Extra Might*/
-I:1:108:1:FORCE		},/*of Extra Shots*/
-I:1:108:1:LITE		},/*of Extra Shots*/
-I:1:108:1:TIME		},/*of Extra Shots*/
-I:1:109:2:FORCE		},/*of Lothlorien*/
-I:1:109:2:LITE		},/*of Lothlorien*/
-I:1:110:2:FORCE		},/*of the Haradrim*/
-I:1:110:2:LITE		},/*of the Haradrim*/
-I:1:111:2:FORCE		},/*of Buckland*/
-I:1:111:2:LITE		},/*of Buckland*/
-I:1:112:1:CHAOS		},/*of Slay Animal*/
-I:1:113:1:CHAOS		},/*of Slay Evil*/
-I:1:114:1:CHAOS		},/*of Slay Undead*/
-I:1:115:1:POISON      },/*of Venom*/
-I:1:116:1:ACID		},/*of Acid*/
-I:1:117:12:ACID		},/*Elemental*/
-I:1:117:12:COLD		},/*Elemental*/
-I:1:117:12:FIRE		},/*Elemental*/
-I:1:117:12:LIGHTNING		},/*Elemental*/
-I:1:117:12:POISON     },/*Elemental*/
-I:1:118:1:CHAOS		},/*of Slay Demon*/
-I:1:119:1:CHAOS		},/*of Slay Dragon*/
-I:1:120:1:FORCE		},/*of Slaying*/
-I:1:120:1:LITE		},/*of Slaying*/
-I:1:121:1:LIGHTNING		},/*of Lightning*/
-I:1:121:1:LITE		},/*of Lightning*/
-I:1:122:1:FIRE		},/*of Flame*/
-I:1:122:1:LITE		},/*of Flame*/
-I:1:123:1:COLD		},/*of Frost*/
-I:1:123:1:LITE		},/*of Frost*/
-I:1:124:1:LIFE		},/*of Wounding*/
-I:1:128:2:ACID		},/*of the Eldar*/
-I:1:128:2:DARKNESS		},/*of the Eldar*/
-I:1:129:2:ACID		},/*of Power*/
-I:1:129:2:COLD		},/*of Power*/
-I:1:129:2:DARKNESS		},/*of Power*/
-I:1:129:2:FIRE		},/*of Power*/
-I:1:129:2:LIGHTNING		},/*of Power*/
-I:1:130:1:MANA		},/*Dragon*/
-I:1:131:1:MANA		},/*Capacity of */
-I:1:132:1:LIFE		},/*Cheapness of */
-I:1:133:1:TIME		},/*Quickness of */
-I:1:134:1:TIME		},/*Charging of */
-I:1:135:3:LIFE		},/*the Istari of */
-I:1:135:3:MANA		},/*the Istari of */
-I:1:135:3:TIME		},/*the Istari of */
-I:1:136:1:LITE		},/*of Boldness*/
-I:1:137:1:LITE		},/*of Fearlessness*/
-I:1:138:2:LITE		},/*of Illumination*/
-I:1:139:2:LITE		},/*of Brightness*/
-I:1:140:4:LITE		},/*of *Brightness**/
-I:1:141:4:DARKNESS		},/*of the Shadows*/
-I:1:141:4:LITE		},/*of the Shadows*/
-I:1:142:4:DARKNESS		},/*of Infravision*/
-I:1:142:4:LITE		},/*of Infravision*/
-I:1:143:8:DARKNESS		},/*of the Eternal Eye*/
-I:1:144:4:MANA		},/*of the Ethereal Eye*/
-I:1:146:4:DARKNESS		},/*Dwarven*/
-I:1:146:4:EXPLOSION		},/*Dwarven*/
-I:1:146:4:LITE		},/*Dwarven*/
-I:1:147:1:MAGIC		},/*Indestructible*/
-I:1:147:4:ACID		},/*Indestructible*/
-I:1:147:4:COLD		},/*Indestructible*/
-I:1:147:4:FIRE		},/*Indestructible*/
-I:1:147:4:LIGHTNING		},/*Indestructible*/
-I:1:147:4:MANA		},/*Indestructible*/
-I:1:149:1:FIRE		},/*Fireproof*/
-I:1:163:3:DARKNESS		},/*of the Magi*/
-I:1:163:3:KNOWLEDGE		},/*of the Magi*/
-I:1:163:3:MANA		},/*of the Magi*/
-I:1:166:4:MAGIC		},/*of Preservation*/
-I:1:166:4:MANA		},/*of Preservation*/
-I:1:167:12:MANA		},/*of Serenity*/
-I:1:168:4:DARKNESS		},/*of Night and Day*/
-I:1:168:4:LITE		},/*of Night and Day*/
-I:1:169:1:TIME		},/*of the Magi*/
-I:1:169:8:KNOWLEDGE		},/*of the Magi*/
-I:1:170:4:DARKNESS		},/*of Invisibility*/
-I:1:171:8:DARKNESS		},/*of the Bat*/
-I:1:171:8:TELEPORT		},/*of the Bat*/
-I:1:172:4:LIGHTNING		},/*of Thievery*/
-I:1:173:4:FORCE		},/*of Combat*/
-I:1:174:4:TELEPORT		},/*of Stability*/
-I:1:175:4:ACID		},/*of Elvenkind*/
-I:1:175:4:COLD		},/*of Elvenkind*/
-I:1:175:4:FIRE		},/*of Elvenkind*/
-I:1:175:4:LIGHTNING		},/*of Elvenkind*/
-I:1:176:1:MAGIC		},/*of Fury*/
-I:1:176:4:CHAOS		},/*of Fury*/
-I:1:176:4:EXPLOSION		},/*of Fury*/
-I:1:176:4:MANA		},/*of Fury*/
-I:1:178:8:FORCE		},/*Magical*/
-I:1:179:4:KNOWLEDGE		},/*Simplicity of */
-I:1:180:1:FIRE		},/*of Warmth*/
-I:1:185:12:LIFE		},/*of Life*/
-I:1:185:2:MAGIC		},/*of Life*/
diff --git a/lib/edit/ba_info.txt b/lib/edit/ba_info.txt
index 8156fd2f..20e7bb77 100644
--- a/lib/edit/ba_info.txt
+++ b/lib/edit/ba_info.txt
@@ -17,10 +17,6 @@
 # 1 = Restrict to normal & liked
 # 2 = Restrict to liked
 
-# Version stamp (required)
-
-V:2.0.0
-
 N:0:Nothing
 C:0:0:0
 I:0:0:.
@@ -65,10 +61,6 @@ N:10:Play craps
 C:0:0:0
 I:14:0:c
 
-N:11:Spin the wheel
-C:0:0:0
-I:15:0:s
-
 N:12:Play dice slots
 C:0:0:0
 I:16:0:d
@@ -93,18 +85,6 @@ N:17:Look at busts of Kings
 C:0:0:0
 I:5:0:l
 
-N:18:Research monster
-C:1600:1500:1400
-I:20:0:r
-
-N:19:View bounties
-C:0:0:0
-I:38:0:v
-
-N:20:Receive bounty money
-C:0:0:0
-I:39:0:b
-
 N:21:Get quest monster
 C:0:0:0
 I:54:0:q
@@ -165,19 +145,6 @@ N:35:Get a quest
 C:0:0:0
 I:6:0:q
 
-# Restrict to liked/normal
-N:36:Get a quest
-C:0:0:0
-I:46:1:q
-
-N:37:Get a quest
-C:0:0:0
-I:47:0:q
-
-N:38:Get a quest
-C:0:0:0
-I:49:0:q
-
 N:39:Herbal Healing
 C:32000:10000:0
 I:50:0:h
@@ -190,10 +157,6 @@ N:41:Distribute earnings
 C:0:0:0
 I:7:2:d
 
-N:42:Morph restoration
-C:3000:1500:750
-I:37:0:r
-
 #for The Mirror
 N:43:View fate
 C:500:500:500
@@ -204,11 +167,6 @@ N:44:Research item
 C:1500:1500:1500
 I:1:0:a
 
-#for library in gondol
-N:45:Research item
-C:2000:2000:2000
-I:1:0:a
-
 #for Star-Dome
 N:46:Identify possessions
 C:1200:1000:250
@@ -257,18 +215,6 @@ N:55:Get an item
 C:0:0:0
 I:44:0:g:p
 
-N:56:Request an item
-C:0:0:0
-I:51:2:r
-
-N:57:Ask for loan
-C:0:0:0
-I:52:2:a
-
-N:58:Pay back loan
-C:0:0:0
-I:53:2:p
-
 N:59:Donate an item
 C:0:0:0
 I:43:0:d
diff --git a/lib/edit/between.map b/lib/edit/between.map
index 1458cdb7..d522799f 100644
--- a/lib/edit/between.map
+++ b/lib/edit/between.map
@@ -23,16 +23,16 @@ F:G:89:5:955
 F:L:89:5:956
 
 # Floor with grass with a brown thunderlord
-F:B:89:5:957:0:0:0:0:0:0:2
+F:B:89:5:957:0:0:0:0:0:2
 
 # Floor with grass with a bronze thunderlord
-F:z:89:5:958:0:0:0:0:0:0:2
+F:z:89:5:958:0:0:0:0:0:2
 
 # Floor with dirt with a bronze thunderlord
-F:Z:88:5:958:0:0:0:0:0:0:2
+F:Z:88:5:958:0:0:0:0:0:2
 
 # Floor with dirt with a gold thunderlord
-F:D:88:5:959:0:0:0:0:0:0:2
+F:D:88:5:959:0:0:0:0:0:2
 
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 D:X..T.TT..T...T...T...T.....T....T......T...T.,,.....T......T....T...T.T..T..TT...T..T.TT.T.TT.TX
diff --git a/lib/edit/d_info.txt b/lib/edit/d_info.txt
index 59a1e6f2..fe20c276 100644
--- a/lib/edit/d_info.txt
+++ b/lib/edit/d_info.txt
@@ -12,7 +12,7 @@
 
 # N:<index>:<name>
 # D:<3 letter short name>:<long name>
-# W:<min depth>:<max depth>:<min player level>:<next dungeon>:<min alloc>:<max alloc chance>
+# W:<min depth>:<max depth>:<min player level>:<min alloc>:<max alloc chance>
 # L:<floor1>:<%1>:<floor2>:<%2>:<floor3>:<%3>
 # A:<wall1>:<%1>:<wall2>:<%2>:<wall3>:<%3>:<outer wall>:<inner wall>
 # O:<%treasure>:<%combat>:<%magic>:<%tools>
@@ -29,66 +29,75 @@
 # 3 = OR
 # 4 = NOR
 
-# Version stamp (required)
-
-V:2.0.0
-
 ### Wilderness(purely cosmetic, never used) ###
 
 N:0:Wilderness
 D:Wil:a way to the Wilderness
-W:0:0:0:0:14:500
+W:0:0:0:14:500
 L:89:80:199:20:1:0
 A:96:100:56:0:56:0:57:58
 O:20:20:20:20
-F:PRINCIPAL | FLAT | NO_RECALL
+F:FLAT
+F:NO_RECALL
+F:PRINCIPAL
 R:100:0
 
 ### The principal dungeons, they were created by spliting the vanilla dungeon ###
 
 N:1:Mirkwood
 D:Mkw:a way to the Mirkwood Forest.
-W:11:33:5:0:14:160
+W:11:33:5:14:160
 L:89:95:199:5:88:0
 A:96:100:97:0:56:0:202:96
 O:20:20:20:20
-F:PRINCIPAL | NO_DOORS | NO_DESTROY | FLAT
 F:FILL_METHOD_0
+F:FLAT
+F:NO_DESTROY
+F:NO_DOORS
+F:PRINCIPAL
 R:100:0
 
 N:2:Mordor
 D:Mdr:a door to the Land of Mordor.
-W:34:66:15:0:14:160
+W:34:66:15:14:160
 L:88:67:93:33:1:0
 L:0:100:0
 A:97:50:56:50:56:0:57:97
 A:0:100:0
 O:20:20:20:20
-F:PRINCIPAL | LAVA_RIVER | CAVERN | NO_STREAMERS
+F:CAVERN
 F:FILL_METHOD_2
+F:LAVA_RIVER
+F:NO_STREAMERS
+F:PRINCIPAL
 R:100:0
 
 N:3:Angband
 D:Ang:an entrance to the Pits of Angband.
-W:67:127:30:0:14:160
+W:67:127:30:14:160
 L:1:100:1:0:1:0
 A:56:100:56:0:56:0:57:58
 O:20:20:20:20
-F:PRINCIPAL | CAVERN | NO_EASY_MOVE | NO_RECALL
-F:ADJUST_LEVEL_1_2 | ADJUST_LEVEL_1
+F:ADJUST_LEVEL_1
+F:ADJUST_LEVEL_1_2
+F:CAVERN
 F:FILL_METHOD_0
+F:NO_EASY_MOVE
+F:NO_RECALL
+F:PRINCIPAL
 R:100:0
 
 N:4:Barrow-Downs
 D:BDw:a way to the Barrow-Downs.
-W:1:10:1:0:14:160
+W:1:10:1:14:160
 L:88:78:89:18:199:4
 L:0:95:5
 A:96:34:97:66:56:0:57:97
 A:100:0:0
 O:20:20:20:20
-F:PRINCIPAL | FLAT
 F:FILL_METHOD_3
+F:FLAT
+F:PRINCIPAL
 R:25:1
 M:UNDEAD
 R:75:0
@@ -99,13 +108,18 @@ R:75:0
 # Levels 85-99
 N:5:Mount Doom
 D:MDm:a way to the top of the Mount Doom.
-W:85:99:18:0:14:160
+W:85:99:18:14:160
 L:86:90:205:10:1:0
 A:177:100:0:0:0:0:85:87
 O:10:10:30:30
 E:2d10:10:FIRE
-F:CAVE | LAVA_RIVER | NO_RECALL | NO_STREAMERS | NO_UP
-F:FILL_METHOD_0 | NO_EASY_MOVE
+F:CAVE
+F:FILL_METHOD_0
+F:LAVA_RIVER
+F:NO_EASY_MOVE
+F:NO_RECALL
+F:NO_STREAMERS
+F:NO_UP
 R:100:1
 M:IM_FIRE
 
@@ -114,47 +128,67 @@ M:IM_FIRE
 # guarded by Tik'srvzllat, who has the Ring of Phasing
 N:6:Nether Realm
 D:Nth:a magical portal to the Nether Realm.
-W:666:696:40:0:14:160
+W:666:696:40:14:160
 L:102:80:86:15:85:5
 A:85:80:87:20:87:0:57:85
 A:50:50:0
 O:25:25:25:25
 E:10d10:3:NETHER
-F:EMPTY | FORGET | NO_BREATH | NO_EASY_MOVE | NO_SHAFT
-F:RANDOM_TOWNS | ADJUST_LEVEL_2 | NO_RECALL | NO_STREAMERS
-F:LAVA_RIVER | FINAL_GUARDIAN_1032 | FINAL_ARTIFACT_203
-F:FILL_METHOD_2 | NO_RECALL_OUT | NO_UP
+F:ADJUST_LEVEL_2
+F:EMPTY
+F:FILL_METHOD_2
+F:FINAL_ARTIFACT_203
+F:FINAL_GUARDIAN_1032
+F:FORGET
+F:LAVA_RIVER
+F:NO_BREATH
+F:NO_EASY_MOVE
+F:NO_RECALL
+F:NO_RECALL_OUT
+F:NO_SHAFT
+F:NO_STREAMERS
+F:NO_UP
+F:RANDOM_TOWNS
 R:5:0
 R:95:3
-M:RES_NETH | R_CHAR_G | R_CHAR_W | R_CHAR_U
+M:RES_NETH
+M:R_CHAR_G
+M:R_CHAR_U
+M:R_CHAR_W
 
 # The Lost Land of Numenor
 # levels 35-50
 # guarded by Ar-Pharazon the Golden, who has the stone "Toris Mejistos".
 N:7:Submerged Ruins
 D:Num:a submerged way to the lost land of Numenor.
-W:35:50:25:0:14:160
+W:35:50:25:14:160
 L:84:95:187:5:1:0
 A:187:80:84:10:56:10:57:187
 A:60:0:40
 O:30:30:10:10
 E:1d1:1:ACID
+F:FILL_METHOD_3
+F:FINAL_ARTIFACT_204
+F:FINAL_GUARDIAN_980
 F:NO_STREAMERS
-F:FINAL_GUARDIAN_980 | FINAL_ARTIFACT_204
-F:FILL_METHOD_3 | WATER_BREATH
+F:WATER_BREATH
 R:20:0
 R:80:3
-M:AQUATIC | CAN_SWIM | CAN_FLY
+M:AQUATIC
+M:CAN_FLY
+M:CAN_SWIM
 
 # Used for astral mode
 N:8:Halls of Mandos
 D:HMa:*A BUG*YOU should see this message!*
-W:1:98:1:0:14:160
+W:1:98:1:14:160
 L:1:100:1:0:1:0
 O:20:20:20:20
 A:56:100:56:0:56:0:57:58
-F:RANDOM_TOWNS | NO_RECALL | NO_SHAFT
 F:FILL_METHOD_0
+F:NO_RECALL
+F:NO_SHAFT
+F:RANDOM_TOWNS
 R:100:2
 M:UNIQUE
 
@@ -163,35 +197,50 @@ M:UNIQUE
 # guarded by Shelob.
 N:9:Cirith Ungol
 D:CUg:an entrance to Cirith Ungol.
-W:25:50:10:0:14:160
+W:25:50:10:14:160
 L:87:5:88:65:16:30
 A:97:90:16:10:56:0:16:58
 O:30:30:30:10
 E:4d4:20:POISON
-F:FINAL_GUARDIAN_481
 F:CIRCULAR_ROOMS
 F:FILL_METHOD_2
+F:FINAL_GUARDIAN_481
 R:2:0
 R:49:3
-M:SPIDER | R_CHAR_c | R_CHAR_a | R_CHAR_I | 
+M:R_CHAR_I
+M:R_CHAR_a
+M:R_CHAR_c
+M:SPIDER
 R:49:3
-M:ORC | R_CHAR_w | R_CHAR_m | R_CHAR_j
+M:ORC
+M:R_CHAR_j
+M:R_CHAR_m
+M:R_CHAR_w
 
 # The Heart of the Earth
 # levels 25-36
 # guarded by Golgarach, the Living Rock
 N:10:Heart of the Earth
 D:HoE:a passage leading into the very heart of the world.
-W:25:36:10:0:14:160
+W:25:36:10:14:160
 L:1:100:1:0:1:0
 A:56:100:56:0:56:0:57:58
 O:40:10:10:20
 G:life
-F:EVOLVE | FINAL_GUARDIAN_1035 | NO_RECALL | NO_SHAFT | NO_UP
+F:EVOLVE
+F:FINAL_GUARDIAN_1035
+F:NO_RECALL
+F:NO_SHAFT
+F:NO_UP
 R:40:3
-M:R_CHAR_# | R_CHAR_X | R_CHAR_g | R_CHAR_E | 
+M:R_CHAR_#
+M:R_CHAR_E
+M:R_CHAR_X
+M:R_CHAR_g
 R:30:3
-M:PASS_WALL | KILL_WALL | HURT_ROCK
+M:HURT_ROCK
+M:KILL_WALL
+M:PASS_WALL
 R:30:0
 
 # The Void
@@ -199,30 +248,43 @@ R:30:0
 # Where Melkor lurks for the final battle!
 N:11:The Void
 D:Vod:a jumpgate to the Void
-W:128:150:40:0:20:160
+W:128:150:40:20:160
 L:183:97:102:3:0:0
 A:183:90:102:10:0:0:102:102
 A:40:60:0
 O:25:25:25:25
 E:20d6:100:DARK
-F:EMPTY | FORGET | NO_BREATH | NO_EASY_MOVE | NO_RECALL_OUT | NO_RECALL |
-F:ADJUST_LEVEL_1_2 | ADJUST_LEVEL_1 | NO_STREAMERS | NO_SHAFT
+F:ADJUST_LEVEL_1
+F:ADJUST_LEVEL_1_2
+F:EMPTY
 F:FILL_METHOD_2
-F:FINAL_GUARDIAN_1044 |
+F:FINAL_GUARDIAN_1044
+F:FORGET
+F:NO_BREATH
+F:NO_EASY_MOVE
+F:NO_RECALL
+F:NO_RECALL_OUT
+F:NO_SHAFT
+F:NO_STREAMERS
 R:1:0
 R:99:3
-M:UNDEAD | DEMON | DRAGON | NONLIVING | SPIRIT
+M:DEMON
+M:DRAGON
+M:NONLIVING
+M:SPIRIT
+M:UNDEAD
 
 # TEST dungeon
 N:12:Test
 D:Tst:a way to test dungeon gen
-W:1:10:1:0:14:160
+W:1:10:1:14:160
 L:88:78:89:18:199:4
 L:0:95:5
 A:177:100:0:0:0:0:85:87
 A:100:0:0
 O:20:20:20:20
-F:FILL_METHOD_3 | SMALL
+F:FILL_METHOD_3
+F:SMALL
 R:100:0
 G:dungeon2
 
@@ -232,50 +294,70 @@ G:dungeon2
 # Feagwath is there, guarding Doomcaller
 N:16:Paths of the Dead
 D:PoD:the entrance to the Paths of the Dead.
-W:40:70:18:0:24:100
+W:40:70:18:24:100
 L:88:85:84:15:1:0
 A:56:75:87:25:56:0:57:58
 O:30:30:30:2
 E:1d1:20:RAISE
-F:FINAL_GUARDIAN_804 | FINAL_ARTIFACT_91
 F:FILL_METHOD_3
+F:FINAL_ARTIFACT_91
+F:FINAL_GUARDIAN_804
 R:5:0
 R:10:3
 M:R_CHAR_p
 R:85:3
-M:UNDEAD | NONLIVING
+M:NONLIVING
+M:UNDEAD
 
 # The Illusory Castle
 # levels 35-52
 # Guarded by The Glass Golem guarding The Helm of Knowledge
 N:17:Illusory Castle
 D:Ill:an entrance to the Illusory Castle.
-W:35:52:10:0:24:100
+W:35:52:10:24:100
 L:1:98:188:2:1:0
 A:56:50:189:50:56:0:57:58
 O:50:10:20:20
 E:6d2:6:CONFUSION
-F:RANDOM_TOWNS | NO_STREAMERS
-F:FINAL_GUARDIAN_1033 | FINAL_ARTIFACT_160
 F:FILL_METHOD_1
+F:FINAL_ARTIFACT_160
+F:FINAL_GUARDIAN_1033
+F:NO_STREAMERS
+F:RANDOM_TOWNS
 R:30:0
 R:70:3
-M:STUPID | WEIRD_MIND | SHAPECHANGER | ATTR_MULTI | CHAR_MULTI | RAND_25 |
-M:RAND_50 | EMPTY_MIND | INVISIBLE | PASS_WALL | KILL_WALL
-S:BR_CONF | BR_CHAO | BA_CHAO | CONF | FORGET | TRAPS | MULTIPLY
+M:ATTR_MULTI
+M:CHAR_MULTI
+M:EMPTY_MIND
+M:INVISIBLE
+M:KILL_WALL
+M:PASS_WALL
+M:RAND_25
+M:RAND_50
+M:SHAPECHANGER
+M:STUPID
+M:WEIRD_MIND
+S:BA_CHAO
+S:BR_CHAO
+S:BR_CONF
+S:CONF
+S:FORGET
+S:MULTIPLY
 
 # The Maze
 # Levels 25-37
 # Guarded by The Minotaur of the Labyrinth with the Steel Helm of Hammerhand
 N:18:Maze
 D:Maz:a small tunnel leading to a maze of twisty little passages, all alike.
-W:25:37:15:0:20:160
+W:25:37:15:20:160
 L:1:100:1:0:1:0
 A:56:98:48:2:56:0:57:58
 O:2:40:10:40
 G:maze
-F:SMALLEST | FORGET
-F:FINAL_GUARDIAN_1029 | FINAL_ARTIFACT_38
+F:FINAL_ARTIFACT_38
+F:FINAL_GUARDIAN_1029
+F:FORGET
+F:SMALLEST
 R:80:0
 R:20:3
 M:R_CHAR_p
@@ -285,74 +367,97 @@ M:R_CHAR_p
 # There is Azog with the Wand of Thrain at the bottom
 N:19:Orc Cave
 D:Orc:a dark tunnel leading to an Orc Cave.
-W:10:22:8:0:35:200
+W:10:22:8:35:200
 L:88:100:1:0:1:0
 A:97:100:56:0:56:0:57:97
 O:5:50:10:25
-F:RANDOM_TOWNS | 
-F:FINAL_OBJECT_810 | FINAL_GUARDIAN_373 | CAVE |
+F:CAVE
 F:FILL_METHOD_0
+F:FINAL_GUARDIAN_373
+F:FINAL_OBJECT_810
+F:RANDOM_TOWNS
 R:30:3
 M:TROLL
 R:20:0
 R:50:3
-M:ORC | R_CHAR_k | R_CHAR_o | R_CHAR_O
+M:ORC
+M:R_CHAR_O
+M:R_CHAR_k
+M:R_CHAR_o
 
 # Erebor
 # levels 60-72
 # There is Glaurung
 N:20:Erebor
 D:Ere:a tunnel leading into depths of the Lonely Mountain.
-W:60:72:35:0:20:140
+W:60:72:30:20:140
 L:88:100:1:0:1:0
 A:97:90:87:10:56:0:57:97
 O:40:40:40:40
-F:BIG | LAVA_RIVER | CAVERN | NO_RECALL | NO_STREAMERS
-F:CAVE | DOUBLE | FINAL_GUARDIAN_715 | 
+F:BIG
+F:CAVE
+F:CAVERN
+F:DOUBLE
 F:FILL_METHOD_2
+F:FINAL_GUARDIAN_715
+F:LAVA_RIVER
+F:NO_RECALL
+F:NO_STREAMERS
 R:10:0
 R:60:1
-M:DRAGON | R_CHAR_D
+M:DRAGON
+M:R_CHAR_D
 R:30:1
-M:DRAGON | R_CHAR_d
+M:DRAGON
+M:R_CHAR_d
 
 # The Old Forest
 # levels 13-25
 # Old Man Willow protects it
 N:21:The Old Forest
 D:OFr:a path into the Old Forest.
-W:13:25:5:0:15:100
+W:13:25:5:15:100
 L:88:76:84:16:199:8
 L:68:16:16
 A:96:100:56:0:56:0:202:96
 O:20:5:15:30
-F:WATER_RIVERS | NO_DOORS | NO_DESTROY | FLAT | NO_STREAMERS
-F:RANDOM_TOWNS | FINAL_GUARDIAN_206
 F:FILL_METHOD_3
+F:FINAL_GUARDIAN_206
+F:FLAT
+F:NO_DESTROY
+F:NO_DOORS
+F:NO_STREAMERS
+F:RANDOM_TOWNS
+F:WATER_RIVERS
 R:30:0
 R:40:3
-M:ANIMAL 
+M:ANIMAL
 R:30:3
-M:UNDEAD | R_CHAR_h
+M:R_CHAR_h
+M:UNDEAD
 
 # The Mines of Moria
 # levels 30-50
 # There is Durin's Bane
 N:22:Moria
 D:MoM:a stone door leading to the Mines of Moria.
-W:30:50:20:0:40:40
+W:30:50:20:40:40
 L:88:100:1:0:1:0
 A:97:100:56:0:56:0:57:97
 O:30:50:10:5
-F:FINAL_GUARDIAN_872 | WATER_RIVER | BIG | NO_STREAMERS
+F:BIG
+F:FILL_METHOD_0
+F:FINAL_GUARDIAN_872
 F:FORCE_DOWN
+F:NO_STREAMERS
 F:RANDOM_TOWNS
+F:WATER_RIVER
 F:WILD_45_30__44_37
-F:FILL_METHOD_0
 R:40:3
 M:ORC
 R:30:3
-M:TROLL | GIANT
+M:GIANT
+M:TROLL
 R:20:3
 M:DEMON
 R:10:0
@@ -362,20 +467,25 @@ R:10:0
 # The Necromancer (weak Sauron) at the bottom, with the Ring of Durin
 N:23:Dol Guldur
 D:TDG:a gate leading to the tower of Dol Guldur.
-W:57:70:34:0:24:160
+W:57:70:34:24:160
 L:1:80:174:20:1:0
 A:56:100:56:0:56:0:57:58
 O:20:1:70:9
-F:SMALL | FINAL_GUARDIAN_819 | FINAL_ARTIFACT_205
 F:FILL_METHOD_3
+F:FINAL_ARTIFACT_205
+F:FINAL_GUARDIAN_819
+F:SMALL
 R:30:3
-M:R_CHAR_p | R_CHAR_P
+M:R_CHAR_P
+M:R_CHAR_p
 R:10:3
-M:ORC | TROLL
+M:ORC
+M:TROLL
 R:20:3
 M:UNDEAD
 R:30:3
-M:DEMON | DRAGON
+M:DEMON
+M:DRAGON
 R:10:0
 
 # Dungeons from Variaz
@@ -385,13 +495,15 @@ R:10:0
 # The Watcher in the Water is at the bottom
 N:24:The Small Water Cave
 D:SWC:the entrance to a small water cave.
-W:32:34:20:0:14:160
+W:32:34:20:14:160
 L:84:100:84:0:84:0
 A:97:100:56:0:56:0:57:58
 O:10:10:30:30
 E:1d1:20:ACID
-F:FINAL_GUARDIAN_517 | NO_RECALL | NO_UP
 F:FILL_METHOD_0
+F:FINAL_GUARDIAN_517
+F:NO_RECALL
+F:NO_UP
 R:10:0
 R:10:3
 M:AQUATIC
@@ -407,13 +519,16 @@ M:IM_COLD
 # Levels 45-70
 N:25:The Sacred Land Of Mountains
 D:LoM:the way to the Sacred Land of Mountains.
-W:45:70:20:0:14:160
+W:45:70:20:14:160
 L:89:100:89:0:89:0
 A:97:100:56:0:56:0:97:97
 O:20:20:20:20
-F:RANDOM_TOWNS | FLAT | NO_STREAMERS
-F:FINAL_GUARDIAN_789 | FINAL_ARTIFACT_27
 F:FILL_METHOD_0
+F:FINAL_ARTIFACT_27
+F:FINAL_GUARDIAN_789
+F:FLAT
+F:NO_STREAMERS
+F:RANDOM_TOWNS
 R:60:3
 M:CAN_FLY
 R:40:0
@@ -423,14 +538,18 @@ R:40:0
 # Guarded by Ulfang the Black, Morgoth's first Easterling follower.
 N:26:The Land Of Rhun
 D:LoR:a way to the Land of Rhun.
-W:26:40:15:0:14:160
+W:26:40:15:14:160
 L:89:100:1:0:1:0
 A:89:50:96:25:84:25:57:58
 O:20:20:20:20
-F:RANDOM_TOWNS | FLAT | NO_STREAMERS | FINAL_GUARDIAN_990
 F:FILL_METHOD_1
+F:FINAL_GUARDIAN_990
+F:FLAT
+F:NO_STREAMERS
+F:RANDOM_TOWNS
 R:30:3
-M:R_CHAR_p | R_CHAR_h
+M:R_CHAR_h
+M:R_CHAR_p
 R:30:3
 M:ANIMAL
 R:40:0
@@ -440,13 +559,15 @@ R:40:0
 # guarded by the Sandworm Queen (and her children), who will drop her armour
 N:27:The Sandworm lair
 D:SwL:a sandhole.
-W:22:30:12:0:5:200
+W:22:30:12:5:200
 L:91:85:94:10:93:5
 A:98:100:96:0:84:0:94:94
 O:15:5:60:20
-F:NO_DOORS | SAND_VEIN |
-F:FINAL_GUARDIAN_1030 | FINAL_ARTIFACT_153
 F:FILL_METHOD_0
+F:FINAL_ARTIFACT_153
+F:FINAL_GUARDIAN_1030
+F:NO_DOORS
+F:SAND_VEIN
 R:90:3
 M:R_CHAR_w
 R:10:3
@@ -455,12 +576,15 @@ S:MULTIPLY
 # Used by the death fate
 N:28:Death fate
 D:Dth:a fated death.
-W:1:1:1:0:30:255
+W:1:1:1:30:255
 L:1:100:1:0:1:0
 A:1:100:1:0:1:0:1:1
 O:1:1:1:1
-F:EMPTY | SMALLEST | NO_RECALL | NO_STREAMERS
+F:EMPTY
 F:FILL_METHOD_0
+F:NO_RECALL
+F:NO_STREAMERS
+F:SMALLEST
 R:100:0
 
 # The Grinding Ice
@@ -468,16 +592,19 @@ R:100:0
 # Guarded by the White Balrog
 N:29:The Helcaraxe
 D:Ice:the entrance to the Grinding Ice of the Helcaraxe.
-W:20:40:10:0:14:160
+W:20:40:10:14:160
 L:90:0:88:70:84:30
 L:90:0:10
 A:95:0:56:100:56:0:57:58
 A:100:0:0
 O:20:20:20:20
 E:1d4:15:COLD
-F:DOUBLE | WATER_RIVER | CAVERN | NO_STREAMERS
-F:FINAL_GUARDIAN_1034 | 
+F:CAVERN
+F:DOUBLE
 F:FILL_METHOD_2
+F:FINAL_GUARDIAN_1034
+F:NO_STREAMERS
+F:WATER_RIVER
 R:100:1
 M:IM_COLD
 
@@ -487,11 +614,12 @@ M:IM_COLD
 # See god.lua for details
 N:30:a lost temple
 D:LTm:the entrance to a lost temple.
-W:1:50:1:0:14:160
+W:1:50:1:14:160
 L:1:100:1:0:1:0
 A:56:100:56:0:56:0:57:58
 O:20:20:20:20
-F:FILL_METHOD_4 | NO_RECALL
+F:FILL_METHOD_4
+F:NO_RECALL
 R:100:0
 
 # N:<index>:<name>
diff --git a/lib/edit/e_info.txt b/lib/edit/e_info.txt
index f01d8cf7..165d4771 100644
--- a/lib/edit/e_info.txt
+++ b/lib/edit/e_info.txt
@@ -63,10 +63,6 @@
 
 
 
-# Version stamp (required)
-
-V:2.0.0
-
 ### Mage Staff ###
 
 N:1:of Mana
@@ -97,19 +93,11 @@ T:6:0:255
 W:10:1:8:50000
 C:-40:-40:0:3
 R:100
-F:MANA | SPELL
+F:MANA
+F:SPELL
 R:50
 F:PVAL_M2
 
-N:4:of Spell
-T:6:0:255
-X:A:24:60
-W:0:2:8:40000
-C:0:0:0:0
-R:100
-F:ACTIVATE
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
-
 ### Body Armor ###
 
 N:5:of Resist Acid
@@ -118,8 +106,10 @@ T:37:0:255
 X:A:30:16
 W:0:4:20:1000
 R:100
-F:RES_ACID | IGNORE_ACID
-f:RES_ACID | IGNORE_ACID
+F:IGNORE_ACID
+F:RES_ACID
+f:IGNORE_ACID
+f:RES_ACID
 
 N:6:of Resist Lightning
 T:36:0:255
@@ -127,8 +117,10 @@ T:37:0:255
 X:A:30:10
 W:0:4:20:400
 R:100
-F:RES_ELEC | IGNORE_ELEC
-f:RES_ELEC | IGNORE_ELEC
+F:IGNORE_ELEC
+F:RES_ELEC
+f:IGNORE_ELEC
+f:RES_ELEC
 
 N:7:of Resist Fire
 T:36:0:15
@@ -137,8 +129,10 @@ T:37:0:255
 X:A:30:14
 W:0:4:20:800
 R:100
-F:RES_FIRE | IGNORE_FIRE
-f:RES_FIRE | IGNORE_FIRE
+F:IGNORE_FIRE
+F:RES_FIRE
+f:IGNORE_FIRE
+f:RES_FIRE
 
 N:8:of Resist Cold
 T:36:0:15
@@ -147,8 +141,10 @@ T:37:0:255
 X:A:30:12
 W:0:4:20:600
 R:100
-F:RES_COLD | IGNORE_COLD
-f:RES_COLD | IGNORE_COLD
+F:IGNORE_COLD
+F:RES_COLD
+f:IGNORE_COLD
+f:RES_COLD
 
 N:9:of Resistance
 T:36:0:255
@@ -157,9 +153,18 @@ X:A:30:20
 W:0:2:20:12500
 C:0:0:10:0
 R:100
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
-f:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+f:RES_ACID
+f:RES_COLD
+f:RES_ELEC
+f:RES_FIRE
 R:25
 F:R_HIGH
 
@@ -170,11 +175,18 @@ X:B:30:25
 W:0:2:20:15000
 C:0:0:10:3
 R:100
-F:STEALTH | ESP_ORC
-f:STEALTH
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:ESP_ORC
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 F:OLD_RESIST
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:STEALTH
+f:STEALTH
 R:25
 F:RES_POIS
 
@@ -185,10 +197,22 @@ X:A:30:30
 W:0:1:10:30000
 C:0:0:10:0
 R:100
-F:SUST_STR | SUST_DEX | SUST_CON | SUST_INT | SUST_WIS | SUST_CHR | 
-F:HOLD_LIFE | RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:HOLD_LIFE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 F:OLD_RESIST
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:SUST_CHR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_INT
+F:SUST_STR
+F:SUST_WIS
 R:2
 F:R_IMMUNITY
 
@@ -199,7 +223,10 @@ X:A:30:0
 W:0:1:10:0
 C:0:0:0:-6
 R:100
-F:CON | STR | R_STAT | CURSED
+F:CON
+F:CURSED
+F:R_STAT
+F:STR
 # No CURSE_NO_DROP here, players seems to unlike surprises
 
 # Mithirl & Adamantite mails & PDSM
@@ -231,7 +258,7 @@ C:0:0:0:3
 Z:blink
 R:100
 F:ACTIVATE
-a:HARDCORE=JUMP
+a:JUMP
 
 ### Shields ###
 
@@ -242,8 +269,10 @@ T:34:7:255
 X:A:32:16
 W:0:6:22:1000
 R:100
-F:RES_ACID | IGNORE_ACID
-f:RES_ACID | IGNORE_ACID
+F:IGNORE_ACID
+F:RES_ACID
+f:IGNORE_ACID
+f:RES_ACID
 
 N:17:of Resist Lightning
 T:34:0:5
@@ -252,8 +281,10 @@ T:115:56:56
 X:A:32:10
 W:0:6:22:400
 R:100
-F:RES_ELEC | IGNORE_ELEC
-f:RES_ELEC | IGNORE_ELEC
+F:IGNORE_ELEC
+F:RES_ELEC
+f:IGNORE_ELEC
+f:RES_ELEC
 
 N:18:of Resist Fire
 T:34:0:5
@@ -262,8 +293,10 @@ T:115:56:56
 X:A:32:14
 W:0:6:22:800
 R:100
-F:RES_FIRE | IGNORE_FIRE
-f:RES_FIRE | IGNORE_FIRE
+F:IGNORE_FIRE
+F:RES_FIRE
+f:IGNORE_FIRE
+f:RES_FIRE
 
 N:19:of Resist Cold
 T:115:56:56
@@ -272,8 +305,10 @@ T:34:7:255
 X:A:32:12
 W:0:6:22:600
 R:100
-F:RES_COLD | IGNORE_COLD
-f:RES_COLD | IGNORE_COLD
+F:IGNORE_COLD
+F:RES_COLD
+f:IGNORE_COLD
+f:RES_COLD
 
 N:20:of Resistance
 T:115:56:56
@@ -283,9 +318,18 @@ X:A:32:20
 W:0:2:22:12500
 C:0:0:10:0
 R:100
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
-f:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+f:RES_ACID
+f:RES_COLD
+f:RES_ELEC
+f:RES_FIRE
 
 N:21:of Reflection
 T:115:56:56
@@ -295,9 +339,12 @@ X:A:32:20
 W:0:2:22:15000
 C:0:0:5:0
 R:100
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 F:REFLECT
 f:REFLECT
-F:IGNORE_ELEC | IGNORE_ACID | IGNORE_COLD | IGNORE_FIRE
 
 # Metal shields only
 N:22:of Electricity
@@ -307,7 +354,9 @@ T:34:10:10
 X:A:32:10
 W:0:2:22:400
 R:100
-F:RES_ELEC | IGNORE_ELEC | SH_ELEC
+F:IGNORE_ELEC
+F:RES_ELEC
+F:SH_ELEC
 f:SH_ELEC
 
 ### Crowns and Helms ###
@@ -320,8 +369,11 @@ X:A:33:13
 C:0:0:0:2
 W:0:1:8:500
 R:100
-F:DEX | SUST_DEX | ACTIVATE | ESP_ORC
-a:HARDCORE=NOLDOR
+F:ACTIVATE
+F:DEX
+F:ESP_ORC
+F:SUST_DEX
+a:NOLDOR
 
 N:24:of Intelligence
 X:A:33:13
@@ -331,7 +383,8 @@ T:32:0:6
 T:32:8:99
 T:115:57:57
 R:100
-F:INT | SUST_INT
+F:INT
+F:SUST_INT
 f:INT
 
 N:25:of Wisdom
@@ -342,7 +395,8 @@ T:32:0:6
 T:32:8:99
 T:115:57:57
 R:100
-F:WIS | SUST_WIS
+F:SUST_WIS
+F:WIS
 f:WIS
 
 N:26:of Beauty
@@ -353,7 +407,8 @@ T:32:0:6
 T:32:8:99
 T:115:57:57
 R:100
-F:CHR | SUST_CHR
+F:CHR
+F:SUST_CHR
 f:CHR
 
 # 40% chance of increase spell power
@@ -363,14 +418,23 @@ W:0:1:8:7500
 C:0:0:0:3
 T:33:0:99
 R:100
-F:INT | SUST_INT | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
-F:ABILITY | R_HIGH
+F:ABILITY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:INT
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:R_HIGH
+F:SUST_INT
 R:40
 F:SPELL
 R:50
-F:SPELL_CONTAIN | WIELD_CAST
+F:SPELL_CONTAIN
+F:WIELD_CAST
 
 N:28:of Might
 X:A:33:19
@@ -378,8 +442,14 @@ W:0:1:8:2000
 C:0:0:0:3
 T:33:0:99
 R:100
-F:STR | DEX | CON | SUST_STR | SUST_DEX | SUST_CON | FREE_ACT
+F:CON
+F:DEX
+F:FREE_ACT
 F:R_HIGH
+F:STR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_STR
 
 N:29:of Lordliness
 X:A:33:17
@@ -387,8 +457,11 @@ W:0:1:8:2000
 C:0:0:0:3
 T:33:0:99
 R:100
-F:WIS | CHR | SUST_WIS | SUST_CHR
+F:CHR
 F:R_HIGH
+F:SUST_CHR
+F:SUST_WIS
+F:WIS
 
 N:30:of Seeing
 X:A:33:8
@@ -399,8 +472,8 @@ T:32:8:99
 T:33:0:99
 T:115:57:57
 R:100
-F:SEARCH | RES_BLIND | SEE_INVIS
-f:SEARCH
+F:RES_BLIND
+F:SEE_INVIS
 R:20
 F:ESP_ALL
 
@@ -412,7 +485,8 @@ T:32:0:6
 T:32:8:99
 T:115:57:57
 R:100
-F:INFRA | HIDE_TYPE
+F:HIDE_TYPE
+F:INFRA
 f:INFRA
 
 N:32:of Light
@@ -422,7 +496,8 @@ T:32:0:6
 T:32:8:99
 T:115:57:57
 R:100
-F:LITE1 | RES_LITE
+F:LITE1
+F:RES_LITE
 f:LITE1
 
 N:33:of Telepathy
@@ -464,7 +539,8 @@ T:32:0:6
 T:32:8:99
 T:115:57:57
 R:100
-F:INT | CURSED
+F:CURSED
+F:INT
 f:INT
 # No CURSE_NO_DROP here, players seems to unlike surprises
 
@@ -496,7 +572,9 @@ C:0:0:0:-5
 W:0:1:7:0
 T:33:0:99
 R:100
-F:STR | DEX | CON
+F:CON
+F:DEX
+F:STR
 
 N:40:Dwarven
 T:32:0:6
@@ -505,7 +583,11 @@ X:B:33:13
 C:0:0:0:2
 W:0:1:8:500
 R:100
-F:INFRA | CON | RES_FIRE | ESP_TROLL | ESP_DRAGON
+F:CON
+F:ESP_DRAGON
+F:ESP_TROLL
+F:INFRA
+F:RES_FIRE
 
 
 ### Cloaks ###
@@ -516,7 +598,11 @@ W:0:4:19:1500
 C:0:0:10:0
 T:35:0:255
 R:100
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | RES_SHARDS
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_SHARDS
 
 N:42:of Stealth
 X:A:31:10
@@ -533,10 +619,13 @@ W:0:1:28:4000
 C:0:0:20:3
 T:35:0:255
 R:100
-F:STEALTH | 
-f:STEALTH | 
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 F:OLD_RESIST
+F:STEALTH
+f:STEALTH
 
 # Aura, Fire
 N:44:of Immolation
@@ -545,7 +634,10 @@ W:0:1:18:4000
 C:0:0:4:0
 T:35:0:255
 R:100
-F:IGNORE_ACID | IGNORE_FIRE | SH_FIRE | RES_FIRE
+F:IGNORE_ACID
+F:IGNORE_FIRE
+F:RES_FIRE
+F:SH_FIRE
 f:SH_FIRE
 
 N:45:of Enveloping
@@ -570,7 +662,8 @@ W:0:1:3:0
 C:-15:-15:0:0
 T:35:0:255
 R:100
-F:AGGRAVATE | SHOW_MODS
+F:AGGRAVATE
+F:SHOW_MODS
 
 # Aura, Electricity
 N:48:of Electricity
@@ -579,7 +672,10 @@ W:0:1:18:4000
 C:0:0:4:0
 T:35:0:255
 R:100
-F:IGNORE_ACID | IGNORE_ELEC | SH_ELEC | RES_ELEC
+F:IGNORE_ACID
+F:IGNORE_ELEC
+F:RES_ELEC
+F:SH_ELEC
 
 ### Gloves ###
 
@@ -605,7 +701,8 @@ W:0:2:10:1000
 C:0:0:0:5
 T:31:0:99
 R:100
-F:DEX | HIDE_TYPE
+F:DEX
+F:HIDE_TYPE
 f:DEX
 
 N:52:of Power
@@ -614,9 +711,11 @@ X:A:34:22
 W:0:1:10:2500
 C:5:5:0:5
 R:100
-F:STR | SHOW_MODS | HIDE_TYPE
-f:STR
+F:HIDE_TYPE
 F:R_HIGH
+F:SHOW_MODS
+F:STR
+f:STR
 
 # 53 Gauntlets only
 N:53:of Peace
@@ -625,7 +724,8 @@ W:0:1:3:0
 C:-10:-10:0:0
 T:31:2:2
 R:100
-F:HEAVY_CURSE | CURSED
+F:CURSED
+F:HEAVY_CURSE
 
 # 54 Gloves only
 N:54:of Charming
@@ -691,7 +791,8 @@ W:0:1:27:200000
 C:0:0:0:10
 T:30:0:99
 R:100
-F:SPEED | HIDE_TYPE
+F:HIDE_TYPE
+F:SPEED
 f:SPEED
 R:10
 F:PVAL_M3
@@ -704,7 +805,9 @@ W:0:1:20:5000
 C:0:0:0:6
 T:30:6:6
 R:100
-F:CON | INFRA | RES_DARK
+F:CON
+F:INFRA
+F:RES_DARK
 R:33
 F:STR
 
@@ -731,7 +834,8 @@ W:0:1:3:0
 C:0:0:0:-10
 T:30:0:99
 R:100
-F:SPEED | AGGRAVATE
+F:AGGRAVATE
+F:SPEED
 
 
 ### Weapons ###
@@ -745,10 +849,16 @@ X:A:24:30
 W:0:2:44:20000
 C:6:6:4:3
 R:100
-F:WIS |
-F:SLAY_EVIL | SLAY_UNDEAD | SLAY_DEMON | 
-F:SEE_INVIS | BLESSED | RES_FEAR | ESP_EVIL
-F:SUSTAIN | LIMIT_BLOWS
+F:BLESSED
+F:ESP_EVIL
+F:LIMIT_BLOWS
+F:RES_FEAR
+F:SEE_INVIS
+F:SLAY_DEMON
+F:SLAY_EVIL
+F:SLAY_UNDEAD
+F:SUSTAIN
+F:WIS
 R:10
 F:BLOWS
 R:1
@@ -765,12 +875,22 @@ X:A:24:25
 W:0:2:44:15000
 C:4:4:8:4
 R:100
-F:STEALTH |
-f:STEALTH |
-F:FREE_ACT | SEE_INVIS | FEATHER | REGEN | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
-F:SUSTAIN | R_HIGH
+F:FEATHER
+F:FREE_ACT
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:REGEN
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:R_HIGH
+F:SEE_INVIS
+F:STEALTH
+F:SUSTAIN
+f:STEALTH
 R:33
 F:RES_POIS
 
@@ -783,8 +903,10 @@ X:B:24:20
 W:0:1:44:5000
 C:0:0:0:3
 R:100
-F:WIS | ESP_GOOD
-F:BLESSED | ABILITY
+F:ABILITY
+F:BLESSED
+F:ESP_GOOD
+F:WIS
 f:BLESSED
 
 N:68:of Greater Life
@@ -798,7 +920,8 @@ W:0:1:50:30000
 C:5:5:0:3
 r:N:MUST2H
 R:100
-F:LIFE | HOLD_LIFE
+F:HOLD_LIFE
+F:LIFE
 f:LIFE
 
 N:69:of Westernesse
@@ -811,9 +934,17 @@ X:A:24:20
 W:0:2:44:20000
 C:5:5:0:2
 R:100
-F:STR | DEX | CON |
-F:SLAY_ORC | SLAY_TROLL | SLAY_GIANT | 
-F:FREE_ACT | SEE_INVIS | ESP_ORC | ESP_TROLL | ESP_GIANT
+F:CON
+F:DEX
+F:ESP_GIANT
+F:ESP_ORC
+F:ESP_TROLL
+F:FREE_ACT
+F:SEE_INVIS
+F:SLAY_GIANT
+F:SLAY_ORC
+F:SLAY_TROLL
+F:STR
 R:33
 F:RES_FEAR
 R:50
@@ -845,7 +976,8 @@ X:A:24:15
 W:0:2:44:2500
 C:0:0:0:0
 R:100
-F:SLAY_WEAP | WOUNDING
+F:SLAY_WEAP
+F:WOUNDING
 
 N:72:of Spinning
 T:125:0:255
@@ -858,8 +990,11 @@ X:A:24:18
 W:0:1:44:9000
 C:8:8:0:2
 R:100
-F:DEX | STR | VORPAL | ACTIVATE
-a:HARDCORE=SPIN
+F:ACTIVATE
+F:DEX
+F:STR
+F:VORPAL
+a:SPIN
 
 # The "Elemental" brands (4) (6)
 
@@ -874,7 +1009,9 @@ T:115:55:55
 X:B:24:15
 W:0:4:44:5000
 R:100
-F:BRAND_ACID | RES_ACID | IGNORE_ACID
+F:BRAND_ACID
+F:IGNORE_ACID
+F:RES_ACID
 f:BRAND_ACID
 
 N:74:Shocking
@@ -888,7 +1025,9 @@ T:115:55:55
 X:B:24:20
 W:0:4:44:4500
 R:100
-F:BRAND_ELEC | RES_ELEC | IGNORE_ELEC
+F:BRAND_ELEC
+F:IGNORE_ELEC
+F:RES_ELEC
 f:BRAND_ELEC
 
 N:75:Fiery
@@ -902,8 +1041,11 @@ T:115:55:55
 X:B:24:20
 W:0:4:44:3500
 R:100
-F:BRAND_FIRE | RES_FIRE | IGNORE_FIRE | LITE1
-f:BRAND_FIRE | 
+F:BRAND_FIRE
+F:IGNORE_FIRE
+F:LITE1
+F:RES_FIRE
+f:BRAND_FIRE
 
 N:76:Frozen
 T:125:0:255
@@ -916,8 +1058,10 @@ T:115:55:55
 X:B:24:15
 W:0:4:44:3000
 R:100
-F:BRAND_COLD | RES_COLD | IGNORE_COLD
-f:BRAND_COLD | 
+F:BRAND_COLD
+F:IGNORE_COLD
+F:RES_COLD
+f:BRAND_COLD
 
 N:77:Venomous
 T:125:0:255
@@ -930,8 +1074,9 @@ T:115:55:55
 X:B:24:20
 W:0:4:44:4000
 R:100
-F:BRAND_POIS | RES_POIS
-f:BRAND_POIS | 
+F:BRAND_POIS
+F:RES_POIS
+f:BRAND_POIS
 
 N:78:Chaotic
 T:125:0:255
@@ -944,9 +1089,13 @@ T:115:55:55
 X:B:24:28
 W:0:1:44:10000
 R:100
-F:CHAOTIC | RES_CHAOS | IGNORE_ELEC | IGNORE_ACID | IGNORE_FIRE
-f:CHAOTIC
+F:CHAOTIC
+F:IGNORE_ACID
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_CHAOS
 F:R_ANY
+f:CHAOTIC
 
 N:79:Sharp
 T:125:0:255
@@ -967,7 +1116,10 @@ X:A:24:20
 W:0:1:44:4000
 C:10:10:0:6
 R:100
-F:IMPACT | STR | TUNNEL | HIDE_TYPE
+F:HIDE_TYPE
+F:IMPACT
+F:STR
+F:TUNNEL
 f:IMPACT
 
 # The "Slay" brands (8)
@@ -1092,8 +1244,13 @@ X:A:24:20
 W:0:2:44:6000
 C:0:0:0:2
 R:100
-F:INT | SLAY_ANIMAL | SLOW_DIGEST | STEALTH | ESP_ANIMAL
-f:SLAY_ANIMAL | STEALTH
+F:ESP_ANIMAL
+F:INT
+F:SLAY_ANIMAL
+F:SLOW_DIGEST
+F:STEALTH
+f:SLAY_ANIMAL
+f:STEALTH
 
 N:90:of *Slay Evil*
 T:125:0:255
@@ -1106,8 +1263,13 @@ X:A:24:20
 W:0:2:44:6000
 C:0:0:0:2
 R:100
-F:WIS | SLAY_EVIL | BLESSED | ESP_EVIL | RES_FEAR | ABILITY
-f:SLAY_EVIL | 
+F:ABILITY
+F:BLESSED
+F:ESP_EVIL
+F:RES_FEAR
+F:SLAY_EVIL
+F:WIS
+f:SLAY_EVIL
 
 N:91:of *Slay Undead*
 T:125:0:255
@@ -1121,8 +1283,12 @@ X:A:24:24
 W:0:2:44:8000
 C:0:0:0:2
 R:100
-F:WIS | KILL_UNDEAD | SEE_INVIS | ESP_UNDEAD | RES_NETHER
-f:KILL_UNDEAD | 
+F:ESP_UNDEAD
+F:KILL_UNDEAD
+F:RES_NETHER
+F:SEE_INVIS
+F:WIS
+f:KILL_UNDEAD
 
 N:92:of *Slay Demon*
 T:125:0:255
@@ -1136,8 +1302,12 @@ X:A:24:16
 W:0:2:44:8000
 C:0:0:0:2
 R:100
-F:INT | KILL_DEMON | ESP_DEMON | RES_FIRE | RES_CHAOS
-f:KILL_DEMON | 
+F:ESP_DEMON
+F:INT
+F:KILL_DEMON
+F:RES_CHAOS
+F:RES_FIRE
+f:KILL_DEMON
 
 N:93:of *Slay Orc*
 T:15:0:255
@@ -1150,8 +1320,11 @@ X:A:24:14
 W:0:2:44:4000
 C:0:0:0:2
 R:100
-F:DEX | SLAY_ORC | ESP_ORC | SUST_DEX | 
-f:SLAY_ORC | 
+F:DEX
+F:ESP_ORC
+F:SLAY_ORC
+F:SUST_DEX
+f:SLAY_ORC
 
 N:94:of *Slay Troll*
 T:15:0:255
@@ -1164,8 +1337,12 @@ X:A:24:14
 W:0:2:44:4000
 C:0:0:0:2
 R:100
-F:STR | SLAY_TROLL | ESP_TROLL | REGEN | SUST_STR
-f:SLAY_TROLL | 
+F:ESP_TROLL
+F:REGEN
+F:SLAY_TROLL
+F:STR
+F:SUST_STR
+f:SLAY_TROLL
 
 N:95:of *Slay Giant*
 T:15:0:255
@@ -1178,8 +1355,12 @@ X:A:24:16
 W:0:2:44:4000
 C:0:0:0:2
 R:100
-F:STR | SLAY_GIANT | ESP_GIANT | RES_SHARDS | SUST_STR
-f:SLAY_GIANT | 
+F:ESP_GIANT
+F:RES_SHARDS
+F:SLAY_GIANT
+F:STR
+F:SUST_STR
+f:SLAY_GIANT
 
 N:96:of *Slay Dragon*
 T:15:0:255
@@ -1192,9 +1373,13 @@ X:A:24:24
 W:0:2:44:8000
 C:0:0:0:2
 R:100
-F:CON | KILL_DRAGON | ESP_DRAGON | RES_FEAR | 
+F:CON
+F:ESP_DRAGON
+F:KILL_DRAGON
+F:RES_FEAR
+F:R_ELEM
+F:R_LOW
 f:KILL_DRAGON
-F:R_LOW | R_ELEM
 R:20
 F:RES_POIS
 
@@ -1206,8 +1391,11 @@ X:B:24:25
 W:0:2:44:10000
 C:0:0:0:-2
 R:100
-F:LIFE | VAMPIRIC | HOLD_LIFE
-f:LIFE | VAMPIRIC
+F:HOLD_LIFE
+F:LIFE
+F:VAMPIRIC
+f:LIFE
+f:VAMPIRIC
 
 N:98:(*Defender*)
 T:21:0:255
@@ -1218,18 +1406,40 @@ X:A:24:35
 W:0:1:100:50000
 C:-15:-15:20:4
 R:100
-F:STEALTH | RES_POIS | DEX | CON | WIS | HOLD_LIFE |
+F:CON
+F:DEX
+F:FEATHER
+F:FREE_ACT
+F:HOLD_LIFE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:REGEN
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_POIS
+F:R_ANY
+F:R_LOW
+F:SEE_INVIS
+F:STEALTH
+F:SUSTAIN
+F:WIS
 f:STEALTH
-F:FREE_ACT | SEE_INVIS | FEATHER | REGEN | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD |
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
-F:R_ANY | R_LOW | SUSTAIN
 R:30
-F:R_ANY | R_LOW | SUSTAIN
+F:R_ANY
+F:R_LOW
+F:SUSTAIN
 R:20
-F:R_ANY | R_LOW | SUSTAIN | R_HIGH
+F:R_ANY
+F:R_HIGH
+F:R_LOW
+F:SUSTAIN
 R:10
-F:R_IMMUNITY | R_ANY
+F:R_ANY
+F:R_IMMUNITY
 
 N:99:of the Thunderlords
 T:21:0:255
@@ -1239,15 +1449,26 @@ T:24:0:255
 X:A:24:22
 W:0:1:100:7000
 C:4:4:0:2
-a:HARDCORE=TELEPORT
+a:TELEPORT
 R:100
-F:SLAY_EVIL | KILL_DRAGON | TELEPORT | FREE_ACT | SEARCH | BRAND_ELEC
-F:REGEN | SLOW_DIGEST | RES_NEXUS | ACTIVATE | FLY | ESP_DRAGON
+F:ACTIVATE
+F:BRAND_ELEC
+F:ESP_DRAGON
+F:FLY
+F:FREE_ACT
+F:KILL_DRAGON
+F:REGEN
+F:RES_NEXUS
 F:R_HIGH
+F:SLAY_EVIL
+F:SLOW_DIGEST
+F:TELEPORT
 R:12
 F:ABILITY
 R:2
-F:R_P_ABILITY | PVAL_M3 | LIMIT_BLOWS
+F:LIMIT_BLOWS
+F:PVAL_M3
+F:R_P_ABILITY
 
 N:100:of Gondolin
 T:21:0:255
@@ -1258,10 +1479,21 @@ X:A:24:26
 W:0:1:44:25000
 C:7:7:0:3
 R:100
-F:STR | CON | ESP_EVIL | RES_FEAR | 
-F:SLAY_EVIL | SLAY_TROLL | SLAY_DRAGON | SLAY_DEMON |
-F:FREE_ACT | SEE_INVIS | LITE1 | RES_DARK | ABILITY | 
-F:IGNORE_ACID | IGNORE_FIRE
+F:ABILITY
+F:CON
+F:ESP_EVIL
+F:FREE_ACT
+F:IGNORE_ACID
+F:IGNORE_FIRE
+F:LITE1
+F:RES_DARK
+F:RES_FEAR
+F:SEE_INVIS
+F:SLAY_DEMON
+F:SLAY_DRAGON
+F:SLAY_EVIL
+F:SLAY_TROLL
+F:STR
 R:33
 F:R_HIGH
 R:33
@@ -1277,9 +1509,12 @@ X:A:24:4
 W:0:1:2:500
 C:0:0:0:5
 R:100
-F:TUNNEL |
-f:TUNNEL |
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:TUNNEL
+f:TUNNEL
 
 # More weapons
 
@@ -1293,9 +1528,12 @@ T:115:55:55
 X:B:24:30
 W:0:1:5:5000
 R:100
-F:SLAY_UNDEAD | SEE_INVIS | HOLD_LIFE | DRAIN_HP
 F:ACTIVATE
-a:HARDCORE=SPECTRAL
+F:DRAIN_HP
+F:HOLD_LIFE
+F:SEE_INVIS
+F:SLAY_UNDEAD
+a:SPECTRAL
 
 N:103:of Morgul
 T:125:0:255
@@ -1308,9 +1546,15 @@ X:A:24:0
 W:0:1:1:0
 C:-20:-20:-10:-10
 R:100
+F:AGGRAVATE
+F:AUTO_CURSE
+F:BLACK_BREATH
+F:CURSED
+F:DRAIN_EXP
+F:HEAVY_CURSE
 F:LUCK
-F:SEE_INVIS | AGGRAVATE | HEAVY_CURSE | CURSED | BLACK_BREATH | DRAIN_EXP | 
-F:AUTO_CURSE | WOUNDING
+F:SEE_INVIS
+F:WOUNDING
 # No CURSE_NO_DROP here, players seems to unlike surprises
 
 N:104:of Nothingness
@@ -1324,7 +1568,10 @@ X:A:24:0
 W:0:1:2:0
 C:-100:-100:0:0
 R:100
-F:NEVER_BLOW | HEAVY_CURSE | CURSED | AUTO_CURSE
+F:AUTO_CURSE
+F:CURSED
+F:HEAVY_CURSE
+F:NEVER_BLOW
 
 
 ### Missile Launchers ###
@@ -1349,8 +1596,10 @@ X:A:25:20
 W:0:4:21:10000
 C:5:10:0:1
 R:100
-F:XTRA_MIGHT | PVAL_M3 | R_ANY
-f:XTRA_MIGHT | 
+F:PVAL_M3
+F:R_ANY
+F:XTRA_MIGHT
+f:XTRA_MIGHT
 
 N:108:of Extra Shots
 T:19:0:255
@@ -1358,8 +1607,9 @@ X:A:25:20
 C:10:5:0:1
 W:0:4:21:10000
 R:100
-F:XTRA_SHOTS | PVAL_M2
-f:XTRA_SHOTS | 
+F:PVAL_M2
+F:XTRA_SHOTS
+f:XTRA_SHOTS
 
 # Bows only
 N:109:of Lothlorien
@@ -1368,8 +1618,14 @@ X:A:25:20
 W:50:2:21:30000
 C:10:10:0:2
 R:100
-F:DEX | XTRA_MIGHT | FREE_ACT | IGNORE_ACID | IGNORE_FIRE | HIDE_TYPE | 
-F:BLESSED | ABILITY
+F:ABILITY
+F:BLESSED
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:IGNORE_ACID
+F:IGNORE_FIRE
+F:XTRA_MIGHT
 
 # Crossbows only
 N:110:of the Haradrim
@@ -1378,7 +1634,11 @@ X:A:25:30
 W:50:2:21:20000
 C:5:15:0:1
 R:100
-F:XTRA_MIGHT | XTRA_SHOTS | IGNORE_ACID | IGNORE_FIRE | HIDE_TYPE
+F:HIDE_TYPE
+F:IGNORE_ACID
+F:IGNORE_FIRE
+F:XTRA_MIGHT
+F:XTRA_SHOTS
 
 # Slings only
 N:111:of Buckland
@@ -1387,7 +1647,12 @@ W:40:2:21:20000
 C:8:8:0:2
 T:19:2:2
 R:100
-F:DEX | XTRA_SHOTS | XTRA_MIGHT | IGNORE_ACID | IGNORE_FIRE | HIDE_TYPE
+F:DEX
+F:HIDE_TYPE
+F:IGNORE_ACID
+F:IGNORE_FIRE
+F:XTRA_MIGHT
+F:XTRA_SHOTS
 
 
 ### Ammo ###
@@ -1438,8 +1703,9 @@ T:17:0:99
 T:18:0:99
 X:A:23:10
 R:100
-F:BRAND_ACID | IGNORE_ACID
-f:BRAND_ACID | 
+F:BRAND_ACID
+F:IGNORE_ACID
+f:BRAND_ACID
 W:0:1:12:30
 
 # 117 All Elements at once - melee weapon
@@ -1451,16 +1717,26 @@ T:22:0:99
 T:23:0:99
 T:24:0:99
 R:100
-F:BRAND_ACID | RES_ACID | IGNORE_ACID
-F:BRAND_ELEC | RES_ELEC | IGNORE_ELEC
-F:BRAND_FIRE | RES_FIRE | IGNORE_FIRE
-F:BRAND_COLD | RES_COLD | IGNORE_COLD
-F:BRAND_POIS | RES_POIS | DRAIN_MANA
-f:BRAND_ACID | 
-f:BRAND_ELEC | 
-f:BRAND_FIRE | 
-f:BRAND_COLD | 
-f:BRAND_POIS | 
+F:BRAND_ACID
+F:BRAND_COLD
+F:BRAND_ELEC
+F:BRAND_FIRE
+F:BRAND_POIS
+F:DRAIN_MANA
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_POIS
+f:BRAND_ACID
+f:BRAND_COLD
+f:BRAND_ELEC
+f:BRAND_FIRE
+f:BRAND_POIS
 
 N:118:of Slay Demon
 T:16:0:99
@@ -1495,8 +1771,9 @@ T:17:0:99
 T:18:0:99
 X:A:23:10
 R:100
-F:BRAND_ELEC | IGNORE_ELEC
-f:BRAND_ELEC | 
+F:BRAND_ELEC
+F:IGNORE_ELEC
+f:BRAND_ELEC
 W:0:1:12:30
 
 N:122:of Flame
@@ -1505,8 +1782,9 @@ T:17:0:99
 T:18:0:99
 X:A:23:10
 R:100
-F:BRAND_FIRE | IGNORE_FIRE
-f:BRAND_FIRE | 
+F:BRAND_FIRE
+F:IGNORE_FIRE
+f:BRAND_FIRE
 W:0:2:12:25
 
 N:123:of Frost
@@ -1515,8 +1793,9 @@ T:17:0:99
 T:18:0:99
 X:A:23:10
 R:100
-F:BRAND_COLD | IGNORE_COLD
-f:BRAND_COLD | 
+F:BRAND_COLD
+F:IGNORE_COLD
+f:BRAND_COLD
 W:0:2:12:25
 
 N:124:of Wounding
@@ -1567,9 +1846,15 @@ X:A:25:20
 W:0:2:3:1000
 C:0:0:0:0
 R:100
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD |
-F:RES_ACID | CHR | SEE_INVIS
-F:R_ANY | PVAL_M2
+F:CHR
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:PVAL_M2
+F:RES_ACID
+F:R_ANY
+F:SEE_INVIS
 R:25
 F:PVAL_M1
 
@@ -1580,9 +1865,19 @@ X:A:25:20
 W:0:1:3:2000
 C:0:0:0:0
 R:100
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | SUST_CHR |
-F:RES_FIRE | RES_COLD | RES_ELEC | RES_ACID | CHR | SEE_INVIS
-F:R_ANY | PVAL_M3
+F:CHR
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:PVAL_M3
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:R_ANY
+F:SEE_INVIS
+F:SUST_CHR
 R:50
 F:PVAL_M1
 R:35
@@ -1596,13 +1891,18 @@ X:B:25:20
 W:0:1:2:2000
 C:0:0:0:0
 R:100
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | ACTIVATE
-F:R_ANY | PVAL_M2
+F:ACTIVATE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:PVAL_M2
+F:R_ANY
 R:50
 F:PVAL_M1
 R:25
 F:PVAL_M1
-a:HARDCORE=BA_ACID_H
+a:BA_ACID_H
 
 # Rods ego
 N:131:Capacity of 
@@ -1647,7 +1947,10 @@ X:A:51:10
 W:0:1:10:10000
 C:0:0:0:0
 R:100
-F:CAPACITY | CHARGING | CHEAPNESS | FAST_CAST |
+F:CAPACITY
+F:CHARGING
+F:CHEAPNESS
+F:FAST_CAST
 
 ### Lights ###
 
@@ -1698,10 +2001,10 @@ R:100
 F:LITE1
 F:LITE2
 F:LITE3
+F:RES_DARK
 f:LITE1
 f:LITE2
 f:LITE3
-F:RES_DARK
 
 N:141:of the Shadows
 X:A:0:6
@@ -1730,7 +2033,8 @@ T:39:0:99
 W:0:3:40:4000
 C:0:0:0:0
 R:100
-F:RES_BLIND | SEE_INVIS
+F:RES_BLIND
+F:SEE_INVIS
 
 N:144:of the Ethereal Eye
 X:A:0:7
@@ -1755,9 +2059,19 @@ X:B:30:18
 W:0:2:20:5000
 C:0:0:15:2
 R:100
-F:STR | CON | INFRA | FREE_ACT | HIDE_TYPE | 
-F:RES_FEAR | RES_DARK | SUST_STR | SUST_CON | 
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:CON
+F:FREE_ACT
+F:HIDE_TYPE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:INFRA
+F:RES_DARK
+F:RES_FEAR
+F:STR
+F:SUST_CON
+F:SUST_STR
 
 # Ring and Amulet egos
 
@@ -1768,8 +2082,14 @@ T:45:0:255
 W:0:1:10:1000
 C:0:0:0:0
 R:100
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
-f:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+f:IGNORE_ACID
+f:IGNORE_COLD
+f:IGNORE_ELEC
+f:IGNORE_FIRE
 
 N:148:Cursed
 X:B:0:0
@@ -1803,123 +2123,17 @@ T:65:31:255
 W:0:1:20:1000
 C:0:0:0:3
 R:100
-F:PVAL_M5 | PVAL_M3
+F:PVAL_M3
+F:PVAL_M5
 R:50
-F:PVAL_M5 | PVAL_M3
+F:PVAL_M3
+F:PVAL_M5
 R:10
-F:PVAL_M5 | PVAL_M3
+F:PVAL_M3
+F:PVAL_M5
 R:1
-F:PVAL_M5 | PVAL_M3
-
-
-### 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:IGNORE_ACID | IGNORE_ELEC | IGNORE_COLD | IGNORE_FIRE | 
-F:AUTOMATIC_5
-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:IGNORE_ACID | IGNORE_ELEC | IGNORE_COLD | IGNORE_FIRE | 
-F:AUTOMATIC_99
-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:IGNORE_ACID | IGNORE_ELEC | IGNORE_COLD | IGNORE_FIRE | 
-F:STEALTH | HIDE_TYPE
-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 | IGNORE_ELEC | IGNORE_COLD | 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:STEALTH | CURSED | HIDE_TYPE
-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:STEALTH | ONLY_DRAGON | HIDE_TYPE | XTRA_SHOTS |
-F:IGNORE_ACID | IGNORE_FIRE
-
-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:STEALTH | ONLY_DEMON | HIDE_TYPE | XTRA_SHOTS
-F:IGNORE_ACID | IGNORE_FIRE
-
-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:STEALTH | ONLY_ANIMAL | HIDE_TYPE | 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:STEALTH | ONLY_UNDEAD | HIDE_TYPE | XTRA_SHOTS | KILL_GHOST
-
-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:STEALTH | ONLY_EVIL | HIDE_TYPE | XTRA_SHOTS | KILL_GHOST
+F:PVAL_M3
+F:PVAL_M5
 
 # Lite ego
 N:163:of the Magi
@@ -1929,15 +2143,19 @@ W:0:1:150:2000
 C:0:0:0:3
 Z:magic map
 R:100
-F:INT | WIS | CHR
+F:CHR
+F:INT
+F:WIS
 R:60
-F:INVIS | RES_BLIND
+F:INVIS
+F:RES_BLIND
 R:30
 F:R_HIGH
 R:30
 F:PVAL_M2
 R:50:
-F:SPELL_CONTAIN | WIELD_CAST
+F:SPELL_CONTAIN
+F:WIELD_CAST
 
 ### New ego-items added by JLE
 
@@ -1949,7 +2167,8 @@ C:0:0:-50:0
 T:36:0:99
 T:37:0:99
 R:100
-F:AGGRAVATE | CURSED
+F:AGGRAVATE
+F:CURSED
 
 # Shield of Vulnerability (the only cursed shield)
 N:165:of Vulnerability
@@ -1959,7 +2178,8 @@ C:0:0:-50:0
 T:115:56:56
 T:34:0:99
 R:100
-F:AGGRAVATE | CURSED
+F:AGGRAVATE
+F:CURSED
 
 # Shield of Preservation -  
 N:166:of Preservation
@@ -1969,8 +2189,16 @@ C:-10:-10:20:0
 T:115:56:56
 T:34:0:99
 R:100
-F:RES_DISEN | SUST_STR | SUST_CON | SUST_DEX | HOLD_LIFE | R_HIGH | 
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:HOLD_LIFE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_DISEN
+F:R_HIGH
+F:SUST_CON
+F:SUST_DEX
+F:SUST_STR
 R:33
 F:R_LOW
 R:33
@@ -1984,7 +2212,9 @@ T:32:0:6
 T:32:8:99
 T:33:0:99
 R:100
-F:RES_SOUND | RES_CONF | RES_FEAR
+F:RES_CONF
+F:RES_FEAR
+F:RES_SOUND
 
 # Crown of Night and Day
 N:168:of Night and Day
@@ -1992,7 +2222,12 @@ X:A:33:18
 W:35:1:15:4000
 T:33:0:99
 R:100
-F:RES_LITE | RES_DARK | LITE1 | SEE_INVIS  | RES_BLIND | IGNORE_ACID
+F:IGNORE_ACID
+F:LITE1
+F:RES_BLIND
+F:RES_DARK
+F:RES_LITE
+F:SEE_INVIS
 
 # Cloak of the Magi
 N:169:of the Magi
@@ -2001,9 +2236,16 @@ W:30:1:18:2000
 C:-5:-5:5:3
 T:35:0:99
 R:100
-F:INT | SPEED | SUST_INT | FREE_ACT | STEALTH | HIDE_TYPE | IGNORE_ACID
+F:FREE_ACT
+F:HIDE_TYPE
+F:IGNORE_ACID
+F:INT
+F:SPEED
+F:STEALTH
+F:SUST_INT
 R:30
-F:SPELL_CONTAIN | WIELD_CAST
+F:SPELL_CONTAIN
+F:WIELD_CAST
 
 # Cloak of Invisibility
 N:170:of Invisibility
@@ -2012,7 +2254,9 @@ W:40:1:18:3000
 C:0:0:10:5
 T:35:0:99
 R:100
-F:STEALTH | HIDE_TYPE | INVIS
+F:HIDE_TYPE
+F:INVIS
+F:STEALTH
 f:INVIS
 
 # Cloak of the Bat
@@ -2022,7 +2266,13 @@ W:50:1:35:3000
 C:-10:-10:10:3
 T:35:0:99
 R:100
-F:SPEED | FLY | RES_DARK | SEE_INVIS | INFRA | HIDE_TYPE | STEALTH
+F:FLY
+F:HIDE_TYPE
+F:INFRA
+F:RES_DARK
+F:SEE_INVIS
+F:SPEED
+F:STEALTH
 
 # Leather Gloves of Thievery
 N:172:of Thievery
@@ -2031,7 +2281,12 @@ W:40:1:15:5000
 C:8:3:0:5
 T:31:1:1
 R:100
-F:DEX | SEARCH | SHOW_MODS | FEATHER | FREE_ACT | HIDE_TYPE | IGNORE_ACID
+F:DEX
+F:FEATHER
+F:FREE_ACT
+F:HIDE_TYPE
+F:IGNORE_ACID
+F:SHOW_MODS
 R:10
 F:SPEED
 
@@ -2042,8 +2297,14 @@ W:50:1:15:7000
 C:6:8:-20:2
 T:31:2:99
 R:100
-F:STR | CON | SHOW_MODS | AGGRAVATE | HIDE_TYPE | IGNORE_ACID | RES_FEAR | 
+F:AGGRAVATE
+F:CON
 F:DRAIN_HP
+F:HIDE_TYPE
+F:IGNORE_ACID
+F:RES_FEAR
+F:SHOW_MODS
+F:STR
 R:25
 F:BLOWS
 
@@ -2053,7 +2314,8 @@ X:A:35:20
 W:0:3:27:5000
 T:30:0:99
 R:100
-F:RES_NEXUS | FEATHER
+F:FEATHER
+F:RES_NEXUS
 
 # Boots of Elvenkind (leather boots only)
 N:175:of Elvenkind
@@ -2062,7 +2324,13 @@ W:60:1:36:200000
 C:0:0:0:5
 T:30:2:3
 R:100
-F:STEALTH | SPEED | HIDE_TYPE | FEATHER | IGNORE_ACID | IGNORE_FIRE | ABILITY
+F:ABILITY
+F:FEATHER
+F:HIDE_TYPE
+F:IGNORE_ACID
+F:IGNORE_FIRE
+F:SPEED
+F:STEALTH
 
 # Weapon of Fury (must be big heavy type of weapon, no daggers or whips)
 N:176:of Fury
@@ -2075,8 +2343,14 @@ T:24:8:99
 T:125:0:99
 C:10:10:-20:2
 R:100
-F:STR | BLOWS | AGGRAVATE | RES_FEAR | HIDE_TYPE | 
-F:IGNORE_ACID | IGNORE_FIRE | DRAIN_MANA
+F:AGGRAVATE
+F:BLOWS
+F:DRAIN_MANA
+F:HIDE_TYPE
+F:IGNORE_ACID
+F:IGNORE_FIRE
+F:RES_FEAR
+F:STR
 
 # Staffs of wishing
 N:177:of Plenty
@@ -2123,27 +2397,36 @@ T:14:7:7
 X:B:25:20
 W:0:1:2:2000
 C:0:0:0:0
-a:HARDCORE=BA_COLD_3
+a:BA_COLD_3
 R:100
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD |
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 
 N:182:Dragon
 T:14:7:7
 X:B:25:20
 W:0:1:2:2000
 C:0:0:0:0
-a:HARDCORE=BA_ELEC_3
+a:BA_ELEC_3
 R:100
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD |
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 
 N:183:Dragon
 T:14:7:7
 X:B:25:20
 W:0:1:2:2000
 C:0:0:0:0
-a:HARDCORE=BA_FIRE_H
+a:BA_FIRE_H
 R:100
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD |
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 
 # Helm of water breathing
 N:184:of Water Breathing
@@ -2152,7 +2435,8 @@ C:0:0:0:2
 W:15:1:25:1000
 T:32:5:10
 R:100
-F:WATER_BREATH | IGNORE_ACID
+F:IGNORE_ACID
+F:WATER_BREATH
 f:WATER_BREATH
 
 # A second of life for non MUST2H weapons, much lower value tho
@@ -2167,7 +2451,8 @@ W:0:1:50:30000
 C:5:5:0:1
 r:F:MUST2H
 R:100
-F:LIFE | HOLD_LIFE
+F:HOLD_LIFE
+F:LIFE
 f:LIFE
 
 # Cloak of Air
@@ -2195,7 +2480,10 @@ X:A:25:30
 W:60:5:30:30000
 C:10:15:20:2
 R:120
-F:XTRA_MIGHT | XTRA_SHOTS | REFLECT | IMMOVABLE
+F:IMMOVABLE
+F:REFLECT
+F:XTRA_MIGHT
+F:XTRA_SHOTS
 
 # N: serial number : ego type
 # D: description
diff --git a/lib/edit/evil.map b/lib/edit/evil.map
index a2f00914..aff2de9b 100644
--- a/lib/edit/evil.map
+++ b/lib/edit/evil.map
@@ -14,13 +14,13 @@ F:<:6:0
 F:.:88:0
 
 # Lesser Balrog
-F:b:88:0:996:0:0:0:0:0:0:2
+F:b:88:0:996:0:0:0:0:0:2
 
 # Greater Balrog
-F:B:88:0:807:0:0:0:0:0:0:2
+F:B:88:0:807:0:0:0:0:0:2
 
 # Pit Fiend
-F:P:88:0:812:0:0:0:0:0:0:2
+F:P:88:0:812:0:0:0:0:0:2
 
 # Dungeon layout
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
diff --git a/lib/edit/f_info.txt b/lib/edit/f_info.txt
index c0dc2e9a..939af78e 100644
--- a/lib/edit/f_info.txt
+++ b/lib/edit/f_info.txt
@@ -15,11 +15,6 @@
 # Note that terrain feature zero contains the "darkness" picture.
 
 
-# Version stamp (required)
-
-V:2.0.0
-
-
 # 0x00 --> nothing
 
 N:0:nothing
@@ -30,39 +25,62 @@ F:FLOOR
 
 N:1:open floor
 G:.:w
-F:FLOOR | DONT_NOTICE_RUNNING | SUPPORT_LIGHT | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
+F:SUPPORT_LIGHT
 
 # 0x02 -> fountain
 N:2:fountain
 G:_:w
-F:FLOOR | NOTICE | REMEMBER | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 D:0:The liquid here seems magical.
 
 # 0x03 --> glyph of warding
 
 N:3:glyph of warding
 G:;:y
-F:FLOOR | NOTICE | SUPPORT_LIGHT | CAN_RUN | REMEMBER
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:REMEMBER
+F:SUPPORT_LIGHT
 D:0:There is a mighty spell of protection here.
 
 # 0x04 --> open door
 
 N:4:open door
 G:':U
-F:FLOOR | NOTICE | REMEMBER | CAN_RUN | DOOR
+F:CAN_RUN
+F:DOOR
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 # 0x05 --> broken door
 
 N:5:broken door
 G:':U
-F:FLOOR | NOTICE | REMEMBER | CAN_RUN | DOOR
+F:CAN_RUN
+F:DOOR
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 # 0x06 --> up stairs (perm)
 
 N:6:up staircase
 G:<:w
-F:FLOOR | PERMANENT | NOTICE | SUPPORT_LIGHT | REMEMBER | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
+F:SUPPORT_LIGHT
 D:0:There is an up staircase here.
 D:1:You cannot tunnel a stair.
 
@@ -70,60 +88,102 @@ D:1:You cannot tunnel a stair.
 
 N:7:down staircase
 G:>:w
-F:FLOOR | PERMANENT | NOTICE | SUPPORT_LIGHT | REMEMBER | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
+F:SUPPORT_LIGHT
 D:0:There is a down staircase here.
 D:1:You cannot tunnel a stair.
 
 N:8:quest entrance
 G:>:y
-F:FLOOR | PERMANENT | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 D:1:You cannot tunnel a quest entrance.
 
 N:9:quest exit
 G:<:y
-F:FLOOR | PERMANENT | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 D:1:You cannot tunnel a quest exit.
 
 N:10:quest down level
 G:>:r
-F:FLOOR | PERMANENT | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 
 N:11:quest up level
 G:<:r
-F:FLOOR | PERMANENT | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 
 N:12:town exit
 G:>:g
-F:FLOOR | PERMANENT | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 
 N:13:shaft down
 G:>:U
-F:FLOOR | PERMANENT | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 D:0:There is a shaft down here.
 D:1:You cannot tunnel a shaft.
 
 N:14:shaft up
 G:<:U
-F:FLOOR | PERMANENT | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 D:0:There is a shaft up here.
 D:1:You cannot tunnel a shaft.
 
 # 0x0F -> empty fountain
 N:15:fountain
 G:_:D
-F:FLOOR | NOTICE | REMEMBER | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 D:0:The fountain seems empty.
 
 N:16:web
 G:+:y
-F:CAN_PASS | NOTICE | WEB | NOTICE | TUNNELABLE
+F:CAN_PASS
+F:NOTICE
+F:NOTICE
+F:TUNNELABLE
+F:WEB
 D:1:You tunnel through the web.
 D:2:a web blocking your way
 
 # Trap -- the flags are not used by the program
 N:17:trap
 G:^:w
-F:FLOOR | NOTICE | REMEMBER
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 # 0x12 --> 0x1F -- UNUSED
 
@@ -132,8 +192,14 @@ F:FLOOR | NOTICE | REMEMBER
 N:32:door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | REMEMBER | DOOR
+F:CAN_PASS
+F:DOOR
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> locked door (power 1)
@@ -141,8 +207,14 @@ D:1:You bash the boor.
 N:33:locked door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | REMEMBER | DOOR
+F:CAN_PASS
+F:DOOR
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> locked door (power 2)
@@ -150,8 +222,14 @@ D:1:You bash the boor.
 N:34:locked door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | REMEMBER | DOOR
+F:CAN_PASS
+F:DOOR
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> locked door (power 3)
@@ -159,8 +237,14 @@ D:1:You bash the boor.
 N:35:locked door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | REMEMBER | DOOR
+F:CAN_PASS
+F:DOOR
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> locked door (power 4)
@@ -168,8 +252,14 @@ D:1:You bash the boor.
 N:36:locked door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | REMEMBER | DOOR
+F:CAN_PASS
+F:DOOR
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> locked door (power 5)
@@ -177,8 +267,14 @@ D:1:You bash the boor.
 N:37:locked door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | REMEMBER | DOOR
+F:CAN_PASS
+F:DOOR
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> locked door (power 6)
@@ -186,8 +282,14 @@ D:1:You bash the boor.
 N:38:locked door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | REMEMBER | DOOR
+F:CAN_PASS
+F:DOOR
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> locked door (power 7)
@@ -195,8 +297,14 @@ D:1:You bash the boor.
 N:39:locked door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | REMEMBER | DOOR
+F:CAN_PASS
+F:DOOR
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> jammed door (power 0)
@@ -204,8 +312,13 @@ D:1:You bash the boor.
 N:40:jammed door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | REMEMBER | NOTICE
+F:CAN_PASS
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> jammed door (power 1)
@@ -213,8 +326,13 @@ D:1:You bash the boor.
 N:41:jammed door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | REMEMBER | NOTICE
+F:CAN_PASS
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> jammed door (power 2)
@@ -222,8 +340,13 @@ D:1:You bash the boor.
 N:42:jammed door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | REMEMBER | NOTICE
+F:CAN_PASS
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> jammed door (power 3)
@@ -231,8 +354,13 @@ D:1:You bash the boor.
 N:43:jammed door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | REMEMBER | NOTICE
+F:CAN_PASS
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> jammed door (power 4)
@@ -240,8 +368,13 @@ D:1:You bash the boor.
 N:44:jammed door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | REMEMBER | NOTICE
+F:CAN_PASS
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> jammed door (power 5)
@@ -249,8 +382,13 @@ D:1:You bash the boor.
 N:45:jammed door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | REMEMBER | NOTICE
+F:CAN_PASS
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> jammed door (power 6)
@@ -258,8 +396,13 @@ D:1:You bash the boor.
 N:46:jammed door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | REMEMBER | NOTICE
+F:CAN_PASS
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> jammed door (power 7)
@@ -267,8 +410,13 @@ D:1:You bash the boor.
 N:47:jammed door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | REMEMBER | NOTICE
+F:CAN_PASS
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x30 --> secret door
@@ -276,36 +424,55 @@ D:1:You bash the boor.
 N:48:secret door
 G:#:w
 M:56
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | DOOR
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:DOOR
+F:NO_VISION
+F:NO_WALK
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel.
 
 # 0x31 --> rubble
 
 N:49:pile of rubble
 G:::w
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE
-F:CAN_FLY | SUPPORT_LIGHT
+F:CAN_FLY
+F:CAN_PASS
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You dig in the rubble.
 
 # 0x32 --> magma vein
 
 N:50:magma vein
 G:%:s
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the magma vein.
 
 # 0x33 --> quartz vein
 
 N:51:quartz vein
 G:%:w
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the quartz vein.
 
 # 0x34 --> magma vein + treasure
@@ -313,9 +480,14 @@ D:1:You tunnel into the quartz vein.
 N:52:magma vein
 G:%:s
 M:50
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the magma vein.
 
 # 0x35 --> quartz vein + treasure
@@ -323,36 +495,55 @@ D:1:You tunnel into the magma vein.
 N:53:quartz vein
 G:%:w
 M:51
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the quartz vein.
 
 # 0x36 --> magma vein + known treasure
 
 N:54:magma vein with treasure
 G:*:o
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the magma vein.
 
 # 0x37 --> quartz vein + known treasure
 
 N:55:quartz vein with treasure
 G:*:o
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the quartz vein.
 
 # 0x38 --> granite wall -- basic
 
 N:56:granite wall
 G:#:w
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the granite wall.
 
 # 0x39 --> granite wall -- inner
@@ -360,9 +551,13 @@ D:1:You tunnel into the granite wall.
 N:57:granite wall
 G:#:w
 M:56
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the granite wall.
 
 # 0x3A --> granite wall -- outer
@@ -370,9 +565,13 @@ D:1:You tunnel into the granite wall.
 N:58:granite wall
 G:#:w
 M:56
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the granite wall.
 
 # 0x3B --> granite wall -- solid
@@ -380,110 +579,172 @@ D:1:You tunnel into the granite wall.
 N:59:granite wall
 G:#:w
 M:56
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the granite wall.
 
 # 0x3C --> permanent wall -- basic (perm)
 
 N:60:permanent wall
 G:#:w
-F:WALL | NO_WALK | NO_VISION | PERMANENT | SUPPORT_LIGHT
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 
 # 0x3D --> permanent wall -- inner (perm)
 
 N:61:permanent wall
 G:#:w
 M:60
-F:WALL | NO_WALK | NO_VISION | PERMANENT | SUPPORT_LIGHT
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 
 # 0x3E --> permanent wall -- outer (perm)
 
 N:62:permanent wall
 G:#:w
 M:60
-F:WALL | NO_WALK | NO_VISION | PERMANENT | SUPPORT_LIGHT
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 
 # 0x3F --> permanent wall -- solid (perm)
 
 N:63:permanent wall
 G:#:w
 M:60
-F:WALL | NO_WALK | NO_VISION | PERMANENT | SUPPORT_LIGHT
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 
 N:64:explosive rune
 G:*:R
-F:FLOOR | CAN_LEVITATE | CAN_FLY | NOTICE | SUPPORT_LIGHT
+F:CAN_FLY
+F:CAN_LEVITATE
+F:FLOOR
+F:NOTICE
+F:SUPPORT_LIGHT
 D:0:This rune seems unstable.
 
 N:65:Straight Road startpoint
 G:*:w
-F:FLOOR | REMEMBER | NOTICE
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 N:66:section of the Straight Road
 G:*:B
-F:FLOOR | REMEMBER | NOTICE
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 N:67:section of the Straight Road
 G:*:b
-F:FLOOR | REMEMBER | NOTICE
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 N:68:section of the Straight Road
 G:*:B
-F:FLOOR | REMEMBER | NOTICE
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 N:69:section of the Straight Road
 G:*:b
-F:FLOOR | REMEMBER | NOTICE
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 N:70:section of the Straight Road
 G:*:W
-F:FLOOR | REMEMBER | NOTICE
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 N:71:section of the Straight Road (discharged)
 G:*:W
-F:FLOOR | REMEMBER | NOTICE
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 N:72:Straight Road exit
 G:*:w
-F:FLOOR | REMEMBER | NOTICE
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 N:73:corrupted section of the Straight Road
 G:*:D
-F:FLOOR | REMEMBER | NOTICE
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 # 74 --> shop
 
 N:74:Building
 G:1:U
-F:FLOOR | PERMANENT | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 
 # 75 --> 78 Quests index
 
 N:75:permanent wall
 G:#:w
-F:WALL | NO_WALK | NO_VISION | PERMANENT | SUPPORT_LIGHT
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 
 N:76:permanent wall
 G:#:w
-F:WALL | NO_WALK | NO_VISION | PERMANENT | SUPPORT_LIGHT
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 
 N:77:permanent wall
 G:#:w
-F:WALL | NO_WALK | NO_VISION | PERMANENT | SUPPORT_LIGHT
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 
 N:78:permanent wall
 G:#:w
-F:WALL | NO_WALK | NO_VISION | PERMANENT | SUPPORT_LIGHT
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 
 # 79 --> 83 UNSUSED
 
@@ -491,94 +752,136 @@ N:84:stream of shallow water
 G:~:B
 S:B:B:B:B:B:B:b
 F:ATTR_MULTI
-F:FLOOR | CAN_LEVITATE | CAN_FLY | REMEMBER | SUPPORT_LIGHT | CAN_RUN
+F:CAN_FLY
+F:CAN_LEVITATE
+F:CAN_RUN
 F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:REMEMBER
 F:SUPPORT_GROWTH
+F:SUPPORT_LIGHT
 
 # -1 = player level
 N:85:pool of deep lava
 G:.:R
 E:-1d2:1:FIRE
-F:FLOOR | CAN_LEVITATE | CAN_FLY | REMEMBER | SUPPORT_LIGHT
+F:CAN_FLY
+F:CAN_LEVITATE
+F:FLOOR
+F:REMEMBER
+F:SUPPORT_LIGHT
 D:0:You move across the deep lava.
 
 N:86:stream of shallow lava
 G:.:r
 E:-1d1:1:FIRE
-F:FLOOR | CAN_LEVITATE | CAN_FLY | REMEMBER | SUPPORT_LIGHT
+F:CAN_FLY
+F:CAN_LEVITATE
+F:FLOOR
+F:REMEMBER
+F:SUPPORT_LIGHT
 D:0:You move across the shallow lava.
 
 N:87:dark pit
 G:#:D
-F:CAN_LEVITATE | CAN_FLY
-F:NO_WALK | SUPPORT_LIGHT
+F:CAN_FLY
+F:CAN_LEVITATE
 F:DONT_NOTICE_RUNNING
+F:NO_WALK
+F:SUPPORT_LIGHT
 D:0:Ohhh, it is dark and deep.
 
 N:88:dirt
 G:.:U
-F:FLOOR | SUPPORT_LIGHT | CAN_RUN
+F:CAN_RUN
 F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
+F:SUPPORT_LIGHT
 
 N:89:patch of grass
 G:.:G
-F:FLOOR | SUPPORT_LIGHT | CAN_RUN
+F:CAN_RUN
 F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
+F:SUPPORT_LIGHT
 
 N:90:ice
 G:.:W
 E:1d1:50:ICE
-F:FLOOR | NOTICE
+F:FLOOR
+F:NOTICE
 
 N:91:sand
 G:.:y
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
 
 N:92:dead tree
 G:#:D
-F:CAN_FLY | CAN_PASS
-F:WALL | NO_WALK | NO_VISION | NOTICE
+F:CAN_FLY
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
 F:TUNNELABLE
+F:WALL
 D:1:You chop away at the dead tree.
 D:2:a tree blocking your way
 
 N:93:ash
 G:.:s
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
 
 N:94:mud
 G:.:u
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
 
 N:95:ice wall
 G:#:W
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the ice wall... #BOh chilly#w.
 D:2:an ice wall blocking your way
 
 N:96:tree
 G:#:G
-F:CAN_FLY | CAN_PASS | SUPPORT_LIGHT
-F:WALL | NO_WALK | NO_VISION
+F:CAN_FLY
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You chop away at the tree.
 D:2:a tree blocking your way
 
 N:97:mountain chain
 G:^:U
-F:CAN_CLIMB | CAN_PASS | SUPPORT_LIGHT
-F:WALL | NO_WALK | NO_VISION
+F:CAN_CLIMB
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
 F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 D:1:You cannot tunnel into such a hard stone.
 D:2:a hard stone block blocking your way
 
@@ -586,9 +889,13 @@ D:2:a hard stone block blocking your way
 
 N:98:sandwall
 G:#:y
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
 F:TUNNELABLE
+F:WALL
 D:1:You easily dig into the sandwall.
 D:2:a sandwall blocking your way
 
@@ -597,9 +904,13 @@ D:2:a sandwall blocking your way
 N:99:sandwall
 G:%:y
 M:98
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
 F:TUNNELABLE
+F:WALL
 D:1:You easily dig into the sandwall.
 D:2:a sandwall blocking your way
 
@@ -607,16 +918,23 @@ D:2:a sandwall blocking your way
 
 N:100:sandwall with treasure
 G:*:o
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
 F:TUNNELABLE
+F:WALL
 D:1:You easily tunnel into the sandwall.
 D:2:a sandwall blocking your way
 
 N:101:high mountain chain
 G:^:W
-F:WALL | NO_WALK | NO_VISION | PERMANENT
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 D:1:This rock is far too hard.
 D:2:a very hard stone block blocking your way
 
@@ -625,46 +943,71 @@ G:.:v
 S:v:R:r:v:R:r:D
 E:1d1:40:NETHER
 F:ATTR_MULTI
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 
 # A diggable glass wall.
 N:103:molten glass wall
 G:.:B
-F:NO_WALK | WALL | CAN_PASS | TUNNELABLE | NOTICE
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_WALK
+F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the molten glass wall...
 D:2:a molten glass wall blocking your way
 
 N:160:Void Jumpgate
 G:+:v
-F:FLOOR | REMEMBER | NOTICE | PERMANENT | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 D:0:A dark rift opens to the void here.
 
 ###### Here are the altars. ######
 
 N:161:Altar of Being
 G:0:W
-F:FLOOR | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 D:0:You feel at peace.
 
 N:162:Altar of Winds
 G:0:B
-F:FLOOR | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 D:0:You grow a desire to become a bird.
 
 N:163:Altar of Force
 G:0:R
-F:FLOOR | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 D:0:You grow a desire to fight evil.
 
 N:164:Altar of Darkness
 G:0:D
-F:FLOOR | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 D:0:Images of pain and death fill your mind.
 
 N:165:Altar of Nature
 G:0:g
-F:FLOOR | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 D:0:You feel the desire to walk in a great forest.
 
 # XXX
@@ -679,20 +1022,30 @@ D:0:You feel the desire to walk in a great forest.
 # Used as a marker for random quests
 N:172:open floor
 G:.:w
-F:FLOOR | CAN_RUN | DONT_NOTICE_RUNNING
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
 
 # Underground Tunnel
 N:173:Underground Tunnel
 G:#:s
-F:FLOOR | REMEMBER | SUPPORT_LIGHT | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:REMEMBER
+F:SUPPORT_LIGHT
 D:0:Oh, an underground tunnel!
 
 # Tainted water
 N:174:stream of tainted water
 G:~:u
-F:FLOOR | CAN_LEVITATE | CAN_FLY | REMEMBER | SUPPORT_LIGHT
+F:CAN_FLY
+F:CAN_LEVITATE
 F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:REMEMBER
+F:SUPPORT_LIGHT
 
 N:175:monster trap
 G:;:v
@@ -700,14 +1053,22 @@ F:FLOOR
 
 N:176:Void Jumpgate
 G:+:v
-F:FLOOR | REMEMBER | NOTICE | PERMANENT | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 D:0:A dark rift opens to the void here.
 
 N:177:lava wall
 G:#:R
 S:R:R:r:r:U:u:R
 F:ATTR_MULTI
-F:WALL | NO_WALK | NO_VISION | PERMANENT | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 D:1:The lava is far too hot to tunnel into it.
 D:2:a lava wall blocking your way
 
@@ -716,33 +1077,51 @@ G:%:v
 S:R:R:y:v:y:v:R
 E:150d2:1:HELL_FIRE
 F:ATTR_MULTI
-F:FLOOR | REMEMBER | NOTICE | PERMANENT
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 D:0:This fire is so powerful it could destroy even the most powerful artifacts.
 
 N:179:path to the next area
 G:>:w
-F:FLOOR | PERMANENT | NOTICE | REMEMBER | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 D:0:There is a path leading to the next area here.
 D:1:You cannot tunnel a path.
 
 N:180:path to the previous area
 G:<:w
-F:FLOOR | PERMANENT | NOTICE | REMEMBER | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 D:0:There is a path leading to the previous area here.
 D:1:You cannot tunnel a path.
 
 N:181:field
 G:::g
-F:FLOOR | PERMANENT | NOTICE | REMEMBER
 F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 D:1:You cannot tunnel a field.
 
 N:182:Ekkaia, the Encircling Sea
 G:*:b
 S:b:b:b:b:b:b:B
 F:ATTR_MULTI
-F:WALL | NO_WALK | NO_VISION | PERMANENT | SUPPORT_LIGHT
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 
 N:183:void
 G: :d
@@ -756,97 +1135,159 @@ N:187:pool of deep water
 G:~:b
 S:b:b:b:b:b:b:B
 F:ATTR_MULTI
-F:FLOOR | CAN_LEVITATE | CAN_FLY | REMEMBER | SUPPORT_LIGHT
+F:CAN_FLY
+F:CAN_LEVITATE
+F:FLOOR
+F:REMEMBER
+F:SUPPORT_LIGHT
 
 # Glass wall -- can see but not pass
 N:188:glass wall
 G:.:B
-F:NO_WALK | WALL | PERMANENT | NOTICE
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_WALK
+F:PERMANENT
+F:WALL
 D:1:This glass seems to be totaly impenetrable.
 D:2:a glass wall blocking your way
 
 # Illusion wall -- can't see but can pass
 N:189:illusion wall
 G:#:w
-F:FLOOR | NO_VISION | REMEMBER | SUPPORT_LIGHT | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:NO_VISION
+F:REMEMBER
+F:SUPPORT_LIGHT
 D:0:Looks like this wall is not so real.
 
 # Grass roof
 N:190:Grass roof
 G:#:y
-F:WALL | NO_WALK | NO_VISION | PERMANENT | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 
 # grass roof top
 N:191:grass roof top
 G:#:y
-F:WALL | NO_WALK | NO_VISION | PERMANENT | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 
 # grass roof chimney
 N:192:grass roof chimney
 G:#:y
-F:WALL | NO_WALK | NO_VISION | PERMANENT | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 
 # brick roof
 N:193:brick roof
 G:#:r
-F:WALL | NO_WALK | NO_VISION | PERMANENT | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 
 # brick roof top
 N:194:brick roof top
 G:#:r
-F:WALL | NO_WALK | NO_VISION | PERMANENT | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 
 # brick roof chimney
 N:195:brick roof chimney
 G:#:r
-F:WALL | NO_WALK | NO_VISION | PERMANENT | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 
 # window
 N:196:window
 G:#:w
-F:WALL | NO_WALK | NO_VISION | PERMANENT | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 
 # small window
 N:197:small window
 G:#:w
-F:WALL | NO_WALK | NO_VISION | PERMANENT | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 
 # rain barrel
 N:198:rain barrel
 G:#:w
-F:WALL | NO_WALK | NO_VISION | PERMANENT | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 
 # grass with flowers
 N:199:grass with flowers
 G:;:G
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
 
 # cobblestone road
 N:200:cobblestone road
 G:.:w
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 
 # cobblestone with outlet
 N:201:cobblestone with outlet
 G:.:w
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 
 N:202:small tree
 G:#:g
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN | SUPPORT_LIGHT | REMEMBER
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:NO_VISION
+F:REMEMBER
+F:SUPPORT_LIGHT
 
 # Just to have a town entrance picture
 N:203:town
 G:*:w
-F:FLOOR | NOTICE
+F:FLOOR
+F:NOTICE
 
 # Underground Tunnel
 N:204:Underground Tunnel
 G:^:U
-F:FLOOR | REMEMBER | SUPPORT_LIGHT | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:REMEMBER
+F:SUPPORT_LIGHT
 D:0:Oh, an underground tunnel!
 
 # Fire
@@ -856,58 +1297,92 @@ S:y:y:y:R:r:y:R
 E:-1d2:1:FIRE
 D:0:The blazing fire burns you!
 F:ATTR_MULTI
-F:FLOOR | CAN_FLY | REMEMBER | SUPPORT_LIGHT
+F:CAN_FLY
 F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:REMEMBER
+F:SUPPORT_LIGHT
 
 # Permanent rubble -- town use
 N:206:pile of rubble
 G:::w
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE
-F:CAN_FLY | SUPPORT_LIGHT | PERMANENT
+F:CAN_FLY
+F:CAN_PASS
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 D:1:Looks like this pile of rubble is quite hard.
 
 # Rocky ground - rougher terrain.
 N:207:rocky ground
 G:.:s
-F:FLOOR | SUPPORT_LIGHT | CAN_RUN
+F:CAN_RUN
 F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:SUPPORT_LIGHT
 
 # cloud-like vapour. Floor for Eru's temple
 N:208:cloud-like vapour
 G:.:W
 S:W:B:B:W:w:W:B
-F:FLOOR | CAN_LEVITATE | CAN_FLY | SUPPORT_LIGHT 
-F:ATTR_MULTI | CAN_RUN | DONT_NOTICE_RUNNING
+F:ATTR_MULTI
+F:CAN_FLY
+F:CAN_LEVITATE
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:SUPPORT_LIGHT
 
 # condensing water
 N:209:condensing water
 G:~:B
 S:B:B:B:B:B:B:b
 F:ATTR_MULTI
-F:FLOOR | CAN_LEVITATE | CAN_FLY | REMEMBER | SUPPORT_LIGHT | CAN_RUN
+F:CAN_FLY
+F:CAN_LEVITATE
+F:CAN_RUN
 F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:REMEMBER
+F:SUPPORT_LIGHT
 
 # Dense mist. Can pass through, but not see through
 N:210:dense mist
 G:#:w
 S:w:W:s:s:s:w:w
-F:FLOOR | NO_VISION | REMEMBER | SUPPORT_LIGHT
-F:ATTR_MULTI | DONT_NOTICE_RUNNING
+F:ATTR_MULTI
+F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:NO_VISION
+F:REMEMBER
+F:SUPPORT_LIGHT
 D:0:You wander through the mist.
 D:1:You cannot tunnel through mist!
 
 # Hail-stone wall
 N:211:hail-stone wall
 G:#:W
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the hail-stone wall.
 
 N:212:dead small tree
 G:#:D
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN | SUPPORT_LIGHT | REMEMBER
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:NO_VISION
+F:REMEMBER
+F:SUPPORT_LIGHT
 
 
 # New features for the Maps of Lord Dimwit
@@ -915,27 +1390,46 @@ F:NO_VISION
 N:213:copper pillar
 G:#:u
 S:u:u:u:o:u:u:u
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | SUPPORT_LIGHT
-F:DONT_NOTICE_RUNNING | ATTR_MULTI
+F:ATTR_MULTI
+F:CAN_PASS
+F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
+F:WALL
 D:1:The copper is too tough to tunnel through.
 D:2:a copper pillar blocking your way
 
 N:214:ethereal wall
 G:.:w
-F:WALL | NO_WALK | PERMANENT | NOTICE | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_WALK
+F:PERMANENT
+F:WALL
 D:1:You can't even see your obstruction!
 D:2:an unseen force blocking your way
 
 N:215:glacial wall
 G:#:B
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | SUPPORT_LIGHT
-F:DONT_NOTICE_RUNNING | TUNNELABLE
+F:CAN_PASS
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
+F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the glacial wall... #BOh chilly#w.
 D:2:a hard glacial wall blocking your way
 
 N:216:battlement
 G:#:w
-F:NO_WALK | CAN_PASS | NOTICE | SUPPORT_LIGHT
-F:DONT_NOTICE_RUNNING | TUNNELABLE
+F:CAN_PASS
+F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_WALK
+F:SUPPORT_LIGHT
+F:TUNNELABLE
 D:1:You tunnel into the battlement.
 D:2:a hard stone battlement blocking your way
diff --git a/lib/edit/k_info.txt b/lib/edit/k_info.txt
index aba86074..1f97827b 100644
--- a/lib/edit/k_info.txt
+++ b/lib/edit/k_info.txt
@@ -20,11 +20,6 @@
 # Note that object zero is used for the "stack" picture (unused).
 
 
-# Version stamp (required)
-
-V:2.0.0
-
-
 ##### Something special #####
 
 N:0:something
@@ -271,7 +266,8 @@ N:29:& Blue Stone~
 G:":B
 I:40:18:0
 W:60:0:3:90000
-F:INSTA_ART | SPECIAL_GENE
+F:INSTA_ART
+F:SPECIAL_GENE
 
 ##### Edged Weapons #####
 
@@ -290,7 +286,8 @@ I:23:21:0
 W:15:0:140:350
 A:15/1
 P:0:3d4:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:This is a long, double-edged sword with a plain hilt that could
 D:be wielded in one or two hands. It's called a "bastard sword" because in
@@ -345,8 +342,11 @@ W:70:0:180:4000
 A:70/8
 P:0:6d5:0:0:0
 F:ATTR_MULTI
-F:RES_CHAOS | CHAOTIC | SHOW_MODS
-f:RES_CHAOS | CHAOTIC
+F:CHAOTIC
+F:RES_CHAOS
+F:SHOW_MODS
+f:CHAOTIC
+f:RES_CHAOS
 D:A mighty sword which seems to be completely blunt. However, it is a conduit
 D:into the realms of pure chaos and strikes its victims with the devastating
 D:might of chaos itself whenever it connects. It gives you resistance to chaos
@@ -359,7 +359,8 @@ I:23:25:0
 W:30:0:200:775
 A:30/1:40/1
 P:0:3d6:0:0:0
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 f:MUST2H
 D:This blade is lot longer, wider and heavier than a long sword. You have to
 D:wield it with two hands. This means that wielding a shield makes fighting
@@ -393,7 +394,8 @@ I:23:28:0
 W:40:0:260:850
 A:40/1
 P:0:4d5:0:0:0
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 f:MUST2H
 D:These weapons have been built in all sizes. They are custom-made
 D:for warriors that want to set out and kill their archenemy. These
@@ -405,7 +407,8 @@ I:23:20:0
 W:20:0:120:400
 A:20/1
 P:0:3d4:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:The katana is a long blade with only a small disk for a guard.
 D:Its hilt is long enough for two hands, though it could be used
@@ -485,7 +488,8 @@ I:21:6:0
 W:20:0:150:200
 A:20/1
 P:0:2d4:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:This weapon has a ball linked with a chain to a wooden handle.
 D:Preferred tactic is smashing the brains of your opponent.
@@ -507,7 +511,8 @@ I:21:13:0
 W:10:0:150:353
 A:10/1
 P:0:2d6:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:This weapon was originally used to cut corn. More warlike versions
 D:sport a large blade stuck on a wooden handle. The hinge allows it to get
@@ -519,7 +524,8 @@ I:21:18:0
 W:45:0:280:590
 A:45/1
 P:0:3d6:0:0:0
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 f:MUST2H
 D:This two-handed version of the flail gives the fighter a fearsome
 D:weapon that can do a fair amount of damage.  It typically has several
@@ -541,7 +547,8 @@ I:21:5:0
 W:5:0:120:130
 A:5/1
 P:0:2d4:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:This weapon is a club ending in a sphere. The sphere is studded
 D:with metal shards, and thus can both crush and cut your adversary.
@@ -552,7 +559,8 @@ I:21:3:0
 W:10:0:150:200
 A:10/1
 P:0:1d9:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:A long, wooden pole, usually the height of the wielder. Four of them can be
 D:made out of the trunk of one young tree, hence the name. The quarterstaff
@@ -566,7 +574,8 @@ I:21:8:0
 W:5:0:120:225
 A:5/1
 P:0:3d3:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:A large hammer, designed to crush skulls with mighty strikes.
 
@@ -576,7 +585,8 @@ I:21:15:0
 W:15:0:180:502
 A:15/1
 P:0:3d4:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:A large, mean mace filled with lead in order to wreak a maximum of havoc.
 
@@ -586,8 +596,11 @@ I:21:20:0
 W:80:0:400:4300
 A:80/5
 P:0:5d8:0:0:0
-F:SLAY_UNDEAD | SHOW_MODS | MUST2H
-f:MUST2H | SLAY_UNDEAD
+F:MUST2H
+F:SHOW_MODS
+F:SLAY_UNDEAD
+f:MUST2H
+f:SLAY_UNDEAD
 D:This mace is custom-made for priests that go out to destroy evil.
 D:It is deadly, especially for undead.
 
@@ -597,7 +610,8 @@ I:21:10:0
 W:10:0:120:376
 A:10/1
 P:0:2d5:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:A war hammer combined with a spearpoint, mounted on a long pole.
 
@@ -609,7 +623,8 @@ I:22:10:0
 W:15:0:180:408
 A:15/1
 P:0:2d6:0:0:0
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 f:MUST2H
 D:This polearm has a beak mounted opposite the blade.
 
@@ -619,7 +634,8 @@ I:22:13:0
 W:20:0:190:363
 A:20/1
 P:0:2d6:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:A polearm with a long, slightly curved knife-like blade. It has spurs on
 D:the dull side of the blade. It's primarily a slashing and chopping weapon. Glaives
@@ -633,7 +649,8 @@ I:22:15:0
 W:25:0:190:430
 A:25/1
 P:0:3d5:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:The halberd has a broad, short axe blade on a 5 - 6ft long haft, with a
 D:spearpoint at the top, often a back-spike and occasionally a butt-spike. Used to
@@ -649,7 +666,8 @@ I:22:4:0
 W:10:0:160:340
 A:10/1
 P:0:1d8:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:This is a polearm with a long square-sectioned spike on the end.
 
@@ -659,7 +677,8 @@ I:22:8:0
 W:15:0:160:358
 A:15/1
 P:0:2d5:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:A staff, 16-18 feet long, that has a small piercing head about 10 inches
 D:long. The pike is often used by infantry to fend off cavalry.  It is very
@@ -684,7 +703,8 @@ I:22:5:0
 W:5:0:70:120
 A:5/1
 P:0:1d8:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:The trident is based on the pitchfork.  In fact, when not used as a weapon,
 D:it is often employed as a pitchfork. It is famous for its uses in
@@ -697,7 +717,8 @@ I:22:20:0
 W:10:0:300:230
 A:10/1
 P:0:2d8:0:0:0
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 f:MUST2H
 D:This is the original polearm. It is shaped like a spear but is bigger. It's
 D:meant to fend off enemies, not to be thrown.
@@ -708,7 +729,8 @@ I:24:25:0
 W:40:0:230:500
 A:40/1
 P:0:4d4:0:0:0
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 f:MUST2H
 D:A huge and heavy two-headed axe.
 
@@ -718,7 +740,8 @@ I:22:22:0
 W:15:0:170:334
 A:15/1
 P:0:2d8:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:Nordic polearm with a broad blade and a hook mounted on the end of the shaft.
 D:The Nordics' take on the halberd. The polearm of choice for many Nordics,
@@ -730,7 +753,8 @@ I:22:28:0
 W:45:0:250:750
 A:45/1
 P:0:3d8:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:Nordic polearm with a broad blade and a hook mounted on the end of the shaft.
 D:A Nordic version of the halberd. The polearm of choice for many Nordics,
@@ -742,7 +766,8 @@ I:24:11:0
 W:15:0:160:304
 A:15/1
 P:0:2d6:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:A one-headed axe made for combat, with an elongated moon-shaped blade.
 
@@ -752,7 +777,8 @@ I:22:17:0
 W:45:0:250:800
 A:45/1
 P:0:5d3:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:A simple farm implement, converted into a weapon by slightly straightening
 D:its blade and putting it in line with its pole, instead of the typical
@@ -764,8 +790,13 @@ I:22:30:0
 W:80:0:250:10000
 A:80/20
 P:0:8d4:0:0:0
-F:SHOW_MODS | MUST2H | WOUNDING | VORPAL
-f:MUST2H | VORPAL | WOUNDING
+F:MUST2H
+F:SHOW_MODS
+F:VORPAL
+F:WOUNDING
+f:MUST2H
+f:VORPAL
+f:WOUNDING
 D:The simple design of the war scythe, but this one uses a finely crafted and
 D:incredibly sharp steel blade which causes terrible wounds when it hits.
 
@@ -957,8 +988,12 @@ I:35:2:0
 W:30:0:5:1500
 A:30/4
 P:4:0d0:0:0:4
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_FIRE | IGNORE_ELEC
-F:STEALTH | SEARCH | LUCK
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:LUCK
+F:STEALTH
 f:STEALTH
 D:A wonderfully light cloak coloured in brown and green hues. Its colouring
 D:greatly helps the wearer to avoid undesired attention. Wearing it makes you
@@ -1271,7 +1306,9 @@ I:35:6:1
 W:60:0:5:7500
 A:75/4
 P:6:0d0:0:0:4
-F:RES_DARK | RES_LITE | STEALTH
+F:RES_DARK
+F:RES_LITE
+F:STEALTH
 f:STEALTH
 D:A rare cloak imbued with magic to radiate a strange twilight, absorbing both
 D:extreme brightness and darkness.
@@ -1349,7 +1386,8 @@ G:=:d
 I:45:24:0
 W:30:0:2:500
 A:30/1
-F:STR | HIDE_TYPE
+F:HIDE_TYPE
+F:STR
 f:STR
 D:This bauble magically improves your strength.
 
@@ -1358,7 +1396,8 @@ G:=:d
 I:45:26:0
 W:30:0:2:500
 A:30/1
-F:DEX | HIDE_TYPE
+F:DEX
+F:HIDE_TYPE
 f:DEX
 D:This piece of jewellery magically improves your agility.
 
@@ -1367,7 +1406,8 @@ G:=:d
 I:45:27:0
 W:30:0:2:500
 A:30/1
-F:CON | HIDE_TYPE
+F:CON
+F:HIDE_TYPE
 f:CON
 D:This ring magically grants you health, improving your constitution.
 
@@ -1376,7 +1416,8 @@ G:=:d
 I:45:25:0
 W:30:0:2:500
 A:30/1
-F:INT | HIDE_TYPE
+F:HIDE_TYPE
+F:INT
 f:INT
 D:This magical piece of jewellery makes you smarter.
 
@@ -1385,27 +1426,22 @@ G:=:d
 I:45:31:0
 W:75:0:2:100000
 A:75/1
-F:SPEED | HIDE_TYPE
+F:HIDE_TYPE
+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:SEARCH | HIDE_TYPE
-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
 I:45:4:0
 W:5:0:2:250
 A:5/1
-a:HARDCORE=DEST_TELE
-F:CURSED | TELEPORT | EASY_KNOW | ACTIVATE
+a:DEST_TELE
+F:ACTIVATE
+F:CURSED
+F:EASY_KNOW
+F:TELEPORT
 f:TELEPORT
 D:This ring will uncontrollably send you to different places at its whim.
 D:You can use its power once at your will, but it will destroy the ring.
@@ -1415,7 +1451,8 @@ G:=:d
 I:45:6:0
 W:5:0:2:250
 A:5/1
-F:SLOW_DIGEST | EASY_KNOW
+F:EASY_KNOW
+F:SLOW_DIGEST
 f:SLOW_DIGEST
 D:This magical bauble grants you some sustenance, allowing you to subsist on less food.
 
@@ -1424,7 +1461,9 @@ G:=:d
 I:45:8:0
 W:10:0:2:250
 A:10/1
-F:RES_FIRE | IGNORE_FIRE | EASY_KNOW
+F:EASY_KNOW
+F:IGNORE_FIRE
+F:RES_FIRE
 f:RES_FIRE
 D:This piece of jewellery grants you some protection from the burning heat of fire.
 
@@ -1433,7 +1472,9 @@ G:=:d
 I:45:9:0
 W:10:0:2:250
 A:10/1
-F:RES_COLD | IGNORE_COLD | EASY_KNOW
+F:EASY_KNOW
+F:IGNORE_COLD
+F:RES_COLD
 f:RES_COLD
 D:This piece of jewellery grants you some protection from the chilling forces of cold.
 
@@ -1442,7 +1483,8 @@ G:=:d
 I:45:7:0
 W:5:0:2:200
 A:5/1
-F:FEATHER | EASY_KNOW
+F:EASY_KNOW
+F:FEATHER
 f:FEATHER
 D:When you put on this ring, you will be able to float just above the floor.
 D:It prevents you from drowning, and all your falls will be painless.
@@ -1452,7 +1494,8 @@ G:=:d
 I:45:20:0
 W:60:0:2:16000
 A:60/2
-F:RES_POIS | EASY_KNOW
+F:EASY_KNOW
+F:RES_POIS
 f:RES_POIS
 D:This magical ring grants protection from poison.
 D:It is rumoured that in deep dungeons monsters can kill you at once if you
@@ -1463,7 +1506,8 @@ G:=:d
 I:45:21:0
 W:20:0:2:1500
 A:20/1
-F:FREE_ACT | EASY_KNOW
+F:EASY_KNOW
+F:FREE_ACT
 f:FREE_ACT
 D:This magical bauble prevents you from being held.
 D:Some monsters will paralyse you and then kill you if you lack free action.
@@ -1473,7 +1517,9 @@ G:=:d
 I:45:2:-5
 W:5:0:2:0
 A:5/1
-F:CURSED | STR | HIDE_TYPE
+F:CURSED
+F:HIDE_TYPE
+F:STR
 f:STR
 D:This accursed ring will sap your strength, rendering you much weaker as long as you wear it.
 
@@ -1483,8 +1529,10 @@ I:45:18:0
 W:50:0:2:3000
 A:50/1
 P:0:0d0:0:0:15
-a:HARDCORE=BA_FIRE_4
-F:RES_FIRE | IGNORE_FIRE | ACTIVATE
+a:BA_FIRE_4
+F:ACTIVATE
+F:IGNORE_FIRE
+F:RES_FIRE
 f:RES_FIRE
 D:This fiery circlet grants you protection, makes fire less dangerous and even
 D:allows you to call forth a ball of flame.
@@ -1495,8 +1543,10 @@ I:45:17:0
 W:50:0:2:3000
 A:50/1
 P:0:0d0:0:0:15
-a:HARDCORE=BA_ACID_4
-F:RES_ACID | IGNORE_ACID | ACTIVATE
+a:BA_ACID_4
+F:ACTIVATE
+F:IGNORE_ACID
+F:RES_ACID
 f:RES_ACID
 D:This magical ring is imbued with spells of devouring acid, granting protection against such
 D:assaults and the ability to shoot acid at your foes.
@@ -1506,9 +1556,11 @@ G:=:d
 I:45:19:0
 W:50:0:2:3000
 A:50/1
-a:HARDCORE=BA_COLD_4
+a:BA_COLD_4
 P:0:0d0:0:0:15
-F:RES_COLD | IGNORE_COLD | ACTIVATE
+F:ACTIVATE
+F:IGNORE_COLD
+F:RES_COLD
 f:RES_COLD
 D:This ring is imbued with supernatural cold, which makes you less vulnerable to such effects
 D:and occasionally allows you to throw balls of ice at your foes.
@@ -1518,7 +1570,12 @@ G:=:d
 I:45:0:-5
 W:50:0:2:0
 A:50/1
-F:CURSED | TELEPORT | WIS | CHR | HIDE_TYPE | AUTO_CURSE
+F:AUTO_CURSE
+F:CHR
+F:CURSED
+F:HIDE_TYPE
+F:TELEPORT
+F:WIS
 D:This accursed ring will turn you into a bumbling fool and, in addition, magically
 D:transports you to places you never wanted to see. It can recurse itself if
 D:you leave it on too long.
@@ -1528,7 +1585,9 @@ G:=:d
 I:45:3:-5
 W:5:0:2:0
 A:5/1
-F:CURSED | INT | HIDE_TYPE
+F:CURSED
+F:HIDE_TYPE
+F:INT
 f:INT
 D:This wicked ring feeds off your intellect, magically making you stupid.
 
@@ -1561,7 +1620,10 @@ G:=:d
 I:45:1:0
 W:5:0:2:0
 A:5/1
-F:CURSED | AGGRAVATE | EASY_KNOW | AUTO_CURSE
+F:AGGRAVATE
+F:AUTO_CURSE
+F:CURSED
+F:EASY_KNOW
 f:AGGRAVATE
 D:This faithless ring will draw opponents' attention towards its hapless owner.
 
@@ -1570,7 +1632,8 @@ G:=:d
 I:45:22:0
 W:30:0:2:340
 A:30/1
-F:SEE_INVIS | EASY_KNOW
+F:EASY_KNOW
+F:SEE_INVIS
 f:SEE_INVIS
 D:This magical piece of jewellery allows your eyes to perceive beings otherwise unseen.
 
@@ -1579,7 +1642,8 @@ G:=:d
 I:45:10:0
 W:20:0:2:400
 A:20/1
-F:SUST_STR | EASY_KNOW
+F:EASY_KNOW
+F:SUST_STR
 f:SUST_STR
 D:This magical bauble protects your physical force against attacks attempting to drain it.
 
@@ -1588,7 +1652,8 @@ G:=:d
 I:45:11:0
 W:20:0:2:400
 A:20/1
-F:SUST_INT | EASY_KNOW
+F:EASY_KNOW
+F:SUST_INT
 f:SUST_INT
 D:This magical ring protects your intellect against attempts to lower it.
 
@@ -1597,7 +1662,8 @@ G:=:d
 I:45:12:0
 W:20:0:2:400
 A:20/1
-F:SUST_WIS | EASY_KNOW
+F:EASY_KNOW
+F:SUST_WIS
 f:SUST_WIS
 D:This magical ring protects you from attempts to make you more foolish.
 
@@ -1606,7 +1672,8 @@ G:=:d
 I:45:13:0
 W:20:0:2:400
 A:20/1
-F:SUST_CON | EASY_KNOW
+F:EASY_KNOW
+F:SUST_CON
 f:SUST_CON
 D:This magical ring protects your health, making it impossible for your opponents to lower it.
 
@@ -1615,7 +1682,8 @@ G:=:d
 I:45:14:0
 W:20:0:2:400
 A:20/1
-F:SUST_DEX | EASY_KNOW
+F:EASY_KNOW
+F:SUST_DEX
 f:SUST_DEX
 D:This magical ring protects your nerves, so that you will never become clumsy.
 
@@ -1624,7 +1692,8 @@ G:=:d
 I:45:15:0
 W:20:0:2:400
 A:20/1
-F:SUST_CHR | EASY_KNOW
+F:EASY_KNOW
+F:SUST_CHR
 f:SUST_CHR
 D:This ring magically protects your beauty and charm from attempts to make you ugly.
 
@@ -1643,7 +1712,10 @@ G:":d
 I:40:6:0
 W:50:0:3:1000
 A:50/4
-F:INT | WIS | HIDE_TYPE | LITE1
+F:HIDE_TYPE
+F:INT
+F:LITE1
+F:WIS
 D:This talisman grants a sharper wit, greater insight and brightness to light dark places.
 
 N:164:Charisma
@@ -1651,25 +1723,19 @@ G:":d
 I:40:7:0
 W:30:0:3:500
 A:30/1
-F:CHR | HIDE_TYPE
+F:CHR
+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:SEARCH | HIDE_TYPE
-f:SEARCH
-D:This amulet grants keen sight, finding things that are hidden.
-
 N:166:Teleportation
 G:":d
 I:40:1:0
 W:10:0:3:250
 A:10/1
-F:CURSED | TELEPORT | EASY_KNOW
+F:CURSED
+F:EASY_KNOW
+F:TELEPORT
 f:TELEPORT
 D:This amulet nastily throws you all over the place.
 
@@ -1678,7 +1744,8 @@ G:":d
 I:40:3:0
 W:15:0:3:200
 A:15/1
-F:SLOW_DIGEST | EASY_KNOW
+F:EASY_KNOW
+F:SLOW_DIGEST
 f:SLOW_DIGEST
 D:This talisman will make you hungry less quickly when worn.
 
@@ -1687,18 +1754,12 @@ G:":d
 I:40:4:0
 W:10:0:3:250
 A:10/1
-F:RES_ACID | IGNORE_ACID | EASY_KNOW
+F:EASY_KNOW
+F:IGNORE_ACID
+F:RES_ACID
 f:RES_ACID
 D:This magical talisman will make the corroding forces of acid less threatening to your health.
 
-N:169:Adornment
-G:":d
-I:40:2:0
-W:10:0:3:20
-A:10/1
-F:EASY_KNOW
-D:This amulet is not magical. It just looks good.
-
 ##### Extra armour #####
 
 N:170:& Double Ring Mail~
@@ -1718,9 +1779,17 @@ I:40:8:0
 W:70:0:3:30000
 A:70/8
 P:0:0d0:-4:-4:0
-F:INT | SUST_INT | SEARCH | SPELL_CONTAIN | WIELD_CAST
-F:FREE_ACT | RES_BLIND | RES_CONF |
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:FREE_ACT
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:INT
+F:RES_BLIND
+F:RES_CONF
+F:SPELL_CONTAIN
+F:SUST_INT
+F:WIELD_CAST
 D:This rare amulet is highly desirable for mages, as it makes its wearer smarter, more attentive
 D:and impervious to magics which would make their own magic-use impossible.
 
@@ -1729,8 +1798,16 @@ G:":d
 I:40:0:-5
 W:50:0:3:0
 A:50/1
-F:CURSED | STR | INT | WIS | DEX | CON | CHR | HIDE_TYPE
-F:AUTO_CURSE | CURSE_NO_DROP
+F:AUTO_CURSE
+F:CHR
+F:CON
+F:CURSED
+F:CURSE_NO_DROP
+F:DEX
+F:HIDE_TYPE
+F:INT
+F:STR
+F:WIS
 D:This wicked amulet will drain all your abilities, turning you into a mere shadow of yourself. It
 D:is exceedingly hard to get rid of.
 
@@ -1791,7 +1868,10 @@ G:?:d
 I:70:50:0
 W:100:0:5:10000
 A:100/8
-F:IGNORE_FIRE | IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:A piece of paper inscribed with strange shifting runes. Upon reading them, they will release
 D:a blast of chaotic forces.
 
@@ -1905,14 +1985,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~
@@ -1931,7 +2003,8 @@ I:16:2:0
 W:40:0:4:20
 A:40/2:65/1
 P:0:3d4:5:5:0
-F:SHOW_MODS | IGNORE_ACID
+F:IGNORE_ACID
+F:SHOW_MODS
 D:Sling bullets made from the slags of mithril smelting. They are unusually heavy, hitting
 D:with great force, and are almost imperishable.
 
@@ -1984,22 +2057,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
@@ -2567,8 +2624,11 @@ I:71:60:100
 W:20:0:4:250
 A:20/1:45/1:80/1:100/1
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
 F:FOUNTAIN
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This great potion infuses you with the power of the elements, so that you can better
 D:withstand their ravages.
 
@@ -2775,9 +2835,13 @@ W:127:0:4:0
 A:127/255
 P:0:1d1:0:0:0
 T:39:2
-F:NORM_ART | FULL_NAME | SPECIAL_GENE
-F:ACTIVATE | ACTIVATE_NO_WIELD
-a:SPELL=Artifact Eternal Flame
+F:ACTIVATE
+F:ACTIVATE_NO_WIELD
+F:EASY_USE
+F:FULL_NAME
+F:NORM_ART
+F:SPECIAL_GENE
+a:ETERNAL_FLAME
 D:An impossibly bright, flickering living flame. It can be used
 D:once to imbue an object with the power of Eru Iluvatar himself.
 
@@ -2787,7 +2851,9 @@ I:23:34:0
 W:0:0:7:10
 A:0/1:5/1:10/1:20/1
 P:0:1d4:0:0:0
-F:SHOW_MODS | VAMPIRIC | SPECIAL_GENE
+F:SHOW_MODS
+F:SPECIAL_GENE
+F:VAMPIRIC
 D:This looks like some animal's teeth or at least you think
 D:it comes from an animal...
 
@@ -2799,7 +2865,12 @@ W:50:10:10:12000
 P:0:1d4:0:0:0
 A:50/200
 T:55:8
-F:NO_RECHARGE | EASY_USE | RECHARGED | NORM_ART | FULL_NAME | SPECIAL_GENE
+F:EASY_USE
+F:FULL_NAME
+F:NORM_ART
+F:NO_RECHARGE
+F:RECHARGED
+F:SPECIAL_GENE
 D:This horn was given to you as a reward. Blow it if you are in dire need
 D:of leaving your current location fast.
 
@@ -2857,13 +2928,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
@@ -2975,7 +3039,8 @@ I:111:0:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:The bright blue cover of this tome seems to glow
 D:with an inner violet light. You feel more attuned
 D:to raw magic as you hold it.
@@ -2986,7 +3051,9 @@ I:111:1:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW | IGNORE_FIRE
+F:EASY_KNOW
+F:FULL_NAME
+F:IGNORE_FIRE
 D:The cover of this tome is bright red, with flickering
 D:flames dancing across it once in a while. As you hold
 D:it, you begin to gain a much closer knowledge of all
@@ -2998,7 +3065,9 @@ I:111:2:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW | IGNORE_ELEC
+F:EASY_KNOW
+F:FULL_NAME
+F:IGNORE_ELEC
 D:The pages of this tome have a tendency to turn themselves,
 D:as though flipped by an errant wind. As you hold it,
 D:you start feeling wind at your fingertips.
@@ -3009,7 +3078,9 @@ I:111:3:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW | IGNORE_ACID
+F:EASY_KNOW
+F:FULL_NAME
+F:IGNORE_ACID
 D:The solid leather cover of this tome seems permanently
 D:stained with caked mud and grass. Heavy it is to lift,
 D:yet strangely comforting to hold - you feel stronger
@@ -3021,7 +3092,8 @@ I:111:4:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:The cover and pages of this tome seem to be perpetually
 D:wet, though they are not wet to the touch. As you hold
 D:it, you begin to understand ocean storms better.
@@ -3032,7 +3104,8 @@ I:111:5:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:This book seems to flicker strangely. It's one of those books
 D:with an annoying tendency to disappear when you need it and
 D:reappear in the unlikeliest places. As you hold it, you start
@@ -3044,7 +3117,8 @@ I:111:6:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:The cover of this tome is a bright shade of green, and it gives off
 D:a healthy, zesty scent that makes your thoughts clearer. As you
 D:hold it, your heart goes out to all living things upon Arda.
@@ -3055,7 +3129,8 @@ I:111:7:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 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.
@@ -3134,8 +3209,11 @@ I:39:0:0:4000
 W:1:0:30:2
 A:1/1
 P:0:1d1:0:0:0
-F:EASY_KNOW | LITE1 | FUEL_LITE
-f:LITE1 | FUEL_LITE
+F:EASY_KNOW
+F:FUEL_LITE
+F:LITE1
+f:FUEL_LITE
+f:LITE1
 D:A piece of wood with an oily rag wrapped around it. When lit, it will give off a little light and
 D:much smoke.
 
@@ -3145,8 +3223,12 @@ I:39:1:0:7500
 W:3:0:50:35
 A:3/1
 P:0:1d1:0:0:0
-F:EASY_KNOW | IGNORE_FIRE | LITE2 | FUEL_LITE
-f:LITE2 | FUEL_LITE
+F:EASY_KNOW
+F:FUEL_LITE
+F:IGNORE_FIRE
+F:LITE2
+f:FUEL_LITE
+f:LITE2
 D:A brass container with a wick emerging from it, protected from draughts by a sheet of greased
 D:paper. It can be carried by a handle.
 
@@ -3187,22 +3269,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:353:Probing
-G:-:d
-I:66:7:50
-W:40:0:15:4000
-A:40/4
-P:0:1d1:0:0:0
-D:A rod of knowledge which will tell you about nearby creatures' health.
-
 N:354:Recall
 G:-:d
 I:66:3:80
@@ -3292,14 +3358,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
@@ -3404,7 +3462,8 @@ G:=:d
 I:45:58:0
 W:10:0:2:1000
 A:10/1
-F:SPELL_CONTAIN | WIELD_CAST
+F:SPELL_CONTAIN
+F:WIELD_CAST
 f:SPELL_CONTAIN
 D:This ring is a container for spells. Those that are skilled in copying spells can inscribe a
 D:spell into it.
@@ -3416,7 +3475,8 @@ G:":d
 I:40:27:0
 W:10:0:2:1000
 A:10/1
-F:SPELL_CONTAIN | WIELD_CAST
+F:SPELL_CONTAIN
+F:WIELD_CAST
 f:SPELL_CONTAIN
 D:This amulet is a container for spells. Those that are skilled in copying spells can inscribe a
 D:spell into it.
@@ -3518,10 +3578,15 @@ I:38:1:0
 W:60:0:200:50000
 A:60/8
 P:30:2d4:-2:0:10
-a:HARDCORE=BR_ACID
-F:RES_ACID | FLY |
-f:RES_ACID |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+a:BR_ACID
+F:ACTIVATE
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_ACID
+f:RES_ACID
 D:An armour made of a black dragon's hide, containing some of this beast's powers.
 
 N:401:& Blue Dragon Scale Mail~
@@ -3530,10 +3595,15 @@ I:38:2:0
 W:50:0:200:40000
 A:50/8
 P:30:2d4:-2:0:10
-a:HARDCORE=BR_ELEC
-F:RES_ELEC | FLY |
-f:RES_ELEC |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+a:BR_ELEC
+F:ACTIVATE
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_ELEC
+f:RES_ELEC
 D:A piece of dragon hide fashioned into an armour, shimmering bright blue.
 
 N:402:& White Dragon Scale Mail~
@@ -3541,11 +3611,16 @@ G:[:w
 I:38:3:0
 W:50:0:200:40000
 A:50/8
-a:HARDCORE=BR_COLD
+a:BR_COLD
 P:30:2d4:-2:0:10
-F:RES_COLD | FLY |
-f:RES_COLD |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:ACTIVATE
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_COLD
+f:RES_COLD
 D:An armour fashioned from dragon hide, glistening the white of snow.
 
 N:403:& Red Dragon Scale Mail~
@@ -3554,10 +3629,15 @@ I:38:4:0
 W:60:0:200:50000
 A:60/8
 P:30:2d4:-2:0:10
-a:HARDCORE=BR_FIRE
-F:RES_FIRE | FLY |
-f:RES_FIRE |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+a:BR_FIRE
+F:ACTIVATE
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_FIRE
+f:RES_FIRE
 D:The skin of a dragon made into a suit of armour. It glows a bright red and radiates heat.
 
 N:404:& Green Dragon Scale Mail~
@@ -3566,10 +3646,15 @@ I:38:5:0
 W:50:0:200:40000
 A:50/8
 P:30:2d4:-2:0:10
-a:HARDCORE=BR_POIS
-F:RES_POIS | FLY |
-f:RES_POIS |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+a:BR_POIS
+F:ACTIVATE
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_POIS
+f:RES_POIS
 D:A suit of armour fashioned of dragon hide. It is dirty green and smells awful.
 
 N:405:& Multi-Hued Dragon Scale Mail~
@@ -3578,11 +3663,24 @@ I:38:6:0
 W:90:0:200:150000
 A:90/32
 P:30:2d4:-2:0:10
-a:HARDCORE=BR_MANY
+a:BR_MANY
+F:ACTIVATE
 F:ATTR_MULTI
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_POIS | FLY |
-f:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_POIS |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_POIS
+f:RES_ACID
+f:RES_COLD
+f:RES_ELEC
+f:RES_FIRE
+f:RES_POIS
 D:A powerful armour made of dragonhide. It glows red, blue, green, black and white.
 
 N:406:& Pseudo Dragon Scale Mail~
@@ -3591,9 +3689,15 @@ I:38:10:0
 W:70:0:200:70000
 A:70/16
 P:30:2d4:-2:0:10
-a:HARDCORE=BR_LIGHT
-F:RES_LITE | RES_DARK | FLY |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+a:BR_LIGHT
+F:ACTIVATE
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_DARK
+F:RES_LITE
 D:A suit of armour made of dragon hide, glowing with a strange light, or is it darkness?
 
 N:407:& Law Dragon Scale Mail~
@@ -3602,9 +3706,15 @@ I:38:12:0
 W:80:0:200:80000
 A:80/16
 P:30:2d4:-2:0:10
-a:HARDCORE=BR_SHARD
-F:RES_SOUND | RES_SHARDS | FLY |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+a:BR_SHARD
+F:ACTIVATE
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_SHARDS
+F:RES_SOUND
 D:A piece of dragonhide cut and shaped so it can be worn as armour. The scales are very sharp,
 D:and the roaring of a storm seems to come from it, but you're not afraid of either.
 
@@ -3614,9 +3724,14 @@ I:38:14:0
 W:50:0:200:40000
 A:50/8
 P:30:2d4:-2:0:10
-a:HARDCORE=BR_CONF
-F:RES_CONF | FLY |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+a:BR_CONF
+F:ACTIVATE
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_CONF
 D:A suit of armour made from dragon skin. Its brownish scales glitter in a dazzling light.
 
 N:409:& Gold Dragon Scale Mail~
@@ -3625,9 +3740,14 @@ I:38:16:0
 W:60:0:200:50000
 A:60/8
 P:30:2d4:-2:0:10
-a:HARDCORE=BR_SOUND
-F:RES_SOUND | FLY |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+a:BR_SOUND
+F:ACTIVATE
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_SOUND
 D:A suit of golden-hued armour made of dragonhide. The rustle of its scales occasionally
 D:increases to a loud boom.
 
@@ -3637,11 +3757,17 @@ I:38:18:0
 W:80:0:200:80000
 A:80/16
 P:30:2d4:-2:0:10
-a:HARDCORE=BR_CHAOS
+a:BR_CHAOS
+F:ACTIVATE
 F:ATTR_MULTI
-F:RES_CHAOS | RES_DISEN | FLY |
-f:RES_CHAOS |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_CHAOS
+F:RES_DISEN
+f:RES_CHAOS
 D:A suit of armour made of dragon hide. It glows in colours you have never seen before. As you
 D:put it on, you feel like you could change the world and are no longer afraid of your equipment
 D:losing its magic.
@@ -3652,9 +3778,17 @@ I:38:20:0
 W:95:0:200:100000
 A:95/32
 P:30:2d4:-2:0:10
-a:HARDCORE=BR_BALANCE
-F:RES_CHAOS | RES_DISEN | RES_SOUND | RES_SHARDS | FLY |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+a:BR_BALANCE
+F:ACTIVATE
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_CHAOS
+F:RES_DISEN
+F:RES_SHARDS
+F:RES_SOUND
 D:A suit of armour made of the hide of a dead dragon. When wearing it, you feel like you
 D:understand the principles of law and chaos, and no longer fear either.
 
@@ -3664,12 +3798,28 @@ I:38:30:0
 W:100:0:250:350000
 A:100/64
 P:40:2d4:-3:0:15
-a:HARDCORE=BR_POWER
+a:BR_POWER
+F:ACTIVATE
 F:ATTR_MULTI
-F:RES_ACID | RES_FIRE | RES_COLD | RES_ELEC | RES_POIS | FLY |
-F:RES_NETHER | RES_NEXUS | RES_CHAOS | RES_LITE | RES_DARK |
-F:RES_SHARDS | RES_SOUND | RES_DISEN | RES_CONF |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_ACID
+F:RES_CHAOS
+F:RES_COLD
+F:RES_CONF
+F:RES_DARK
+F:RES_DISEN
+F:RES_ELEC
+F:RES_FIRE
+F:RES_LITE
+F:RES_NETHER
+F:RES_NEXUS
+F:RES_POIS
+F:RES_SHARDS
+F:RES_SOUND
 D:A suit of armour made of a very thick richly coloured dragonhide. You think you'll never have
 D:to fear dragons if you put it on.
 
@@ -3681,7 +3831,10 @@ I:32:7:0
 W:45:0:50:10000
 A:80/4
 P:8:1d3:0:0:10
-F:IGNORE_ACID | IGNORE_FIRE | IGNORE_ELEC | IGNORE_COLD
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:An iron helmet, covered with a layer of dragonhide. It offers great protection and may grant
 D:protection against some dragon's attacks, based on the dragon the hide was taken from.
 
@@ -3691,7 +3844,10 @@ I:34:6:0
 W:70:0:100:10000
 A:80/4
 P:8:1d3:0:0:10
-F:IGNORE_ACID | IGNORE_FIRE | IGNORE_ELEC | IGNORE_COLD
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:A large shield, with a dragonskin cover. Depending on which dragon the hide came from, it
 D:might grant protection against some sorts of dragon breath.
 
@@ -3756,15 +3912,6 @@ P:0:1d1:0:0:0
 D:This wonderful potion will fully heal you no matter how badly you're hurt, allow drained
 D:abilities to recover and remove various other ailments.
 
-N:421:Self Knowledge
-G:!:d
-I:71:58:0
-W:40:0:4:2000
-A:40/1
-P:0:1d1:0:0:0
-F:FOUNTAIN
-D:A drink of insight, letting you know yourself better.
-
 N:422:*Enlightenment*
 G:!:d
 I:71:57:0
@@ -3783,8 +3930,9 @@ G:=:d
 I:45:38:0
 W:10:0:2:300
 A:10/2
-F:RES_FEAR | EASY_KNOW
-f:RES_FEAR |
+F:EASY_KNOW
+F:RES_FEAR
+f:RES_FEAR
 D:This ring grants courage, so that you can never become afraid.
 
 N:426:Light and Darkness Resistance
@@ -3792,8 +3940,11 @@ G:=:d
 I:45:39:0
 W:30:0:2:3000
 A:30/2
-F:RES_LITE | RES_DARK | EASY_KNOW
-f:RES_LITE | RES_DARK |
+F:EASY_KNOW
+F:RES_DARK
+F:RES_LITE
+f:RES_DARK
+f:RES_LITE
 D:This ring protects against fluctuations of the light.
 
 N:427:Nether Resistance
@@ -3801,8 +3952,10 @@ G:=:d
 I:45:40:0
 W:34:0:2:14500
 A:34/2
-F:RES_NETHER | HOLD_LIFE | EASY_KNOW
-f:RES_NETHER |
+F:EASY_KNOW
+F:HOLD_LIFE
+F:RES_NETHER
+f:RES_NETHER
 D:This blessed ring improves your life force, protecting you from the draining forces of nether
 D:and other attempts to suck your lifeblood.
 
@@ -3811,8 +3964,9 @@ G:=:d
 I:45:41:0
 W:24:0:2:3000
 A:24/2
-F:RES_NEXUS | EASY_KNOW
-f:RES_NEXUS |
+F:EASY_KNOW
+F:RES_NEXUS
+f:RES_NEXUS
 D:This ring of stability protects you from the warping forces of nexus.
 
 N:429:Sound Resistance
@@ -3820,8 +3974,9 @@ G:=:d
 I:45:42:0
 W:26:0:2:3000
 A:26/2
-F:RES_SOUND | EASY_KNOW
-f:RES_SOUND |
+F:EASY_KNOW
+F:RES_SOUND
+f:RES_SOUND
 D:This ring projects an aura of quiet around you, protecting you from loud noise.
 
 N:430:Confusion Resistance
@@ -3829,8 +3984,9 @@ G:=:d
 I:45:43:0
 W:22:0:2:3000
 A:22/2
-F:RES_CONF | EASY_KNOW
-f:RES_CONF |
+F:EASY_KNOW
+F:RES_CONF
+f:RES_CONF
 D:This ring stabilises your mind, protecting you from all kinds of befuddlement.
 
 N:431:Shard Resistance
@@ -3838,8 +3994,9 @@ G:=:d
 I:45:44:0
 W:25:0:2:3000
 A:25/2
-F:RES_SHARDS | EASY_KNOW
-f:RES_SHARDS |
+F:EASY_KNOW
+F:RES_SHARDS
+f:RES_SHARDS
 D:This piece of jewellery magically toughens your skin, protecting you from flying shrapnel.
 
 N:432:Disenchantment Resistance
@@ -3847,8 +4004,9 @@ G:=:d
 I:45:45:0
 W:90:0:2:15000
 A:90/10
-F:RES_DISEN | EASY_KNOW
-f:RES_DISEN |
+F:EASY_KNOW
+F:RES_DISEN
+f:RES_DISEN
 D:This rare ring of preservation protects your equipment from attempts to sap its magic, also
 D:causing you to suffer less pain from such attacks.
 
@@ -3857,8 +4015,10 @@ G:=:d
 I:45:46:0
 W:50:0:2:13000
 A:50/2
-F:RES_CHAOS | RES_CONF | EASY_KNOW
-f:RES_CHAOS |
+F:EASY_KNOW
+F:RES_CHAOS
+F:RES_CONF
+f:RES_CHAOS
 D:This ring protects you from the horribly warping forces of chaos.
 
 N:434:Blindness Resistance
@@ -3866,8 +4026,9 @@ G:=:d
 I:45:47:0
 W:60:0:2:7500
 A:60/2
-F:RES_BLIND | EASY_KNOW
-f:RES_BLIND |
+F:EASY_KNOW
+F:RES_BLIND
+f:RES_BLIND
 D:This ring magically preserves your eyesight, making you impervious to any attempt to blind
 D:you.
 
@@ -3876,8 +4037,14 @@ G:=:d
 I:45:48:0
 W:100:0:2:100000
 A:100/5
-F:RES_DISEN | RES_POIS | HOLD_LIFE | FREE_ACT
-f:RES_DISEN | RES_POIS | HOLD_LIFE | FREE_ACT
+F:FREE_ACT
+F:HOLD_LIFE
+F:RES_DISEN
+F:RES_POIS
+f:FREE_ACT
+f:HOLD_LIFE
+f:RES_DISEN
+f:RES_POIS
 D:This blessed ring will protect you from disenchantment, poison, attempts to drain your life
 D:force and holding magic.
 
@@ -3961,7 +4128,10 @@ I:17:3:0
 W:55:0:2:35
 A:50/4:90/2
 P:0:3d4:0:0:0
-F:SHOW_MODS | SLAY_EVIL | IGNORE_ACID | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_FIRE
+F:SHOW_MODS
+F:SLAY_EVIL
 D:An arrow to be shot with a bow, its iron head coated with hallowed silver,
 D:a material that sears the flesh of all evil creatures.
 
@@ -3971,7 +4141,10 @@ I:18:3:0
 W:50:0:2:40
 A:60/4:95/2
 P:0:3d5:0:0:0
-F:SHOW_MODS | SLAY_EVIL | IGNORE_ACID | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_FIRE
+F:SHOW_MODS
+F:SLAY_EVIL
 D:This crossbow bolt has a silver tip, blessed by the Valar for fighting evil.
 
 N:467:Lightning Resistance
@@ -3979,8 +4152,10 @@ G:":d
 I:40:29:0
 W:10:0:3:250
 A:10/1
-F:RES_ELEC | IGNORE_ELEC | EASY_KNOW
-f:RES_ELEC |
+F:EASY_KNOW
+F:IGNORE_ELEC
+F:RES_ELEC
+f:RES_ELEC
 D:This amulet will protect you from electrical discharges and storms.
 
 N:468:Wisdom
@@ -3988,8 +4163,10 @@ G:":d
 I:40:28:0
 W:30:0:3:500
 A:30/1
-F:WIS | SUST_WIS | HIDE_TYPE
-f:WIS |
+F:HIDE_TYPE
+F:SUST_WIS
+F:WIS
+f:WIS
 D:This magical amulet will magically make you wiser, and fend off
 D:attacks that would reduce your wisdom. Beware: if cursed, the
 D:amulet will do the opposite.
@@ -3999,8 +4176,9 @@ G:":d
 I:40:30:0
 W:30:0:3:600
 A:30/3
-F:REGEN | EASY_KNOW
-f:REGEN |
+F:EASY_KNOW
+F:REGEN
+f:REGEN
 D:Wearing this amulet will trigger your body's regenerational
 D:processes quicker and make them proceed faster.
 
@@ -4009,8 +4187,9 @@ G:":d
 I:40:26:0
 W:10:0:3:200
 A:10/1
-F:INFRA | HIDE_TYPE
-f:INFRA |
+F:HIDE_TYPE
+F:INFRA
+f:INFRA
 D:This amulet will increase your ability to sense warm-blooded
 D:creatures in your vicinity. Beware: if cursed, it will do
 D:just the opposite.
@@ -4020,8 +4199,16 @@ G:":d
 I:40:25:0
 W:70:0:3:30000
 A:70/8
-F:WIS | CHR | SUST_WIS | SUST_CHR | LITE1 | HIDE_TYPE |
-F:RES_DARK | RES_LITE | RES_FIRE | HOLD_LIFE |
+F:CHR
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:LITE1
+F:RES_DARK
+F:RES_FIRE
+F:RES_LITE
+F:SUST_CHR
+F:SUST_WIS
+F:WIS
 D:This blessed amulet will protect your wisdom and charms from
 D:diminishing, often adding to them as well. It also grants
 D:some extra protective magics by the grace of the Valar.
@@ -4031,8 +4218,14 @@ G:":d
 I:40:24:0
 W:70:0:3:30000
 A:70/8
-F:STR | CON | SUST_STR | SUST_CON | FREE_ACT | HIDE_TYPE |
-F:RES_FEAR | RES_DISEN |
+F:CON
+F:FREE_ACT
+F:HIDE_TYPE
+F:RES_DISEN
+F:RES_FEAR
+F:STR
+F:SUST_CON
+F:SUST_STR
 D:The ultimate amulet for a warrior, it will grant protection
 D:in the face of some evil magics, protect your strength and health,
 D:also increasing them. Beware: if cursed, the amulet will
@@ -4043,8 +4236,14 @@ G:":d
 I:40:23:0
 W:70:0:3:30000
 A:70/8
-F:DEX | SUST_DEX | STEALTH | SPEED | INFRA | HIDE_TYPE |
-F:RES_NEXUS | RES_POIS
+F:DEX
+F:HIDE_TYPE
+F:INFRA
+F:RES_NEXUS
+F:RES_POIS
+F:SPEED
+F:STEALTH
+F:SUST_DEX
 D:The ultimate amulet for a rogue or assassin, it protects the
 D:wearer against some evil magics, granting improvements in
 D:the abilities vital to these adventurers. Beware: if cursed,
@@ -4055,9 +4254,12 @@ G:":d
 I:40:22:0
 W:50:0:3:25000
 A:50/6
-F:ESP_ALL |
-f:ESP_ALL |
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:ESP_ALL
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+f:ESP_ALL
 D:This rare and powerful amulet lays bare the minds of monsters
 D:before the wearer.
 
@@ -4066,9 +4268,19 @@ G:":d
 I:40:21:0
 W:60:0:3:20000
 A:60/4
-F:SUST_STR | SUST_INT | SUST_WIS | SUST_DEX | SUST_CON | SUST_CHR |
-F:HOLD_LIFE | SLOW_DIGEST | EASY_KNOW |
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:EASY_KNOW
+F:HOLD_LIFE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:SLOW_DIGEST
+F:SUST_CHR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_INT
+F:SUST_STR
+F:SUST_WIS
 D:This blessed amulet will make the wearer impervious to evil magics
 D:that would sap innate abilities. It also slows down the digestive
 D:system, making food less necessary on long journeys.
@@ -4104,7 +4316,8 @@ N:479:& Ring~
 G:=:d
 I:45:57:0
 W:70:0:2:65000
-F:INSTA_ART | SPECIAL_GENE
+F:INSTA_ART
+F:SPECIAL_GENE
 
 ##### And here starts the gold/gems #####
 
@@ -4210,7 +4423,10 @@ G:\:D
 I:21:50:0
 W:15:0:200:1000
 P:0:3d9:0:0:0
-F:SHOW_MODS | INSTA_ART | MUST2H | SPECIAL_GENE
+F:INSTA_ART
+F:MUST2H
+F:SHOW_MODS
+F:SPECIAL_GENE
 f:MUST2H
 
 N:499:& Massive Iron Crown~
@@ -4218,7 +4434,8 @@ G:]:D
 I:33:50:0
 W:44:0:20:1000
 P:0:1d1:0:0:0
-F:INSTA_ART | SPECIAL_GENE
+F:INSTA_ART
+F:SPECIAL_GENE
 
 
 ##### Objects 500 to 511 are "Special Artifacts" #####
@@ -4322,7 +4539,8 @@ N:508:& Ring~
 G:=:d
 I:45:34:0
 W:80:0:2:100000
-F:INSTA_ART | SPECIAL_GENE
+F:INSTA_ART
+F:SPECIAL_GENE
 
 # The Ring of Power 'Nenya' -- see artifact list
 
@@ -4365,9 +4583,13 @@ G:":d
 I:40:9:0
 W:60:0:3:30000
 A:60/4
-F:REFLECT | EASY_KNOW
-f:REFLECT |
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:EASY_KNOW
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:REFLECT
+f:REFLECT
 D:This wondrous amulet will magically make the wearer
 D:reflect arrows and bolts launched by adversaries.
 
@@ -4378,9 +4600,12 @@ G:":d
 I:40:13:0
 W:40:0:3:30000
 A:40/4
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 F:NO_MAGIC
 f:NO_MAGIC
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
 D:This amulet wards off magic of any kind, good or bad.
 
 N:522:Anti-Teleportation
@@ -4388,9 +4613,12 @@ G:":d
 I:40:14:0
 W:30:0:3:15000
 A:30/4
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 F:NO_TELE
 f:NO_TELE
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
 D:This amulet will prevent the space-time continuum from
 D:being disrupted around the wearer.
 
@@ -4401,9 +4629,18 @@ G:":d
 I:40:15:0
 W:50:0:3:25000
 A:50/4
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD
-f:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+f:RES_ACID
+f:RES_COLD
+f:RES_ELEC
+f:RES_FIRE
 D:This amulet will make the wearer resist the elements.
 
 ##### New arms #####
@@ -4414,7 +4651,8 @@ I:23:29:0
 W:40:0:280:580
 A:40/3
 P:0:4d6:0:0:0
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 f:MUST2H
 D:This great sword of foreign origin is approximately 6 feet long. The hilt is
 D:long enough for even four hands to grip. A mighty weapon for a warrior.
@@ -4426,7 +4664,9 @@ I:39:3:0
 W:15:0:50:5000
 A:15/2
 P:0:1d1:0:0:0
-F:EASY_KNOW | IGNORE_FIRE | LITE2
+F:EASY_KNOW
+F:IGNORE_FIRE
+F:LITE2
 f:LITE2
 D:Made by the dwarves, this lantern provides light in the
 D:darkest recesses of the earth.
@@ -4447,7 +4687,9 @@ I:39:2:0
 W:5:0:50:2500
 A:5/1
 P:0:1d1:0:0:0
-F:EASY_KNOW | IGNORE_FIRE | LITE1
+F:EASY_KNOW
+F:IGNORE_FIRE
+F:LITE1
 f:LITE1
 D:This enchanted torch never needs to be fuelled.
 
@@ -4478,7 +4720,9 @@ I:39:4:0
 W:25:0:50:15000
 A:25/3
 P:0:1d1:0:0:0
-F:EASY_KNOW | IGNORE_FIRE | LITE3
+F:EASY_KNOW
+F:IGNORE_FIRE
+F:LITE3
 f:LITE3
 D:Made by the descendants of the Noldo craftsman, this lamp
 D:contains a part of the flame which burned inside Feanor.
@@ -4507,7 +4751,8 @@ I:24:1:0
 W:10:0:60:120
 A:10/2
 P:0:1d5:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:This is a large axe that could be wielded in one or two hands.  It has
 D:a single blade with a pick on the reverse, designed for armour piercing.
@@ -4585,7 +4830,8 @@ I:23:26:0
 W:40:0:230:600
 A:40/2
 P:0:3d7:0:0:0
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 f:MUST2H
 D:A large, two-handed sword with a blade that weaves
 D:left and right until it reaches the hilt.
@@ -4596,7 +4842,8 @@ I:23:23:0
 W:40:0:200:600
 A:40/2
 P:0:2d8:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:Also known as a Claidhmore, or Greatsword, this weapon is favoured
 D:by powerful mercenaries. The blade is large, straight, and broad,
@@ -4608,7 +4855,8 @@ I:23:24:0
 W:40:0:200:600
 A:40/3
 P:0:2d9:0:0:0
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 f:MUST2H
 D:This is the strictly two-handed version of the bastard sword.
 D:The blade is of medium length, double-edged, and considerably
@@ -4620,39 +4868,20 @@ I:23:22:0
 W:40:0:240:500
 A:40/3
 P:0:4d5:0:0:0
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 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
 W:18:0:155:301
 A:18/2
 P:0:1d10:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:It is a type of glaive with two ornate hooks on the back
 D:of the blade. It is typically 8 to 9 feet long.
@@ -4663,7 +4892,8 @@ I:22:16:0
 W:21:0:165:320
 A:21/1
 P:0:2d5:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:Mounted on a long shaft for maximum reach, this weapon is
 D:effective at repelling both cavalry and infantry.
@@ -4674,7 +4904,8 @@ I:22:29:0
 W:43:0:400:700
 A:43/2
 P:0:4d8:0:0:0
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 f:MUST2H
 D:This is a shock weapon. Its purpose is to unhorse a rider
 D:in single combat, or smash through the armour of opposing lines.
@@ -4690,17 +4921,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
@@ -4737,16 +4957,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
@@ -4755,26 +4965,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 | IGNORE_FIRE | IGNORE_COLD | IGNORE_ELEC
-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 | IGNORE_FIRE | IGNORE_COLD | IGNORE_ELEC
-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
@@ -4782,13 +4972,6 @@ W:1:0:5:2
 A:1/1
 P:0:1d1:0:0:0
 
-N:565:Poison
-G:*:G
-I:4:1:5
-W:0:0:4:2
-A:0/1
-P:0:1d1:0:0:0
-
 # wand
 N:566:Nothing
 G:-:d
@@ -4796,7 +4979,8 @@ I:65:2:-1:SPELL=Nothing
 W:2:0:10:20
 A:2/1
 P:0:1d1:0:0:0
-F:NO_RECHARGE | SPECIAL_GENE
+F:NO_RECHARGE
+F:SPECIAL_GENE
 
 N:567:Nothing
 G:=:d
@@ -4811,7 +4995,8 @@ I:55:30:0
 W:5:0:50:50
 A:5/1
 P:0:1d1:0:0:0
-F:NO_RECHARGE | SPECIAL_GENE
+F:NO_RECHARGE
+F:SPECIAL_GENE
 
 N:569:Nothing
 G:-:d
@@ -4821,22 +5006,6 @@ A:5/1
 P:0:1d1:0:0:0
 
 
-# Here comes the Essences (randomly interspersed with other stuff...)
-
-N:570:Explosion
-G:*:G
-I:4:2:50
-W:0:0:4:2
-A:0/1:20/1:40/1:60/1
-P:0:1d1:0:0:0
-
-N:571:Teleport
-G:*:G
-I:4:3:190
-W:0:0:4:2
-A:5/1:20/1:40/1:60/1
-P:0:1d1:0:0:0
-
 # Amulet of Nothing
 
 N:572:Nothing
@@ -4855,31 +5024,11 @@ W:70:0:4:10000
 A:70/16
 P:0:1d1:0:0:0
 T:71:2
-F:NORM_ART | FULL_NAME
+F:FULL_NAME
+F:NORM_ART
 D:Quaffing this measure of living blood will imbue your body and soul
 D:with the power to escape death one time.
 
-N:574:Cold
-G:*:G
-I:4:4:200
-W:0:0:4:2
-A:5/1:20/1:40/1:60/1
-P:0:1d1:0:0:0
-
-N:575:Fire
-G:*:G
-I:4:5:200
-W:0:0:4:2
-A:5/1:20/1:40/1:60/1
-P:0:1d1:0:0:0
-
-N:576:Acid
-G:*:G
-I:4:6:200
-W:0:0:4:2
-A:6/1:20/1:40/1:60/1
-P:0:1d1:0:0:0
-
 # Mage staffs (for Sorcerers to wield.)
 
 N:577:& Mage Staff~
@@ -4888,7 +5037,8 @@ I:6:1:0
 W:5:0:12:300
 A:5/1:20/1:50/1:80/1
 P:0:1d4:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:It looks like a simple walking stick, plain and nondescript.
 D:In the hands of a spellcaster, it can be a deadly weapon.
@@ -4901,35 +5051,14 @@ I:45:56:0
 W:50:0:2:3000
 A:50/1
 P:0:0d0:0:0:15
-a:HARDCORE=BA_ELEC_4
-F:RES_ELEC | IGNORE_ELEC | ACTIVATE
-f:RES_ELEC |
+a:BA_ELEC_4
+F:ACTIVATE
+F:IGNORE_ELEC
+F:RES_ELEC
+f:RES_ELEC
 D:This sparkling circlet grants you protection, makes electricity less
 D:dangerous and even allows you to call forth a ball of lightning.
 
-# More essences
-
-N:579:Life
-G:*:G
-I:4:7:300
-W:0:0:4:2
-A:0/1:20/1:40/1:60/1
-P:0:1d1:0:0:0
-
-N:580:Confusion
-G:*:G
-I:4:8:100
-W:0:0:4:2
-A:0/1:20/1:40/1:60/1
-P:0:1d1:0:0:0
-
-N:581:Light
-G:*:G
-I:4:9:60
-W:0:0:4:2
-A:0/1:20/1:40/1:60/1
-P:0:1d1:0:0:0
-
 # The Ring of Flare -- see artifact list
 
 N:582:& Ring~
@@ -4950,14 +5079,6 @@ F:FOUNTAIN
 D:This magical brew will temporarily hide you from sight, and also attunes you
 D:to this state so that your eyes can still perceive your hidden form.
 
-N:584:Chaos
-G:*:G
-I:4:10:200
-W:20:0:4:2
-A:20/1
-P:0:1d1:0:0:0
-F:ATTR_MULTI
-
 # Potion of Corruption
 
 N:585:Corruption
@@ -4976,19 +5097,11 @@ G:=:d
 I:45:53:4
 W:50:0:2:10000
 A:50/1
-F:INVIS | HIDE_TYPE
-f:INVIS |
+F:HIDE_TYPE
+F:INVIS
+f:INVIS
 D:This magical bauble will hide you from sight.
 
-### Just another essence, to confuse the edit file hackers ;) ###
-
-N:587:Time
-G:*:G
-I:4:11:600
-W:20:0:4:2
-A:20/1:40/1:60/1
-P:0:1d1:0:0:0
-
 ######### Here are the parchments ########
 
 N:588:Deep Thoughts
@@ -5135,7 +5248,8 @@ I:72:1:0
 W:5:0:4:100
 A:1/3:5/1:10/1
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:This concoction can transform your body for a short period of time.
 
 # XXX 606 -> 617
@@ -5154,15 +5268,6 @@ D:extra protection.
 
 # XXX 619 -> 639
 
-# One more essence...
-
-N:640:Magic
-G:*:G
-I:4:12:700
-W:20:0:4:2
-A:30/1:50/1:80/1
-P:0:1d1:0:0:0
-
 # Here are the corpses
 
 N:641:corpse
@@ -5217,7 +5322,8 @@ I:36:16:0
 W:5:0:60:400
 A:25/1
 P:9:1d1:0:0:0
-F:RES_FIRE | RES_COLD |
+F:RES_COLD
+F:RES_FIRE
 D:This suit of thick impregnated cloth is worn by the riders of flying steeds,
 D:and protects them from extremes of temperatures.
 
@@ -5226,7 +5332,8 @@ N:647:& Stone~
 G:~:g
 I:39:106:0
 W:15:0:15:20000
-F:INSTA_ART | SPECIAL_GENE
+F:INSTA_ART
+F:SPECIAL_GENE
 
 # Here are the boomerangs
 
@@ -5354,7 +5461,9 @@ G:~:o
 I:102:0:0
 W:1:0:50:0
 A:1/1:10/1:20/1:30/1
-F:INSTA_ART | ACTIVATE | ACTIVATE_NO_WIELD
+F:ACTIVATE
+F:ACTIVATE_NO_WIELD
+F:INSTA_ART
 
 N:663:Craftsmanship
 G:?:d
@@ -5383,7 +5492,9 @@ I:14:60:1
 W:7:0:30:400
 A:7/2:20/1:40/1:80/1
 P:0:1d1:0:0:0
-F:CON | ACTIVATE | WIELD_CAST
+F:ACTIVATE
+F:CON
+F:WIELD_CAST
 D:A simple wind instrument made from brass. If used by inexperienced musicians it sounds
 D:like somebody making "prbbt!" noises down a drainpipe.
 
@@ -5393,7 +5504,8 @@ I:14:58:1
 W:7:0:30:400
 A:7/2:20/1:40/1:80/1
 P:0:1d1:0:0:0
-F:STR | WIELD_CAST
+F:STR
+F:WIELD_CAST
 D:A sort of clay pot with a bit of skin stretched over its mouth.
 
 N:671:& Harp~
@@ -5402,7 +5514,8 @@ I:14:59:1
 W:7:0:30:400
 A:7/2:20/1:40/1:80/1
 P:0:1d1:0:0:0
-F:CHR | WIELD_CAST
+F:CHR
+F:WIELD_CAST
 D:A number of strings held by a wooden frame.
 
 #N:672:& Banjo~
@@ -5446,7 +5559,8 @@ I:10:1:0
 W:5:0:30:100
 A:5/1:15/1:25/1:35/1
 P:0:1d1:0:0:0
-F:ACTIVATE | ACTIVATE_NO_WIELD
+F:ACTIVATE
+F:ACTIVATE_NO_WIELD
 
 ### Two more scrolls ###
 
@@ -5466,169 +5580,6 @@ A:30/1:45/1:55/1
 D:This scroll is inscribed with a ritual which allows you to discern what fate holds in store for
 D:you.
 
-### Here comes the Runes ###
-
-N:679:Self
-G:?:b
-I:105:0:0
-W:3:5:2:40
-A:3/1
-P:0:1d1:0:0:0
-
-N:680:Ray
-G:?:b
-I:105:2:0
-W:10:5:2:300
-A:10/1
-P:0:1d1:0:0:0
-F:IGNORE_COLD | IGNORE_ELEC
-
-N:681:Sphere
-G:?:b
-I:105:3:0
-W:15:5:2:1000
-A:15/1
-P:0:1d1:0:0:0
-F:IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
-
-N:682:Knowledge
-G:?:b
-I:104:91:0
-W:6:5:2:200
-A:6/1
-P:0:1d1:0:0:0
-
-N:683:Life
-G:?:D
-I:104:53:0
-W:3:5:2:200
-A:3/1
-P:0:1d1:0:0:0
-
-N:684:Fire
-G:?:r
-I:104:5:0
-W:10:5:2:300
-A:10/1
-P:0:1d1:0:0:0
-F:IGNORE_FIRE
-
-N:685:Cold
-G:?:b
-I:104:4:0
-W:12:5:2:300
-A:12/1
-P:0:1d1:0:0:0
-F:IGNORE_COLD
-
-N:686:Lightning
-G:?:W
-I:104:1:0
-W:13:5:2:300
-A:13/1
-P:0:1d1:0:0:0
-F:IGNORE_ELEC
-
-N:687:Acid
-G:?:B
-I:104:3:0
-W:16:5:2:300
-A:16/1
-P:0:1d1:0:0:0
-F:IGNORE_ACID
-
-N:688:Element
-G:?:g
-I:104:10:0
-W:23:5:2:1000
-A:23/1
-P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
-
-N:689:Chaos
-G:?:v
-I:104:30:0
-W:26:5:2:2000
-A:26/1
-P:0:1d1:0:0:0
-F:ATTR_MULTI
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
-
-N:690:Mind
-G:?:D
-I:104:85:0
-W:19:5:2:3000
-A:19/1
-P:0:1d1:0:0:0
-F:IGNORE_ELEC
-
-N:691:Holding
-G:?:B
-I:104:75:0
-W:5:5:2:500
-A:5/1
-P:0:1d1:0:0:0
-F:IGNORE_ACID
-
-N:692:Arrow
-G:?:b
-I:105:1:0
-W:6:5:2:100
-A:6/1
-P:0:1d1:0:0:0
-F:IGNORE_ELEC
-
-N:693:Power Surge
-G:?:b
-I:105:4:0
-W:50:5:2:5000
-A:50/1
-P:0:1d1:0:0:0
-F:IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | IGNORE_ACID
-
-N:694:Armageddon
-G:?:b
-I:105:5:0
-W:30:5:2:4000
-A:30/1
-P:0:1d1:0:0:0
-F:IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | IGNORE_ACID
-
-N:695:Gravity
-G:?:G
-I:104:35:0
-W:16:5:2:300
-A:16/1
-P:0:1d1:0:0:0
-F:IGNORE_ACID
-
-# And, among the runes, one more essence...
-
-N:696:Extra Life
-G:*:G
-I:4:13:900
-W:50:0:4:2
-A:50/1:70/1:90/1
-P:0:1d1:0:0:0
-
-# Now, the rest of the runes...
-
-N:697:Undeath
-G:?:G
-I:104:92:0
-W:35:5:2:1000
-A:35/1
-P:0:1d1:0:0:0
-F:IGNORE_ACID
-
-N:698:Protection
-G:?:G
-I:104:74:0
-W:45:5:2:1500
-A:45/1
-P:0:1d1:0:0:0
-F:IGNORE_ACID
-
 # XXX
 
 # The Ring of Precognition (now a k_info.txt artifact)
@@ -5638,10 +5589,14 @@ I:45:51:0
 W:90:0:2:300000
 A:90/100
 T:45:23
-F:PRECOGNITION |
-f:PRECOGNITION |
-F:NORM_ART | FULL_NAME
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:FULL_NAME
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:NORM_ART
+F:PRECOGNITION
+f:PRECOGNITION
 D:This magical ring allows you to know what you will encounter in the near future.
 
 # Athelas, cures Black Breath
@@ -5682,8 +5637,12 @@ I:70:40:0
 W:90:0:5:160000
 A:90/140
 T:70:51
-F:NORM_ART | FULL_NAME
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:FULL_NAME
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:NORM_ART
 D:It allows you to leave your body to reincarnate into
 D:another one. However, your current body is lost in the process.
 
@@ -5693,7 +5652,8 @@ I:23:33:0
 W:25:0:70:500
 A:25/1:80/2
 P:0:3d7:0:0:0
-F:SHOW_MODS | ANTIMAGIC_50
+F:ANTIMAGIC_50
+F:SHOW_MODS
 f:ANTIMAGIC_50
 D:A strange, very sharp long sword, which seems to drain light from its surroundings. As you
 D:wield it, you feel much less attuned to magic.
@@ -5795,8 +5755,12 @@ W:90:0:4:100000
 A:90/25
 P:0:1d1:0:0:0
 T:71:49
-F:NORM_ART | FULL_NAME
-F:IGNORE_ACID | IGNORE_FIRE | IGNORE_COLD | IGNORE_ELEC
+F:FULL_NAME
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:NORM_ART
 D:This old potion is supposed to grant more learning power
 D:to its user.
 
@@ -5835,8 +5799,9 @@ G:=:d
 I:45:54:0
 W:20:0:2:16000
 A:20/3
-F:FLY | EASY_KNOW
-f:FLY |
+F:EASY_KNOW
+F:FLY
+f:FLY
 D:This ring is imbued with the power of eagles. It grants you the power of flight.
 
 N:756:& Tome~ of the Time
@@ -5845,7 +5810,8 @@ I:111:8:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:This tome seems to have trouble deciding whether it really exists now. Its flickering pages
 D:contain all that is known about the currents of time.
 
@@ -5863,7 +5829,10 @@ I:111:9:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW | IGNORE_FIRE | ATTR_MULTI
+F:ATTR_MULTI
+F:EASY_KNOW
+F:FULL_NAME
+F:IGNORE_FIRE
 D:This tome gives you deeper insights on the works of magic.
 
 N:759:& Tome~ of the Mind
@@ -5872,7 +5841,8 @@ I:111:10:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:This tome has no pages; knowledge is transferred to you if you simply
 D:hold it.
 
@@ -5882,7 +5852,8 @@ I:111:20:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:This dusty tome is filled with ancient rituals,
 D:designed to uncover all that is hidden.
 
@@ -5892,7 +5863,8 @@ I:111:21:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:A large jewel-encrusted tome that transfers
 D:wisdom and understanding to its wearer.
 
@@ -5902,7 +5874,8 @@ I:111:22:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:This tome fills you with glorious visions of total devastation.
 D:Anyone in your way shall be destroyed.
 
@@ -5912,7 +5885,9 @@ I:111:11:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW | ATTR_MULTI
+F:ATTR_MULTI
+F:EASY_KNOW
+F:FULL_NAME
 D:This singed book smells like burned flesh.  Its power is as evident
 D:as its thirst for your blood.
 
@@ -5922,7 +5897,8 @@ I:111:23:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:A black and scarlet flame springs from this tome, issuing
 D:a thunderous roar under which you think you hear the screams of tormented souls.
 
@@ -5932,7 +5908,8 @@ I:111:24:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 
 # for the Library Quest
 # Tome of PLAYER
@@ -5942,8 +5919,15 @@ I:111:61:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW | ATTR_MULTI | SPECIAL_GENE
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | NORM_ART
+F:ATTR_MULTI
+F:EASY_KNOW
+F:FULL_NAME
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:NORM_ART
+F:SPECIAL_GENE
 D:This book has some of your favourite spells inside.
 
 # The Ring of Phasing -- see artifact list
@@ -5953,7 +5937,8 @@ G:=:d
 I:45:55:0
 W:110:0:2:300000
 A:110/5
-F:INSTA_ART | SPECIAL_GENE
+F:INSTA_ART
+F:SPECIAL_GENE
 
 N:771:[Earth]
 G:?:R
@@ -5981,7 +5966,10 @@ I:114:2:0
 W:50:0:30:2500
 A:50/1
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 F:SPECIAL_GENE
 D:A completely translucent gem; as you behold it, you hear a great wind and feel like you're
 D:about to take off and fly away.
@@ -5992,7 +5980,10 @@ I:114:3:0
 W:70:0:30:50000
 A:70/3
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 F:SPECIAL_GENE
 D:A large gem, filled with dark blue water. It feels strangely heavy and cold.
 
@@ -6002,7 +5993,10 @@ I:114:4:0
 W:100:0:30:100000
 A:100/3
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 F:SPECIAL_GENE
 D:A large gem that seems somehow immaterial and is filled with a strange insubstantial... power?
 
@@ -6015,8 +6009,12 @@ W:90:0:15:150000
 A:100/14
 P:0:1d1:0:0:0
 T:66:1
-F:NORM_ART | FULL_NAME
-F:IGNORE_FIRE | IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC
+F:FULL_NAME
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:NORM_ART
 D:This rod creates a little hatch, allowing access to your home, no matter how far away the abode
 D:is.
 
@@ -6027,7 +6025,9 @@ I:23:32:1
 W:50:900:45:2000
 A:48/4:60/2:80/1
 P:0:4d4:-2:2:0
-F:IGNORE_ACID | RES_DARK | STEALTH
+F:IGNORE_ACID
+F:RES_DARK
+F:STEALTH
 f:STEALTH
 D:A thin long sword made of a completely black metal, which reflects no light.
 
@@ -6037,7 +6037,8 @@ I:23:31:0
 W:60:1800:50:6000
 A:60/20
 P:0:1d6:4:0:0
-F:SHOW_MODS | VORPAL
+F:SHOW_MODS
+F:VORPAL
 D:A small sword made of a blueish metal with a strangely rough surface. As anything is hurt
 D:with it, the weapon will stick inside the wound and cause horrible wounds when torn away.
 
@@ -6047,54 +6048,14 @@ G:":G
 I:40:17:0
 W:25:0:3:10000
 A:25/1
-a:HARDCORE=BA_POIS_4
-F:RES_POIS | DEX | ACTIVATE
+a:BA_POIS_4
+F:ACTIVATE
+F:DEX
+F:RES_POIS
 D:A petrified serpent's tongue, hung on a thin chain to be clasped around your neck. It makes you
 D:like unto snakes, able to wriggle out of tight corners, impervious to poisons and poisonous
 D:yourself.
 
-# Here comes the new Essences
-
-N:780:Darkness
-G:*:G
-I:4:14:20
-W:0:0:4:1
-A:0/1:20/1:40/1
-P:0:1d1:0:0:0
-D:It's a gem that eats all light that reaches it.  It's perfectly black.
-
-N:781:Knowledge
-G:*:G
-I:4:15:100
-W:0:0:4:1
-A:20/1:30/1:70/1
-P:0:1d1:0:0:0
-D:It's a blue gem with countless formulae scribbled on it.
-
-N:782:Force
-G:*:G
-I:4:16:180
-W:0:0:4:1
-A:10/1:40/1
-P:0:1d1:0:0:0
-D:It's a green gem that can barely contain the forces in it.
-
-N:783:Lightning
-G:*:G
-I:4:17:200
-W:0:0:4:1
-A:28/1
-P:0:1d1:0:0:0
-D:It's a white gem.  Inside you see lightning rage.
-
-N:784:Mana
-G:*:G
-I:4:18:400
-W:0:0:4:1
-A:45/2
-P:0:1d1:0:0:0
-D:It's an everchanging gem.  You feel the magic throbbing through it.
-
 # The Nine Rings for mortal men doomed to die! When a Nazgul is
 # destroyed, it drops a Ring of Power with random powers.
 
@@ -6103,9 +6064,14 @@ G:=:d
 I:45:5:0
 W:100:0:2:1
 A:100/100
-F:INVIS | DRAIN_EXP | CURSED | HEAVY_CURSE | CURSE_NO_DROP
+F:CURSED
+F:CURSE_NO_DROP
+F:DRAIN_EXP
+F:FULL_NAME
+F:HEAVY_CURSE
+F:INVIS
+F:SPECIAL_GENE
 f:INVIS
-F:SPECIAL_GENE | FULL_NAME
 
 # To help people climb mountains...
 
@@ -6135,7 +6101,9 @@ I:115:55:0
 W:10:0:150:500
 A:10/1
 P:0:4d6:0:0:0
-F:SHOW_MODS | SLAY_DEMON | WIELD_CAST
+F:SHOW_MODS
+F:SLAY_DEMON
+F:WIELD_CAST
 D:This blade has been taken from the corpse of a demon.
 D:Some demonic energy is still coursing through it, helping
 D:you slay other demons.
@@ -6146,7 +6114,8 @@ I:115:56:0
 W:15:0:70:500
 A:15/1
 P:5:1d1:0:0:0
-F:REGEN | WIELD_CAST
+F:REGEN
+F:WIELD_CAST
 D:This shield has been taken from the corpse of a demon.
 D:Some demonic energy is still coursing through it, giving
 D:life to any that wield it.
@@ -6157,7 +6126,8 @@ I:115:57:0
 W:20:0:30:500
 A:20/1
 P:2:1d1:0:0:0
-F:LITE2 | WIELD_CAST
+F:LITE2
+F:WIELD_CAST
 D:This horn is about six feet long.  Just looking at it makes you nervous.
 
 # XXX
@@ -6241,7 +6211,8 @@ I:80:41:0
 W:90:5:2:60000
 A:90/50
 T:80:40
-F:NORM_ART | FULL_NAME
+F:FULL_NAME
+F:NORM_ART
 D:This food will, once eaten, permanently add 70 HP.
 
 # Scroll of Mass Resurrection - artifact scroll
@@ -6251,8 +6222,12 @@ I:70:43:0
 W:55:0:5:0
 A:55/1
 T:70:1
-F:NORM_ART | FULL_NAME
-F:IGNORE_FIRE | IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC
+F:FULL_NAME
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:NORM_ART
 D:This magical scroll sends a call to the halls of Mandos, issuing forth all those who have been
 D:slain by the reader.
 
@@ -6282,20 +6257,11 @@ I:24:30:0
 W:70:0:300:6000
 A:70/8
 P:0:5d7:0:0:0
-F:SLAY_ANIMAL | SHOW_MODS
+F:SHOW_MODS
+F:SLAY_ANIMAL
 D:A huge axe, the sort used for slaughtering animals, this weapon is unusually deadly against
 D:natural creatures.
 
-N:806:& Runestone~
-G:?:v
-I:105:255:0
-W:10:5:2:300
-A:10/3:20/2:30/1:60/1
-P:0:1d1:0:0:0
-F:IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE | IGNORE_ACID
-D:A small oval stone. One surface is flat, as if something ought to be scratched or inscribed into
-D:it.
-
 N:807:& Fortune cookie~
 G:,:U
 I:80:42:500
@@ -6322,7 +6288,12 @@ W:10:10:10:3200
 A:10/200
 P:0:10d10:0:0:0
 T:65:6
-F:RECHARGE | SPECIAL_GENE | EASY_USE | RECHARGED | NORM_ART | FULL_NAME
+F:EASY_USE
+F:FULL_NAME
+F:NORM_ART
+F:RECHARGE
+F:RECHARGED
+F:SPECIAL_GENE
 D:The miner's friend.  This wand was used by Thrain to dig into the
 D:walls of the dungeon.  Its indestructible nature makes it quite useful.
 
@@ -6334,7 +6305,11 @@ W:50:10:10:12000
 P:0:10d4:0:0:0
 A:50/200
 T:55:8
-F:RECHARGE | EASY_USE | RECHARGED | NORM_ART | FULL_NAME
+F:EASY_USE
+F:FULL_NAME
+F:NORM_ART
+F:RECHARGE
+F:RECHARGED
 D:Mithrandir's staff that throws powerful fire attacks at all enemies.  It
 D:can be recharged without blowing up, for it is built to hold
 D:much magical energy.
@@ -6368,7 +6343,11 @@ I:11:7:0
 W:0:0:0:1000
 A:0/1
 P:0:1d1:0:0:0
-F:SPECIAL_GENE | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE | IGNORE_ACID
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:SPECIAL_GENE
 D:Although it looks like a piece of junk, it is actually part of an ancient
 D:relic belonging to Priests of Eru. The relic now lies in pieces, hidden
 D:from all but but his most dedicated followers.
@@ -6379,7 +6358,11 @@ I:11:8:0
 W:0:0:0:1000
 A:0/1
 P:0:1d1:0:0:0
-F:SPECIAL_GENE | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE | IGNORE_ACID
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:SPECIAL_GENE
 D:Although it looks like a piece of junk, it is actually part of an ancient
 D:relic belonging to Priests of Manwe. The relic now lies in pieces, hidden
 D:from all but his most dedicated followers.
@@ -6390,7 +6373,11 @@ I:11:9:0
 W:0:0:0:1000
 A:0/1
 P:0:1d1:0:0:0
-F:SPECIAL_GENE | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE | IGNORE_ACID
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:SPECIAL_GENE
 D:Although it looks like a piece of junk, it is actually part of an ancient
 D:relic belonging to worshippers of Tulkas. The relic now lies in pieces,
 D:hidden from all but his most dedicated followers.
@@ -6401,7 +6388,11 @@ I:11:10:0
 W:0:0:0:1000
 A:0/1
 P:0:1d1:0:0:0
-F:SPECIAL_GENE | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE | IGNORE_ACID
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:SPECIAL_GENE
 D:Although it looks like a piece of junk, it is actually part of an ancient
 D:relic belonging to Dark Priests. The relic now lies in pieces, hidden
 D:from all but the most faithful followers of Melkor.
@@ -6412,7 +6403,11 @@ I:11:11:0
 W:0:0:0:1000
 A:0/1
 P:0:1d1:0:0:0
-F:SPECIAL_GENE | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE | IGNORE_ACID
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:SPECIAL_GENE
 D:Although it looks like a piece of junk, it is actually part of an ancient
 D:relic belonging to Druids. The relic now lies in pieces, hidden
 D:from all but the most faithful followers of Yavanna.
diff --git a/lib/edit/maeglin.map b/lib/edit/maeglin.map
index e3be9972..7916fd9b 100644
--- a/lib/edit/maeglin.map
+++ b/lib/edit/maeglin.map
@@ -11,7 +11,7 @@ F:X:63:3
 F:<:172:3
 
 # up stairs with maeglin
-F:{:6:3:825:0:0:0:0:0:0:2
+F:{:6:3:825:0:0:0:0:0:2
 
 # Floor with dirt
 F:.:88:5
@@ -56,7 +56,7 @@ F:R:88:5:644
 F:O:88:5:645
 
 # Floor with dirt with a Lesser Balrog
-F:U:88:5:996:0:0:0:0:0:0:2
+F:U:88:5:996:0:0:0:0:0:2
 
 # Granite wall
 F:#:56:5
diff --git a/lib/edit/misc.txt b/lib/edit/misc.txt
index 08e35c1f..06a9fcce 100644
--- a/lib/edit/misc.txt
+++ b/lib/edit/misc.txt
@@ -12,80 +12,8 @@ M:X:101
 # Maximum y size of the wilderness
 M:Y:66
 
-# Maximum number of randart parts in ra_info.txt
-M:Z:516
-
-# Maximum number of monsters in r_info.txt
-# WARNING ! add one more to the real count for the player ghost !!
-M:R:1078
-
-# Maximum number of monsters in re_info.txt
-# WARNING ! Use the exact amount of ego types used, if not you
-# will get weird results !
-M:r:14
-
-# Maximum number of items in k_info.txt
-M:K:819
-
-# Maximum number of vaults in v_info.txt
-M:V:108
-
-# Maximum number of terrain features in f_info.txt
-M:F:256
-
-# Maximum number of alchemist recipes
-M:a:1000
-
-# Maximum number of artifacts in a_info.txt
-M:A:219
-
-# Maximum number of sets types in set_info.txt
-M:s:10
-
-# Maximum number of ego-items in e_info.txt
-M:E:200
-
-# Maximum number of dungeon types in d_info.txt
-M:D:31
-
-# Maximum number of trap types in tr_info.txt
-M:U:176
-
-# Maximum number of terrain types in wf_info.txt
-M:W:30
-
-# Maximum number of owners types in ow_info.txt
-M:N:70
-
-# Maximum number of building actions in ba_info.txt
-M:B:62
-
-# Maximum number of store types in st_info.txt
-M:S:61
-
 # Maximum size for "o_list[]"
 M:O:1024
 
 # Maximum size for "m_list[]"
 M:M:768
-
-# Maximum number of race types in p_info.txt
-M:P:R:22
-
-# Maximum number of subrace types in p_info.txt
-M:P:S:10
-
-# Maximum number of class types in p_info.txt
-M:P:C:32
-
-# Maximum number of meta class types in p_info.txt
-M:P:M:1
-
-# Maximum number of histories types in p_info.txt
-M:P:H:266
-
-# Maximum number of skills in s_info.txt
-M:k:60
-
-# Maximum number of traits in ab_info.txt
-M:b:50
diff --git a/lib/edit/nirnaeth.map b/lib/edit/nirnaeth.map
index a8c06999..3ad0789c 100644
--- a/lib/edit/nirnaeth.map
+++ b/lib/edit/nirnaeth.map
@@ -14,28 +14,28 @@ F:s:88:5
 F:V:84:5
 
 # Dirt with Olog
-F:a:88:5:538:0:0:0:0:0:0:2
+F:a:88:5:538:0:0:0:0:0:2
 
 # Dirt with Cave Troll
-F:b:88:5:496:0:0:0:0:0:0:2
+F:b:88:5:496:0:0:0:0:0:2
 
 # Dirt with with Eldrak
-F:c:88:1:620:0:0:0:0:0:0:2
+F:c:88:1:620:0:0:0:0:0:2
 
 # Dirt with with Ettin
-F:e:88:1:621:0:0:0:0:0:0:2
+F:e:88:1:621:0:0:0:0:0:2
 
 # Dirt with with War troll
-F:f:88:1:631:0:0:0:0:0:0:2
+F:f:88:1:631:0:0:0:0:0:2
 
 # Dirt with with Hru
-F:g:88:1:709:0:0:0:0:0:0:2
+F:g:88:1:709:0:0:0:0:0:2
 
 # Dirt with Ulik the Troll
-F:h:88:5:729:0:0:0:0:0:0:2
+F:h:88:5:729:0:0:0:0:0:2
 
 # Dirt with Ancient green dragon
-F:i:88:5:618:0:0:0:0:0:0:2
+F:i:88:5:618:0:0:0:0:0:2
 
 # Dungeon
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
diff --git a/lib/edit/numenor.txt b/lib/edit/numenor.txt
index ec8621b1..0ca52738 100644
--- a/lib/edit/numenor.txt
+++ b/lib/edit/numenor.txt
@@ -1,7 +1,7 @@
 # File: numenor.txt
 
 # Way to the lost land of Numenor
-F:>:7:3:0:0:0:0:0:7
+F:>:7:3:0:0:0:0:7
 
 ############### Town Layout ###############
 
diff --git a/lib/edit/ow_info.txt b/lib/edit/ow_info.txt
index a1e3d0a3..7a27fc59 100644
--- a/lib/edit/ow_info.txt
+++ b/lib/edit/ow_info.txt
@@ -13,435 +13,814 @@
 # L:liked races
 # H:hated races
 
-# Version stamp (required)
-
-V:2.0.0
-
 N:0:Bilbo the Friendly(Hobbit)
-I:20000:170:108:5:15
-C:120:100:80
-L:Elf | Half-Elf | High-Elf | Dunadan | Hobbit | Dwarf | RohanKnight
-H:Orc | Troll | DeathMold | Half-Ogre | Beorning | Kobold
+I:20000:120
+C:120:100:80
+L:Dunadan
+L:Dwarf
+L:Elf
+L:Half-Elf
+L:High-Elf
+L:Hobbit
+L:RohanKnight
+H:Beorning
+H:DeathMold
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:1:Uldrik(Human)
-I:20000:170:108:1:1
+I:20000:120
 C:120:100:80
-L:Dunadan | Hobbit | Human |
-H:Orc | Troll | DeathMold | Half-Ogre | Beorning | Kobold |
+L:Dunadan
+L:Hobbit
+L:Human
+H:Beorning
+H:DeathMold
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 
 N:2:Otick(Human)
-I:100:170:108:4:10
+I:100:120
 C:120:100:80
-L:Dunadan | Hobbit | Human |
-H:Orc | Troll | DeathMold | Half-Ogre | Beorning | Kobold |
+L:Dunadan
+L:Hobbit
+L:Human
+H:Beorning
+H:DeathMold
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 
 N:3:Merana(Human)
-I:0:170:108:1:1
+I:0:120
 C:200:100:95
 L:Human
-H:Orc | Troll | DeathMold | Half-Ogre | Beorning | Kobold |
+H:Beorning
+H:DeathMold
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 
 N:4:Mirimbar(High-Elf)
-I:0:170:108:1:1
+I:0:120
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:5:Raistlin the Chicken(Human)
-I:20000:175:108:4:12
+I:20000:130
 C:120:100:80
 L:Human
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:6:Sultan the Midget(Gnome)
-I:30000:170:107:5:15
+I:30000:120
 C:120:100:80
-L:Gnome | Dwarf | Petty-Dwarf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Dwarf
+L:Gnome
+L:Petty-Dwarf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:7:Lyar-el the Comely(Elf)
-I:30000:165:107:6:18
-C:120:100:80
-L:Elf | Half-Elf | Dark-Elf | High-Elf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+I:30000:120
+C:120:100:80
+L:Dark-Elf
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:8:Kon-Dar the Ugly(Half-Orc)
-I:5000:210:115:5:7
-C:120:100:80
-L:Orc | Troll | Half-Ogre | Beorning | Kobold
-H:Gnome | Dwarf | Human | RohanKnight | Elf | Half-Elf | High-Elf
+I:5000:140
+C:120:100:80
+L:Beorning
+L:Half-Ogre
+L:Kobold
+L:Orc
+L:Troll
+H:Dwarf
+H:Elf
+H:Gnome
+H:Half-Elf
+H:High-Elf
+H:Human
+H:RohanKnight
 
 N:9:Darg-Low the Grim(Human)
-I:10000:190:111:4:9
+I:10000:130
 C:120:100:80
 L:Human
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:10:Decado the Handsome(Dunadan)
-I:25000:200:112:4:10
+I:25000:140
 C:120:100:80
-L:Human | Dunadan | RohanKnight
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:11:Wieland the Smith(Dwarf)
-I:30000:200:112:4:5
+I:30000:140
 C:120:100:80
-L:Gnome | Dwarf | Petty-Dwarf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Dwarf
+L:Gnome
+L:Petty-Dwarf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:12:Arnold the Beastly(Barbarian)
-I:5000:210:115:6:6
+I:5000:140
 C:120:100:80
 
 N:13:Arndal Beast-Slayer(Half-Elf)
-I:10000:185:110:5:9
-C:120:100:80
-L:Elf | Half-Elf | Dark-Elf | High-Elf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+I:10000:130
+C:120:100:80
+L:Dark-Elf
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:14:Eddie Beast-Master(Half-Orc)
-I:25000:190:115:5:7
-C:120:100:80
-L:Orc | Troll | Half-Ogre | Beorning | Kobold
-H:Gnome | Dwarf | Human | RohanKnight | Elf | Half-Elf | High-Elf
+I:25000:140
+C:120:100:80
+L:Beorning
+L:Half-Ogre
+L:Kobold
+L:Orc
+L:Troll
+H:Dwarf
+H:Elf
+H:Gnome
+H:Half-Elf
+H:High-Elf
+H:Human
+H:RohanKnight
 
 N:15:Oglign Dragon-Slayer(Dwarf)
-I:30000:195:112:4:8
+I:30000:130
 C:120:100:80
-L:Gnome | Dwarf | Petty-Dwarf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Dwarf
+L:Gnome
+L:Petty-Dwarf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:16:Aragorn(Dunadan)
-I:20000:200:112:4:10
+I:20000:140
 C:120:100:80
-L:Human | Dunadan | RohanKnight
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:17:Sondar(Human)
-I:0:200:112:4:10
+I:0:140
 C:120:100:80
 
 N:18:Celebor(Half-Elf)
-I:100:170:108:4:10
+I:100:120
 C:120:100:80
-L:Dunadan | Hobbit | Human |
-H:Orc | Troll | DeathMold | Half-Ogre | Beorning | Kobold |
+L:Dunadan
+L:Hobbit
+L:Human
+H:Beorning
+H:DeathMold
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 
 N:19:Sharra(Human)
-I:25000:200:112:4:10
+I:25000:140
 C:120:100:80
-L:Human | Dunadan | RohanKnight
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:20:Hjolgar(Barbarian)
-I:5000:210:115:6:6
+I:5000:140
 C:120:100:80
 #L:Warrior |
 
 N:21:Tanistil(Elf)
-I:5000:210:115:6:6
+I:5000:140
 C:120:100:80
 #L:Mage | Sorceror | Thaumaturgist
 #H:Warrior |
 
 N:22:Eldore(Human)
-I:5000:210:115:6:6
+I:5000:140
 C:120:100:80
 #L:Priest
 #H:Necromancer
 
 N:23:Vilios(Human)
-I:5000:210:115:6:6
+I:5000:140
 C:120:100:80
 #L:Paladin
 #H:Necromancer
 
 N:24:Angros(Elf)
-I:5000:210:115:6:6
+I:5000:140
 C:120:100:80
 #L:Ranger
 
 N:25:Palano(Thunderlord)
-I:0:210:115:6:6
+I:0:140
 C:120:100:80
 L:Thunderlord
 
 N:26:Ludwig the Humble(Dwarf)
-I:5000:175:109:6:15
+I:5000:130
 C:120:100:80
-L:Gnome | Dwarf | Petty-Dwarf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Dwarf
+L:Gnome
+L:Petty-Dwarf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:27:Gunnar the Paladin(Half-Troll)
-I:10000:185:110:5:23
-C:120:100:80
-L:Orc | Troll | Half-Ogre | Beorning | Kobold
-H:Gnome | Dwarf | Human | RohanKnight | Elf | Half-Elf | High-Elf
+I:10000:130
+C:120:100:80
+L:Beorning
+L:Half-Ogre
+L:Kobold
+L:Orc
+L:Troll
+H:Dwarf
+H:Elf
+H:Gnome
+H:Half-Elf
+H:High-Elf
+H:Human
+H:RohanKnight
 
 N:28:Torin the Chosen(High-Elf)
-I:25000:180:107:6:20
+I:25000:130
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:29:Sarastro the Wise(Human)
-I:30000:185:109:5:15
+I:30000:130
 C:120:100:80
-L:Dunadan | Hobbit | Human |
-H:Orc | Troll | DeathMold | Half-Ogre | Beorning | Kobold |
+L:Dunadan
+L:Hobbit
+L:Human
+H:Beorning
+H:DeathMold
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 
 N:30:Mauser the Chemist(Half-Elf)
-I:10000:190:111:5:8
+I:10000:130
 C:120:100:80
-L:Dunadan | Hobbit | Human |
-H:Orc | Troll | DeathMold | Half-Ogre | Beorning | Kobold |
+L:Dunadan
+L:Hobbit
+L:Human
+H:Beorning
+H:DeathMold
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 
 N:31:Wizzle the Chaotic(Hobbit)
-I:10000:190:110:6:8
-C:120:100:80
-L:Elf | Half-Elf | High-Elf | Dunadan | Hobbit | Dwarf | RohanKnight
-H:Orc | Troll | DeathMold | Half-Ogre | Beorning | Kobold |
+I:10000:130
+C:120:100:80
+L:Dunadan
+L:Dwarf
+L:Elf
+L:Half-Elf
+L:High-Elf
+L:Hobbit
+L:RohanKnight
+H:Beorning
+H:DeathMold
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 
 N:32:Midas the Greedy(Gnome)
-I:15000:200:116:6:9
+I:15000:140
 C:120:100:80
-L:Gnome | Dwarf | Petty-Dwarf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Dwarf
+L:Gnome
+L:Petty-Dwarf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:33:Ja-Far the Alchemist(Elf)
-I:15000:220:111:4:9
-C:120:100:80
-L:Elf | Half-Elf | Dark-Elf | High-Elf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+I:15000:140
+C:120:100:80
+L:Dark-Elf
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:34:Ariel the Sorceress(Half-Elf)
-I:20000:200:110:7:8
+I:20000:140
 C:120:100:80
-L:Dunadan | Hobbit | Human |
-H:Orc | Troll | DeathMold | Half-Ogre | Beorning | Kobold |
+L:Dunadan
+L:Hobbit
+L:Human
+H:Beorning
+H:DeathMold
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 
 N:35:Buggerby the Great(Gnome)
-I:20000:215:113:6:10
+I:20000:140
 C:120:100:80
-L:Gnome | Dwarf | Petty-Dwarf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Dwarf
+L:Gnome
+L:Petty-Dwarf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:36:Inglorian the Mage(Human)
-I:30000:200:110:7:10
+I:30000:140
 C:120:100:80
-L:Dunadan | Hobbit | Human |
-H:Orc | Troll | DeathMold | Half-Ogre | Beorning | Kobold |
+L:Dunadan
+L:Hobbit
+L:Human
+H:Beorning
+H:DeathMold
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 
 N:37:Luthien Starshine(High-Elf)
-I:30000:175:110:5:11
+I:30000:130
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:38:Gary Gygaz(Half-Troll)
-I:20000:250:150:10:5
+I:20000:180
 C:120:100:80
 #L:Rogue
-H:Gnome | Dwarf | Human | RohanKnight | Elf | Half-Elf | High-Elf
+H:Dwarf
+H:Elf
+H:Gnome
+H:Half-Elf
+H:High-Elf
+H:Human
+H:RohanKnight
 
 N:39:Histor the Goblin(Half-Orc)
-I:20000:250:150:10:5
+I:20000:180
 C:120:100:80
 #L:Rogue
-H:Gnome | Dwarf | Human | RohanKnight | Elf | Half-Elf | High-Elf
+H:Dwarf
+H:Elf
+H:Gnome
+H:Half-Elf
+H:High-Elf
+H:Human
+H:RohanKnight
 
 N:40:Zorak the Smart(Dwarf)
-I:30000:250:150:10:5
+I:30000:180
 C:120:100:80
 #L:Rogue
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:41:Tipo the Fair(Human)
-I:30000:250:150:10:5
+I:30000:180
 C:120:100:80
 #L:Rogue
-H:Orc | Troll | DeathMold | Half-Ogre | Beorning | Kobold |
+H:Beorning
+H:DeathMold
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 
 N:42:Dolaf the Greedy(Human)
-I:10000:175:108:4:12
+I:10000:130
 C:120:100:80
-L:Dunadan | Hobbit | Human |
-H:Orc | Troll | DeathMold | Half-Ogre | Beorning | Kobold |
+L:Dunadan
+L:Hobbit
+L:Human
+H:Beorning
+H:DeathMold
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 
 N:43:Odnar the Sage(High-Elf)
-I:15000:120:105:6:16
+I:15000:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:44:Gandar the Neutral(Dark-Elf)
-I:25000:120:110:7:19
+I:25000:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:45:Ro-sha the Patient(Elf)
-I:30000:140:105:6:12
-C:120:100:80
-L:Elf | Half-Elf | Dark-Elf | High-Elf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+I:30000:110
+C:120:100:80
+L:Dark-Elf
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:46:N'rak the Summoner(Human)
-I:10000:175:108:4:12
+I:10000:130
 C:120:100:80
-L:Human | Dunadan | RohanKnight
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:47:Esperion the Beastlover(High-Elf)
-I:15000:120:105:6:16
+I:15000:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:48:Flarim the Shopkeeper(Dunadan)
-I:25000:120:110:7:19
+I:25000:110
 C:120:100:80
-L:Human | Dunadan | RohanKnight
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:49:Tril-akheb the Supreme(Elf)
-I:30000:140:105:6:12
-C:120:100:80
-L:Elf | Half-Elf | Dark-Elf | High-Elf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+I:30000:110
+C:120:100:80
+L:Dark-Elf
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:50:Dorchel(Elf)
-I:30000:140:105:6:12
-C:120:100:80
-L:Elf | Half-Elf | Dark-Elf | High-Elf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+I:30000:110
+C:120:100:80
+L:Dark-Elf
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:51:Galadriel(High-Elf)
-I:15000:120:105:6:16
+I:15000:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:52:Celeborn(High-Elf)
-I:15000:120:105:6:16
+I:15000:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:53:Aulendil(Elf)
-I:30000:140:105:6:12
+I:30000:110
 C:120:100:80
 #L:Warrior |
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:54:Valceronwe(Elf)
-I:30000:140:105:6:12
+I:30000:110
 C:120:100:80
 #L:Mage | Thaumaturgist | Sorceror
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:55:Voronwe(Elf)
-I:30000:140:105:6:12
+I:30000:110
 C:120:100:80
 #L:Priest | Paladin
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:56:Celegail(Elf)
-I:30000:140:105:6:12
+I:30000:110
 C:120:100:80
 #L:Ranger
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:57:Turgon(High-Elf)
-I:30000:120:105:6:16
+I:30000:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:58:Pengolodh(High-Elf)
-I:0:120:105:6:16
+I:0:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:59:Aerandir(High-Elf)
-I:0:120:105:6:16
+I:0:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:60:Celebrimbor(High-Elf)
-I:0:120:105:6:16
+I:0:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
+L:Elf
+L:Half-Elf
+L:High-Elf
 #L:Warrior |
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:61:Lomelosse(High-Elf)
-I:0:120:105:6:16
+I:0:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf |
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:62:Arlindel(High-Elf)
-I:0:120:105:6:16
+I:0:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
+L:Elf
+L:Half-Elf
+L:High-Elf
 #L:Harper | Ranger
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:63:Sulraen(High-Elf)
-I:0:120:105:6:16
+I:0:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
+L:Elf
+L:Half-Elf
+L:High-Elf
 #L:Mage | Sorceror
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:64:Firiel(High-Elf)
-I:0:120:105:6:16
+I:0:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf |
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:65:Earendur(High-Elf)
-I:0:120:105:6:16
+I:0:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:66:Glorfindel(High-Elf)
-I:0:120:105:6:16
+I:0:110
 C:120:100:80
-L:High-Elf | Half-Elf
+L:Half-Elf
+L:High-Elf
 #L:Ranger
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:67:Ecthelion(High-Elf)
-I:0:120:105:6:16
+I:0:110
 C:120:100:80
-L:High-Elf | Half-Elf
+L:Half-Elf
+L:High-Elf
 #L:Paladin
-H:Orc | Troll | Half-Ogre | Beorning | Kobold |
+H:Beorning
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
 
 N:68:Kanris(Human)
-I:5000:210:115:6:6
+I:5000:140
 C:120:100:80
-#L:Merchant
-#H:Rogue
 
 N:69:Barliman Butterbur(Human)
-I:100:170:108:4:10
+I:100:120
 C:120:100:80
-L:Dunadan | Hobbit | Human |
-H:Orc | Troll | DeathMold | Half-Ogre | Beorning | Kobold |
+L:Dunadan
+L:Hobbit
+L:Human
+H:Beorning
+H:DeathMold
+H:Half-Ogre
+H:Kobold
+H:Orc
+H:Troll
diff --git a/lib/edit/p_info.txt b/lib/edit/p_info.txt
index 1531f4fd..5cb2e5cd 100644
--- a/lib/edit/p_info.txt
+++ b/lib/edit/p_info.txt
@@ -8,8 +8,6 @@
 # Do not modify this file unless you know exactly what you are doing,
 # unless you wish to risk possible system crashes and broken savefiles.
 
-V:2.0.0
-
 ##############################################################################
 ##############################################################################
 ##############################################################################
@@ -31,7 +29,6 @@ G:k:+1000:+1000:Magic-Device
 # C:D:1:titles
 # C:S:str:int:wis:dex:con:chr:mana:bonus blows
 # C:K:dis:dev:sav:stl:srh:fos:thn:thb
-# C:X:dis:dev:sav:stl:srh:fos:thn:thb
 # C:P:hitdie:xp%
 # C:B:num:wgt:mul
 # C:C:(H|L):(H|L):base:pl:plus
@@ -54,7 +51,7 @@ G:k:+1000:+1000:Magic-Device
 # C:a:b:level:ability
 # C:a:O:tval:sval:xdy
 
-C:N:0:Warrior
+C:N:0:0:Warrior
 C:D:0:Simple fighters, they hack away with their trusty weapon.
 C:D:1:Rookie
 C:D:1:Soldier
@@ -67,10 +64,7 @@ C:D:1:Baron
 C:D:1:Duke
 C:D:1:Lord
 C:S:5:-2:-2:2:2:-1:0:0
-C:K:10:10:0:1:10:10:10:10
-C:X:0:0:0:0:0:0:0:0
 C:B:4:30:5
-C:C:H:L:9000:2:40
 C:P:9:0
 C:R:30:0
 C:F:RES_FEAR
@@ -84,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
@@ -175,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
@@ -186,7 +176,7 @@ C:a:g:Manwe Sulimo
 C:a:g:Tulkas
 C:a:g:Melkor Bauglir
 
-C:N:1:Mage
+C:N:1:3:Mage
 C:D:0:The basic spellcaster with lots of different skills
 C:D:1:Apprentice
 C:D:1:Trickster
@@ -199,10 +189,7 @@ C:D:1:Sorcerer
 C:D:1:Ipsissimus
 C:D:1:Archimage
 C:S:-5:3:0:1:-2:1:50:0
-C:K:10:10:0:1:10:10:10:10
-C:X:0:0:0:0:0:0:0:0
 C:B:4:40:2
-C:C:L:H:240000:1:5
 C:P:0:30
 C:E:0:0:0:0:0:0
 C:k:+1000:+900:Magic
@@ -220,12 +207,10 @@ C:k:+0:+700:Nature
 C:k:+0:+700:Meta
 C:k:+0:+700:Mind
 C:k:+0:+700:Necromancy
-C:k:+0:+700:Runecraft
 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
@@ -298,7 +283,6 @@ C:a:k:+0:+300:Divination
 C:a:k:+0:+300:Meta
 C:a:k:+0:+300:Mind
 C:a:k:+0:+200:Necromancy
-C:a:k:+0:+200:Runecraft
 C:a:k:+0:+200:Thaumaturgy
 C:a:O:36:2:1d1
 C:a:O:111:50:1d1
@@ -320,17 +304,6 @@ C:a:O:23:4:1d1
 C:a:O:111:50:1d1
 C:a:b:25:Undead Form
 
-C:a:N:Runecrafter
-C:a:D:Runecrafters use the runes found in Middle-earth to create
-C:a:D:finely tuned spells for each specific situation.
-C:a:k:+1000:+50:Magic
-C:a:k:+1000:+300:Runecraft
-C:a:k:+0:-100:Weaponmastery
-C:a:O:111:50:1d1
-C:a:O:105:1:1d1
-C:a:O:104:5:1d1
-C:a:O:23:4:1d1
-
 C:a:N:Thaumaturgist
 C:a:D:Thaumaturgy spells come from within and are different for each character.
 C:a:D:Since attack is the best defence, all their spells are offensive.
@@ -342,36 +315,7 @@ C:a:k:+0:-150:Magic-Device
 C:a:O:23:4:1d1
 C:a:O:111:50:1d1
 
-C:a:N:Alchemist
-C:a:D:Alchemists can quickly create powerful magic items through the correct use
-C:a:D:of the essences of magic they can extract from magical objects.
-C:a:k:+2000:+0:Magic
-C:a:k:+0:-600:Spell-power
-C:a:k:+0:-600:Necromancy
-C:a:k:+0:-600:Thaumaturgy
-C:a:k:+0:+250:Spirituality
-C:a:k:+0:+500:Combat
-C:a:k:+0:+200:Weaponmastery
-C:a:k:-1000:-600:Mana
-C:a:k:+0:-600:Fire
-C:a:k:+0:-600:Water
-C:a:k:+0:-600:Air
-C:a:k:+0:-600:Earth
-C:a:k:+0:-600:Conveyance
-C:a:k:+0:-600:Nature
-C:a:k:+0:-600:Temporal
-C:a:k:+0:-200:Divination
-C:a:k:+0:-200:Meta
-C:a:k:+0:-600:Mind
-C:a:k:+1000:+800:Alchemy
-C:a:k:+0:+50:Magic-Device
-C:a:O:31:1:1d1
-C:a:O:4:2:6d1
-C:a:O:2:1:1d1
-C:a:O:23:4:1d1
-C:a:G:EXPERIMENTAL
-
-C:N:2:Archer
+C:N:2:1:Archer
 C:D:0:'Kill them before they see you' could be the motto of the archer class.
 C:D:0:As deadly with a bow as a warrior is with a sword.
 C:D:1:Rock Thrower
@@ -385,10 +329,7 @@ C:D:1:Archer
 C:D:1:Archer
 C:D:1:Great Archer
 C:S:2:1:0:2:1:1:0:0
-C:K:10:10:0:1:10:10:10:10
-C:X:0:0:0:0:0:0:0:0
 C:B:4:35:4
-C:C:H:L:9000:2:40
 C:P:4:30
 C:E:0:0:0:0:0:0
 C:k:+1000:+800:Combat
@@ -399,9 +340,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
@@ -429,8 +368,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
@@ -440,9 +377,9 @@ C:a:g:Manwe Sulimo
 C:a:g:Tulkas
 C:a:g:Yavanna Kementari
 
-C:N:3:Rogue
+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
@@ -454,10 +391,7 @@ C:D:1:Master Thief
 C:D:1:Assassin
 C:D:1:Guildmaster
 C:S:2:1:-2:3:1:-1:0:0
-C:K:10:10:0:1:10:10:10:10
-C:X:0:0:0:0:0:0:0:0
 C:B:4:30:3
-C:C:H:H:20000:2:40
 C:P:6:25
 C:O:23:4:1d1
 C:G:EASE_STEAL
@@ -504,9 +438,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
@@ -516,8 +448,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.
@@ -531,12 +461,11 @@ 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
 
-C:N:4:Loremaster
+C:N:4:5:Loremaster
 C:D:0:Loremasters are skilled in most combat and monster skills.
 C:D:1:Apprentice
 C:D:1:Apprentice
@@ -549,10 +478,7 @@ C:D:1:Lorekeeper
 C:D:1:Loremaster
 C:D:1:Loremaster
 C:S:1:-2:1:1:0:1:0:0
-C:K:10:10:0:1:10:10:10:10
-C:X:0:0:0:0:0:0:0:0
 C:B:4:30:3
-C:C:H:L:9000:2:40
 C:P:8:40
 C:E:0:0:0:0:0:0
 C:k:+1000:+700:Combat
@@ -560,9 +486,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
@@ -591,7 +515,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
@@ -609,7 +532,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
@@ -627,7 +549,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
@@ -646,9 +567,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
@@ -667,9 +586,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
@@ -691,7 +608,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
@@ -699,7 +615,7 @@ C:a:k:+0:-100:Symbiosis
 C:a:k:+0:-100:Mimicry
 C:a:k:+1000:+500:Music
 
-C:N:5:Priest
+C:N:5:4:Priest
 C:D:0:A priest serves a god (Vala, Maia or Eru himself) to bring down
 C:D:0:the empire of fear and shadows of Morgoth.
 C:D:1:Believer
@@ -713,13 +629,10 @@ C:D:1:Cardinal
 C:D:1:Inquisitor
 C:D:1:Pope
 C:S:-1:-3:3:-1:0:2:0:0
-C:K:10:10:0:1:10:10:10:10
-C:X:0:0:0:0:0:0:0:0
 C:B:4:35:3
-C:C:L:H:10000:2:40
 C:P:2:20
 C:Z:detect curses
-C:G:GOD_FRIEND |
+C:G:GOD_FRIEND
 C:E:0:0:0:0:0:0
 C:k:+1000:+900:Magic
 C:k:+0:+600:Spell-power
@@ -729,8 +642,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
@@ -798,50 +709,8 @@ 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
 
-###############################TEST###############################
-C:N:30:Test
-C:D:0:Simple testers.
-C:D:1:Rookie
-C:D:1:Soldier
-C:D:1:Mercenary
-C:D:1:Veteran
-C:D:1:Swordsman
-C:D:1:Champion
-C:D:1:Hero
-C:D:1:Baron
-C:D:1:Duke
-C:D:1:Lord
-C:S:5:-2:-2:2:2:-1:0:3
-C:K:10:10:0:1:10:10:10:10
-C:X:0:0:0:0:0:0:0:0
-C:B:6:30:5
-C:C:H:L:9000:2:40
-C:P:9:0
-C:R:30:0
-C:F:RES_FEAR
-C:E:0:0:0:0:0:0
-C:O:45:38:1d1
-C:O:37:4:1d1
-C:k:+1000:+800:Combat
-C:k:+1000:+850:Weaponmastery
-C:k:+0:+200:Sword-mastery
-C:k:+0:+200:Axe-mastery
-C:k:+0:+200:Hafted-mastery
-C:k:+0:+200:Polearm-mastery
-C:k:+1000:+600:Archery
-C:k:+1000:+900:Sneakiness
-C:k:+1000:+900:Disarming
-C:k:+1000:+300:Magic
-C:k:+0:+550:Antimagic
-
-C:a:N:Shinny test
-C:a:D:Simple testers, they test all with their shiny hacks !
-C:a:O:23:16:1d1
-###############################TEST###############################
-
 
 
 
@@ -856,8 +725,7 @@ C:a:O:23:16:1d1
 # R:D:race desc
 # R:S:str:int:wis:dex:con:chr:luck
 # R:K:dis:dev:sav:stl:srh:fos:thn:thb
-# R:P:hitdie:xp%:infra:history chart
-# R:M:b_age:m_age:m_b_ht:m_m_ht:m_b_wt:m_m_wt:f_b_ht:f_m_ht:f_b_wt:f_m_wt
+# R:P:hitdie:xp%:infra
 # R:E:weapons:torso:arms:finger:head:legs
 # R:C:allowed classes
 # R:G:race flags
@@ -873,26 +741,30 @@ R:D:Humans are the second born, the Edain.
 R:D:They are the basic race to which all others are compared.
 R:D:Average in ability, they can be any class.
 R:S:0:0:0:0:0:0:0
-R:K:0:0:0:0:0:10:0:0
-R:P:10:100:0:1
-R:M:14:6:72:6:180:25:66:4:150:20
+R:P:10:100:0
 R:E:1:1:1:2:1:1
-R:C:Warrior | Archer | Mage | Rogue | Priest | Loremaster
+R:C:Archer
+R:C:Loremaster
+R:C:Mage
+R:C:Priest
+R:C:Rogue
+R:C:Warrior
 
 R:N:1:Half-Elf
 R:D:A crossbreed of elf and human, they get the best of the two races.
 R:S:0:1:1:1:-1:1:0
-R:K:2:3:3:1:6:11:-1:5
-R:P:9:110:2:4
-R:M:24:16:66:6:130:15:62:6:100:10
+R:P:9:110:2
 R:E:1:1:1:2:1:1
-R:C:Warrior | Archer | Mage | Rogue | Priest | Loremaster
+R:C:Archer
+R:C:Loremaster
+R:C:Mage
+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
 
@@ -901,19 +773,19 @@ R:D:Elves are the first born, the Eldar.
 R:D:More spiritual than physical beings, they are weaker than humans
 R:D:but are more intelligent.
 R:S:-1:2:2:1:-2:2:0
-R:K:5:6:6:2:8:12:-5:15
-R:P:8:120:3:5
-R:M:75:75:60:4:100:6:54:4:80:6
+R:P:8:120:3
 R:E:1:1:1:2:1:1
 R:R:1:0
-R:F:RES_LITE | 
-R:C:Warrior | Archer | Mage | Priest | Loremaster
+R:F:RES_LITE
+R:C:Archer
+R:C:Loremaster
+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
 
@@ -921,21 +793,22 @@ R:N:3:Hobbit
 R:D:An old but quiet race related to humans.
 R:D:They are small and quite weak but good at many things.
 R:S:-2:2:1:3:2:1:5
-R:K:15:18:18:5:12:15:-10:20
-R:P:7:110:4:10
-R:M:21:12:36:3:60:3:33:3:50:3
+R:P:7:110:4
 R:E:1:1:1:2:1:1
 R:Z:create food
-R:G:RESIST_BLACK_BREATH | XTRA_MIGHT_SLING |
+R:G:RESIST_BLACK_BREATH
+R:G:XTRA_MIGHT_SLING
 R:R:1:0
-R:F:SUST_DEX | 
-R:C:Warrior | Archer | Mage | Rogue | Loremaster
+R:F:SUST_DEX
+R:C:Archer
+R:C:Loremaster
+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
 
@@ -943,19 +816,17 @@ R:N:4:Gnome
 R:D:Related to dwarves, Gnomes are between Dwarves and Hobbits in size.
 R:D:Very good at magic use, they are poor as fighters.
 R:S:-1:2:0:2:1:-2:2
-R:K:10:12:12:3:6:13:-8:12
-R:P:8:135:4:13
-R:M:50:40:42:3:90:6:39:3:75:3
+R:P:8:135:4
 R:E:1:1:1:2:1:1
 R:Z:blink
 R:R:1:0
-R:F:FREE_ACT | 
-R:C:Warrior | Mage | Rogue
-R:k:+1000:+000:Disarming
+R:F:FREE_ACT
+R:C:Mage
+R:C:Rogue
+R:C:Warrior
 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
 
@@ -963,39 +834,35 @@ R:N:5:Dwarf
 R:D:The children of Aule, a strong but small race.
 R:D:Miners and fighters of legend.
 R:S:2:-2:2:-2:2:-3:0
-R:K:2:9:10:-1:7:10:15:0
-R:P:11:125:5:16
-R:M:35:15:48:3:150:10:46:3:120:10
+R:P:11:125:5
 R:E:1:1:1:2:1:1
 R:Z:find secret passages
 R:R:1:0
-R:F:RES_BLIND | 
-R:C:Warrior | Priest
+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
 
 R:N:6:Orc
 R:D:Quite strong but not very smart.
 R:S:2:-1:0:1:1:-4:-3
-R:K:-3:-3:-3:-1:0:7:12:-5
-R:P:10:110:3:25
-R:M:11:4:66:1:150:5:62:1:120:5
+R:P:10:110:3
 R:E:1:1:1:2:1:1
 R:Z:remove fear
 R:R:1:0
-R:F:RES_DARK | 
-R:C:Warrior | Archer | Rogue | Priest
-R:k:-300:+000:Disarming
+R:F:RES_DARK
+R:C:Archer
+R:C:Priest
+R:C:Rogue
+R:C:Warrior
 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
 
@@ -1003,21 +870,17 @@ R:N:7:Troll
 R:D:They can bear the light of the sun.
 R:D:They are extremely strong and dumb.
 R:S:4:-4:-2:-4:3:-6:-4
-R:K:-5:-8:-8:-2:-1:5:20:-10
-R:P:12:137:3:22
-R:M:20:10:96:10:250:50:84:8:225:40
+R:P:12:137:3
 R:E:1:1:1:2:1:1
 R:Z:berserk
 R:R:1:0
-R:F:SUST_STR | 
+R:F:SUST_STR
 R:R:15:0
-R:F:REGEN | 
+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
 
@@ -1025,18 +888,20 @@ R:N:8:Dunadan
 R:D:The greatest of the Edain, humans in all respects but
 R:D:stronger, smarter and wiser.
 R:S:1:2:2:2:3:2:2
-R:K:4:5:5:2:3:13:15:10
-R:P:10:180:0:1
-R:M:50:50:82:5:190:20:78:6:180:15
+R:P:10:180:0
 R:E:1:1:1:2:1:1
 R:R:1:0
-R:F:SUST_CON | REGEN | 
-R:C:Warrior | Archer | Mage | Rogue | Priest | Loremaster
-R:k:+400:+000:Disarming
+R:F:REGEN
+R:F:SUST_CON
+R:C:Archer
+R:C:Loremaster
+R:C:Mage
+R:C:Priest
+R:C:Rogue
+R:C:Warrior
 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
 
@@ -1045,20 +910,20 @@ R:D:Elves are the first born, the Eldar.
 R:D:High elves are the best of the Eldar, strong, fast, intellectual, though
 R:D:they sometimes lack wisdom.
 R:S:1:3:2:3:1:5:0
-R:K:4:20:20:4:3:14:10:25
-R:P:10:200:4:7
-R:M:100:30:90:10:190:20:82:10:180:15
+R:P:10:200:4
 R:E:1:1:1:2:1:1
 R:R:1:0
-R:F:SEE_INVIS | 
-R:F:RES_LITE | 
+R:F:RES_LITE
+R:F:SEE_INVIS
 R:G:ELF
-R:C:Warrior | Archer | Mage | Priest | Loremaster
-R:k:+400:+000:Disarming
+R:C:Archer
+R:C:Loremaster
+R:C:Mage
+R:C:Priest
+R:C:Warrior
 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
 
@@ -1066,19 +931,17 @@ R:N:10:Half-Ogre
 R:D:A crossbreed between a human and an ogre.
 R:D:They are similar to half-trolls, strong and dumb.
 R:S:3:-1:-1:-1:3:-3:-2
-R:K:-3:-5:-5:-2:-1:5:20:0
-R:P:12:130:3:74
-R:M:40:10:92:10:255:60:80:8:235:60
+R:P:12:130:3
 R:E:1:1:1:2:1:1
 R:Z:set explosive rune
 R:R:1:0
-R:F:SUST_STR | RES_DARK | 
-R:C:Warrior | Priest
-R:k:-300:+000:Disarming
+R:F:RES_DARK
+R:F:SUST_STR
+R:C:Priest
+R:C:Warrior
 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
 
@@ -1086,41 +949,37 @@ R:N:11:Beorning
 R:D:A race of men shapeshifters.
 R:D:They have the unique power of being able to polymorph to bear forms.
 R:S:4:-2:-2:-1:3:-5:1
-R:K:-6:-8:-6:-2:-1:5:25:5
-R:P:12:150:3:75
-R:M:40:10:100:10:255:65:80:10:240:64
+R:P:12:150:3
 R:E:1:1:1:2:1:1
 R:Z:turn into a bear
 R:R:1:0
-R:F:SUST_STR | 
+R:F:SUST_STR
 R:R:20:1
-R:F:STR | 
-R:C:Warrior | Rogue | Loremaster
+R:F:STR
+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
 
 R:N:12:Kobold
 R:D:A weaker kind of goblin, related to orcs.
 R:S:1:-1:0:1:0:-4:0
-R:K:-2:-3:-2:-1:1:8:10:-8
-R:P:9:125:3:82
-R:M:11:3:60:1:130:5:55:1:100:5
+R:P:9:125:3
 R:E:1:1:1:2:1:1
 R:Z:poison dart
 R:R:1:0
-R:F:RES_POIS | 
-R:C:Warrior | Archer | Rogue
-R:k:-200:+000:Disarming
+R:F:RES_POIS
+R:C:Archer
+R:C:Rogue
+R:C:Warrior
 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
 
@@ -1128,19 +987,17 @@ R:N:13:Petty-Dwarf
 R:D:A nearly extinct subrace of dwarves.
 R:D:They prefer to live in the darkness.
 R:S:1:-1:2:0:2:-4:-5
-R:K:3:5:10:1:5:10:9:0
-R:P:11:135:5:87
-R:M:40:12:43:3:92:6:40:3:78:3
+R:P:11:135:5
 R:E:1:1:1:2:1:1
 R:Z:detect doors and traps
 R:R:1:0
-R:F:RES_DARK | RES_DISEN | 
-R:C:Warrior | Rogue
-R:k:+300:+000:Disarming
+R:F:RES_DARK
+R:F:RES_DISEN
+R:C:Rogue
+R:C:Warrior
 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
 
@@ -1149,23 +1006,23 @@ R:D:Elves are the first born, the Eldar.
 R:D:Dark elves are rare on Middle-earth and even though not evil
 R:D:they are not good.
 R:S:-1:3:2:2:-2:1:-2
-R:K:5:15:20:3:8:12:-5:10
-R:P:9:150:5:69
-R:M:75:75:60:4:100:6:54:4:80:6
+R:P:9:150:5
 R:E:1:1:1:2:1:1
 R:Z:magic missile
 R:R:1:0
-R:F:RES_DARK | 
+R:F:RES_DARK
 R:R:20:0
-R:F:SEE_INVIS | 
-R:C:Warrior | Archer | Mage | Rogue | Priest
+R:F:SEE_INVIS
+R:C:Archer
+R:C:Mage
+R:C:Priest
+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
 
@@ -1173,30 +1030,32 @@ R:N:15:Ent
 R:D:Guardian of the forests of Middle-earth, summoned by Yavanna before
 R:D:even the elves awoke. It is said 'Trolls are strong, Ents are STRONGER'.
 R:S:10:-3:2:-5:11:-3:-2
-R:K:5:5:20:-6:5:4:15:5
-R:P:14:210:5:95
-R:M:255:70:72:6:100:25:66:4:100:20
+R:P:14:210:5
 R:E:1:1:1:2:1:1
 R:Z:grow trees
-R:G:NO_STUN | NO_FOOD |
-R:G:AC_LEVEL | 
+R:G:AC_LEVEL
+R:G:NO_FOOD
+R:G:NO_STUN
 R:R:1:-5
-R:F:SPEED | SENS_FIRE | SLOW_DIGEST | 
+R:F:SENS_FIRE
+R:F:SLOW_DIGEST
+R:F:SPEED
 R:R:5:0
-R:F:SEE_INVIS | 
+R:F:SEE_INVIS
 R:R:20:0
-R:F:ESP_ORC | 
-R:F:ESP_TROLL | ESP_EVIL | 
-R:C:Warrior | Priest | Loremaster
+R:F:ESP_EVIL
+R:F:ESP_ORC
+R:F:ESP_TROLL
+R:C:Loremaster
+R:C:Priest
+R:C:Warrior
 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
 
@@ -1204,71 +1063,66 @@ R:N:16:RohanKnight
 R:D:Humans from the land of Rohan, riding the great Mearas.
 R:D:Fast and powerful in battle.
 R:S:4:-2:3:1:4:2:0
-R:K:10:5:5:-8:1:1:5:5
-R:P:10:220:0:84
-R:M:20:3:60:3:80:4:54:3:70:4
+R:P:10:220:0
 R:E:1:1:1:2:1:1
 R:Z:Rohan Knight's Powers
 R:R:1:3
-R:F:SPEED | 
+R:F:SPEED
 R:R:5:1
-R:F:SPEED | 
+R:F:SPEED
 R:R:10:1
-R:F:SPEED | 
+R:F:SPEED
 R:R:15:1
-R:F:SPEED | 
+R:F:SPEED
 R:R:20:1
-R:F:SPEED | 
+R:F:SPEED
 R:R:25:1
-R:F:SPEED | 
+R:F:SPEED
 R:R:30:1
-R:F:SPEED | 
+R:F:SPEED
 R:R:35:1
-R:F:SPEED | 
+R:F:SPEED
 R:R:40:1
-R:F:SPEED | 
+R:F:SPEED
 R:R:45:1
-R:F:SPEED | 
-R:C:Warrior | Priest
-R:k:+1000:+000:Disarming
+R:F:SPEED
+R:C:Priest
+R:C:Warrior
 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.
 R:S:6:2:1:1:3:8:2
-R:K:6:0:10:-16:30:10:15:5
-R:P:12:400:0:89
-R:M:14:6:180:6:255:25:150:4:230:20
+R:P:12:400:0
 R:E:1:1:1:2:1:1
 R:Z:Thunderlord's Powers
 R:R:1:0
-R:F:FEATHER | 
+R:F:FEATHER
 R:R:4:0
-R:F:ESP_DRAGON |
+R:F:ESP_DRAGON
 R:R:5:0
-R:F:RES_ELEC | 
+R:F:RES_ELEC
 R:R:10:0
-R:F:RES_COLD | 
+R:F:RES_COLD
 R:R:15:0
-R:F:RES_ACID | 
+R:F:RES_ACID
 R:R:17:0
-R:F:FLY | 
+R:F:FLY
 R:R:35:0
-R:F:RES_POIS | 
+R:F:RES_POIS
 R:R:45:0
-R:F:IM_ELEC | 
-R:C:Warrior | Mage | Archer | Priest
-R:k:+600:+000:Disarming
+R:F:IM_ELEC
+R:C:Archer
+R:C:Mage
+R:C:Priest
+R:C:Warrior
 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
 
@@ -1276,38 +1130,38 @@ R:N:18:DeathMold
 R:D:A pure mass of evilness, DeathMolds cannot move, but they have much more
 R:D:power than an average race.
 R:S:10:0:10:0:10:-15:-5
-R:K:15:-5:15:25:0:10:25:25
-R:P:15:250:10:100
-R:M:5:15:10:1:50:1:10:1:50:1
+R:P:15:250:10
 R:E:1:1:1:4:0:0
 R:Z:Death Mold's Powers
 R:G:EXPERIMENTAL
 R:R:1:0
-R:F:IMMOVABLE | HOLD_LIFE |
-R:F:RES_NETHER | RES_NEXUS | 
-R:C:Mage | Priest
+R:F:HOLD_LIFE
+R:F:IMMOVABLE
+R:F:RES_NETHER
+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
 
 R:N:19:Yeek
 R:D:The weakest of all the races, bad at everything except gaining levels quickly.
 R:S:-5:-5:-5:-5:-5:-5:-5
-R:K:-5:-5:-10:0:-5:0:-10:-10
-R:P:6:25:2:29
-R:M:10:4:40:5:50:10:35:4:45:10
+R:P:6:25:2
 R:E:1:1:1:2:1:1
-R:C:Warrior | Archer | Mage | Rogue | Priest | Loremaster
-R:k:-500:+000:Disarming
+R:C:Archer
+R:C:Loremaster
+R:C:Mage
+R:C:Priest
+R:C:Rogue
+R:C:Warrior
 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
 
@@ -1315,22 +1169,23 @@ R:N:20:Wood-Elf
 R:D:Elves are the first born, the Eldar.
 R:D:Wood elves live in the great forests of Middle-earth.
 R:S:-3:2:1:5:-4:1:0
-R:K:5:6:6:5:8:12:-25:40
-R:P:7:130:4:5
-R:M:75:75:60:4:100:6:54:4:80:6
+R:P:7:130:4
 R:E:1:1:1:2:1:1
-R:G:XTRA_MIGHT_BOW | 
+R:G:XTRA_MIGHT_BOW
 R:R:1:1
-R:F:XTRA_MIGHT | RES_LITE | 
-R:C:Warrior | Archer | Mage | Priest | Loremaster
+R:F:RES_LITE
+R:F:XTRA_MIGHT
+R:C:Archer
+R:C:Loremaster
+R:C:Mage
+R:C:Priest
+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
 
@@ -1338,38 +1193,76 @@ R:N:21:Maia
 R:D:An old race, dating from before the creation of Arda, the Maiar were
 R:D:created by Eru to help the Valar in their task.
 R:S:0:0:0:0:0:0:4
-R:K:0:0:0:0:0:10:0:0
-R:P:10:100:0:91
-R:M:14:6:72:6:180:25:66:4:150:20
+R:P:10:100:0
 R:E:1:1:1:2:1:1
 R:G:NO_GOD
 R:R:1:0
-R:F:AGGRAVATE | 
+R:F:AGGRAVATE
 R:R:20:0
-R:F:DRAIN_EXP | 
+R:F:DRAIN_EXP
 R:R:6:1
-R:F:STR | INT | WIS | DEX | CON | CHR | 
+R:F:CHR
+R:F:CON
+R:F:DEX
+R:F:INT
+R:F:STR
+R:F:WIS
 R:R:12:1
-R:F:STR | INT | WIS | DEX | CON | CHR | 
+R:F:CHR
+R:F:CON
+R:F:DEX
+R:F:INT
+R:F:STR
+R:F:WIS
 R:R:18:1
-R:F:STR | INT | WIS | DEX | CON | CHR | 
+R:F:CHR
+R:F:CON
+R:F:DEX
+R:F:INT
+R:F:STR
+R:F:WIS
 R:R:24:1
-R:F:STR | INT | WIS | DEX | CON | CHR | 
+R:F:CHR
+R:F:CON
+R:F:DEX
+R:F:INT
+R:F:STR
+R:F:WIS
 R:R:30:1
-R:F:STR | INT | WIS | DEX | CON | CHR | 
+R:F:CHR
+R:F:CON
+R:F:DEX
+R:F:INT
+R:F:STR
+R:F:WIS
 R:R:36:1
-R:F:STR | INT | WIS | DEX | CON | CHR | 
+R:F:CHR
+R:F:CON
+R:F:DEX
+R:F:INT
+R:F:STR
+R:F:WIS
 R:R:42:1
-R:F:STR | INT | WIS | DEX | CON | CHR | 
+R:F:CHR
+R:F:CON
+R:F:DEX
+R:F:INT
+R:F:STR
+R:F:WIS
 R:R:48:1
-R:F:STR | INT | WIS | DEX | CON | CHR | 
-R:C:Warrior | Archer | Mage
-R:k:+000:+000:Disarming
+R:F:CHR
+R:F:CON
+R:F:DEX
+R:F:INT
+R:F:STR
+R:F:WIS
+R:C:Archer
+R:C:Mage
+R:C:Warrior
 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
 
@@ -1383,7 +1276,6 @@ R:k:+000:+000:Archery
 # S:S:str:int:wis:dex:con:chr:luck:mana
 # S:K:dis:dev:sav:stl:srh:fos:thn:thb
 # S:P:hitdie:xp%:infra
-# S:M:b_age:m_age:m_b_ht:m_m_ht:m_b_wt:m_m_wt:f_b_ht:f_m_ht:f_b_wt:f_m_wt
 # S:E:weapons:torso:arms:finger:head:legs
 # S:A:allowed races
 # S:C:'A'llow/'F'orbid:allowed/forbiden classes
@@ -1399,14 +1291,30 @@ I:
 S:N:0: 
 S:D:A:A normal member of the race.
 S:S:0:0:0:0:0:0:0:100
-S:K:0:0:0:0:0:0:0:0
 S:P:0:0:0
-S:M:0:0:0:0:0:0:0:0:0:0
 S:E:0:0:0:0:0:0
-S:A:Human | Half-Elf | Elf | Hobbit | Gnome | Dwarf | 
-S:A:Orc | Troll | Dunadan | High-Elf | Half-Ogre | Beorning | 
-S:A:Kobold | Petty-Dwarf | Dark-Elf | Ent | RohanKnight | Thunderlord | 
-S:A:DeathMold | Yeek | Wood-Elf | Maia | 
+S:A:Beorning
+S:A:Dark-Elf
+S:A:DeathMold
+S:A:Dunadan
+S:A:Dwarf
+S:A:Elf
+S:A:Ent
+S:A:Gnome
+S:A:Half-Elf
+S:A:Half-Ogre
+S:A:High-Elf
+S:A:Hobbit
+S:A:Human
+S:A:Kobold
+S:A:Maia
+S:A:Orc
+S:A:Petty-Dwarf
+S:A:RohanKnight
+S:A:Thunderlord
+S:A:Troll
+S:A:Wood-Elf
+S:A:Yeek
 
 # Just a place holder, the actualy setting are done with corruptions, see
 # corrupt.lua and player.lua
@@ -1414,13 +1322,23 @@ S:N:1:Vampire
 S:D:B:Vampires are powerful undead, wielding great powers. They still fear the
 S:D:B:sunlight and cannot easily satiate their hunger.
 S:S:0:0:0:0:0:0:0:100
-S:K:0:0:0:0:0:0:0:0
 S:P:0:0:0
-S:M:0:0:0:0:0:0:0:0:0:0
 S:E:0:0:0:0:0:0
-S:A:Human | Half-Elf | Hobbit | Gnome | Dwarf | Orc |
-S:A:Troll | Dunadan | Half-Ogre | Beorning | Kobold | Petty-Dwarf | 
-S:A:Dark-Elf | RohanKnight | Yeek | 
+S:A:Beorning
+S:A:Dark-Elf
+S:A:Dunadan
+S:A:Dwarf
+S:A:Gnome
+S:A:Half-Elf
+S:A:Half-Ogre
+S:A:Hobbit
+S:A:Human
+S:A:Kobold
+S:A:Orc
+S:A:Petty-Dwarf
+S:A:RohanKnight
+S:A:Troll
+S:A:Yeek
 S:C:A:Mage
 S:O:70:0:5d3
 S:O:70:32:2d3
@@ -1429,24 +1347,44 @@ S:N:2:Spectre
 S:D:B:Spectres only partially exist in the mortal world and so they can
 S:D:B:pass through walls. They are somewhat physically weak.
 S:S:-5:1:1:2:-3:-6:-3:105
-S:K:2:8:7:2:2:7:-5:-2
 S:P:-4:80:3
-S:M:50:15:0:0:-10:-5:0:0:-10:-5
 S:E:0:0:0:0:0:0
-S:A:Human | Half-Elf | Elf | Hobbit | Gnome | Dwarf | 
-S:A:Orc | Troll | Dunadan | High-Elf | Half-Ogre | Beorning | 
-S:A:Kobold | Petty-Dwarf | Dark-Elf | RohanKnight | Yeek | Wood-Elf | 
-S:C:F:Warrior | Archer
-S:G:UNDEAD | NO_CUT | NO_FOOD | SEMI_WRAITH | NO_SUBRACE_CHANGE
+S:A:Beorning
+S:A:Dark-Elf
+S:A:Dunadan
+S:A:Dwarf
+S:A:Elf
+S:A:Gnome
+S:A:Half-Elf
+S:A:Half-Ogre
+S:A:High-Elf
+S:A:Hobbit
+S:A:Human
+S:A:Kobold
+S:A:Orc
+S:A:Petty-Dwarf
+S:A:RohanKnight
+S:A:Troll
+S:A:Wood-Elf
+S:A:Yeek
+S:C:F:Archer
+S:C:F:Warrior
+S:G:NO_CUT
+S:G:NO_FOOD
+S:G:NO_SUBRACE_CHANGE
+S:G:SEMI_WRAITH
+S:G:UNDEAD
 S:R:1:0
-S:F:SEE_INVIS | HOLD_LIFE | 
-S:F:SLOW_DIGEST | RES_COLD | RES_POIS | RES_NETHER | 
+S:F:HOLD_LIFE
+S:F:RES_COLD
+S:F:RES_NETHER
+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
 
@@ -1454,70 +1392,102 @@ S:N:3:Skeleton
 S:D:B:Yet an other kind of undead. Their physical 'body' is not very vulnerable
 S:D:B:to sharp things.
 S:S:0:-2:-2:0:1:-4:-3:70
-S:K:-5:-5:5:-1:-1:8:8:0
 S:P:0:45:1
-S:M:50:15:0:0:-10:-5:0:0:-10:-5
 S:E:0:0:0:0:0:0
-S:A:Human | Half-Elf | Elf | Hobbit | Gnome | Dwarf | 
-S:A:Orc | Troll | Dunadan | High-Elf | Half-Ogre | Beorning | 
-S:A:Kobold | Petty-Dwarf | Dark-Elf | RohanKnight | Yeek | Wood-Elf | 
-S:G:UNDEAD | NO_CUT | NO_FOOD | NO_SUBRACE_CHANGE
+S:A:Beorning
+S:A:Dark-Elf
+S:A:Dunadan
+S:A:Dwarf
+S:A:Elf
+S:A:Gnome
+S:A:Half-Elf
+S:A:Half-Ogre
+S:A:High-Elf
+S:A:Hobbit
+S:A:Human
+S:A:Kobold
+S:A:Orc
+S:A:Petty-Dwarf
+S:A:RohanKnight
+S:A:Troll
+S:A:Wood-Elf
+S:A:Yeek
+S:G:NO_CUT
+S:G:NO_FOOD
+S:G:NO_SUBRACE_CHANGE
+S:G:UNDEAD
 S:R:1:0
-S:F:SEE_INVIS | HOLD_LIFE | 
-S:F:RES_POIS | RES_SHARDS | 
+S:F:HOLD_LIFE
+S:F:RES_POIS
+S:F:RES_SHARDS
+S:F:SEE_INVIS
 S:R:10:0
-S:F:RES_COLD | 
+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
 
 S:N:4:Zombie
 S:D:B:Strong and dumb is a zombie.
 S:S:2:-6:-6:1:4:-5:-4:70
-S:K:-2:-2:5:-1:-1:2:5:0
 S:P:3:45:1
-S:M:50:15:0:0:0:0:0:0:0:0
 S:E:0:0:0:0:0:0
-S:A:Human | Half-Elf | Elf | Hobbit | Gnome | Dwarf | 
-S:A:Orc | Troll | Dunadan | High-Elf | Half-Ogre | Beorning | 
-S:A:Kobold | Petty-Dwarf | Dark-Elf | RohanKnight | Yeek | Wood-Elf | 
+S:A:Beorning
+S:A:Dark-Elf
+S:A:Dunadan
+S:A:Dwarf
+S:A:Elf
+S:A:Gnome
+S:A:Half-Elf
+S:A:Half-Ogre
+S:A:High-Elf
+S:A:Hobbit
+S:A:Human
+S:A:Kobold
+S:A:Orc
+S:A:Petty-Dwarf
+S:A:RohanKnight
+S:A:Troll
+S:A:Wood-Elf
+S:A:Yeek
 S:C:F:Mage
-S:G:UNDEAD | NO_FOOD | NO_SUBRACE_CHANGE
+S:G:NO_FOOD
+S:G:NO_SUBRACE_CHANGE
+S:G:UNDEAD
 S:R:1:0
-S:F:SEE_INVIS | HOLD_LIFE | 
-S:F:SLOW_DIGEST | RES_POIS | 
+S:F:HOLD_LIFE
+S:F:RES_POIS
+S:F:SEE_INVIS
+S:F:SLOW_DIGEST
 S:R:5:0
-S:F:RES_COLD | 
+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
 
 S:N:5:Barbarian
 S:D:A:Hardy members of their race, they are strong fighters but poor spellcasters.
 S:S:2:-3:-2:1:1:-3:1:50
-S:K:-2:-10:2:-2:0:1:12:5
 S:P:1:25:0
-S:M:0:0:0:0:0:0:0:0:0:0
 S:E:0:0:0:0:0:0
-S:A:Human | Dwarf | Orc | Troll | Half-Ogre | Beorning | 
+S:A:Beorning
+S:A:Dwarf
+S:A:Half-Ogre
+S:A:Human
+S:A:Orc
+S:A:Troll
 S:C:F:Mage
 S:R:10:0
-S:F:RES_FEAR | 
-S:k:-200:+000:Disarming
+S:F:RES_FEAR
 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
 
@@ -1525,36 +1495,64 @@ S:N:6:Hermit
 S:D:A:Through years of isolation hermits can manage to increase their mana
 S:D:A:reserves but at the cost of an increased physical weakness.
 S:S:-3:1:1:-3:-3:1:0:120
-S:K:5:10:5:3:4:10:-5:-5
 S:P:-3:20:1
-S:M:0:0:0:0:0:0:0:0:0:0
 S:E:0:0:0:0:0:0
-S:A:Human | Half-Elf | Elf | Hobbit | Gnome | Dwarf | 
-S:A:Dunadan | High-Elf | Petty-Dwarf | Dark-Elf | Ent | RohanKnight | 
-S:A:Thunderlord | DeathMold | Yeek | Wood-Elf | Maia | 
-S:C:F:Warrior | Archer
-S:k:+500:+000:Disarming
+S:A:Dark-Elf
+S:A:DeathMold
+S:A:Dunadan
+S:A:Dwarf
+S:A:Elf
+S:A:Ent
+S:A:Gnome
+S:A:Half-Elf
+S:A:High-Elf
+S:A:Hobbit
+S:A:Human
+S:A:Maia
+S:A:Petty-Dwarf
+S:A:RohanKnight
+S:A:Thunderlord
+S:A:Wood-Elf
+S:A:Yeek
+S:C:F:Archer
+S:C:F:Warrior
 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
 
 S:N:8:LostSoul
 S:D:A:In some very rare occasions souls can come back from the Halls of Mandos.
 S:S:0:0:0:0:0:0:0:100
-S:K:0:0:0:0:0:0:0:0
 S:P:0:0:0
-S:M:0:0:0:0:0:0:0:0:0:0
 S:E:0:0:0:0:0:0
-S:G:ASTRAL | NO_SUBRACE_CHANGE
+S:G:ASTRAL
+S:G:NO_SUBRACE_CHANGE
 S:R:1:0
 S:F:SEE_INVIS
-S:A:Human | Half-Elf | Elf | Hobbit | Gnome | Dwarf | 
-S:A:Orc | Troll | Dunadan | High-Elf | Half-Ogre | Beorning | 
-S:A:Kobold | Petty-Dwarf | Dark-Elf | Ent | RohanKnight | Thunderlord | 
-S:A:DeathMold | Yeek | Wood-Elf | Maia | 
+S:A:Beorning
+S:A:Dark-Elf
+S:A:DeathMold
+S:A:Dunadan
+S:A:Dwarf
+S:A:Elf
+S:A:Ent
+S:A:Gnome
+S:A:Half-Elf
+S:A:Half-Ogre
+S:A:High-Elf
+S:A:Hobbit
+S:A:Human
+S:A:Kobold
+S:A:Maia
+S:A:Orc
+S:A:Petty-Dwarf
+S:A:RohanKnight
+S:A:Thunderlord
+S:A:Troll
+S:A:Wood-Elf
+S:A:Yeek
 S:O:70:32:25d2
 S:O:70:12:25d3
 
@@ -1562,413 +1560,5 @@ S:O:70:12:25d3
 S:N:9:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 S:D:A:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 S:S:0:0:0:0:0:0:0:100
-S:K:0:0:0:0:0:0:0:0
 S:P:0:0:0
-S:M:0:0:0:0:0:0:0:0:0:0
 S:E:0:0:0:0:0:0
-
-
-##############################################################################
-##############################################################################
-##############################################################################
-##############################################################################
-# H: Race history
-# H:index:chance:chart:next chart:social class bonus:desc
-
-# Dunadan, Human: 1 -> 2 -> 3 -> 50 -> 51 -> 52 -> 53.
-# RohanKnight:   84 -> 85 -> 50 -> 51 -> 52 -> 53.
-# Half-Ogre:     74 -> 20 -> 2 -> 3 -> 50 -> 51 -> 52 -> 53.
-# Beorning:      75 -> 76 -> 20 -> 2 -> 3 -> 50 -> 51 -> 52 -> 53.
-# Half-elf:       4 -> 1 -> 2 -> 3 -> 50 -> 51 -> 52 -> 53.
-# Elf,  Wood-elf: 5 -> 6 -> 9 -> 54 -> 55 -> 56.
-# High-elf:       7 -> 8 -> 9 -> 54 -> 55 -> 56.
-# Dark-elf:      69 -> 70 -> 71 -> 72 -> 73.
-# Hobbit:        10 -> 11 -> 3 -> 50 -> 51 -> 52 -> 53.
-# Gnome:         13 -> 14 -> 3 -> 50 -> 51 -> 52 -> 53.
-# Dwarf:         16 -> 17 -> 18 -> 57 -> 58 -> 59 -> 60 -> 61.
-# Petty-Dwarf:   87 -> 88 -> 18 -> 57 -> 58 -> 59 -> 60 -> 61.
-# Thunderlord:   89 -> 90 -> 93 -> 94.
-# Maia:          91 -> 92 -> 93 -> 94.
-# Ent:           95 -> 96.
-# Troll:         22 -> 23 -> 24 -> 62 -> 63 -> 64 -> 65 -> 66.
-# Orc            25 -> 26 -> 27 -> 28 -> 80 -> 81 -> 65 -> 66.
-# Yeek:          29 -> 3 -> 50 -> 51 -> 52 -> 53.
-#   (not used:   78 -> 79 -> 80 -> 81 -> 65 -> 66.)
-# Kobold:        82 -> 83 -> 80 -> 81 -> 65 -> 66.
-# Deathmold:    100 -> 101 -> 102 -> 103 -> 104.
-
-H:0:10:1:2:25:You are the illegitimate and unacknowledged child 
-H:1:20:1:2:35:You are the illegitimate but acknowledged child 
-H:2:95:1:2:45:You are one of several children 
-H:3:100:1:2:50:You are the first child 
-
-H:4:40:2:3:65:of a Serf.  
-H:5:65:2:3:80:of a Yeoman.  
-H:6:80:2:3:90:of a Townsman.  
-H:7:90:2:3:105:of a Guildsman.  
-H:8:96:2:3:120:of a Landed Knight.  
-H:9:99:2:3:130:of a Noble Lord.  
-H:10:100:2:3:140:of the Royal Blood Line.  
-
-H:11:20:3:50:20:You are the black sheep of the family.  
-H:12:80:3:50:55:You are a credit to the family.  
-H:13:100:3:50:60:You are a well-liked child.  
-
-H:14:25:4:1:40:Your mother was of the Avari.  
-H:15:40:4:1:50:Your father was of the Avari.  
-H:16:65:4:1:60:Your mother was of the Nandor.  
-H:17:80:4:1:60:Your father was of the Nandor.  
-H:18:96:4:1:70:Your mother was of the Sindar.  
-H:19:99:4:1:70:Your father was of the Sindar.  
-H:20:100:4:1:100:Your ancestry traces to Elrond.  
-
-H:21:60:5:6:50:You are one of several children 
-H:22:100:5:6:55:You are the only child 
-
-H:23:40:6:9:40:of an Avarin 
-H:24:70:6:9:50:of a Nandorin 
-H:25:100:6:9:60:of a Sindarin 
-
-H:26:60:7:8:50:You are one of several children 
-H:27:100:7:8:55:You are the only child 
-
-H:28:75:8:9:50:of a Telerin 
-H:29:95:8:9:55:of a Noldorin 
-H:30:100:8:9:60:of a Vanyarin 
-
-H:31:40:9:54:80:Ranger.  
-H:32:70:9:54:90:Archer.  
-H:33:87:9:54:110:Warrior.  
-H:34:95:9:54:125:Mage.  
-H:35:99:9:54:140:Prince.  
-H:36:100:9:54:145:King.  
-
-H:37:85:10:11:45:You are one of several children of a Hobbit 
-H:38:100:10:11:55:You are the only child of a Hobbit 
-
-H:39:20:11:3:55:Bum.  
-H:40:30:11:3:80:Tavern Owner.  
-H:41:40:11:3:90:Miller.  
-H:42:50:11:3:100:Home Owner.  
-H:43:80:11:3:110:Burglar.  
-H:44:95:11:3:115:Warrior.  
-H:45:99:11:3:125:Mage.  
-H:46:100:11:3:140:Clan Elder.  
-
-H:47:85:13:14:45:You are one of several children of a Gnome 
-H:48:100:13:14:55:You are the only child of a Gnome 
-
-H:49:20:14:3:55:Beggar.  
-H:50:50:14:3:70:Braggart.  
-H:51:75:14:3:85:Prankster.  
-H:52:95:14:3:100:Warrior.  
-H:53:100:14:3:125:Mage.  
-
-H:54:25:16:17:40:You are one of two children of a Dwarven 
-H:55:100:16:17:50:You are the only child of a Dwarven 
-
-H:56:10:17:18:60:Thief.  
-H:57:35:17:18:80:Smith.  
-H:58:75:17:18:90:Miner.  
-H:59:90:17:18:110:Warrior.  
-H:60:99:17:18:130:Priest.  
-H:61:100:17:18:150:King.  
-
-H:62:15:18:57:10:You are the black sheep of the family.  
-H:63:85:18:57:50:You are a credit to the family.  
-H:64:100:18:57:55:You are a well liked child.  
-
-H:65:100:20:2:50:You are the adopted child 
-
-H:66:100:22:23:50:You are the offspring of a 
-
-H:67:30:23:24:20:Forest-Troll 
-H:68:60:23:24:25:Cave-Troll 
-H:69:75:23:24:30:Hill-Troll 
-H:70:90:23:24:35:Stone-Troll 
-H:71:95:23:24:40:Snow-Troll 
-H:72:100:23:24:45:Water-Troll 
-
-H:73:25:24:62:50:Worker.  
-H:74:95:24:62:55:Warrior.  
-H:75:99:24:62:65:Shaman.  
-H:76:100:24:62:80:Clan Chief.  
-
-H:77:100:25:26:50:You are one of several children of 
-
-H:78:40:26:27:40:a Snaga 
-H:79:80:26:27:50:an Orc 
-H:80:100:26:27:60:an Uruk 
-
-H:81:30:27:28:20:Slave 
-H:82:60:27:28:50:Archer 
-H:83:90:27:28:60:Warrior 
-H:84:95:27:28:80:Shaman 
-H:85:100:27:28:100:Chieftain 
-
-H:86:30:28:80:50:from the Misty Mountains.  
-H:87:60:28:80:50:from the Grey Mountains.  
-H:88:90:28:80:70:from the orc-hold of Mount Gundabad.  
-H:89:100:28:80:80:from the Pits of Angband.  
-
-H:90:25:29:3:50:You are one of five children of a blue Yeek.  
-H:91:75:29:3:75:You are one of five children of a brown Yeek.  
-H:92:100:29:3:100:You are one of five children of a master Yeek.  
-
-H:93:20:50:51:50:You have dark brown eyes, 
-H:94:60:50:51:50:You have brown eyes, 
-H:95:70:50:51:50:You have hazel eyes, 
-H:96:80:50:51:50:You have green eyes, 
-H:97:90:50:51:50:You have blue eyes, 
-H:98:100:50:51:50:You have blue-gray eyes, 
-
-H:99:70:51:52:50:straight 
-H:100:90:51:52:50:wavy 
-H:101:100:51:52:50:curly 
-
-H:102:30:52:53:50:black hair, 
-H:103:70:52:53:50:brown hair, 
-H:104:80:52:53:50:auburn hair, 
-H:105:90:52:53:50:red hair, 
-H:106:100:52:53:50:blond hair, 
-
-H:107:10:53:0:50:and a very dark complexion.
-H:108:30:53:0:50:and a dark complexion.
-H:109:80:53:0:50:and an average complexion.
-H:110:90:53:0:50:and a fair complexion.
-H:111:100:53:0:50:and a very fair complexion.
-
-H:112:85:54:55:50:You have light grey eyes, 
-H:113:95:54:55:50:You have light blue eyes, 
-H:114:100:54:55:50:You have light green eyes, 
-
-H:115:75:55:56:50:straight 
-H:116:100:55:56:50:wavy 
-
-H:117:75:56:0:50:black hair, and a fair complexion.
-H:118:85:56:0:50:brown hair, and a fair complexion.
-H:119:95:56:0:50:blond hair, and a fair complexion.
-H:120:100:56:0:50:silver hair, and a fair complexion.
-
-H:121:99:57:58:50:You have dark brown eyes, 
-H:122:100:57:58:60:You have glowing red eyes, 
-
-H:123:90:58:59:50:straight 
-H:124:100:58:59:50:wavy 
-
-H:125:75:59:60:50:black hair, 
-H:126:100:59:60:50:brown hair, 
-
-H:127:25:60:61:50:a one foot beard, 
-H:128:60:60:61:51:a two foot beard, 
-H:129:90:60:61:53:a three foot beard, 
-H:130:100:60:61:55:a four foot beard, 
-
-H:131:100:61:0:50:and a dark complexion.
-
-H:132:60:62:63:50:You have slime green eyes, 
-H:133:85:62:63:50:You have puke yellow eyes, 
-H:134:99:62:63:50:You have blue-bloodshot eyes, 
-H:135:100:62:63:55:You have glowing red eyes, 
-
-H:136:33:63:64:50:dirty 
-H:137:66:63:64:50:mangy 
-H:138:100:63:64:50:oily 
-
-H:139:33:64:65:50:sea-weed green hair, 
-H:140:66:64:65:50:bright red hair, 
-H:141:100:64:65:50:dark purple hair, 
-
-H:142:25:65:66:50:and green 
-H:143:50:65:66:50:and blue 
-H:144:75:65:66:50:and white 
-H:145:100:65:66:50:and black 
-
-H:146:33:66:0:50:ulcerous skin.
-H:147:66:66:0:50:scabby skin.
-H:148:100:66:0:50:leprous skin.
-
-H:149:85:69:70:45:You are one of several children of a Dark Elven 
-H:150:100:69:70:55:You are the only child of a Dark Elven 
-
-H:151:50:70:71:60:Warrior.  
-H:152:80:70:71:75:Warlock.  
-H:153:100:70:71:95:Noble.  
-
-H:154:100:71:72:50:You have black eyes, 
-
-H:155:70:72:73:50:straight 
-H:156:90:72:73:50:wavy 
-H:157:100:72:73:50:curly 
-
-H:158:100:73:0:50:black hair and a very dark complexion.
-
-H:159:25:74:20:25:Your mother was an Ogre, but it is unacknowledged.  
-H:160:100:74:20:25:Your father was an Ogre, but it is unacknowledged.  
-
-H:161:90:75:76:50:You are a descendant of Beorn to the 
-H:162:100:75:20:100:Your father was Beorn.  
-
-H:163:13:76:20:55:9th degree.  
-H:164:25:76:20:60:8th degree.  
-H:165:38:76:20:65:7th degree.  
-H:166:50:76:20:70:6th degree.  
-H:167:63:76:20:75:5th degree.  
-H:168:75:76:20:80:4th degree.  
-H:169:88:76:20:85:3rd degree.  
-H:170:100:76:20:90:2nd degree.  
-
-H:171:100:78:79:50:You are one of several children of 
-
-H:172:50:79:80:50:a Brown Yeek.  
-H:173:75:79:80:50:a Blue Yeek.  
-H:174:95:79:80:85:a Master Yeek.  
-H:175:100:79:80:120:Boldor, the King of the Yeeks.  
-
-H:176:25:80:81:50:You have pale eyes, 
-H:177:50:80:81:50:You have glowing eyes, 
-H:178:75:80:81:50:You have tiny black eyes, 
-H:179:100:80:81:50:You have shining black eyes, 
-
-H:180:20:81:65:50:no hair at all, 
-H:181:40:81:65:50:short black hair, 
-H:182:60:81:65:50:long black hair, 
-H:183:80:81:65:50:bright red hair, 
-H:184:100:81:65:50:colourless albino hair, 
-
-H:185:100:82:83:50:You are one of several children of 
-
-H:186:40:83:80:50:a Small Kobold.  
-H:187:75:83:80:55:a Kobold.  
-H:188:95:83:80:65:a Large Kobold.  
-H:189:100:83:80:100:Mughash, the Kobold Lord.  
-
-H:190:85:84:85:45:You are one of several children 
-H:191:100:84:85:50:You are the first child 
-
-H:192:60:85:50:40:of a Serf.  
-H:193:85:85:50:55:of a Devoted Mercenary.  
-H:194:96:85:50:60:of a Landed Knight.  
-H:195:99:85:50:100:of a Marshal of the Riddermark.  
-H:196:100:85:50:120:of a King of the Rohirrim.  
-
-H:197:100:87:88:89:You are one of several children of 
-
-H:198:30:88:18:20:a Petty-Dwarf Slave.  
-H:199:50:88:18:40:a Petty-Dwarf Thief.  
-H:200:70:88:18:60:a Petty-Dwarf Smith.  
-H:201:90:88:18:75:a Petty-Dwarf Miner.  
-H:202:95:88:18:100:a Petty-Dwarf Shaman.  
-H:203:100:88:18:100:Mim, Betrayer of Turin.  
-
-H:204:85:89:90:50:You are one of many Manwe Maia.  
-H:205:100:89:90:60:You are the one of the most famous Manwe Maia.  
-
-H:206:90:90:93:100:Your eagle looks very good.  
-H:207:100:90:93:120:Your eagle is splendid.  
-
-H:208:10:91:92:20:You are a unnoticed minion of 
-H:209:25:91:92:30:You are a minor servant of 
-H:210:45:91:92:40:You are a subject of 
-H:211:65:91:92:50:You have attached yourself to 
-H:212:85:91:92:65:You are associated with 
-H:213:95:91:92:80:You are a notable follower of 
-H:214:100:91:92:100:You are a celebrated assistant to 
-
-H:215:20:92:93:55:Nessa.  
-H:216:40:92:93:60:Vana.  
-H:217:50:92:93:65:Tulkas.  
-H:218:80:92:93:75:Mandos.  
-H:219:90:92:93:80:Nienna.  
-H:220:95:92:93:90:Varda.  
-H:221:100:92:93:95:Manwe.  
-
-H:222:100:93:94:50:In the past you dwelt on earth in the form of 
-
-H:223:25:94:0:50:various animals.
-H:224:55:94:0:55:a spirit of forest and river.
-H:225:70:94:0:60:a beneficent but unseen force.
-H:226:96:94:0:70:a wise and ancient counsellor.
-H:227:100:94:0:80:a Wizard of legend.
-
-H:228:30:95:96:30:You are of an unknown generation of the Ents.  
-H:229:40:95:96:50:You are of the third generation of the Ents.  
-H:230:60:95:96:60:You are of the second generation of the Ents.  
-H:231:100:95:96:80:You are one of the first beings who awoke on Arda.  
-
-H:232:50:96:0:50:You have green skin and inflexible members.
-H:233:100:96:0:50:You have brown skin and inflexible members.
-
-H:234:10:100:101:30:You were born in dirty bilge-water, 
-H:235:20:100:101:35:You were born in dirty straw, 
-H:236:30:100:101:40:You were born in wet mud, 
-H:237:40:100:101:45:You were born in a pile of dust, 
-H:238:50:100:101:50:You were born in sand, 
-H:239:60:100:101:50:You were born in pebbles, 
-H:240:70:100:101:55:You were born in a kobold corpse, 
-H:241:80:100:101:60:You were born in dragon droppings, 
-H:242:90:100:101:65:You were born in a pile of bones, 
-H:243:100:100:101:70:You were born in a corpse of a mighty hero, 
-
-H:244:10:101:102:30:created by rotting flesh.  
-H:245:20:101:102:35:created by a kobold magician.  
-H:246:30:101:102:40:created by a corrupted apprentice.  
-H:247:40:101:102:45:created by a curious mage apprentice.  
-H:248:50:101:102:50:created by an evil Symbiant.  
-H:249:60:101:102:50:created by a practicing Necromancer.  
-H:250:70:101:102:55:created by the Mutant Breeders.  
-H:251:80:101:102:60:created by a curious adventurer.  
-H:252:90:101:102:65:called to life by the Witch-King of Angmar.  
-H:253:100:101:102:70:called to life by Sauron himself.  
-
-H:254:100:102:103:50:Since then you have given life to 
-
-H:255:10:103:104:30:no 
-H:256:20:103:104:35:one weak-willed 
-H:257:30:103:104:40:two 
-H:258:40:103:104:45:three 
-H:259:50:103:104:50:four 
-H:260:60:103:104:50:five 
-H:261:70:103:104:55:about twenty 
-H:262:80:103:104:60:dozens of 
-H:263:90:103:104:65:hundreds of 
-H:264:100:103:104:70:uncounted multitudes of 
-
-H:265:100:104:0:50:foul offspring.
-
-
-##############################################################################
-##############################################################################
-##############################################################################
-##############################################################################
-# M:N:idx:color:Meta class name
-# M:C:class name
-
-I:
-
-M:N:0:U:Classes       -- The Classes of Middle-earth
-M:C:Warrior
-M:C:Archer
-M:C:Rogue
-M:C:Mage
-M:C:Priest
-M:C:Loremaster
-#M:C:Test
-#M:C:Chaos-Warrior
-
-#M:N:1:B:Spellcasters -- Magic is The One True Way
-
-#M:N:2:y:Priests      -- Hail the powers of the Ainur
-#M:C:Mindcrafter
-
-#M:N:3:G:Beastfriends -- Monsters are fun
-#M:C:BeastMaster
-
-#M:N:4:v:Others       -- The way to your independence
-#M:C:Harper
-#M:C:Merchant
-
-#M:N:5:o:Tests        -- Test is you dare !
-#M:C:Test
-#M:C:Blade
-#M:C:Black-Knight
diff --git a/lib/edit/qrand1.map b/lib/edit/qrand1.map
index f42cbf1c..041e221c 100644
--- a/lib/edit/qrand1.map
+++ b/lib/edit/qrand1.map
@@ -16,9 +16,6 @@ F:G:188:6
 # Door
 F:D:38:6
 
-# Floor with Trap
-F:t:1:8:0:0:0:0:*
-
 # Deep lava
 F:F:85:12
 
diff --git a/lib/edit/qrand10.map b/lib/edit/qrand10.map
index ae45b9cb..cfe57e16 100644
--- a/lib/edit/qrand10.map
+++ b/lib/edit/qrand10.map
@@ -16,9 +16,6 @@ F:G:188:6
 # Door
 F:D:38:6
 
-# Floor with Trap
-F:t:1:2056:0:0:0:0:*
-
 # Deep lava
 F:F:85:12
 
@@ -26,11 +23,11 @@ F:F:85:12
 D:                   
 D:      xxxxxxx      
 D:      xFFFFFx      
-D: xxxxxx,t.ttxxxx   
-D: xFFG,t....t,,,xxx 
-D: xFpG.......t.t.DD 
-D: xFFG,t....t,,,xxx 
-D: xxxxxx,t.ttxxxx   
+D: xxxxxx,....xxxx   
+D: xFFG,......,,,xxx 
+D: xFpG...........DD 
+D: xFFG,......,,,xxx 
+D: xxxxxx,....xxxx   
 D:      xFFFFFx      
 D:      xxxxxxx      
 D:                   
diff --git a/lib/edit/qrand11.map b/lib/edit/qrand11.map
index 4af3c266..67d5258a 100644
--- a/lib/edit/qrand11.map
+++ b/lib/edit/qrand11.map
@@ -16,9 +16,6 @@ F:G:188:6
 # Door
 F:D:38:6
 
-# Floor with Trap
-F:t:1:8:0:0:0:0:*
-
 # Deep lava
 F:L:85:6
 
diff --git a/lib/edit/qrand12.map b/lib/edit/qrand12.map
index 4621ef0b..f24a7927 100644
--- a/lib/edit/qrand12.map
+++ b/lib/edit/qrand12.map
@@ -16,9 +16,6 @@ F:G:188:6
 # Door
 F:D:38:6
 
-# Floor with Trap
-F:t:1:8:0:0:0:0:*
-
 # Deep water
 F:W:187:6
 
diff --git a/lib/edit/qrand14.map b/lib/edit/qrand14.map
index 9f339db0..ee6e8975 100644
--- a/lib/edit/qrand14.map
+++ b/lib/edit/qrand14.map
@@ -16,9 +16,6 @@ F:G:188:6
 # Door
 F:D:38:6
 
-# Floor with Trap
-F:t:1:8:0:0:0:0:*
-
 # Deep water
 F:W:84:6
 
diff --git a/lib/edit/qrand6.map b/lib/edit/qrand6.map
index 3b55e985..407a9083 100644
--- a/lib/edit/qrand6.map
+++ b/lib/edit/qrand6.map
@@ -16,9 +16,6 @@ F:G:188:6
 # Door
 F:D:38:6
 
-# Floor with Trap
-F:t:1:8:0:0:0:0:*
-
 # Deep water
 F:W:84:6
 
diff --git a/lib/edit/qrand7.map b/lib/edit/qrand7.map
index a7c0607f..4da79778 100644
--- a/lib/edit/qrand7.map
+++ b/lib/edit/qrand7.map
@@ -16,9 +16,6 @@ F:G:188:6
 # Door
 F:D:38:6
 
-# Floor with Trap
-F:t:1:8:0:0:0:0:*
-
 # Deep water
 F:W:84:6
 
@@ -26,10 +23,10 @@ F:W:84:6
 F:w:187:6
 
 # Dungeon wayout
-D:ttttt      
-D:tGGGt  ,x, 
-D:tGpGt  x,x 
-D:tGGGt  ,x, 
-D:ttttt      
+D:           
+D: GGG   ,x, 
+D: GpG   x,x 
+D: GGG   ,x, 
+D:           
 D:      ,x,  
 D:           
diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt
index e7801d09..7eebf70c 100644
--- a/lib/edit/r_info.txt
+++ b/lib/edit/r_info.txt
@@ -129,6 +129,7 @@
 # S: spell frequency |
 # S: spell type | spell type | etc
 # D: Description
+# A: a_ptr_index : %chance
 
 # 'N' indicates the beginning of an entry. The serial number must
 # increase for each new item. Entry 0 is used for the player.
@@ -182,10 +183,6 @@
 
 # Note that monster zero is used for the "player" picture.
 
-# Version stamp (required)
-
-V:2.2.0
-
 ##### The Player #####
 
 N:0:Player
@@ -203,10 +200,18 @@ E:1:1:1:2:1:1
 O:1:1:1:1
 B:BEG:*
 B:TOUCH:EAT_GOLD
-F:MALE | EVIL | WILD_TOWN | WILD_ONLY | 
-F:RAND_25 |  FRIENDS | 
-F:TAKE_ITEM | OPEN_DOOR | DROP_CORPSE | DROP_SKELETON | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:RAND_25
+F:TAKE_ITEM
+F:WILD_ONLY
+F:WILD_TOWN
 D:He looks squalid and thoroughly revolting. 
 
 N:2:Scrawny cat
@@ -216,9 +221,15 @@ W:0:3:100:0
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:CLAW:HURT:1d1
-F:RAND_25 | WILD_TOO | WILD_GRASS | WILD_TOWN | WILD_ONLY | 
-F:ANIMAL | DROP_CORPSE | DROP_SKELETON | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:MORTAL
+F:RAND_25
+F:WILD_GRASS
+F:WILD_ONLY
+F:WILD_TOO
+F:WILD_TOWN
 D:A skinny little furball with sharp claws and a menacing look. 
 
 N:3:Sparrow
@@ -228,9 +239,15 @@ W:0:3:90:0
 E:0:1:1:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d1
-F:RAND_25 | CAN_FLY | WILD_TOWN | WILD_ONLY | 
-F:ANIMAL | DROP_SKELETON | HAS_EGG | IMPRESED | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:DROP_SKELETON
+F:HAS_EGG
+F:IMPRESED
+F:MORTAL
+F:RAND_25
+F:WILD_ONLY
+F:WILD_TOWN
 D:Utterly harmless, except when angry. 
 
 N:4:Chaffinch
@@ -240,9 +257,16 @@ W:0:3:80:0
 E:0:1:1:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d1
-F:RAND_25 | CAN_FLY | WILD_ONLY | WILD_WOOD | WILD_GRASS | 
-F:ANIMAL | DROP_SKELETON | HAS_EGG | IMPRESED | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:DROP_SKELETON
+F:HAS_EGG
+F:IMPRESED
+F:MORTAL
+F:RAND_25
+F:WILD_GRASS
+F:WILD_ONLY
+F:WILD_WOOD
 D:Utterly harmless, except when angry. 
 
 N:5:Wild rabbit
@@ -252,9 +276,14 @@ W:0:3:100:0
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d1
-F:RAND_50 | WILD_ONLY | WILD_GRASS | WILD_WOOD |
-F:ANIMAL | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:MORTAL
+F:RAND_50
+F:WILD_GRASS
+F:WILD_ONLY
+F:WILD_WOOD
 D:It is not a carnivore, but will defend itself if you stray too 
 D:close. 
 
@@ -265,11 +294,19 @@ W:0:1:1000:0
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:1d6
-F:MALE | WILD_ONLY | WILD_WOOD |
-F:RAND_25 | DROP_SKELETON | DROP_CORPSE |
-F:ONLY_GOLD | DROP_60 | HAS_LITE | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:RAND_25
+F:TAKE_ITEM
+F:WILD_ONLY
+F:WILD_WOOD
 D:He has a strong axe with a sharp edge. 
 
 N:7:Scruffy little dog
@@ -279,8 +316,13 @@ W:0:3:300:0
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d1
-F:RAND_25 | DROP_SKELETON | DROP_CORPSE | WILD_TOWN | WILD_ONLY | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:MORTAL
+F:RAND_25
+F:WILD_ONLY
+F:WILD_TOWN
 D:A thin flea-ridden mutt, growling as you get close. 
 
 N:8:Farmer Maggot
@@ -291,12 +333,22 @@ E:0:1:1:2:1:1
 O:0:100:0:0
 #B:MOAN:*
 #B:MOAN:*
-F:UNIQUE | MALE | CAN_SPEAK | DROP_CORPSE |
-F:FORCE_MAXHP | WILD_TOWN | WILD_ONLY | NO_TARGET
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:NEUTRAL
 F:NEVER_MOVE
-F:OPEN_DOOR | BASH_DOOR | SPECIAL_GENE
-F:NEUTRAL | NO_DEATH
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:NO_DEATH
+F:NO_TARGET
+F:OPEN_DOOR
+F:SPECIAL_GENE
+F:UNIQUE
+F:WILD_ONLY
+F:WILD_TOWN
 D:He's lost his dogs. He's had his mushrooms stolen. He's not a happy 
 D:hobbit! 
 
@@ -307,9 +359,16 @@ W:0:1:1500:0
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:DROOL:*
-F:MALE | DROP_CORPSE | DROP_SKELETON | WILD_TOWN | WILD_ONLY | 
-F:RAND_25 | DROP_1D2 | TAKE_ITEM | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:RAND_25
+F:TAKE_ITEM
+F:WILD_ONLY
+F:WILD_TOWN
 D:He tends to blubber a lot. 
 
 N:10:Boil-covered wretch
@@ -319,10 +378,18 @@ W:0:1:1400:0
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:DROOL:*
-F:MALE | DROP_SKELETON | DROP_CORPSE | WILD_TOWN | WILD_ONLY |
-F:RAND_25 | DROP_1D2 | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:RAND_25
+F:TAKE_ITEM
+F:WILD_ONLY
+F:WILD_TOWN
 D:Ugly doesn't begin to describe him. 
 
 N:11:Village idiot
@@ -332,9 +399,16 @@ W:0:1:1400:0
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:DROOL:*
-F:MALE | DROP_CORPSE | DROP_SKELETON | WILD_TOWN | WILD_ONLY | 
-F:RAND_25 | DROP_1D2 | TAKE_ITEM | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:RAND_25
+F:TAKE_ITEM
+F:WILD_ONLY
+F:WILD_TOWN
 D:Drooling and comical, but then, what do you expect? 
 
 N:12:Pitiful-looking beggar
@@ -344,10 +418,17 @@ W:0:1:1300:0
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:BEG:*
-F:MALE | DROP_SKELETON | DROP_CORPSE | 
-F:RAND_25 | WILD_TOWN | WILD_ONLY | DROP_1D2 | 
-F:TAKE_ITEM | OPEN_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:RAND_25
+F:TAKE_ITEM
+F:WILD_ONLY
+F:WILD_TOWN
 D:You just can't help feeling sorry for him. 
 
 N:13:Mangy-looking leper
@@ -358,10 +439,17 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:BEG:*
 B:TOUCH:DISEASE
-F:MALE | DROP_CORPSE | DROP_SKELETON | 
-F:RAND_25 | WILD_TOWN | WILD_ONLY | DROP_1D2 | 
-F:TAKE_ITEM | OPEN_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:RAND_25
+F:TAKE_ITEM
+F:WILD_ONLY
+F:WILD_TOWN
 D:You feel it isn't safe to touch him. 
 
 N:14:Agent of the black market
@@ -373,11 +461,21 @@ O:25:50:20:5
 B:HIT:HURT:1d6
 B:TOUCH:EAT_ITEM
 B:INSULT:*
-F:MALE | DROP_CORPSE | DROP_SKELETON | 
-F:DROP_60 | WILD_TOWN |
-F:WILD_SWAMP | WILD_WOOD | WILD_GRASS | WILD_MOUNTAIN | WILD_ONLY | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR |
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:TAKE_ITEM
+F:WILD_GRASS
+F:WILD_MOUNTAIN
+F:WILD_ONLY
+F:WILD_TOWN
+F:WILD_WOOD
 D:He 'finds' new wares for the Black Market. From unwary adventurers... 
 
 N:15:Singing, happy drunk
@@ -387,11 +485,19 @@ W:0:1:1100:0
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:BEG:*
-F:MALE |
-F:RAND_50 | DROP_SKELETON | DROP_CORPSE | 
-F:ONLY_GOLD | DROP_60 | WILD_TOWN | WILD_ONLY | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:RAND_50
+F:TAKE_ITEM
+F:WILD_ONLY
+F:WILD_TOWN
 D:He makes you glad to be sober. 
 
 N:16:Aimless-looking merchant
@@ -401,10 +507,19 @@ W:0:1:1500:0
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:1d3
-F:MALE | RAND_50 | 
-F:ONLY_GOLD | DROP_60 | DROP_SKELETON | DROP_CORPSE | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | WILD_TOWN | WILD_ONLY | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:RAND_50
+F:TAKE_ITEM
+F:WILD_ONLY
+F:WILD_TOWN
 D:The typical ponce around town, with purse jingling, and looking for more 
 D:amulets of adornment to buy. 
 
@@ -415,10 +530,21 @@ W:0:1:1700:0
 E:1:1:1:2:1:1
 O:0:100:0:0
 B:HIT:HURT:1d10
-F:MALE | DROP_SKELETON | DROP_CORPSE | 
-F:RAND_50 | DROP_90 | WILD_GRASS | WILD_TOWN | WILD_WOOD | WILD_ONLY | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:RAND_50
+F:TAKE_ITEM
+F:WILD_GRASS
+F:WILD_ONLY
+F:WILD_TOWN
+F:WILD_WOOD
 D:No job is too low for him. 
 
 N:18:Battle-scarred veteran
@@ -428,10 +554,18 @@ W:0:1:1650:0
 E:1:1:1:2:1:1
 O:25:50:25:0
 B:HIT:HURT:2d6
-F:MALE | DROP_SKELETON | DROP_CORPSE | 
-F:RAND_50 | DROP_90 | WILD_TOWN | WILD_ONLY | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:RAND_50
+F:TAKE_ITEM
+F:WILD_ONLY
+F:WILD_TOWN
 D:He doesn't take to strangers kindly. 
 
 N:19:Martti Ihrasaari
@@ -442,11 +576,20 @@ E:0:1:1:2:1:1
 O:50:50:0:0
 B:SHOW:*
 B:SHOW:*
-F:UNIQUE | MALE | CAN_SPEAK |
-F:FORCE_MAXHP | DROP_CORPSE | WILD_TOWN | WILD_ONLY | 
-F:ONLY_ITEM | DROP_90 | DROP_GOOD |
-F:OPEN_DOOR | BASH_DOOR | 
-F:JOKEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:HAS_LITE
+F:JOKEANGBAND
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNIQUE
+F:WILD_ONLY
+F:WILD_TOWN
 D:He weighs 127 kg. He is the president of some remote country. 
 
 ##### Normal monsters #####
@@ -459,11 +602,16 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:HURT:1d4
 B:SPORE:HURT:1d4
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | DROP_CORPSE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | 
-F:MORTAL | BASEANGBAND | NO_CUT
+F:DROP_CORPSE
+F:EMPTY_MIND
+F:IM_POIS
+F:MORTAL
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:A small strange growth. 
 
 N:21:Large white snake
@@ -474,9 +622,14 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d1
 B:CRUSH:HURT:1d1
-F:RAND_50 | WILD_TOO |
-F:BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | HAS_EGG | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_EGG
+F:MORTAL
+F:RAND_50
+F:WILD_TOO
 D:It is about eight feet long. 
 
 N:22:Grey mushroom patch
@@ -486,10 +639,15 @@ W:1:1:10:1
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:CONFUSE:1d4
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | DROP_CORPSE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:DROP_CORPSE
+F:EMPTY_MIND
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:Yum! It looks quite tasty. 
 
 N:23:Newt
@@ -500,9 +658,17 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d3
 B:BITE:HURT:1d3
-F:WEIRD_MIND | CAN_SWIM | WILD_TOO | DROP_CORPSE | 
-F:WILD_GRASS | WILD_WASTE | WILD_SHORE | WILD_SWAMP | WILD_MOUNTAIN |
-F:ANIMAL | HAS_EGG | MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_SWIM
+F:DROP_CORPSE
+F:HAS_EGG
+F:MORTAL
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_MOUNTAIN
+F:WILD_SHORE
+F:WILD_TOO
+F:WILD_WASTE
 D:A small, harmless lizard. 
 
 N:24:Giant white centipede
@@ -513,9 +679,13 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d2
 B:STING:HURT:1d2
-F:RAND_50 | DROP_SKELETON |
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO |
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:MORTAL
+F:RAND_50
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is about four feet long and carnivorous. 
 
 N:25:White icky thing
@@ -525,8 +695,11 @@ W:1:1:500:1
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:HURT:1d2
-F:RAND_50 | RAND_25 | CAN_SWIM |
-F:EMPTY_MIND | DROP_CORPSE | BASEANGBAND
+F:CAN_SWIM
+F:DROP_CORPSE
+F:EMPTY_MIND
+F:RAND_25
+F:RAND_50
 D:It is a smallish, slimy, icky creature. 
 
 N:26:Clear icky thing
@@ -536,9 +709,13 @@ W:1:1:500:2
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:HURT:1d2
-F:ATTR_CLEAR | CAN_SWIM |
-F:RAND_50 | RAND_25 | 
-F:INVISIBLE | EMPTY_MIND | DROP_CORPSE | BASEANGBAND
+F:ATTR_CLEAR
+F:CAN_SWIM
+F:DROP_CORPSE
+F:EMPTY_MIND
+F:INVISIBLE
+F:RAND_25
+F:RAND_50
 D:It is a smallish, slimy, icky, blobby creature. 
 
 N:27:Giant white mouse
@@ -548,10 +725,13 @@ W:1:1:600:1
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d2
-F:RAND_50 | WILD_TOO | WILD_GRASS |
-F:CAN_SWIM |
-F:ANIMAL | DROP_CORPSE |
-F:MORTAL | BASEANGBAND |
+F:ANIMAL
+F:CAN_SWIM
+F:DROP_CORPSE
+F:MORTAL
+F:RAND_50
+F:WILD_GRASS
+F:WILD_TOO
 S:MULTIPLY
 D:It is about three feet long with large teeth. 
 
@@ -563,9 +743,14 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d3
 B:CRUSH:HURT:1d4
-F:RAND_25 | CAN_SWIM |
-F:BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | HAS_EGG | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_EGG
+F:MORTAL
+F:RAND_25
 D:It is about eight feet long. 
 
 N:29:Small kobold
@@ -575,10 +760,16 @@ W:1:1:800:5
 E:1:1:1:2:1:1
 O:0:50:0:30
 B:HIT:HURT:1d5
-F:DROP_60 | WILD_TOO | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:HAS_LITE
+F:IM_POIS
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
 D:It is a small, dog-headed humanoid figure. 
 
 N:30:Kobold
@@ -588,10 +779,16 @@ W:2:1:900:5
 E:1:1:1:2:1:1
 O:0:50:0:30
 B:HIT:HURT:1d8
-F:DROP_60 | WILD_TOO |
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:HAS_LITE
+F:IM_POIS
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
 D:It is a squat and ugly dog-headed humanoid. 
 
 N:31:White worm mass
@@ -601,10 +798,17 @@ W:1:1:30:2
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:CRAWL:POISON:1d2
-F:RAND_50 | RAND_25 | CAN_SWIM |
-F:STUPID | WEIRD_MIND | 
-F:ANIMAL | IM_POIS | HURT_LITE | NO_FEAR
-F:MORTAL | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:CAN_SWIM
+F:HURT_LITE
+F:IM_POIS
+F:MORTAL
+F:NO_CUT
+F:NO_FEAR
+F:RAND_25
+F:RAND_50
+F:STUPID
+F:WEIRD_MIND
 S:MULTIPLY
 D:It is a large slimy mass of worms. 
 
@@ -615,8 +819,11 @@ W:1:1:500:1
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:GAZE:PARALYZE
-F:NEVER_MOVE | CAN_FLY | DROP_CORPSE | 
-F:HURT_LITE | NO_FEAR | BASEANGBAND
+F:CAN_FLY
+F:DROP_CORPSE
+F:HURT_LITE
+F:NEVER_MOVE
+F:NO_FEAR
 D:A disembodied eye, floating a few feet above the ground. 
 
 N:33:Rock lizard
@@ -626,23 +833,15 @@ W:1:1:100:2
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d1
-F:ANIMAL | CAN_SWIM | WILD_TOO | WILD_MOUNTAIN | 
-F:DROP_CORPSE | HAS_EGG | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_SWIM
+F:DROP_CORPSE
+F:HAS_EGG
+F:MORTAL
+F:WILD_MOUNTAIN
+F:WILD_TOO
 D:It is a small lizard with a hardened hide. 
 
-N:34:Grid bug
-G:I:v
-I:110:2d4:10:2:10
-W:1:1:10:2
-E:0:0:0:0:0:0
-O:0:0:0:0
-B:BITE:ELEC:1d4
-F:RAND_25 | FRIENDS | CAN_FLY |
-F:STUPID | WEIRD_MIND |
-F:ANIMAL | NO_FEAR | IM_ELEC | ZANGBAND
-D:A strange electric bug. 
-
 N:35:Jackal
 G:C:U
 I:110:1d4:10:3:10
@@ -650,9 +849,14 @@ W:1:1:400:1
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d1
-F:FRIENDS |
-F:WILD_TOO | WILD_WOOD | WILD_GRASS | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FRIENDS
+F:MORTAL
+F:WILD_GRASS
+F:WILD_TOO
+F:WILD_WOOD
 D:It is a yapping snarling dog, dangerous when in a pack. 
 
 N:36:Soldier ant
@@ -662,9 +866,13 @@ W:1:1:300:3
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d2
-F:WEIRD_MIND | BASH_DOOR | DROP_SKELETON |
-F:ANIMAL | WILD_TOO | WILD_GRASS | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:MORTAL
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_TOO
 D:A large ant with powerful mandibles. 
 
 N:37:Fruit bat
@@ -674,8 +882,13 @@ W:1:1:20:1
 E:0:1:1:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d1
-F:ANIMAL | CAN_FLY | WILD_TOO | WILD_WOOD | WILD_SWAMP | DROP_CORPSE
-F:MORTAL | BASEANGBAND | AI_ANNOY
+F:AI_ANNOY
+F:ANIMAL
+F:CAN_FLY
+F:DROP_CORPSE
+F:MORTAL
+F:WILD_TOO
+F:WILD_WOOD
 D:A fast-moving pest. 
 
 N:38:Insect swarm
@@ -686,9 +899,16 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:BITE:HURT:1d1
 B:STING:HURT:1d1
-F:ANIMAL | WEIRD_MIND | CAN_FLY | RAND_25 | WILD_TOO | WILD_GRASS |
-F:WILD_WOOD | WILD_SWAMP | 
-F:MORTAL | SUSCEP_FIRE | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:CAN_FLY
+F:MORTAL
+F:NO_CUT
+F:RAND_25
+F:SUSCEP_FIRE
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_TOO
+F:WILD_WOOD
 D:A lone insect may be harmless, but there's a whole swarm of 
 D:them here! 
 
@@ -701,11 +921,30 @@ O:0:0:0:0
 B:GAZE:*
 B:GAZE:*
 B:CRUSH:*
-F:EVIL | IM_ACID | IM_ELEC | IM_FIRE | IM_POIS | IM_COLD | UNIQUE | 
-F:RES_NETH | RES_WATE | RES_PLAS | RES_DISE | RES_NEXU | NO_SLEEP | NO_CONF
-F:KILL_WALL | FORCE_MAXHP | CAN_SWIM | DROP_CORPSE | JOKEANGBAND | HAS_LITE
-S:1_IN_9 |
-S:TPORT | BLINK | TELE_AWAY
+F:CAN_SWIM
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:JOKEANGBAND
+F:KILL_WALL
+F:NO_CONF
+F:NO_SLEEP
+F:RES_DISE
+F:RES_NETH
+F:RES_NEXU
+F:RES_PLAS
+F:RES_WATE
+F:UNIQUE
+S:1_IN_9
+S:BLINK
+S:TELE_AWAY
+S:TPORT
 D:This unholy abomination will crush you. Flee while you can! 
 
 N:40:Shrieker mushroom patch
@@ -714,11 +953,19 @@ I:110:1d1:4:1:0
 W:2:1:40:1
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:FORCE_SLEEP | NEVER_MOVE | NEVER_BLOW | 
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | WILD_TOO | WILD_SWAMP | DROP_CORPSE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_4 | 
+F:DROP_CORPSE
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:IM_POIS
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+F:WILD_TOO
+S:1_IN_4
 S:SHRIEK
 D:Yum!  It looks quite tasty.  It doesn't sound so nice, though... 
 
@@ -732,9 +979,14 @@ B:CRAWL:POISON:1d4
 B:CRAWL:EAT_FOOD
 B:DROOL:*
 B:DROOL:*
-F:RAND_50 | DROP_90 | CAN_SWIM | DROP_CORPSE | 
-F:EMPTY_MIND | TAKE_ITEM | KILL_BODY | 
-F:IM_POIS | BASEANGBAND
+F:CAN_SWIM
+F:DROP_90
+F:DROP_CORPSE
+F:EMPTY_MIND
+F:IM_POIS
+F:KILL_BODY
+F:RAND_50
+F:TAKE_ITEM
 D:It is a smallish, slimy, icky, hungry creature. 
 
 N:42:Metallic green centipede
@@ -744,9 +996,13 @@ W:3:1:500:5
 E:0:0:0:0:1:0
 O:0:0:0:0
 B:CRAWL:HURT:1d2
-F:RAND_50 | WILD_TOO | DROP_SKELETON
-F:WEIRD_MIND | BASH_DOOR | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:MORTAL
+F:RAND_50
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is about four feet long and carnivorous. 
 
 N:43:Novice warrior
@@ -757,10 +1013,15 @@ E:1:1:1:2:1:1
 O:25:50:0:20
 B:HIT:HURT:1d7
 B:HIT:HURT:1d6
-F:MALE | 
-F:DROP_60 | WILD_TOO | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
 D:He looks inexperienced but tough. 
 
 N:44:Novice rogue
@@ -771,10 +1032,16 @@ E:1:1:1:2:1:1
 O:50:25:0:20
 B:HIT:HURT:1d6
 B:TOUCH:EAT_GOLD
-F:MALE | 
-F:DROP_60 | DROP_SKELETON | DROP_CORPSE | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | WILD_TOO |
-F:EVIL | MORTAL | BASEANGBAND
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:TAKE_ITEM
+F:WILD_TOO
 D:A rather shifty individual. 
 
 N:45:Novice priest
@@ -784,13 +1051,21 @@ W:2:1:1500:6
 E:1:1:1:2:1:1
 O:25:0:50:20
 B:HIT:HURT:1d5
-F:MALE | 
-F:FORCE_SLEEP | GOOD | WILD_TOO | DROP_SKELETON | DROP_CORPSE | 
-F:DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_12 | 
-S:HEAL | SCARE | CAUSE_1
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
+S:1_IN_12
+S:CAUSE_1
+S:HEAL
+S:SCARE
 D:He is tripping over his priestly robes. 
 
 N:46:Novice mage
@@ -800,13 +1075,21 @@ W:2:1:1400:6
 E:1:1:1:2:1:1
 O:25:0:70:0
 B:HIT:HURT:1d4
-F:MALE | 
-F:FORCE_SLEEP | WILD_TOO | DROP_SKELETON | DROP_CORPSE | 
-F:DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_12 | 
-S:BLINK | BLIND | CONF | MISSILE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
+S:1_IN_12
+S:BLIND
+S:BLINK
+S:CONF
+S:MISSILE
 D:He is leaving behind a trail of dropped spell components. 
 
 N:47:Yellow mushroom patch
@@ -816,11 +1099,16 @@ W:2:1:30:2
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:TERRIFY:1d6
-F:NEVER_MOVE | WILD_TOO | WILD_SWAMP |
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | 
-F:MORTAL | BASEANGBAND | NO_CUT
+F:EMPTY_MIND
+F:IM_POIS
+F:MORTAL
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+F:WILD_TOO
 D:Yum!  It looks quite tasty. 
 
 N:48:White jelly
@@ -830,10 +1118,16 @@ W:2:1:2000:10
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:POISON:1d2
-F:NEVER_MOVE | CAN_SWIM |
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:EMPTY_MIND
+F:HURT_LITE
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:It's a large pile of white flesh. 
 
 N:49:Giant black ant
@@ -843,10 +1137,15 @@ W:2:1:500:8
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d4
-F:RAND_25 | 
-F:WEIRD_MIND | DROP_SKELETON | 
-F:BASH_DOOR | WILD_TOO | WILD_WOOD | WILD_GRASS |
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:MORTAL
+F:RAND_25
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_TOO
+F:WILD_WOOD
 D:It is about three feet long.
 
 N:50:Salamander
@@ -856,9 +1155,15 @@ W:2:1:100:10
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:FIRE:1d3
-F:RAND_25 | CAN_SWIM | WILD_TOO | WILD_VOLCANO | DROP_CORPSE | 
-F:ANIMAL | IM_FIRE | SUSCEP_COLD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_SWIM
+F:DROP_CORPSE
+F:IM_FIRE
+F:MORTAL
+F:RAND_25
+F:SUSCEP_COLD
+F:WILD_TOO
+F:WILD_VOLCANO
 D:A small black and orange lizard. 
 
 N:51:White harpy
@@ -870,8 +1175,15 @@ O:0:0:0:0
 B:CLAW:HURT:1d1
 B:CLAW:HURT:1d1
 B:BITE:HURT:1d2
-F:FEMALE | CAN_FLY | WILD_TOO | WILD_MOUNTAIN | 
-F:RAND_50 | DROP_CORPSE | ANIMAL | EVIL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:DROP_CORPSE
+F:EVIL
+F:FEMALE
+F:MORTAL
+F:RAND_50
+F:WILD_MOUNTAIN
+F:WILD_TOO
 D:A flying, screeching bird with a woman's face. 
 
 N:52:Blue yeek
@@ -881,10 +1193,13 @@ W:2:1:700:4
 E:1:1:1:2:1:1
 O:25:0:0:55
 B:HIT:HURT:1d5
-F:DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | 
-F:ANIMAL | IM_ACID | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:IM_ACID
+F:MORTAL
+F:OPEN_DOOR
 D:A small humanoid figure. 
 
 N:53:Grip, Farmer Maggot's dog
@@ -894,10 +1209,14 @@ W:2:2:600:30
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d6
-F:UNIQUE | SPECIAL_GENE
-F:FORCE_MAXHP | RAND_25 | DROP_CORPSE
-F:BASH_DOOR | ANIMAL
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:MORTAL
+F:RAND_25
+F:SPECIAL_GENE
+F:UNIQUE
 D:A rather vicious dog belonging to Farmer Maggot. It thinks you are 
 D:stealing mushrooms. 
 
@@ -908,10 +1227,14 @@ W:2:2:650:30
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d6
-F:UNIQUE | SPECIAL_GENE
-F:FORCE_MAXHP | RAND_25 | DROP_CORPSE
-F:BASH_DOOR 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:MORTAL
+F:RAND_25
+F:SPECIAL_GENE
+F:UNIQUE
 D:A rather vicious dog belonging to Farmer Maggot. It thinks you are 
 D:stealing mushrooms. 
 
@@ -922,10 +1245,14 @@ W:2:2:700:30
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d6
-F:UNIQUE | SPECIAL_GENE
-F:FORCE_MAXHP | RAND_25 | DROP_CORPSE
-F:BASH_DOOR 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:MORTAL
+F:RAND_25
+F:SPECIAL_GENE
+F:UNIQUE
 D:A rather vicious dog belonging to Farmer Maggot. It thinks you are 
 D:stealing mushrooms. 
 
@@ -936,25 +1263,14 @@ W:2:1:200:6
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d3
-F:RAND_25 | WILD_ONLY | WILD_SHORE | WILD_SWAMP | DROP_CORPSE | 
-F:BASH_DOOR | 
-F:ANIMAL | MORTAL | BASEANGBAND
-D:It is as big as a wolf. 
-
-N:57:Freesia
-G:f:u
-I:120:6d5:30:30:0
-W:2:1:450:32
-E:0:1:0:2:1:0
-O:0:0:0:0
-B:CLAW:HURT:1d3
-B:CLAW:HURT:1d4
-F:UNIQUE | 
-F:FORCE_MAXHP | DROP_SKELETON
-F:BASH_DOOR | 
 F:ANIMAL
-F:MORTAL | ZANGBAND
-D:A striped housecat who enjoys hunting. 
+F:BASH_DOOR
+F:DROP_CORPSE
+F:MORTAL
+F:RAND_25
+F:WILD_ONLY
+F:WILD_SHORE
+D:It is as big as a wolf. 
 
 N:58:Green worm mass
 G:w:g
@@ -963,11 +1279,17 @@ W:2:1:40:3
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:CRAWL:ACID:1d3
-F:RAND_50 | RAND_25 | 
-F:STUPID | WEIRD_MIND | 
-F:ANIMAL | IM_ACID | CAN_SWIM | 
-F:HURT_LITE | NO_FEAR | 
-F:MORTAL | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:CAN_SWIM
+F:HURT_LITE
+F:IM_ACID
+F:MORTAL
+F:NO_CUT
+F:NO_FEAR
+F:RAND_25
+F:RAND_50
+F:STUPID
+F:WEIRD_MIND
 S:MULTIPLY
 D:It is a large slimy mass of worms. 
 
@@ -979,8 +1301,15 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d4
 B:CRUSH:HURT:1d6
-F:RAND_25 | CAN_SWIM | WILD_TOO | DROP_SKELETON | DROP_CORPSE
-F:BASH_DOOR | HAS_EGG | ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_EGG
+F:MORTAL
+F:RAND_25
+F:WILD_TOO
 D:It is about ten feet long. 
 
 N:60:Cave spider
@@ -990,10 +1319,15 @@ W:2:1:400:7
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d4
-F:FRIENDS | 
-F:WEIRD_MIND | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | SPIDER | HURT_LITE | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FRIENDS
+F:HURT_LITE
+F:MORTAL
+F:SPIDER
+F:WEIRD_MIND
 D:It is a black spider that moves in fits and starts. 
 
 N:61:Crow
@@ -1004,8 +1338,13 @@ E:0:1:1:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d3
 B:BITE:HURT:1d3
-F:ANIMAL | WILD_TOO | WILD_WOOD | CAN_FLY | DROP_CORPSE
-F:MORTAL | HAS_EGG | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:DROP_CORPSE
+F:HAS_EGG
+F:MORTAL
+F:WILD_TOO
+F:WILD_WOOD
 D:It is a hooded crow, gray except for the black wings and head. 
 
 N:62:Wild cat
@@ -1016,8 +1355,12 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
-F:BASH_DOOR | WILD_TOO | DROP_SKELETON | DROP_CORPSE |
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:MORTAL
+F:WILD_TOO
 D:A larger than normal feline, hissing loudly. Its velvet claws conceal a 
 D:fistful of needles. 
 
@@ -1028,12 +1371,27 @@ W:3:2:670:16
 E:1:1:1:2:1:1
 O:50:50:0:0
 B:TOUCH:EAT_GOLD
-F:UNIQUE | MALE | CAN_SWIM | DROP_SKELETON | DROP_CORPSE | DROP_CHOSEN | 
-F:FORCE_MAXHP | CAN_SPEAK | SMART | 
-F:RAND_50 | RAND_25 | WILD_TOO |
-F:ONLY_ITEM | DROP_90 | DROP_GOOD | DROP_GREAT |
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | INVISIBLE
-F:EVIL | BASEANGBAND
+F:BASH_DOOR
+F:CAN_SPEAK
+F:CAN_SWIM
+F:DROP_90
+F:DROP_CHOSEN
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:INVISIBLE
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RAND_25
+F:RAND_50
+F:SMART
+F:TAKE_ITEM
+F:UNIQUE
+F:WILD_TOO
 D:Usually known as Gollum.  He's been sneaking, and he wants his 'precious.' 
 
 N:64:Green ooze
@@ -1043,10 +1401,18 @@ W:3:2:300:4
 E:0:0:0:0:0:0
 O:50:0:25:20
 B:CRAWL:ACID:1d3
-F:RAND_50 | RAND_25 | DROP_90 | 
-F:STUPID | EMPTY_MIND | 
-F:IM_ACID | IM_POIS | CAN_SWIM |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:DROP_90
+F:EMPTY_MIND
+F:IM_ACID
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RAND_25
+F:RAND_50
+F:STUPID
 D:It's green and it's oozing. 
 
 N:65:Poltergeist
@@ -1056,12 +1422,24 @@ W:3:1:0:8
 E:0:0:0:0:0:0
 O:50:5:30:10
 B:TOUCH:TERRIFY
-F:RAND_50 | RAND_25 | CAN_FLY |
-F:DROP_60 | DROP_90 | 
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | TAKE_ITEM | 
-F:EVIL | UNDEAD | 
-F:IM_COLD | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_15 | 
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_60
+F:DROP_90
+F:EVIL
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
+F:RAND_25
+F:RAND_50
+F:TAKE_ITEM
+F:UNDEAD
+S:1_IN_15
 S:BLINK
 D:It is a ghastly, ghostly form. 
 
@@ -1072,11 +1450,17 @@ W:3:1:2000:12
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:POISON:1d3
-F:NEVER_MOVE | CAN_SWIM |
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_15 | 
+F:CAN_SWIM
+F:EMPTY_MIND
+F:HURT_LITE
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+S:1_IN_15
 S:DRAIN_MANA
 D:It's a large pile of yellow flesh. 
 
@@ -1087,9 +1471,13 @@ W:4:1:770:6
 E:0:0:0:0:1:0
 O:0:0:0:0
 B:CRAWL:HURT:1d3
-F:RAND_50 | DROP_SKELETON
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO |
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:MORTAL
+F:RAND_50
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is about four feet long and carnivorous. 
 
 N:68:Raven
@@ -1100,8 +1488,13 @@ E:0:1:1:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d4
 B:BITE:HURT:1d4
-F:ANIMAL | WILD_TOO | WILD_WOOD | CAN_FLY | DROP_CORPSE
-F:MORTAL | HAS_EGG | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:DROP_CORPSE
+F:HAS_EGG
+F:MORTAL
+F:WILD_TOO
+F:WILD_WOOD
 D:Larger than a crow, and pitch black. 
 
 N:69:Giant white louse
@@ -1111,8 +1504,12 @@ W:3:1:100:1
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:BITE:HURT:1d1
-F:RAND_50 | RAND_25 | CAN_FLY |
-F:WEIRD_MIND | ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:MORTAL
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
 S:MULTIPLY
 D:It is six inches long. 
 
@@ -1124,9 +1521,13 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d3
 B:STING:HURT:1d3
-F:RAND_50 | DROP_SKELETON |
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO |
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:MORTAL
+F:RAND_50
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is about four feet long and carnivorous. 
 
 N:71:Black naga
@@ -1136,10 +1537,14 @@ W:3:1:1700:20
 E:0:0:0:0:1:0
 O:0:75:20:5
 B:CRUSH:HURT:1d8
-F:FEMALE | 
-F:RAND_25 | DROP_60 | DROP_CORPSE | 
-F:BASH_DOOR | CAN_SWIM |
-F:EVIL | MORTAL | BASEANGBAND
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FEMALE
+F:MORTAL
+F:RAND_25
 D:A large black serpent's body with a female torso. 
 
 N:72:Spotted mushroom patch
@@ -1149,10 +1554,15 @@ W:3:1:30:3
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:POISON:2d4
-F:NEVER_MOVE | WILD_TOO | WILD_SWAMP | 
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:EMPTY_MIND
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+F:WILD_TOO
 D:Yum!  It looks quite tasty. 
 
 N:73:Silver jelly
@@ -1163,11 +1573,17 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:EAT_LITE:1d3
 B:TOUCH:EAT_LITE:1d3
-F:NEVER_MOVE | CAN_SWIM |
-F:STUPID | EMPTY_MIND |
-F:IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_15 | 
+F:CAN_SWIM
+F:EMPTY_MIND
+F:HURT_LITE
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+S:1_IN_15
 S:DRAIN_MANA
 D:It is a large pile of silver flesh that sucks all light from its 
 D:surroundings. 
@@ -1180,11 +1596,15 @@ E:1:1:1:2:1:1
 O:0:50:0:40
 B:HIT:HURT:1d4
 B:TOUCH:EAT_GOLD
-F:MALE | 
-F:DROP_60 | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
 F:EVIL
-F:MORTAL | BASEANGBAND
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:TAKE_ITEM
 D:A short little guy, in bedraggled clothes. He appears to be looking 
 D:for a good tavern. 
 
@@ -1195,9 +1615,13 @@ W:3:1:800:7
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d4
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | WILD_GRASS | 
-F:ANIMAL | DROP_SKELETON | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:MORTAL
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_TOO
 D:It is about two feet long and has sharp pincers. 
 
 N:76:Yellow mold
@@ -1207,10 +1631,14 @@ W:3:1:30:9
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:HURT:1d4
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:EMPTY_MIND
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:It is a strange growth on the dungeon floor. 
 
 N:77:Metallic red centipede
@@ -1220,9 +1648,13 @@ W:5:1:800:10
 E:0:0:0:0:1:0
 O:0:0:0:0
 B:CRAWL:HURT:2d3
-F:RAND_25 | 
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | DROP_SKELETON
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:MORTAL
+F:RAND_25
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is about four feet long and carnivorous. 
 
 N:78:Yellow worm mass
@@ -1232,10 +1664,16 @@ W:3:2:200:4
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:CRAWL:LOSE_DEX:1d3
-F:RAND_50 | RAND_25 | CAN_SWIM |
-F:STUPID | WEIRD_MIND | 
-F:ANIMAL | HURT_LITE | NO_FEAR | 
-F:MORTAL | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:CAN_SWIM
+F:HURT_LITE
+F:MORTAL
+F:NO_CUT
+F:NO_FEAR
+F:RAND_25
+F:RAND_50
+F:STUPID
+F:WEIRD_MIND
 S:MULTIPLY
 D:It is a large slimy mass of worms. 
 
@@ -1246,12 +1684,19 @@ W:3:2:200:4
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:CRAWL:POISON:1d2
-F:ATTR_CLEAR | CAN_SWIM |
-F:RAND_50 | RAND_25 | 
-F:STUPID | WEIRD_MIND | INVISIBLE | 
-F:ANIMAL | 
-F:IM_POIS | HURT_LITE | NO_FEAR | 
-F:MORTAL | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:ATTR_CLEAR
+F:CAN_SWIM
+F:HURT_LITE
+F:IM_POIS
+F:INVISIBLE
+F:MORTAL
+F:NO_CUT
+F:NO_FEAR
+F:RAND_25
+F:RAND_50
+F:STUPID
+F:WEIRD_MIND
 S:MULTIPLY
 D:It is a disgusting mass of poisonous worms. 
 
@@ -1262,9 +1707,13 @@ W:3:1:500:6
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:GAZE:LOSE_STR:1d6
-F:NEVER_MOVE | CAN_FLY | DROP_CORPSE | 
-F:HURT_LITE | NO_FEAR | BASEANGBAND | HAS_LITE
-S:1_IN_11 | 
+F:CAN_FLY
+F:DROP_CORPSE
+F:HAS_LITE
+F:HURT_LITE
+F:NEVER_MOVE
+F:NO_FEAR
+S:1_IN_11
 S:DRAIN_MANA
 D:A disembodied eye, crackling with energy. 
 
@@ -1275,8 +1724,14 @@ W:4:1:0:4
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:EXPLODE:BLIND
-F:EMPTY_MIND | CAN_FLY | NONLIVING | SUSCEP_ELEC | 
-F:BASEANGBAND | HAS_LITE | RAND_50 | RAND_25 | NO_CUT
+F:CAN_FLY
+F:EMPTY_MIND
+F:HAS_LITE
+F:NONLIVING
+F:NO_CUT
+F:RAND_25
+F:RAND_50
+F:SUSCEP_ELEC
 D:A fast-moving bright light, apparently totally random in its movement.
 
 N:82:Cave lizard
@@ -1286,8 +1741,11 @@ W:4:1:100:8
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d5
-F:ANIMAL | CAN_SWIM | DROP_CORPSE | HAS_EGG | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_SWIM
+F:DROP_CORPSE
+F:HAS_EGG
+F:MORTAL
 D:It is an armoured lizard with a powerful bite. 
 
 N:83:Novice ranger
@@ -1298,13 +1756,20 @@ E:1:1:1:2:1:1
 O:25:45:25:0
 B:HIT:HURT:1d5
 B:HIT:HURT:1d5
-F:MALE | 
-F:FORCE_SLEEP | DROP_SKELETON | DROP_CORPSE
-F:DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR |  WILD_TOO | WILD_WOOD |
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_9 | 
-S:ARROW_2 | MISSILE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
+F:WILD_WOOD
+S:1_IN_9
+S:ARROW_2
+S:MISSILE
 D:An agile hunter, ready and relaxed. 
 
 N:84:Blue jelly
@@ -1314,10 +1779,18 @@ W:4:1:2000:14
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:COLD:1d6
-F:NEVER_MOVE | COLD_BLOOD | 
-F:STUPID | EMPTY_MIND | CAN_SWIM |
-F:IM_COLD | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | SUSCEP_FIRE | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:HURT_LITE
+F:IM_COLD
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+F:SUSCEP_FIRE
 D:It's a large pile of pulsing blue flesh. 
 
 N:85:Creeping copper coins
@@ -1328,10 +1801,17 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:HURT:1d4
 B:TOUCH:POISON:2d4
-F:ONLY_GOLD | DROP_1D2 | SUSCEP_ACID |
-F:COLD_BLOOD | BASH_DOOR | 
-F:IM_ELEC | IM_POIS | CHAR_MULTI | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:DROP_1D2
+F:IM_ELEC
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_GOLD
+F:SUSCEP_ACID
 D:It appears to be a pile of copper coins, until it starts crawling towards you 
 D:on tiny legs. 
 
@@ -1342,8 +1822,9 @@ W:4:1:200:1
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:POISON:1d3
-F:RAND_25 | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:MORTAL
+F:RAND_25
 S:MULTIPLY
 D:It is a very vicious rodent. 
 
@@ -1354,11 +1835,21 @@ W:4:1:900:15
 E:1:1:1:2:1:1
 O:25:50:0:20
 B:HIT:HURT:1d6
-F:MALE | 
-F:FRIENDS | DROP_60 | RAND_50 | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR |  WILD_TOO | WILD_WOOD |
-F:EVIL | ORC | HURT_LITE | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HAS_LITE
+F:HURT_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:ORC
+F:RAND_50
+F:WILD_TOO
+F:WILD_WOOD
 D:Immature Orclings, running wild and screaming all the time. 
 
 N:88:Swordfish
@@ -1369,8 +1860,11 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:HIT:HURT:1d5
 B:HIT:HURT:1d5
-F:ANIMAL | AQUATIC | WILD_TOO | COLD_BLOOD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:MORTAL
+F:WILD_TOO
 D:A fish with a swordlike "beak". 
 
 N:89:Blue worm mass
@@ -1380,11 +1874,19 @@ W:4:1:40:5
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:CRAWL:COLD:1d4
-F:RAND_50 | RAND_25 | 
-F:STUPID | WEIRD_MIND | COLD_BLOOD | 
-F:ANIMAL | IM_COLD | CAN_SWIM |
-F:HURT_LITE | NO_FEAR | 
-F:MORTAL | SUSCEP_FIRE | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:CAN_SWIM
+F:COLD_BLOOD
+F:HURT_LITE
+F:IM_COLD
+F:MORTAL
+F:NO_CUT
+F:NO_FEAR
+F:RAND_25
+F:RAND_50
+F:STUPID
+F:SUSCEP_FIRE
+F:WEIRD_MIND
 S:MULTIPLY
 D:It is a large slimy mass of worms. 
 
@@ -1396,8 +1898,15 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d5
 B:CRUSH:HURT:1d8
-F:RAND_25 | CAN_SWIM | DROP_SKELETON | DROP_CORPSE | WILD_TOO | 
-F:BASH_DOOR | HAS_EGG | ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_EGG
+F:MORTAL
+F:RAND_25
+F:WILD_TOO
 D:It is about ten feet long. 
 
 N:91:Skeleton kobold
@@ -1407,9 +1916,18 @@ W:5:1:800:12
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:1d6
-F:COLD_BLOOD | EMPTY_MIND | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:UNDEAD
 D:It is a small animated kobold skeleton. 
 
 N:92:Ewok
@@ -1420,9 +1938,15 @@ E:1:1:1:2:1:1
 O:50:0:50:0
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
-F:DROP_60 | OPEN_DOOR | BASH_DOOR | FRIENDS | DROP_CORPSE |
-F:WILD_TOO | WILD_WOOD | 
-F:MORTAL | JOKEANGBAND
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:FRIENDS
+F:JOKEANGBAND
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
+F:WILD_WOOD
 S:1_IN_8
 S:ARROW_1
 D:A cute little bear, full of merchandising potential. 
@@ -1434,13 +1958,22 @@ W:6:2:1400:6
 E:1:1:1:2:1:1
 O:25:0:70:0
 B:HIT:HURT:1d4
-F:MALE | 
-F:FORCE_SLEEP | 
-F:FRIENDS | DROP_60 |  WILD_TOO | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_12 | 
-S:BLINK | BLIND | CONF | MISSILE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
+S:1_IN_12
+S:BLIND
+S:BLINK
+S:CONF
+S:MISSILE
 D:He is leaving behind a trail of dropped spell components. 
 
 N:94:Green naga
@@ -1451,10 +1984,18 @@ E:0:0:0:0:1:0
 O:0:25:0:65
 B:CRUSH:HURT:1d8
 B:SPIT:ACID:2d6
-F:FEMALE | 
-F:RAND_25 | TAKE_ITEM | DROP_60 | DROP_CORPSE | 
-F:BASH_DOOR | CAN_SWIM | WILD_TOO | WILD_SHORE |
-F:EVIL | IM_ACID | MORTAL | BASEANGBAND
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FEMALE
+F:IM_ACID
+F:MORTAL
+F:RAND_25
+F:TAKE_ITEM
+F:WILD_SHORE
+F:WILD_TOO
 D:A large green serpent with a female torso. Her green skin glistens with 
 D:acid. 
 
@@ -1466,7 +2007,10 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:3d1
 B:BITE:HURT:3d1
-F:ANIMAL | AQUATIC | WEIRD_MIND | RAND_25 | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:RAND_25
+F:WEIRD_MIND
 D:Yech! The disgusting thing only wants your blood! 
 
 N:96:Barracuda
@@ -1477,8 +2021,11 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d10
 B:BITE:HURT:1d10
-F:AQUATIC | ANIMAL | WILD_TOO | COLD_BLOOD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:MORTAL
+F:WILD_TOO
 D:A predatory fish with razor-sharp teeth. 
 
 N:97:Novice paladin
@@ -1489,29 +2036,23 @@ E:1:1:1:2:1:1
 O:0:70:25:0
 B:HIT:HURT:1d7
 B:HIT:HURT:1d7
-F:MALE | GOOD | WILD_TOO | DROP_SKELETON | DROP_CORPSE |
-F:FORCE_SLEEP | 
-F:DROP_60 |
-F:OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_9 | 
-S:SCARE | CAUSE_1
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
+S:1_IN_9
+S:CAUSE_1
+S:SCARE
 D:An adventurer both devoutly religious and skilful in combat.  
 D:He seems to consider you an agent of the devil. 
 
-N:98:Zog
-G:h:b
-I:110:13d9:20:20:20
-W:5:1:600:25
-E:0:1:0:2:1:0
-O:50:0:25:20
-B:HIT:HURT:1d8
-B:HIT:HURT:1d8
-B:DROOL:*
-F:EVIL | OPEN_DOOR | BASH_DOOR | DROP_90 | DROP_SKELETON | 
-F:MORTAL | ZANGBAND
-D:Drooling, insectoid aliens with disgusting habits. 
-
 N:99:Blue ooze
 G:j:b
 I:110:3d4:8:16:80
@@ -1519,10 +2060,18 @@ W:5:1:300:7
 E:0:0:0:0:0:0
 O:45:20:20:0
 B:CRAWL:COLD:1d4
-F:RAND_50 | RAND_25 | DROP_60 | 
-F:STUPID | EMPTY_MIND | CAN_SWIM |
-F:IM_COLD | SUSCEP_FIRE
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:DROP_60
+F:EMPTY_MIND
+F:IM_COLD
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RAND_25
+F:RAND_50
+F:STUPID
+F:SUSCEP_FIRE
 D:It's blue and it's oozing. 
 
 N:100:Green glutton ghost
@@ -1532,10 +2081,19 @@ W:5:1:0:15
 E:0:0:0:0:0:0
 O:30:30:30:5
 B:TOUCH:EAT_FOOD:1d1
-F:RAND_50 | RAND_25 | 
-F:DROP_60 | DROP_90 | CAN_FLY |
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | 
-F:EVIL | UNDEAD | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_60
+F:DROP_90
+F:EVIL
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
+F:RAND_25
+F:RAND_50
+F:UNDEAD
 D:It is a very ugly green ghost with a voracious appetite. 
 
 N:101:Green jelly
@@ -1545,10 +2103,16 @@ W:5:1:2500:18
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:ACID:1d2
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | CAN_SWIM |
-F:IM_ACID | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:EMPTY_MIND
+F:HURT_LITE
+F:IM_ACID
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:It is a large pile of pulsing green flesh. 
 
 N:102:Large kobold
@@ -1558,10 +2122,15 @@ W:5:1:1000:25
 E:1:1:1:2:1:1
 O:0:90:0:5
 B:HIT:HURT:1d10
-F:DROP_90 | 
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:HAS_LITE
+F:IM_POIS
+F:MORTAL
+F:OPEN_DOOR
 D:It a man-sized figure with the all too recognisable face of a kobold. 
 
 N:103:Grey icky thing
@@ -1571,8 +2140,10 @@ W:5:1:500:10
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:HURT:1d5
-F:RAND_50 | CAN_SWIM | DROP_CORPSE | 
-F:EMPTY_MIND | BASEANGBAND
+F:CAN_SWIM
+F:DROP_CORPSE
+F:EMPTY_MIND
+F:RAND_50
 D:It is a smallish, slimy, icky, nasty creature. 
 
 N:104:Disenchanter eye
@@ -1582,10 +2153,15 @@ W:5:2:500:20
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:GAZE:UN_BONUS
-F:ATTR_MULTI | ATTR_ANY | RES_DISE | DROP_CORPSE | 
-F:NEVER_MOVE | CAN_FLY | 
-F:HURT_LITE | NO_FEAR | BASEANGBAND
-S:1_IN_9 | 
+F:ATTR_ANY
+F:ATTR_MULTI
+F:CAN_FLY
+F:DROP_CORPSE
+F:HURT_LITE
+F:NEVER_MOVE
+F:NO_FEAR
+F:RES_DISE
+S:1_IN_9
 S:DRAIN_MANA
 D:A disembodied eye, crackling with magic. 
 
@@ -1596,11 +2172,19 @@ W:5:1:40:6
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:CRAWL:FIRE:1d6
-F:RAND_50 | RAND_25 | SUSCEP_COLD |
-F:STUPID | EMPTY_MIND | BASH_DOOR | 
-F:ANIMAL | IM_FIRE | CAN_SWIM |
-F:HURT_LITE | NO_FEAR | 
-F:MORTAL | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:EMPTY_MIND
+F:HURT_LITE
+F:IM_FIRE
+F:MORTAL
+F:NO_CUT
+F:NO_FEAR
+F:RAND_25
+F:RAND_50
+F:STUPID
+F:SUSCEP_COLD
 S:MULTIPLY
 D:It is a large slimy mass of worms. 
 
@@ -1611,8 +2195,16 @@ W:5:1:200:15
 E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:POISON:2d4
-F:RAND_50 | CAN_SWIM | WILD_TOO | DROP_SKELETON | DROP_CORPSE | BASH_DOOR | 
-F:ANIMAL | IM_POIS | HAS_EGG | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_EGG
+F:IM_POIS
+F:MORTAL
+F:RAND_50
+F:WILD_TOO
 D:It has a copper head and sharp venomous fangs. 
 
 N:107:Death sword
@@ -1625,10 +2217,25 @@ B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
-F:NEVER_MOVE | NONLIVING | NO_FEAR | SUSCEP_ACID |
-F:STUPID | EMPTY_MIND | COLD_BLOOD | CHAR_MULTI | NO_CONF | NO_SLEEP | 
-F:DROP_90 | EVIL | IM_COLD | IM_FIRE | FORCE_MAXHP | IM_ELEC | IM_POIS | 
-F:BASEANGBAND | HAS_LITE | NO_CUT
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:DROP_90
+F:EMPTY_MIND
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NEVER_MOVE
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+F:SUSCEP_ACID
 D:A bloodthirsty blade lurking for prey. Beware! 
 
 N:108:Purple mushroom patch
@@ -1640,9 +2247,14 @@ O:0:0:0:0
 B:SPORE:LOSE_CON:1d2
 B:SPORE:LOSE_CON:1d2
 B:SPORE:LOSE_CON:1d2
-F:NEVER_MOVE | CAN_SWIM |
-F:STUPID | EMPTY_MIND | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:EMPTY_MIND
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:Yuk!  It doesn't look so tasty. 
 
 N:109:Novice priest
@@ -1652,13 +2264,22 @@ W:6:2:1500:6
 E:1:1:1:2:1:1
 O:20:50:20:5
 B:HIT:HURT:1d5
-F:MALE | GOOD |
-F:FORCE_SLEEP |  WILD_TOO | DROP_SKELETON | DROP_CORPSE | 
-F:FRIENDS | DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_12 | 
-S:HEAL | SCARE | CAUSE_1
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:GOOD
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
+S:1_IN_12
+S:CAUSE_1
+S:HEAL
+S:SCARE
 D:He is tripping over his priestly robes. 
 
 N:110:Novice warrior
@@ -1669,39 +2290,18 @@ E:1:1:1:2:1:1
 O:0:95:0:0
 B:HIT:HURT:1d7
 B:HIT:HURT:1d6
-F:MALE | 
-F:FRIENDS | DROP_60 | WILD_TOO |
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FRIENDS
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
 D:He looks inexperienced but tough. 
 
-N:111:Nibelung
-G:h:D
-I:110:8d4:20:12:5
-W:6:1:900:6
-E:1:1:1:2:1:1
-O:90:0:0:5
-B:HIT:HURT:1d6
-B:TOUCH:EAT_GOLD
-F:MALE | 
-F:FRIENDS | DROP_60 | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | HURT_LITE | RES_DISE | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | ZANGBAND | HAS_LITE
-D:Night dwarfs collecting riches. 
-
-N:112:The disembodied hand that strangled people
-G:z:g
-I:130:7d8:30:15:20
-W:6:2:300:20
-E:0:0:0:1:0:0
-O:0:0:0:0
-B:CRUSH:HURT:1d8
-F:EMPTY_MIND | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_POIS | CAN_FLY | UNIQUE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | ZANGBAND | NO_CUT
-D:Even today, nobody knows where it lurks... 
-
 N:113:Brown mold
 G:m:u
 I:110:15d8:2:12:99
@@ -1709,10 +2309,15 @@ W:6:1:50:20
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:CONFUSE:1d4
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | CAN_SWIM |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:EMPTY_MIND
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:A strange brown growth on the dungeon floor. 
 
 N:114:Giant brown bat
@@ -1722,26 +2327,17 @@ W:6:1:600:10
 E:0:1:1:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d3
-F:RAND_50 | CAN_FLY | WILD_TOO | WILD_MOUNTAIN | WILD_WOOD |
-F:ANIMAL | DROP_CORPSE | AI_ANNOY
-F:MORTAL | BASEANGBAND
+F:AI_ANNOY
+F:ANIMAL
+F:CAN_FLY
+F:DROP_CORPSE
+F:MORTAL
+F:RAND_50
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:It screeches as it attacks. 
 
-N:115:Rat-thing
-G:r:R
-I:120:9d9:12:20:20
-W:6:1:1000:10
-E:0:1:0:2:1:0
-O:0:0:0:0
-B:BITE:HURT:3d2
-B:BITE:HURT:3d1
-B:BITE:HURT:3d2
-F:EVIL | ANIMAL | DROP_CORPSE | 
-F:MORTAL | ZANGBAND
-S:1_IN_9
-S:SCARE | CONF
-D:A ratlike creature with a humanlike face. 
-
 N:116:Novice rogue
 G:p:b
 I:110:8d4:20:12:5
@@ -1750,10 +2346,17 @@ E:1:1:1:2:1:1
 O:50:25:0:20
 B:HIT:HURT:1d6
 B:TOUCH:EAT_GOLD
-F:MALE | FRIENDS | 
-F:DROP_60 | DROP_SKELETON | DROP_CORPSE | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | WILD_TOO |
-F:EVIL | MORTAL | BASEANGBAND
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:TAKE_ITEM
+F:WILD_TOO
 D:A rather shifty individual. 
 
 N:117:Creeping silver coins
@@ -1764,9 +2367,18 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:HURT:1d6
 B:TOUCH:POISON:2d6
-F:ONLY_GOLD | DROP_60 | DROP_1D2 | 
-F:COLD_BLOOD | BASH_DOOR | SUSCEP_ACID | CHAR_MULTI | 
-F:IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_60
+F:IM_ELEC
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_GOLD
+F:SUSCEP_ACID
 D:It appears to be a pile of silver coins, until it starts crawling towards you 
 D:on tiny legs. 
 
@@ -1777,11 +2389,19 @@ W:6:1:1600:15
 E:1:1:1:2:1:1
 O:20:50:5:15
 B:HIT:HURT:1d8
-F:MALE | 
-F:FRIENDS | DROP_60 | WILD_TOO | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | HURT_LITE | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HAS_LITE
+F:HURT_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:ORC
+F:WILD_TOO
 D:He is one of the many weaker 'slave' orcs, often mistakenly known as a 
 D:goblin. 
 
@@ -1792,8 +2412,16 @@ W:6:1:200:20
 E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:POISON:2d5
-F:RAND_50 | CAN_SWIM | WILD_TOO | DROP_SKELETON | DROP_CORPSE | 
-F:BASH_DOOR | HAS_EGG | ANIMAL | IM_POIS | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_EGG
+F:IM_POIS
+F:MORTAL
+F:RAND_50
+F:WILD_TOO
 D:It is recognised by the hard-scaled end of its body that is often rattled 
 D:to frighten its prey. 
 
@@ -1805,9 +2433,14 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:ACID:2d4
 B:BITE:ACID:2d6
-F:ANIMAL | EMPTY_MIND | KILL_ITEM | KILL_BODY | CAN_SWIM |  WILD_TOO |
-F:DROP_CORPSE | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_SWIM
+F:DROP_CORPSE
+F:EMPTY_MIND
+F:KILL_BODY
+F:KILL_ITEM
+F:MORTAL
+F:WILD_TOO
 S:1_IN_10
 S:BR_ACID
 D:It is slowly making its way towards you, eating everything in 
@@ -1820,9 +2453,13 @@ W:7:1:200:16
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:LOSE_STR:2d4
-F:RAND_50 | WILD_ONLY | WILD_SHORE | WILD_SWAMP |
-F:BASH_DOOR | DROP_CORPSE
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:MORTAL
+F:RAND_50
+F:WILD_ONLY
+F:WILD_SHORE
 D:It looks poisonous. 
 
 N:122:Dark elf
@@ -1833,13 +2470,20 @@ E:1:1:1:2:1:1
 O:20:20:50:10
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
-F:MALE | 
-F:FORCE_SLEEP | 
-F:DROP_90 | 
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | HURT_LITE | BASEANGBAND | HAS_LITE
-S:1_IN_10 | 
-S:CONF | DARKNESS | MISSILE
+F:BASH_DOOR
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:HURT_LITE
+F:MALE
+F:OPEN_DOOR
+S:1_IN_10
+S:CONF
+S:DARKNESS
+S:MISSILE
 D:An elven figure with jet black skin and white hair, his eyes are large and 
 D:twisted with evil. 
 
@@ -1851,9 +2495,18 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:1d2
 B:HIT:HURT:1d2
-F:EMPTY_MIND | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:UNDEAD
 D:It is an animated kobold corpse. Flesh falls off in large chunks as it 
 D:shambles forward. 
 
@@ -1866,12 +2519,22 @@ O:0:0:0:0
 B:CLAW:HURT:1d2
 B:CLAW:HURT:1d2
 B:BITE:POISON
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EVIL
+F:FRIENDS
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
 F:RAND_25
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | FRIENDS |
-F:EVIL | UNDEAD | IM_POIS | IM_COLD | 
-F:NO_CONF | NO_SLEEP | HURT_LITE | BASEANGBAND | NO_CUT
+F:UNDEAD
 S:1_IN_10
-S:CAUSE_1 | S_UNDEAD
+S:CAUSE_1
+S:S_UNDEAD
 D:A frightening skeletal figure in a black robe. 
 
 N:125:Rotting corpse
@@ -1882,9 +2545,19 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:CLAW:POISON:1d3
 B:CLAW:POISON:1d3
-F:OPEN_DOOR | BASH_DOOR | FRIENDS |
-F:NO_CONF | NO_SLEEP | UNDEAD | EVIL | NO_FEAR | IM_POIS | 
-F:IM_COLD | COLD_BLOOD | EMPTY_MIND | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:FRIENDS
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:UNDEAD
 D:Corpses awakened from their sleep by dark sorcery. 
 
 N:126:Cave orc
@@ -1894,11 +2567,18 @@ W:7:1:1900:20
 E:1:1:1:2:1:1
 O:20:70:0:0
 B:HIT:HURT:1d8
-F:MALE | 
-F:FRIENDS | DROP_60 | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | HURT_LITE | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HAS_LITE
+F:HURT_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:ORC
 D:He is often found in huge numbers in deep caves.
 
 N:127:Wood spider
@@ -1909,10 +2589,16 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d3
 B:STING:POISON:1d4
-F:FRIENDS | DROP_SKELETON | 
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | WILD_WOOD | 
-F:ANIMAL | SPIDER | IM_POIS | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:FRIENDS
+F:IM_POIS
+F:MORTAL
+F:SPIDER
+F:WEIRD_MIND
+F:WILD_TOO
+F:WILD_WOOD
 D:It scuttles towards you. 
 
 N:128:Manes
@@ -1922,9 +2608,13 @@ W:7:2:300:16
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:1d8
-F:FRIENDS | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DEMON | IM_FIRE | NO_FEAR | BASEANGBAND
+F:BASH_DOOR
+F:DEMON
+F:EVIL
+F:FRIENDS
+F:IM_FIRE
+F:NO_FEAR
+F:OPEN_DOOR
 D:It is a minor but aggressive demon. 
 
 N:129:Bloodshot eye
@@ -1934,9 +2624,13 @@ W:7:3:550:30
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:GAZE:BLIND:2d6
-F:NEVER_MOVE | CAN_FLY | DROP_CORPSE | 
-F:HURT_LITE | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_7 | 
+F:CAN_FLY
+F:DROP_CORPSE
+F:HURT_LITE
+F:NEVER_MOVE
+F:NO_CUT
+F:NO_FEAR
+S:1_IN_7
 S:DRAIN_MANA
 D:A disembodied eye, bloodshot and nasty. 
 
@@ -1948,10 +2642,17 @@ E:0:0:0:0:1:0
 O:50:0:50:0
 B:CRUSH:HURT:1d10
 B:BITE:LOSE_STR:1d4
-F:FEMALE |  CAN_SWIM | WILD_TOO | WILD_SHORE |
-F:RAND_25 | DROP_60 | 
-F:TAKE_ITEM | BASH_DOOR | DROP_CORPSE | 
-F:EVIL | MORTAL | BASEANGBAND
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FEMALE
+F:MORTAL
+F:RAND_25
+F:TAKE_ITEM
+F:WILD_SHORE
+F:WILD_TOO
 D:A large red snake with a woman's torso. 
 
 N:131:Red jelly
@@ -1961,10 +2662,15 @@ W:7:1:2500:26
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:LOSE_STR:1d5
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | 
-F:HURT_LITE |  CAN_SWIM |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:EMPTY_MIND
+F:HURT_LITE
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:It is a large pulsating mound of red flesh. 
 
 N:132:Green icky thing
@@ -1974,9 +2680,11 @@ W:7:2:500:18
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:ACID:2d5
-F:RAND_50 |  CAN_SWIM | DROP_CORPSE | 
-F:EMPTY_MIND | 
-F:IM_ACID | BASEANGBAND
+F:CAN_SWIM
+F:DROP_CORPSE
+F:EMPTY_MIND
+F:IM_ACID
+F:RAND_50
 D:It is a smallish, slimy, icky, acidic creature. 
 
 N:133:Lost soul
@@ -1987,12 +2695,23 @@ E:0:0:0:0:0:0
 O:60:0:25:0
 B:HIT:HURT:2d2
 B:TOUCH:LOSE_WIS
-F:RAND_50 | DROP_60 | DROP_90 | CAN_FLY |
-F:INVISIBLE | COLD_BLOOD | TAKE_ITEM | PASS_WALL | 
-F:EVIL | UNDEAD | 
-F:IM_COLD | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_15 | 
-S:TPORT | DRAIN_MANA
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_60
+F:DROP_90
+F:EVIL
+F:IM_COLD
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
+F:RAND_50
+F:TAKE_ITEM
+F:UNDEAD
+S:1_IN_15
+S:DRAIN_MANA
+S:TPORT
 D:It is almost insubstantial. 
 
 N:134:Night lizard
@@ -2003,8 +2722,12 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d6
 B:BITE:HURT:1d6
-F:ANIMAL | CAN_SWIM | WILD_TOO | DROP_CORPSE
-F:MORTAL | HAS_EGG | BASEANGBAND
+F:ANIMAL
+F:CAN_SWIM
+F:DROP_CORPSE
+F:HAS_EGG
+F:MORTAL
+F:WILD_TOO
 D:It is a black lizard with overlapping scales and a powerful jaw. 
 
 N:135:Mughash, the Kobold Lord
@@ -2016,13 +2739,23 @@ O:0:100:0:0
 B:HIT:HURT:1d12
 B:HIT:HURT:1d12
 B:HIT:HURT:1d12
-F:UNIQUE | MALE | CAN_SPEAK
-F:FORCE_MAXHP | 
-F:ESCORT | ESCORTS | DROP_SKELETON | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:ESCORTS
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNIQUE
 D:Strong and powerful, for a kobold. 
 
 N:136:Skeleton orc
@@ -2032,10 +2765,19 @@ W:8:1:1700:26
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:2d5
-F:COLD_BLOOD | EMPTY_MIND | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | UNDEAD | 
-F:IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:ORC
+F:UNDEAD
 D:It is an animated orc skeleton.
 
 N:137:Wormtongue, Agent of Saruman
@@ -2048,46 +2790,29 @@ B:HIT:HURT:1d7
 B:HIT:HURT:1d7
 B:TOUCH:EAT_GOLD
 B:INSULT:*
-F:UNIQUE | MALE | CAN_SPEAK |
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | DROP_GREAT | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | 
-F:EVIL | RES_TELE | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_5 | 
-S:HEAL | SLOW | TRAPS | BO_COLD | BA_POIS
-D:He's been spying for Saruman. He is a snivelling wretch with no morals. 
-
-N:138:Robin Hood, the Outlaw
-G:p:G
-I:120:16d12:20:30:20
-W:10:2:1600:150
-E:1:1:1:2:1:1
-O:20:80:0:0
-B:HIT:HURT:1d5
-B:HIT:HURT:1d5
-B:TOUCH:EAT_GOLD
-B:TOUCH:EAT_ITEM
-F:UNIQUE | MALE | FORCE_SLEEP | FORCE_MAXHP | CAN_SPEAK |
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | DROP_GREAT | WILD_TOO | WILD_WOOD |
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | EVIL | DROP_SKELETON | DROP_CORPSE
-F:MORTAL | ZANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_GOOD
+F:DROP_GREAT
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:TAKE_ITEM
+F:UNIQUE
 S:1_IN_5
-S:ARROW_2 | HEAL | TRAPS
-D:The legendary archer steals from the rich (you qualify). 
-
-N:139:Nurgling
-G:u:o
-I:110:9d8:20:32:30
-W:8:2:800:19
-E:1:1:1:2:1:1
-O:0:0:0:0
-B:BITE:DISEASE:1d8
-F:FRIENDS | FRIEND |
-F:OPEN_DOOR | BASH_DOOR | IM_POIS |
-F:EVIL | DEMON | IM_FIRE | NO_FEAR | ZANGBAND
-D:It is a minor demon servitor of Nurgle. It looks like a hairless 
-D:teddy bear, with twisted eyes and rotting, ghoulish skin. 
+S:BA_POIS
+S:BO_COLD
+S:HEAL
+S:SLOW
+D:He's been spying for Saruman. He is a snivelling wretch with no morals. 
 
 N:140:Lagduf, the Snaga
 G:o:y
@@ -2099,10 +2824,23 @@ B:HIT:HURT:1d11
 B:HIT:HURT:1d11
 B:HIT:HURT:1d10
 B:HIT:HURT:1d10
-F:UNIQUE | MALE | EVIL | ORC | FORCE_MAXHP | ESCORT | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | SPECIAL_GENE | 
-F:OPEN_DOOR | BASH_DOOR | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:ORC
+F:SPECIAL_GENE
+F:UNIQUE
 D:A captain of a regiment of weaker orcs, Lagduf keeps his troop in order 
 D:with displays of excessive violence. 
 
@@ -2113,10 +2851,13 @@ W:8:1:800:11
 E:1:1:1:2:1:1
 O:0:50:0:30
 B:HIT:HURT:1d6
-F:DROP_60 | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:ANIMAL | IM_ACID | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:IM_ACID
+F:MORTAL
+F:OPEN_DOOR
 D:It is a strange small humanoid. 
 
 N:142:Novice ranger
@@ -2127,12 +2868,19 @@ E:1:1:1:2:1:1
 O:0:80:0:15
 B:HIT:HURT:1d5
 B:HIT:HURT:1d5
-F:MALE | 
-F:FORCE_SLEEP | FRIENDS | DROP_60 | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_9 | 
-S:ARROW_2 | MISSILE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+S:1_IN_9
+S:ARROW_2
+S:MISSILE
 D:An agile hunter, ready and relaxed. 
 
 N:143:Giant salamander
@@ -2142,11 +2890,15 @@ W:8:1:600:50
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:FIRE:3d6
-F:FORCE_SLEEP | SUSCEP_COLD |
-F:RAND_25 | 
-F:ANIMAL | IM_FIRE | CAN_SWIM | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND
-S:1_IN_9 
+F:ANIMAL
+F:CAN_SWIM
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:IM_FIRE
+F:MORTAL
+F:RAND_25
+F:SUSCEP_COLD
+S:1_IN_9
 S:BR_FIRE
 D:A large black and yellow lizard. You'd better run away! 
 
@@ -2157,22 +2909,16 @@ W:8:2:0:28
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:TERRIFY:1d4
-F:PASS_WALL | NO_CONF | NO_SLEEP | NONLIVING | IM_ACID | CAN_FLY | JOKEANGBAND | NO_CUT
+F:CAN_FLY
+F:IM_ACID
+F:JOKEANGBAND
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
 D:A black hole in the fabric of reality. 
 
-N:145:Carnivorous flying monkey
-G:H:R
-I:110:20d8:30:20:20
-W:8:2:800:30
-E:1:1:1:2:1:1
-O:0:0:0:0
-B:CLAW:HURT:1d8
-B:CLAW:HURT:1d8
-B:BITE:HURT:5d1
-F:ANIMAL | CAN_FLY | WILD_TOO | WILD_WOOD | WILD_MOUNTAIN | 
-F:DROP_CORPSE | MORTAL | ZANGBAND | HAS_LITE
-D:It looks fantastic, yet frightening. 
-
 N:146:Green mold
 G:m:g
 I:110:21d8:2:14:75
@@ -2180,10 +2926,16 @@ W:8:1:40:28
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:TERRIFY:1d4
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | 
-F:IM_ACID | IM_POIS | CAN_SWIM |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:EMPTY_MIND
+F:IM_ACID
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:It is a strange growth on the dungeon floor. 
 
 N:147:Novice paladin
@@ -2194,13 +2946,21 @@ E:1:1:1:2:1:1
 O:30:55:10:0
 B:HIT:HURT:1d7
 B:HIT:HURT:1d7
-F:MALE | GOOD | WILD_TOO | DROP_SKELETON | DROP_CORPSE |
-F:FORCE_SLEEP | 
-F:FRIENDS | DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_9 | 
-S:SCARE | CAUSE_1
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:GOOD
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
+S:1_IN_9
+S:CAUSE_1
+S:SCARE
 D:He thinks you are an agent of the devil. 
 
 N:148:Lemure
@@ -2210,9 +2970,13 @@ W:8:3:1000:16
 E:0:0:0:0:1:0
 O:0:0:0:0
 B:HIT:HURT:1d8
-F:FRIENDS | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DEMON | IM_FIRE | NO_FEAR | BASEANGBAND
+F:BASH_DOOR
+F:DEMON
+F:EVIL
+F:FRIENDS
+F:IM_FIRE
+F:NO_FEAR
+F:OPEN_DOOR
 D:It is the larval form of a major demon. 
 
 N:149:Hill orc
@@ -2222,11 +2986,18 @@ W:8:1:2000:25
 E:1:1:1:2:1:1
 O:10:70:10:0
 B:HIT:HURT:1d10
-F:MALE | 
-F:FRIENDS | DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | ORC | HURT_LITE | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HAS_LITE
+F:HURT_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:ORC
 D:He is a hardy well-weathered survivor. 
 
 N:150:Bandit
@@ -2237,10 +3008,18 @@ E:1:1:1:2:1:1
 O:25:60:0:0
 B:HIT:HURT:2d4
 B:TOUCH:EAT_GOLD
-F:MALE | 
-F:DROP_1D2 | WILD_TOO | WILD_WOOD | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:TAKE_ITEM
+F:WILD_TOO
+F:WILD_WOOD
 D:He is after your possessions! 
 
 N:151:Hunting hawk
@@ -2252,8 +3031,14 @@ O:0:0:0:0
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
 B:BITE:HURT:1d4
-F:ANIMAL | NO_FEAR | CAN_FLY | WILD_WOOD | WILD_TOO | DROP_CORPSE
-F:MORTAL | HAS_EGG | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:DROP_CORPSE
+F:HAS_EGG
+F:MORTAL
+F:NO_FEAR
+F:WILD_TOO
+F:WILD_WOOD
 D:Trained to hunt and kill without fear. 
 
 N:152:Phantom warrior
@@ -2264,25 +3049,17 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:HURT:1d11
 B:HIT:HURT:1d11
-F:PASS_WALL | NO_SLEEP | FRIENDS | COLD_BLOOD | NONLIVING |
-F:NO_FEAR | EMPTY_MIND | CAN_FLY | BASEANGBAND | NO_CUT
+F:CAN_FLY
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FRIENDS
+F:NONLIVING
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:PASS_WALL
 D:Spectral creatures that are half real, half illusion. 
 
-N:153:Gremlin
-G:u:u
-I:110:5d5:30:30:20
-W:8:3:500:6
-E:1:1:1:2:1:1
-O:0:0:0:0
-B:CLAW:EAT_FOOD:1d2
-B:CLAW:EAT_FOOD:1d2
-B:BITE:EAT_FOOD:1d3
-F:IM_POIS | HURT_LITE | EVIL | DEMON | OPEN_DOOR | 
-F:TAKE_ITEM | CAN_SWIM | 
-F:MORTAL | ZANGBAND
-S:MULTIPLY
-D:Don't feed them after midnight! 
-
 N:154:Yeti
 G:Y:w
 I:110:11d9:20:24:10
@@ -2292,9 +3069,15 @@ O:0:0:0:0
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
 B:BITE:HURT:1d4
-F:OPEN_DOOR | BASH_DOOR | WILD_TOO | WILD_MOUNTAIN | DROP_CORPSE | 
-F:ANIMAL | IM_COLD | 
-F:MORTAL | SUSCEP_FIRE | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:IM_COLD
+F:MORTAL
+F:OPEN_DOOR
+F:SUSCEP_FIRE
+F:WILD_MOUNTAIN
+F:WILD_TOO
 D:A large white figure covered in shaggy fur. 
 
 N:155:Bloodshot icky thing
@@ -2305,10 +3088,12 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:HURT:1d4
 B:CRAWL:ACID:2d4
-F:RAND_50 | 
-F:EMPTY_MIND |  CAN_SWIM | DROP_CORPSE | 
-F:IM_POIS | BASEANGBAND
-S:1_IN_11 | 
+F:CAN_SWIM
+F:DROP_CORPSE
+F:EMPTY_MIND
+F:IM_POIS
+F:RAND_50
+S:1_IN_11
 S:DRAIN_MANA
 D:It is a strange, slimy, icky creature. 
 
@@ -2319,9 +3104,10 @@ W:9:1:250:2
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:POISON:1d4
-F:RAND_25 | 
-F:ANIMAL | IM_POIS | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:IM_POIS
+F:MORTAL
+F:RAND_25
 S:MULTIPLY
 D:It is a rodent of unusual size. 
 
@@ -2334,25 +3120,17 @@ O:0:0:0:0
 B:CLAW:HURT:1d2
 B:CLAW:HURT:1d2
 B:BITE:HURT:1d3
-F:FEMALE | CAN_FLY | WILD_TOO | WILD_MOUNTAIN | DROP_CORPSE | 
-F:RAND_25 | ANIMAL | EVIL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:DROP_CORPSE
+F:EVIL
+F:FEMALE
+F:MORTAL
+F:RAND_25
+F:WILD_MOUNTAIN
+F:WILD_TOO
 D:A woman's face on the body of a vicious black bird. 
 
-N:158:Skaven
-G:r:G
-I:110:11d8:15:25:20
-W:9:1:600:20
-E:1:1:1:2:1:1
-O:35:35:20:0
-B:HIT:HURT:1d4
-B:HIT:HURT:1d4
-F:EVIL | FRIENDS | DROP_60 | DROP_90 | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | MALE | WILD_TOO | WILD_WASTE | WILD_SWAMP | 
-F:MORTAL | ZANGBAND
-D:A mutated rat-creature from the great waste, it is vaguely 
-D:humanoid in appearance and walks on its hind legs. This race 
-D:serves chaos fervently and is greatly feared by others. 
-
 N:159:The wounded bear
 G:q:r
 I:110:11d10:10:35:10
@@ -2362,9 +3140,17 @@ O:0:0:0:0
 B:CLAW:HURT:1d10
 B:CLAW:HURT:1d10
 B:BITE:HURT:1d11
-F:BASH_DOOR | FORCE_MAXHP | FORCE_SLEEP | UNIQUE | DROP_CORPSE | 
-F:ANIMAL | WILD_ONLY | WILD_WOOD | WILD_GRASS | WILD_MOUNTAIN | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:MORTAL
+F:UNIQUE
+F:WILD_GRASS
+F:WILD_MOUNTAIN
+F:WILD_ONLY
+F:WILD_WOOD
 D:A wounded bear, who has occasionally attacked humans. 
 
 N:160:Cave bear
@@ -2376,9 +3162,15 @@ O:0:0:0:0
 B:CLAW:HURT:1d6
 B:CLAW:HURT:1d6
 B:BITE:HURT:1d8
-F:BASH_DOOR | FORCE_MAXHP | FORCE_SLEEP | DROP_CORPSE | 
-F:ANIMAL | WILD_TOO | WILD_WOOD | WILD_MOUNTAIN | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:MORTAL
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:A large bear appears to have made its home in this cave.  It is hungry, 
 D:and you are trespassing in its territory. 
 
@@ -2390,8 +3182,13 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d10
 B:BITE:HURT:1d10
-F:WEIRD_MIND | BASH_DOOR | KILL_WALL | KILL_ITEM | DROP_CORPSE | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:KILL_ITEM
+F:KILL_WALL
+F:MORTAL
+F:WEIRD_MIND
 D:Despite its unimpressive size, this mole creature has fangs powerful 
 D:enough to bore through solid rock. 
 
@@ -2403,12 +3200,25 @@ E:1:1:1:2:1:1
 O:30:40:30:0
 B:HIT:HURT:2d4
 B:HIT:HURT:2d4
-F:MALE | 
-F:FORCE_SLEEP | DROP_90 | WILD_TOO | 
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:CONF | BLIND | HOLD | SLOW | MIND_BLAST | S_MONSTER | BLINK
+F:BASH_DOOR
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
+S:1_IN_3
+S:BLIND
+S:BLINK
+S:CONF
+S:HOLD
+S:MIND_BLAST
+S:SLOW
+S:S_MONSTER
 D:A master of the mental arts, able to damage or dominate the 
 D:minds of others. 
 
@@ -2421,11 +3231,23 @@ O:0:0:0:0
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
 B:BITE:HURT:1d5
-F:FORCE_MAXHP | FORCE_SLEEP | DROP_CORPSE | 
-F:ONLY_GOLD | DROP_60 | DROP_1D2 | HAS_EGG | IMPRESED | 
-F:OPEN_DOOR | BASH_DOOR | CAN_FLY |
-F:EVIL | DRAGON | IM_ELEC | BASEANGBAND | ATTR_MULTI | ATTR_MULTI
-S:1_IN_12 | 
+F:ATTR_MULTI
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_EGG
+F:IMPRESED
+F:IM_ELEC
+F:ONLY_GOLD
+F:OPEN_DOOR
+S:1_IN_12
 S:BR_ELEC
 D:This hatchling dragon is still soft, its eyes unaccustomed to light and 
 D:its scales a pale blue. 
@@ -2439,12 +3261,24 @@ O:0:0:0:0
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
 B:BITE:HURT:1d5
-F:FORCE_MAXHP | FORCE_SLEEP | CAN_FLY | DROP_CORPSE | 
-F:ONLY_GOLD | DROP_60 | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | ATTR_MULTI
-F:EVIL | DRAGON | IM_COLD | SUSCEP_FIRE | HAS_EGG | IMPRESED | BASEANGBAND
 F:ATTR_MULTI
-S:1_IN_12 | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_EGG
+F:IMPRESED
+F:IM_COLD
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:SUSCEP_FIRE
+S:1_IN_12
 S:BR_COLD
 D:This hatchling dragon is still soft, its eyes unaccustomed to light and 
 D:its scales a pale white. 
@@ -2458,11 +3292,22 @@ O:0:0:0:0
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
 B:BITE:HURT:1d5
-F:FORCE_MAXHP | FORCE_SLEEP | 
-F:ONLY_GOLD | DROP_60 | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | CAN_FLY | DROP_CORPSE | 
-F:EVIL | DRAGON | IM_POIS | HAS_EGG | IMPRESED | BASEANGBAND | ATTR_MULTI
-S:1_IN_12 | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_EGG
+F:IMPRESED
+F:IM_POIS
+F:ONLY_GOLD
+F:OPEN_DOOR
+S:1_IN_12
 S:BR_POIS
 D:This hatchling dragon is still soft, its eyes unaccustomed to light and 
 D:its scales a sickly green. 
@@ -2476,11 +3321,22 @@ O:0:0:0:0
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
 B:BITE:HURT:1d5
-F:FORCE_MAXHP | FORCE_SLEEP | CAN_FLY | DROP_CORPSE | 
-F:ONLY_GOLD | DROP_60 | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DRAGON | IM_ACID | HAS_EGG | IMPRESED | BASEANGBAND | ATTR_MULTI
-S:1_IN_12 | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_EGG
+F:IMPRESED
+F:IM_ACID
+F:ONLY_GOLD
+F:OPEN_DOOR
+S:1_IN_12
 S:BR_ACID
 D:This hatchling dragon is still soft, its eyes unaccustomed to light and 
 D:its scales a dull black. 
@@ -2494,12 +3350,24 @@ O:0:0:0:0
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
 B:BITE:HURT:1d5
-F:FORCE_MAXHP | FORCE_SLEEP | CAN_FLY | DROP_CORPSE | SUSCEP_COLD |
-F:ONLY_GOLD | DROP_60 | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DRAGON | IM_FIRE | HAS_EGG | IMPRESED | BASEANGBAND | HAS_LITE
 F:ATTR_MULTI
-S:1_IN_11 | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_EGG
+F:HAS_LITE
+F:IMPRESED
+F:IM_FIRE
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:SUSCEP_COLD
+S:1_IN_11
 S:BR_FIRE
 D:This hatchling dragon is still soft, its eyes unaccustomed to light and 
 D:its scales a pale red. 
@@ -2512,8 +3380,13 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d4
 B:STING:LOSE_STR:1d4
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | DROP_SKELETON
-F:ANIMAL | MORTAL | BASEANGBAND | HAS_LITE
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:HAS_LITE
+F:MORTAL
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is large and has venomous mandibles. 
 
 N:169:Brodda, the Easterling
@@ -2526,11 +3399,21 @@ B:HIT:HURT:1d13
 B:HIT:HURT:1d13
 B:HIT:HURT:1d13
 B:HIT:HURT:1d13
-F:UNIQUE | MALE | EVIL
-F:FORCE_MAXHP | CAN_SPEAK | WILD_TOO | DROP_SKELETON | DROP_CORPSE
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNIQUE
+F:WILD_TOO
 D:A nasty piece of work, Brodda picks on defenceless women and children. 
 
 N:170:Bloodfang, the Wolf
@@ -2541,9 +3424,15 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d12
 B:BITE:HURT:1d12
-F:BASH_DOOR | WILD_ONLY | WILD_GRASS | WILD_WOOD | DROP_CORPSE |
-F:ANIMAL | UNIQUE | FORCE_MAXHP | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:MORTAL
+F:UNIQUE
+F:WILD_GRASS
+F:WILD_ONLY
+F:WILD_WOOD
 D:It has been terrorising the nearby villages. 
 
 N:171:King cobra
@@ -2554,8 +3443,17 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:SPIT:BLIND:1d2
 B:BITE:POISON:3d4
-F:RAND_50 | WILD_TOO | WILD_SWAMP | WILD_WOOD | DROP_SKELETON | DROP_CORPSE | 
-F:BASH_DOOR | CAN_SWIM | ANIMAL | IM_POIS | HAS_EGG | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_EGG
+F:IM_POIS
+F:MORTAL
+F:RAND_50
+F:WILD_TOO
+F:WILD_WOOD
 D:It is a large snake with a hooded face. 
 
 N:172:Eagle
@@ -2567,8 +3465,15 @@ O:0:0:0:0
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
 B:BITE:HURT:1d6
-F:ANIMAL | CAN_FLY | WILD_ONLY | WILD_WASTE | WILD_MOUNTAIN | WILD_WOOD | 
-F:DROP_CORPSE | MORTAL | BASEANGBAND | HAS_EGG
+F:ANIMAL
+F:CAN_FLY
+F:DROP_CORPSE
+F:HAS_EGG
+F:MORTAL
+F:WILD_MOUNTAIN
+F:WILD_ONLY
+F:WILD_WASTE
+F:WILD_WOOD
 D:A magnificent huge predatory bird. 
 
 N:173:War bear
@@ -2580,9 +3485,13 @@ O:0:0:0:0
 B:CLAW:HURT:1d4
 B:CLAW:HURT:1d4
 B:BITE:HURT:1d6
-F:WEIRD_MIND | BASH_DOOR | FRIENDS | DROP_SKELETON | DROP_CORPSE
 F:ANIMAL
-F:MORTAL | BASEANGBAND
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FRIENDS
+F:MORTAL
+F:WEIRD_MIND
 D:Bears with tusks, trained to kill. 
 
 N:174:Killer bee
@@ -2593,8 +3502,12 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:STING:POISON:1d4
 B:STING:LOSE_STR:1d4
-F:WEIRD_MIND | FRIENDS | CAN_FLY | WILD_TOO |
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:FRIENDS
+F:MORTAL
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is poisonous and aggressive. 
 
 N:175:Giant spider
@@ -2607,9 +3520,14 @@ B:BITE:HURT:1d10
 B:BITE:POISON:1d6
 B:BITE:POISON:1d6
 B:BITE:HURT:1d10
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | DROP_SKELETON | 
-F:ANIMAL | SPIDER | IM_POIS | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:IM_POIS
+F:MORTAL
+F:SPIDER
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is a vast spider whose bulbous body is bloated with poison. 
 
 N:176:Giant white tick
@@ -2619,33 +3537,14 @@ W:10:2:200:27
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:POISON:2d6
-F:WEIRD_MIND | BASH_DOOR | CAN_FLY |
-F:ANIMAL | IM_POIS | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:IM_POIS
+F:MORTAL
+F:WEIRD_MIND
 D:It is moving slowly towards you. 
 
-N:177:The Borshin
-G:g:w
-I:110:12d20:40:30:0
-W:10:2:600:45
-E:1:1:1:2:1:1
-O:0:0:0:0
-B:HIT:HURT:2d12
-B:CRUSH:HURT:2d15
-B:TOUCH:TERRIFY
-F:BASH_DOOR | UNIQUE | FORCE_MAXHP | NO_CONF
-F:IM_POIS | IM_COLD | NO_FEAR 
-F:MORTAL | CTHANGBAND | NO_CUT
-D:Pallid and twisted, this creature hates the very sight of you. 
-D:"It looked like something that had started out to be a man but had never 
-D:quite made it. It had been stepped on, twisted, had holes poked into the 
-D:sickly dough of its head-bulge. Bones showed through the transparent flesh 
-D:of its torso and its short legs were as thick as trees, terminating in 
-D:disk-shaped pads from which dozens of long toes hung like roots or worms. 
-D:its arms were longer than its entire body. it was a crushed slug, a thing 
-D:that had been frozen and thawed before it was fully baked. It was - 
-D:'It is the Borshin', said the Lord of Bats." 
-
 N:178:Dark elven mage
 G:h:r
 I:120:7d10:20:16:20
@@ -2654,27 +3553,26 @@ E:1:1:1:2:1:1
 O:0:0:100:0
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
-F:MALE | 
-F:FORCE_SLEEP | 
-F:ONLY_ITEM | DROP_1D2 | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | IM_POIS | HURT_LITE | BASEANGBAND | HAS_LITE
-S:1_IN_5 | 
-S:BLIND | CONF | MISSILE | DARKNESS | BA_POIS
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:HURT_LITE
+F:IM_POIS
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+S:1_IN_5
+S:BA_POIS
+S:BLIND
+S:CONF
+S:DARKNESS
+S:MISSILE
 D:A dark elven figure, dressed all in black, hurling spells at you. 
 
-N:179:Kamikaze yeek
-G:y:r
-I:113:4d8:18:18:10
-W:10:1:800:10
-E:1:1:1:2:1:1
-O:0:0:0:0
-B:EXPLODE:HURT:15d2
-F:OPEN_DOOR | BASH_DOOR | 
-F:ANIMAL | IM_ACID | 
-F:MORTAL | ZANGBAND
-D:The evil wizard Bruce has trained them to be living weapons. 
-
 N:180:Orfax, Son of Boldor
 G:y:B
 I:120:14d10:18:20:10
@@ -2685,35 +3583,34 @@ B:HIT:HURT:1d10
 B:HIT:HURT:1d9
 B:INSULT:*
 B:INSULT:*
-F:UNIQUE | MALE | CAN_SPEAK | DROP_CORPSE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ESCORT | ESCORTS | 
-F:ONLY_ITEM | DROP_90 | DROP_GOOD | 
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:ANIMAL | EVIL | IM_ACID | 
-F:MORTAL | BASEANGBAND
-S:1_IN_4 | 
-S:HEAL | BLINK | TELE_TO | SLOW | CONF | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_GOOD
+F:ESCORT
+F:ESCORTS
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:UNIQUE
+S:1_IN_4
+S:BLINK
+S:CONF
+S:HEAL
+S:SLOW
 S:S_MONSTER
+S:TELE_TO
 D:He's just like his daddy!  He knows mighty spells, but fortunately he is a 
 D:yeek. 
 
-N:181:Servant of Glaaki
-G:z:G
-I:110:9d9:20:20:20
-W:10:1:600:25
-E:0:0:0:0:0:0
-O:0:0:0:0
-B:CRUSH:HURT:1d8
-B:CLAW:DISEASE:1d3
-F:OPEN_DOOR | BASH_DOOR | FRIENDS | HURT_LITE |
-F:NO_CONF | NO_SLEEP | UNDEAD | EVIL | NO_FEAR | IM_POIS | 
-F:IM_COLD | COLD_BLOOD | CTHANGBAND | NO_CUT
-S:1_IN_12
-S:CAUSE_1 | SCARE
-D:"...the hand of a corpse -- bloodless and skeletal, and with 
-D:impossibly long, cracked nails." 
-
 N:182:Dark elven warrior
 G:h:u
 I:110:10d11:20:16:20
@@ -2722,30 +3619,19 @@ E:1:1:1:2:1:1
 O:10:90:0:0
 B:HIT:HURT:1d8
 B:HIT:HURT:1d8
-F:MALE | 
-F:DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | HURT_LITE | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:HAS_LITE
+F:HURT_LITE
+F:MALE
+F:OPEN_DOOR
 S:1_IN_12
 S:MISSILE
 D:A dark elven figure in armour, ready with his sword. 
 
-N:183:Sand-dweller
-G:u:y
-I:110:9d9:20:20:20
-W:10:1:600:30
-E:1:1:1:2:1:1
-O:20:50:20:5
-B:CLAW:HURT:1d6
-B:CLAW:HURT:1d6
-F:FRIENDS | WILD_TOO | WILD_WASTE | DROP_SKELETON | 
-F:OPEN_DOOR | BASH_DOOR | HURT_LITE | EVIL | DROP_60 | DROP_90 | 
-F:MALE
-F:MORTAL | CTHANGBAND
-D:"Rough-skinned, large-eyed, large-eared, with a horrible, 
-D:distorted resemblance to the koala bear facially, though 
-D:his body had an appearance of emaciation." 
-
 N:184:Clear mushroom patch
 G:,:B
 I:120:1d1:4:1:0
@@ -2753,10 +3639,17 @@ W:10:2:30:3
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:HURT:1d1
-F:ATTR_CLEAR | 
-F:NEVER_MOVE | INVISIBLE | COLD_BLOOD | 
-F:STUPID | EMPTY_MIND | CAN_SWIM |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:ATTR_CLEAR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:INVISIBLE
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 S:MULTIPLY
 D:Yum! It smells quite tasty.  If you could only see it...
 
@@ -2767,11 +3660,18 @@ W:10:2:60:3
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:CONFUSE:1d1
-F:NEVER_MOVE | COLD_BLOOD | 
-F:STUPID | EMPTY_MIND | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | JOKEANGBAND | NO_CUT
-S:MULTIPLY | 
-S:1_IN_5 | ARROW_1
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:JOKEANGBAND
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+S:1_IN_5
+S:ARROW_1
+S:MULTIPLY
 D:What looks like the remains of a quiver dropped by a past adventurer 
 D:has become overgrown with a strange mold intent on using the contents 
 D:of the quiver to grab prey. 
@@ -2786,13 +3686,25 @@ B:HIT:HURT:1d13
 B:HIT:HURT:1d11
 B:HIT:HURT:1d13
 B:HIT:HURT:1d11
-F:UNIQUE | MALE | CAN_SPEAK | 
-F:FORCE_MAXHP | SPECIAL_GENE | 
-F:ESCORT | WILD_TOO |
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:ORC
+F:SPECIAL_GENE
+F:UNIQUE
+F:WILD_TOO
 D:He is a cunning and devious orc with a chaotic nature. 
 
 N:187:Giant tan bat
@@ -2804,9 +3716,16 @@ O:0:0:0:0
 B:BITE:TERRIFY:1d3
 B:CLAW:HURT:1d2
 B:CLAW:HURT:1d2
-F:RAND_50 | CAN_FLY | WILD_TOO | WILD_MOUNTAIN | WILD_WOOD |
-F:FORCE_SLEEP | ANIMAL | DROP_CORPSE | AI_ANNOY | 
-F:MORTAL | BASEANGBAND
+F:AI_ANNOY
+F:ANIMAL
+F:CAN_FLY
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:MORTAL
+F:RAND_50
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:A giant bat, the beating of whose wings produces a strangely unnerving noise. 
 
 N:188:Owlbear
@@ -2818,23 +3737,14 @@ O:0:0:0:0
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
 B:CRUSH:HURT:1d10
-F:EVIL | ANIMAL | OPEN_DOOR | BASH_DOOR | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:EVIL
+F:MORTAL
+F:OPEN_DOOR
 D:A bizarre bear-creature with the claws and the face of an owl. 
 
-N:189:Blue horror
-G:u:B
-I:110:14d9:20:35:20
-W:10:3:1200:25
-E:1:1:1:2:1:1
-O:0:0:0:0
-B:CLAW:TERRIFY:1d8
-B:CLAW:TERRIFY:1d8
-F:FRIENDS | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DEMON | IM_FIRE | NO_FEAR | NO_CONF | ZANGBAND
-D:An ugly screaming little demon servant of Tzeentch. 
-
 N:190:Hairy mold
 G:m:o
 I:110:15d8:2:15:70
@@ -2842,10 +3752,15 @@ W:10:1:50:32
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:POISON:1d3
-F:NEVER_MOVE | CAN_SWIM |
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:EMPTY_MIND
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:It is a strange hairy growth on the dungeon floor. 
 
 N:191:Grizzly bear
@@ -2858,9 +3773,13 @@ B:CLAW:HURT:1d8
 B:CLAW:HURT:1d8
 B:BITE:HURT:1d12
 B:CRUSH:HURT:1d10
-F:WILD_TOO | WILD_WOOD | WILD_MOUNTAIN | DROP_CORPSE | 
-F:ANIMAL | BASH_DOOR | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:MORTAL
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:A huge, beastly bear, more savage than most of its kind. 
 
 N:192:Disenchanter mold
@@ -2870,11 +3789,18 @@ W:10:1:40:40
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:UN_BONUS:1d6
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | RES_DISE |
-F:IM_POIS | ATTR_MULTI | CAN_SWIM |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_11 | 
+F:ATTR_MULTI
+F:CAN_SWIM
+F:EMPTY_MIND
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RES_DISE
+F:STUPID
+S:1_IN_11
 S:DRAIN_MANA
 D:It is a strange glowing growth on the dungeon floor. 
 
@@ -2887,11 +3813,22 @@ O:50:50:0:0
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
 B:BITE:HURT:1d5
-F:FORCE_MAXHP | FORCE_SLEEP | CAN_FLY | DROP_CORPSE | 
-F:DROP_60 | BASH_DOOR | HAS_EGG | 
-F:EVIL | DRAGON | BASEANGBAND | HAS_LITE | ATTR_MULTI
-S:1_IN_11 | 
-S:CONF | SCARE | BR_LITE | BR_DARK
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_EGG
+F:HAS_LITE
+S:1_IN_11
+S:BR_DARK
+S:BR_LITE
+S:CONF
+S:SCARE
 D:A small relative of the dragon that inhabits dark caves. 
 
 N:194:Tengu
@@ -2901,10 +3838,19 @@ W:10:1:600:40
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:1d8
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DEMON | IM_FIRE | NO_FEAR | RES_TELE | CAN_FLY | BASEANGBAND
-S:1_IN_3 | 
-S:BLINK | TELE_TO | TELE_AWAY | TPORT
+F:BASH_DOOR
+F:CAN_FLY
+F:DEMON
+F:EVIL
+F:IM_FIRE
+F:NO_FEAR
+F:OPEN_DOOR
+F:RES_TELE
+S:1_IN_3
+S:BLINK
+S:TELE_AWAY
+S:TELE_TO
+S:TPORT
 D:It is a fast-moving demon that blinks quickly in and out of existence; no 
 D:other demon matches its teleporting mastery. 
 
@@ -2916,9 +3862,16 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:HURT:2d5
 B:TOUCH:POISON:3d5
-F:ONLY_GOLD | DROP_90 | DROP_1D2 | 
-F:COLD_BLOOD | BASH_DOOR | 
-F:IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_90
+F:IM_ELEC
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_GOLD
 D:It appears to be a pile of gold coins, until it starts crawling towards you 
 D:on tiny legs. 
 
@@ -2929,10 +3882,16 @@ W:10:1:600:30
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d6
-F:RAND_25 | FRIENDS | 
-F:BASH_DOOR | WILD_TOO | WILD_WOOD | WILD_WASTE | WILD_MOUNTAIN | 
-F:ANIMAL | DROP_CORPSE |
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:FRIENDS
+F:MORTAL
+F:RAND_25
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WASTE
+F:WILD_WOOD
 D:It howls and snaps at you. 
 
 N:197:Giant fruit fly
@@ -2942,8 +3901,12 @@ W:10:3:100:4
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:BITE:HURT:1d2
-F:RAND_50 | RAND_25 | CAN_FLY | WEIRD_MIND | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:MORTAL
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
 S:MULTIPLY
 D:A fast-breeding, annoying pest. 
 
@@ -2955,8 +3918,14 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:CLAW:HURT:1d8
 B:CLAW:HURT:1d8
-F:BASH_DOOR | WILD_TOO | WILD_WOOD | WILD_GRASS | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:MORTAL
+F:WILD_GRASS
+F:WILD_TOO
+F:WILD_WOOD
 D:A large black cat, stalking you with intent. It thinks you're its next 
 D:meal. 
 
@@ -2968,11 +3937,15 @@ E:1:1:1:2:1:1
 O:25:60:0:0
 B:HIT:HURT:2d4
 B:TOUCH:EAT_ITEM
-F:MALE | 
-F:DROP_1D2 | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DROP_SKELETON | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_SKELETON
+F:EVIL
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:TAKE_ITEM
 D:He is eyeing your backpack. 
 
 N:200:Hobbes the Tiger
@@ -2984,31 +3957,17 @@ O:0:0:0:0
 B:CLAW:HURT:1d12
 B:CLAW:HURT:1d12
 B:BITE:HURT:1d5
-F:BASH_DOOR | UNIQUE | FORCE_MAXHP |
-F:ANIMAL | MALE | CAN_SPEAK | DROP_CORPSE | 
-F:MORTAL | JOKEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:JOKEANGBAND
+F:MALE
+F:MORTAL
+F:UNIQUE
 D:Fast-moving, with a taste for tuna sandwiches. 
 
-N:201:Shadow Creature of Fiona
-G:h:s
-I:110:11d8:12:12:16
-W:10:2:1000:35
-E:1:1:1:2:1:1
-O:20:30:50:0
-B:HIT:HURT:1d8
-B:HIT:HURT:1d8
-F:BASH_DOOR | OPEN_DOOR | FRIENDS | DROP_60 | IM_POIS | NO_SLEEP | NO_CONF
-F:MALE | DROP_SKELETON | ZANGBAND
-D:"There was something unusual about their appearance... For one thing, 
-D:all had uniformly bloodshot eyes. Very, very bloodshot eyes. With them, 
-D:though, the condition seemed normal. For another, all had an extra joint 
-D:to each finger and thumb, and sharp, forward-curving spurs on the backs 
-D:of their hands. All of them had prominent jaws and forty-four teeth, 
-D:most of them longer than human teeth, and several looking to be much 
-D:sharper. Their flesh was grayish and hard and shiny. There were 
-D:undoubtedly other differences also, but those were sufficient to prove 
-D:a point of some sort." 
-
 N:202:Undead mass
 G:j:u
 I:110:8d8:70:12:5
@@ -3017,27 +3976,22 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:DISEASE:1d6
 B:TOUCH:LOSE_CON:1d6
-F:UNDEAD | EMPTY_MIND | NO_CONF | NO_SLEEP | IM_POIS | IM_COLD | NO_FEAR |
-F:HURT_LITE | COLD_BLOOD | EVIL | NEVER_MOVE | BASEANGBAND | NO_CUT
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:UNDEAD
 S:MULTIPLY
 D:A sickening mound of decaying flesh, bones, hands and so on. It seems to 
 D:be growing. 
 
-N:203:Chaos shapechanger
-G:H:v
-I:110:20d9:10:14:12
-W:11:2:0:38
-E:1:1:1:2:1:1
-O:20:50:20:6
-B:HIT:HURT:1d5
-B:HIT:HURT:1d5
-B:HIT:CONFUSE:1d3
-F:DROP_60 | EVIL | SHAPECHANGER | ATTR_MULTI | ATTR_ANY
-F:MORTAL | ZANGBAND
-S:1_IN_5
-S:BO_FIRE | BO_COLD | CONF
-D:A vaguely humanoid form constantly changing its appearance. 
-
 N:204:Baby multi-hued dragon
 G:d:v
 I:110:13d10:20:30:70
@@ -3047,33 +4001,35 @@ O:0:0:0:0
 B:CLAW:HURT:1d4
 B:CLAW:HURT:1d4
 B:BITE:HURT:1d6
-F:ATTR_MULTI | 
-F:FORCE_MAXHP | FORCE_SLEEP | 
-F:ONLY_GOLD | DROP_60 | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | 
-F:EVIL | DRAGON | CAN_FLY |
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | HAS_EGG | IMPRESED | 
-F:BASEANGBAND | HAS_LITE
-S:1_IN_12 | 
-S:BR_ACID | BR_FIRE | BR_COLD | BR_ELEC | BR_POIS
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_EGG
+F:HAS_LITE
+F:IMPRESED
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:ONLY_GOLD
+F:OPEN_DOOR
+S:1_IN_12
+S:BR_ACID
+S:BR_COLD
+S:BR_ELEC
+S:BR_FIRE
+S:BR_POIS
 D:This hatchling dragon is still soft, its eyes unaccustomed to light and 
 D:its scales shimmering with a hint of colour. 
 
-N:205:Vorpal bunny
-G:r:w
-I:120:10d10:40:40:0
-W:11:3:600:40
-E:0:1:0:2:1:0
-O:0:0:0:0
-B:BITE:HURT:6d1
-B:BITE:HURT:7d1
-F:BASH_DOOR | WILD_TOO | WILD_MOUNTAIN | DROP_CORPSE | 
-F:ANIMAL | MORTAL | ZANGBAND
-S:1_IN_8
-S:BLINK
-D:It looks very cute, except for the razor sharp teeth. It moans 
-D:ominously as it jumps at your throat! 
-
 N:206:Old Man Willow
 G:#:s
 I:110:32d30:20:20:20
@@ -3083,12 +4039,26 @@ O:0:50:50:0
 B:TOUCH:PARALYZE:1d14
 B:TOUCH:PARALYZE:1d14
 B:CRUSH:HURT:2d12
-F:ANIMAL | NEVER_MOVE | COLD_BLOOD | DROP_RANDART
-F:EMPTY_MIND | UNIQUE | FORCE_MAXHP | FORCE_SLEEP |
-F:RES_WATE | IM_POIS | IM_ACID | SUSCEP_FIRE | SPECIAL_GENE | 
-F:DROP_1D2 | DROP_GOOD | ONLY_ITEM | BASEANGBAND | NO_CUT
-S:1_IN_10 | 
-S:TELE_TO | HOLD | 
+F:ANIMAL
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_GOOD
+F:DROP_RANDART
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CUT
+F:ONLY_ITEM
+F:RES_WATE
+F:SPECIAL_GENE
+F:SUSCEP_FIRE
+F:UNIQUE
+S:1_IN_10
+S:HOLD
+S:TELE_TO
 D:The ancient grey willow tree, ruler of the Old Forest. He despises 
 D:trespassers in his territory.  "...a huge willow-tree, old and hoary. 
 D:Enormous it looked, its sprawling branches going up like racing arms 
@@ -3103,8 +4073,11 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:2d5
 B:BITE:HURT:2d5
-F:AQUATIC | WILD_TOO | DROP_CORPSE | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:DROP_CORPSE
+F:MORTAL
+F:WILD_TOO
 D:A truly strange hybrid of a horse and a fish. 
 
 N:208:Zombified orc
@@ -3116,10 +4089,19 @@ O:0:0:0:0
 B:HIT:HURT:1d4
 B:HIT:HURT:1d4
 B:HIT:HURT:1d4
-F:COLD_BLOOD | EMPTY_MIND | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | UNDEAD | 
-F:IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:ORC
+F:UNDEAD
 D:It is a shambling orcish corpse leaving behind a trail of flesh. 
 
 N:209:Hippogryph
@@ -3130,8 +4112,14 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:HIT:HURT:2d5
 B:BITE:HURT:2d5
-F:BASH_DOOR | CAN_FLY | WILD_TOO | WILD_MOUNTAIN | WILD_GRASS | 
-F:ANIMAL | DROP_CORPSE | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:MORTAL
+F:WILD_GRASS
+F:WILD_MOUNTAIN
+F:WILD_TOO
 D:A strange hybrid of eagle and horse. It looks weird. 
 
 N:210:Black mamba
@@ -3141,10 +4129,18 @@ W:12:3:300:40
 E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:POISON:4d4
-F:RAND_50 | BASH_DOOR | CAN_SWIM | 
-F:WILD_TOO | WILD_WOOD | WILD_GRASS | WILD_SWAMP | 
-F:ANIMAL | IM_POIS | DROP_SKELETON | DROP_CORPSE | HAS_EGG | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_EGG
+F:IM_POIS
+F:MORTAL
+F:RAND_50
+F:WILD_GRASS
+F:WILD_TOO
+F:WILD_WOOD
 D:It has glistening black skin, a sleek body, and highly venomous fangs. 
 
 N:211:White wolf
@@ -3155,11 +4151,17 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d3
 B:BITE:HURT:1d4
-F:RAND_25 | 
-F:FRIENDS | SUSCEP_FIRE |
-F:BASH_DOOR | WILD_TOO | WILD_WASTE |
-F:ANIMAL | IM_COLD | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FRIENDS
+F:IM_COLD
+F:MORTAL
+F:RAND_25
+F:SUSCEP_FIRE
+F:WILD_TOO
+F:WILD_WASTE
 D:A large and muscled wolf from the northern wastes. Its breath is cold and 
 D:icy and its fur coated in frost. 
 
@@ -3170,11 +4172,17 @@ W:12:3:2600:60
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:EXP_10
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | HURT_LITE | CAN_SWIM |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_11 | 
+F:CAN_SWIM
+F:EMPTY_MIND
+F:HURT_LITE
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+S:1_IN_11
 S:DRAIN_MANA
 D:Yum! It looks quite tasty.  It is a pulsing mound of glowing flesh. 
 
@@ -3185,27 +4193,20 @@ W:12:4:200:6
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:EXP_10
-F:RAND_50 | RAND_25 | CAN_SWIM |
-F:STUPID | WEIRD_MIND | BASH_DOOR | 
-F:ANIMAL | HURT_LITE | NO_FEAR | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:HURT_LITE
+F:NO_CUT
+F:NO_FEAR
+F:RAND_25
+F:RAND_50
+F:STUPID
+F:WEIRD_MIND
 S:MULTIPLY
 D:It is a disgusting mass of dark worms, eating each other, the floor, 
 D:the air, you... 
 
-N:214:Abyss worm mass
-G:w:D
-I:100:5d8:10:15:3
-W:12:4:200:7
-E:0:0:0:0:0:0
-O:0:0:0:0
-B:CRAWL:EXP_10
-F:RAND_50 | RAND_25 | 
-F:STUPID | WEIRD_MIND | BASH_DOOR | EVIL | CAN_SWIM |
-F:ANIMAL | HURT_LITE | NO_FEAR | KILL_WALL | COLD_BLOOD | INVISIBLE | 
-F:MORTAL | ZANGBAND | NO_CUT
-S:MULTIPLY
-D:Even more disgusting dark worms, their essence that of unbeing. 
-
 N:215:Golfimbul, the Hill Orc Chief
 G:o:y
 I:110:26d10:20:60:20
@@ -3216,13 +4217,28 @@ B:HIT:HURT:1d13
 B:HIT:HURT:1d13
 B:HIT:HURT:1d11
 B:HIT:HURT:1d11
-F:UNIQUE | MALE | 
-F:FORCE_MAXHP | WILD_TOO | SPECIAL_GENE | 
-F:ESCORT | DROP_SKELETON | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | CAN_SPEAK |
-F:EVIL | ORC | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:ORC
+F:SPECIAL_GENE
+F:UNIQUE
+F:WILD_TOO
 D:A leader of a band of raiding orcs, he picks on hobbits. 
 
 N:216:Swordsman
@@ -3233,29 +4249,17 @@ E:1:1:1:2:1:1
 O:0:100:0:0
 B:HIT:HURT:3d5
 B:HIT:HURT:3d5
-F:MALE | WILD_TOO |
-F:DROP_1D2 | DROP_SKELETON | DROP_CORPSE
-F:OPEN_DOOR | BASH_DOOR
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
 D:A warrior of considerable skill. 
 
-N:217:Skaven shaman
-G:r:g
-I:110:10d8:20:15:20
-W:12:1:600:36
-E:1:1:1:2:1:1
-O:0:0:100:0
-B:HIT:HURT:1d7
-B:HIT:HURT:1d7
-F:MALE | WILD_TOO | WILD_SWAMP | WILD_WASTE |
-F:FORCE_SLEEP | DROP_90 | 
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | MORTAL | ZANGBAND
-S:1_IN_8 | 
-S:BLINK | CAUSE_1 | MISSILE | CONF | SCARE
-D:The shaman of a skaven tribe gets his powers from a mystic 
-D:stone corrupted by chaos, called a Warp Stone. 
-
 N:218:Baby bronze dragon
 G:d:U
 I:110:10d10:20:30:70
@@ -3265,11 +4269,22 @@ O:0:0:0:0
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
 B:BITE:HURT:1d5
-F:FORCE_MAXHP | FORCE_SLEEP | CAN_FLY | DROP_CORPSE | 
-F:ONLY_GOLD | DROP_60 | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DRAGON | NO_CONF | HAS_EGG | IMPRESED | BASEANGBAND | ATTR_MULTI
-S:1_IN_12 | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_EGG
+F:IMPRESED
+F:NO_CONF
+F:ONLY_GOLD
+F:OPEN_DOOR
+S:1_IN_12
 S:BR_CONF
 D:This hatchling dragon is still soft, its eyes unaccustomed to light and 
 D:its scales a dull bronze. 
@@ -3283,12 +4298,23 @@ O:0:0:0:0
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
 B:BITE:HURT:1d5
-F:FORCE_MAXHP | FORCE_SLEEP | CAN_FLY | DROP_CORPSE | 
-F:ONLY_GOLD | DROP_60 | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DRAGON | NO_STUN | HAS_EGG | IMPRESED | BASEANGBAND | HAS_LITE
 F:ATTR_MULTI
-S:1_IN_12 | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_EGG
+F:HAS_LITE
+F:IMPRESED
+F:NO_STUN
+F:ONLY_GOLD
+F:OPEN_DOOR
+S:1_IN_12
 S:BR_SOUN
 D:This hatchling dragon is still soft, its eyes unaccustomed to light and 
 D:its scales a pale gold. 
@@ -3301,58 +4327,20 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:GAZE:EXP_10
 B:GAZE:EXP_10
-F:NEVER_MOVE | EVIL | CAN_FLY | DROP_CORPSE | 
-F:HURT_LITE | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_7 | 
-S:HOLD | TELE_TO 
+F:CAN_FLY
+F:DROP_CORPSE
+F:EVIL
+F:HURT_LITE
+F:NEVER_MOVE
+F:NO_CUT
+F:NO_FEAR
+S:1_IN_7
+S:HOLD
+S:TELE_TO
 D:A huge disembodied eye.  As you stare into the black nothingness of its pupil, 
 D:you feel your will and vitality draining away, and are unable to do anything 
 D:except approach it in horrified fascination. 
 
-N:221:Mine-dog
-G:C:u
-I:120:6d6:30:30:20
-W:12:4:500:40
-E:0:1:0:2:1:0
-O:0:0:0:0
-B:EXPLODE:HURT:6d6
-F:RAND_50 | FRIENDS | BASH_DOOR | ANIMAL | 
-F:MORTAL | ZANGBAND
-D:An explosive charge has been attached to this poor animal, who 
-D:has been trained to search for its target and detonate. 
-
-N:222:Hellcat
-G:f:R
-I:120:9d8:20:30:30
-W:12:1:400:40
-E:0:1:0:2:1:0
-O:0:0:0:0
-B:CLAW:HURT:1d5
-B:CLAW:HURT:1d5
-B:BITE:HURT:1d8
-F:ANIMAL | WEIRD_MIND | FRIENDS | RAND_25 | IM_FIRE | EVIL | SUSCEP_COLD |
-F:MORTAL | ZANGBAND | HAS_LITE
-D:It is as large as a tiger, and its yellow eyes are pupilless. 
-
-N:223:Moon beast
-G:q:W
-I:120:9d10:30:30:20
-W:12:1:800:57
-E:0:1:0:2:1:0
-O:50:0:40:5
-B:CLAW:HURT:1d3
-B:CLAW:HURT:1d3
-B:BUTT:HURT:1d6
-F:DROP_1D2 | ONLY_ITEM | OPEN_DOOR | BASH_DOOR |
-F:EVIL | IM_FIRE | ANIMAL | DROP_CORPSE
-F:MORTAL | ZANGBAND
-S:1_IN_6
-S:HEAL | BLIND | DARKNESS | CONF | CAUSE_2
-D:"Great greyish-white slippery things which could expand and 
-D:contract at will, and whose principle shape... was that of a 
-D:sort of toad without any eyes, but with a curious vibrating mass 
-D:of short pink tentacles on the end of its blunt, vague snout." 
-
 N:224:Master yeek
 G:y:g
 I:110:12d9:18:24:10
@@ -3360,14 +4348,22 @@ W:12:2:600:28
 E:1:1:1:2:1:1
 O:0:0:100:0
 B:HIT:HURT:1d8
-F:FORCE_SLEEP | 
-F:DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:ANIMAL | EVIL | IM_ACID | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND
-S:1_IN_4 | 
-S:BLINK | TPORT | BLIND | SLOW | BA_POIS | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_SLEEP
+F:IM_ACID
+F:MORTAL
+F:OPEN_DOOR
+S:1_IN_4
+S:BA_POIS
+S:BLIND
+S:BLINK
+S:SLOW
 S:S_MONSTER
+S:TPORT
 D:A small humanoid that radiates some power. 
 
 N:225:Priest
@@ -3378,13 +4374,21 @@ E:1:1:1:2:1:1
 O:0:20:80:0
 B:HIT:HURT:2d3
 B:HIT:HURT:2d3
-F:MALE | GOOD |
-F:FORCE_SLEEP | 
-F:DROP_1D2 | 
-F:SMART | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_3 |
-S:HEAL | SCARE | CAUSE_2 |
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:SMART
+S:1_IN_3
+S:CAUSE_2
+S:HEAL
+S:SCARE
 S:S_MONSTER
 D:A robed man dedicated to his god. 
 
@@ -3396,13 +4400,25 @@ E:1:1:1:2:1:1
 O:0:10:90:0
 B:HIT:HURT:1d9
 B:HIT:HURT:1d10
-F:MALE | 
-F:FORCE_SLEEP | 
-F:ONLY_ITEM | DROP_1D2 | 
-F:SMART | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | HURT_LITE | BASEANGBAND | HAS_LITE
-S:1_IN_5 | 
-S:HEAL | BLIND | CONF | CAUSE_2 | DARKNESS | MISSILE
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:HURT_LITE
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+S:1_IN_5
+S:BLIND
+S:CAUSE_2
+S:CONF
+S:DARKNESS
+S:HEAL
+S:MISSILE
 D:A dark elven figure, dressed all in black, chanting curses and waiting to 
 D:deliver your soul to hell. 
 
@@ -3413,10 +4429,20 @@ W:12:2:0:40
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:HURT:1d3
-F:RAND_50 | RAND_25 | IM_ELEC | IM_POIS | 
-F:EMPTY_MIND | INVISIBLE | COLD_BLOOD | BASH_DOOR | 
-F:IM_POIS | CAN_FLY |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:IM_ELEC
+F:IM_POIS
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RAND_25
+F:RAND_50
 D:A whirlwind of sentient air. 
 
 N:228:Skeleton human
@@ -3426,9 +4452,18 @@ W:12:1:1500:38
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:1d8
-F:EMPTY_MIND | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:UNDEAD
 D:It is an animated human skeleton. 
 
 N:229:Zombified human
@@ -3439,9 +4474,18 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:1d4
 B:HIT:HURT:1d4
-F:EMPTY_MIND | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:UNDEAD
 D:It is a shambling human corpse dropping chunks of flesh behind it. 
 
 N:230:Tiger
@@ -3453,9 +4497,15 @@ O:0:0:0:0
 B:CLAW:HURT:1d8
 B:CLAW:HURT:1d8
 B:BITE:HURT:1d6
-F:BASH_DOOR | WILD_TOO | WILD_GRASS | WILD_WOOD | WILD_MOUNTAIN | 
-F:ANIMAL | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:MORTAL
+F:WILD_GRASS
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:One of the largest of its species, a sleek orange and black shape creeps 
 D:towards you, ready to pounce. 
 
@@ -3467,12 +4517,23 @@ E:0:0:0:0:0:0
 O:45:15:25:0
 B:WAIL:TERRIFY
 B:TOUCH:LOSE_DEX:1d8
-F:FORCE_SLEEP | RAND_25 | 
-F:DROP_60 | DROP_90 | CAN_FLY |
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | 
-F:EVIL | UNDEAD | IM_COLD | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_15 | 
-S:TPORT | SCARE
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_60
+F:DROP_90
+F:EVIL
+F:FORCE_SLEEP
+F:IM_COLD
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
+F:RAND_25
+F:UNDEAD
+S:1_IN_15
+S:SCARE
+S:TPORT
 D:A ghostly apparition that shrieks horribly. 
 
 N:232:Stegocentipede
@@ -3484,8 +4545,11 @@ O:0:0:0:0
 B:BITE:HURT:2d4
 B:BITE:HURT:2d4
 B:STING:HURT:2d4
-F:WEIRD_MIND | BASH_DOOR | 
-F:ANIMAL | DROP_SKELETON | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:MORTAL
+F:WEIRD_MIND
 D:It is a vast armoured centipede with massive mandibles and a spiked tail. 
 
 N:233:Spotted jelly
@@ -3497,10 +4561,18 @@ O:0:0:0:0
 B:TOUCH:ACID:1d10
 B:TOUCH:ACID:2d6
 B:TOUCH:ACID:2d6
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | COLD_BLOOD | 
-F:IM_ACID | IM_POIS | HURT_LITE | CAN_SWIM |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:HURT_LITE
+F:IM_ACID
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:A strange jelly thing, covered in discoloured blotches. 
 
 N:234:Drider
@@ -3512,12 +4584,19 @@ O:0:0:0:0
 B:HIT:HURT:1d12
 B:HIT:HURT:1d12
 B:BITE:POISON:1d6
-F:FORCE_SLEEP | 
-F:BASH_DOOR | DROP_SKELETON |
-F:EVIL | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_8 | 
-S:CONF | CAUSE_1 | DARKNESS | MISSILE | ARROW_2 
+F:BASH_DOOR
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_POIS
+F:MORTAL
+S:1_IN_8
+S:ARROW_2
+S:CAUSE_1
+S:CONF
+S:DARKNESS
+S:MISSILE
 D:A dark elven torso merged with the bloated form of a giant spider. 
 
 N:235:Mongbat
@@ -3529,9 +4608,17 @@ O:0:0:0:0
 B:CLAW:HURT:1d4
 B:CLAW:HURT:1d4
 B:BITE:POISON:1d8
-F:ANIMAL | EVIL | FRIENDS | CAN_FLY | FORCE_MAXHP |
-F:IM_COLD | IM_ELEC | IM_POIS | WEIRD_MIND | DROP_CORPSE
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FRIENDS
+F:IM_COLD
+F:IM_ELEC
+F:IM_POIS
+F:MORTAL
+F:WEIRD_MIND
 D:Devil-bats, notoriously difficult to kill. 
 
 N:236:Killer brown beetle
@@ -3541,8 +4628,12 @@ W:13:1:500:38
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:3d4
-F:WEIRD_MIND | BASH_DOOR | CAN_FLY | DROP_CORPSE | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:MORTAL
+F:WEIRD_MIND
 D:It is a vicious insect with a tough carapace. 
 
 N:237:Boldor, King of the Yeeks
@@ -3554,16 +4645,33 @@ O:0:90:10:0
 B:HIT:HURT:1d10
 B:HIT:HURT:1d10
 B:HIT:HURT:1d9
-F:UNIQUE | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ESCORT | ESCORTS | 
-F:ONLY_ITEM | DROP_90 | DROP_1D2 | DROP_GOOD | 
-F:SMART | OPEN_DOOR | BASH_DOOR | CAN_SPEAK | DROP_CORPSE | 
-F:ANIMAL | EVIL | IM_ACID | 
-F:MORTAL | BASEANGBAND
-S:1_IN_2 | 
-S:HEAL | BLINK | TPORT | BLIND | SLOW | 
-S:S_KIN | S_MONSTER
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_GOOD
+F:ESCORT
+F:ESCORTS
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:UNIQUE
+S:1_IN_2
+S:BLIND
+S:BLINK
+S:HEAL
+S:SLOW
+S:S_KIN
+S:S_MONSTER
+S:TPORT
 D:A great yeek, powerful in magic and sorcery, but a yeek all the same. 
 
 N:238:Ogre
@@ -3573,11 +4681,18 @@ W:13:2:2100:50
 E:1:1:1:2:1:1
 O:10:85:0:0
 B:HIT:HURT:2d8
-F:FRIENDS | 
-F:DROP_60 | WILD_TOO | WILD_WOOD | WILD_MOUNTAIN | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | GIANT | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FRIENDS
+F:GIANT
+F:HAS_LITE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:A hideous, smallish giant that is often found near or with orcs. 
 
 N:239:Creeping mithril coins
@@ -3588,9 +4703,18 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:HURT:2d5
 B:TOUCH:POISON:3d5
-F:ONLY_GOLD | DROP_90 | DROP_2D2 | 
-F:COLD_BLOOD | BASH_DOOR | IM_ACID | CHAR_MULTI | 
-F:IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_90
+F:IM_ACID
+F:IM_ELEC
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_GOLD
 D:It appears to be a pile of sentient mithril coins that doesn't like being 
 D:picked up. 
 
@@ -3601,12 +4725,26 @@ W:13:2:1500:50
 E:1:1:1:2:1:1
 O:20:0:80:0
 B:HIT:HURT:2d2
-F:MALE | 
-F:FORCE_SLEEP | DROP_1D2 | DROP_SKELETON | DROP_CORPSE
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:HASTE | BLINK | TPORT | BLIND | HOLD | SLOW | CONF | DARKNESS
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:SMART
+S:1_IN_3
+S:BLIND
+S:BLINK
+S:CONF
+S:DARKNESS
+S:HASTE
+S:HOLD
+S:SLOW
+S:TPORT
 D:A deceptive spell caster. 
 
 N:241:Druid
@@ -3617,31 +4755,30 @@ E:1:1:1:2:1:1
 O:20:0:80:0
 B:HIT:HURT:2d4
 B:HIT:HURT:2d4
-F:MALE | WILD_TOO | WILD_WOOD |
-F:FORCE_SLEEP | DROP_1D2 | DROP_SKELETON | DROP_CORPSE
-F:SMART | OPEN_DOOR | BASH_DOOR | 
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
 F:EVIL
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:HASTE | BLINK | BLIND | HOLD | SLOW | BO_FIRE | BO_ELEC | S_ANIMAL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:SMART
+F:WILD_TOO
+F:WILD_WOOD
+S:1_IN_3
+S:BLIND
+S:BLINK
+S:BO_ELEC
+S:BO_FIRE
+S:HASTE
+S:HOLD
+S:SLOW
+S:S_ANIMAL
 D:A priest devoted to Nature. 
 
-N:242:Pink horror
-G:u:R
-I:110:15d9:20:35:20
-W:13:3:1200:64
-E:1:1:1:2:1:1
-O:0:0:0:0
-B:CLAW:TERRIFY:1d8
-B:CLAW:TERRIFY:1d8
-B:BITE:CONFUSE:1d6
-F:FRIENDS | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DEMON | IM_FIRE | NO_FEAR | NO_CONF | ZANGBAND
-S:1_IN_8 | 
-S:CONF | SCARE
-D:An ugly screaming little demon servant of Tzeentch.
-
 N:243:Cloaker
 G:(:g
 I:130:7d7:20:40:0
@@ -3650,10 +4787,20 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:PARALYZE:5d5
 B:HIT:TERRIFY:5d5
-F:NEVER_MOVE | NO_FEAR |
-F:STUPID | EMPTY_MIND | COLD_BLOOD | CHAR_MULTI | NO_CONF | NO_SLEEP | 
-F:DROP_90 | IM_COLD | FORCE_MAXHP | IM_ELEC | IM_POIS | 
-F:BASEANGBAND | NO_CUT
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:DROP_90
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:IM_COLD
+F:IM_ELEC
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:It resembles a normal cloak until some poor fool ventures too close! 
 
 N:244:Black orc
@@ -3664,11 +4811,19 @@ E:1:1:1:2:1:1
 O:10:50:20:15
 B:HIT:HURT:3d4
 B:HIT:HURT:3d4
-F:MALE | WILD_TOO | DROP_SKELETON | DROP_CORPSE | 
-F:FRIENDS | DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | HURT_LITE | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HAS_LITE
+F:HURT_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:ORC
+F:WILD_TOO
 S:1_IN_9
 S:ARROW_2
 D:He is a large orc with powerful arms and deep black skin. 
@@ -3682,10 +4837,19 @@ O:0:0:0:0
 B:TOUCH:ACID:1d10
 B:TOUCH:ACID:2d6
 B:TOUCH:ACID:2d6
-F:STUPID | EMPTY_MIND | COLD_BLOOD |
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:IM_ACID | IM_POIS | CAN_SWIM |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:IM_ACID
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:STUPID
+F:TAKE_ITEM
 D:A fast moving highly acidic jelly thing, that is eating away the floor it 
 D:rests on. 
 
@@ -3696,9 +4860,14 @@ W:14:1:0:4
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:BITE:HURT:1d2
-F:RAND_50 | RAND_25 | 
-F:WEIRD_MIND | BASH_DOOR | CAN_FLY |
-F:ANIMAL | MORTAL | JOKEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:JOKEANGBAND
+F:MORTAL
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
 S:MULTIPLY
 D:Oh no! They are everywhere! 
 
@@ -3710,10 +4879,17 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:HURT:1d8
 B:HIT:HURT:1d8
-F:CHAR_CLEAR | ATTR_CLEAR | CHAR_MULTI | 
-F:NEVER_MOVE | FORCE_MAXHP | 
-F:EMPTY_MIND | INVISIBLE | COLD_BLOOD | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND
+F:ATTR_CLEAR
+F:CHAR_CLEAR
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:INVISIBLE
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
 D:A strange creature that merges with the dungeon floor, trapping its 
 D:victims by enveloping them within its perfectly disguised form. 
 
@@ -3725,28 +4901,28 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:PARALYZE
 B:HIT:PARALYZE
-F:FORCE_SLEEP | NEVER_MOVE | STUPID | EMPTY_MIND | FRIENDS | 
-F:KILL_TREES | SUSCEP_FIRE | ANIMAL | 
-F:WILD_ONLY | COLD_BLOOD | WILD_WOOD | WILD_GRASS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | MORTAL | BASEANGBAND | DROP_60 | NO_CUT
+F:ANIMAL
+F:COLD_BLOOD
+F:DROP_60
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:FRIENDS
+F:KILL_TREES
+F:MORTAL
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+F:SUSCEP_FIRE
+F:WILD_GRASS
+F:WILD_ONLY
+F:WILD_WOOD
 D:A mass of vegetation.  As you pass near it, it reaches out tendrils to 
 D:ensnare you.  You can just make out skeletons of its previous victims 
 D:deep within the thickets. 
 
-N:249:Vlasta
-G:R:B
-I:120:12d6:12:20:12
-W:14:3:1000:40
-E:0:1:0:2:1:0
-O:0:0:0:0
-B:BITE:BLIND:1d10
-B:BITE:BLIND:1d10
-F:OPEN_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | ZANGBAND
-D:This strange creature looks like a miniature tyrannosaur. It has 
-D:empty, pale eyes and a sharp beak, which it aims at your eyes 
-D:as it jumps at you! 
-
 N:250:Giant white dragon fly
 G:F:w
 I:110:3d8:12:20:50
@@ -3754,31 +4930,21 @@ W:14:2:150:60
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:COLD:1d6
-F:FORCE_SLEEP | WILD_TOO | WILD_WASTE |
-F:RAND_50 | CAN_FLY | SUSCEP_FIRE |
-F:WEIRD_MIND | BASH_DOOR | 
-F:ANIMAL | IM_COLD | 
-F:MORTAL | BASEANGBAND
-S:1_IN_10 | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:FORCE_SLEEP
+F:IM_COLD
+F:MORTAL
+F:RAND_50
+F:SUSCEP_FIRE
+F:WEIRD_MIND
+F:WILD_TOO
+F:WILD_WASTE
+S:1_IN_10
 S:BR_COLD
 D:It is a large fly that drips frost. 
 
-N:251:Snaga sapper
-G:o:U
-I:111:8d8:20:32:30
-W:14:1:80:15
-E:1:1:1:2:1:1
-O:0:0:0:0
-B:HIT:HURT:1d8
-B:EXPLODE:HURT:20d2
-F:MALE | 
-F:WILD_TOO | SUSCEP_FIRE |
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | HURT_LITE | 
-F:MORTAL | ZANGBAND | HAS_LITE
-D:He is one of the many weaker 'slave' orcs, often mistakenly known as a 
-D:goblin. He is equipped with an explosive charge. 
-
 N:252:Blue icky thing
 G:i:b
 I:100:10d6:15:20:20
@@ -3789,13 +4955,19 @@ B:CRAWL:POISON:1d4
 B:CRAWL:EAT_FOOD
 B:HIT:HURT:1d4
 B:HIT:HURT:1d4
-F:FORCE_SLEEP | 
-F:RAND_50 | 
-F:OPEN_DOOR | BASH_DOOR | CAN_SWIM | DROP_CORPSE | 
-F:EVIL | IM_POIS | BASEANGBAND
-S:MULTIPLY | 
-S:1_IN_8 | 
-S:BLIND | CONF | SCARE
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_SLEEP
+F:IM_POIS
+F:OPEN_DOOR
+F:RAND_50
+S:1_IN_8
+S:BLIND
+S:CONF
+S:MULTIPLY
+S:SCARE
 D:It is a strange, slimy, icky creature, with rudimentary intelligence, 
 D:but evil cunning. It hungers for food, and you look tasty. 
 
@@ -3806,25 +4978,20 @@ W:14:4:2600:20
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:CRAWL:POISON:1d4
-F:NEVER_MOVE | EVIL | CAN_SWIM |
-F:IM_POIS | EMPTY_MIND | NO_FEAR | BASEANGBAND | NO_CUT
-S:MULTIPLY | 
-S:1_IN_7 | 
-S:SCARE | CONF | BR_LITE
+F:CAN_SWIM
+F:EMPTY_MIND
+F:EVIL
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CUT
+F:NO_FEAR
+S:1_IN_7
+S:BR_LITE
+S:CONF
+S:MULTIPLY
+S:SCARE
 D:A chaotic mass of pulsating flesh, mouths and eyes. 
 
-N:254:Wolfhound of Flora
-G:C:s
-I:120:9d9:20:20:0
-W:14:2:1600:40
-E:0:1:0:2:1:0
-O:0:0:0:0
-B:BITE:HURT:1d5
-B:BITE:HURT:1d5
-F:ANIMAL | NO_FEAR | FRIENDS | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | ZANGBAND
-D:Well-trained watchdogs, obedient to death. 
-
 N:255:Hill giant
 G:P:U
 I:110:30d15:20:45:50
@@ -3833,10 +5000,18 @@ E:1:1:1:2:1:1
 O:20:50:20:5
 B:HIT:HURT:4d8
 B:HIT:HURT:4d8
-F:DROP_60 | WILD_TOO | WILD_MOUNTAIN | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | GIANT | MALE | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:GIANT
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_MOUNTAIN
+F:WILD_TOO
 D:A ten foot tall humanoid with powerful muscles. 
 
 N:256:Flesh golem
@@ -3847,10 +5022,17 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
-F:EMPTY_MIND | BASH_DOOR | CAN_SWIM |
-F:IM_ELEC | IM_COLD |
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | 
-F:MORTAL | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CAN_SWIM
+F:EMPTY_MIND
+F:IM_COLD
+F:IM_ELEC
+F:MORTAL
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
 D:A shambling humanoid monster with long scars. 
 
 N:257:Warg
@@ -3861,26 +5043,19 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d6
 B:BITE:HURT:1d6
-F:RAND_25 | BASH_DOOR | FRIENDS | 
-F:WILD_TOO | WILD_WOOD | WILD_MOUNTAIN | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | EVIL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:MORTAL
+F:RAND_25
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:It is a large wolf with eyes full of cunning. 
 
-N:258:Cheerful leprechaun
-G:h:G
-I:120:2d5:8:6:6
-W:14:2:800:23
-E:1:1:1:2:1:1
-O:0:0:0:0
-B:TOUCH:EAT_GOLD
-B:TOUCH:EAT_FOOD
-F:DROP_60 | ONLY_GOLD | RAND_50 | OPEN_DOOR | MALE | 
-F:GOOD | MORTAL | ZANGBAND
-S:MULTIPLY | 
-S:1_IN_6 | 
-S:BLINK
-D:A merry little gnome. 
-
 N:259:Giant flea
 G:I:s
 I:120:1d2:6:7:10
@@ -3888,8 +5063,11 @@ W:14:3:90:3
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:BITE:HURT:1d2
-F:RAND_50 | CAN_FLY | WEIRD_MIND | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:MORTAL
+F:RAND_50
+F:WEIRD_MIND
 S:MULTIPLY
 D:It makes you itch just to look at it. 
 
@@ -3903,13 +5081,24 @@ B:HIT:HURT:3d5
 B:HIT:HURT:3d5
 B:HIT:HURT:3d5
 B:HIT:HURT:3d5
-F:UNIQUE | MALE | 
-F:FORCE_MAXHP | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE | 
-F:ESCORT | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | IM_COLD | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_COLD
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:ORC
+F:UNIQUE
 D:A strong orc guarding the pass of Cirith Ungol. He is mortally afraid of 
 D:spiders:  he was captured by Shelob once, but escaped when she forgot 
 D:completely about him.
@@ -3922,10 +5111,18 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:1d8
 B:HIT:HURT:1d8
-F:EMPTY_MIND | COLD_BLOOD | BASH_DOOR | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:HURT_ROCK | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:HURT_ROCK
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
 D:It is a massive animated statue made out of hardened clay. 
 
 N:262:Black ogre
@@ -3936,29 +5133,20 @@ E:1:1:1:2:1:1
 O:0:70:0:15
 B:HIT:HURT:2d8
 B:HIT:HURT:2d8
-F:RAND_25 | WILD_TOO | WILD_MOUNTAIN | DROP_CORPSE | 
-F:FRIENDS | DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | GIANT | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FRIENDS
+F:GIANT
+F:HAS_LITE
+F:MORTAL
+F:OPEN_DOOR
+F:RAND_25
+F:WILD_MOUNTAIN
+F:WILD_TOO
 D:A massive orc-like figure with black skin and powerful arms. 
 
-N:263:Dweller on the threshold
-G:Y:s
-I:110:30d8:30:30:20
-W:15:5:3000:50
-E:1:1:1:2:1:1
-O:45:0:40:10
-B:GAZE:PARALYZE:4d4
-B:GAZE:TERRIFY:3d3
-B:GAZE:CONFUSE:3d3
-F:NEVER_MOVE | DROP_60 | EVIL | DEMON | DROP_CORPSE | 
-F:IM_POIS | IM_COLD |IM_FIRE | NO_FEAR | NO_CONF | NO_SLEEP
-F:MORTAL | ZANGBAND
-S:1_IN_6
-S:BO_ACID | S_MONSTER | SCARE | DRAIN_MANA
-D:A gorilla-shaped arcane guardian with an appetite for mages. 
-
 N:264:Half-orc
 G:o:s
 I:110:16d10:20:40:20
@@ -3967,10 +5155,18 @@ E:1:1:1:2:1:1
 O:30:30:30:5
 B:HIT:HURT:3d4
 B:HIT:HURT:3d4
-F:MALE | WILD_TOO |
-F:FRIENDS | DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | ORC | MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:ORC
+F:WILD_TOO
 D:He is a hideous deformed cross-breed of man and orc, combining man's 
 D:strength and cunning with orcish evil.  The traitorous wizard Saruman is 
 D:generally believed to be responsible for this abomination. 
@@ -3983,12 +5179,26 @@ E:0:0:0:0:1:0
 O:0:0:80:20
 B:STING:HURT:1d10
 B:BITE:HURT:1d10
-F:FEMALE | 
-F:RAND_25 | DROP_60 | DROP_1D2 | IM_POIS | IM_COLD | RES_WATE |
-F:OPEN_DOOR | BASH_DOOR | EMPTY_MIND | CAN_SWIM | DROP_CORPSE | 
-F:EVIL | MORTAL | BASEANGBAND
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:EMPTY_MIND
+F:EVIL
+F:FEMALE
+F:IM_COLD
+F:IM_POIS
+F:MORTAL
+F:OPEN_DOOR
+F:RAND_25
+F:RES_WATE
 S:1_IN_8
-S:HOLD | CONF | BO_COLD | HEAL | DARKNESS
+S:BO_COLD
+S:CONF
+S:DARKNESS
+S:HEAL
+S:HOLD
 D:A giant snake-like figure with a woman's torso, talented in magic. 
 
 N:266:Poison ivy
@@ -3999,10 +5209,24 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:POISON:2d2
 B:HIT:POISON:2d2
-F:FORCE_SLEEP | NEVER_MOVE | STUPID | EMPTY_MIND | FRIENDS | 
-F:KILL_TREES | SUSCEP_FIRE | ANIMAL | 
-F:WILD_ONLY | COLD_BLOOD | WILD_WOOD | WILD_GRASS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | MORTAL | BASEANGBAND | DROP_60 | NO_CUT
+F:ANIMAL
+F:COLD_BLOOD
+F:DROP_60
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:FRIENDS
+F:KILL_TREES
+F:MORTAL
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+F:SUSCEP_FIRE
+F:WILD_GRASS
+F:WILD_ONLY
+F:WILD_WOOD
 S:MULTIPLY
 D:A mass of vegetation.  It seems to be growing...  
 
@@ -4016,32 +5240,22 @@ B:SPORE:CONFUSE
 B:SPORE:CONFUSE
 B:SPORE:HALLU
 B:SPORE:HALLU
-F:FORCE_SLEEP | NEVER_MOVE | 
-F:STUPID | RES_TELE | CAN_SWIM |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_2 | 
-S:BLINK | SLOW | SCARE | DARKNESS
+F:CAN_SWIM
+F:FORCE_SLEEP
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RES_TELE
+F:STUPID
+S:1_IN_2
+S:BLINK
+S:DARKNESS
+S:SCARE
+S:SLOW
 D:Yum!  It looks quite tasty. It seems to glow with an unusual light. 
 
-N:268:Plaguebearer of Nurgle
-G:z:o
-I:110:9d10:20:50:20
-W:15:2:2800:75
-E:1:1:1:2:1:1
-O:50:20:20:10
-B:CLAW:DISEASE:2d5
-B:CLAW:DISEASE:2d5
-B:BUTT:HURT:3d5
-F:FORCE_MAXHP | DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | IM_COLD |
-F:EVIL | DEMON | UNDEAD | IM_POIS | NONLIVING | ZANGBAND | NO_CUT
-S:1_IN_8 | 
-S:SCARE | S_ANT | CAUSE_2 | SLOW
-D:An unfortunate individual, who was killed by the incurable 
-D:disease known as Nurgle's Rot, and was transformed into a 
-D:rotting demon zombie. It has but one eye, and a single 
-D:pale horn in its forehead. 
-
 N:269:Guardian naga
 G:n:y
 I:110:24d11:20:65:120
@@ -4051,11 +5265,16 @@ O:0:0:80:20
 B:CRUSH:HURT:2d8
 B:BITE:HURT:1d8
 B:BITE:HURT:1d8
-F:FEMALE | 
-F:RAND_25 | DROP_60 | DROP_1D2 | DROP_CORPSE
-F:OPEN_DOOR | BASH_DOOR | CAN_SWIM |
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
 F:EVIL
-F:MORTAL | BASEANGBAND
+F:FEMALE
+F:MORTAL
+F:OPEN_DOOR
+F:RAND_25
 D:A giant snake-like figure with a woman's torso. 
 
 N:270:Wererat
@@ -4067,13 +5286,21 @@ O:0:0:0:0
 B:CLAW:HURT:1d8
 B:CLAW:HURT:1d8
 B:BITE:HURT:2d6
-F:FORCE_SLEEP | 
-F:ONLY_GOLD | DROP_60 | DROP_CORPSE
-F:OPEN_DOOR | BASH_DOOR | 
-F:ANIMAL | EVIL
-F:MORTAL | BASEANGBAND
-S:1_IN_9 | 
-S:BLINK | CAUSE_2 | BO_COLD | BA_POIS | S_KIN
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_SLEEP
+F:MORTAL
+F:ONLY_GOLD
+F:OPEN_DOOR
+S:1_IN_9
+S:BA_POIS
+S:BLINK
+S:BO_COLD
+S:CAUSE_2
+S:S_KIN
 D:A large rat with glowing red eyes, which can also assume human form. The wererat 
 D:is a disgusting creature, relishing in filth and disease. 
 
@@ -4086,11 +5313,14 @@ O:0:0:0:0
 B:CLAW:HURT:1d4
 B:CLAW:HURT:1d4
 B:BITE:HURT:1d6
-F:FORCE_SLEEP | DROP_CORPSE | 
-F:FRIENDS | 
-F:BASH_DOOR | 
-F:ANIMAL | MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_5 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:FRIENDS
+F:HAS_LITE
+F:MORTAL
+S:1_IN_5
 S:BR_LITE
 D:A brilliant canine form whose light hurts your eyes, even at this distance. 
 
@@ -4103,11 +5333,14 @@ O:0:0:0:0
 B:CLAW:HURT:1d4
 B:CLAW:HURT:1d4
 B:BITE:HURT:1d6
-F:FORCE_SLEEP | DROP_CORPSE | 
-F:FRIENDS | 
-F:BASH_DOOR | HURT_LITE | 
-F:ANIMAL | MORTAL | BASEANGBAND
-S:1_IN_5 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:FRIENDS
+F:HURT_LITE
+F:MORTAL
+S:1_IN_5
 S:BR_DARK
 D:A hole in the air in the shape of a huge hound. No light falls upon its 
 D:form. 
@@ -4120,29 +5353,22 @@ E:0:0:0:0:1:0
 O:90:0:10:0
 B:BITE:POISON:1d3
 B:BITE:LOSE_STR:1d4
-F:UNDEAD | EVIL | IM_POIS | IM_COLD | WEIRD_MIND | NO_FEAR | CAN_FLY |
-F:NO_CONF | NO_SLEEP | DROP_60 | BASH_DOOR | FRIENDS | COLD_BLOOD | 
-F:BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_60
+F:EVIL
+F:FRIENDS
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:UNDEAD
+F:WEIRD_MIND
 D:A pack of skulls animated by necromantic spells. 
 
-N:274:Mi-Go
-G:I:R
-I:120:13d8:20:30:20
-W:15:2:800:80
-E:0:0:0:0:1:0
-O:0:0:0:0
-B:STING:POISON:1d4
-B:BITE:LOSE_STR:1d2
-F:IM_POIS | IM_COLD | COLD_BLOOD | ANIMAL | EVIL | 
-F:NO_SLEEP | NO_CONF | CAN_FLY | DROP_SKELETON | CTHANGBAND
-S:1_IN_6
-S:CONF | S_MONSTER | S_DEMON
-D:"They were pinkish things about five feet long; with crustaceous 
-D:bodies bearing vast pairs of dorsal fins or membranous wings and 
-D:several sets of articulate limbs, and with a sort of convoluted 
-D:ellipsoid, covered with multitudes of very short antenna, where 
-D:a head would ordinarily be..." 
-
 N:275:Giant tarantula
 G:S:o
 I:120:10d15:8:32:80
@@ -4152,9 +5378,14 @@ O:0:0:0:0
 B:BITE:POISON:1d6
 B:BITE:POISON:1d6
 B:BITE:POISON:1d6
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO |
-F:ANIMAL | SPIDER | IM_POIS | DROP_SKELETON | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:IM_POIS
+F:MORTAL
+F:SPIDER
+F:WEIRD_MIND
+F:WILD_TOO
 D:A giant spider with hairy black and red legs.
 
 N:276:Giant clear centipede
@@ -4165,10 +5396,14 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:2d4
 B:STING:HURT:2d4
-F:ATTR_CLEAR | 
-F:INVISIBLE | WEIRD_MIND | BASH_DOOR | WILD_TOO |
-F:ANIMAL | DROP_SKELETON | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:ATTR_CLEAR
+F:BASH_DOOR
+F:DROP_SKELETON
+F:INVISIBLE
+F:MORTAL
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is about four feet long and carnivorous. 
 
 N:277:Mirkwood spider
@@ -4180,10 +5415,18 @@ O:0:0:0:0
 B:BITE:HURT:1d8
 B:BITE:POISON:1d6
 B:BITE:POISON:1d6
-F:FRIENDS | WILD_TOO | WILD_WOOD |
-F:WEIRD_MIND | BASH_DOOR | HURT_LITE |
-F:ANIMAL | SPIDER | EVIL | IM_POIS |  DROP_SKELETON | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HURT_LITE
+F:IM_POIS
+F:MORTAL
+F:SPIDER
+F:WEIRD_MIND
+F:WILD_TOO
+F:WILD_WOOD
 D:A strong and powerful spider from Mirkwood forest. Cunning and evil, it 
 D:seeks to taste your juicy insides. 
 
@@ -4195,10 +5438,22 @@ E:1:1:1:2:1:1
 O:20:80:0:0
 B:HIT:COLD:5d8
 B:HIT:COLD:5d8
-F:DROP_60 | WILD_TOO | WILD_WASTE | WILD_MOUNTAIN |
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | GIANT | MALE | AURA_COLD | SUSCEP_FIRE |
-F:IM_COLD | BASEANGBAND | HAS_LITE | MORTAL
+F:AURA_COLD
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:GIANT
+F:HAS_LITE
+F:IM_COLD
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:SUSCEP_FIRE
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WASTE
 D:A twelve foot tall giant covered in furs. 
 
 N:279:Griffon
@@ -4209,8 +5464,15 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:HIT:HURT:3d4
 B:BITE:HURT:2d6
-F:BASH_DOOR | CAN_FLY | WILD_TOO | WILD_WOOD | WILD_MOUNTAIN | WILD_GRASS |
-F:ANIMAL | DROP_CORPSE | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:MORTAL
+F:WILD_GRASS
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:It is half lion, half eagle. It flies menacingly towards you. 
 
 N:280:Homunculus
@@ -4221,8 +5483,15 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:PARALYZE:1d2
 B:HIT:HURT:1d10
-F:OPEN_DOOR | BASH_DOOR | NONLIVING | CAN_FLY |
-F:EVIL | DEMON | IM_FIRE | NO_FEAR | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_FLY
+F:DEMON
+F:EVIL
+F:HAS_LITE
+F:IM_FIRE
+F:NONLIVING
+F:NO_FEAR
+F:OPEN_DOOR
 D:It is a small demonic spirit full of malevolence. 
 
 N:281:Gnome mage
@@ -4232,12 +5501,20 @@ W:15:2:900:40
 E:1:1:1:2:1:1
 O:20:0:80:0
 B:HIT:HURT:1d5
-F:MALE | 
-F:FORCE_SLEEP | FRIENDS | DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_4 | 
-S:BLINK | DARKNESS | BO_COLD | 
+F:BASH_DOOR
+F:DROP_60
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_SLEEP
+F:FRIENDS
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+S:1_IN_4
+S:BLINK
+S:BO_COLD
+S:DARKNESS
 S:S_MONSTER
 D:A mage of short stature. 
 
@@ -4250,10 +5527,14 @@ O:0:0:0:0
 B:CLAW:HURT:1d6
 B:CLAW:HURT:1d6
 B:BITE:HURT:1d8
-F:ATTR_CLEAR | 
-F:FRIENDS | DROP_SKELETON | DROP_CORPSE | 
-F:INVISIBLE | BASH_DOOR | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:ATTR_CLEAR
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FRIENDS
+F:INVISIBLE
+F:MORTAL
 D:A faint sense of motion in the air, hound shaped, stands before you. 
 
 N:283:Umber hulk
@@ -4266,11 +5547,18 @@ B:GAZE:CONFUSE
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
 B:BITE:HURT:2d6
-F:EMPTY_MIND | COLD_BLOOD | 
-F:BASH_DOOR | KILL_WALL | DROP_SKELETON | 
-F:ANIMAL | EVIL | 
-F:IM_POIS | 
-F:HURT_ROCK | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_SKELETON
+F:EMPTY_MIND
+F:EVIL
+F:HURT_ROCK
+F:IM_POIS
+F:KILL_WALL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
 D:This bizarre creature has glaring eyes and large mandibles capable of 
 D:slicing through rock. 
 
@@ -4284,10 +5572,14 @@ B:TOUCH:ACID:1d10
 B:TOUCH:ACID:1d10
 B:TOUCH:ACID:1d10
 B:TOUCH:ACID:1d10
-F:STUPID | WEIRD_MIND | KILL_ITEM |
-F:IM_ACID | IM_POIS | DROP_CORPSE | 
-F:NO_CONF | 
-F:MORTAL | BASEANGBAND
+F:DROP_CORPSE
+F:IM_ACID
+F:IM_POIS
+F:KILL_ITEM
+F:MORTAL
+F:NO_CONF
+F:STUPID
+F:WEIRD_MIND
 D:It is a weird, small animal with two antennae popping forth from 
 D:its forehead. It looks hungry. 
 
@@ -4299,10 +5591,16 @@ E:1:1:1:2:1:1
 O:20:70:0:10
 B:HIT:HURT:2d10
 B:HIT:HURT:2d10
-F:FRIENDS | DROP_60 | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | GIANT | ORC | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FRIENDS
+F:GIANT
+F:HAS_LITE
+F:MORTAL
+F:OPEN_DOOR
+F:ORC
 D:An unholy hybrid of ogre and orc.
 
 N:286:Gelatinous cube
@@ -4314,12 +5612,25 @@ O:40:30:20:0
 B:TOUCH:ACID:1d10
 B:TOUCH:ACID:1d10
 B:TOUCH:ACID:1d10
-F:FORCE_MAXHP | 
-F:DROP_1D2 | DROP_4D2 | 
-F:STUPID | EMPTY_MIND | COLD_BLOOD |
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | CAN_SWIM |
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_4D2
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:STUPID
+F:TAKE_ITEM
 D:It is a strange, vast gelatinous structure that assumes cubic proportions 
 D:as it lines all four walls of the corridors it patrols. Through its 
 D:transparent jelly structure you can see treasures it has engulfed, and a 
@@ -4332,11 +5643,17 @@ W:16:2:150:65
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:POISON:1d6
-F:FORCE_SLEEP | RAND_50 | RAND_25 | WILD_TOO | WILD_SWAMP |
-F:WEIRD_MIND | BASH_DOOR | CAN_FLY |
-F:ANIMAL | IM_POIS | 
-F:MORTAL | BASEANGBAND
-S:1_IN_10 | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:FORCE_SLEEP
+F:IM_POIS
+F:MORTAL
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
+F:WILD_TOO
+S:1_IN_10
 S:BR_POIS
 D:A vast, foul-smelling dragonfly. 
 
@@ -4348,10 +5665,21 @@ E:1:1:1:2:1:1
 O:20:80:0:0
 B:HIT:FIRE:6d8
 B:HIT:FIRE:6d8
-F:DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | WILD_TOO | WILD_VOLCANO | SUSCEP_COLD |
-F:EVIL | GIANT | MALE | AURA_FIRE | DROP_SKELETON | DROP_CORPSE | 
-F:IM_FIRE | BASEANGBAND | HAS_LITE | MORTAL
+F:AURA_FIRE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:GIANT
+F:HAS_LITE
+F:IM_FIRE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:SUSCEP_COLD
+F:WILD_TOO
+F:WILD_VOLCANO
 D:A glowing fourteen foot tall giant. Flames drip from its red skin. 
 
 N:289:Hummerhorn
@@ -4361,8 +5689,11 @@ W:16:4:100:4
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:CONFUSE:2d2
-F:RAND_50 | RAND_25 | CAN_FLY |
-F:WEIRD_MIND | ANIMAL | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
 S:MULTIPLY
 D:A giant buzzing wasp, its stinger drips venom. 
 
@@ -4374,11 +5705,19 @@ E:1:1:1:2:1:1
 O:50:50:0:0
 B:HIT:HURT:4d4
 B:HIT:HURT:4d4
-F:MALE | CAN_SWIM | IM_ACID |
-F:FRIENDS | DROP_60 | WILD_TOO | WILD_SHORE |
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON
-F:EVIL 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_60
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HAS_LITE
+F:IM_ACID
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_SHORE
+F:WILD_TOO
 D:Intelligent lizard beings from the depths. 
 
 N:291:Ulfast, Son of Ulfang
@@ -4391,12 +5730,21 @@ B:HIT:HURT:3d6
 B:HIT:HURT:3d6
 B:HIT:HURT:3d6
 B:HIT:HURT:3d6
-F:UNIQUE | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE | 
-F:MALE | 
-F:FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_90 | DROP_GOOD | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:TAKE_ITEM
+F:UNIQUE
 D:A short and swarthy Easterling. 
 
 N:292:Crebain
@@ -4407,10 +5755,23 @@ E:0:1:1:0:1:0
 O:0:0:0:0
 B:CLAW:HURT:1d4
 B:CLAW:HURT:1d4
-F:ANIMAL | EVIL | MORTAL | FRIENDS | BASEANGBAND | DROP_CORPSE | HAS_EGG | 
-F:WILD_TOO | WILD_WASTE | WILD_MOUNTAIN | WILD_WOOD | WILD_VOLCANO | 
-F:WILD_GRASS | WILD_SWAMP | WILD_SHORE | WILD_OCEAN | CAN_FLY
-S:1_IN_8 | SHRIEK
+F:ANIMAL
+F:CAN_FLY
+F:DROP_CORPSE
+F:EVIL
+F:FRIENDS
+F:HAS_EGG
+F:MORTAL
+F:WILD_GRASS
+F:WILD_MOUNTAIN
+F:WILD_OCEAN
+F:WILD_SHORE
+F:WILD_TOO
+F:WILD_VOLCANO
+F:WILD_WASTE
+F:WILD_WOOD
+S:1_IN_8
+S:SHRIEK
 D:A type of crow, specially bred by the forces of evil as spies; their 
 D:rudimentary intelligence guided by an evil mind has tracked you down, 
 D:and now they seek to alert other evil creatures to your presence. 
@@ -4424,10 +5785,19 @@ O:20:80:0:0
 B:HIT:HURT:7d7
 B:HIT:HURT:7d7
 B:HIT:HURT:7d7
-F:MALE | NO_FEAR | NO_STUN | BASH_DOOR | KILL_BODY | FORCE_MAXHP | 
-F:DROP_SKELETON | DROP_CORPSE
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_4 | HASTE | SCARE
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:HAS_LITE
+F:KILL_BODY
+F:MALE
+F:MORTAL
+F:NO_FEAR
+F:NO_STUN
+S:1_IN_4
+S:HASTE
+S:SCARE
 D:Even the strongest of normal human warriors fears the Berserker - the one who 
 D:can drive himself into such a terrible battle-frenzy that he can survive blows 
 D:which should kill him, and still apparently feel no pain.  He tramples weaker 
@@ -4443,13 +5813,27 @@ O:0:50:30:10
 B:BITE:LOSE_DEX:1d6
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
-F:FORCE_SLEEP | CAN_FLY |
-F:RAND_25 | 
-F:ONLY_ITEM | DROP_1D2 | 
-F:SMART | INVISIBLE | BASH_DOOR | 
-F:EVIL | DEMON | IM_FIRE | NONLIVING | BASEANGBAND | HAS_LITE
-S:1_IN_10 | 
-S:BLINK | TPORT | TELE_TO | TELE_LEVEL | BLIND | CONF | SCARE
+F:BASH_DOOR
+F:CAN_FLY
+F:DEMON
+F:DROP_1D2
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:INVISIBLE
+F:NONLIVING
+F:ONLY_ITEM
+F:RAND_25
+F:SMART
+S:1_IN_10
+S:BLIND
+S:BLINK
+S:CONF
+S:SCARE
+S:TELE_LEVEL
+S:TELE_TO
+S:TPORT
 D:The chaotic evil master's favourite pet. 
 
 N:295:Sphinx
@@ -4460,12 +5844,20 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:CLAW:HURT:2d6
 B:CLAW:HURT:2d6
-F:FORCE_SLEEP | 
-F:ONLY_GOLD | DROP_1D2 | CAN_FLY | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | WILD_TOO | WILD_MOUNTAIN | 
-F:ANIMAL | MORTAL | BASEANGBAND
-S:1_IN_11 | 
-S:SCARE | CONF
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_1D2
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:MORTAL
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:WILD_MOUNTAIN
+F:WILD_TOO
+S:1_IN_11
+S:CONF
+S:SCARE
 D:It will eat you if you cannot answer its riddle. 
 
 N:296:Imp
@@ -4476,13 +5868,29 @@ E:0:1:1:0:1:0
 O:30:20:50:0
 B:HIT:POISON:3d4
 B:HIT:POISON:3d4
-F:FORCE_SLEEP | CAN_FLY |
-F:RAND_25 | 
-F:ONLY_ITEM | DROP_1D2 | 
-F:SMART | INVISIBLE | COLD_BLOOD | BASH_DOOR | 
-F:EVIL | DEMON | IM_FIRE | RES_TELE | BASEANGBAND | HAS_LITE
-S:1_IN_10 | 
-S:BLINK | TPORT | TELE_TO | TELE_LEVEL | BLIND | CONF | SCARE | BO_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DEMON
+F:DROP_1D2
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:INVISIBLE
+F:ONLY_ITEM
+F:RAND_25
+F:RES_TELE
+F:SMART
+S:1_IN_10
+S:BLIND
+S:BLINK
+S:BO_FIRE
+S:CONF
+S:SCARE
+S:TELE_LEVEL
+S:TELE_TO
+S:TPORT
 D:The lawful evil master's favourite pet. 
 
 N:297:Forest troll
@@ -4494,10 +5902,20 @@ O:30:70:0:0
 B:HIT:HURT:1d4
 B:HIT:HURT:1d4
 B:BITE:HURT:1d6
-F:MALE | 
-F:FRIENDS | DROP_60 | WILD_TOO | WILD_WOOD | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | SUSCEP_FIRE | REGENERATE | 
-F:EVIL | TROLL | HURT_LITE | BASEANGBAND
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HURT_LITE
+F:MALE
+F:OPEN_DOOR
+F:REGENERATE
+F:SUSCEP_FIRE
+F:TROLL
+F:WILD_TOO
+F:WILD_WOOD
 D:He is green-skinned and ugly. 
 
 
@@ -4508,9 +5926,20 @@ W:17:1:0:50
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:EXPLODE:COLD:8d8
-F:FORCE_SLEEP | CAN_FLY | SUSCEP_FIRE | RAND_50 | RAND_25 | 
-F:EMPTY_MIND | AURA_COLD |
-F:IM_COLD | NO_FEAR | NO_CONF | NO_SLEEP | NONLIVING | BASEANGBAND | HAS_LITE | NO_CUT
+F:AURA_COLD
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RAND_25
+F:RAND_50
+F:SUSCEP_FIRE
 D:A semi-sentient snowball, hurling itself at targets at random.
 
 N:299:Jumping fireball
@@ -4520,9 +5949,20 @@ W:17:1:0:50
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:EXPLODE:FIRE:8d8
-F:FORCE_SLEEP | CAN_FLY | SUSCEP_COLD |
-F:EMPTY_MIND | AURA_FIRE | RAND_50 | RAND_25 | 
-F:IM_FIRE | NO_FEAR | NO_CONF | NO_SLEEP | NONLIVING | BASEANGBAND | HAS_LITE | NO_CUT
+F:AURA_FIRE
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RAND_25
+F:RAND_50
+F:SUSCEP_COLD
 D:A semi-sentient fireball that moves around randomly.
 
 N:300:Ball lightning
@@ -4532,9 +5972,19 @@ W:17:1:0:50
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:EXPLODE:ELEC:8d8
-F:FORCE_SLEEP | CAN_FLY | RAND_25 | RAND_50 | 
-F:EMPTY_MIND | AURA_ELEC |
-F:IM_ELEC | NO_FEAR | NO_CONF | NO_SLEEP | NONLIVING | BASEANGBAND | HAS_LITE |NO_CUT
+F:AURA_ELEC
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ELEC
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RAND_25
+F:RAND_50
 D:A crackling ball of energy, zooming about seemingly at random.
 
 N:301:2-headed hydra
@@ -4545,11 +5995,22 @@ E:0:1:0:2:2:0
 O:0:0:0:0
 B:BITE:HURT:2d6
 B:BITE:HURT:2d6
-F:FORCE_SLEEP | WILD_TOO | WILD_SHORE | WILD_SWAMP |
-F:ONLY_GOLD | DROP_1D2 | CAN_SWIM | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | MOVE_BODY | HAS_EGG | IMPRESED | 
-F:ANIMAL | MORTAL | BASEANGBAND
-S:1_IN_11 | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:HAS_EGG
+F:IMPRESED
+F:MORTAL
+F:MOVE_BODY
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:WILD_SHORE
+F:WILD_TOO
+S:1_IN_11
 S:SCARE
 D:A strange reptilian creature with two heads, guarding its hoard. 
 
@@ -4561,8 +6022,11 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:CLAW:TERRIFY:2d5
 B:CLAW:TERRIFY:5d2
-F:CAN_SWIM | OPEN_DOOR | BASH_DOOR | WILD_TOO | WILD_SWAMP
-F:MORTAL | BASEANGBAND
+F:BASH_DOOR
+F:CAN_SWIM
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
 D:A creature that was once human, but is now as green as moss. 
 
 N:303:Water spirit
@@ -4573,10 +6037,17 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:HURT:2d4
 B:HIT:HURT:2d4
-F:RAND_25 | 
-F:EMPTY_MIND | COLD_BLOOD | BASH_DOOR | 
-F:IM_POIS | IM_ACID | CAN_FLY |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:IM_ACID
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RAND_25
 D:A whirlpool of sentient liquid. 
 
 N:304:Giant red scorpion
@@ -4587,9 +6058,12 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:2d4
 B:STING:LOSE_STR:1d7
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO |
-F:ANIMAL | DROP_SKELETON | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:MORTAL
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is fast and poisonous. 
 
 N:305:Earth spirit
@@ -4600,11 +6074,20 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:HURT:1d8
 B:HIT:HURT:1d8
-F:RAND_25 | 
-F:EMPTY_MIND | COLD_BLOOD | 
-F:PASS_WALL | CAN_FLY |
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | HURT_ROCK | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_FLY
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:HURT_ROCK
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:PASS_WALL
+F:RAND_25
 D:A whirling form of sentient rock. 
 
 N:306:Fire spirit
@@ -4615,10 +6098,21 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:FIRE:2d6
 B:HIT:FIRE:2d6
-F:RAND_25 | 
-F:EMPTY_MIND | BASH_DOOR | CAN_FLY | SUSCEP_COLD | 
-F:IM_FIRE | IM_POIS | WILD_TOO | WILD_VOLCANO |
-F:NO_CONF | NO_SLEEP | NO_FEAR | AURA_FIRE | BASEANGBAND | HAS_LITE | NO_CUT
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:HAS_LITE
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RAND_25
+F:SUSCEP_COLD
+F:WILD_TOO
+F:WILD_VOLCANO
 D:A whirlwind of sentient flame. 
 
 N:307:Fire hound
@@ -4630,12 +6124,17 @@ O:0:0:0:0
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
 B:BITE:FIRE:2d6
-F:FORCE_SLEEP | 
-F:FRIENDS | 
-F:BASH_DOOR | SUSCEP_COLD |
-F:ANIMAL | IM_FIRE | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_10 |
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:HAS_LITE
+F:IM_FIRE
+F:MORTAL
+F:SUSCEP_COLD
+S:1_IN_10
 S:BR_FIRE
 D:Flames lick at its feet and its tongue is a blade of fire. You can feel a 
 D:furnace heat radiating from the creature. 
@@ -4649,12 +6148,16 @@ O:0:0:0:0
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
 B:BITE:COLD:2d6
-F:FORCE_SLEEP | 
-F:FRIENDS | 
-F:BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | IM_COLD | SUSCEP_FIRE |
-F:MORTAL | BASEANGBAND
-S:1_IN_10 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:IM_COLD
+F:MORTAL
+F:SUSCEP_FIRE
+S:1_IN_10
 S:BR_COLD
 D:A hound as tall as a man, this creature appears to be composed of angular 
 D:planes of ice. Cold radiates from it and freezes your breath in the air. 
@@ -4668,12 +6171,16 @@ O:0:0:0:0
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
 B:BITE:ELEC:2d6
-F:FORCE_SLEEP | 
-F:FRIENDS | DROP_SKELETON | DROP_CORPSE | 
-F:BASH_DOOR | 
-F:ANIMAL | IM_ELEC | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_10 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:HAS_LITE
+F:IM_ELEC
+F:MORTAL
+S:1_IN_10
 S:BR_ELEC
 D:Saint Elmo's Fire forms a ghostly halo around this hound, and sparks sting 
 D:your fingers as energy builds up in the air around you. 
@@ -4687,12 +6194,22 @@ O:10:10:10:10
 B:HIT:POISON:3d4
 B:HIT:HURT:2d3
 B:HIT:HURT:2d3
-F:MIMIC | 
-F:FORCE_SLEEP | NEVER_MOVE | SUSCEP_COLD |
-F:EMPTY_MIND | COLD_BLOOD | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_6 | 
-S:BLIND | CONF | SCARE | CAUSE_2 | BO_COLD
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:MIMIC
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:SUSCEP_COLD
+S:1_IN_6
+S:BLIND
+S:BO_COLD
+S:CAUSE_2
+S:CONF
+S:SCARE
 D:A strange creature that disguises itself as some object to lure 
 D:unsuspecting adventurers within reach of its venomous claws. 
 
@@ -4705,12 +6222,21 @@ O:0:0:0:0
 B:HIT:POISON:3d4
 B:HIT:CONFUSE:2d3
 B:HIT:PARALYZE:2d3
-F:CHAR_MULTI | 
-F:FORCE_SLEEP | NEVER_MOVE | 
-F:EMPTY_MIND | COLD_BLOOD | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_6 | 
-S:BLIND | CONF | SCARE | CAUSE_2 | BO_COLD
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+S:1_IN_6
+S:BLIND
+S:BO_COLD
+S:CAUSE_2
+S:CONF
+S:SCARE
 D:A strange creature that disguises itself as a door to lure 
 D:unsuspecting adventurers within reach of its venomous claws. 
 
@@ -4721,9 +6247,17 @@ W:18:2:400:50
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d8
-F:RAND_25 | FRIENDS | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | RES_TELE | MORTAL | BASEANGBAND
-S:1_IN_4 | BLINK | TELE_TO
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FRIENDS
+F:MORTAL
+F:RAND_25
+F:RES_TELE
+S:1_IN_4
+S:BLINK
+S:TELE_TO
 D:A strange magical member of the canine race, its form seems to shimmer and 
 D:fade in front of your very eyes. 
 
@@ -4735,12 +6269,20 @@ E:1:1:1:2:1:1
 O:20:80:0:0
 B:HIT:HURT:3d5
 B:HIT:HURT:3d5
-F:MALE | 
-F:FORCE_MAXHP | FRIENDS | DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | ORC | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_9 | 
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FRIENDS
+F:HAS_LITE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:ORC
+S:1_IN_9
 S:ARROW_2
 D:It is a cunning orc of power, as tall as a man, and stronger. It fears 
 D:little. 
@@ -4755,13 +6297,24 @@ B:HIT:HURT:3d9
 B:HIT:HURT:3d9
 B:HIT:HURT:3d6
 B:HIT:HURT:3d6
-F:UNIQUE | MALE | CAN_SPEAK |
-F:FORCE_MAXHP | SPECIAL_GENE
-F:ESCORT | DROP_SKELETON | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:ORC
+F:SPECIAL_GENE
+F:UNIQUE
 D:He is an orc of power and great cunning, leader of the garrison at Cirith Ungol. 
 
 N:315:Gorbag, the Orc Captain
@@ -4774,13 +6327,23 @@ B:HIT:HURT:3d9
 B:HIT:HURT:3d9
 B:HIT:HURT:3d6
 B:HIT:HURT:3d6
-F:UNIQUE | MALE | CAN_SPEAK |
-F:FORCE_MAXHP | 
-F:ESCORT | DROP_SKELETON | DROP_CORPSE
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | IM_POIS
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:ORC
+F:UNIQUE
 D:He is an orc of power and great cunning, leader of the garrison at Minas Morgul. 
 
 N:316:Shambling mound
@@ -4791,10 +6354,19 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:1d8
 B:HIT:HURT:1d8
-F:ONLY_GOLD | DROP_90 | WILD_TOO | WILD_SWAMP |
-F:STUPID | EMPTY_MIND | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_4 | 
+F:BASH_DOOR
+F:DROP_90
+F:EMPTY_MIND
+F:EVIL
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:STUPID
+F:WILD_TOO
+S:1_IN_4
 S:SHRIEK
 D:A pile of rotting vegetation that slides towards you with a disgusting 
 D:stench, waking all it nears. 
@@ -4808,45 +6380,19 @@ O:0:0:0:0
 B:HIT:PARALYZE:3d3
 B:HIT:PARALYZE:3d3
 B:HIT:PARALYZE:3d3
-F:NEVER_MOVE | EMPTY_MIND | STUPID | CHAR_CLEAR | CHAR_MULTI | 
-F:WILD_ONLY | WILD_WOOD | WILD_SWAMP | ANIMAL | SUSCEP_FIRE | NO_CUT
+F:ANIMAL
+F:CHAR_CLEAR
+F:CHAR_MULTI
+F:EMPTY_MIND
+F:NEVER_MOVE
+F:NO_CUT
+F:STUPID
+F:SUSCEP_FIRE
+F:WILD_ONLY
+F:WILD_WOOD
 D:A carnivorous plant that is difficult to detect, until it suddenly snaps shut 
 D:around its prey and releases paralysing enzymes to stop its struggles. 
 
-N:318:Chaos beastman
-G:H:u
-I:110:20d8:20:50:30
-W:18:2:2300:75
-E:0:0:0:0:0:0
-O:25:45:20:0
-B:HIT:CONFUSE:3d5
-B:HIT:EXP_20:3d5
-F:DROP_1D2
-F:OPEN_DOOR | BASH_DOOR | NO_CONF | NO_SLEEP | DROP_CORPSE
-F:EVIL | IM_POIS | IM_FIRE | ATTR_ANY | ATTR_MULTI
-F:MORTAL | ZANGBAND
-S:1_IN_8
-S:MISSILE | BO_FIRE | CONF | TPORT
-D:A truly loathsome thing, twisted by chaos, it is a mixture 
-D:of several different kinds of creature. 
-
-N:319:Daemonette of Slaanesh
-G:u:R
-I:120:12d8:20:50:30
-W:18:2:2000:75
-E:1:1:1:0:1:1
-O:30:0:30:40
-B:CLAW:CONFUSE:3d5
-B:CLAW:CONFUSE:3d5
-F:FORCE_MAXHP |  DROP_60 | FEMALE |
-F:OPEN_DOOR | BASH_DOOR | IM_COLD | NO_CONF | NO_SLEEP |
-F:EVIL | DEMON | IM_POIS | IM_FIRE | ZANGBAND
-S:1_IN_8
-S:SCARE | S_DEMON | CAUSE_2 | CONF | BO_FIRE | BO_COLD 
-D:It is minor female demon, vaguely human-like, but with crab-like 
-D:pincers instead of hands. She wears a rather indecent skimpy 
-D:leather bikini, moves quickly and casts deadly spells! 
-
 N:320:Giant bronze dragon fly
 G:F:U
 I:120:3d8:12:20:50
@@ -4854,11 +6400,19 @@ W:18:2:150:80
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:CONFUSE:1d6
-F:FORCE_SLEEP | RAND_50 | RAND_25 | CAN_FLY |
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | WILD_MOUNTAIN |
-F:ANIMAL | NO_CONF | NO_SLEEP | 
-F:MORTAL | BASEANGBAND
-S:1_IN_10 | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:FORCE_SLEEP
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
+F:WILD_MOUNTAIN
+F:WILD_TOO
+S:1_IN_10
 S:BR_CONF
 D:This vast gleaming bronze fly has wings which beat mesmerically fast. 
 
@@ -4870,9 +6424,18 @@ E:1:1:1:2:1:1
 O:10:90:0:0
 B:HIT:HURT:3d8
 B:HIT:HURT:3d8
-F:DROP_60 | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | GIANT | MALE | WILD_TOO | WILD_MOUNTAIN | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:GIANT
+F:HAS_LITE
+F:MALE
+F:OPEN_DOOR
+F:TAKE_ITEM
+F:WILD_MOUNTAIN
+F:WILD_TOO
 D:It is eighteen feet tall and looking at you. 
 
 N:322:Giant black dragon fly
@@ -4882,11 +6445,17 @@ W:20:2:150:70
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:ACID:1d6
-F:FORCE_SLEEP | RAND_50 | RAND_25 | 
-F:WEIRD_MIND | BASH_DOOR | CAN_FLY | WILD_TOO | WILD_SWAMP |
-F:ANIMAL | IM_ACID | 
-F:MORTAL | BASEANGBAND
-S:1_IN_10 | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:FORCE_SLEEP
+F:IM_ACID
+F:MORTAL
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
+F:WILD_TOO
+S:1_IN_10
 S:BR_ACID
 D:The size of a large bird, this fly drips caustic acid. 
 
@@ -4898,10 +6467,19 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:1d10
 B:HIT:HURT:1d10
-F:COLD_BLOOD | EMPTY_MIND | BASH_DOOR | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:HURT_ROCK | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:HURT_ROCK
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
 D:It is a massive animated statue. 
 
 N:324:Red mold
@@ -4911,10 +6489,17 @@ W:19:1:40:64
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:FIRE:4d4
-F:NEVER_MOVE | SUSCEP_COLD |
-F:STUPID | EMPTY_MIND | 
-F:IM_FIRE | IM_POIS | CAN_SWIM |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:EMPTY_MIND
+F:IM_FIRE
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+F:SUSCEP_COLD
 D:It is a strange red growth on the dungeon floor; it seems to burn with 
 D:flame. 
 
@@ -4925,29 +6510,22 @@ W:22:2:150:75
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d6
-F:FORCE_SLEEP | 
-F:RAND_50 | RAND_25 | WILD_TOO | WILD_MOUNTAIN |
-F:WEIRD_MIND | BASH_DOOR | 
-F:ANIMAL | IM_FIRE | CAN_FLY | 
-F:MORTAL | BASEANGBAND
-S:1_IN_10 | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:FORCE_SLEEP
+F:IM_FIRE
+F:MORTAL
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
+F:WILD_MOUNTAIN
+F:WILD_TOO
+S:1_IN_10
 S:BR_SOUN
 D:Large beating wings support this dazzling insect. A loud buzzing noise 
 D:pervades the air. 
 
-N:326:Stunwall
-G:#:W
-I:110:4d8:45:25:0
-W:18:5:1000:50
-E:0:0:0:0:0:0
-O:0:0:0:0
-B:TOUCH:PARALYZE:10d1
-B:TOUCH:PARALYZE:10d1
-F:NEVER_MOVE | IM_COLD | COLD_BLOOD | IM_ACID | IM_ELEC | NO_FEAR |
-F:IM_FIRE | IM_POIS | NO_CONF | NO_SLEEP | CHAR_MULTI | 
-F:EMPTY_MIND | HURT_ROCK | ZANGBAND | NO_CUT
-D:A sentient section of wall. 
-
 N:327:Ghast
 G:z:u
 I:120:30d10:40:40:20
@@ -4958,9 +6536,20 @@ B:CLAW:PARALYZE:2d4
 B:CLAW:PARALYZE:2d4
 B:BITE:LOSE_CON:2d4
 B:BITE:LOSE_CHR:2d4
-F:DROP_60 | OPEN_DOOR | BASH_DOOR | ESCORT | 
-F:NO_SLEEP | NO_CONF | UNDEAD | EVIL | IM_POIS | IM_COLD | 
-F:COLD_BLOOD | HURT_LITE | CAN_SWIM | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:DROP_60
+F:ESCORT
+F:EVIL
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:UNDEAD
 D:This vile abomination is a relative of ghouls, and often leads packs 
 D:of them. It smells foul, and its bite carries a rotting disease. 
 
@@ -4969,10 +6558,15 @@ G:I:D
 I:120:3d2:8:18:10
 W:19:4:100:4
 B:BITE:POISON:2d2
-F:RAND_50 | RAND_25 | CAN_FLY | WILD_SWAMP | WILD_TOO | 
-F:WEIRD_MIND | ANIMAL | EVIL | BASEANGBAND
-S:MULTIPLY | 
-S:1_IN_12 | 
+F:ANIMAL
+F:CAN_FLY
+F:EVIL
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
+F:WILD_TOO
+S:1_IN_12
+S:MULTIPLY
 S:SHRIEK
 D:Believed to be an evil relative of the cricket, this creature gets its name 
 D:from its incessant squeaking, which can best be described as "neek-breek, 
@@ -4989,11 +6583,21 @@ B:CRUSH:HURT:3d6
 B:CRUSH:HURT:3d6
 B:CRUSH:HURT:3d6
 B:CRUSH:HURT:3d6
-F:DROP_60 | NO_SLEEP | NO_CONF | ANIMAL | WEIRD_MIND | SUSCEP_FIRE | 
-F:RES_WATE | IM_COLD | NEVER_MOVE | WILD_ONLY | WILD_WOOD | 
-F:BASEANGBAND | NO_CUT
+F:ANIMAL
+F:DROP_60
+F:IM_COLD
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:RES_WATE
+F:SUSCEP_FIRE
+F:WEIRD_MIND
+F:WILD_ONLY
+F:WILD_WOOD
 S:1_IN_9
-S:BLINK | TELE_TO
+S:BLINK
+S:TELE_TO
 D:A very strong near-sentient tree, which has become hostile to other living things. 
 
 N:330:Bolg, Son of Azog
@@ -5006,13 +6610,24 @@ B:HIT:HURT:3d7
 B:HIT:HURT:3d7
 B:HIT:HURT:3d7
 B:HIT:HURT:3d7
-F:UNIQUE | MALE | CAN_SPEAK |
-F:FORCE_MAXHP | SPECIAL_GENE | 
-F:ESCORT | DROP_SKELETON | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:ORC
+F:SPECIAL_GENE
+F:UNIQUE
 D:A large and powerful orc, he looks just like his father. He is tall and 
 D:fast, but fortunately blessed with orcish brains. 
 
@@ -5025,12 +6640,21 @@ O:0:0:0:0
 B:BITE:HURT:1d8
 B:BITE:POISON:1d6
 B:BITE:POISON:1d6
-F:FRIENDS | WILD_TOO | WILD_WOOD | DROP_SKELETON | 
-F:WEIRD_MIND | BASH_DOOR | CAN_SWIM |
-F:ANIMAL | SPIDER | IM_POIS | RES_TELE | 
-F:MORTAL | BASEANGBAND
-S:1_IN_5 | 
-S:BLINK | TELE_TO
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_SKELETON
+F:FRIENDS
+F:IM_POIS
+F:MORTAL
+F:RES_TELE
+F:SPIDER
+F:WEIRD_MIND
+F:WILD_TOO
+F:WILD_WOOD
+S:1_IN_5
+S:BLINK
+S:TELE_TO
 D:A spider that never seems quite there. Everywhere you look it is just 
 D:half-seen in the corner of one eye. 
 
@@ -5043,11 +6667,20 @@ O:50:50:0:0
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:WAIL:TERRIFY
-F:MALE | CAN_SWIM | IM_ACID | IM_POIS | WILD_SHORE |
-F:DROP_60 | DROP_1D2 | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | FORCE_MAXHP | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_ACID
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_SHORE
 D:A lizardman leader. 
 
 N:333:Landmine
@@ -5057,10 +6690,19 @@ W:20:5:300:50
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:EXPLODE:HURT:25d2
-F:CHAR_CLEAR | ATTR_CLEAR | CHAR_MULTI | 
-F:NEVER_MOVE | FORCE_MAXHP | 
-F:EMPTY_MIND | INVISIBLE | COLD_BLOOD | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | JOKEANGBAND | NO_CUT
+F:ATTR_CLEAR
+F:CHAR_CLEAR
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:INVISIBLE
+F:JOKEANGBAND
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
 D:It was left here to be used against intruders. 
 
 N:334:Wyvern
@@ -5073,11 +6715,24 @@ B:BITE:HURT:2d6
 B:BITE:HURT:2d6
 B:BITE:HURT:2d6
 B:STING:POISON:1d6
-F:FORCE_SLEEP | 
-F:ONLY_GOLD | DROP_2D2 | IM_POIS | CAN_FLY | HAS_EGG | 
-F:OPEN_DOOR | BASH_DOOR | MOVE_BODY | DROP_CORPSE | 
-F:WILD_TOO | WILD_WOOD | WILD_MOUNTAIN | DROP_SKELETON | 
-F:ANIMAL | EVIL | DRAGON | BASEANGBAND | ATTR_MULTI
+F:ANIMAL
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_EGG
+F:IM_POIS
+F:MOVE_BODY
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:A fast-moving and deadly draconian animal. Beware its poisonous sting! 
 
 N:335:Great eagle
@@ -5089,9 +6744,16 @@ O:0:0:0:0
 B:CLAW:HURT:6d3
 B:CLAW:HURT:6d3
 B:BITE:HURT:3d6
-F:CAN_FLY |
-F:WILD_ONLY | WILD_MOUNTAIN | WILD_VOLCANO | WILD_WASTE | WILD_WOOD | 
-F:ANIMAL | GOOD | DROP_CORPSE | BASEANGBAND | HAS_EGG
+F:ANIMAL
+F:CAN_FLY
+F:DROP_CORPSE
+F:GOOD
+F:HAS_EGG
+F:WILD_MOUNTAIN
+F:WILD_ONLY
+F:WILD_VOLCANO
+F:WILD_WASTE
+F:WILD_WOOD
 D:Greater and more intelligent than most of its kind, this great eagle is 
 D:a messenger between the forces of good. 
 
@@ -5103,9 +6765,20 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:HURT:2d5
 B:HIT:HURT:2d5
-F:NEVER_MOVE | IM_COLD | COLD_BLOOD | IM_ACID | IM_ELEC | NO_FEAR |
-F:IM_FIRE | IM_POIS | NO_CONF | NO_SLEEP | FRIENDS | CHAR_MULTI | HURT_ROCK | 
-F:BASEANGBAND | NO_CUT
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:FRIENDS
+F:HURT_ROCK
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
 S:MULTIPLY
 D:A sentient section of wall. 
 
@@ -5119,11 +6792,15 @@ B:BITE:HURT:1d8
 B:BITE:HURT:1d8
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
-F:FORCE_SLEEP | 
-F:FRIENDS | DROP_SKELETON | DROP_CORPSE | 
-F:BASH_DOOR |
-F:ANIMAL | MORTAL | BASEANGBAND | NO_CUT
-S:1_IN_10 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:MORTAL
+F:NO_CUT
+S:1_IN_10
 S:BR_SHAR
 D:A beautiful crystalline shape does not disguise the danger this hound 
 D:clearly presents. Your flesh tingles as it approaches. 
@@ -5138,11 +6815,16 @@ B:BITE:POISON:1d8
 B:BITE:POISON:1d8
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
-F:FORCE_SLEEP | 
-F:FRIENDS | CAN_FLY |
-F:BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | IM_POIS | MORTAL | BASEANGBAND
-S:1_IN_10 | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:IM_POIS
+F:MORTAL
+S:1_IN_10
 S:BR_POIS
 D:Swirling vapours surround this beast as it floats towards you, seemingly 
 D:walking on air. Noxious gases sting your throat. 
@@ -5157,9 +6839,14 @@ B:CLAW:HURT:1d10
 B:CLAW:HURT:1d10
 B:BITE:HURT:1d10
 B:BITE:HURT:1d10
-F:BASH_DOOR | WILD_WOOD | WILD_TOO | WILD_GRASS |
-F:ANIMAL | DROP_SKELETON | DROP_CORPSE
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:MORTAL
+F:WILD_GRASS
+F:WILD_TOO
+F:WILD_WOOD
 D:A fierce and dangerous cat, its huge tusks and sharp claws would lacerate 
 D:even the strongest armour.  
 
@@ -5173,11 +6860,16 @@ B:BITE:ACID:1d8
 B:BITE:ACID:1d8
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
-F:FORCE_SLEEP | 
-F:FRIENDS | 
-F:BASH_DOOR | CAN_SWIM | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | IM_ACID | MORTAL | BASEANGBAND
-S:1_IN_10 | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:IM_ACID
+F:MORTAL
+S:1_IN_10
 S:BR_ACID
 D:Footprints are burned in the ground behind this hound as it pads 
 D:around the dungeon. An acrid smell of acid rises from the dog's pelt. 
@@ -5191,10 +6883,17 @@ O:0:0:0:0
 B:BUTT:HURT:2d8
 B:BITE:HURT:2d10
 B:BITE:FIRE:2d6
-F:FORCE_SLEEP | CAN_FLY | DROP_CORPSE | SUSCEP_COLD |
-F:BASH_DOOR | WILD_TOO | WILD_MOUNTAIN |
-F:IM_FIRE | MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_10 | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:MORTAL
+F:SUSCEP_COLD
+F:WILD_MOUNTAIN
+F:WILD_TOO
+S:1_IN_10
 S:BR_FIRE
 D:It is a strange concoction of goat, lion and dragon, with the heads of all 
 D:three beasts. 
@@ -5205,11 +6904,17 @@ I:110:6d8:10:1:0
 W:20:1:3000:250
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:FORCE_SLEEP | NEVER_MOVE | NEVER_BLOW
-F:EMPTY_MIND | INVISIBLE | ANIMAL | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND
-S:1_IN_4 | 
-S:BLINK | 
+F:ANIMAL
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:INVISIBLE
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+S:1_IN_4
+S:BLINK
 S:S_MONSTER
 D:It is a strange pulsing mound of flesh. 
 
@@ -5222,25 +6927,19 @@ O:0:0:0:0
 B:CLAW:HURT:1d10
 B:CLAW:HURT:1d10
 B:BITE:HURT:2d8
-F:OPEN_DOOR | BASH_DOOR | WILD_TOO | WILD_MOUNTAIN | WILD_WOOD | WILD_WASTE |
-F:ANIMAL | IM_COLD | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:IM_COLD
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WASTE
+F:WILD_WOOD
 D:A tall shaggy, furry humanoid, it could call the yeti brother. 
 
-N:344:Weir
-G:C:W
-I:110:10d12:15:30:40
-W:20:2:2010:150
-E:1:1:1:2:1:1
-O:0:0:0:0
-B:BITE:HURT:1d8
-B:BITE:HURT:1d8
-F:RAND_25 | 
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | EVIL | FRIENDS | 
-F:MORTAL | ZANGBAND
-D:It is a tracker; half human, half beast. 
-
 N:345:Ranger
 G:p:W
 I:110:15d11:20:40:40
@@ -5249,12 +6948,22 @@ E:1:1:1:2:1:1
 O:20:50:20:0
 B:HIT:HURT:5d4
 B:HIT:HURT:5d4
-F:MALE | 
-F:DROP_1D2 | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:DROP_SKELETON | DROP_CORPSE | BASEANGBAND | MORTAL | HAS_LITE
-S:1_IN_4 |  
-S:ARROW_2 | MISSILE | BO_COLD | BO_ELEC | BLINK | S_ANIMAL
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:TAKE_ITEM
+S:1_IN_4
+S:ARROW_2
+S:BLINK
+S:BO_COLD
+S:BO_ELEC
+S:MISSILE
+S:S_ANIMAL
 D:A warrior who is at one with nature.  A master of both bow and sword, with 
 D:minor spellcasting skills. 
 
@@ -5266,12 +6975,22 @@ E:1:1:1:2:1:1
 O:20:60:0:10
 B:HIT:HURT:4d5
 B:HIT:HURT:4d5
-F:MALE | GOOD | DROP_SKELETON | DROP_CORPSE | 
-F:DROP_1D2 | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:BASEANGBAND | MORTAL | HAS_LITE
-S:1_IN_4 | 
-S:HEAL | CAUSE_2 | SLOW | SCARE | BLIND
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:GOOD
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:TAKE_ITEM
+S:1_IN_4
+S:BLIND
+S:CAUSE_2
+S:HEAL
+S:SCARE
+S:SLOW
 D:A warrior for a holy cause.  Unfortunately, his god is not yours, and there is 
 D:rivalry even between the various gods of Good, so he is your enemy. 
 
@@ -5284,9 +7003,14 @@ O:0:0:0:0
 B:CLAW:HURT:2d6
 B:CLAW:HURT:2d6
 B:BITE:HURT:2d10
-F:RAND_25 | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_SKELETON |
-F:ANIMAL | EVIL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:EVIL
+F:MORTAL
+F:OPEN_DOOR
+F:RAND_25
+F:TAKE_ITEM
 D:It is a huge wolf with eyes that glow with manly intelligence. 
 
 N:348:Dark elven lord
@@ -5297,12 +7021,25 @@ E:1:1:1:2:1:1
 O:0:80:20:0
 B:HIT:HURT:3d8
 B:HIT:HURT:3d5
-F:MALE | FORCE_SLEEP | 
-F:ONLY_ITEM | DROP_2D2 | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | HURT_LITE | BASEANGBAND | HAS_LITE
-S:1_IN_5 | 
-S:HASTE | BLIND | CONF | DARKNESS | BO_FIRE | BO_COLD | MISSILE
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:HURT_LITE
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+S:1_IN_5
+S:BLIND
+S:BO_COLD
+S:BO_FIRE
+S:CONF
+S:DARKNESS
+S:HASTE
+S:MISSILE
 D:A dark elven figure in armour and radiating evil power. 
 
 N:349:Cloud giant
@@ -5313,9 +7050,17 @@ E:1:1:1:2:1:1
 O:10:90:0:0
 B:HIT:ELEC:8d8
 B:HIT:ELEC:8d8
-F:DROP_90 | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | GIANT | IM_ELEC | MALE | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:GIANT
+F:HAS_LITE
+F:IM_ELEC
+F:MALE
+F:OPEN_DOOR
+F:TAKE_ITEM
 D:It is a twenty foot tall giant wreathed in clouds. 
 
 N:350:Ugluk, the Uruk
@@ -5328,13 +7073,25 @@ B:HIT:HURT:3d8
 B:HIT:HURT:3d8
 B:HIT:HURT:3d5
 B:HIT:HURT:3d5
-F:UNIQUE | MALE | CAN_SPEAK |
-F:FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE | 
-F:ESCORT | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | IM_FIRE | IM_COLD | IM_POIS
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:ORC
+F:UNIQUE
 D:A strong and cunning orc warrior, the commander of Saruman's orcish horde. 
 
 N:351:Blue dragon bat
@@ -5344,12 +7101,15 @@ W:21:1:100:54
 E:0:1:1:0:1:0
 O:0:0:0:0
 B:BITE:ELEC:1d3
-F:FORCE_SLEEP | 
-F:RAND_50 | 
-F:BASH_DOOR | CAN_FLY |
-F:ANIMAL | IM_ELEC | AI_ANNOY
-F:MORTAL | BASEANGBAND
-S:1_IN_4 | 
+F:AI_ANNOY
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:FORCE_SLEEP
+F:IM_ELEC
+F:MORTAL
+F:RAND_50
+S:1_IN_4
 S:BR_ELEC
 D:It is a glowing blue bat with a sharp tail. 
 
@@ -5363,12 +7123,22 @@ B:HIT:POISON:3d4
 B:HIT:POISON:3d4
 B:HIT:HURT:2d3
 B:HIT:HURT:2d3
-F:MIMIC | 
-F:FORCE_SLEEP | NEVER_MOVE | 
-F:EMPTY_MIND | COLD_BLOOD | SUSCEP_FIRE |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_5 | 
-S:BLIND | CONF | SCARE | CAUSE_2 | BO_FIRE | 
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:MIMIC
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:SUSCEP_FIRE
+S:1_IN_5
+S:BLIND
+S:BO_FIRE
+S:CAUSE_2
+S:CONF
+S:SCARE
 S:S_MONSTER
 D:A strange creature that disguises itself as an object to lure 
 D:unsuspecting adventurers within reach of its venomous claws. 
@@ -5383,12 +7153,21 @@ B:BITE:POISON:4d4
 B:BITE:POISON:4d4
 B:BUTT:CONFUSE:4d4
 B:SPIT:BLIND:4d4
-F:MIMIC | 
-F:FORCE_SLEEP | NEVER_MOVE | 
-F:EMPTY_MIND | COLD_BLOOD
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_5 | 
-S:BLIND | CONF | SCARE | CAUSE_2 | BA_POIS |
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:MIMIC
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+S:1_IN_5
+S:BA_POIS
+S:BLIND
+S:CAUSE_2
+S:CONF
+S:SCARE
 S:S_MONSTER
 D:A strange creature that disguises itself as an object to lure 
 D:unsuspecting adventurers within reach of its venomous claws. 
@@ -5401,11 +7180,24 @@ W:21:1:0:100
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:ENGULF:FIRE:3d3
-F:FORCE_SLEEP | RAND_50 | CAN_FLY | WILD_VOLCANO | WILD_TOO | SUSCEP_COLD |
-F:EMPTY_MIND | BASH_DOOR | POWERFUL |  AURA_FIRE |
-F:IM_FIRE | NO_FEAR | NO_CONF | NO_SLEEP | NONLIVING | BASEANGBAND | HAS_LITE
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:NONLIVING
+F:NO_CONF
 F:NO_CUT
-S:1_IN_6 | 
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_50
+F:SUSCEP_COLD
+F:WILD_TOO
+F:WILD_VOLCANO
+S:1_IN_6
 S:BR_FIRE
 D:A whirling maelstrom of fire. 
 
@@ -5416,10 +7208,19 @@ W:21:1:0:100
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:ENGULF:ACID:3d3
-F:FORCE_SLEEP | RAND_50 | 
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | CAN_FLY |
-F:IM_ACID | NO_FEAR | NO_CONF | NO_SLEEP | NONLIVING | BASEANGBAND | NO_CUT
-S:1_IN_6 | 
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:IM_ACID
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_50
+S:1_IN_6
 S:BR_ACID
 D:A caustic spinning whirlpool of foaming, steaming water. 
 
@@ -5433,32 +7234,25 @@ B:HIT:HURT:3d6
 B:HIT:HURT:3d6
 B:HIT:HURT:3d6
 B:HIT:HURT:3d6
-F:UNIQUE | MALE | CAN_SPEAK |
-F:FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE | 
-F:ESCORT | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:ORC
+F:UNIQUE
 D:A large and powerful orc, captain of one of Saruman's orcish regiments. 
 
-N:357:Arch-vile
-G:u:W
-I:130:11d11:100:30:0
-W:21:1:100:300
-E:1:1:1:2:1:1
-O:0:0:0:0
-B:CLAW:HURT:3d9
-B:CLAW:HURT:3d9
-F:RAND_50 | EVIL | DEMON | FORCE_SLEEP | FORCE_MAXHP |
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | COLD_BLOOD |
-F:IM_FIRE | RES_NETH |  NO_CONF | NO_SLEEP | NONLIVING | NO_STUN | 
-F:ZANGBAND
-S:1_IN_3 |
-S:BA_FIRE | ANIM_DEAD
-D:A pale, corpse-like lesser demon, who moves very fast and spawns evil 
-D:everywhere. 
-
 N:358:Cold vortex
 G:v:w
 I:110:9d9:100:30:0
@@ -5466,10 +7260,22 @@ W:21:1:0:100
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:ENGULF:COLD:3d3
-F:FORCE_SLEEP | RAND_50 | AURA_COLD | COLD_BLOOD | SUSCEP_FIRE |
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | CAN_FLY |
-F:IM_COLD | NO_FEAR | NO_CONF | NO_SLEEP | NONLIVING | BASEANGBAND | NO_CUT
-S:1_IN_6 | 
+F:AURA_COLD
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:IM_COLD
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_50
+F:SUSCEP_FIRE
+S:1_IN_6
 S:BR_COLD
 D:A twisting whirlpool of frost. 
 
@@ -5480,10 +7286,21 @@ W:21:1:0:100
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:ENGULF:ELEC:3d3
-F:FORCE_SLEEP | RAND_50 | CAN_FLY | HAS_LITE | 
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | AURA_ELEC |
-F:IM_ELEC | NO_FEAR | NO_CONF | NO_SLEEP | NONLIVING | BASEANGBAND | NO_CUT
-S:1_IN_6 | 
+F:AURA_ELEC
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ELEC
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_50
+S:1_IN_6
 S:BR_ELEC
 D:A shimmering tornado of air, sparks crackle along its length. 
 
@@ -5495,10 +7312,17 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:POISON:10d5
 B:BITE:POISON:10d5
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | AQUATIC |
-F:IM_POIS | NO_STUN | WILD_TOO | COLD_BLOOD | 
-F:ANIMAL | MORTAL | BASEANGBAND
-S:1_IN_8 | 
+F:ANIMAL
+F:AQUATIC
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:IM_POIS
+F:MORTAL
+F:NO_STUN
+F:POWERFUL
+F:WILD_TOO
+S:1_IN_8
 S:BR_POIS
 D:This fish is among the most poisonous creatures there are. 
 
@@ -5507,8 +7331,11 @@ G:I:r
 I:120:3d2:8:18:10
 W:24:4:100:4
 B:BITE:BLIND:1d2
-F:RAND_50 | RAND_25 | CAN_FLY | 
-F:WEIRD_MIND | ANIMAL | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
 S:MULTIPLY
 D:Clouds of these monsters light up the dungeon - so brightly that you can 
 D:barely see through them. 
@@ -5521,11 +7348,20 @@ E:1:1:1:2:1:1
 O:10:70:0:10
 B:HIT:HURT:2d4
 B:HIT:HURT:2d4
-F:DROP_90 | 
-F:EMPTY_MIND | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | UNDEAD | 
-F:IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_90
+F:EMPTY_MIND
+F:EVIL
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:ORC
+F:UNDEAD
 D:It is an orcish figure covered in wrappings. 
 
 N:363:Wolf chieftain
@@ -5536,31 +7372,24 @@ B:CLAW:HURT:2d6
 B:CLAW:HURT:2d6
 B:BITE:HURT:2d10
 B:WAIL:TERRIFY
-F:ESCORTS | FORCE_MAXHP | IM_COLD | IM_ACID | 
-F:SMART | ESCORT | ANIMAL | EVIL | MORTAL | BASEANGBAND | 
-F:OPEN_DOOR | BASH_DOOR | NO_FEAR | MALE
-S:1_IN_8 | DARKNESS
+F:ANIMAL
+F:BASH_DOOR
+F:ESCORT
+F:ESCORTS
+F:EVIL
+F:FORCE_MAXHP
+F:IM_ACID
+F:IM_COLD
+F:MALE
+F:MORTAL
+F:NO_FEAR
+F:OPEN_DOOR
+F:SMART
+S:1_IN_8
+S:DARKNESS
 D:A great wolf-chieftain whose pack is in the service of the Dark Lord, 
 D:and whose howls strike fear into even the boldest heart. 
 
-N:364:Serpent man
-G:J:G
-I:120:15d10:20:40:20
-W:22:3:900:75
-E:1:1:1:2:1:1
-O:25:20:25:20
-B:BITE:POISON:5d5
-B:BITE:POISON:5d5
-F:MALE | CAN_SWIM | IM_POIS | IM_ACID |
-F:DROP_60 | DROP_2D2 | FRIENDS | DROP_CORPSE |
-F:OPEN_DOOR | BASH_DOOR | EVIL | MORTAL | ZANGBAND
-S:1_IN_8
-S:BA_POIS | S_MONSTER | SCARE | HOLD
-D:"They walked lithely and sinuously erect on pre-mammalian 
-D:members, their pied and hairless bodies bending with great 
-D:suppleness. There was a loud hissing of formulae as they 
-D:went to and fro."
-
 N:365:Vampiric mist
 G:#:D
 I:110:10d8:12:55:30
@@ -5569,9 +7398,19 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:ENGULF:EXP_20:1d6
 B:ENGULF:EXP_20:1d6
-F:RAND_25 | SUSCEP_ELEC | UNDEAD |
-F:IM_COLD | IM_POIS | IM_ACID | RES_NETH | WILD_TOO | WILD_SWAMP |
-F:EVIL | EMPTY_MIND | COLD_BLOOD | FRIENDS | BASEANGBAND | NO_CUT
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:FRIENDS
+F:IM_ACID
+F:IM_COLD
+F:IM_POIS
+F:NO_CUT
+F:RAND_25
+F:RES_NETH
+F:SUSCEP_ELEC
+F:UNDEAD
+F:WILD_TOO
 D:A cloud of evil, sentient mist. 
 
 N:366:Killer stag beetle
@@ -5582,9 +7421,14 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:CLAW:HURT:1d12
 B:CLAW:HURT:1d12
-F:RAND_25 | WILD_TOO | DROP_CORPSE |
-F:WEIRD_MIND | BASH_DOOR | 
-F:ANIMAL | CAN_FLY | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:MORTAL
+F:RAND_25
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is a giant beetle with vicious claws. 
 
 N:367:Iron golem
@@ -5594,11 +7438,21 @@ W:22:2:3800:160
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:1d12
-F:FORCE_SLEEP | SUSCEP_ACID |
-F:EMPTY_MIND | COLD_BLOOD | BASH_DOOR | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | BASEANGBAND | NO_CUT
-S:1_IN_7 | 
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:SUSCEP_ACID
+S:1_IN_7
 S:SLOW
 D:It is a massive metal statue that moves steadily towards you. 
 
@@ -5612,9 +7466,21 @@ B:CRUSH:HURT:1d8
 B:CRUSH:HURT:1d8
 B:CRUSH:HURT:1d8
 B:CRUSH:HURT:1d8
-F:FORCE_SLEEP | RES_TELE
-F:EMPTY_MIND | COLD_BLOOD | BASH_DOOR | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS
-F:NO_FEAR | NO_CONF | NO_SLEEP | NONLIVING | JOKEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:JOKEANGBAND
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RES_TELE
 D:It looks like a huge spiked roller, moving on its own towards you. 
 
 N:369:Giant yellow scorpion
@@ -5625,27 +7491,14 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d8
 B:STING:POISON:2d5
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO |
-F:ANIMAL | DROP_SKELETON | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:MORTAL
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is a giant scorpion with a sharp stinger. 
 
-N:370:Jade monk
-G:p:G
-I:120:10d9:22:45:5
-W:23:1:1200:100
-E:1:1:1:2:1:1
-O:30:0:60:10
-B:KICK:HURT:4d1
-B:KICK:HURT:4d1
-B:HIT:HURT:4d5
-B:HIT:HURT:4d5
-F:OPEN_DOOR | BASH_DOOR | NO_FEAR | NO_CONF | NO_SLEEP |
-F:MALE | DROP_60 | DROP_1D2 | IM_FIRE | IM_COLD | IM_POIS | 
-F:DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | ZANGBAND | HAS_LITE
-D:A monk trained in martial arts. 
-
 N:371:Black ooze
 G:j:D
 I:90:6d8:10:6:1
@@ -5653,13 +7506,22 @@ W:23:1:400:7
 E:0:0:0:0:0:0
 O:30:0:40:15
 B:TOUCH:ACID:2d6
-F:RAND_50 | DROP_60 | STUPID | EMPTY_MIND | CAN_SWIM |
-F:TAKE_ITEM | KILL_BODY | OPEN_DOOR | BASH_DOOR | 
-F:IM_POIS | NO_FEAR | 
-F:MORTAL | BASEANGBAND | NO_CUT
-S:MULTIPLY
-S:1_IN_11 | 
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_60
+F:EMPTY_MIND
+F:IM_POIS
+F:KILL_BODY
+F:MORTAL
+F:NO_CUT
+F:NO_FEAR
+F:OPEN_DOOR
+F:RAND_50
+F:STUPID
+F:TAKE_ITEM
+S:1_IN_11
 S:DRAIN_MANA
+S:MULTIPLY
 D:It is a strangely moving puddle. 
 
 N:372:Hardened warrior
@@ -5670,10 +7532,16 @@ E:1:1:1:2:1:1
 O:0:100:0:0
 B:HIT:HURT:6d5
 B:HIT:HURT:6d5
-F:MALE | 
-F:DROP_1D2 | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:TAKE_ITEM
 D:A scarred warrior who moves with confidence. 
 
 N:373:Azog, King of the Uruk-Hai
@@ -5685,32 +7553,28 @@ O:10:90:0:0
 B:HIT:HURT:5d6
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
-F:UNIQUE | MALE | CAN_SPEAK |
-F:FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE | 
-F:ESCORT | ESCORTS | SPECIAL_GENE |
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:ESCORTS
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:ORC
+F:SPECIAL_GENE
+F:UNIQUE
 D:He is also known as the King of Khazad-dum. His ego is renowned to be 
 D:bigger than his head. 
 
-N:374:Fleshhound of Khorne
-G:C:R
-I:120:25d25:15:30:70
-W:30:3:700:150
-E:0:1:0:2:1:0
-O:0:0:0:0
-B:CLAW:HURT:4d1
-B:CLAW:HURT:4d1
-B:BITE:HURT:6d1
-B:BITE:HURT:6d1
-F:BASH_DOOR | DEMON | NO_STUN | NO_FEAR |
-F:ANIMAL | EVIL | IM_FIRE | NO_SLEEP | NO_CONF | 
-F:RES_NETH | RES_NEXU | RES_DISE | RES_PLAS | ZANGBAND
-D:A revolting canine creature, a huge demon hound with a somewhat 
-D:reptilian head. 
-
 N:375:Dark elven warlock
 G:h:v
 I:120:7d10:20:16:20
@@ -5719,13 +7583,24 @@ E:1:1:1:2:1:1
 O:0:0:100:0
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
-F:MALE | 
-F:FORCE_SLEEP | 
-F:ONLY_ITEM | DROP_1D2 | DROP_SKELETON | DROP_CORPSE
-F:OPEN_DOOR | BASH_DOOR | FRIENDS
-F:EVIL | IM_POIS | HURT_LITE | BASEANGBAND | HAS_LITE
-S:1_IN_5 | 
-S:CONF | MISSILE | DARKNESS | BO_MANA
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_SLEEP
+F:FRIENDS
+F:HAS_LITE
+F:HURT_LITE
+F:IM_POIS
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+S:1_IN_5
+S:BO_MANA
+S:CONF
+S:DARKNESS
+S:MISSILE
 D:A dark elven mage with spells of frightening destructive power. 
 
 N:376:Master rogue
@@ -5737,10 +7612,17 @@ O:80:10:10:0
 B:HIT:HURT:2d8
 B:HIT:HURT:2d8
 B:HIT:EAT_GOLD:4d4
-F:MALE | DROP_SKELETON | DROP_CORPSE | 
-F:DROP_2D2 | SUSCEP_ELEC |
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:SUSCEP_ELEC
+F:TAKE_ITEM
 D:A thief of great power and shifty speed. 
 
 N:377:Red dragon bat
@@ -5750,10 +7632,16 @@ W:23:1:100:60
 E:0:1:1:0:1:0
 O:0:0:0:0
 B:BITE:FIRE:1d3
-F:FORCE_SLEEP | RAND_50 | SUSCEP_COLD |
-F:BASH_DOOR | CAN_FLY | DROP_CORPSE | AI_ANNOY
-F:ANIMAL | IM_FIRE | BASEANGBAND
-S:1_IN_4 | 
+F:AI_ANNOY
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:IM_FIRE
+F:RAND_50
+F:SUSCEP_COLD
+S:1_IN_4
 S:BR_FIRE
 D:It is a sharp-tailed bat, wreathed in fire. 
 
@@ -5764,9 +7652,14 @@ W:23:1:500:85
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:4d5
-F:RAND_25 | 
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | DROP_CORPSE | 
-F:ANIMAL | CAN_FLY | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:MORTAL
+F:RAND_25
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is looking for prey. 
 
 N:379:Ice skeleton
@@ -5777,10 +7670,20 @@ E:1:1:1:2:1:1
 O:20:0:80:0
 B:CLAW:COLD:2d3
 B:CLAW:COLD:2d3
-F:ONLY_ITEM | DROP_90 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | SUSCEP_FIRE |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_90
+F:EVIL
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SUSCEP_FIRE
+F:UNDEAD
 D:It is a skeleton covered in frost. 
 
 N:380:Angamaite of Umbar
@@ -5793,14 +7696,27 @@ B:HIT:HURT:4d7
 B:HIT:HURT:4d7
 B:HIT:HURT:4d6
 B:HIT:HURT:4d6
-F:UNIQUE | MALE | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_90 | DROP_1D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | IM_FIRE | IM_ELEC
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_4 | 
-S:SLOW | FORGET
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ELEC
+F:IM_FIRE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNIQUE
+S:1_IN_4
+S:FORGET
+S:SLOW
 D:A Black Numenorean who hates the men of the west. 
 
 N:381:Forest wight
@@ -5812,13 +7728,25 @@ O:0:50:50:0
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
 B:TOUCH:EXP_20
-F:FORCE_SLEEP | RAND_25 | 
-F:DROP_60 | DROP_90 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | CAN_FLY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_10 |
-S:SCARE | DRAIN_MANA
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_60
+F:DROP_90
+F:EVIL
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:RAND_25
+F:UNDEAD
+S:1_IN_10
+S:DRAIN_MANA
+S:SCARE
 D:It is a ghostly apparition with a humanoid form. 
 
 N:382:Khim, Son of Mim
@@ -5831,14 +7759,27 @@ B:HIT:HURT:3d8
 B:HIT:HURT:3d8
 B:HIT:HURT:3d7
 B:HIT:UN_BONUS
-F:UNIQUE | MALE | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE
-F:FORCE_SLEEP | FORCE_MAXHP | RES_TELE
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR |
-F:IM_FIRE | IM_COLD
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_8 | 
-S:HEAL | SLOW | BO_FIRE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:IM_FIRE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:UNIQUE
+S:1_IN_8
+S:BO_FIRE
+S:HEAL
+S:SLOW
 D:One of the last of the Petty-Dwarves. Khim is a tricky sorcerous little 
 D:being, full of mischief. 
 
@@ -5852,14 +7793,27 @@ B:HIT:HURT:3d8
 B:HIT:HURT:3d8
 B:HIT:HURT:3d7
 B:HIT:UN_BONUS
-F:UNIQUE | MALE | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE | 
-F:FORCE_SLEEP | FORCE_MAXHP | RES_TELE | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR |
-F:IM_FIRE | IM_COLD
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_8 | 
-S:HEAL | SLOW | BO_FIRE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:IM_FIRE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:UNIQUE
+S:1_IN_8
+S:BO_FIRE
+S:HEAL
+S:SLOW
 D:One of the last of the Petty-Dwarves. Ibun is a tricky sorcerous little 
 D:being, full of mischief. 
 
@@ -5872,9 +7826,17 @@ O:0:0:0:0
 B:CLAW:HURT:7d3
 B:CLAW:HURT:7d3
 B:BITE:HURT:3d7
-F:CAN_FLY | UNIQUE | FORCE_MAXHP | DROP_CORPSE | CAN_SPEAK |
-F:WILD_ONLY | WILD_MOUNTAIN | WILD_VOLCANO | PET | 
-F:ANIMAL | GOOD | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:CAN_SPEAK
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:GOOD
+F:PET
+F:UNIQUE
+F:WILD_MOUNTAIN
+F:WILD_ONLY
+F:WILD_VOLCANO
 D:Among all the eagles of Middle-earth he is the swiftest, and in his time 
 D:has borne messages between all of the Wise.  It was Meneldor who bore the 
 D:Ring-bearer away from the destruction of Mount Doom. 
@@ -5887,8 +7849,16 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:HURT:2d33
 B:HIT:HURT:2d44
-F:PASS_WALL | NO_SLEEP | COLD_BLOOD | NONLIVING | NO_FEAR |
-F:FORCE_MAXHP | RES_TELE | EMPTY_MIND | CAN_FLY | BASEANGBAND | NO_CUT
+F:CAN_FLY
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:NONLIVING
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:PASS_WALL
+F:RES_TELE
 D:A creature that is half real, half illusion. 
 
 N:386:Giant silver ant
@@ -5898,9 +7868,14 @@ W:23:1:800:45
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:ACID:4d4
-F:RAND_25 | 
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | DROP_SKELETON | 
-F:ANIMAL | MORTAL | BASEANGBAND | HAS_LITE
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:HAS_LITE
+F:MORTAL
+F:RAND_25
+F:WEIRD_MIND
+F:WILD_TOO
 D:A giant silver ant with a caustic bite. 
 
 N:387:4-headed hydra
@@ -5913,11 +7888,19 @@ B:BITE:HURT:2d6
 B:BITE:HURT:2d6
 B:BITE:HURT:2d6
 B:BITE:HURT:2d6
-F:FORCE_SLEEP | 
-F:ONLY_GOLD | DROP_4D2 | WILD_TOO | WILD_SWAMP | WILD_SHORE |
-F:OPEN_DOOR | BASH_DOOR | MOVE_BODY | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | MORTAL | BASEANGBAND
-S:1_IN_7 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:MORTAL
+F:MOVE_BODY
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:WILD_SHORE
+F:WILD_TOO
+S:1_IN_7
 S:SCARE
 D:A strange reptilian creature with four heads, guarding its hoard. 
 
@@ -5930,28 +7913,29 @@ O:0:0:0:0
 B:GAZE:TERRIFY:1d4
 B:GAZE:TERRIFY:1d4
 B:CRUSH:HURT:44d1
-F:EVIL | IM_ACID | IM_ELEC | IM_FIRE | IM_POIS | IM_COLD |
-F:RES_NETH | RES_WATE | RES_PLAS | RES_DISE | RES_NEXU |
-F:KILL_WALL | FORCE_MAXHP | CAN_SWIM | DROP_CORPSE | JOKEANGBAND | HAS_LITE
-S:1_IN_9 |
-S:TPORT | BLINK | TELE_AWAY
+F:CAN_SWIM
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:JOKEANGBAND
+F:KILL_WALL
+F:RES_DISE
+F:RES_NETH
+F:RES_NEXU
+F:RES_PLAS
+F:RES_WATE
+S:1_IN_9
+S:BLINK
+S:TELE_AWAY
+S:TPORT
 D:This creature just might crush you. 
 
-N:389:Tyrannosaur
-G:R:g
-I:120:200d3:20:70:20
-W:24:2:5000:350
-E:0:1:0:2:1:0
-O:0:0:0:0
-B:CLAW:HURT:1d6
-B:CLAW:HURT:1d6
-B:BITE:HURT:3d6
-B:BITE:HURT:3d6
-F:FORCE_SLEEP | 
-F:OPEN_DOOR | BASH_DOOR | MOVE_BODY | DROP_CORPSE | 
-F:ANIMAL | MORTAL | ZANGBAND
-D:A horror from prehistory, reawakened by chaos. 
-
 N:390:Mummified human
 G:z:w
 I:110:17d9:20:34:60
@@ -5960,10 +7944,20 @@ E:1:1:1:2:1:1
 O:20:40:20:10
 B:HIT:HURT:2d4
 B:HIT:HURT:2d4
-F:ONLY_ITEM | DROP_90 | 
-F:EMPTY_MIND | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_90
+F:EMPTY_MIND
+F:EVIL
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNDEAD
 D:It is a human form encased in mouldy wrappings. 
 
 N:391:Vampire bat
@@ -5974,9 +7968,19 @@ E:0:1:1:0:1:0
 O:0:0:0:0
 B:BITE:EXP_40:1d4
 B:BITE:EXP_40:1d4
-F:RAND_50 | COLD_BLOOD | REGENERATE | CAN_FLY |
-F:EVIL | ANIMAL | UNDEAD | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:CAN_FLY
+F:COLD_BLOOD
+F:EVIL
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RAND_50
+F:REGENERATE
+F:UNDEAD
 D:A blood-sucking bat that flies at your neck hungrily. 
 
 N:392:Sangahyando of Umbar
@@ -5989,35 +7993,28 @@ B:HIT:HURT:4d7
 B:HIT:HURT:4d7
 B:HIT:HURT:4d7
 B:HIT:HURT:4d7
-F:UNIQUE | MALE | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_90 | DROP_1D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | IM_FIRE | IM_ELEC
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_4 | 
-S:SLOW | FORGET
-D:A Black Numenorean with a blacker heart. 
-
-N:393:It
-G:.:W
-I:110:77d9:25:80:25
-W:24:3:500:400
-E:0:0:0:0:0:0
-O:10:0:90:0
-B:GAZE:BLIND:8d8
-B:TOUCH:TERRIFY
-B:GAZE:EXP_40
-B:TOUCH:EAT_ITEM
-F:ONLY_ITEM | DROP_90 | DROP_1D2 | DROP_GOOD | DROP_GREAT | DROP_CORPSE | 
-F:CHAR_MULTI | CHAR_CLEAR | ATTR_CLEAR | INVISIBLE | COLD_BLOOD | 
-F:NO_CONF | UNIQUE | FORCE_MAXHP | NO_SLEEP | CAN_SPEAK | REFLECTING |
-F:IM_FIRE | IM_ELEC | EMPTY_MIND | EVIL | SMART | RES_TELE | CAN_FLY | 
-F:ZANGBAND
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ELEC
+F:IM_FIRE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNIQUE
 S:1_IN_4
-S:DRAIN_MANA | BLINK | BLIND | SCARE | CONF | S_UNDEAD | S_MONSTER |
-S:HEAL | TELE_AWAY | DARKNESS | S_HYDRA | TRAPS | FORGET | TELE_TO | SHRIEK
-D:Nobody has ever seen It. 
+S:FORGET
+S:SLOW
+D:A Black Numenorean with a blacker heart. 
 
 N:394:Banshee
 G:G:b
@@ -6027,13 +8024,24 @@ E:0:0:0:0:0:0
 O:80:0:0:15
 B:WAIL:TERRIFY
 B:TOUCH:EXP_20
-F:FEMALE | 
-F:RAND_50 | DROP_1D2 | 
-F:INVISIBLE | COLD_BLOOD | TAKE_ITEM | PASS_WALL | CAN_FLY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_1D2
+F:EVIL
+F:FEMALE
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
 F:NO_CUT
-S:1_IN_15 | 
-S:TPORT | DRAIN_MANA
+F:NO_SLEEP
+F:PASS_WALL
+F:RAND_50
+F:TAKE_ITEM
+F:UNDEAD
+S:1_IN_15
+S:DRAIN_MANA
+S:TPORT
 D:It is a ghostly woman's form that wails mournfully. 
 
 N:395:Carrion crawler
@@ -6044,31 +8052,16 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:STING:PARALYZE:2d6
 B:STING:PARALYZE:2d6
-F:RAND_25 | 
-F:WEIRD_MIND | BASH_DOOR | DROP_SKELETON | 
-F:ANIMAL | IM_POIS | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:IM_POIS
+F:MORTAL
+F:RAND_25
+F:WEIRD_MIND
 D:A hideous centipede covered in slime and with glowing tentacles around its 
 D:head. 
 
-N:396:Xiclotlan
-G:#:D
-I:110:25d13:15:60:10
-W:25:2:6000:60
-E:0:0:0:0:0:0
-O:0:0:0:0
-B:CRUSH:HURT:6d4
-B:CRUSH:HURT:6d4
-B:BITE:HURT:3d2
-F:RAND_25 | SUSCEP_ACID |
-F:EMPTY_MIND | BASH_DOOR | 
-F:IM_POIS | IM_ELEC | 
-F:MORTAL | CTHANGBAND | NO_CUT
-D:"...a metallically grey tree... about sixteen feet high with 
-D:very thick cylindrical branches... cylinders further 
-D:divided into six flat circular extensions... and from the top 
-D:of what I had taken for a trunk rose a featureless oval... an 
-D:orifice gaping at the top." 
-
 N:397:Silent watcher
 G:g:s
 I:110:80d25:60:80:0
@@ -6079,12 +8072,33 @@ B:GAZE:TERRIFY
 B:GAZE:PARALYZE
 B:GAZE:LOSE_STR
 B:GAZE:HALLU
-F:EMPTY_MIND | COLD_BLOOD | NONLIVING | NEVER_MOVE |
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | EVIL |
-F:HURT_ROCK | COLD_BLOOD | HURT_LITE | NO_FEAR |
-F:NO_CONF | NO_SLEEP | NO_STUN | NONLIVING | RES_TELE | BASEANGBAND | NO_CUT
-S:1_IN_3 | 
-S:SHRIEK | S_MONSTER | S_MONSTERS | HOLD | CONF | MIND_BLAST | DRAIN_MANA
+F:COLD_BLOOD
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:HURT_LITE
+F:HURT_ROCK
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NEVER_MOVE
+F:NONLIVING
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:RES_TELE
+S:1_IN_3
+S:CONF
+S:DRAIN_MANA
+S:HOLD
+S:MIND_BLAST
+S:SHRIEK
+S:S_MONSTER
+S:S_MONSTERS
 D:A figure carved from stone, with three vulture faces whose eyes glow 
 D:with a malevolent light.  None escape its vigilance. 
 
@@ -6096,31 +8110,25 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:1d12
 B:HIT:HURT:3d6
-F:FORCE_SLEEP | 
-F:EMPTY_MIND | COLD_BLOOD | BASH_DOOR | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:HURT_ROCK | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_4 | 
-S:SLOW | CONF | BO_ACID
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HURT_ROCK
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+S:1_IN_4
+S:BO_ACID
+S:CONF
+S:SLOW
 D:A stumpy figure carved from stone, with glittering eyes. 
 
-N:399:Disenchanter beast
-G:q:v
-I:110:30d30:12:60:12
-W:25:2:2000:250
-E:0:1:0:2:1:0
-O:0:0:0:0
-B:TOUCH:UN_BONUS:1d10
-B:TOUCH:UN_BONUS:1d10
-B:TOUCH:UN_BONUS:1d10
-B:TOUCH:UN_BONUS:1d10
-F:STUPID | WEIRD_MIND | RES_DISE | DROP_CORPSE | ATTR_MULTI | 
-F:IM_ACID | IM_POIS | 
-F:NO_CONF | ZANGBAND
-D:It looks like an anteater, and there is a static feeling 
-D:crackling around its long trunk. 
-
 N:400:Dark elven druid
 G:h:G
 I:120:20d20:15:75:10
@@ -6130,14 +8138,27 @@ O:10:0:80:10
 B:HIT:HURT:1d7
 B:HIT:HURT:1d7
 B:HIT:HURT:3d8
-F:MALE | 
-F:FORCE_SLEEP | 
-F:ONLY_ITEM | DROP_1D2 | DROP_SKELETON | DROP_CORPSE
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
-S:1_IN_6 | 
-S:HEAL | CONF | DARKNESS | 
-S:S_MONSTER | S_SPIDER | S_ANIMAL
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:HURT_LITE
+F:IM_POIS
+F:MALE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+S:1_IN_6
+S:CONF
+S:DARKNESS
+S:HEAL
+S:S_ANIMAL
+S:S_MONSTER
+S:S_SPIDER
 D:A powerful dark elf, with mighty nature-controlling enchantments. 
 
 N:401:Stone troll
@@ -6149,27 +8170,21 @@ O:0:100:0:0
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
 B:BITE:HURT:3d4
-F:MALE | 
-F:FRIENDS | DROP_60 | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | REGENERATE | 
-F:EVIL | TROLL | HURT_LITE | HURT_ROCK | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HURT_LITE
+F:HURT_ROCK
+F:MALE
+F:NO_CUT
+F:OPEN_DOOR
+F:REGENERATE
+F:TROLL
 D:He is a giant troll with scabrous black skin. 
 
-N:402:Black
-G:j:d
-I:111:12d12:12:65:30
-W:25:1:0:50
-E:0:0:0:0:0:0
-O:0:0:0:0
-B:ENGULF:EXP_40:2d6
-B:ENGULF:EXP_40:2d6
-F:RAND_25 | 
-F:IM_COLD | IM_POIS | IM_ACID | RES_NETH |
-F:EVIL | EMPTY_MIND | COLD_BLOOD | FRIENDS | CTHANGBAND | NO_CUT
-D:The eldritch  blood of Yibb-Tstll is know only as "the Black": it is 
-D:an amorphous substance, which will suck your life and deliver it to 
-D:Yibb-Tstll. 
-
 N:403:Hill troll
 G:T:s
 I:110:21d10:20:65:40
@@ -6179,11 +8194,21 @@ O:30:70:0:0
 B:HIT:HURT:1d5
 B:HIT:HURT:1d5
 B:BITE:HURT:2d6
-F:MALE | 
-F:FRIENDS | DROP_60 | WILD_TOO | WILD_WASTE | WILD_MOUNTAIN | 
-F:DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | SUSCEP_FIRE | REGENERATE | 
-F:EVIL | TROLL | HURT_LITE | BASEANGBAND
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HURT_LITE
+F:MALE
+F:OPEN_DOOR
+F:REGENERATE
+F:SUSCEP_FIRE
+F:TROLL
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WASTE
 D:A large troll with an extremely tough and warty hide.
 
 N:404:Wereworm
@@ -6196,9 +8221,14 @@ B:GAZE:EXP_20
 B:CRAWL:ACID:2d4
 B:BITE:HURT:1d10
 B:BITE:POISON:1d6
-F:BASH_DOOR | EVIL | CAN_SWIM | WILD_TOO | WILD_SWAMP | 
-F:ANIMAL | IM_ACID | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_CORPSE
+F:EVIL
+F:IM_ACID
+F:MORTAL
+F:WILD_TOO
 D:A huge wormlike shape dripping acid, twisted by evil sorcery into a foul 
 D:monster that breeds on death. 
 
@@ -6209,9 +8239,14 @@ W:25:1:600:90
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:LOSE_STR:4d4
-F:RAND_25 | WILD_TOO |
-F:WEIRD_MIND | BASH_DOOR | DROP_CORPSE | 
-F:ANIMAL | CAN_FLY | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:MORTAL
+F:RAND_25
+F:WEIRD_MIND
+F:WILD_TOO
 D:A giant beetle with poisonous mandibles. 
 
 N:406:Disenchanter bat
@@ -6222,28 +8257,17 @@ E:0:1:1:0:1:0
 O:0:0:0:0
 B:HIT:UN_BONUS
 B:HIT:UN_BONUS
-F:FORCE_SLEEP | RAND_50 | ANIMAL | MORTAL | ATTR_MULTI | 
-F:DROP_CORPSE | AI_ANNOY | CAN_FLY | BASEANGBAND | WEIRD_MIND
+F:AI_ANNOY
+F:ANIMAL
+F:ATTR_MULTI
+F:CAN_FLY
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:MORTAL
+F:RAND_50
+F:WEIRD_MIND
 D:A giant bat which feeds on raw magical energy. 
 
-N:407:Gnoph-Keh
-G:q:s
-I:110:20d8:12:50:25
-W:26:2:1500:95
-E:0:1:0:2:1:0
-O:20:40:20:10
-B:CLAW:COLD:2d4
-B:CLAW:COLD:2d4
-B:BUTT:HURT:2d9
-F:RAND_25 | DROP_90 | DROP_60
-F:OPEN_DOOR | BASH_DOOR | AURA_COLD | IM_COLD | SUSCEP_FIRE |
-F:ANIMAL | DROP_CORPSE | CTHANGBAND
-S:1_IN_8
-S:BR_COLD | BO_ICEE | BO_COLD | BA_COLD
-D:A creature with a sharp horn: "the hairy myth-thing of the 
-D:Greenland ice, that walked sometimes on two legs, sometimes 
-D:on four, and sometimes on six." 
-
 N:408:Giant grey ant
 G:a:s
 I:110:19d8:10:40:40
@@ -6251,9 +8275,12 @@ W:26:1:700:90
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:2d12
-F:RAND_25 | KILL_BODY | DROP_SKELETON
-F:WEIRD_MIND | BASH_DOOR | 
-F:ANIMAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:KILL_BODY
+F:RAND_25
+F:WEIRD_MIND
 D:It is an ant encased in shaggy grey fur. 
 
 N:409:Khufu, the Mummified King
@@ -6266,13 +8293,34 @@ B:GAZE:TERRIFY
 B:HIT:DISEASE:6d6
 B:CLAW:LOSE_CON:4d4
 B:CLAW:LOSE_CON:4d4
-F:UNIQUE | MALE | CAN_SPEAK | UNDEAD | EVIL | ESCORTS | ESCORT | 
-F:FORCE_MAXHP | COLD_BLOOD | IM_POIS | IM_COLD | NO_FEAR | NO_CONF | NO_SLEEP |
-F:ONLY_ITEM | DROP_90 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | RES_TELE | BASEANGBAND | NO_CUT
-S:1_IN_5 |
-S:TRAPS | CAUSE_3 | DARKNESS | S_UNDEAD | SCARE | SLOW | 
-S:S_KIN | ANIM_DEAD
+F:BASH_DOOR
+F:CAN_SPEAK
+F:COLD_BLOOD
+F:DROP_90
+F:DROP_GOOD
+F:ESCORT
+F:ESCORTS
+F:EVIL
+F:FORCE_MAXHP
+F:IM_COLD
+F:IM_POIS
+F:MALE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:UNDEAD
+F:UNIQUE
+S:1_IN_5
+S:CAUSE_3
+S:DARKNESS
+S:SCARE
+S:SLOW
+S:S_KIN
+S:S_UNDEAD
 D:He is out to have revenge on those who have desecrated his tomb. 
 
 N:410:Gwaihir the Windlord
@@ -6284,9 +8332,17 @@ O:0:0:0:0
 B:CLAW:HURT:15d2
 B:CLAW:HURT:15d2
 B:BITE:HURT:3d10
-F:CAN_FLY | UNIQUE | FORCE_MAXHP | DROP_CORPSE | CAN_SPEAK |
-F:WILD_ONLY | WILD_MOUNTAIN | WILD_VOLCANO | PET | 
-F:ANIMAL | GOOD | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:CAN_SPEAK
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:GOOD
+F:PET
+F:UNIQUE
+F:WILD_MOUNTAIN
+F:WILD_ONLY
+F:WILD_VOLCANO
 D:The greatest of eagles in the Third Age of Middle-earth, Gwaihir rescued 
 D:Gandalf the Wizard from Orthanc, and has twice brought his flock to the 
 D:aid of Sauron's enemies in battle - first outside the gates of Erebor in 
@@ -6299,10 +8355,15 @@ W:26:2:200:90
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:FIRE:3d6
-F:RAND_25 | SUSCEP_COLD |
-F:WEIRD_MIND | BASH_DOOR | 
-F:ANIMAL | IM_FIRE | CAN_FLY | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:HAS_LITE
+F:IM_FIRE
+F:MORTAL
+F:RAND_25
+F:SUSCEP_COLD
+F:WEIRD_MIND
 D:It is smoking and burning with great heat. 
 
 N:412:Displacer beast
@@ -6315,8 +8376,11 @@ B:BITE:HURT:2d8
 B:HIT:HURT:1d10
 B:HIT:HURT:1d10
 B:HIT:HURT:1d10
-F:INVISIBLE | BASH_DOOR | DROP_CORPSE | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:INVISIBLE
+F:MORTAL
 D:It is a huge black panther, clubbed tentacles sprouting from its shoulders. 
 
 N:413:Ulwarth, Son of Ulfang
@@ -6328,12 +8392,22 @@ O:40:60:0:0
 B:HIT:HURT:4d6
 B:HIT:HURT:4d6
 B:HIT:HURT:4d6
-F:UNIQUE | MALE | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE | 
-F:FORCE_MAXHP | WILD_TOO |
-F:ONLY_ITEM | DROP_90 | DROP_GOOD | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
 F:EVIL
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:FORCE_MAXHP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:TAKE_ITEM
+F:UNIQUE
+F:WILD_TOO
 D:A short and swarthy Easterling. 
 
 N:414:Werebear
@@ -6346,9 +8420,15 @@ B:CLAW:HURT:1d10
 B:CLAW:HURT:1d10
 B:BITE:HURT:2d8
 B:CRUSH:HURT:2d6
-F:BASH_DOOR | OPEN_DOOR | 
-F:WILD_TOO | WILD_WOOD | WILD_MOUNTAIN | DROP_CORPSE | 
-F:ANIMAL | EVIL | DROP_1D2 | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:EVIL
+F:OPEN_DOOR
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:In the eyes of this bear, there glimmers the faintest light of intelligence.  
 D:And then its form begins to change... The combination of animal cunning, 
 D:human intelligence and the great physical strength of the bear makes for 
@@ -6362,10 +8442,15 @@ E:1:1:1:2:1:1
 O:20:70:0:10
 B:HIT:HURT:3d8
 B:HIT:HURT:3d8
-F:FRIENDS | DROP_60 | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | GIANT | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FRIENDS
+F:GIANT
+F:HAS_LITE
+F:MORTAL
+F:OPEN_DOOR
 D:A giant orc-like figure with an awesomely muscled frame. 
 
 N:416:White wraith
@@ -6377,13 +8462,24 @@ O:0:50:50:0
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
 B:TOUCH:EXP_20
-F:FORCE_SLEEP | 
-F:DROP_1D2 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | CAN_FLY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_8 | 
-S:SCARE | CAUSE_2 | DARKNESS
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_1D2
+F:EVIL
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:UNDEAD
+S:1_IN_8
+S:CAUSE_2
+S:DARKNESS
+S:SCARE
 D:It is a tangible but ghostly form made of white fog. 
 
 N:417:Angel
@@ -6396,12 +8492,27 @@ B:HIT:HURT:3d4
 B:HIT:HURT:3d4
 B:HIT:HURT:3d4
 B:HIT:HURT:3d4
-F:FORCE_MAXHP | FORCE_SLEEP | NO_FEAR |
-F:ONLY_ITEM | DROP_2D2 | GOOD | CAN_FLY |
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | POWERFUL | 
-F:IM_ACID | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:BLIND | CONF | SCARE | FORGET
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_2D2
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_POIS
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:TAKE_ITEM
+S:1_IN_3
+S:BLIND
+S:CONF
+S:FORGET
+S:SCARE
 D:Who knows why you are now facing an angel as an enemy? Is it a punishment 
 D:from your own god for your sins, or a test of your mettle, or has this angel 
 D:been sent by another god on behalf of someone who wishes to claim the glory 
@@ -6417,11 +8528,23 @@ O:0:45:35:10
 B:CLAW:DISEASE:1d4
 B:CLAW:DISEASE:1d4
 B:BITE:PARALYZE:1d5
-F:DROP_60 | OPEN_DOOR | BASH_DOOR | CAN_SWIM |
-F:EVIL | UNDEAD | FRIENDS | IM_POIS | IM_COLD | NO_CONF | NO_SLEEP | 
-F:COLD_BLOOD | HURT_LITE | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:DROP_60
+F:EVIL
+F:FRIENDS
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:UNDEAD
 S:1_IN_9
-S:SCARE | HOLD
+S:HOLD
+S:SCARE
 D:Flesh is falling off in chunks from this decaying abomination. 
 
 N:419:Mim, Betrayer of Turin
@@ -6434,15 +8557,35 @@ B:HIT:HURT:3d9
 B:HIT:HURT:3d9
 B:HIT:HURT:3d9
 B:HIT:UN_BONUS:3d12
-F:UNIQUE | MALE | CAN_SPEAK | 
-F:FORCE_MAXHP | FORCE_SLEEP | DROP_SKELETON | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR |
-F:EVIL | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:RES_DISE | RES_TELE | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_6 | 
-S:HEAL | SCARE | BO_ACID | BA_ACID | TPORT | S_MONSTER 
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_DISE
+F:RES_TELE
+F:UNIQUE
+S:1_IN_6
+S:BA_ACID
+S:BO_ACID
+S:HEAL
+S:SCARE
+S:S_MONSTER
+S:TPORT
 D:The last of his race, Mim is a Petty-Dwarf.  Petty-Dwarves are strange 
 D:creatures, powerful in sorcery and originating in the East.  They have 
 D:been hunted nearly to extinction by the High Elves. 
@@ -6455,10 +8598,22 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:EXP_20:2d13
 B:HIT:EXP_20:2d13
-F:CHAR_MULTI | EVIL | IM_POIS | IM_COLD | 
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | SUSCEP_ACID |
-F:COLD_BLOOD | BASH_DOOR | NONLIVING |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | HAS_LITE | NO_CUT
+F:BASH_DOOR
+F:CAN_FLY
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:IM_POIS
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:SUSCEP_ACID
 D:A deadly blade of chaos, moving of its own volition.
 
 N:421:Killer fire beetle
@@ -6469,25 +8624,19 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:3d4
 B:SPIT:FIRE:4d5
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | WILD_VOLCANO | DROP_CORPSE | 
-F:ANIMAL | IM_FIRE | CAN_FLY | SUSCEP_COLD |
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:HAS_LITE
+F:IM_FIRE
+F:MORTAL
+F:SUSCEP_COLD
+F:WEIRD_MIND
+F:WILD_TOO
+F:WILD_VOLCANO
 D:It is a giant beetle wreathed in flames. 
 
-N:422:Beast of Nurgle
-G:q:y
-I:110:15d7:14:50:30
-W:27:2:2300:100
-E:0:1:0:2:1:0
-O:0:0:0:0
-B:TOUCH:POISON:3d3
-B:TOUCH:DISEASE:3d3
-B:BITE:ACID:4d5
-F:WEIRD_MIND | BASH_DOOR | IM_ACID | IM_POIS |
-F:DEMON | EVIL | IM_FIRE | CAN_FLY | ZANGBAND
-D:It walks on four legs, but mostly resembles a slug-shaped jelly. 
-D:It even has two disgusting antennae in its head. Yecch! 
-
 N:423:Creeping adamantite coins
 G:$:G
 I:120:20d25:5:50:10
@@ -6498,9 +8647,18 @@ B:BITE:POISON:3d4
 B:TOUCH:POISON:3d5
 B:HIT:HURT:1d12
 B:HIT:HURT:1d12
-F:ONLY_GOLD | DROP_90 | DROP_2D2 | 
-F:COLD_BLOOD | BASH_DOOR | CHAR_MULTI | 
-F:IM_ELEC | IM_ACID | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_90
+F:IM_ACID
+F:IM_ELEC
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_GOLD
 D:It appears to be a pile of coins made of precious adamant, slithering toward 
 D:you on lots of tiny legs. 
 
@@ -6513,26 +8671,19 @@ O:10:80:0:10
 B:CLAW:POISON:3d3
 B:CLAW:POISON:3d3
 B:BITE:HURT:1d6
-F:FRIENDS | DROP_60 | WILD_WOOD | WILD_MOUNTAIN | WILD_TOO | WILD_SWAMP | 
-F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | REGENERATE | 
-F:EVIL | TROLL | BASEANGBAND
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FRIENDS
+F:OPEN_DOOR
+F:REGENERATE
+F:TROLL
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:A powerful troll form. Venom drips from its needlelike claws. 
 
-N:425:Flamer of Tzeentch
-G:,:r
-I:110:60d15:10:70:20
-W:27:2:0:500
-E:1:0:1:2:0:0
-O:0:0:0:0
-B:ENGULF:FIRE:3d6
-B:ENGULF:FIRE:3d6
-F:FORCE_SLEEP |  BASH_DOOR | SUSCEP_COLD |
-F:IM_FIRE | IM_POIS | AURA_FIRE | DEMON | EVIL | RES_PLAS |
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | ZANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:BO_FIRE | BA_FIRE
-D:It looks like an inverted mushroom, with two flexible arms. 
-
 N:426:Roper
 G:#:D
 I:115:30d10:30:60:255
@@ -6543,33 +8694,35 @@ B:CRUSH:PARALYZE:3d5
 B:CRUSH:PARALYZE:3d5
 B:CRUSH:PARALYZE:3d5
 B:CRUSH:PARALYZE:3d5
-F:FORCE_MAXHP | FORCE_SLEEP | NO_FEAR | NEVER_MOVE |
-F:ONLY_GOLD | DROP_2D2 | DROP_60 | DROP_1D2 | EVIL | 
-F:IM_ACID | IM_POIS | NO_CONF | NO_SLEEP | IM_COLD | IM_FIRE | BASEANGBAND
+F:DROP_1D2
+F:DROP_2D2
+F:DROP_60
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
 F:NO_CUT
-S:1_IN_5 | 
-S:BA_FIRE | BA_ELEC | BA_POIS | HASTE | 
-S:TRAPS | SHRIEK | HOLD | CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_GOLD
+S:1_IN_5
+S:BA_ELEC
+S:BA_FIRE
+S:BA_POIS
+S:CONF
+S:HASTE
+S:HOLD
+S:SHRIEK
 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 
 D:mouth. 
 
-N:427:Headless
-G:H:u
-I:110:25d12:20:50:40
-W:27:1:1600:175
-E:1:1:1:2:0:1
-O:0:100:0:0
-B:HIT:HURT:1d8
-B:HIT:HURT:1d8
-F:FRIENDS | DROP_60 | OPEN_DOOR | BASH_DOOR | WILD_TOO |
-F:WILD_MOUNTAIN | WILD_WASTE | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | ZANGBAND
-S:1_IN_6
-S:SCARE
-D:Headless humanoid abominations created by a magical mutation. 
-
 N:428:Vibration hound
 G:Z:y
 I:110:25d10:30:30:0
@@ -6580,12 +8733,16 @@ B:BITE:HURT:2d8
 B:BITE:HURT:2d8
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
-F:FORCE_SLEEP | 
-F:FRIENDS | 
-F:BASH_DOOR | 
-F:ANIMAL | NO_CONF | NO_SLEEP | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND
-S:1_IN_5 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+S:1_IN_5
 S:BR_SOUN
 D:A blurry canine form which seems to be moving as fast as the eye can 
 D:follow. You can feel the earth resonating beneath your feet. 
@@ -6600,11 +8757,17 @@ B:BITE:HURT:2d8
 B:BITE:HURT:2d8
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
-F:FORCE_SLEEP | RES_NEXU | DROP_SKELETON | DROP_CORPSE | 
-F:FRIENDS | 
-F:BASH_DOOR | 
-F:ANIMAL | RES_TELE | NO_SLEEP | MORTAL | BASEANGBAND
-S:1_IN_5 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:MORTAL
+F:NO_SLEEP
+F:RES_NEXU
+F:RES_TELE
+S:1_IN_5
 S:BR_NEXU
 D:A locus of conflicting points coalesce to form the vague shape of a huge 
 D:hound. Or is it just your imagination? 
@@ -6617,10 +8780,16 @@ E:1:1:1:2:1:1
 O:20:70:0:10
 B:HIT:HURT:4d8
 B:HIT:HURT:4d8
-F:FRIENDS | DROP_60 | DROP_CORPSE | SMART | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | GIANT | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FRIENDS
+F:GIANT
+F:HAS_LITE
+F:MORTAL
+F:OPEN_DOOR
+F:SMART
 D:A giant, brutish figure, as ugly as an orc, but with some of the 
 D:intelligence of his half-human ancestry.
 
@@ -6633,12 +8802,25 @@ O:5:85:0:5
 B:HIT:HURT:6d7
 B:HIT:HURT:6d7
 B:HIT:HURT:6d7
-F:UNIQUE | MALE | CAN_SPEAK | WILD_TOO | WILD_SWAMP | WILD_SHORE |
-F:FORCE_MAXHP | ESCORT | 
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | CAN_SWIM |
-F:EVIL | GIANT | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:CAN_SWIM
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:GIANT
+F:HAS_LITE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNIQUE
+F:WILD_SHORE
+F:WILD_TOO
 D:An ogre renowned for acts of surprising cruelty, Lokkak is the leader of a large 
 D:band of violent ogres.
 
@@ -6652,13 +8834,31 @@ B:HIT:HURT:1d6
 B:HIT:HURT:1d6
 B:BITE:EXP_20:2d6
 B:BITE:EXP_20:2d6
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:COLD_BLOOD | DROP_60 | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | REGENERATE | CAN_FLY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP | 
-F:BASEANGBAND | NO_CUT
-S:1_IN_9 | 
-S:TELE_TO | HOLD | SCARE | CAUSE_2 | MIND_BLAST | FORGET | DARKNESS
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_60
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:REGENERATE
+F:UNDEAD
+S:1_IN_9
+S:CAUSE_2
+S:DARKNESS
+S:FORGET
+S:HOLD
+S:MIND_BLAST
+S:SCARE
+S:TELE_TO
 D:It is a humanoid with an aura of power. You notice a sharp set of front 
 D:teeth. 
 
@@ -6671,30 +8871,18 @@ O:0:0:0:0
 B:BUTT:HURT:2d10
 B:BITE:FIRE:2d10
 B:GAZE:PARALYZE:2d6
-F:FORCE_SLEEP | SUSCEP_COLD |
-F:BASH_DOOR | CAN_FLY | DROP_CORPSE | 
-F:IM_FIRE | BASEANGBAND
-S:1_IN_8 | 
-S:BR_FIRE 
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:IM_FIRE
+F:SUSCEP_COLD
+S:1_IN_8
+S:BR_FIRE
 D:The result of evil experiments, this travesty of nature should never be 
 D:alive.  It has three heads - goat, dragon and gorgon - all attached to a 
 D:lion's body. 
 
-N:434:Shantak
-G:H:D
-I:120:25d20:12:55:10
-W:27:2:6000:280
-E:0:1:1:0:1:0
-O:0:0:0:0
-B:BITE:HURT:1d6
-B:BITE:HURT:1d6
-B:BITE:HURT:1d6
-F:ANIMAL | IM_ACID | EVIL | ELDRITCH_HORROR | CAN_FLY | DROP_CORPSE | 
-F:MORTAL | ZANGBAND
-S:1_IN_6
-S:SCARE | HASTE
-D:A scaly bird larger than an elephant, with a horse-like head.
-
 N:435:Colbran
 G:g:y
 I:120:80d12:12:80:10
@@ -6703,11 +8891,21 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:ELEC:3d8
 B:HIT:ELEC:3d8
-F:FORCE_SLEEP | 
-F:EMPTY_MIND | COLD_BLOOD | BASH_DOOR | CAN_FLY |
-F:IM_ELEC | IM_POIS | AURA_ELEC | REFLECTING |
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | BASEANGBAND | NO_CUT
-S:1_IN_3 | 
+F:AURA_ELEC
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:IM_ELEC
+F:IM_POIS
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:REFLECTING
+S:1_IN_3
 S:BO_ELEC
 D:A man-shaped form of living lightning, sparks and shocks crackle all over 
 D:this madly capering figure, as it leaps and whirls around and about you. 
@@ -6722,49 +8920,28 @@ B:CRUSH:HURT:2d8
 B:CRUSH:HURT:2d8
 B:BITE:HURT:1d8
 B:BITE:HURT:1d8
-F:FEMALE | 
-F:FORCE_SLEEP | CAN_FLY |
-F:ONLY_ITEM | DROP_90 | DROP_2D2 | DROP_CORPSE | 
-F:INVISIBLE | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_4 | 
-S:HEAL | BLIND | MIND_BLAST | DARKNESS
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_2D2
+F:DROP_90
+F:DROP_CORPSE
+F:EVIL
+F:FEMALE
+F:FORCE_SLEEP
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+S:1_IN_4
+S:BLIND
+S:DARKNESS
+S:HEAL
+S:MIND_BLAST
 D:A wraithly snake-like form with the torso of a beautiful woman, it is the 
 D:most powerful of its kind. 
 
-N:437:Corpser
-G:,:D
-I:112:30d15:20:75:120
-W:28:2:0:65
-E:0:0:0:0:0:0
-O:0:0:0:0
-B:CRUSH:HURT:2d8
-B:CRUSH:HURT:2d8
-B:CRUSH:HURT:2d8
-B:CRUSH:HURT:2d8
-F:WILD_TOO | WILD_GRASS |
-F:INVISIBLE | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | NO_CONF | NO_SLEEP | 
-F:MORTAL | ZANGBAND
-D:A creature who lives underground and eats surface dwellers that it catches 
-D:with its poisonous tentacle, which is the only part of the creature that 
-D:is ever seen. Perhaps it is better not to see the part which remains 
-D:underground... 
-
-N:438:Fiend of Slaanesh
-G:S:R
-I:120:15d20:12:50:40
-W:28:4:0:225
-E:0:1:0:2:1:0
-O:0:0:0:0
-B:STING:POISON:8d1
-B:STING:LOSE_STR:8d1
-B:WAIL:TERRIFY:1d4
-F:BASH_DOOR | 
-F:EVIL | DEMON | ZANGBAND
-D:Slaanesh's pet, a large scorpion-like creature with a human face and 
-D:reptile skin. 
-
 N:439:Stairway to Hell
 G:>:W
 I:120:15d8:90:40:20
@@ -6775,11 +8952,27 @@ B:WAIL:UN_BONUS
 B:WAIL:EXP_20
 B:WAIL:EAT_GOLD
 B:WAIL:EAT_ITEM
-F:CHAR_MULTI | COLD_BLOOD | EVIL | NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING |
-F:UNDEAD | FORCE_MAXHP | IM_FIRE | IM_ELEC | IM_POIS | IM_ACID | EMPTY_MIND
-F:NEVER_MOVE | JOKEANGBAND | HAS_LITE | NO_CUT
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_ACID
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:JOKEANGBAND
+F:NEVER_MOVE
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:UNDEAD
 S:1_IN_15
-S:S_DEMON | SHRIEK
+S:SHRIEK
+S:S_DEMON
 D:Often found in graveyards. 
 
 N:440:5-headed hydra
@@ -6792,13 +8985,23 @@ B:BITE:POISON:4d4
 B:BITE:POISON:4d4
 B:BITE:POISON:4d4
 B:BITE:POISON:4d4
-F:FORCE_SLEEP | 
-F:ONLY_GOLD | DROP_1D2 | DROP_4D2 | DROP_SKELETON | DROP_CORPSE
-F:BASH_DOOR | MOVE_BODY | CAN_SWIM |
-F:ANIMAL | IM_POIS | WILD_TOO | WILD_SHORE | WILD_SWAMP |
-F:MORTAL | BASEANGBAND
-S:1_IN_5 | 
-S:SCARE | BA_POIS
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:IM_POIS
+F:MORTAL
+F:MOVE_BODY
+F:ONLY_GOLD
+F:WILD_SHORE
+F:WILD_TOO
+S:1_IN_5
+S:BA_POIS
+S:SCARE
 D:A strange reptilian creature with five heads dripping venom. 
 
 N:441:Barney the Dinosaur
@@ -6811,13 +9014,37 @@ B:SHOW:LOSE_INT
 B:SHOW:LOSE_WIS
 B:CHARGE:EAT_GOLD
 B:CHARGE:EAT_GOLD
-F:DROP_1D2 | DROP_90 | DROP_GOOD | DROP_GREAT | ONLY_ITEM |
-F:EVIL | MALE | CAN_SPEAK | SMART | RES_TELE | CAN_SWIM | DROP_CORPSE
-F:ANIMAL | IM_POIS | FORCE_MAXHP | UNIQUE | FORCE_SLEEP
-F:MORTAL | JOKEANGBAND
+F:ANIMAL
+F:CAN_SPEAK
+F:CAN_SWIM
+F:DROP_1D2
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_POIS
+F:JOKEANGBAND
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:RES_TELE
+F:SMART
+F:UNIQUE
 S:1_IN_3
-S:SHRIEK | CONF | S_HYDRA | SLOW | BLIND | DRAIN_MANA
-S:BA_POIS | BR_CHAO | FORGET | DARKNESS | BR_NUKE
+S:BA_POIS
+S:BLIND
+S:BR_CHAO
+S:BR_NUKE
+S:CONF
+S:DARKNESS
+S:DRAIN_MANA
+S:FORGET
+S:SHRIEK
+S:SLOW
+S:S_HYDRA
 D:The lovable purple reptile is making a guest appearance here. 
 
 N:442:Black knight
@@ -6829,12 +9056,21 @@ O:0:90:10:0
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
-F:MALE | 
-F:FORCE_SLEEP | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_8 | 
-S:BLIND | SCARE | CAUSE_3 | DARKNESS
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+S:1_IN_8
+S:BLIND
+S:CAUSE_3
+S:DARKNESS
+S:SCARE
 D:He is a figure encased in deep black plate armour; he looks at you 
 D:menacingly. 
 
@@ -6847,11 +9083,22 @@ O:0:0:0:0
 B:BITE:PARALYZE:4d5
 B:BITE:LOSE_DEX:4d5
 B:BITE:LOSE_CON:4d5
-F:FORCE_SLEEP | AQUATIC | GOOD | ANIMAL |
-F:IM_COLD | IM_POIS | IM_FIRE | IM_ELEC | WILD_TOO | WILD_OCEAN 
-F:MORTAL | BASEANGBAND
-S:1_IN_5 | 
-S:BO_WATE | BO_COLD | BO_ICEE | BO_MANA
+F:ANIMAL
+F:AQUATIC
+F:FORCE_SLEEP
+F:GOOD
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:WILD_OCEAN
+F:WILD_TOO
+S:1_IN_5
+S:BO_COLD
+S:BO_ICEE
+S:BO_MANA
+S:BO_WATE
 D:Your mind is filled with admiration as you view this wondrous, 
 D:magical seahorse. 
 
@@ -6863,12 +9110,25 @@ E:1:1:1:2:1:1
 O:0:100:0:0
 B:HIT:HURT:9d9
 B:HIT:HURT:9d9
-F:FORCE_SLEEP | 
-F:DROP_1D2 | TAKE_ITEM | WILD_TOO | WILD_SHORE | WILD_MOUNTAIN |
-F:BASH_DOOR | OPEN_DOOR | MOVE_BODY | DROP_CORPSE | 
-F:EVIL | IM_POIS | IM_ACID | IM_FIRE | IM_COLD | GIANT | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_8 | 
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_SLEEP
+F:GIANT
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:MOVE_BODY
+F:OPEN_DOOR
+F:TAKE_ITEM
+F:WILD_MOUNTAIN
+F:WILD_SHORE
+F:WILD_TOO
+S:1_IN_8
 S:ARROW_4
 D:A gigantic humanoid with but one eye.  
 
@@ -6880,12 +9140,24 @@ E:1:1:1:2:1:1
 O:0:0:90:10
 B:HIT:CONFUSE:5d5
 B:HIT:TERRIFY:5d5
-F:MALE | 
-F:FORCE_SLEEP | DROP_1D2 | DROP_SKELETON | DROP_CORPSE
-F:OPEN_DOOR | BASH_DOOR | SMART |
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_8 | 
-S:BLIND | MIND_BLAST | HOLD | CAUSE_3 | FORGET | S_MONSTER
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:SMART
+S:1_IN_8
+S:BLIND
+S:CAUSE_3
+S:FORGET
+S:HOLD
+S:MIND_BLAST
+S:S_MONSTER
 D:He is using his supernatural talents to bring about your 
 D:destruction. 
 
@@ -6898,9 +9170,13 @@ O:0:0:0:0
 B:HIT:HURT:1d8
 B:BITE:ACID:2d8
 B:STING:POISON:1d8
-F:BASH_DOOR | DROP_CORPSE | 
-F:ANIMAL | IM_ACID | IM_POIS | CAN_SWIM | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_CORPSE
+F:IM_ACID
+F:IM_POIS
+F:MORTAL
 D:It is a massive worm form, many feet in length. Its vast maw drips acid 
 D:and poison. 
 
@@ -6914,10 +9190,15 @@ B:GAZE:TERRIFY:2d4
 B:GAZE:BLIND:2d4
 B:BUTT:HURT:2d6
 B:BITE:HURT:2d12
-F:ONLY_GOLD | DROP_2D2 | DROP_CORPSE
-F:BASH_DOOR | CAN_SWIM | WILD_TOO |  WILD_SWAMP |
-F:ANIMAL | IM_POIS
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_2D2
+F:DROP_CORPSE
+F:IM_POIS
+F:MORTAL
+F:ONLY_GOLD
+F:WILD_TOO
 D:A strange ox-like form with a huge head but a thin, weak neck, it looks 
 D:like the creation of some deranged alchemist. 
 
@@ -6930,9 +9211,23 @@ O:0:0:0:0
 B:HIT:HURT:2d6
 B:HIT:HURT:2d6
 B:HIT:HURT:2d6
-F:FORCE_SLEEP | COLD_BLOOD | EMPTY_MIND | KILL_WALL | RAND_50 | 
-F:BASH_DOOR | IM_COLD | IM_ACID | IM_FIRE | IM_ELEC | IM_POIS | NONLIVING | 
-F:HURT_ROCK | NO_CONF | NO_SLEEP | CHAR_MULTI | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HURT_ROCK
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_WALL
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:RAND_50
 S:MULTIPLY
 D:A sentient, moving section of wall. 
 
@@ -6944,15 +9239,28 @@ E:1:1:1:2:1:1
 O:10:0:90:0
 B:HIT:HURT:2d5
 B:HIT:HURT:2d5
-F:MALE | 
-F:FORCE_SLEEP | 
-F:ONLY_ITEM | DROP_1D2 | DROP_SKELETON | DROP_CORPSE | 
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:HASTE | TPORT | TELE_TO | BLIND | CONF | 
-S:BO_FIRE | BO_COLD | BO_ELEC | 
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+S:1_IN_3
+S:BLIND
+S:BO_COLD
+S:BO_ELEC
+S:BO_FIRE
+S:CONF
+S:HASTE
 S:S_MONSTER
+S:TELE_TO
+S:TPORT
 D:A fat mage with glasses.  And considerable power, too - as you can 
 D:tell from the size of his hat. 
 
@@ -6964,13 +9272,25 @@ E:1:1:1:2:1:1
 O:0:10:90:0
 B:CRUSH:LOSE_INT:2d6
 B:GAZE:INSANITY:2d6
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE
-F:ONLY_ITEM | DROP_60 | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | NO_CONF | NO_SLEEP
-F:MORTAL | BASEANGBAND
-S:1_IN_8 | 
-S:BLIND | HOLD | SCARE | MIND_BLAST | BRAIN_SMASH | FORGET
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+S:1_IN_8
+S:BLIND
+S:BRAIN_SMASH
+S:FORGET
+S:HOLD
+S:MIND_BLAST
+S:SCARE
 D:A humanoid form with a gruesome head, tentacular mouth, and piercing 
 D:eyes. Claws reach out for you and you feel a presence invade your mind. 
 
@@ -6984,34 +9304,29 @@ B:CRUSH:HURT:2d10
 B:CRUSH:HURT:2d10
 B:CRUSH:HURT:2d10
 B:CRUSH:HURT:2d10
-F:FORCE_SLEEP | FORCE_MAXHP | KILL_BODY | KILL_ITEM | UNIQUE | REFLECTING |
-F:EMPTY_MIND | COLD_BLOOD | BASH_DOOR | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS
-F:NO_FEAR | NO_CONF | NO_SLEEP | NONLIVING | RES_TELE | JOKEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:JOKEANGBAND
+F:KILL_BODY
+F:KILL_ITEM
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:REFLECTING
+F:RES_TELE
+F:UNIQUE
 D:It looks like a huge spiked roller. It was designed to keep this dungeon 
 D:clean, and you are the biggest spot of dirt in sight. 
 
-N:452:Deep one
-G:u:g
-I:120:35d12:20:50:20
-W:28:5:4000:150
-E:1:1:1:2:1:1
-O:20:80:0:0
-B:CLAW:POISON:2d4
-B:CLAW:POISON:2d4
-B:BITE:HURT:4d4
-F:FRIENDS | WILD_TOO | WILD_SHORE | DROP_CORPSE | 
-F:RAND_25 | 
-F:DROP_60 | DROP_90 |
-F:CAN_SWIM | BASH_DOOR | ELDRITCH_HORROR | RES_TELE |
-F:EVIL | DEMON | IM_FIRE | IM_COLD | IM_POIS | RES_WATE | CTHANGBAND
-D:"I thought their predominant color was a greyish-green, 
-D:though they had white bellies. They were mostly shiny and 
-D:slippery, but the ridges of their backs were scaly. Their 
-D:forms vaguely suggested the anthropoid, while their heads were 
-D:the heads of fish, with prodigious bulging eyes that never 
-D:closed. At the sides of their necks were palpitating gills and 
-D:their long paws were webbed." 
-
 N:453:Basilisk
 G:R:s
 I:120:20d30:15:90:30
@@ -7022,11 +9337,21 @@ B:GAZE:PARALYZE
 B:BITE:HURT:2d12
 B:BITE:HURT:2d12
 B:BITE:HURT:2d12
-F:ONLY_ITEM | DROP_1D2 | WILD_TOO | WILD_MOUNTAIN |
-F:OPEN_DOOR | BASH_DOOR | EVIL | IM_POIS | DROP_CORPSE | 
-F:ANIMAL | NO_CONF | NO_SLEEP | CAN_SWIM | 
-F:MORTAL | BASEANGBAND
-S:1_IN_8 | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_1D2
+F:DROP_CORPSE
+F:EVIL
+F:IM_POIS
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:WILD_MOUNTAIN
+F:WILD_TOO
+S:1_IN_8
 S:BR_POIS
 D:An evil reptile that preys on unsuspecting travellers.  Its eyes stare 
 D:deeply at you and your soul starts to wilt! 
@@ -7041,30 +9366,23 @@ B:HIT:HURT:1d5
 B:HIT:HURT:1d5
 B:BITE:COLD:2d6
 B:BITE:COLD:2d6
-F:MALE | 
-F:FRIENDS | DROP_60 | WILD_TOO | WILD_WASTE | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | SUSCEP_FIRE | REGENERATE | 
-F:EVIL | TROLL | IM_COLD | HURT_LITE | BASEANGBAND
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HURT_LITE
+F:IM_COLD
+F:MALE
+F:OPEN_DOOR
+F:REGENERATE
+F:SUSCEP_FIRE
+F:TROLL
+F:WILD_TOO
+F:WILD_WASTE
 D:He is a white troll with powerful clawed hands. 
 
-N:455:Dhole
-G:w:s
-I:110:65d8:14:64:25
-W:29:4:1000:555
-E:0:0:0:0:1:0
-O:0:0:0:0
-B:SPIT:ACID:1d8
-B:ENGULF:ACID:2d8
-B:CRUSH:HURT:4d8
-F:ANIMAL | EVIL | KILL_WALL | IM_ACID | ELDRITCH_HORROR |
-F:CAN_SWIM | FORCE_MAXHP | DROP_CORPSE | 
-F:MORTAL | CTHANGBAND
-S:1_IN_6
-S:BR_ACID
-D:A gigantic worm dripping with acid. "...even as he looked, one 
-D:reared up several hundred feet and leveled a bleached, viscous end 
-D:at him." 
-
 N:456:Archangel
 G:A:B
 I:110:60d10:30:68:255
@@ -7075,13 +9393,31 @@ B:HIT:HURT:3d5
 B:HIT:HURT:3d5
 B:HIT:HURT:3d5
 B:HIT:HURT:3d5
-F:FORCE_MAXHP | FORCE_SLEEP | NO_FEAR | GOOD |
-F:ONLY_ITEM | DROP_2D2 | CAN_FLY |
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR | POWERFUL | 
-F:IM_FIRE | IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | RES_TELE | 
-F:BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:HEAL | HASTE | BLIND | CONF | SCARE
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_2D2
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:RES_TELE
+F:SMART
+F:TAKE_ITEM
+S:1_IN_3
+S:BLIND
+S:CONF
+S:HASTE
+S:HEAL
+S:SCARE
 D:A lesser angel protected by an aura of holiness. Its muscular form looks 
 D:extremely powerful next to your own frail body. 
 
@@ -7095,34 +9431,30 @@ B:HIT:POISON:3d4
 B:HIT:POISON:3d4
 B:HIT:POISON:3d4
 B:HIT:POISON:3d4
-F:MIMIC | 
-F:FORCE_SLEEP | NEVER_MOVE | SUSCEP_ACID |
-F:EMPTY_MIND | COLD_BLOOD | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_4 | 
-S:BLIND | CONF | SCARE | CAUSE_2 | FORGET | 
-S:BO_ACID | BO_FIRE | BO_COLD | BO_ELEC | 
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:MIMIC
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:SUSCEP_ACID
+S:1_IN_4
+S:BLIND
+S:BO_ACID
+S:BO_COLD
+S:BO_ELEC
+S:BO_FIRE
+S:CAUSE_2
+S:CONF
+S:FORGET
+S:SCARE
 S:S_MONSTER
 D:A strange creature that disguises itself as an object to lure 
 D:unsuspecting adventurers within reach of its venomous claws. 
 
-N:458:Chaos tile
-G:.:v
-I:120:3d5:30:60:100
-W:29:6:100:200
-E:0:0:0:0:0:0
-O:0:0:0:0
-B:HIT:POISON:3d4
-B:HIT:CONFUSE:3d4
-F:CHAR_MULTI | ATTR_MULTI | ATTR_ANY |
-F:FORCE_SLEEP | NEVER_MOVE | 
-F:EMPTY_MIND | COLD_BLOOD | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | ZANGBAND | NO_CUT
-S:MULTIPLY | 
-S:1_IN_4 | 
-S:BLIND | CONF | SCARE | CAUSE_2 | BLINK | S_MONSTER
-D:It is a floor tile corrupted by chaos. 
-
 N:459:Young blue dragon
 G:d:b
 I:110:27d10:20:50:70
@@ -7132,13 +9464,24 @@ O:50:50:0:0
 B:CLAW:HURT:2d4
 B:CLAW:HURT:2d4
 B:BITE:HURT:2d6
-F:FORCE_SLEEP | FORCE_MAXHP | WILD_TOO | WILD_MOUNTAIN | WILD_WOOD |
-F:DROP_2D2 | DROP_CORPSE | ATTR_MULTI
-F:OPEN_DOOR | BASH_DOOR | CAN_FLY |
-F:EVIL | DRAGON | IM_ELEC | BASEANGBAND | ATTR_MULTI
-S:1_IN_10 | 
-S:SCARE | 
+F:ATTR_MULTI
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ELEC
+F:OPEN_DOOR
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
+S:1_IN_10
 S:BR_ELEC
+S:SCARE
 D:It has a form out of legend. Its still-tender scales are a 
 D:deep blue in hue. Sparks crackle along its length. 
 
@@ -7151,13 +9494,25 @@ O:50:50:0:0
 B:CLAW:HURT:2d4
 B:CLAW:HURT:2d4
 B:BITE:HURT:2d6
-F:FORCE_SLEEP | FORCE_MAXHP | WILD_TOO | WILD_MOUNTAIN | WILD_WASTE |
-F:DROP_2D2 | DROP_CORPSE | ATTR_MULTI
-F:OPEN_DOOR | BASH_DOOR | CAN_FLY | SUSCEP_FIRE |
-F:EVIL | DRAGON | IM_COLD | BASEANGBAND | ATTR_MULTI
-S:1_IN_10 | 
-S:SCARE | 
+F:ATTR_MULTI
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:OPEN_DOOR
+F:SUSCEP_FIRE
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WASTE
+S:1_IN_10
 S:BR_COLD
+S:SCARE
 D:It has a form out of legend. Its still-tender scales are a 
 D:frosty white in hue. Icy blasts of cold air come from it as it breathes. 
 
@@ -7170,13 +9525,22 @@ O:50:50:0:0
 B:CLAW:HURT:2d4
 B:CLAW:HURT:2d4
 B:BITE:HURT:2d6
-F:FORCE_SLEEP | FORCE_MAXHP | WILD_TOO | WILD_MOUNTAIN | WILD_SWAMP |
-F:DROP_2D2 | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | CAN_FLY |
-F:EVIL | DRAGON | IM_POIS | BASEANGBAND | ATTR_MULTI
-S:1_IN_10 | 
-S:SCARE | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_POIS
+F:OPEN_DOOR
+F:WILD_MOUNTAIN
+F:WILD_TOO
+S:1_IN_10
 S:BR_POIS
+S:SCARE
 D:It has a form out of legend. Its still-tender scales are a 
 D:deep green in hue. Foul gas seeps through its scales. 
 
@@ -7189,32 +9553,25 @@ O:50:50:0:0
 B:CLAW:HURT:2d4
 B:CLAW:HURT:2d4
 B:BITE:HURT:2d6
-F:FORCE_SLEEP | FORCE_MAXHP | WILD_TOO | WILD_MOUNTAIN | 
-F:DROP_2D2 | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | CAN_FLY |
-F:EVIL | DRAGON | NO_CONF | BASEANGBAND | ATTR_MULTI
-S:1_IN_10 | 
-S:SCARE | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:NO_CONF
+F:OPEN_DOOR
+F:WILD_MOUNTAIN
+F:WILD_TOO
+S:1_IN_10
 S:BR_CONF
+S:SCARE
 D:It has a form out of legend. Its still-tender scales are a 
 D:rich bronze hue, and its shape masks its true form. 
 
-N:463:Aklash
-G:T:R
-I:110:30d8:14:64:25
-W:29:4:4000:300
-E:1:1:1:2:1:1
-O:0:0:0:0
-B:CLAW:HURT:1d6
-B:CLAW:HURT:1d6
-B:BITE:POISON:1d20
-B:CRUSH:HURT:2d9
-F:TROLL | EVIL | FRIENDS | OPEN_DOOR | BASH_DOOR | DROP_CORPSE | 
-F:IM_POIS | IM_ACID | REGENERATE | ZANGBAND | REGENERATE | 
-S:1_IN_9 | BR_POIS
-D:Pale, bald, fat, hairless troll creatures. Ugly beyond description. 
-D:Not to mention how bad their breath smells... 
-
 N:464:Mithril golem
 G:g:B
 I:110:80d15:12:100:10
@@ -7225,10 +9582,21 @@ B:HIT:HURT:3d8
 B:HIT:HURT:3d8
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
-F:ONLY_GOLD | DROP_2D2 | 
-F:EMPTY_MIND | COLD_BLOOD | BASH_DOOR | REFLECTING | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_2D2
+F:EMPTY_MIND
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_GOLD
+F:REFLECTING
 D:It is a massive statue of purest mithril. It looks expensive! 
 
 N:465:Skeleton troll
@@ -7240,28 +9608,21 @@ O:0:0:0:0
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
 B:BITE:HURT:3d4
-F:EMPTY_MIND | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | TROLL | UNDEAD | 
-F:IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:TROLL
+F:UNDEAD
 D:It is a troll skeleton animated by dark dweomers. 
 
-N:466:Skeletal tyrannosaur 
-G:R:w
-I:120:50d10:20:55:20
-W:30:2:6000:225
-E:0:1:0:2:1:0
-O:0:0:0:0
-B:CLAW:HURT:1d8
-B:CLAW:HURT:1d8
-B:BITE:LOSE_CON:4d6
-B:GAZE:TERRIFY
-F:EMPTY_MIND | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ANIMAL | UNDEAD | 
-F:IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | ZANGBAND | NO_CUT
-D:It is the skeleton of a tyrannosaur, animated by dark dweomers. 
-
 N:467:Beorn, the Shape-Changer
 G:q:D
 I:120:20d70:25:60:25
@@ -7272,11 +9633,24 @@ B:CLAW:HURT:2d10
 B:CLAW:HURT:2d10
 B:BITE:HURT:4d8
 B:CRUSH:HURT:3d6
-F:UNIQUE | MALE | FORCE_MAXHP | FORCE_SLEEP | 
-F:BASH_DOOR | ANIMAL | MOVE_BODY | SMART | PET
-F:WILD_TOO | WILD_WOOD | WILD_MOUNTAIN | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | BASEANGBAND
-S:1_IN_6 | S_ANIMAL
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:MALE
+F:MOVE_BODY
+F:ONLY_ITEM
+F:PET
+F:SMART
+F:UNIQUE
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
+S:1_IN_6
+S:S_ANIMAL
 D:Beorn is only occasionally seen in human form these days, preferring to 
 D:appear in the shape of a giant black bear:  he also prefers the company of 
 D:beasts to that of humans.  He has never taken kindly to strangers, even in 
@@ -7291,9 +9665,17 @@ O:0:0:0:0
 B:CLAW:HURT:16d2
 B:CLAW:HURT:16d2
 B:BITE:HURT:4d10
-F:CAN_FLY | UNIQUE | FORCE_MAXHP | DROP_CORPSE | CAN_SPEAK |
-F:WILD_ONLY | WILD_MOUNTAIN | WILD_VOLCANO | PET | 
-F:ANIMAL | GOOD | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:CAN_SPEAK
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:GOOD
+F:PET
+F:UNIQUE
+F:WILD_MOUNTAIN
+F:WILD_ONLY
+F:WILD_VOLCANO
 D:Among the mightiest of birds, Thorondor is the messenger of the Valar, and 
 D:brings news of Middle-earth to Valinor itself.  Nothing that can be seen 
 D:from the airs of the world is hidden from him. 
@@ -7305,10 +9687,14 @@ W:30:2:600:80
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:ELEC:5d5
-F:RAND_25 | WILD_TOO | DROP_SKELETON
-F:WEIRD_MIND | BASH_DOOR | 
-F:ANIMAL | IM_ELEC
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:IM_ELEC
+F:MORTAL
+F:RAND_25
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is a giant ant that crackles with energy. 
 
 N:470:Grave wight
@@ -7320,13 +9706,26 @@ O:0:50:50:0
 B:HIT:HURT:1d7
 B:HIT:HURT:1d7
 B:TOUCH:EXP_20
-F:FORCE_SLEEP | RAND_25 |
-F:ONLY_ITEM | DROP_1D2 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | CAN_FLY |
-F:IM_COLD | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_8 | 
-S:SCARE | CAUSE_3 | DARKNESS
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_1D2
+F:EVIL
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RAND_25
+F:UNDEAD
+S:1_IN_8
+S:CAUSE_3
+S:DARKNESS
+S:SCARE
 D:It is a ghostly form with eyes that haunt you. 
 
 N:471:Shadow drake
@@ -7338,12 +9737,27 @@ O:50:50:0:0
 B:CLAW:HURT:2d4
 B:CLAW:HURT:2d4
 B:BITE:EXP_10:3d6
-F:FORCE_SLEEP | FORCE_MAXHP | PASS_WALL | 
-F:ONLY_ITEM | DROP_3D2 | CAN_FLY | DROP_CORPSE | 
-F:INVISIBLE | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DRAGON | NO_CONF | NO_SLEEP | BASEANGBAND | ATTR_MULTI
-S:1_IN_6 | 
-S:BR_NETH | SLOW | CONF | SCARE | DARKNESS
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:INVISIBLE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:PASS_WALL
+S:1_IN_6
+S:BR_NETH
+S:CONF
+S:DARKNESS
+S:SCARE
+S:SLOW
 D:It is a dragon-like form wrapped in shadow.  Glowing red eyes shine in 
 D:the dark, and it is surrounded by an aura of unearthly cold that chills 
 D:the soul rather than the body. 
@@ -7358,10 +9772,16 @@ B:HIT:HURT:3d4
 B:HIT:HURT:3d4
 B:HIT:HURT:3d4
 B:HIT:HURT:3d4
-F:FORCE_SLEEP | FORCE_MAXHP |
-F:BASH_DOOR | CAN_FLY | WILD_TOO | WILD_WOOD | DROP_CORPSE | 
-F:EVIL | MORTAL | BASEANGBAND
-S:1_IN_5 | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:MORTAL
+F:WILD_TOO
+F:WILD_WOOD
+S:1_IN_5
 S:ARROW_4
 D:It is a winged lion's body with a human torso and a tail covered in 
 D:vicious spikes. 
@@ -7373,10 +9793,14 @@ W:30:3:600:90
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:2d12
-F:RAND_25 | KILL_BODY | FRIENDS | DROP_SKELETON
-F:WEIRD_MIND | BASH_DOOR | 
 F:ANIMAL
-F:MORTAL | BASEANGBAND
+F:BASH_DOOR
+F:DROP_SKELETON
+F:FRIENDS
+F:KILL_BODY
+F:MORTAL
+F:RAND_25
+F:WEIRD_MIND
 D:An armoured form moving with purpose. Powerful on its own, flee when 
 D:hordes of them march. 
 
@@ -7388,8 +9812,14 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:5d8
 B:BITE:HURT:5d8
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | WILD_GRASS | DROP_CORPSE
-F:ANIMAL | CAN_FLY | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:MORTAL
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_TOO
 D:It is a beetle with deadly sharp cutting mandibles and a rock-hard 
 D:carapace. 
 
@@ -7403,33 +9833,21 @@ B:BUTT:HURT:3d9
 B:BUTT:HURT:3d9
 B:BITE:POISON:1d10
 B:KICK:HURT:2d4
-F:FORCE_SLEEP | ANIMAL | MOVE_BODY | WILD_TOO | WILD_WOOD |
-F:BASH_DOOR | IM_POIS | IM_ACID | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND
-S:1_IN_8 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_POIS
+F:MORTAL
+F:MOVE_BODY
+F:WILD_TOO
+F:WILD_WOOD
+S:1_IN_8
 S:BR_POIS
 D:A bull-like creature whose skin is made of steel plates. Watch out for 
 D:its deadly breath! 
 
-N:476:Gug
-G:P:G
-I:110:22d11:14:60:30
-W:31:2:1500:210
-E:2:0:2:4:1:1
-O:0:50:50:0
-B:BITE:HURT:10d4
-B:CLAW:HURT:2d7
-B:CLAW:HURT:2d7
-B:CLAW:HURT:2d7
-F:FORCE_SLEEP | 
-F:DROP_1D2 | TAKE_ITEM |
-F:BASH_DOOR | OPEN_DOOR | DROP_CORPSE
-F:EVIL | IM_POIS | IM_ACID | GIANT | ZANGBAND
-D:A hideous, beastly, four-armed unclean giant: "...large as a 
-D:barrel... The eyes jutted two inches from each side, shaded by 
-D:bony protuberances overgrown of the mouth. That mouth had great 
-D:yellow fangs and ran from the top to the tally." 
-
 N:477:Ghost
 G:G:w
 I:120:13d8:20:30:10
@@ -7440,12 +9858,26 @@ B:WAIL:TERRIFY
 B:TOUCH:EXP_20
 B:CLAW:LOSE_INT:1d6
 B:CLAW:LOSE_WIS:1d6
-F:FORCE_SLEEP | RAND_25 | DROP_60 | DROP_1D2 | 
-F:INVISIBLE | COLD_BLOOD | TAKE_ITEM | PASS_WALL | 
-F:EVIL | UNDEAD | IM_COLD | CAN_FLY |
-F:IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_15 | 
-S:BLIND | HOLD | DRAIN_MANA
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_60
+F:EVIL
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
+F:RAND_25
+F:TAKE_ITEM
+F:UNDEAD
+S:1_IN_15
+S:BLIND
+S:DRAIN_MANA
+S:HOLD
 D:You don't believe in them. 
 
 N:478:Death watch beetle
@@ -7456,8 +9888,13 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:5d4
 B:WAIL:TERRIFY:5d6
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | DROP_CORPSE | 
-F:ANIMAL | CAN_FLY | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:MORTAL
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is a giant beetle that produces a chilling sound. 
 
 N:479:Mountain ogre
@@ -7468,10 +9905,15 @@ E:1:1:1:2:1:1
 O:20:70:0:10
 B:HIT:HURT:5d8
 B:HIT:HURT:5d8
-F:FRIENDS | DROP_60 | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | GIANT | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FRIENDS
+F:GIANT
+F:HAS_LITE
+F:MORTAL
+F:OPEN_DOOR
 D:The largest breed of ogre, he is awesomely strong and awesomely ugly. 
 
 N:480:Nexus quylthulg
@@ -7480,11 +9922,20 @@ I:110:10d12:10:1:0
 W:32:1:3000:300
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:FORCE_SLEEP | NEVER_MOVE | NEVER_BLOW | 
-F:INVISIBLE | EMPTY_MIND | RES_NEXU | ANIMAL | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | RES_TELE | BASEANGBAND
-S:1_IN_1 | 
-S:BLINK | TELE_AWAY
+F:ANIMAL
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:INVISIBLE
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:RES_NEXU
+F:RES_TELE
+S:1_IN_1
+S:BLINK
+S:TELE_AWAY
 D:It is a very unstable, strange pulsing mound of flesh. 
 
 N:481:Shelob, Spider of Darkness
@@ -7497,15 +9948,38 @@ B:CLAW:POISON:5d6
 B:CLAW:POISON:5d6
 B:BITE:PARALYZE:5d10
 B:STING:LOSE_STR:5d4
-F:UNIQUE | FEMALE |
-F:FORCE_SLEEP | FORCE_MAXHP | SPECIAL_GENE | 
-F:ESCORT | ESCORTS | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_GOOD | DROP_RANDART
-F:SMART | BASH_DOOR | IM_POIS | IM_ACID | 
-F:ANIMAL | SPIDER | EVIL | HURT_LITE | NO_SLEEP | BASEANGBAND
-S:1_IN_4 | 
-S:HEAL | BLIND | SLOW | CONF | SCARE | CAUSE_3 | CAUSE_4 | 
-S:TRAPS | BR_DARK | BR_POIS | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_RANDART
+F:ESCORT
+F:ESCORTS
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_ACID
+F:IM_POIS
+F:NO_SLEEP
+F:ONLY_ITEM
+F:SMART
+F:SPECIAL_GENE
+F:SPIDER
+F:UNIQUE
+S:1_IN_4
+S:BLIND
+S:BR_DARK
+S:BR_POIS
+S:CAUSE_3
+S:CAUSE_4
+S:CONF
+S:HEAL
+S:SCARE
+S:SLOW
 S:S_SPIDER
 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 
@@ -7521,10 +9995,20 @@ O:0:0:0:0
 B:CRUSH:HURT:8d4
 B:CRUSH:HURT:8d4
 B:CRUSH:HURT:8d4
-F:IM_ACID | RES_WATE | AQUATIC | ANIMAL | IM_COLD | MOVE_BODY
-F:FORCE_MAXHP | WILD_TOO | WILD_OCEAN | BASEANGBAND | COLD_BLOOD
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:FORCE_MAXHP
+F:IM_ACID
+F:IM_COLD
+F:MOVE_BODY
+F:RES_WATE
+F:WILD_OCEAN
+F:WILD_TOO
 S:1_IN_8
-S:BR_ELEC | BR_ACID | BR_POIS
+S:BR_ACID
+S:BR_ELEC
+S:BR_POIS
 D:Besides being capable of dragging whole ships underwater, 
 D:this creature can also harm you with ranged attacks. 
 
@@ -7538,12 +10022,29 @@ B:CLAW:LOSE_STR:3d4
 B:CLAW:DISEASE:3d4
 B:CLAW:DISEASE:3d4
 B:BITE:PARALYZE:3d5
-F:DROP_60 | OPEN_DOOR | BASH_DOOR | CAN_SWIM |
-F:DROP_1D2 | FORCE_MAXHP | ESCORT | FORCE_SLEEP |
-F:EVIL | UNDEAD | IM_POIS | IM_COLD | NO_CONF | NO_SLEEP | 
-F:COLD_BLOOD | HURT_LITE | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_60
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:UNDEAD
 S:1_IN_7
-S:SCARE | HOLD | DARKNESS | SCARE | S_UNDEAD | ANIM_DEAD
+S:DARKNESS
+S:HOLD
+S:SCARE
+S:SCARE
+S:S_UNDEAD
 D:Flesh is falling off in chunks from this decaying abomination. 
 
 N:484:Doombat
@@ -7555,9 +10056,15 @@ O:0:0:0:0
 B:BITE:FIRE:5d4
 B:BITE:FIRE:5d4
 B:BITE:FIRE:5d4
-F:WEIRD_MIND | BASH_DOOR | AURA_FIRE | CAN_FLY | DROP_CORPSE | 
-F:IM_FIRE | AI_ANNOY | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:AI_ANNOY
+F:ANIMAL
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:IM_FIRE
+F:MORTAL
+F:WEIRD_MIND
 D:It is a fast moving creature of chaos, a gigantic black bat 
 D:surrounded by flickering bright red flames. 
 
@@ -7570,11 +10077,17 @@ O:0:100:0:0
 B:HIT:POISON:3d4
 B:HIT:LOSE_STR:3d4
 B:HIT:LOSE_STR:3d4
-F:MALE | 
-F:DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | NO_CONF | NO_SLEEP | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:OPEN_DOOR
 D:A humanoid clothed in black who moves with blinding speed. 
 
 N:486:Memory moss
@@ -7585,11 +10098,16 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:CONFUSE:1d4
 B:HIT:CONFUSE:1d4
-F:FORCE_SLEEP | NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | 
-F:MORTAL | BASEANGBAND | NO_CUT
-S:1_IN_6 | 
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:MORTAL
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+S:1_IN_6
 S:FORGET
 D:A mass of vegetation. You don't remember seeing anything like it 
 D:before. 
@@ -7602,11 +10120,30 @@ E:1:1:1:2:1:1
 O:10:90:0:0
 B:HIT:ELEC:10d8
 B:HIT:ELEC:10d8
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_1D2 | WILD_TOO | WILD_MOUNTAIN |
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | AURA_ELEC | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | GIANT | IM_COLD | IM_ELEC | MALE | BASEANGBAND | HAS_LITE
-S:1_IN_8 | 
-S:BLINK | TELE_TO | CONF | SCARE | BO_ELEC | BA_ELEC
+F:AURA_ELEC
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GIANT
+F:HAS_LITE
+F:IM_COLD
+F:IM_ELEC
+F:MALE
+F:OPEN_DOOR
+F:TAKE_ITEM
+F:WILD_MOUNTAIN
+F:WILD_TOO
+S:1_IN_8
+S:BA_ELEC
+S:BLINK
+S:BO_ELEC
+S:CONF
+S:SCARE
+S:TELE_TO
 D:It is a twenty-five foot tall giant wreathed in lightning. 
 
 N:488:Spectator
@@ -7618,54 +10155,25 @@ O:0:0:0:0
 B:GAZE:PARALYZE:1d4
 B:GAZE:CONFUSE:1d4
 B:BITE:HURT:1d8
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:STUPID | EMPTY_MIND | CAN_FLY | DROP_CORPSE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | 
-F:MORTAL | BASEANGBAND
-S:1_IN_6 | 
-S:FORGET | CAUSE_2 | HOLD | SLOW
+F:CAN_FLY
+F:DROP_CORPSE
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:MORTAL
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+S:1_IN_6
+S:CAUSE_2
+S:FORGET
+S:HOLD
+S:SLOW
 D:A lesser relative of the beholder: a globular body with a large toothy mouth, 
 D:a large central eye, and four smaller eyes on stalks protruding from the top 
 D:of its body. 
 
-N:489:Bokrug
-G:R:v
-I:110:11d90:20:70:50
-W:33:7:0:2200
-E:1:1:1:2:1:1
-O:20:0:80:0
-B:BITE:HURT:5d5
-B:CRUSH:HURT:2d10
-B:CRUSH:HURT:2d10
-F:UNIQUE | CAN_SPEAK |  
-F:FORCE_MAXHP | NONLIVING | NO_CONF | NO_FEAR |
-F:ESCORT | ESCORTS | ELDRITCH_HORROR |
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | CAN_SWIM |
-F:EVIL | IM_COLD | IM_POIS | DEMON | CTHANGBAND
-S:1_IN_5
-S:S_UNDEAD | MIND_BLAST | CAUSE_3 | SCARE | BO_WATE | S_KIN
-D:A lizard-like Great Old One worshipped by the men of Sarnath. 
-
-N:490:Biclops
-G:P:u
-I:120:65d20:20:90:20
-W:48:5:3000:1700
-E:1:1:1:2:1:1
-O:0:100:0:0
-B:HIT:HURT:10d9
-B:HIT:HURT:10d9
-F:FORCE_SLEEP | 
-F:DROP_1D2 | TAKE_ITEM | DROP_CORPSE | 
-F:BASH_DOOR | OPEN_DOOR | MOVE_BODY | 
-F:EVIL | IM_POIS | IM_ACID | IM_FIRE | IM_COLD | GIANT | 
-F:MORTAL | ZANGBAND | HAS_LITE
-S:1_IN_8 | 
-S:ARROW_4
-D:Oh, no! Aaargh! It is the most unnatural, most disgusting 
-D:creature imaginable: a two-eyed cyclops! This perversion 
-D:of nature must be exterminated! 
-
 N:491:Half-troll
 G:T:U
 I:110:25d14:20:50:50
@@ -7676,28 +10184,20 @@ B:CLAW:HURT:1d5
 B:CLAW:HURT:1d5
 B:BITE:HURT:2d6
 B:BITE:HURT:2d6
-F:MALE | 
-F:FRIENDS | 
-F:ONLY_ITEM | DROP_90 | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | REGENERATE | 
-F:EVIL | TROLL | IM_POIS | BASEANGBAND
+F:BASH_DOOR
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:IM_POIS
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:TROLL
 D:A huge, ugly, half-human in search of plunder. 
 
-N:492:Ivory monk
-G:p:w
-I:120:38d9:22:55:5
-W:33:1:1600:900
-E:1:1:1:2:1:1
-O:40:0:50:10
-B:KICK:HURT:8d1
-B:HIT:HURT:8d4
-B:KICK:HURT:8d1
-B:HIT:HURT:8d4
-F:OPEN_DOOR | BASH_DOOR | NO_FEAR | NO_CONF | NO_SLEEP | DROP_SKELETON |
-F:DROP_CORPSE | MALE | DROP_60 | DROP_1D2 | IM_FIRE | IM_COLD | IM_POIS | 
-F:MORTAL | ZANGBAND | HAS_LITE
-D:A monk trained in the most lethal martial arts. 
-
 N:493:Bert the Stone Troll
 G:T:W
 I:120:11d100:20:70:50
@@ -7707,12 +10207,30 @@ O:0:100:0:0
 B:HIT:HURT:6d6
 B:HIT:HURT:6d6
 B:BITE:HURT:3d10
-F:UNIQUE | MALE | 
-F:FORCE_MAXHP | 
-F:ESCORT | SPECIAL_GENE | MOVE_BODY | REGENERATE | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | WILD_TOO | WILD_WOOD |
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | TROLL | IM_COLD | IM_POIS | HURT_LITE | HURT_ROCK | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:HURT_LITE
+F:HURT_ROCK
+F:IM_COLD
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:NO_CUT
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:SPECIAL_GENE
+F:TAKE_ITEM
+F:TROLL
+F:UNIQUE
+F:WILD_TOO
+F:WILD_WOOD
 D:Big, brawny, powerful and with a taste for hobbit. He has friends called 
 D:Bill and Tom. 
 
@@ -7725,12 +10243,30 @@ O:0:100:0:0
 B:HIT:HURT:6d6
 B:HIT:HURT:6d6
 B:BITE:HURT:3d10
-F:UNIQUE | MALE | 
-F:FORCE_MAXHP | 
-F:ESCORT | SPECIAL_GENE | MOVE_BODY | REGENERATE | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | WILD_TOO | WILD_WOOD |
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE
-F:EVIL | TROLL | IM_COLD | IM_POIS | HURT_LITE | HURT_ROCK | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:HURT_LITE
+F:HURT_ROCK
+F:IM_COLD
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:NO_CUT
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:SPECIAL_GENE
+F:TAKE_ITEM
+F:TROLL
+F:UNIQUE
+F:WILD_TOO
+F:WILD_WOOD
 D:Big, brawny, powerful and with a taste for hobbit. He has friends called 
 D:Bert and Tom. 
 
@@ -7743,12 +10279,30 @@ O:0:100:0:0
 B:HIT:HURT:6d6
 B:HIT:HURT:6d6
 B:BITE:HURT:3d10
-F:UNIQUE | MALE | 
-F:FORCE_MAXHP | 
-F:ESCORT | SPECIAL_GENE | MOVE_BODY | REGENERATE | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | WILD_TOO | WILD_WOOD |
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | TROLL | IM_COLD | IM_POIS | HURT_LITE | HURT_ROCK | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:HURT_LITE
+F:HURT_ROCK
+F:IM_COLD
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:NO_CUT
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:SPECIAL_GENE
+F:TAKE_ITEM
+F:TROLL
+F:UNIQUE
+F:WILD_TOO
+F:WILD_WOOD
 D:Big, brawny, powerful and with a taste for hobbit. He has friends called 
 D:Bert and Bill. 
 
@@ -7762,49 +10316,21 @@ B:HIT:HURT:3d5
 B:HIT:HURT:3d5
 B:BITE:HURT:1d8
 B:BITE:HURT:1d8
-F:MALE | 
-F:FRIENDS | DROP_60 | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | SUSCEP_FIRE | REGENERATE | 
-F:EVIL | TROLL | IM_POIS | HURT_LITE | BASEANGBAND
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HURT_LITE
+F:IM_POIS
+F:MALE
+F:OPEN_DOOR
+F:REGENERATE
+F:SUSCEP_FIRE
+F:TROLL
 D:He is a vicious monster, feared for his ferocity. 
 
-N:497:Anti-paladin
-G:p:D
-I:120:30d20:30:50:30
-W:33:2:2400:450
-E:1:1:1:2:1:1
-O:0:50:50:0
-B:HIT:HURT:2d6
-B:HIT:HURT:1d6
-B:HIT:HURT:1d6
-F:MALE | OPEN_DOOR | BASH_DOOR | TAKE_ITEM | DROP_1D2 | ONLY_ITEM |
-F:EVIL | IM_POIS | IM_COLD | NO_CONF | NO_SLEEP | DROP_SKELETON | DROP_CORPSE
-F:MORTAL | ZANGBAND | HAS_LITE
-S:1_IN_4
-S:HOLD | SCARE | BLIND | CAUSE_3 | TRAPS | DARKNESS | FORGET | HASTE
-D:An embodiment of all the cardinal vices, he beholds you scornfully. 
-
-N:498:Chaos master
-G:p:v
-I:120:30d10:30:50:5
-W:37:3:2300:550
-E:1:1:1:2:1:1
-O:10:60:10:10
-B:HIT:HURT:10d2
-B:KICK:HURT:10d2
-B:PUNCH:HURT:10d2
-B:KICK:HURT:10d2
-F:MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | EVIL |
-F:ONLY_ITEM | DROP_1D2 | ATTR_ANY | DROP_SKELETON | DROP_CORPSE
-F:INVISIBLE | OPEN_DOOR | BASH_DOOR | 
-F:IM_ACID | IM_POIS | NO_CONF | NO_SLEEP
-F:MORTAL | ZANGBAND | HAS_LITE
-S:1_IN_6 | 
-S:HEAL | 
-S:S_SPIDER | BA_CHAO | S_DEMON
-D:An adept of chaos, feared for his skill of invoking raw Chaos. 
-
 N:499:Barrow wight
 G:W:v
 I:110:15d10:20:40:10
@@ -7814,12 +10340,26 @@ O:0:50:50:0
 B:HIT:HURT:1d8
 B:HIT:HURT:1d8
 B:TOUCH:EXP_40
-F:FORCE_SLEEP | FRIENDS | DROP_60 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | CAN_FLY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_8 | 
-S:HOLD | SCARE | CAUSE_2 | DARKNESS
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_60
+F:EVIL
+F:FORCE_SLEEP
+F:FRIENDS
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:UNDEAD
+S:1_IN_8
+S:CAUSE_2
+S:DARKNESS
+S:HOLD
+S:SCARE
 D:It is a ghostly nightmare of an entity. 
 
 N:500:Skeleton ettin
@@ -7832,11 +10372,20 @@ B:HIT:HURT:1d9
 B:HIT:HURT:1d9
 B:BITE:HURT:1d5
 B:BITE:HURT:1d5
-F:FORCE_MAXHP | 
-F:EMPTY_MIND | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | TROLL | UNDEAD | 
-F:IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:FORCE_MAXHP
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:TROLL
+F:UNDEAD
 D:It is the animated skeleton of a massive two-headed troll. 
 
 N:501:Chaos drake
@@ -7848,15 +10397,29 @@ O:50:50:0:0
 B:CLAW:HURT:2d4
 B:CLAW:HURT:2d4
 B:BITE:HURT:3d6
-F:ATTR_MULTI | ATTR_ANY | CAN_FLY |
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_3D2 | RES_DISE |
-F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | 
-F:EVIL | DRAGON | 
-F:IM_FIRE | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
-S:1_IN_6 | 
-S:SLOW | CONF | SCARE | 
-S:BR_DISE | BR_CHAO
+F:ATTR_ANY
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_DISE
+S:1_IN_6
+S:BR_CHAO
+S:BR_DISE
+S:CONF
+S:SCARE
+S:SLOW
 D:A dragon twisted by the forces of chaos. It seems first ugly, then fair, 
 D:as its form shimmers and changes in front of your eyes. 
 
@@ -7869,14 +10432,28 @@ O:50:50:0:0
 B:CLAW:HURT:2d4
 B:CLAW:HURT:2d4
 B:BITE:HURT:3d6
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_3D2 | CAN_FLY |
-F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | 
-F:DRAGON | EVIL | 
-F:IM_COLD | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE | NO_CUT | ATTR_MULTI
-S:1_IN_6 | 
-S:SLOW | CONF | SCARE | 
-S:BR_SOUN | BR_SHAR
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+S:1_IN_6
+S:BR_SHAR
+S:BR_SOUN
+S:CONF
+S:SCARE
+S:SLOW
 D:This dragon is clever and cunning. It laughs at your puny efforts to 
 D:disturb it. 
 
@@ -7889,15 +10466,32 @@ O:50:50:0:0
 B:CLAW:HURT:2d4
 B:CLAW:HURT:2d4
 B:BITE:HURT:3d6
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_3D2 | RES_DISE |
-F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE
-F:EVIL | DRAGON | CAN_FLY |
-F:IM_FIRE | IM_COLD | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE | NO_CUT
 F:ATTR_MULTI
-S:1_IN_6 | 
-S:SLOW | CONF | SCARE | 
-S:BR_SOUN | BR_SHAR | BR_DISE | BR_CHAO
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:IM_FIRE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_DISE
+S:1_IN_6
+S:BR_CHAO
+S:BR_DISE
+S:BR_SHAR
+S:BR_SOUN
+S:CONF
+S:SCARE
+S:SLOW
 D:A mighty dragon, the balance drake seeks to maintain the Cosmic Balance, 
 D:and despises your feeble efforts to destroy evil. 
 
@@ -7910,35 +10504,28 @@ O:40:50:10:0
 B:CLAW:HURT:2d4
 B:CLAW:HURT:2d4
 B:BITE:HURT:3d6
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_3D2 | CAN_FLY |
-F:INVISIBLE | PASS_WALL |
-F:EVIL | DRAGON | NO_CONF | NO_SLEEP | BASEANGBAND | ATTR_MULTI
-S:1_IN_6 | 
-S:SLOW | CONF | SCARE | 
-S:BR_LITE | BR_DARK | BR_CONF
+F:ATTR_MULTI
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:INVISIBLE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PASS_WALL
+S:1_IN_6
+S:BR_CONF
+S:BR_DARK
+S:BR_LITE
+S:CONF
+S:SCARE
+S:SLOW
 D:A dragon of great power with control over light and dark, the 
 D:ethereal drake's eyes glare with white hatred from the shadows. 
 
-N:505:Groo, the Wanderer
-G:p:U
-I:120:13d113:20:70:50
-W:35:7:5000:2000
-E:1:1:1:2:1:1
-O:0:100:0:0
-B:HIT:HURT:9d1
-B:HIT:HURT:6d5
-B:HIT:HURT:25d1
-B:HIT:HURT:6d5
-F:UNIQUE | MALE | WEIRD_MIND | CAN_SPEAK |
-F:FORCE_MAXHP | WILD_TOO | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD |
-F:DROP_CHOSEN |
-F:OPEN_DOOR | BASH_DOOR | 
-F:IM_COLD | IM_POIS | ZANGBAND
-D:He who laughs at Groo's brains will find there is nothing to laugh 
-D:about... erm, nobody laughs at Groo and lives. 
-
 N:506:Fasolt the Giant
 G:P:u
 I:110:11d111:20:70:50
@@ -7948,12 +10535,24 @@ O:0:100:0:0
 B:HIT:HURT:7d10
 B:HIT:HURT:7d10
 B:HIT:EAT_GOLD:2d10
-F:UNIQUE | MALE | CAN_SPEAK |
-F:FORCE_MAXHP | WILD_TOO | DROP_CORPSE | 
-F:ESCORT | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | GIANT | IM_COLD | IM_POIS | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:GIANT
+F:HAS_LITE
+F:IM_COLD
+F:IM_POIS
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:TAKE_ITEM
+F:UNIQUE
+F:WILD_TOO
 D:Big, brawny, powerful and with a greed for gold. 
 
 N:507:Shade
@@ -7965,13 +10564,28 @@ O:0:0:100:0
 B:WAIL:TERRIFY
 B:TOUCH:EXP_40
 B:CLAW:LOSE_INT:1d10
-F:FORCE_SLEEP | RAND_25 | 
-F:ONLY_ITEM | DROP_90 | DROP_2D2 | 
-F:INVISIBLE | COLD_BLOOD | TAKE_ITEM | PASS_WALL | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | CAN_FLY |
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_15 | 
-S:BLIND | HOLD | DRAIN_MANA | FORGET
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_90
+F:EVIL
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PASS_WALL
+F:RAND_25
+F:TAKE_ITEM
+F:UNDEAD
+S:1_IN_15
+S:BLIND
+S:DRAIN_MANA
+S:FORGET
+S:HOLD
 D:A shadowy form clutches at you from the darkness. A powerful undead with 
 D:a deadly touch. 
 
@@ -7984,13 +10598,27 @@ O:0:0:100:0
 B:WAIL:TERRIFY
 B:TOUCH:EXP_40
 B:CLAW:LOSE_WIS:5d5
-F:FORCE_SLEEP | RAND_25 | 
-F:ONLY_ITEM | DROP_90 | DROP_2D2 | CAN_FLY |
-F:COLD_BLOOD | TAKE_ITEM | PASS_WALL |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_15 | 
-S:BLIND | HOLD | DRAIN_MANA | FORGET
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_90
+F:EVIL
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PASS_WALL
+F:RAND_25
+F:TAKE_ITEM
+F:UNDEAD
+S:1_IN_15
+S:BLIND
+S:DRAIN_MANA
+S:FORGET
+S:HOLD
 D:A phantasmal shrieking spirit. Its wail drives the intense cold of pure 
 D:evil deep within your body. 
 
@@ -8004,11 +10632,23 @@ B:HIT:HURT:1d9
 B:HIT:HURT:1d9
 B:HIT:HURT:2d2
 B:HIT:HURT:2d2
-F:MALE | WILD_TOO | WILD_SHORE | WILD_SWAMP |
-F:FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE | 
-F:FRIENDS | DROP_60 | REGENERATE | 
-F:OPEN_DOOR | BASH_DOOR | CAN_SWIM |
-F:EVIL | TROLL | IM_COLD | IM_POIS | HURT_LITE | BASEANGBAND
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FRIENDS
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:MALE
+F:OPEN_DOOR
+F:REGENERATE
+F:TROLL
+F:WILD_SHORE
+F:WILD_TOO
 D:He is a troll that reeks of brackish water and mud.
 
 N:510:Fire elemental
@@ -8019,12 +10659,27 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:FIRE:4d6
 B:HIT:FIRE:4d6
-F:FORCE_SLEEP | RAND_25 | 
-F:EMPTY_MIND | CAN_FLY | WILD_TOO | WILD_VOLCANO | 
-F:KILL_ITEM | KILL_BODY | BASH_DOOR | POWERFUL | AURA_FIRE |
-F:IM_FIRE | IM_POIS | IM_ELEC | IM_ACID | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | HAS_LITE | NO_CUT
-S:1_IN_6 | 
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:KILL_ITEM
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_25
+F:WILD_TOO
+F:WILD_VOLCANO
+S:1_IN_6
 S:BO_FIRE
 D:It is a towering inferno of flames. 
 
@@ -8038,13 +10693,37 @@ B:HIT:HURT:4d3
 B:HIT:HURT:3d8
 B:HIT:HURT:4d3
 B:HIT:HURT:3d8
-F:FORCE_SLEEP | FORCE_MAXHP | NO_FEAR | GOOD | CAN_FLY |
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | REFLECTING  | RES_TELE
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:HEAL | HASTE | BLIND | SCARE | MIND_BLAST | BO_FIRE | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_1D2
+F:DROP_2D2
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MOVE_BODY
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:REFLECTING
+F:RES_TELE
+F:SMART
+F:TAKE_ITEM
+S:1_IN_3
+S:BLIND
+S:BO_FIRE
+S:HASTE
+S:HEAL
+S:MIND_BLAST
+S:SCARE
 S:S_MONSTERS
 D:It is an angel moving very quickly, wielding a holy war hammer and casting 
 D:a volley of powerful spells in your direction. 
@@ -8058,12 +10737,24 @@ O:0:0:0:0
 B:HIT:HURT:1d10
 B:HIT:HURT:1d10
 B:HIT:HURT:1d10
-F:FORCE_SLEEP | RAND_25 | 
-F:EMPTY_MIND | COLD_BLOOD | CAN_FLY |
-F:KILL_BODY | KILL_ITEM | BASH_DOOR | POWERFUL | 
-F:IM_POIS | IM_ACID | IM_FIRE | IM_COLD | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_6 | 
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:KILL_ITEM
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_25
+S:1_IN_6
 S:BO_COLD
 D:It is a towering tempest of water. 
 
@@ -8077,14 +10768,28 @@ B:CLAW:HURT:2d8
 B:CLAW:HURT:2d8
 B:BITE:HURT:4d4
 B:BITE:HURT:4d4
-F:FORCE_SLEEP | 
-F:FRIENDS | 
-F:BASH_DOOR | ATTR_MULTI | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | NO_CONF | NO_SLEEP | 
-F:IM_ELEC | IM_POIS | IM_ACID | IM_FIRE | IM_COLD | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_5 | 
-S:BR_ACID | BR_POIS | BR_COLD | BR_FIRE | BR_ELEC
+F:ANIMAL
+F:ATTR_MULTI
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+S:1_IN_5
+S:BR_ACID
+S:BR_COLD
+S:BR_ELEC
+S:BR_FIRE
+S:BR_POIS
 D:Shimmering in rainbow hues, this hound is beautiful and deadly. 
 
 N:514:Invisible stalker
@@ -8096,13 +10801,22 @@ O:0:0:0:0
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
-F:RAND_50 | 
-F:RES_TELE |
-F:EMPTY_MIND | INVISIBLE | COLD_BLOOD | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | 
-F:EVIL | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING
-F:BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:IM_ELEC
+F:IM_POIS
+F:INVISIBLE
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:POWERFUL
+F:RAND_50
+F:RES_TELE
 D:It is impossible to define its form but its violence is legendary. 
 
 N:515:Carrion crawler
@@ -8113,9 +10827,14 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:STING:PARALYZE:2d6
 B:STING:PARALYZE:2d6
-F:RAND_25 | FRIENDS | DROP_SKELETON | 
-F:WEIRD_MIND | BASH_DOOR | 
-F:ANIMAL | IM_POIS | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:FRIENDS
+F:IM_POIS
+F:MORTAL
+F:RAND_25
+F:WEIRD_MIND
 D:A hideous centipede covered in slime and with glowing tentacles around its 
 D:head. 
 
@@ -8129,12 +10848,20 @@ B:HIT:HURT:2d8
 B:HIT:HURT:3d4
 B:HIT:EAT_GOLD:4d4
 B:HIT:EAT_ITEM:4d5
-F:MALE | 
-F:DROP_90 | DROP_2D2 | DROP_SKELETON | DROP_CORPSE | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:TAKE_ITEM
 S:1_IN_6
-S:TRAPS | ARROW_2 | BLINK
+S:ARROW_2
+S:BLINK
 D:Cool and confident, fast and lithe; protect your possessions quickly! 
 
 N:517:The Watcher in the Water
@@ -8146,11 +10873,35 @@ O:50:50:0:0
 B:CRUSH:ACID:8d8
 B:CRUSH:POISON:8d8
 B:CRUSH:PARALYZE:8d8
-F:UNIQUE | FORCE_SLEEP | FORCE_MAXHP | CAN_SWIM | AQUATIC | ANIMAL | 
-F:IM_ACID | IM_COLD | IM_POIS | RES_WATE | RES_TELE | DROP_CORPSE | 
-F:NO_CONF | NO_FEAR | EVIL | COLD_BLOOD | BASEANGBAND | 
-F:ONLY_ITEM | DROP_GOOD | DROP_4D2 | DROP_1D2 | SPECIAL_GENE | DROP_RANDART
-S:1_IN_5 | BA_WATE | BO_WATE | HOLD | BR_POIS | BO_ICEE | TELE_TO
+F:ANIMAL
+F:AQUATIC
+F:CAN_SWIM
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_RANDART
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_FEAR
+F:ONLY_ITEM
+F:RES_TELE
+F:RES_WATE
+F:SPECIAL_GENE
+F:UNIQUE
+S:1_IN_5
+S:BA_WATE
+S:BO_ICEE
+S:BO_WATE
+S:BR_POIS
+S:HOLD
+S:TELE_TO
 D:A vile creature which seems to consist mostly of tentacles, it seeks to 
 D:drag people to their doom in the water.  Few have ever escaped its grasp. 
 
@@ -8164,13 +10915,32 @@ B:TOUCH:EXP_40
 B:TOUCH:UN_POWER
 B:TOUCH:LOSE_DEX:2d8
 B:TOUCH:LOSE_DEX:2d8
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_1D2 | 
-F:SMART | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_4 | 
-S:BLINK | TELE_TO | TELE_AWAY | BLIND | HOLD | SLOW | SCARE | 
-S:CAUSE_3 | DRAIN_MANA | BRAIN_SMASH
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_1D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:SMART
+F:UNDEAD
+S:1_IN_4
+S:BLIND
+S:BLINK
+S:BRAIN_SMASH
+S:CAUSE_3
+S:DRAIN_MANA
+S:HOLD
+S:SCARE
+S:SLOW
+S:TELE_AWAY
+S:TELE_TO
 D:It is a skeletal form dressed in robes. It radiates vastly evil power. 
 
 N:519:Gas spore
@@ -8180,9 +10950,14 @@ W:34:4:0:100
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:EXPLODE:DISEASE:30d2
-F:FORCE_SLEEP |
-F:STUPID | EMPTY_MIND | CAN_FLY | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:From a distance, this creature is often mistaken for the 
 D:much more dangerous beholder. 
 
@@ -8196,14 +10971,32 @@ B:HIT:HURT:2d6
 B:HIT:HURT:2d6
 B:BITE:EXP_40:3d6
 B:BITE:EXP_40:3d6
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:DROP_4D2 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | REGENERATE | CAN_FLY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP | 
-F:BASEANGBAND | NO_CUT
-S:1_IN_6 | 
-S:TELE_TO | HOLD | CONF | SCARE | CAUSE_3 | MIND_BLAST | FORGET | 
-S:DARKNESS | BO_NETH
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_4D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:REGENERATE
+F:UNDEAD
+S:1_IN_6
+S:BO_NETH
+S:CAUSE_3
+S:CONF
+S:DARKNESS
+S:FORGET
+S:HOLD
+S:MIND_BLAST
+S:SCARE
+S:TELE_TO
 D:It is a humanoid form dressed in robes. Power emanates from its chilling 
 D:frame. 
 
@@ -8217,14 +11010,35 @@ B:HIT:HURT:3d6
 B:HIT:HURT:3d6
 B:BITE:EXP_40:3d6
 B:BITE:EXP_40:3d6
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:DROP_4D2 | CAN_FLY |
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | REGENERATE | INVISIBLE | PASS_WALL |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP | RES_TELE | 
-F:BASEANGBAND | NO_CUT
-S:1_IN_6 | 
-S:TELE_TO | HOLD | CONF | SCARE | CAUSE_3 | MIND_BLAST | FORGET | 
-S:DARKNESS | BO_NETH
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_4D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:PASS_WALL
+F:REGENERATE
+F:RES_TELE
+F:UNDEAD
+S:1_IN_6
+S:BO_NETH
+S:CAUSE_3
+S:CONF
+S:DARKNESS
+S:FORGET
+S:HOLD
+S:MIND_BLAST
+S:SCARE
+S:TELE_TO
 D:The oriental vampire can transform into a mist at will. 
 
 N:522:Greater mummy
@@ -8237,33 +11051,46 @@ B:CLAW:LOSE_CON:3d6
 B:CLAW:DISEASE:3d6
 B:GAZE:EXP_40:3d4
 B:GAZE:TERRIFY:3d4
-F:FORCE_SLEEP | FORCE_MAXHP | NO_FEAR | EVIL | UNDEAD |COLD_BLOOD |
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | RES_TELE | 
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_3 | 
-S:HEAL | HASTE | BLIND | SCARE | S_UNDEAD | ANIM_DEAD | 
-S:BA_POIS | BA_NETH | BA_COLD | DRAIN_MANA |
-S:MIND_BLAST | CAUSE_3 | DARKNESS | FORGET
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_2D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MOVE_BODY
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:RES_TELE
+F:SMART
+F:TAKE_ITEM
+F:UNDEAD
+S:1_IN_3
+S:BA_COLD
+S:BA_NETH
+S:BA_POIS
+S:BLIND
+S:CAUSE_3
+S:DARKNESS
+S:DRAIN_MANA
+S:FORGET
+S:HASTE
+S:HEAL
+S:MIND_BLAST
+S:SCARE
+S:S_UNDEAD
 D:Once a powerful ruler, now an even more powerful undead menace. 
 
-N:523:Bloodletter of Khorne
-G:U:r
-I:120:30d8:20:40:30
-W:34:1:0:450
-E:1:1:1:2:1:1
-O:0:100:0:0
-B:HIT:EXP_20:13d1
-B:HIT:EXP_20:13d1
-B:HIT:EXP_20:13d1
-F:FORCE_MAXHP | OPEN_DOOR | FRIENDS | DROP_60 | REGENERATE |
-F:ONLY_ITEM | DROP_CHOSEN | NO_FEAR | NONLIVING |
-F:EVIL | IM_POIS | IM_COLD | IM_FIRE | DEMON | ZANGBAND | HAS_LITE
-D:Slender, red-skinned demons twisting in nightmarish shapes. 
-D:They are armed with hellblades, which will suck the life from 
-D:your body. 
-
 N:524:Giant grey scorpion
 G:S:s
 I:120:18d20:12:50:40
@@ -8272,9 +11099,12 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d6
 B:STING:POISON:1d4
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | DROP_SKELETON |
 F:ANIMAL
-F:MORTAL | BASEANGBAND
+F:BASH_DOOR
+F:DROP_SKELETON
+F:MORTAL
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is a giant grey scorpion. It looks poisonous. 
 
 N:525:Earth elemental
@@ -8286,12 +11116,23 @@ O:0:0:0:0
 B:HIT:HURT:4d6
 B:HIT:HURT:4d6
 B:HIT:HURT:4d6
-F:FORCE_SLEEP | 
-F:EMPTY_MIND | COLD_BLOOD | 
-F:KILL_ITEM | KILL_BODY | PASS_WALL | POWERFUL | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | HURT_ROCK | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_8 | 
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HURT_ROCK
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:KILL_ITEM
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:PASS_WALL
+F:POWERFUL
+S:1_IN_8
 S:BO_ACID
 D:It is a towering form composed of rock with fists of awesome power. 
 
@@ -8304,12 +11145,24 @@ O:0:0:0:0
 B:HIT:HURT:1d10
 B:HIT:CONFUSE:1d4
 B:HIT:HURT:1d10
-F:FORCE_SLEEP | RAND_25 | 
-F:EMPTY_MIND | COLD_BLOOD | CAN_FLY |
-F:KILL_BODY | KILL_ITEM | BASH_DOOR | POWERFUL | 
-F:IM_ACID | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_8 | 
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_POIS
+F:KILL_BODY
+F:KILL_ITEM
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_25
+S:1_IN_8
 S:BO_ELEC
 D:It is a towering tornado of winds. 
 
@@ -8319,10 +11172,16 @@ I:110:32d8:2:24:70
 W:27:1:0:140
 B:SPORE:ELEC:5d4
 B:SPORE:ELEC:5d4
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | 
-F:IM_ELEC | IM_POIS | CAN_SWIM | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:EMPTY_MIND
+F:IM_ELEC
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:It is a strange growth on the dungeon floor, glowing and crackling with sparks. 
 
 N:528:Gargoyle
@@ -8334,12 +11193,25 @@ O:0:0:0:0
 B:CLAW:HURT:2d6
 B:CLAW:HURT:2d6
 B:BITE:HURT:1d6
-F:DROP_60 | ONLY_GOLD | EVIL | DEMON | FRIENDS | HURT_LITE |
-F:WILD_TOO | WILD_MOUNTAIN | WILD_WASTE |
-F:IM_POIS | IM_FIRE | IM_COLD | IM_ELEC | HURT_ROCK | NONLIVING | 
-F:BASEANGBAND | NO_CUT
+F:DEMON
+F:DROP_60
+F:EVIL
+F:FRIENDS
+F:HURT_LITE
+F:HURT_ROCK
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NONLIVING
+F:NO_CUT
+F:ONLY_GOLD
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WASTE
 S:1_IN_12
-S:BR_ELEC | BR_FIRE
+S:BR_ELEC
+S:BR_FIRE
 D:A weird demon creature with a stone-like skin. 
 
 N:529:Malicious leprechaun
@@ -8350,12 +11222,21 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:TOUCH:EAT_GOLD
 B:TOUCH:EAT_ITEM
-F:INVISIBLE | RAND_25 | TAKE_ITEM | COLD_BLOOD |
-F:HURT_LITE | EVIL | OPEN_DOOR | MALE | 
-F:MORTAL | BASEANGBAND
-S:MULTIPLY | 
-S:1_IN_6 | 
-S:BLINK | TPORT | TELE_TO | CAUSE_1
+F:COLD_BLOOD
+F:EVIL
+F:HURT_LITE
+F:INVISIBLE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:RAND_25
+F:TAKE_ITEM
+S:1_IN_6
+S:BLINK
+S:CAUSE_1
+S:MULTIPLY
+S:TELE_TO
+S:TPORT
 D:This little creature has a fiendish gleam in its eyes. 
 
 N:530:Eog golem
@@ -8368,10 +11249,21 @@ B:HIT:HURT:8d6
 B:HIT:HURT:8d6
 B:HIT:HURT:6d6
 B:HIT:HURT:6d6
-F:ONLY_GOLD | DROP_2D2 | 
-F:EMPTY_MIND | COLD_BLOOD | BASH_DOOR | REFLECTING |
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_2D2
+F:EMPTY_MIND
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_GOLD
+F:REFLECTING
 D:It is a massive deep brown statue, striding towards you with an 
 D:all-too-familiar purpose. Your magic surprisingly feels much less 
 D:powerful now. 
@@ -8383,9 +11275,24 @@ W:35:2:0:200
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:EXPLODE:SHATTER:100d2
-F:FORCE_SLEEP | FORCE_MAXHP | UNIQUE | REFLECTING |
-F:EMPTY_MIND | COLD_BLOOD | BASH_DOOR | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS
-F:NO_FEAR | NO_CONF | NO_SLEEP | NONLIVING | RES_TELE | JOKEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:JOKEANGBAND
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:REFLECTING
+F:RES_TELE
+F:UNIQUE
 D:A shining machine of death and destruction. 
 
 N:532:Dagashi
@@ -8398,11 +11305,17 @@ B:HIT:POISON:3d4
 B:HIT:LOSE_STR:3d4
 B:HIT:LOSE_STR:3d4
 B:HIT:POISON:3d4
-F:MALE | 
-F:DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | NO_CONF | NO_SLEEP | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:OPEN_DOOR
 D:A human warrior, moving with lightning speed. 
 
 N:533:Headless ghost
@@ -8415,13 +11328,28 @@ B:TOUCH:TERRIFY
 B:TOUCH:EXP_40
 B:CLAW:LOSE_INT:5d5
 B:CLAW:LOSE_WIS:5d5
-F:FORCE_SLEEP | RAND_25 | 
-F:ONLY_ITEM | DROP_90 | DROP_2D2 | CAN_FLY |
-F:COLD_BLOOD | TAKE_ITEM | PASS_WALL |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_15 | 
-S:BLIND | DRAIN_MANA | SCARE | BO_COLD | FORGET
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_90
+F:EVIL
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PASS_WALL
+F:RAND_25
+F:TAKE_ITEM
+F:UNDEAD
+S:1_IN_15
+S:BLIND
+S:BO_COLD
+S:DRAIN_MANA
+S:FORGET
+S:SCARE
 D:A phantasmal apparition with no head. 
 
 N:534:Dread
@@ -8433,29 +11361,33 @@ O:0:50:50:0
 B:HIT:HURT:6d6
 B:HIT:HURT:6d6
 B:HIT:LOSE_STR:3d4
-F:FORCE_SLEEP | RAND_25 | 
-F:ONLY_ITEM | DROP_60 | DROP_2D2 | 
-F:TAKE_ITEM | INVISIBLE | COLD_BLOOD | PASS_WALL | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | CAN_FLY |
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_15 | 
-S:BLIND | HOLD | CONF | DRAIN_MANA | BO_NETH
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_60
+F:EVIL
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PASS_WALL
+F:RAND_25
+F:TAKE_ITEM
+F:UNDEAD
+S:1_IN_15
+S:BLIND
+S:BO_NETH
+S:CONF
+S:DRAIN_MANA
+S:HOLD
 D:It is a form that screams its presence against the eye. Death incarnate, 
 D:its hideous black body seems to struggle against reality as the universe 
 D:itself struggles to banish it. 
 
-N:535:Leng spider
-G:S:v
-I:120:16d20:12:50:40
-W:35:4:600:250
-E:0:1:0:2:1:0
-O:0:0:0:0
-B:BITE:POISON:1d6
-B:STING:POISON:1d6
-F:WEIRD_MIND | BASH_DOOR | FRIENDS | ELDRITCH_HORROR | DROP_CORPSE | 
-F:ANIMAL | SPIDER | CTHANGBAND
-D:Bloated purple spiders with long, bristly legs. 
-
 N:536:Gauth
 G:e:s
 I:110:15d20:20:50:20
@@ -8466,10 +11398,20 @@ B:GAZE:UN_BONUS:5d2
 B:GAZE:UN_BONUS:5d2
 B:GAZE:UN_POWER:5d2
 B:GAZE:UN_POWER:5d2
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | DROP_CORPSE | 
-F:BASH_DOOR | EVIL | BASEANGBAND | MORTAL
-S:1_IN_5 | 
-S:CAUSE_2 | TELE_AWAY | BA_COLD | BO_ELEC | HOLD | DRAIN_MANA
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:MORTAL
+S:1_IN_5
+S:BA_COLD
+S:BO_ELEC
+S:CAUSE_2
+S:DRAIN_MANA
+S:HOLD
+S:TELE_AWAY
 D:Another lesser relative of the beholder, this six-eyed creature feeds on magic. 
 
 N:537:Smoke elemental
@@ -8480,13 +11422,24 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:ENGULF:HURT:2d6
 B:ENGULF:HURT:2d6
-F:FORCE_SLEEP | 
-F:EMPTY_MIND | 
-F:KILL_ITEM | KILL_BODY | BASH_DOOR | POWERFUL | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | CAN_FLY | BASEANGBAND | NO_CUT
-S:1_IN_5 | 
-S:DARKNESS | BO_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:KILL_ITEM
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+S:1_IN_5
+S:BO_FIRE
+S:DARKNESS
 D:It is a towering blackened form, crackling with heat. 
 
 N:538:Olog
@@ -8499,9 +11452,18 @@ B:HIT:HURT:1d12
 B:HIT:HURT:1d12
 B:BITE:HURT:2d3
 B:BITE:HURT:2d3
-F:FORCE_MAXHP | OPEN_DOOR | FRIENDS | DROP_60 | REGENERATE | 
-F:SMART | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | TROLL | IM_POIS | BASEANGBAND
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FRIENDS
+F:IM_POIS
+F:OPEN_DOOR
+F:REGENERATE
+F:SMART
+F:TROLL
 D:It is a massive troll, more intelligent than most of its kind, with needle-
 D:sharp fangs. 
 
@@ -8513,9 +11475,19 @@ E:1:1:1:2:1:1
 O:100:0:0:0
 B:HIT:HURT:2d6
 B:HIT:HURT:2d6
-F:FORCE_MAXHP | OPEN_DOOR | FRIENDS | DROP_90 |
-F:SMART | EVIL | IM_POIS | IM_COLD | MALE | DROP_SKELETON | DROP_CORPSE
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FRIENDS
+F:HAS_LITE
+F:IM_COLD
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:SMART
 S:1_IN_3
 S:ARROW_4
 D:A rebel halfling who has rejected the halfling tradition of archery.  
@@ -8530,11 +11502,16 @@ B:CLAW:HURT:2d8
 B:CLAW:HURT:2d8
 B:BITE:HURT:2d8
 B:BITE:HURT:2d8
-F:FORCE_SLEEP | FRIENDS | DROP_SKELETON | DROP_CORPSE | 
-F:BASH_DOOR | 
-F:ANIMAL | NO_CONF | NO_SLEEP | 
-F:MORTAL | BASEANGBAND
-S:1_IN_5 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+S:1_IN_5
 S:BR_GRAV
 D:Unfettered by the usual constraints of gravity, these unnatural creatures 
 D:are walking on the walls and even the ceiling!  The earth suddenly feels 
@@ -8550,11 +11527,25 @@ B:TOUCH:ACID:1d10
 B:TOUCH:ACID:1d10
 B:TOUCH:ACID:1d10
 B:TOUCH:ACID:1d10
-F:FORCE_MAXHP | TAKE_ITEM | COLD_BLOOD | 
-F:DROP_1D2 | DROP_4D2 | CAN_SWIM |
-F:STUPID | EMPTY_MIND | OPEN_DOOR | BASH_DOOR | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_FEAR | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_4D2
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:STUPID
+F:TAKE_ITEM
 D:A disgusting animated blob of destruction. Flee its gruesome hunger! 
 
 N:542:Inertia hound
@@ -8567,11 +11558,16 @@ B:CLAW:HURT:2d8
 B:CLAW:HURT:2d8
 B:BITE:HURT:2d8
 B:BITE:HURT:2d8
-F:FORCE_SLEEP | FRIENDS | DROP_SKELETON | DROP_CORPSE | 
-F:BASH_DOOR | 
-F:ANIMAL | NO_CONF | NO_SLEEP | 
-F:MORTAL | BASEANGBAND
-S:1_IN_5 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+S:1_IN_5
 S:BR_INER
 D:Bizarrely, this hound seems to be hardly moving at all, yet it approaches 
 D:you with deadly menace. It makes you tired just to look at it. 
@@ -8586,12 +11582,16 @@ B:CLAW:HURT:2d8
 B:CLAW:HURT:2d8
 B:BITE:HURT:2d8
 B:BITE:HURT:2d8
-F:FORCE_SLEEP | 
-F:FRIENDS | 
-F:BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | NO_CONF | NO_SLEEP
-F:MORTAL | BASEANGBAND
-S:1_IN_5 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+S:1_IN_5
 S:BR_WALL
 D:A deep brown shape is visible before you, its canine form striking you with 
 D:an almost physical force. The dungeon floor buckles as if struck by a 
@@ -8604,10 +11604,18 @@ W:37:1:0:800
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:ENGULF:HURT:6d6
-F:FORCE_SLEEP | RAND_50 | NONLIVING | CAN_FLY | 
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | 
-F:NO_FEAR | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_4 | 
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_50
+S:1_IN_4
 S:BR_SHAR
 D:A howling blast of razor-sharp mountain fragments, kept intact by perilous 
 D:magics. 
@@ -8621,13 +11629,27 @@ O:0:0:0:0
 B:TOUCH:ACID:1d10
 B:TOUCH:ACID:1d10
 B:TOUCH:ACID:1d10
-F:FORCE_SLEEP | 
-F:EMPTY_MIND | COLD_BLOOD | WILD_TOO | WILD_SHORE | WILD_SWAMP |
-F:KILL_ITEM | KILL_BODY | BASH_DOOR | POWERFUL | 
-F:IM_ACID | IM_FIRE | CAN_SWIM | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_5 | 
-S:BO_ACID | BA_ACID
+F:BASH_DOOR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:KILL_ITEM
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:WILD_SHORE
+F:WILD_TOO
+S:1_IN_5
+S:BA_ACID
+S:BO_ACID
 D:It is a towering mass of filth, an eyesore of ooze. 
 
 N:546:Young black dragon
@@ -8639,13 +11661,21 @@ O:50:50:0:0
 B:CLAW:HURT:2d6
 B:CLAW:HURT:2d6
 B:BITE:HURT:2d8
-F:FORCE_SLEEP | FORCE_MAXHP | WILD_TOO | WILD_SWAMP |
-F:DROP_3D2 | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | CAN_FLY | 
-F:EVIL | DRAGON | IM_ACID | BASEANGBAND | ATTR_MULTI
-S:1_IN_10 | 
-S:SCARE | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:OPEN_DOOR
+F:WILD_TOO
+S:1_IN_10
 S:BR_ACID
+S:SCARE
 D:It has a form out of legend. Its still-tender scales are a 
 D:darkest black hue. Acid drips from its body. 
 
@@ -8658,8 +11688,10 @@ O:0:0:0:0
 B:BUTT:HURT:8d6
 B:BUTT:HURT:8d6
 B:CRUSH:HURT:8d4
-F:BASH_DOOR | DROP_CORPSE | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:MORTAL
 D:A massive elephantine form with eyes twisted by madness. 
 
 N:548:Giant fire ant
@@ -8670,10 +11702,16 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:FIRE:3d12
 B:BITE:FIRE:3d12
-F:FORCE_MAXHP | KILL_BODY | FRIENDS | DROP_SKELETON
-F:WEIRD_MIND | BASH_DOOR | SUSCEP_COLD |
-F:ANIMAL | IM_FIRE
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:FRIENDS
+F:IM_FIRE
+F:KILL_BODY
+F:MORTAL
+F:SUSCEP_COLD
+F:WEIRD_MIND
 D:A giant ant covered in shaggy fur. Its powerful jaws glow with heat. 
 
 N:549:Mature white dragon
@@ -8685,13 +11723,27 @@ O:50:50:0:0
 B:CLAW:HURT:2d8
 B:CLAW:HURT:2d8
 B:BITE:HURT:4d8
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_4D2 | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | CAN_FLY | WILD_TOO | WILD_WASTE | WILD_MOUNTAIN | 
-F:EVIL | DRAGON | IM_COLD | NO_CONF | NO_SLEEP | SUSCEP_FIRE | BASEANGBAND | 
-F:HAS_LITE | ATTR_MULTI
-S:1_IN_9 |
-S:SCARE |
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:NO_CONF
+F:NO_SLEEP
+F:OPEN_DOOR
+F:SUSCEP_FIRE
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WASTE
+S:1_IN_9
 S:BR_COLD
+S:SCARE
 D:A large dragon, scales gleaming bright white. 
 
 N:550:Xorn
@@ -8704,11 +11756,19 @@ B:HIT:HURT:1d6
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
-F:FORCE_MAXHP | 
-F:EMPTY_MIND | COLD_BLOOD | 
-F:KILL_ITEM | PASS_WALL | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:HURT_ROCK | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:HURT_ROCK
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_ITEM
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
 D:A huge creature of the element Earth. Able to merge with its element, it 
 D:has four huge arms protruding from its enormous torso. 
 
@@ -8722,36 +11782,26 @@ B:HIT:HURT:6d7
 B:HIT:HURT:6d7
 B:BITE:HURT:4d10
 B:SPIT:ACID:4d8
-F:UNIQUE | MALE | 
-F:FORCE_MAXHP | 
-F:ESCORT | MOVE_BODY | 
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | DROP_CORPSE | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | REGENERATE | 
-F:EVIL | TROLL | IM_COLD | IM_POIS | BASEANGBAND
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:IM_COLD
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:TAKE_ITEM
+F:TROLL
+F:UNIQUE
 D:A massive and cruel troll of great power, drool slides caustically down 
 D:his muscular frame. Despite his bulk, he strikes with stunning speed. 
 
-N:552:Mist giant
-G:#:B
-I:120:35d10:20:50:50
-W:36:2:0:450
-E:0:0:0:0:0:0
-O:10:90:0:0
-B:CRUSH:HURT:4d8
-B:CRUSH:HURT:4d8
-B:CRUSH:HURT:4d8
-B:BITE:EXP_40:3d9
-F:FORCE_MAXHP | OPEN_DOOR | DROP_60 | WILD_TOO | WILD_SWAMP |
-F:SMART | BASH_DOOR | 
-F:EVIL | GIANT | IM_POIS | CAN_FLY | CTHANGBAND | NO_CUT
-D:"Two eyes, the colour of a thin, yellow wine, were set high in the 
-D:thing's body; though it had no separate head. A mouthing, obscene slit, 
-D:filled with fangs lay just beneath the eyes. It had no nose or ears... 
-D:Four appendages sprang from its upper parts and its lower body 
-D:slithered along the ground, unsupported by any limbs... incredibly 
-D:disgusting to behold and its amorphous body gave off a stench of death 
-D:and decay..." 
-
 N:553:Phantom
 G:G:v
 I:120:20d25:30:30:20
@@ -8762,13 +11812,23 @@ B:TOUCH:EXP_80
 B:TOUCH:EXP_40
 B:CLAW:LOSE_INT:1d10
 B:CLAW:LOSE_WIS:1d10
-F:FORCE_SLEEP | 
-F:ONLY_ITEM | DROP_1D2 | 
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | CAN_FLY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_1D2
+F:EVIL
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
 F:NO_CUT
-S:1_IN_5 | 
-S:FORGET | MIND_BLAST
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PASS_WALL
+F:UNDEAD
+S:1_IN_5
+S:FORGET
+S:MIND_BLAST
 D:An unholy creature of darkness, the aura emanating from this evil being 
 D:saps your very soul.
 
@@ -8781,13 +11841,26 @@ O:0:50:50:0
 B:HIT:HURT:1d10
 B:HIT:HURT:1d10
 B:TOUCH:EXP_40
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:DROP_60 | DROP_90 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | HURT_LITE | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_7 |
-S:HOLD | SCARE | CAUSE_3 | DARKNESS
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_60
+F:DROP_90
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:UNDEAD
+S:1_IN_7
+S:CAUSE_3
+S:DARKNESS
+S:HOLD
+S:SCARE
 D:A tangible but ghostly form, made of grey fog. The air around it feels 
 D:deathly cold. 
 
@@ -8801,13 +11874,28 @@ B:GAZE:PARALYZE
 B:CLAW:LOSE_CON:1d10
 B:CLAW:LOSE_CON:1d10
 B:GAZE:EXP_40
-F:FORCE_SLEEP | FORCE_MAXHP | REGENERATE |
-F:DROP_60 | DROP_90 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | MOVE_BODY |
-F:EVIL | UNDEAD | HURT_LITE | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_7 |
-S:CONF | SCARE | CAUSE_3 | DARKNESS
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_60
+F:DROP_90
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:MOVE_BODY
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:REGENERATE
+F:UNDEAD
+S:1_IN_7
+S:CAUSE_3
+S:CONF
+S:DARKNESS
+S:SCARE
 D:Back from the grave, to wreak vengeance upon the living. A skeletal figure 
 D:wearing a black robe, with eyes that burn with undying hatred. 
 
@@ -8820,34 +11908,35 @@ O:50:50:0:0
 B:CLAW:HURT:2d6
 B:CLAW:HURT:2d6
 B:BITE:HURT:3d8
-F:ATTR_MULTI | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE
-F:DROP_1D2 | DROP_3D2 | CAN_FLY |
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DRAGON | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | 
-F:IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
-S:1_IN_8 | 
-S:SCARE | 
-S:BR_ACID | BR_FIRE | BR_COLD | BR_ELEC | BR_POIS
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_1D2
+F:DROP_3D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_SLEEP
+F:OPEN_DOOR
+S:1_IN_8
+S:BR_ACID
+S:BR_COLD
+S:BR_ELEC
+S:BR_FIRE
+S:BR_POIS
+S:SCARE
 D:It has a form out of legend. Beautiful scales of shimmering 
 D:and magical colours cover it. 
 
-N:557:Raal's Tome of Destruction
-G:?:r
-I:120:50d15:20:150:15
-W:36:4:0:1500
-E:0:0:0:0:0:0
-O:20:0:80:0
-F:NEVER_MOVE | NEVER_BLOW | NONLIVING |
-F:FORCE_SLEEP | DROP_90 | DROP_GOOD | EVIL | COLD_BLOOD | EMPTY_MIND |
-F:FORCE_MAXHP | NO_CONF | NO_FEAR | NO_SLEEP | CHAR_MULTI |
-F:IM_ACID | IM_POIS | IM_COLD | IM_ELEC | SUSCEP_FIRE | RES_NETH | RES_TELE | 
-F:ZANGBAND | HAS_LITE | NO_CUT
-S:1_IN_2  |
-S:BO_ACID | BR_FIRE | BO_MANA | BR_COLD | BR_POIS |
-S:BO_WATE | BA_POIS | BR_NETH
-D:A sentient arcane tome casting spells with malevolent intent. 
-
 N:558:Colossus
 G:g:G
 I:110:30d100:15:150:10
@@ -8858,12 +11947,21 @@ B:HIT:HURT:10d10
 B:HIT:HURT:10d10
 B:HIT:HURT:6d6
 B:HIT:HURT:6d6
-F:FORCE_MAXHP | 
-F:EMPTY_MIND | COLD_BLOOD | BASH_DOOR | 
-F:IM_FIRE | IM_COLD | IM_ELEC | 
-F:IM_POIS | NONLIVING | REFLECTING |
-F:NO_CONF | NO_SLEEP | NO_FEAR
-F:MORTAL | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:REFLECTING
 S:1_IN_8
 S:ARROW_4
 D:An enormous construct resembling a titan made from stone. It strides 
@@ -8879,13 +11977,23 @@ O:50:50:0:0
 B:CLAW:HURT:2d6
 B:CLAW:HURT:2d6
 B:BITE:HURT:2d8
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:DROP_3D2 | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | WILD_TOO | WILD_MOUNTAIN |
-F:EVIL | DRAGON | BASEANGBAND | NO_STUN | HAS_LITE | ATTR_MULTI
-S:1_IN_10 | 
-S:SCARE | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:NO_STUN
+F:OPEN_DOOR
+F:WILD_MOUNTAIN
+F:WILD_TOO
+S:1_IN_10
 S:BR_SOUN
+S:SCARE
 D:It has a form out of legend. Its still-tender scales are a 
 D:tarnished gold hue, and light is reflected from its form. 
 
@@ -8898,14 +12006,25 @@ O:50:50:0:0
 B:CLAW:HURT:2d8
 B:CLAW:HURT:2d8
 B:BITE:HURT:4d8
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:DROP_4D2 | DROP_CORPSE
-F:BASH_DOOR | WILD_TOO | WILD_MOUNTAIN | WILD_WOOD |
-F:EVIL | DRAGON | IM_ELEC | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
 F:ATTR_MULTI
-S:1_IN_9 | 
-S:SCARE | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ELEC
+F:NO_CONF
+F:NO_SLEEP
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
+S:1_IN_9
 S:BR_ELEC
+S:SCARE
 D:A large dragon, scales tinted deep blue. 
 
 N:561:Mature green dragon
@@ -8917,14 +12036,25 @@ O:50:50:0:0
 B:CLAW:HURT:2d8
 B:CLAW:HURT:2d8
 B:BITE:HURT:4d8
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:DROP_4D2 | DROP_CORPSE | 
-F:BASH_DOOR | WILD_TOO | WILD_MOUNTAIN | WILD_WOOD |
-F:EVIL | DRAGON | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
 F:ATTR_MULTI
-S:1_IN_9 | 
-S:SCARE | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_POIS
+F:NO_CONF
+F:NO_SLEEP
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
+S:1_IN_9
 S:BR_POIS
+S:SCARE
 D:A large dragon, scales tinted deep green. 
 
 N:562:Mature bronze dragon
@@ -8936,13 +12066,24 @@ O:50:50:0:0
 B:CLAW:HURT:2d8
 B:CLAW:HURT:2d8
 B:BITE:HURT:4d8
-F:FORCE_SLEEP | FORCE_MAXHP | WILD_TOO | WILD_MOUNTAIN |
-F:DROP_4D2 | CAN_FLY |
-F:BASH_DOOR | DROP_CORPSE | 
-F:EVIL | DRAGON | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE | ATTR_MULTI
-S:1_IN_9 | 
-S:CONF | SCARE | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:NO_CONF
+F:NO_SLEEP
+F:WILD_MOUNTAIN
+F:WILD_TOO
+S:1_IN_9
 S:BR_CONF
+S:CONF
+S:SCARE
 D:A large dragon with scales of rich bronze. 
 
 N:563:Young red dragon
@@ -8954,31 +12095,28 @@ O:50:50:0:0
 B:CLAW:HURT:2d6
 B:CLAW:HURT:2d6
 B:BITE:HURT:2d8
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | SUSCEP_COLD |
-F:DROP_3D2 | WILD_TOO | WILD_MOUNTAIN | WILD_VOLCANO |
-F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE
-F:EVIL | DRAGON | IM_FIRE | BASEANGBAND | HAS_LITE | ATTR_MULTI
-S:1_IN_10 | 
-S:SCARE | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:OPEN_DOOR
+F:SUSCEP_COLD
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_VOLCANO
+S:1_IN_10
 S:BR_FIRE
+S:SCARE
 D:It has a form out of legend. Its still-tender scales are a 
 D:deepest red hue. Heat radiates from its form. 
 
-N:564:Nightblade
-G:h:D
-I:120:19d13:20:60:10
-W:36:2:1600:315
-E:1:1:1:2:1:1
-O:0:100:0:0
-B:HIT:POISON:3d4
-B:HIT:POISON:3d4
-B:HIT:LOSE_CON:3d4
-F:MALE | 
-F:DROP_1D2 | FRIENDS | INVISIBLE | DROP_SKELETON | DROP_CORPSE
-F:OPEN_DOOR | BASH_DOOR | HURT_LITE |
-F:EVIL | NO_CONF | NO_SLEEP | ZANGBAND
-D:A dark elven assassin, so stealthy that he is almost impossible to see. 
-
 N:565:Trapper
 G:.:w
 I:120:60d10:30:75:10
@@ -8989,11 +12127,18 @@ B:HIT:HURT:3d8
 B:HIT:HURT:3d8
 B:HIT:PARALYZE:15d1
 B:HIT:PARALYZE:15d1
-F:CHAR_CLEAR | ATTR_CLEAR | CHAR_MULTI | 
-F:NEVER_MOVE | FORCE_MAXHP | 
-F:INVISIBLE | EMPTY_MIND | COLD_BLOOD | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | 
-F:MORTAL | BASEANGBAND
+F:ATTR_CLEAR
+F:CHAR_CLEAR
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:INVISIBLE
+F:MORTAL
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
 D:This creature traps unsuspecting victims 
 D:and paralyzes them, to be slowly digested later. 
 
@@ -9006,12 +12151,22 @@ O:0:0:0:0
 B:HIT:FIRE:4d6
 B:HIT:FIRE:4d6
 B:GAZE:EXP_20
-F:FORCE_SLEEP | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | AURA_FIRE | NONLIVING |
-F:EVIL | DEMON | IM_FIRE | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND
+F:AURA_FIRE
+F:BASH_DOOR
+F:DEMON
+F:EVIL
+F:FORCE_SLEEP
 F:HAS_LITE
-S:1_IN_4 | 
-S:BO_FIRE | BA_FIRE | 
+F:IM_FIRE
+F:IM_POIS
+F:NONLIVING
+F:NO_CONF
+F:NO_SLEEP
+F:OPEN_DOOR
+F:TAKE_ITEM
+S:1_IN_4
+S:BA_FIRE
+S:BO_FIRE
 S:S_DEMON
 D:It is a humanoid form composed of flames and hatred. 
 
@@ -9022,10 +12177,19 @@ W:36:5:0:50
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:EXPLODE:TIME:30d2
-F:CHAR_CLEAR | ATTR_CLEAR | CHAR_MULTI | 
-F:NEVER_MOVE | FORCE_MAXHP | 
-F:EMPTY_MIND | INVISIBLE | COLD_BLOOD | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | JOKEANGBAND | NO_CUT
+F:ATTR_CLEAR
+F:CHAR_CLEAR
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:INVISIBLE
+F:JOKEANGBAND
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
 D:It was left here to be used against intruders. 
 
 N:568:Mezzodaemon
@@ -9036,37 +12200,25 @@ E:1:1:1:0:1:1
 O:0:0:0:0
 B:CLAW:HURT:5d6
 B:CLAW:HURT:5d6
-F:FORCE_SLEEP | PASS_WALL | INVISIBLE |
-F:IM_POIS | IM_COLD | IM_ACID | IM_FIRE |
-F:NO_SLEEP | NO_CONF | NO_STUN | NONLIVING |
-F:EVIL | DEMON | BASEANGBAND
-S:1_IN_4 | 
-S:BLINK | DARKNESS | S_DEMON
+F:DEMON
+F:EVIL
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:NONLIVING
+F:NO_CONF
+F:NO_SLEEP
+F:NO_STUN
+F:PASS_WALL
+S:1_IN_4
+S:BLINK
+S:DARKNESS
+S:S_DEMON
 D:An ugly demon with insect-like extremities and large bulbous eyes. 
 
-N:569:Elder thing
-G:u:G
-I:110:35d10:10:70:50
-W:36:3:0:800
-E:0:0:0:0:0:0
-O:0:0:0:0
-B:CRUSH:HURT:4d6
-B:CRUSH:HURT:4d6
-B:CRUSH:HURT:4d6
-B:TOUCH:LOSE_WIS
-F:FORCE_SLEEP | OPEN_DOOR | BASH_DOOR | ELDRITCH_HORROR | NONLIVING |
-F:EVIL | DEMON | IM_POIS | IM_ACID | NO_CONF | NO_SLEEP | RES_TELE |
-F:CAN_SWIM | CTHANGBAND
-S:1_IN_4 |
-S:SCARE | TELE_AWAY | BA_NUKE | CAUSE_4 | BA_POIS |
-S:CONF | S_DEMON | S_UNDEAD
-D:"...some ridged barrel-shaped objects with thin 
-D:horizontal arms radiating spoke-like from a central ring and with 
-D:vertical knobs or bulbs projecting from the head and base of the 
-D:barrel. Each of these knobs was the hub of a system of five long, 
-D:flat, triangularly tapering arms arranged around it like the arms 
-D:of a starfish." 
-
 N:570:Ice elemental
 G:E:w
 I:110:35d10:10:60:90
@@ -9076,13 +12228,26 @@ O:0:0:0:0
 B:TOUCH:COLD:4d3
 B:HIT:HURT:4d6
 B:TOUCH:COLD:4d3
-F:FORCE_SLEEP | 
-F:EMPTY_MIND | COLD_BLOOD | AURA_COLD |
-F:KILL_ITEM | KILL_BODY | BASH_DOOR | POWERFUL | 
-F:IM_COLD | IM_ELEC | CAN_SWIM | IM_POIS | IM_ACID | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_5 | 
-S:BO_ICEE | BA_COLD
+F:AURA_COLD
+F:BASH_DOOR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_POIS
+F:KILL_BODY
+F:KILL_ITEM
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+S:1_IN_5
+S:BA_COLD
+S:BO_ICEE
 D:It is a towering glacier of ice. 
 
 N:571:Necromancer
@@ -9093,16 +12258,30 @@ E:1:1:1:2:1:1
 O:10:0:90:0
 B:HIT:HURT:2d6
 B:HIT:HURT:2d6
-F:MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_1D2 | DROP_SKELETON
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:EVIL
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:HASTE | TPORT | TELE_TO | BLIND | HOLD | SCARE | CAUSE_3 | 
-S:BO_NETH | MIND_BLAST | FORGET |
-S:S_UNDEAD | ANIM_DEAD
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+S:1_IN_3
+S:BLIND
+S:BO_NETH
+S:CAUSE_3
+S:FORGET
+S:HASTE
+S:HOLD
+S:MIND_BLAST
+S:SCARE
+S:S_UNDEAD
+S:TELE_TO
+S:TPORT
 D:A gaunt figure, clothed in black robes. 
 
 N:572:The Greater hell magic mushroom were-quylthulg
@@ -9115,16 +12294,54 @@ B:GAZE:EXP_40:4d8
 B:GAZE:EXP_40:4d8
 B:CRUSH:ACID:8d8
 B:CRUSH:ACID:8d8
-F:FORCE_MAXHP | FORCE_SLEEP | UNIQUE | NO_STUN | NO_CONF |
-F:NO_SLEEP| EVIL | IM_ACID | IM_ELEC | IM_FIRE | IM_POIS | 
-F:IM_COLD | RES_NETH | RES_WATE | RES_PLAS | RES_DISE | SMART |
-F:RES_NEXU | NONLIVING | RES_TELE | KILL_WALL | ELDRITCH_HORROR |
-F:BASH_DOOR | DEMON | COLD_BLOOD | ANIMAL | CAN_SWIM |
-F:DROP_GOOD | DROP_GREAT | ONLY_ITEM | DROP_2D2 | JOKEANGBAND | NO_CUT
-S:1_IN_3 | 
-S:BLINK | SLOW | SCARE | DARKNESS | HEAL | ANIM_DEAD
-S:TPORT | TELE_AWAY | HASTE | S_MONSTER | DRAIN_MANA |
-S:S_UNDEAD | S_DEMON | S_DRAGON | S_KIN
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:DEMON
+F:DROP_2D2
+F:DROP_GOOD
+F:DROP_GREAT
+F:ELDRITCH_HORROR
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:JOKEANGBAND
+F:KILL_WALL
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:RES_DISE
+F:RES_NETH
+F:RES_NEXU
+F:RES_PLAS
+F:RES_TELE
+F:RES_WATE
+F:SMART
+F:UNIQUE
+S:1_IN_3
+S:BLINK
+S:DARKNESS
+S:DRAIN_MANA
+S:HASTE
+S:HEAL
+S:SCARE
+S:SLOW
+S:S_DEMON
+S:S_DRAGON
+S:S_KIN
+S:S_MONSTER
+S:S_UNDEAD
+S:TELE_AWAY
+S:TPORT
 D:This unholy abomination will crush you too. Flee while you can! 
 
 N:573:Lorgan, Chief of the Easterlings
@@ -9137,30 +12354,28 @@ B:HIT:HURT:6d6
 B:HIT:HURT:6d6
 B:HIT:HURT:3d8
 B:HIT:HURT:3d8
-F:UNIQUE | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:BASEANGBAND | HAS_LITE
-S:1_IN_4 | 
-S:TELE_TO | S_MONSTERS
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNIQUE
+S:1_IN_4
+S:S_MONSTERS
+S:TELE_TO
 D:A mighty warrior from the east, Lorgan hates everything that he cannot 
 D:control. 
 
-N:574:Chaos spawn
-G:e:s
-I:110:21d21:20:50:20
-W:38:2:1900:700
-E:0:0:0:0:0:0
-O:0:0:0:0
-B:GAZE:HURT:10d10
-B:GAZE:UN_BONUS:5d2
-B:GAZE:EXP_40:5d2
-B:GAZE:PARALYZE:5d2
-F:FORCE_MAXHP | BASH_DOOR | EVIL | CAN_FLY | ZANGBAND
-D:It has two eyestalks and a large central eye. Its gaze can kill. 
-
 N:575:Mummified troll
 G:z:w
 I:110:25d10:20:50:50
@@ -9169,11 +12384,22 @@ E:1:1:1:2:1:1
 O:0:100:0:0
 B:HIT:HURT:4d6
 B:HIT:HURT:4d6
-F:FORCE_MAXHP | 
-F:DROP_60 | 
-F:EMPTY_MIND | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | REGENERATE | 
-F:EVIL | TROLL | UNDEAD | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_60
+F:EMPTY_MIND
+F:EVIL
+F:FORCE_MAXHP
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:REGENERATE
+F:TROLL
+F:UNDEAD
 D:It is a massive figure clothed in wrappings. You are wary of its massive 
 D:fists. 
 
@@ -9185,13 +12411,23 @@ B:ENGULF:EXP_80:5d5
 B:ENGULF:UN_POWER:5d5
 B:ENGULF:UN_BONUS:5d5
 B:HIT:LOSE_ALL:5d5
-F:ATTR_MULTI | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:RAND_50 | RAND_25 | NONLIVING | CAN_FLY | 
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_6 | 
-S:BR_TIME | BR_DISE
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_25
+F:RAND_50
+S:1_IN_6
+S:BR_DISE
+S:BR_TIME
 D:Howling through the disintegrating dungeon, this awesome whirlpool of Unmagic 
 D:rips the enchantments from everything it touches. 
 
@@ -9205,67 +12441,32 @@ B:TOUCH:EXP_40
 B:TOUCH:UN_POWER
 B:TOUCH:LOSE_DEX:2d10
 B:TOUCH:LOSE_DEX:2d10
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_1D2 | RES_TELE | 
-F:SMART | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_3 | 
-S:BLINK | TELE_TO | TELE_AWAY | TELE_LEVEL |
-S:CAUSE_3 | DRAIN_MANA | BRAIN_SMASH
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_1D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:RES_TELE
+F:SMART
+F:UNDEAD
+S:1_IN_3
+S:BLINK
+S:BRAIN_SMASH
+S:CAUSE_3
+S:DRAIN_MANA
+S:TELE_AWAY
+S:TELE_LEVEL
+S:TELE_TO
 D:It is a skeletal form dressed in robes. It looks evil and devious... 
 
-N:578:Chaos butterfly
-G:I:G
-I:120:60d10:40:60:10
-W:37:2:0:1000
-E:1:1:1:2:1:1
-O:0:0:0:0
-B:CLAW:HURT:3d7
-B:CLAW:HURT:3d7
-B:CRUSH:HURT:10d5
-F:FORCE_SLEEP | 
-F:CAN_FLY |
-F:WEIRD_MIND | BASH_DOOR | ATTR_MULTI | ATTR_ANY |
-F:NO_CONF | NO_SLEEP | MORTAL | ZANGBAND
-S:1_IN_9
-S:BR_CONF | BR_CHAO
-D:With fractal patterns on its wings, it is clearly one of those butterflies 
-D:that mathematicians keep talking about - the ones that flap their wings on the  
-D:other side of the world to cause storms here. Now's your chance to stop it... 
-
-N:579:Time elemental
-G:E:G
-I:120:35d10:90:70:10
-W:39:2:0:1000
-E:0:0:0:0:0:0
-O:0:0:0:0
-B:TOUCH:TIME:3d4
-B:TOUCH:TIME:3d4
-F:PASS_WALL | IM_POIS | IM_FIRE | IM_ELEC | IM_FIRE | IM_ACID | CAN_FLY |
-F:NO_CONF | NO_SLEEP | EMPTY_MIND | KILL_ITEM | RAND_50 | 
-F:ZANGBAND | NO_CUT
-S:1_IN_7
-S:SLOW | BR_TIME |
-D:You have not seen it yet. 
-
-N:580:Flying polyp
-G:~:R
-I:120:35d10:90:70:10
-W:37:2:0:1000
-E:3:0:3:6:1:0
-O:0:0:0:0
-B:CRUSH:PARALYZE:8d4
-B:CRUSH:PARALYZE:8d4
-B:CRUSH:PARALYZE:8d4
-F:PASS_WALL | INVISIBLE | FORCE_MAXHP | RES_DISE | 
-F:IM_POIS | IM_COLD | IM_ACID | ELDRITCH_HORROR |
-F:NO_CONF | NO_SLEEP | EVIL | CAN_FLY | CTHANGBAND |NO_CUT
-S:1_IN_7
-S:BR_WALL |
-D:"They were only partly material and had the power of aerial motion, 
-D:despite the absence of wings... Suggestions of monstrous plasticity 
-D:and of temporary lapses of visibility..." 
-
 N:581:The Queen Ant
 G:a:v
 I:120:15d100:30:100:10
@@ -9276,14 +12477,24 @@ B:BITE:HURT:2d12
 B:BITE:HURT:2d12
 B:BITE:HURT:2d8
 B:BITE:HURT:2d8
-F:UNIQUE | FEMALE | GOOD | DROP_CORPSE
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ESCORT | ESCORTS | CAN_FLY |
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
-F:WEIRD_MIND | OPEN_DOOR | BASH_DOOR | 
-F:ANIMAL |
-F:MORTAL | BASEANGBAND
-S:1_IN_2 | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:ESCORT
+F:ESCORTS
+F:FEMALE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNIQUE
+F:WEIRD_MIND
+S:1_IN_2
 S:S_KIN
 D:She's upset because you hurt her children. 
 
@@ -9297,35 +12508,36 @@ B:HIT:HURT:1d9
 B:HIT:HURT:1d9
 B:HIT:HALLU:1d9
 B:HIT:HALLU:1d9
-F:FORCE_SLEEP | FORCE_MAXHP | RAND_50 | 
-F:SMART | EMPTY_MIND | INVISIBLE | 
-F:PASS_WALL | POWERFUL | CAN_FLY | WILD_TOO | WILD_SWAMP |
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | BASEANGBAND | HAS_LITE | NO_CUT
-S:1_IN_2 | 
-S:BLINK | TPORT | CONF | CAUSE_2
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:PASS_WALL
+F:POWERFUL
+F:RAND_50
+F:SMART
+F:WILD_TOO
+S:1_IN_2
+S:BLINK
+S:CAUSE_2
+S:CONF
+S:TPORT
 D:A strange ball of glowing light. It disappears and reappears and seems to 
 D:draw you to it. You seem somehow compelled to stand still and watch its 
 D:strange dancing motion. 
 
-N:583:Shan
-G:I:B
-I:120:20d8:20:120:20
-W:37:4:0:250
-E:0:0:0:0:0:0
-O:0:0:0:0
-F:IM_POIS | IM_COLD | COLD_BLOOD | ANIMAL | EVIL | 
-F:NO_SLEEP | NO_CONF | CAN_FLY | NEVER_BLOW | CTHANGBAND | 
-S:1_IN_2
-S:CONF | HOLD | DRAIN_MANA | FORGET | MIND_BLAST | SHRIEK
-D:"Those huge lidless eyes which stared with hate at me, the jointed 
-D:tendrils which seemed to twist from the head in cosmic rhythms, 
-D:the ten legs, covered with black shining tentacles and folded into 
-D:the pallid underbelly, and the semi-circular ridged wings covered 
-D:with triangular scales -- all this cannot convey the soul-ripping 
-D:horror of the shape which darted at me. I saw the three mouths 
-D:of the thing move moistly, and then it was upon me." 
-
 N:584:Magma elemental
 G:E:o
 I:110:35d10:10:70:90
@@ -9335,13 +12547,27 @@ O:0:0:0:0
 B:HIT:FIRE:3d7
 B:HIT:HURT:4d6
 B:HIT:FIRE:3d7
-F:FORCE_SLEEP | 
-F:EMPTY_MIND | AURA_FIRE | WILD_TOO | WILD_VOLCANO |
-F:KILL_ITEM | KILL_BODY | PASS_WALL | POWERFUL | 
-F:IM_FIRE | IM_ELEC | IM_ACID | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | HAS_LITE | NO_CUT
-S:1_IN_7 | 
-S:BO_PLAS | BA_FIRE
+F:AURA_FIRE
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:KILL_ITEM
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:PASS_WALL
+F:POWERFUL
+F:WILD_TOO
+F:WILD_VOLCANO
+S:1_IN_7
+S:BA_FIRE
+S:BO_PLAS
 D:It is a towering glowing form of molten rock. 
 
 N:585:Black pudding
@@ -9354,13 +12580,27 @@ B:TOUCH:ACID:1d10
 B:TOUCH:ACID:1d10
 B:TOUCH:ACID:1d10
 B:TOUCH:ACID:1d10
-F:FORCE_MAXHP | 
-F:FRIENDS | 
-F:DROP_60 | DROP_90 | DROP_1D2 | 
-F:STUPID | EMPTY_MIND | COLD_BLOOD | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | CAN_SWIM | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_60
+F:DROP_90
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FRIENDS
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:STUPID
+F:TAKE_ITEM
 D:A lump of rotting black flesh that slurrrrrrrps across the dungeon floor. 
 
 N:586:Killer iridescent beetle
@@ -9372,10 +12612,17 @@ O:0:0:0:0
 B:CLAW:ELEC:1d12
 B:CLAW:ELEC:1d12
 B:GAZE:PARALYZE
-F:ATTR_MULTI | FORCE_MAXHP | 
-F:WEIRD_MIND | BASH_DOOR | AURA_ELEC | DROP_CORPSE | 
-F:ANIMAL | IM_ELEC | CAN_FLY | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:ANIMAL
+F:ATTR_MULTI
+F:AURA_ELEC
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_ELEC
+F:MORTAL
+F:WEIRD_MIND
 D:It is a giant beetle, whose carapace shimmers with vibrant energies. 
 
 N:587:Nexus vortex
@@ -9385,11 +12632,22 @@ W:37:1:0:800
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:ENGULF:HURT:5d5
-F:FORCE_SLEEP | 
-F:RAND_50 | RAND_25 | RES_NEXU | CAN_FLY |
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | RES_TELE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | BASEANGBAND | HAS_LITE | NO_CUT
-S:1_IN_6 | 
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HAS_LITE
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_25
+F:RAND_50
+F:RES_NEXU
+F:RES_TELE
+S:1_IN_6
 S:BR_NEXU
 D:A maelstrom of potent magical energy. 
 
@@ -9401,12 +12659,25 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:ENGULF:FIRE:4d8
 B:ENGULF:ELEC:4d8
-F:FORCE_SLEEP | SUSCEP_COLD |
-F:RAND_50 | RAND_25 | RES_PLAS | AURA_FIRE | AURA_ELEC |
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | 
-F:IM_FIRE | CAN_FLY |
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | BASEANGBAND | HAS_LITE | NO_CUT
-S:1_IN_6 | 
+F:AURA_ELEC
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_25
+F:RAND_50
+F:RES_PLAS
+F:SUSCEP_COLD
+S:1_IN_6
 S:BR_PLAS
 D:A whirlpool of intense flame, charring the stones at your feet. 
 
@@ -9419,14 +12690,28 @@ O:50:50:0:0
 B:CLAW:HURT:2d10
 B:CLAW:HURT:2d10
 B:BITE:HURT:4d10
-F:FORCE_SLEEP | FORCE_MAXHP | WILD_TOO | WILD_MOUNTAIN | WILD_VOLCANO |
-F:DROP_1D2 | DROP_4D2 | CAN_FLY | DROP_CORPSE | SUSCEP_COLD |
-F:BASH_DOOR | 
-F:EVIL | DRAGON | IM_FIRE | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
 F:ATTR_MULTI
-S:1_IN_9 | 
-S:CONF | SCARE | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:NO_CONF
+F:NO_SLEEP
+F:SUSCEP_COLD
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_VOLCANO
+S:1_IN_9
 S:BR_FIRE
+S:CONF
+S:SCARE
 D:A large dragon, scales tinted deep red.
 
 N:590:Mature gold dragon
@@ -9438,13 +12723,25 @@ O:50:50:0:0
 B:CLAW:HURT:2d10
 B:CLAW:HURT:2d10
 B:BITE:HURT:4d10
-F:FORCE_SLEEP | FORCE_MAXHP | WILD_TOO | WILD_MOUNTAIN |
-F:DROP_1D2 | DROP_4D2 | CAN_FLY | DROP_CORPSE | 
-F:BASH_DOOR | 
-F:EVIL | DRAGON | NO_STUN | NO_SLEEP | BASEANGBAND | HAS_LITE | ATTR_MULTI
-S:1_IN_9 | 
-S:CONF | SCARE | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:NO_SLEEP
+F:NO_STUN
+F:WILD_MOUNTAIN
+F:WILD_TOO
+S:1_IN_9
 S:BR_SOUN
+S:CONF
+S:SCARE
 D:A large dragon with scales of gleaming gold. 
 
 N:591:Crystal drake
@@ -9456,14 +12753,28 @@ O:50:50:0:0
 B:CLAW:HURT:2d4
 B:CLAW:HURT:2d4
 B:BITE:HURT:3d6
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_3D2 | REFLECTING |
-F:OPEN_DOOR | BASH_DOOR | CAN_FLY |
-F:EVIL | DRAGON | IM_COLD | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE | NO_CUT
 F:ATTR_MULTI
-S:1_IN_6 | 
-S:SLOW | CONF | SCARE | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REFLECTING
+S:1_IN_6
 S:BR_SHAR
+S:CONF
+S:SCARE
+S:SLOW
 D:A dragon of strange crystalline form. Light shines through it, dazzling 
 D:your eyes with spectrums of colour. 
 
@@ -9476,13 +12787,24 @@ O:50:50:0:0
 B:CLAW:HURT:2d10
 B:CLAW:HURT:2d10
 B:BITE:HURT:4d10
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | DROP_CORPSE | 
-F:DROP_1D2 | DROP_4D2 | WILD_TOO | WILD_SWAMP | WILD_MOUNTAIN |
-F:BASH_DOOR | 
-F:EVIL | DRAGON | IM_ACID | NO_CONF | NO_SLEEP | BASEANGBAND | ATTR_MULTI
-S:1_IN_9 | 
-S:SCARE | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:NO_CONF
+F:NO_SLEEP
+F:WILD_MOUNTAIN
+F:WILD_TOO
+S:1_IN_9
 S:BR_ACID
+S:SCARE
 D:A large dragon, with scales of deepest black. 
 
 N:593:Mature multi-hued dragon
@@ -9494,35 +12816,36 @@ O:50:50:0:0
 B:CLAW:HURT:2d12
 B:CLAW:HURT:2d12
 B:BITE:HURT:4d12
-F:ATTR_MULTI | 
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:DROP_2D2 | DROP_4D2 | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DRAGON | IM_ACID | IM_FIRE | IM_COLD | 
-F:IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
-S:1_IN_7 | 
-S:BLIND | CONF | SCARE | 
-S:BR_ACID | BR_FIRE | BR_COLD | BR_ELEC | BR_POIS
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_SLEEP
+F:OPEN_DOOR
+S:1_IN_7
+S:BLIND
+S:BR_ACID
+S:BR_COLD
+S:BR_ELEC
+S:BR_FIRE
+S:BR_POIS
+S:CONF
+S:SCARE
 D:A large dragon, scales shimmering many colours. 
 
-N:594:Sky whale
-G:~:G
-I:110:80d10:20:75:30
-W:38:6:4000:1750
-E:0:0:0:0:1:0
-O:50:50:0:0
-B:CRUSH:HURT:20d2
-B:CRUSH:HURT:20d2
-B:CRUSH:HURT:20d2
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:DROP_60 | DROP_90 | DROP_2D2 | DROP_CORPSE | 
-F:BASH_DOOR | SMART | GOOD | 
-F:NO_CONF | NO_SLEEP | RES_NEXU | RES_TELE | RES_DISE
-F:MORTAL | ZANGBAND
-S:1_IN_9 | 
-S:BRAIN_SMASH | CONF | SCARE | FORGET | TELE_TO | TELE_AWAY | SHRIEK
-D:A vastly intelligent whale-like being from the stars. 
-
 N:595:Draebor, the Imp
 G:u:v
 I:120:19d99:12:80:50
@@ -9533,38 +12856,42 @@ B:CLAW:POISON:8d4
 B:CLAW:POISON:8d4
 B:BITE:HURT:8d8
 B:INSULT:*
+F:BASH_DOOR
+F:CAN_SPEAK
+F:CAN_SWIM
+F:DEMON
+F:DROP_1D2
+F:DROP_60
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_GOOD
 F:ESCORT
-F:DROP_60 | DROP_90 | DROP_1D2 | DROP_GOOD | ONLY_ITEM | DROP_CORPSE | 
-F:CAN_SWIM | BASH_DOOR | RES_TELE | CAN_SPEAK |
-F:EVIL | DEMON | IM_FIRE | IM_COLD | IM_POIS | RES_WATE |
-F:UNIQUE | MALE | FORCE_SLEEP | FORCE_MAXHP | POWERFUL |
-F:NO_SLEEP | BASEANGBAND | HAS_LITE
-S:1_IN_5 | 
-S:S_KIN | BLINK | TPORT | TELE_TO | TELE_AWAY | TELE_LEVEL | BLIND | 
-S:CONF | SCARE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:NO_SLEEP
+F:ONLY_ITEM
+F:POWERFUL
+F:RES_TELE
+F:RES_WATE
+F:UNIQUE
+S:1_IN_5
+S:BLIND
+S:BLINK
+S:CONF
+S:SCARE
+S:S_KIN
+S:TELE_AWAY
+S:TELE_LEVEL
+S:TELE_TO
+S:TPORT
 D:An intensely irritating git of a monster. 
 
-N:596:Mother Hydra
-G:u:v
-I:120:25d99:12:80:50
-W:40:3:30000:3250
-E:0:1:0:2:2:0
-O:0:50:50:0
-B:CLAW:POISON:8d4
-B:CLAW:POISON:8d4
-B:BITE:HURT:8d8
-F:ESCORT | 
-F:DROP_60 | DROP_90 | DROP_1D2 | DROP_GOOD | ONLY_ITEM | DROP_CORPSE | 
-F:CAN_SWIM | BASH_DOOR | ELDRITCH_HORROR | RES_TELE | CAN_SPEAK |
-F:EVIL | DEMON | IM_FIRE | IM_COLD | IM_POIS | RES_WATE |
-F:UNIQUE | FEMALE | FORCE_SLEEP | FORCE_MAXHP | POWERFUL |
-F:NO_CONF |
-F:MORTAL | CTHANGBAND
-S:1_IN_7 | 
-S:S_HYDRA | S_DEMON | DARKNESS | BA_WATE | BO_ACID | BA_ACID 
-D:The queen of the deep ones. "Vast, Polyphemus-like, and loathsome, it 
-D:darted like a stupendous monster of nightmares..." 
-
 N:597:Death knight
 G:p:D
 I:120:60d10:20:100:10
@@ -9574,12 +12901,25 @@ O:0:90:0:10
 B:HIT:EXP_20:6d6
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | RES_NETH |
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | IM_COLD | BASEANGBAND | HAS_LITE | NO_CUT
-S:1_IN_5 | 
-S:BLIND | SCARE | CAUSE_3 | BO_NETH | 
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_2D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:NO_CUT
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_NETH
+F:SMART
+S:1_IN_5
+S:BLIND
+S:BO_NETH
+S:CAUSE_3
+S:SCARE
 S:S_MONSTERS
 D:It is a humanoid figure dressed in armour of an ancient form. From beneath 
 D:its helmet, eyes glow a baleful red and seem to pierce you like lances of 
@@ -9595,13 +12935,25 @@ B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
-F:UNIQUE | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
-F:SMART | OPEN_DOOR | TAKE_ITEM | BASH_DOOR | 
-F:EVIL | BASEANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:HEAL | TRAPS | BO_FIRE | BO_COLD | BO_ELEC | BO_ICEE
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:TAKE_ITEM
+F:UNIQUE
+S:1_IN_2
+S:BO_COLD
+S:BO_ELEC
+S:BO_FIRE
+S:BO_ICEE
+S:HEAL
 D:A Black Numenorean who usurped the throne of Gondor, he is treacherous and 
 D:evil. 
 
@@ -9612,11 +12964,19 @@ W:38:4:0:800
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:ENGULF:TIME:5d5
-F:FORCE_SLEEP | 
-F:RAND_50 | RAND_25 | 
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | CAN_FLY |
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | BASEANGBAND | NO_CUT
-S:1_IN_6 | 
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_25
+F:RAND_50
+S:1_IN_6
 S:BR_TIME
 D:You haven't seen it yet. 
 
@@ -9628,12 +12988,23 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:ENGULF:BLIND:4d4
 B:ENGULF:BLIND:4d4
-F:FORCE_SLEEP | 
-F:RAND_50 | RAND_25 | CAN_FLY |
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | RES_TELE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | BASEANGBAND | HAS_LITE | NO_CUT
-S:1_IN_4 | 
-S:BR_LITE | SHRIEK
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HAS_LITE
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_25
+F:RAND_50
+F:RES_TELE
+S:1_IN_4
+S:BR_LITE
+S:SHRIEK
 D:A strange pillar of shining light that hurts your eyes. Its shape changes 
 D:constantly as it cuts through the air towards you. It is like a beacon, 
 D:waking monsters from their slumber. 
@@ -9647,14 +13018,28 @@ O:50:50:0:0
 B:CLAW:HURT:4d8
 B:CLAW:HURT:4d8
 B:BITE:ELEC:7d8
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:DROP_3D2 | DROP_4D2 | DROP_CORPSE | 
-F:SMART | BASH_DOOR | POWERFUL | MOVE_BODY | CAN_FLY |
-F:EVIL | DRAGON | IM_ELEC | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
 F:ATTR_MULTI
-S:1_IN_6 | 
-S:BLIND | CONF | SCARE | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ELEC
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:POWERFUL
+F:SMART
+S:1_IN_6
+S:BLIND
 S:BR_ELEC
+S:CONF
+S:SCARE
 D:A huge draconic form. Lightning crackles along its length. 
 
 N:602:Ancient bronze dragon
@@ -9666,13 +13051,27 @@ O:50:50:0:0
 B:CLAW:HURT:4d8
 B:CLAW:HURT:4d8
 B:BITE:HURT:7d8
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE | 
-F:DROP_3D2 | DROP_4D2 | CAN_FLY |
-F:SMART | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DRAGON | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE | ATTR_MULTI
-S:1_IN_6 | 
-S:BLIND | CONF | SCARE | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:POWERFUL
+F:SMART
+S:1_IN_6
+S:BLIND
 S:BR_CONF
+S:CONF
+S:SCARE
 D:A huge draconic form enveloped in a cascade of colour. 
 
 N:603:Beholder
@@ -9685,12 +13084,29 @@ B:GAZE:EXP_20:2d6
 B:GAZE:UN_POWER:2d6
 B:GAZE:INSANITY:2d6
 B:BITE:HURT:6d6
-F:FORCE_SLEEP | FORCE_MAXHP  | RES_TELE | CAN_FLY |
-F:BASH_DOOR | DROP_CORPSE | 
-F:EVIL | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND
-S:1_IN_2 | 
-S:BLIND | SLOW | CONF | SCARE | DRAIN_MANA | MIND_BLAST | 
-S:FORGET | DARKNESS | BO_ACID | BO_FIRE | BO_COLD | BO_ELEC 
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_POIS
+F:NO_CONF
+F:NO_SLEEP
+F:RES_TELE
+S:1_IN_2
+S:BLIND
+S:BO_ACID
+S:BO_COLD
+S:BO_ELEC
+S:BO_FIRE
+S:CONF
+S:DARKNESS
+S:DRAIN_MANA
+S:FORGET
+S:MIND_BLAST
+S:SCARE
+S:SLOW
 D:A vile creature with one huge central eye, twelve smaller eyes on stalks, and 
 D:a huge mouth filled with sharp teeth. 
 
@@ -9704,13 +13120,28 @@ B:HIT:HURT:1d12
 B:HIT:HURT:1d12
 B:TOUCH:EXP_80
 B:TOUCH:EXP_80
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_90 | DROP_4D2 | CAN_FLY |
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_6 | 
-S:HOLD | SCARE | CAUSE_3 | BO_NETH
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_4D2
+F:DROP_90
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNDEAD
+S:1_IN_6
+S:BO_NETH
+S:CAUSE_3
+S:HOLD
+S:SCARE
 D:Your life force is torn from your body as this powerful unearthly being 
 D:approaches. 
 
@@ -9724,14 +13155,40 @@ B:HIT:HURT:4d6
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:HIT:HURT:4d6
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | NO_FEAR | GOOD | CAN_FLY |
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | REFLECTING | RES_TELE
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
-S:1_IN_11 | 
-S:HEAL | HASTE | TELE_AWAY | CONF | BO_MANA | BO_PLAS | 
-S:S_MONSTERS | S_ANGEL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_1D2
+F:DROP_2D2
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MOVE_BODY
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:REFLECTING
+F:RES_TELE
+F:SMART
+F:SMART
+F:TAKE_ITEM
+S:1_IN_11
+S:BO_MANA
+S:BO_PLAS
+S:CONF
+S:HASTE
+S:HEAL
+S:S_ANGEL
+S:S_MONSTERS
+S:TELE_AWAY
 D:It is an angel, fast and strong. You are stunned by its extreme holiness 
 D:and try to resist all desires to obey it. 
 
@@ -9745,14 +13202,32 @@ B:HIT:FIRE:6d6
 B:HIT:FIRE:6d6
 B:HIT:FIRE:6d6
 B:HIT:FIRE:6d6
-F:UNIQUE | SUSCEP_COLD |
-F:FORCE_SLEEP | FORCE_MAXHP | RAND_25 | CAN_SPEAK |
-F:EMPTY_MIND | CAN_SPEAK | MALE | AURA_FIRE |
-F:KILL_ITEM | KILL_BODY | BASH_DOOR | POWERFUL | 
-F:IM_FIRE | IM_ACID | IM_POIS | IM_ELEC | NO_STUN |
-F:NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE | NO_CUT
-S:1_IN_4 | 
-S:BO_PLAS | BA_FIRE
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:CAN_SPEAK
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:KILL_ITEM
+F:MALE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:NO_STUN
+F:POWERFUL
+F:RAND_25
+F:SUSCEP_COLD
+F:UNIQUE
+S:1_IN_4
+S:BA_FIRE
+S:BO_PLAS
 D:A towering fire elemental, Vargo burns everything beyond recognition. 
 
 N:607:Black wraith
@@ -9765,68 +13240,32 @@ B:HIT:HURT:1d12
 B:HIT:HURT:1d12
 B:TOUCH:EXP_40
 B:TOUCH:EXP_40
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP
-F:BASEANGBAND | NO_CUT
-S:1_IN_7 | 
-S:BLIND | HOLD | SCARE | CAUSE_3 | BO_NETH
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_2D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNDEAD
+S:1_IN_7
+S:BLIND
+S:BO_NETH
+S:CAUSE_3
+S:HOLD
+S:SCARE
 D:A figure that seems made of void, its strangely human shape is cloaked in 
 D:shadow. It reaches out at you. 
 
-N:608:Nightgaunt
-G:U:D
-I:110:24d10:20:50:80
-W:38:2:0:1000
-E:0:0:0:0:0:0
-O:50:0:50:0
-B:STING:LOSE_STR:1d5
-B:TOUCH:PARALYZE:3d4
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_60 | ELDRITCH_HORROR |
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | CAN_FLY |
-F:EVIL | DEMON | 
-F:IM_FIRE | IM_POIS | NO_CONF | NO_SLEEP | ZANGBAND
-S:1_IN_7 | 
-S:BLIND | CONF | BO_FIRE
-D:It is a black, horned humanoid with wings. 
-
-N:609:Baron of hell
-G:U:U
-I:110:150d12:10:130:40
-W:38:3:0:1000
-E:1:1:1:2:1:1
-O:0:0:0:0
-B:CLAW:HURT:11d2
-B:CLAW:HURT:11d2
-B:CLAW:HURT:22d1
-F:IM_POIS | OPEN_DOOR | BASH_DOOR | MALE | RES_PLAS | IM_FIRE | NONLIVING |
-F:IM_FIRE | NO_CONF | NO_SLEEP | EVIL | DEMON | FORCE_MAXHP | RES_TELE | 
-F:ZANGBAND | HAS_LITE
-S:1_IN_2 |
-S:BO_PLAS
-D:A minor demon lord with a goat's head, tough to kill. 
-
-N:610:Scylla
-G:M:B
-I:125:100d20:20:100:70
-W:42:1:15000:13000
-E:0:1:0:2:2:0
-O:0:0:0:0
-B:BITE:POISON:10d3
-B:BITE:POISON:10d3
-B:BITE:POISON:10d3
-B:BITE:POISON:10d3
-F:FORCE_SLEEP | UNIQUE | AQUATIC | FORCE_MAXHP | COLD_BLOOD | 
-F:ONLY_GOLD | DROP_2D2 | DROP_4D2 | DROP_CORPSE | 
-F:BASH_DOOR | MOVE_BODY | EVIL | ZANGBAND | RES_WATE | 
-F:ANIMAL | IM_POIS | IM_FIRE
-S:1_IN_5 | 
-S:BR_POIS | BR_FIRE | SCARE | CONF | S_HYDRA
-D:A many-headed sea-monster, this foul creature preys on all those who 
-D:escape the clutches of Charybdis. 
-
 N:611:Monastic lich
 G:L:u
 I:120:12d100:30:80:30
@@ -9837,14 +13276,35 @@ B:KICK:HURT:24d1
 B:KICK:HURT:24d1
 B:CLAW:EXP_80:4d2
 B:CLAW:LOSE_DEX:4d2
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | RES_TELE | 
-F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | SMART |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND
-F:NO_CUT
-S:1_IN_3 | 
-S:BLINK | TELE_TO | BLIND | HOLD | CONF | SCARE | CAUSE_3 | CAUSE_4 | 
-S:DRAIN_MANA | BRAIN_SMASH | ANIM_DEAD 
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_4D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:SMART
+F:SMART
+F:UNDEAD
+S:1_IN_3
+S:BLIND
+S:BLINK
+S:BRAIN_SMASH
+S:CAUSE_3
+S:CAUSE_4
+S:CONF
+S:DRAIN_MANA
+S:HOLD
+S:SCARE
+S:TELE_TO
 D:A skeletal form wrapped in priestly robes. Before its un-death, it 
 D:was a monk in an evil order. 
 
@@ -9858,13 +13318,30 @@ B:HIT:HURT:1d12
 B:HIT:HURT:1d12
 B:TOUCH:EXP_80
 B:TOUCH:EXP_80
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:ONLY_ITEM | DROP_90 | DROP_4D2 | 
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | 
-F:HURT_LITE | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_6 | 
-S:BLIND | SCARE | CAUSE_3 | MIND_BLAST | DARKNESS | BO_NETH
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_4D2
+F:DROP_90
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PASS_WALL
+F:UNDEAD
+S:1_IN_6
+S:BLIND
+S:BO_NETH
+S:CAUSE_3
+S:DARKNESS
+S:MIND_BLAST
+S:SCARE
 D:A form that hurts the eye, death permeates the air around it. As it nears 
 D:you, a coldness saps your soul. 
 
@@ -9877,11 +13354,21 @@ O:0:0:0:0
 B:BITE:FIRE:3d12
 B:BITE:FIRE:3d12
 B:BITE:FIRE:3d12
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE 
-F:RAND_25 | FRIENDS | AURA_FIRE | SUSCEP_COLD |
-F:BASH_DOOR | MOVE_BODY | 
-F:ANIMAL | EVIL | IM_FIRE | BASEANGBAND | HAS_LITE | 
-S:1_IN_5 | BR_FIRE
+F:ANIMAL
+F:AURA_FIRE
+F:BASH_DOOR
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:FRIENDS
+F:HAS_LITE
+F:IM_FIRE
+F:MOVE_BODY
+F:RAND_25
+F:SUSCEP_COLD
+S:1_IN_5
+S:BR_FIRE
 D:It is a giant dog that glows with heat. Flames pour from its nostrils.
 
 N:614:7-headed hydra
@@ -9894,13 +13381,23 @@ B:BITE:POISON:3d9
 B:BITE:POISON:3d9
 B:BITE:POISON:3d9
 B:SPIT:BLIND:1d2
-F:FORCE_SLEEP | WILD_TOO | WILD_SHORE | WILD_SWAMP |
-F:ONLY_GOLD | DROP_2D2 | DROP_4D2 | CAN_SWIM | DROP_CORPSE
-F:BASH_DOOR | MOVE_BODY | 
-F:ANIMAL | IM_POIS | MORTAL | BASEANGBAND
-S:1_IN_5 | 
-S:SCARE | BA_POIS | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:IM_POIS
+F:MORTAL
+F:MOVE_BODY
+F:ONLY_GOLD
+F:WILD_SHORE
+F:WILD_TOO
+S:1_IN_5
+S:BA_POIS
 S:BR_POIS
+S:SCARE
 D:A strange reptilian creature with seven heads dripping venom. 
 
 N:615:Waldern, King of Water
@@ -9913,14 +13410,28 @@ B:HIT:HURT:8d5
 B:HIT:HURT:8d5
 B:HIT:HURT:8d5
 B:HIT:HURT:8d5
-F:UNIQUE | 
-F:FORCE_SLEEP | FORCE_MAXHP |
-F:EMPTY_MIND | COLD_BLOOD | 
-F:KILL_ITEM | KILL_BODY | BASH_DOOR | POWERFUL | 
-F:IM_ACID | IM_FIRE | IM_POIS | IM_COLD |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_3 | 
-S:BO_ICEE | BO_WATE | BA_COLD | BA_WATE
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:KILL_ITEM
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:UNIQUE
+S:1_IN_3
+S:BA_COLD
+S:BA_WATE
+S:BO_ICEE
+S:BO_WATE
 D:A towering water elemental, Waldern is master of all things liquid. 
 D:Wave after wave drowns your frail body. 
 
@@ -9934,15 +13445,39 @@ B:BITE:HURT:2d12
 B:BITE:HURT:2d12
 B:BITE:HURT:2d12
 B:BITE:HURT:2d12
-F:UNIQUE | MALE | ATTR_MULTI | CAN_SPEAK | ATTR_ANY |
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | RES_NEXU |
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | CAN_FLY |
-F:EVIL | DRAGON | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | 
-F:BASEANGBAND | HAS_LITE |
-S:1_IN_4 | 
-S:BR_ACID | BR_FIRE | BR_COLD | BR_ELEC | BR_SOUN | BR_CONF | 
-S:BR_SHAR | BR_GRAV | BR_NEXU
+F:ATTR_ANY
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:DRAGON
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:RES_NEXU
+F:UNIQUE
+S:1_IN_4
+S:BR_ACID
+S:BR_COLD
+S:BR_CONF
+S:BR_ELEC
+S:BR_FIRE
+S:BR_GRAV
+S:BR_NEXU
+S:BR_SHAR
+S:BR_SOUN
 D:A large dragon with a selection of heads, all shouting and arguing as they 
 D:look for prey, but each with its own deadly breath weapon. 
 
@@ -9955,14 +13490,29 @@ O:50:50:0:0
 B:CLAW:HURT:4d8
 B:CLAW:HURT:4d8
 B:BITE:COLD:7d8
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:DROP_3D2 | DROP_4D2 | DROP_CORPSE | 
-F:SMART | BASH_DOOR | POWERFUL | MOVE_BODY | CAN_FLY |
-F:EVIL | DRAGON | IM_COLD | NO_CONF | NO_SLEEP | SUSCEP_FIRE | BASEANGBAND
-F:HAS_LITE | ATTR_MULTI
-S:1_IN_6 | 
-S:BLIND | CONF | SCARE | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:POWERFUL
+F:SMART
+F:SUSCEP_FIRE
+S:1_IN_6
+S:BLIND
 S:BR_COLD
+S:CONF
+S:SCARE
 D:A huge draconic form. Frost covers it from head to tail. 
 
 N:618:Ancient green dragon
@@ -9974,38 +13524,30 @@ O:50:50:0:0
 B:CLAW:HURT:4d8
 B:CLAW:HURT:4d8
 B:BITE:POISON:7d8
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE | 
-F:DROP_3D2 | DROP_4D2 | CAN_FLY |
-F:SMART | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DRAGON | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
 F:ATTR_MULTI
-S:1_IN_6 | 
-S:BLIND | CONF | SCARE | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_POIS
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:POWERFUL
+F:SMART
+S:1_IN_6
+S:BLIND
 S:BR_POIS
+S:CONF
+S:SCARE
 D:A huge draconic form enveloped in clouds of poisonous vapour. 
 
-N:619:Chthonian
-G:w:D
-I:120:100d10:20:90:20
-W:39:2:12000:2300
-E:0:0:0:0:0:0
-O:0:0:0:0
-B:CRUSH:SHATTER:3d11
-B:CRUSH:SHATTER:3d11
-B:TOUCH:LOSE_CON:1d2
-B:TOUCH:LOSE_CON:1d2
-F:IM_FIRE | RES_PLAS | IM_COLD | IM_POIS | ELDRITCH_HORROR | RES_TELE | 
-F:KILL_WALL | ONLY_GOLD | DROP_4D2 | DROP_2D2 | CAN_SWIM | DROP_CORPSE | 
-F:EVIL | FORCE_MAXHP | CTHANGBAND
-S:1_IN_5 | 
-S:SCARE | CONF | HOLD | S_DEMON | 
-S:MIND_BLAST | HEAL | HASTE | FORGET | BRAIN_SMASH
-D:"Flowing tentacles and a pulpy gray-black elongated sack of a body... 
-D:no distinguishing features at all other than the reaching, groping 
-D:tentacles. Or was there -- yes! -- a lump in the upper body of 
-D:the thing... a container of sorts for the brain, ganglia, or 
-D:whichever diseased organ governed this horror's loathsome life!" 
-
 N:620:Eldrak
 G:T:r
 I:110:75d10:20:80:50
@@ -10016,10 +13558,22 @@ B:HIT:HURT:3d6
 B:HIT:HURT:3d6
 B:BITE:HURT:3d4
 B:BITE:HURT:3d4
-F:FORCE_MAXHP | MOVE_BODY | 
-F:ONLY_ITEM | DROP_2D2 | REGENERATE | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | WILD_SHORE | WILD_WOOD |
-F:EVIL | TROLL | IM_POIS | NO_CONF | NO_SLEEP | DROP_CORPSE | BASEANGBAND
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:IM_POIS
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:TAKE_ITEM
+F:TROLL
+F:WILD_SHORE
+F:WILD_WOOD
 D:A massive troll of huge strength. Eldraks are extremely stupid and extremely 
 D:violent. 
 
@@ -10033,10 +13587,22 @@ B:HIT:HURT:3d8
 B:HIT:HURT:3d8
 B:BITE:HURT:3d8
 B:BITE:HURT:3d8
-F:FORCE_MAXHP | REGENERATE | MOVE_BODY | 
-F:ONLY_ITEM | DROP_1D2 | WILD_TOO | WILD_MOUNTAIN | WILD_WOOD | WILD_SWAMP |
-F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | 
-F:EVIL | TROLL | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:IM_POIS
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:TROLL
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:A massive two-headed troll, larger and stronger than many men together. 
 D:Fortunately, ettins are solitary creatures.  They are also living proof that 
 D:two heads are not necessarily more intelligent than one... 
@@ -10051,11 +13617,21 @@ B:BITE:EXP_80:2d6
 B:HIT:HURT:3d8
 B:HIT:HURT:3d8
 B:HIT:CONFUSE:6d6
-F:FORCE_MAXHP | 
-F:ONLY_GOLD | DROP_2D2 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | CAN_FLY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND
-F:HAS_LITE | NO_CUT
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_2D2
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:UNDEAD
 D:A fearsome skeletal horse with glowing eyes that watch you with little 
 D:more than a hatred of all that lives. Its flying hooves do not touch the 
 D:ground. 
@@ -10070,14 +13646,34 @@ B:HIT:HURT:3d6
 B:HIT:HURT:3d6
 B:BITE:EXP_80:4d6
 B:BITE:EXP_80:4d6
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:DROP_60 | DROP_4D2 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | REGENERATE | RES_TELE | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_7 | 
-S:BLIND | HOLD | SCARE | CAUSE_3 | CAUSE_4 | DRAIN_MANA | 
-S:BRAIN_SMASH | DARKNESS | BO_NETH
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_4D2
+F:DROP_60
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:REGENERATE
+F:RES_TELE
+F:UNDEAD
+S:1_IN_7
+S:BLIND
+S:BO_NETH
+S:BRAIN_SMASH
+S:CAUSE_3
+S:CAUSE_4
+S:DARKNESS
+S:DRAIN_MANA
+S:HOLD
+S:SCARE
 D:A foul wind chills your bones as this ghastly figure approaches. 
 
 N:624:Ancient black dragon
@@ -10089,47 +13685,29 @@ O:50:50:0:0
 B:CLAW:HURT:4d9
 B:CLAW:HURT:4d9
 B:BITE:ACID:7d9
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:DROP_3D2 | DROP_4D2 | DROP_CORPSE | 
-F:SMART | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DRAGON | IM_ACID | NO_CONF | NO_SLEEP | BASEANGBAND | ATTR_MULTI
-S:1_IN_6 | 
-S:BLIND | CONF | SCARE | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:POWERFUL
+F:SMART
+S:1_IN_6
+S:BLIND
 S:BR_ACID
+S:CONF
+S:SCARE
 D:A huge draconic form. Pools of acid melt the floor around it. 
 
-N:625:Weird fume
-G:#:v
-I:120:35d10:100:40:0
-W:40:2:0:800
-E:0:0:0:0:0:0
-O:0:0:0:0
-B:ENGULF:CONFUSE:8d4
-B:ENGULF:CONFUSE:8d4
-F:FORCE_SLEEP | 
-F:RAND_50 | RAND_25 | RES_NEXU |  AURA_ELEC | IM_FIRE | IM_ELEC |
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | 
-F:CAN_FLY | ATTR_MULTI | ATTR_ANY |
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | ZANGBAND | NO_CUT
-S:1_IN_6 | 
-S:BR_CHAO | BR_NEXU | BR_NUKE
-D:A swirling spiral of mist, constantly changing its appearance. 
-
-N:626:Spawn of Ubbo-Sathla
-G:j:v
-I:120:30d10:100:40:0
-W:40:5:0:300
-E:0:0:0:0:0:0
-O:0:0:0:0
-B:CRUSH:ACID:8d4
-B:CRUSH:ACID:8d4
-F:FORCE_SLEEP | ATTR_MULTI | ATTR_ANY | EVIL |
-F:RAND_25 | RES_NEXU |  AURA_ELEC | IM_FIRE | IM_ELEC |
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | KILL_BODY |
-F:CAN_SWIM | NO_CONF | NO_SLEEP | CTHANGBAND | NO_CUT
-S:MULTIPLY
-D:Weird, jelly like creatures. No two look the same. 
-
 N:627:Fat Man
 G:{:D
 I:120:14d14:10:80:12
@@ -10137,32 +13715,27 @@ W:40:2:0:200
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:EXPLODE:SHATTER:200d2
-F:FORCE_SLEEP | FORCE_MAXHP |  UNIQUE | REFLECTING |
-F:EMPTY_MIND | COLD_BLOOD | BASH_DOOR | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS
-F:NO_FEAR | NO_CONF | NO_SLEEP | NONLIVING | RES_TELE | JOKEANGBAND | NO_CUT | NO_STUN
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:JOKEANGBAND
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:REFLECTING
+F:RES_TELE
+F:UNIQUE
 D:A shining machine of death and destruction. 
 
-N:628:Malekith the Accursed
-G:h:v
-I:125:25d100:20:70:10
-W:44:2:3500:7500
-E:1:1:1:2:1:1
-O:50:0:50:0
-B:HIT:HURT:12d9
-B:HIT:HURT:12d9
-F:MALE | REGENERATE | UNIQUE | CAN_SPEAK |
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE
-F:ONLY_ITEM | DROP_90 | DROP_4D2 | DROP_GOOD |
-F:SMART | OPEN_DOOR | BASH_DOOR |
-F:EVIL | HURT_LITE | ZANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:HEAL | TELE_TO | BLIND | CONF | CAUSE_3 | DARKNESS | FORGET | HOLD |
-S:S_MONSTER | S_MONSTERS | S_DEMON | TPORT | BA_NETH | MIND_BLAST |
-S:S_KIN
-D:One of the oldest and most powerful dark elves, Malekith is a master 
-D:sorcerer devoted to evil. The left side of his face is pale, and the other 
-D:is dark. His hair is long and white. 
-
 N:629:Shadowfax, steed of Gandalf
 G:q:v
 I:130:30d100:20:100:50
@@ -10172,10 +13745,19 @@ O:0:0:0:0
 B:KICK:HURT:5d5
 B:KICK:HURT:5d5
 B:BITE:HURT:6d6
-F:FORCE_MAXHP | UNIQUE | ANIMAL | GOOD |
-F:REGENERATE | BASH_DOOR | IM_FIRE | IM_COLD | IM_ELEC |
-F:IM_POIS | NO_FEAR | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:GOOD
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:NO_FEAR
+F:REGENERATE
+F:UNIQUE
 D:Shadowfax is the chief of the "Mearas", the greatest of all horses that are 
 D:bred in the fields of Rohan.  Although the Mearas should technically be only 
 D:ridden by the royal family of Rohan, only Gandalf the Wizard has ever 
@@ -10191,11 +13773,19 @@ O:10:90:0:0
 B:HIT:HURT:3d6
 B:HIT:HURT:3d5
 B:HIT:HURT:3d5
-F:FORCE_MAXHP | 
-F:DROP_90 | 
-F:INVISIBLE | PASS_WALL | CAN_FLY |
-F:EVIL | TROLL | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:CAN_FLY
+F:DROP_90
+F:EVIL
+F:FORCE_MAXHP
+F:IM_COLD
+F:IM_ELEC
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
+F:TROLL
 D:A weird ghostly troll-like being from the ethereal plane. 
 
 N:631:War troll
@@ -10208,10 +13798,21 @@ B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:BITE:HURT:3d5
 B:BITE:HURT:3d5
-F:FORCE_MAXHP | SUSCEP_FIRE | REGENERATE | 
-F:DROP_90 | REGENERATE | FRIENDS |
-F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | 
-F:EVIL | TROLL | IM_POIS | NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND
+F:BASH_DOOR
+F:DROP_90
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FRIENDS
+F:IM_POIS
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:REGENERATE
+F:REGENERATE
+F:SUSCEP_FIRE
+F:TROLL
 D:A massive troll, equipped with a scimitar and heavy armour. 
 
 N:632:Disenchanter worm mass
@@ -10221,9 +13822,17 @@ W:40:3:50:30
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:CRAWL:UN_BONUS:1d4
-F:RAND_50 | RES_DISE | ATTR_MULTI | CAN_SWIM |
-F:STUPID | WEIRD_MIND | BASH_DOOR | 
-F:ANIMAL | HURT_LITE | NO_FEAR | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_SWIM
+F:HURT_LITE
+F:NO_CUT
+F:NO_FEAR
+F:RAND_50
+F:RES_DISE
+F:STUPID
+F:WEIRD_MIND
 S:MULTIPLY
 D:It is a strange mass of squirming worms. Magical energy crackles 
 D:around its disgusting form. 
@@ -10234,12 +13843,20 @@ I:120:48d10:20:1:0
 W:45:1:3000:3000
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:FORCE_SLEEP | FORCE_MAXHP | NEVER_MOVE | NEVER_BLOW | 
-F:INVISIBLE | EMPTY_MIND | ANIMAL | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND
-S:1_IN_2 | 
-S:BLINK | TPORT | 
+F:ANIMAL
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:INVISIBLE
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+S:1_IN_2
+S:BLINK
 S:S_UNDEAD
+S:TPORT
 D:It is a pulsing flesh mound that reeks of death and putrefaction. 
 
 N:634:Lesser titan
@@ -10252,13 +13869,25 @@ B:HIT:CONFUSE:9d9
 B:HIT:CONFUSE:9d9
 B:HIT:CONFUSE:9d9
 B:HIT:CONFUSE:9d9
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:DROP_GOOD | DROP_4D2 | DROP_SKELETON | DROP_CORPSE | 
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR |
-F:EVIL | GIANT | MALE | BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:HEAL | TELE_TO | SCARE | 
+F:BASH_DOOR
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GIANT
+F:HAS_LITE
+F:MALE
+F:OPEN_DOOR
+F:SMART
+F:TAKE_ITEM
+S:1_IN_3
+S:HEAL
+S:SCARE
 S:S_MONSTERS
+S:TELE_TO
 D:It is a humanoid figure thirty feet tall that gives off an aura of power 
 D:and hate. 
 
@@ -10272,12 +13901,24 @@ B:BITE:FIRE:3d10
 B:BITE:FIRE:3d10
 B:BITE:FIRE:3d10
 B:BITE:FIRE:3d10
-F:FORCE_SLEEP | WILD_TOO | WILD_SHORE | WILD_SWAMP |
-F:ONLY_GOLD | DROP_3D2 | DROP_4D2 | CAN_SWIM | 
-F:OPEN_DOOR | BASH_DOOR | MOVE_BODY | DROP_CORPSE | 
-F:ANIMAL | IM_FIRE | MORTAL | BASEANGBAND
-S:1_IN_4 | 
-S:SCARE | BO_FIRE | BR_FIRE
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:IM_FIRE
+F:MORTAL
+F:MOVE_BODY
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:WILD_SHORE
+F:WILD_TOO
+S:1_IN_4
+S:BO_FIRE
+S:BR_FIRE
+S:SCARE
 D:A strange reptilian creature with nine smouldering heads. 
 
 N:636:Enchantress
@@ -10289,14 +13930,23 @@ O:0:0:100:0
 B:HIT:HURT:2d6
 B:HIT:HURT:2d6
 B:HIT:HURT:2d8
-F:FEMALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | NO_CONF | NO_SLEEP
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:BLIND | 
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+S:1_IN_2
+S:BLIND
 S:S_DRAGON
 D:This elusive female spellcaster has a special affinity for dragons, without
 D:whom she rarely fights.
@@ -10310,16 +13960,39 @@ O:30:50:20:0
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
-F:MALE | INVISIBLE | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE
-F:ONLY_ITEM | DROP_2D2 | TAKE_ITEM | 
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | NO_CONF | NO_SLEEP | IM_FIRE | IM_ELEC | IM_COLD | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_4 |
-S:S_MONSTERS |  
-S:ARROW_2 | ARROW_3 | ARROW_4 | MISSILE | BO_FIRE | BO_ELEC | BA_COLD | 
-S:HASTE | BLINK | S_ANIMALS
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:MALE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:TAKE_ITEM
+S:1_IN_4
+S:ARROW_2
+S:ARROW_3
+S:ARROW_4
+S:BA_COLD
+S:BLINK
+S:BO_ELEC
+S:BO_FIRE
+S:HASTE
+S:MISSILE
+S:S_ANIMALS
+S:S_MONSTERS
 D:A chieftain among the Rangers.  His understanding of nature gives him 
 D:powerful elemental spells to use against you, in addition to his skills 
 D:as an archer and a warrior.  Furthermore, he is a master of camouflage, so 
@@ -10334,16 +14007,33 @@ O:0:0:100:0
 B:HIT:HURT:2d8
 B:HIT:HURT:2d8
 B:HIT:HURT:2d8
-F:MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_90 | DROP_4D2 | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | NO_CONF | NO_SLEEP | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:BLINK | TELE_TO | BLIND | CONF | CAUSE_3 | TRAPS | 
-S:BO_ACID | BA_FIRE | BA_COLD | 
-S:S_MONSTER | S_UNDEAD | S_DRAGON
+F:BASH_DOOR
+F:DROP_4D2
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+S:1_IN_2
+S:BA_COLD
+S:BA_FIRE
+S:BLIND
+S:BLINK
+S:BO_ACID
+S:CAUSE_3
+S:CONF
+S:S_DRAGON
+S:S_MONSTER
+S:S_UNDEAD
+S:TELE_TO
 D:A human figure in robes, he moves with magically improved speed, and his 
 D:hands are ablur with spell casting. 
 
@@ -10357,12 +14047,22 @@ B:HIT:HURT:3d4
 B:HIT:HURT:3d4
 B:HIT:HURT:3d4
 B:HIT:HURT:3d4
-F:FORCE_MAXHP | SUSCEP_ACID |
-F:EMPTY_MIND | COLD_BLOOD |
-F:ONLY_GOLD | DROP_2D2 |  
-F:KILL_ITEM | PASS_WALL | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:HURT_ROCK | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:COLD_BLOOD
+F:DROP_2D2
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:HURT_ROCK
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_ITEM
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_GOLD
+F:PASS_WALL
+F:SUSCEP_ACID
 D:It is a tougher relative of the Xorn. Its hide glitters with metal ores. 
 
 N:640:Giant roc
@@ -10374,9 +14074,16 @@ O:0:0:0:0
 B:CRUSH:HURT:8d12
 B:CRUSH:HURT:8d12
 B:HIT:ELEC:12d12
-F:BASH_DOOR | CAN_FLY | WILD_MOUNTAIN | WILD_WOOD |
-F:ANIMAL | IM_ELEC | DROP_CORPSE | SUSCEP_ACID | HAS_EGG
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:HAS_EGG
+F:IM_ELEC
+F:MORTAL
+F:SUSCEP_ACID
+F:WILD_MOUNTAIN
+F:WILD_WOOD
 D:A vast legendary bird, its iron talons rake the most impenetrable of 
 D:surfaces and its screech echoes through the many winding dungeon corridors. 
 
@@ -10390,8 +14097,11 @@ B:BUTT:HURT:4d6
 B:BUTT:HURT:4d6
 B:BUTT:HURT:2d6
 B:BUTT:HURT:2d6
-F:BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | MORTAL | BASEANGBAND
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:MORTAL
 D:It is a cross between a human and a bull. 
 
 N:642:Medusa, the Gorgon
@@ -10404,15 +14114,32 @@ B:GAZE:EXP_80
 B:GAZE:PARALYZE
 B:HIT:HURT:8d6
 B:HIT:HURT:8d6
-F:UNIQUE | FEMALE | DROP_CORPSE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_GOOD | 
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | IM_ACID | IM_FIRE | IM_POIS |
-F:MORTAL | BASEANGBAND
-S:1_IN_2 | 
-S:HOLD | SCARE | CAUSE_3 | BO_FIRE | BO_PLAS | BA_ACID | 
-S:S_HYDRA | S_KIN
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:UNIQUE
+S:1_IN_2
+S:BA_ACID
+S:BO_FIRE
+S:BO_PLAS
+S:CAUSE_3
+S:HOLD
+S:SCARE
+S:S_HYDRA
+S:S_KIN
 D:One of the original three ugly sisters. Her face could sink a thousand 
 D:ships. Her scales rattle as she slithers towards you, venom dripping from 
 D:her ghastly mouth. 
@@ -10426,14 +14153,30 @@ O:50:50:0:0
 B:CLAW:HURT:4d10
 B:CLAW:HURT:4d10
 B:BITE:EXP_80:7d10
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | RES_TELE
-F:INVISIBLE | TAKE_ITEM | CAN_FLY |
-F:PASS_WALL | POWERFUL | MOVE_BODY | RES_NETH |
-F:EVIL | DRAGON | IM_COLD | NO_CONF | NO_SLEEP | BASEANGBAND | ATTR_MULTI
-S:1_IN_6 | 
-S:SLOW | CONF | SCARE | 
+F:ATTR_MULTI
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_4D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:INVISIBLE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PASS_WALL
+F:POWERFUL
+F:RES_NETH
+F:RES_TELE
+F:TAKE_ITEM
+S:1_IN_6
 S:BR_NETH
+S:CONF
+S:SCARE
+S:SLOW
 D:It is a dragon-like form wrapped in darkness. You cannot make out its 
 D:true form but you sense its evil. 
 
@@ -10446,14 +14189,29 @@ O:50:50:0:0
 B:CLAW:HURT:4d9
 B:CLAW:HURT:4d9
 B:BITE:FIRE:7d9
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE
-F:DROP_3D2 | DROP_4D2 | CAN_FLY | SUSCEP_COLD |
-F:SMART | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DRAGON | IM_FIRE | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
 F:ATTR_MULTI
-S:1_IN_6 | 
-S:BLIND | CONF | SCARE | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:POWERFUL
+F:SMART
+F:SUSCEP_COLD
+S:1_IN_6
+S:BLIND
 S:BR_FIRE
+S:CONF
+S:SCARE
 D:A huge draconic form. Wisps of smoke steam from its nostrils and the 
 D:extreme heat surrounding it makes you gasp for breath.
 
@@ -10466,13 +14224,27 @@ O:50:50:0:0
 B:CLAW:HURT:4d9
 B:CLAW:HURT:4d9
 B:BITE:HURT:7d9
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE
-F:DROP_3D2 | DROP_4D2 | CAN_FLY |
-F:SMART | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DRAGON | NO_STUN | NO_SLEEP | BASEANGBAND | HAS_LITE | ATTR_MULTI
-S:1_IN_6 | 
-S:BLIND | CONF | SCARE | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MOVE_BODY
+F:NO_SLEEP
+F:NO_STUN
+F:POWERFUL
+F:SMART
+S:1_IN_6
+S:BLIND
 S:BR_SOUN
+S:CONF
+S:SCARE
 D:A huge draconic form wreathed in a nimbus of light. Its roar stuns and 
 D:deafens you. 
 
@@ -10485,39 +14257,35 @@ O:50:50:0:0
 B:CLAW:HURT:4d10
 B:CLAW:HURT:4d10
 B:BITE:HURT:7d10
-F:FORCE_SLEEP | FORCE_MAXHP | REFLECTING | DROP_CORPSE
-F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | CAN_FLY |
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DRAGON | IM_COLD | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE | NO_CUT
 F:ATTR_MULTI
-S:1_IN_6 | 
-S:SLOW | CONF | SCARE | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:MOVE_BODY
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:REFLECTING
+S:1_IN_6
 S:BR_SHAR
+S:CONF
+S:SCARE
+S:SLOW
 D:A huge crystalline dragon. Its claws could cut you to shreds and its 
 D:teeth are razor sharp. Strange colours ripple through it as it moves in 
 D:the light. 
 
-N:647:Wyrd sister
-G:p:v
-I:125:50d11:20:60:10
-W:40:4:1600:1900
-E:1:1:1:2:1:1
-O:10:0:80:0
-B:CLAW:HURT:2d6
-B:CLAW:HURT:2d6
-B:CLAW:HURT:2d8
-F:FEMALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_2D2 | DROP_SKELETON
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | NO_CONF | NO_SLEEP
-F:MORTAL | ZANGBAND
-S:1_IN_2 | 
-S:BLIND | 
-S:S_DEMON | CONF | SCARE | DARKNESS | BA_CHAO
-D:This old crone is rumoured to be a witch of chaos... but you don't 
-D:really believe in witches, do you? 
-
 N:648:Vrock
 G:U:s
 I:110:40d10:20:50:80
@@ -10527,13 +14295,22 @@ O:0:50:50:0
 B:HIT:HURT:3d4
 B:CRUSH:HURT:8d12
 B:CRUSH:HURT:8d12
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:FRIENDS | 
-F:ONLY_ITEM | DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | 
-F:EVIL | DEMON | IM_FIRE | NO_CONF | NO_SLEEP | BASEANGBAND
-S:1_IN_8 | 
-S:BLIND | CONF
+F:BASH_DOOR
+F:DEMON
+F:DROP_60
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:FRIENDS
+F:IM_FIRE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+S:1_IN_8
+S:BLIND
+S:CONF
 D:It is a demon with a long neck and raking claws. 
 
 N:649:Death quasit
@@ -10545,59 +14322,35 @@ O:0:50:50:0
 B:BITE:LOSE_DEX:3d6
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_90 | DROP_2D2 | DROP_4D2 | NONLIVING |
-F:SMART | INVISIBLE | PASS_WALL | CAN_FLY |
-F:EVIL | DEMON | IM_FIRE | IM_POIS | RES_TELE
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND
-S:1_IN_10 | 
-S:BLIND | CONF | SCARE | CAUSE_3 | FORGET | 
+F:CAN_FLY
+F:DEMON
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_90
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:NONLIVING
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PASS_WALL
+F:RES_TELE
+F:SMART
+S:1_IN_10
+S:BLIND
+S:CAUSE_3
+S:CONF
+S:FORGET
+S:SCARE
 S:S_DEMON
 D:It is a demon of small stature, but its armoured frame moves with 
 D:lightning speed and its powers make it a tornado of death and destruction. 
 
-N:650:Giganto, the Gargantuan
-G:~:s
-I:110:80d10:20:75:30
-W:38:6:8000:1750
-E:0:1:0:0:1:0
-O:60:40:0:0
-B:CRUSH:HURT:30d2
-B:CRUSH:HURT:30d2
-B:CRUSH:HURT:30d2
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_SWIM | IM_FIRE |
-F:DROP_60 | DROP_90 | DROP_2D2 | UNIQUE | WEIRD_MIND |
-F:BASH_DOOR | SMART | EVIL | IM_COLD | DROP_CORPSE
-F:RES_WATE | WILD_OCEAN |
-F:MORTAL | ZANGBAND
-S:1_IN_9 | 
-S:BR_NUKE | BA_WATE
-D:A gargantuan mutant whale, who has grown legs that enable it to walk 
-D:on dry land as well. 
-
-N:651:Strygalldwir
-G:U:W
-I:120:12d100:90:60:10
-W:41:3:5000:8000
-E:1:1:1:2:1:1
-O:20:0:80:0
-B:CLAW:HURT:5d5
-B:CLAW:HURT:5d5
-B:HIT:LOSE_STR:4d4
-B:TOUCH:EXP_80:8d1
-F:UNIQUE | CAN_SPEAK | 
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | 
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | MOVE_BODY | NONLIVING | NO_SLEEP | NO_CONF|
-F:OPEN_DOOR | BASH_DOOR | IM_POIS | IM_COLD | DEMON | EVIL | ZANGBAND
-S:1_IN_3 |
-S:CAUSE_3 | HOLD | SCARE | BLIND | BO_ACID | S_DEMON |
-S:FORGET | BO_NETH | MIND_BLAST | DARKNESS
-D:"it was well over six feet in height, with great branches of antlers 
-D:growing out of its forehead. Nude, its flesh was a uniform ash-gray 
-D:in color. It appeared to be sexless, and it had gray, leathery wings 
-D:extending far out behind it." 
-
 N:652:Fallen angel
 G:A:s
 I:130:100d25:30:90:255
@@ -10608,32 +14361,39 @@ B:GAZE:EXP_40:4d4
 B:GAZE:EXP_40:4d4
 B:HIT:HURT:6d6
 B:HIT:HURT:6d6
-F:FORCE_SLEEP | 
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | NO_FEAR | EVIL | REFLECTING |
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY |
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | RES_TELE | RES_NETH |
-F:CAN_FLY | BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:TELE_TO | BLIND | SCARE | CAUSE_2 | CAUSE_4 | 
-S:S_DEMON | BO_NETH
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MOVE_BODY
+F:NO_FEAR
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:REFLECTING
+F:RES_NETH
+F:RES_TELE
+F:SMART
+F:TAKE_ITEM
+S:1_IN_3
+S:BLIND
+S:BO_NETH
+S:CAUSE_2
+S:CAUSE_4
+S:SCARE
+S:S_DEMON
+S:TELE_TO
 D:An angelic being, who was mighty once, but dared defy its Creator. 
 
-N:653:Giant headless
-G:H:u
-I:110:30d12:20:50:40
-W:41:2:4000:900
-E:1:1:1:2:1:0
-O:0:100:0:0
-B:HIT:HURT:4d8
-B:HIT:HURT:4d8
-B:HIT:HURT:4d8
-F:FRIENDS | DROP_60 | DROP_90 | OPEN_DOOR | BASH_DOOR |
-F:DROP_SKELETON | DROP_CORPSE
-F:EVIL | ZANGBAND
-S:1_IN_6
-S:SCARE | BA_NUKE | BLIND
-D:Giant headless humanoid abominations created by a magical mutation. 
-
 N:654:Judge Fire
 G:s:R
 I:120:18d100:90:70:10
@@ -10644,37 +14404,47 @@ B:HIT:FIRE:5d5
 B:HIT:FIRE:5d5
 B:GAZE:EXP_80
 B:WAIL:TERRIFY
-F:UNIQUE | MALE | CAN_SPEAK | SUSCEP_COLD |
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | POWERFUL |
-F:OPEN_DOOR | BASH_DOOR | MOVE_BODY | 
-F:EVIL | UNDEAD | SUSCEP_COLD | IM_POIS | IM_FIRE | RES_PLAS | 
-F:NO_CONF | NO_SLEEP | JOKEANGBAND | HAS_LITE | NO_CUT | NO_STUN
-S:1_IN_3 | 
-S:CAUSE_3 | BO_FIRE | BA_FIRE | BR_FIRE | BO_PLAS
-S:DARKNESS | S_MONSTER | S_DEMON | S_UNDEAD | TPORT | BLINK | SCARE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:IM_POIS
+F:JOKEANGBAND
+F:MALE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:RES_PLAS
+F:SUSCEP_COLD
+F:SUSCEP_COLD
+F:UNDEAD
+F:UNIQUE
+S:1_IN_3
+S:BA_FIRE
+S:BLINK
+S:BO_FIRE
+S:BO_PLAS
+S:BR_FIRE
+S:CAUSE_3
+S:DARKNESS
+S:SCARE
+S:S_DEMON
+S:S_MONSTER
+S:S_UNDEAD
+S:TPORT
 D:One of the Dark Judges, he has come to punish your crime of living. 
 D:He looks like a skeleton enveloped in flames. 
 
-N:655:Ubbo-Sathla, the Unbegotten Source
-G:j:W
-I:120:20d100:90:80:10
-W:41:3:0:13500
-E:0:0:0:0:0:0
-O:30:50:0:10
-B:CRUSH:ACID:5d5
-B:HIT:POISON:5d5
-B:CRUSH:ACID:5d5
-B:HIT:POISON:5d5
-F:UNIQUE | CAN_SPEAK | NO_STUN | NO_SLEEP | NO_CONF | NO_STUN |
-F:FORCE_SLEEP | FORCE_MAXHP | ELDRITCH_HORROR | ESCORT |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | REGENERATE | SUSCEP_FIRE |
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | KILL_BODY | 
-F:EVIL |  SUSCEP_FIRE | IM_COLD | IM_POIS | CTHANGBAND | NO_CUT
-D:"There, in the gray beginning of Earth, the formless mass that was 
-D:Ubbo-Sathla reposed amid the slime and the vapors. Headless, 
-D:without organs or members..." 
-
 N:656:Judge Mortis
 G:z:G
 I:120:18d100:90:70:10
@@ -10685,16 +14455,41 @@ B:HIT:POISON:5d5
 B:HIT:DISEASE:5d5
 B:TOUCH:LOSE_ALL
 B:TOUCH:EXP_80
-F:UNIQUE | MALE | CAN_SPEAK | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | MOVE_BODY | 
-F:EVIL | UNDEAD | SUSCEP_FIRE | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | JOKEANGBAND | NO_CUT | NO_STUN
-S:1_IN_3 | 
-S:BLIND | SCARE | CAUSE_3 | BO_ACID | BO_NETH | BR_POIS |
-S:BR_NETH | BO_NETH | BLINK | TPORT | ANIM_DEAD
-S:BO_POIS | S_UNDEAD 
+F:BASH_DOOR
+F:CAN_SPEAK
+F:COLD_BLOOD
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:JOKEANGBAND
+F:MALE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SUSCEP_FIRE
+F:UNDEAD
+F:UNIQUE
+S:1_IN_3
+S:BLIND
+S:BLINK
+S:BO_ACID
+S:BO_NETH
+S:BO_NETH
+S:BO_POIS
+S:BR_NETH
+S:BR_POIS
+S:CAUSE_3
+S:SCARE
+S:S_UNDEAD
+S:TPORT
 D:Another Dark Judge, he is a rotting humanoid with a cow's skull as 
 D:his head. 
 
@@ -10707,15 +14502,37 @@ O:0:0:100:0
 B:HIT:HURT:2d8
 B:HIT:HURT:2d8
 B:HIT:HURT:2d8
-F:MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE
-F:ONLY_ITEM | DROP_90 | DROP_4D2 | 
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | HURT_LITE | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:HEAL | BLINK | TELE_TO | BLIND | CONF | CAUSE_3 | DARKNESS | 
-S:BO_ACID | BA_FIRE | BA_COLD | ANIM_DEAD 
-S:S_MONSTER | S_UNDEAD | S_DEMON | MISSILE
+F:BASH_DOOR
+F:DROP_4D2
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:HURT_LITE
+F:MALE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+S:1_IN_2
+S:BA_COLD
+S:BA_FIRE
+S:BLIND
+S:BLINK
+S:BO_ACID
+S:CAUSE_3
+S:CONF
+S:DARKNESS
+S:HEAL
+S:MISSILE
+S:S_DEMON
+S:S_MONSTER
+S:S_UNDEAD
+S:TELE_TO
 D:A dark elven figure, dressed in deepest black. Power seems to crackle 
 D:from his slender frame. 
 
@@ -10729,56 +14546,88 @@ B:TOUCH:EXP_80
 B:TOUCH:UN_POWER
 B:TOUCH:LOSE_DEX:2d12
 B:TOUCH:LOSE_DEX:2d12
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | RES_TELE | 
-F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND
-F:NO_CUT
-S:1_IN_3 | 
-S:BLINK | TELE_TO | BLIND | HOLD | CONF | SCARE | CAUSE_3 | CAUSE_4 | 
-S:DRAIN_MANA | BRAIN_SMASH | S_UNDEAD
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_4D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:SMART
+F:UNDEAD
+S:1_IN_3
+S:BLIND
+S:BLINK
+S:BRAIN_SMASH
+S:CAUSE_3
+S:CAUSE_4
+S:CONF
+S:DRAIN_MANA
+S:HOLD
+S:SCARE
+S:S_UNDEAD
+S:TELE_TO
 D:A skeletal form wrapped in robes. Powerful magic crackles along its 
 D:bony fingers. 
 
-N:659:Byakhee
-G:U:D
-I:110:40d10:20:40:80
-W:41:3:1300:1500
-E:0:0:0:0:0:0
-O:0:50:50:0
-B:CLAW:LOSE_STR:3d4
-B:BITE:EXP_20:3d4
-F:FORCE_SLEEP | FORCE_MAXHP | FRIENDS | 
-F:ONLY_ITEM | DROP_2D2 | ELDRITCH_HORROR |
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | CAN_FLY |
-F:EVIL | DEMON | IM_FIRE | NO_CONF | NO_SLEEP | CTHANGBAND
-S:1_IN_9 | 
-S:BO_FIRE | 
-S:S_DEMON | CONF
-D:"There flapped rhythmically a horde of tame, trained, hybrid 
-D:winged things... not altogether crows, nor moles, nor buzzards, 
-D:nor ants, nor decomposed human beings, but something I cannot 
-D:and must not recall." 
-
 N:660:Eol, the Dark Elf
 G:h:D
 I:130:80d30:20:100:60
 W:49:2:1400:25000
 E:1:1:1:2:1:1
 O:10:40:40:10
+A:84:50
 B:HIT:HURT:3d8
 B:HIT:HURT:3d8
 B:HIT:HURT:3d8
-F:UNIQUE | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE | CAN_SPEAK |
-F:ONLY_ITEM | DROP_4D2 | DROP_2D2 | DROP_GOOD | DROP_CHOSEN |
-F:SMART | IM_ELEC | IM_COLD | IM_POIS | IM_FIRE | 
-F:REFLECTING | OPEN_DOOR | BASH_DOOR | SPECIAL_GENE |
-F:HURT_LITE | BASEANGBAND | HAS_LITE
-S:1_IN_3 |
-S:HEAL | BLINK | TELE_TO | BLIND | CONF | CAUSE_4 | DARKNESS | 
-S:BA_NETH | BA_ELEC | BA_ACID | BA_FIRE | BA_COLD | BO_MANA |  
-S:S_MONSTERS | S_UNDEAD | S_DRAGON | S_DEMON
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_CHOSEN
+F:DROP_CORPSE
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:HURT_LITE
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REFLECTING
+F:SMART
+F:SPECIAL_GENE
+F:UNIQUE
+S:1_IN_3
+S:BA_ACID
+S:BA_COLD
+S:BA_ELEC
+S:BA_FIRE
+S:BA_NETH
+S:BLIND
+S:BLINK
+S:BO_MANA
+S:CAUSE_4
+S:CONF
+S:DARKNESS
+S:HEAL
+S:S_DEMON
+S:S_DRAGON
+S:S_MONSTERS
+S:S_UNDEAD
+S:TELE_TO
 D:A lord of the Teleri, Eol is a mighty metalsmith, the first 
 D:one ever to forge weapons of meteorite iron.  His dark 
 D:countenance glares at you in disdain. 
@@ -10793,61 +14642,40 @@ B:GAZE:TERRIFY:4d4
 B:GAZE:TERRIFY:4d4
 B:HIT:HURT:8d6
 B:HIT:HURT:8d6
-F:FORCE_SLEEP | 
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | NO_FEAR | GOOD | REFLECTING |
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | RES_TELE | CAN_FLY 
-F:BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:TELE_TO | BLIND | SCARE | CAUSE_2 | CAUSE_4 | BO_MANA | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_GOOD
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MOVE_BODY
+F:NO_FEAR
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:REFLECTING
+F:RES_TELE
+F:SMART
+F:TAKE_ITEM
+S:1_IN_3
+S:BLIND
+S:BO_MANA
+S:CAUSE_2
+S:CAUSE_4
+S:SCARE
 S:S_ANGEL
+S:TELE_TO
 D:Never a more heavenly being have you seen. The very holiness of its 
 D:presence makes you deeply respect it. Few creatures can match the powers 
 D:of an Archon; fewer still live to tell the tale after attacking one. 
 
-N:662:Formless spawn of Tsathoggua
-G:U:D
-I:110:22d20:20:40:80
-W:41:2:0:1850
-E:0:0:0:0:0:0
-O:35:45:0:10
-B:HIT:ACID:2d4
-B:HIT:ACID:2d4
-B:CRUSH:HURT:3d4
-B:BITE:ACID:6d6
-F:FORCE_SLEEP | FORCE_MAXHP | ELDRITCH_HORROR | NONLIVING |
-F:ONLY_ITEM | DROP_90 | REGENERATE | RES_TELE | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | CAN_SWIM |
-F:EVIL | DEMON | NO_CONF | NO_SLEEP | SUSCEP_FIRE | IM_POIS | CTHANGBAND | NO_CUT
-S:1_IN_9 | 
-S:BO_FIRE | BO_ACID | 
-S:S_DEMON | MIND_BLAST | DARKNESS | 
-D:"...living things that oozed along stone channels... 
-D:But they were not toads like Tsathoggua himself. Far worse -- 
-D:they were amorphous lumps of viscous black slime that took 
-D:temporary shapes for various purposes." 
-
-N:663:Hunting horror
-G:U:D
-I:110:30d17:20:90:80
-W:42:2:0:2300
-E:0:0:0:0:0:0
-O:45:35:0:10
-B:BITE:LOSE_DEX:1d3
-B:BITE:POISON:1d3
-B:CRUSH:HURT:9d4
-F:FORCE_SLEEP | FORCE_MAXHP | ELDRITCH_HORROR |
-F:ONLY_ITEM | DROP_1D2 |
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | CAN_FLY |
-F:EVIL | DEMON | HURT_LITE | IM_POIS | 
-F:IM_FIRE | NO_CONF | NO_SLEEP | CTHANGBAND
-S:1_IN_9 |
-S:BLIND | CONF | S_DEMON | BR_DARK
-D:"And in the air there were great viperine creatures, 
-D:which had curiously distorted heads, and grotesquely great 
-D:clawed appendages, supporting themselves with ease by the aid 
-D:of black rubbery wings of singularly monstrous dimensions." 
-
 N:664:Undead beholder
 G:e:u
 I:120:27d100:30:100:10
@@ -10858,15 +14686,36 @@ B:GAZE:EXP_40:3d6
 B:GAZE:UN_POWER:3d6
 B:GAZE:INSANITY:3d6
 B:BITE:EXP_40:7d6
-F:FORCE_SLEEP | FORCE_MAXHP | RES_TELE | 
-F:COLD_BLOOD | BASH_DOOR | 
-F:EVIL | UNDEAD | CAN_FLY |
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_2 | 
-S:SLOW | CONF | CAUSE_4 | DRAIN_MANA | MIND_BLAST | FORGET | 
-S:BO_MANA | BO_NETH | BRAIN_SMASH | BA_FIRE | BA_COLD | BO_ACID |
-S:S_UNDEAD | ANIM_DEAD 
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:RES_TELE
+F:UNDEAD
+S:1_IN_2
+S:BA_COLD
+S:BA_FIRE
+S:BO_ACID
+S:BO_MANA
+S:BO_NETH
+S:BRAIN_SMASH
+S:CAUSE_4
+S:CONF
+S:DRAIN_MANA
+S:FORGET
+S:MIND_BLAST
+S:SLOW
+S:S_UNDEAD
 D:A beholder which has cheated death.  Black nether storms rage around the 
 D:bloodshot pupil of its central giant eye, and light seems to bend as it 
 D:sucks its power from the very air around it.  Your soul chills as it drains 
@@ -10882,13 +14731,28 @@ B:TOUCH:EXP_80
 B:TOUCH:EXP_40
 B:CLAW:LOSE_INT:1d10
 B:CLAW:LOSE_WIS:1d10
-F:FORCE_SLEEP | CAN_FLY |
-F:ONLY_ITEM | DROP_1D2 | POWERFUL | REGENERATE | HURT_LITE |
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | RES_NETH |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_1D2
+F:EVIL
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
 F:NO_CUT
-S:1_IN_8 | 
-S:BO_NETH | TELE_TO | SLOW
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PASS_WALL
+F:POWERFUL
+F:REGENERATE
+F:RES_NETH
+F:UNDEAD
+S:1_IN_8
+S:BO_NETH
+S:SLOW
+S:TELE_TO
 D:A mighty spirit of darkness of vaguely humanoid form. Razor-edged claws 
 D:reach out to end your life as it glides towards you, seeking to suck the 
 D:energy from your soul to feed its power. 
@@ -10902,15 +14766,38 @@ O:0:0:100:0
 B:BUTT:COLD:3d6
 B:BUTT:FIRE:3d6
 B:BUTT:ELEC:3d6
-F:FORCE_SLEEP | FORCE_MAXHP | REFLECTING |
-F:COLD_BLOOD | BASH_DOOR | CAN_FLY | SUSCEP_ACID |
-F:EVIL | UNDEAD | POWERFUL | SMART |
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | RES_TELE | 
-F:ONLY_ITEM | DROP_60 | DROP_GOOD |
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_2 |
-S:BA_WATE | BA_FIRE | BO_ICEE | BA_ELEC | BA_COLD |
-S:CAUSE_4 | DRAIN_MANA | BRAIN_SMASH | S_UNDEAD
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_60
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:POWERFUL
+F:REFLECTING
+F:RES_TELE
+F:SMART
+F:SUSCEP_ACID
+F:UNDEAD
+S:1_IN_2
+S:BA_COLD
+S:BA_ELEC
+S:BA_FIRE
+S:BA_WATE
+S:BO_ICEE
+S:BRAIN_SMASH
+S:CAUSE_4
+S:DRAIN_MANA
+S:S_UNDEAD
 D:It is a huge, twisted grey skull floating through the air. Its cold eyes 
 D:burn with hatred towards all who live. 
 
@@ -10923,14 +14810,29 @@ O:0:50:50:0
 B:HIT:HURT:6d6
 B:HIT:HURT:6d6
 B:HIT:LOSE_STR:3d4
-F:FORCE_SLEEP | 
-F:RAND_25 | FRIENDS | CAN_FLY |
-F:ONLY_ITEM | DROP_60 | 
-F:TAKE_ITEM | INVISIBLE | COLD_BLOOD | PASS_WALL | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_15 | 
-S:BLIND | HOLD | CONF | DRAIN_MANA | BO_NETH
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_60
+F:EVIL
+F:FORCE_SLEEP
+F:FRIENDS
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PASS_WALL
+F:RAND_25
+F:TAKE_ITEM
+F:UNDEAD
+S:1_IN_15
+S:BLIND
+S:BO_NETH
+S:CONF
+S:DRAIN_MANA
+S:HOLD
 D:It is a form that screams its presence against the eye. Death incarnate, 
 D:its hideous black body seems to struggle against reality as the universe 
 D:itself struggles to banish it. 
@@ -10945,90 +14847,26 @@ B:GAZE:PARALYZE:3d12
 B:GAZE:PARALYZE:3d12
 B:BITE:POISON:2d12
 B:BITE:POISON:2d12
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | POWERFUL |
-F:OPEN_DOOR | BASH_DOOR | EVIL | IM_POIS | DROP_CORPSE | 
-F:ANIMAL | NO_CONF | NO_SLEEP | CAN_SWIM | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:IM_POIS
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
 S:1_IN_8
-S:BR_POIS | BR_DARK | BR_NEXU
+S:BR_DARK
+S:BR_NEXU
+S:BR_POIS
 D:A large basilisk, whose shape resembles that of a great wyrm. 
 
-N:669:Charybdis
-G:~:r
-I:120:20d100:20:100:70
-W:42:1:15000:13000
-E:0:0:0:0:1:0
-O:50:50:0:0
-B:ENGULF:HURT:10d8
-B:ENGULF:HURT:10d8
-B:ENGULF:HURT:10d8
-F:AQUATIC | EVIL | UNIQUE |
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_3D2 | DROP_GOOD | 
-F:SMART | POWERFUL | MOVE_BODY | NEVER_MOVE |
-F:IM_ACID | IM_FIRE | IM_COLD | RES_WATE | COLD_BLOOD | 
-F:IM_ELEC | IM_POIS | NO_STUN | ZANGBAND
-S:1_IN_5 | 
-S:BA_WATE 
-D:A monstrous dweller of the depths; its hungry maw has been the doom 
-D:of innumerable sailors! 
-
-N:670:Jack of Shadows
-G:p:s
-I:150:30d100:70:150:4
-W:60:4:2300:10000
-E:1:1:1:2:1:1
-O:20:80:0:0
-B:HIT:HURT:5d10
-B:HIT:HURT:5d10
-B:HIT:EAT_ITEM:2d10
-B:HIT:EAT_ITEM:2d10
-F:MALE | FORCE_MAXHP | CAN_SPEAK | REFLECTING | DROP_SKELETON | DROP_CORPSE | 
-F:REGENERATE |
-F:IM_ACID | IM_ELEC | IM_COLD | IM_FIRE | IM_POIS | RES_TELE |
-F:ONLY_ITEM | DROP_3D2 | DROP_GOOD | DROP_GREAT | UNIQUE |
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | SMART | POWERFUL |
-F:MORTAL | ZANGBAND
-S:1_IN_3
-S:BLIND | HEAL | BA_DARK | HASTE | CONF |
-D:Deriving his strength from the shadows, this king of thieves 
-D:steals only for the challenge. 
-
-N:671:Zephyr Lord
-G:W:v
-I:130:80d10:20:70:10
-W:43:2:600:3000
-E:1:1:1:2:1:1
-O:0:100:0:0
-B:HIT:EXP_20:8d2
-B:HIT:LOSE_STR:8d2
-B:HIT:LOSE_CON:8d2
-F:MALE | ATTR_MULTI | UNDEAD | EVIL | 
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:IM_FIRE | IM_COLD | IM_ACID | IM_ELEC | IM_POIS |
-F:ONLY_ITEM | DROP_90 | DROP_4D2 | 
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:NO_STUN | NO_CONF | NO_SLEEP | ZANGBAND | NO_CUT
-S:1_IN_5 | 
-S:SHRIEK | S_HOUND
-D:An undead master of the vicious Zephyr hounds. 
-
-N:672:Juggernaut of Khorne
-G:g:D
-I:120:90d19:12:90:10
-W:43:3:6000:2500
-E:1:1:1:2:1:1
-O:0:0:0:0
-B:BUTT:HURT:6d6
-B:CRUSH:HURT:8d6
-B:CRUSH:HURT:8d6
-B:BUTT:HURT:6d6
-F:COLD_BLOOD | BASH_DOOR | REFLECTING | KILL_ITEM |
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | ZANGBAND | NO_CUT
-D:A great, vicious beast whose flesh is made of steel and whose 
-D:blood is fire. It charges at you ignoring everything else. 
-
 N:673:Mumak
 G:q:s
 I:110:90d10:20:55:100
@@ -11038,8 +14876,11 @@ O:0:0:0:0
 B:BUTT:HURT:8d6
 B:BUTT:HURT:8d6
 B:CRUSH:HURT:8d4
-F:FRIENDS | DROP_CORPSE | 
-F:BASH_DOOR | ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:FRIENDS
+F:MORTAL
 D:A massive elephantine form with eyes twisted by madness. 
 
 N:674:Judge Fear
@@ -11052,15 +14893,40 @@ B:GAZE:TERRIFY
 B:GAZE:EXP_40
 B:GAZE:EXP_40
 B:GAZE:HURT:2d20
-F:UNIQUE | MALE | CAN_SPEAK |
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | 
-F:INVISIBLE | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | MOVE_BODY | 
-F:EVIL | UNDEAD | IM_FIRE | IM_COLD | IM_POIS | 
-F:HURT_LITE | NO_CONF | NO_SLEEP | JOKEANGBAND | NO_CUT | NO_STUN
-S:1_IN_3 | 
-S:BLIND | HOLD | SCARE | CAUSE_3 | MIND_BLAST | BRAIN_SMASH | 
-S:S_UNDEAD | DRAIN_MANA | FORGET | ANIM_DEAD
+F:BASH_DOOR
+F:CAN_SPEAK
+F:COLD_BLOOD
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:JOKEANGBAND
+F:MALE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNDEAD
+F:UNIQUE
+S:1_IN_3
+S:BLIND
+S:BRAIN_SMASH
+S:CAUSE_3
+S:DRAIN_MANA
+S:FORGET
+S:HOLD
+S:MIND_BLAST
+S:SCARE
+S:S_UNDEAD
 D:A Dark Judge, reputedly so frightening that his gaze can kill. 
 
 N:675:Ancient multi-hued dragon
@@ -11072,15 +14938,39 @@ O:50:50:0:0
 B:CLAW:HURT:4d10
 B:CLAW:HURT:4d10
 B:BITE:HURT:7d10
-F:ATTR_MULTI | 
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | DROP_CORPSE
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | 
-F:SMART | OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DRAGON | IM_ACID | IM_FIRE | IM_COLD | 
-F:IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
-S:1_IN_5 | 
-S:BLIND | CONF | SCARE | 
-S:BR_ACID | BR_FIRE | BR_COLD | BR_ELEC | BR_POIS
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:SMART
+S:1_IN_5
+S:BLIND
+S:BR_ACID
+S:BR_COLD
+S:BR_ELEC
+S:BR_FIRE
+S:BR_POIS
+S:CONF
+S:SCARE
 D:A huge draconic form. Many colours ripple down its massive frame. Few 
 D:live to see another. 
 
@@ -11093,62 +14983,30 @@ O:50:50:0:0
 B:CLAW:HURT:4d10
 B:CLAW:HURT:4d10
 B:BITE:HURT:7d10
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | 
-F:INVISIBLE | CAN_FLY |
-F:PASS_WALL | POWERFUL | MOVE_BODY | 
-F:DRAGON | NO_CONF | NO_SLEEP | BASEANGBAND | ATTR_MULTI
-S:1_IN_6 | 
-S:BLIND | CONF | 
-S:BR_LITE | BR_DARK | BR_CONF
+F:ATTR_MULTI
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_4D2
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:INVISIBLE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PASS_WALL
+F:POWERFUL
+S:1_IN_6
+S:BLIND
+S:BR_CONF
+S:BR_DARK
+S:BR_LITE
+S:CONF
 D:A huge dragon emanating from the ethereal plane, this terrible creature is 
 D:a master of light and dark. Its form disappears from sight as it cloaks 
 D:itself in unearthly shadows. 
 
-N:677:Dark young of Shub-Niggurath
-G:U:g
-I:120:12d100:20:75:80
-W:43:2:0:5000
-E:0:0:0:0:0:0
-O:0:40:30:20
-B:CRUSH:HURT:5d6
-B:CRUSH:HURT:5d6
-B:BITE:LOSE_STR:1d6
-B:BITE:LOSE_STR:1d6
-F:FORCE_SLEEP | FORCE_MAXHP | ELDRITCH_HORROR |
-F:ONLY_ITEM | DROP_1D2 | NONLIVING | CAN_SWIM |
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | HURT_LITE |
-F:EVIL | DEMON | IM_FIRE | NO_CONF | NO_SLEEP | RES_TELE | CTHANGBAND
-S:1_IN_9 | 
-S:BLIND | CAUSE_2 | 
-S:S_DEMON | HEAL 
-D:"Something black in the road, something that wasn't a tree. 
-D:Something big and black and ropy, just squatting there, waiting, 
-D:with ropy arms squirming and reaching... It came crawling up the 
-D:hillside... and it was the black thing of my dreams... that black, 
-D:ropy, slimy jelly tree-thing out of the woods. It crawled up and it 
-D:flowed up on its hoofs and mouths and snaky arms." 
-
-N:678:Colour out of space
-G:.:v
-I:120:12d100:20:100:10
-W:43:2:0:8000
-E:0:0:0:0:0:0
-O:35:35:10:10
-B:TOUCH:LOSE_ALL:7d6
-B:TOUCH:LOSE_ALL:7d6
-F:FORCE_SLEEP | FORCE_MAXHP | RAND_25 | 
-F:INVISIBLE | PASS_WALL | CAN_FLY | 
-F:ONLY_ITEM | DROP_1D2 | DROP_4D2 | ATTR_MULTI | ATTR_ANY |
-F:CHAR_CLEAR | SMART | COLD_BLOOD | EVIL | 
-F:IM_COLD | IM_FIRE | IM_ACID | IM_ELEC | IM_POIS |
-F:NO_STUN | NO_CONF | NO_SLEEP | CTHANGBAND | HAS_LITE | NO_CUT
-S:1_IN_9 | 
-S:DRAIN_MANA | BR_DISE | BR_NETH | TPORT
-D:"The shaft of phosphorescence from the well... was no longer shining 
-D:out, it was pouring out; and as the shapeless stream of unplaceable 
-D:colour left the well it seemed to flow directly into the sky." 
-
 N:679:Quaker, Master of Earth
 G:E:u
 I:110:28d100:10:97:90
@@ -11159,147 +15017,34 @@ B:HIT:HURT:6d6
 B:HIT:HURT:6d6
 B:HIT:HURT:6d6
 B:HIT:SHATTER:10d10
-F:UNIQUE | MALE | CAN_SPEAK | 
-F:FORCE_SLEEP | FORCE_MAXHP |
-F:EMPTY_MIND | COLD_BLOOD | KILL_WALL | 
-F:KILL_ITEM | KILL_BODY | PASS_WALL | POWERFUL | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:HURT_ROCK | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT | NO_STUN
-S:1_IN_6 | 
-S:BO_ACID | BA_ACID
+F:CAN_SPEAK
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_ROCK
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:KILL_ITEM
+F:KILL_WALL
+F:MALE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:PASS_WALL
+F:POWERFUL
+F:UNIQUE
+S:1_IN_6
+S:BA_ACID
+S:BO_ACID
 D:A towering stone elemental stands before you. The walls and ceiling are 
 D:reduced to rubble as Quaker advances. 
 
-N:680:Death leprechaun
-G:h:D
-I:120:6d6:8:13:8
-W:44:6:0:85
-E:1:1:1:2:1:1
-O:0:0:0:0
-B:TOUCH:EXP_40:1d10
-B:TOUCH:EAT_GOLD
-B:TOUCH:EAT_ITEM
-F:INVISIBLE | RAND_25 | TAKE_ITEM | COLD_BLOOD | SMART |
-F:HURT_LITE | EVIL | OPEN_DOOR | MALE | UNDEAD | RES_NETH | ZANGBAND | NO_CUT
-S:MULTIPLY | 
-S:1_IN_6 | 
-S:BLINK | TPORT | TELE_TO | CAUSE_3 | ANIM_DEAD
-D:Nasty undead little creatures. They are chanting the name of the 
-D:sinister wizard who created them: 'Bruce! Bruce..!' 
-
-N:681:Chaugnar Faugn, Horror from the Hills
-G:q:D
-I:110:20d100:10:125:90
-W:44:4:0:6250
-E:0:0:0:0:0:0
-O:0:0:0:0
-B:CRUSH:HURT:10d10
-B:CRUSH:HURT:10d10
-B:BITE:LOSE_CON:8d2
-B:BITE:LOSE_CON:8d1
-F:UNIQUE | CAN_SPEAK | EVIL | DEMON | 
-F:FORCE_SLEEP | FORCE_MAXHP | NEVER_MOVE |
-F:ELDRITCH_HORROR | POWERFUL |
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:HURT_ROCK | 
-F:NO_CONF | NO_FEAR | CTHANGBAND
-S:1_IN_6 | 
-S:HOLD | CAUSE_4 | CONF | SCARE | FORGET | BRAIN_SMASH |
-S:MIND_BLAST | CAUSE_3 | S_DEMON | S_MONSTERS
-D:"The ears were webbed and tentacled, the trunk terminated in 
-D:a huge flaring disk at least a foot in diameter... Its forelimbs 
-D:were bent stiffly at the elbow, and its hands... rested palms 
-D:upward on its lap." 
-
-N:682:Lloigor
-G:v:B
-I:120:100d15:20:100:20
-W:44:2:0:6000
-E:0:0:0:0:0:0
-O:90:0:10:0
-B:ENGULF:LOSE_CON:4d10
-B:ENGULF:LOSE_CON:4d10
-B:ENGULF:LOSE_CON:4d10
-F:FORCE_SLEEP | ELDRITCH_HORROR | PASS_WALL | 
-F:INVISIBLE | DROP_2D2 | DROP_4D2 | CAN_FLY |
-F:OPEN_DOOR | BASH_DOOR | MOVE_BODY | POWERFUL |
-F:SMART | IM_FIRE | IM_COLD | IM_ELEC | IM_ACID | IM_POIS |
-F:MORTAL | CTHANGBAND | HAS_LITE | NO_CUT
-S:1_IN_4 | 
-S:BR_WALL | TELE_AWAY | BR_GRAV |
-S:S_KIN | MIND_BLAST | BLIND | BLINK  
-D:"Invisible ones from the stars... They sometimes took forms... 
-D:but existed as vortices of power in their natural state." 
-
-N:683:Utgard-Loke
-G:P:v
-I:120:40d100:30:125:15
-W:44:3:0:13500
-E:1:1:1:2:1:1
-O:0:100:0:0
-B:HIT:COLD:12d12
-B:HIT:COLD:12d12
-B:HIT:COLD:12d12
-B:HIT:COLD:12d12
-F:ESCORT | UNIQUE | IM_COLD | AURA_COLD | DROP_CORPSE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | MOVE_BODY |
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR |
-F:EVIL | GIANT | MALE | ZANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:HEAL | TELE_TO | 
-S:S_KIN | BR_COLD 
-D:A frost giant chieftain, unusually smart for a giant. 
-
-N:684:Quachil Uttaus, Treader of the Dust
-G:z:D
-I:120:50d66:30:80:15
-W:44:3:0:20000
-E:1:1:1:2:1:1
-O:0:0:100:0
-B:CLAW:HURT:50d1
-B:TOUCH:TIME:1d50
-B:TOUCH:TIME:1d50
-F:ESCORT | UNIQUE | IM_COLD | ELDRITCH_HORROR | RES_NETH |
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | KILL_BODY | DROP_GREAT |
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR | NO_SLEEP | NO_CONF
-F:EVIL | UNDEAD | DEMON | REGENERATE | CTHANGBAND | NO_CUT
-S:1_IN_3 | 
-S:BR_TIME | SLOW | HASTE | HEAL 
-D:"It was a figure no larger than a young child, but severe and 
-D:shriveled as some millenial mummy. Its hairless head, its 
-D:unfeatured face, borne on a neck of skeleton thinness, were 
-D:lined with a thousand reticulated wrinkles. The body was like 
-D:that of some monstrous, withered abortion that had never drawn 
-D:breath. The pipelike arms, ending in bony claws, were outhrust as if 
-D:enclosed in a posture of an eternal dreadful grasping." 
-
-N:685:Shoggoth
-G:j:D
-I:140:50d20:20:80:20
-W:44:2:0:2500
-E:0:0:0:0:0:0
-O:30:70:0:0
-B:CRUSH:ACID:5d6
-B:CRUSH:ACID:5d6
-B:CRUSH:ACID:5d6
-B:CRUSH:HURT:9d9
-F:REGENERATE | ONLY_ITEM | KILL_ITEM | DROP_2D2 | DROP_90 | DROP_60
-F:BASH_DOOR | EVIL | NO_CONF | NO_SLEEP | KILL_BODY | CAN_SWIM |
-F:FORCE_MAXHP | FORCE_SLEEP | HURT_LITE | POWERFUL |
-F:IM_ACID | IM_FIRE | RES_PLAS | IM_POIS | IM_COLD | IM_ELEC | RES_TELE
-F:CTHANGBAND | HAS_LITE | NO_CUT
-D:"The nightmare, plastic column of fetid, black iridescence oozed 
-D:tightly onward... A shapeless congerie of protoplasmic bubbles, 
-D:faintly self-luminous and with myriads of temporary eyes forming 
-D:and unforming as pustules of greenish light all over the 
-D:tunnel-filling front that bore down upon us, crushing the frantic 
-D:penguins and slithering over glistening floor that it and its 
-D:kind had swept so evilly free of all litter. Still came that eldritch 
-D:mocking cry -- 'Tekeli-li! Tekeli-li!'" 
-
 N:686:Judge Death
 G:W:D
 I:120:45d50:90:90:10
@@ -11310,15 +15055,41 @@ B:CLAW:POISON:10d5
 B:CLAW:POISON:10d5
 B:CLAW:EXP_40:10d1
 B:GAZE:TERRIFY
-F:UNIQUE | MALE | CAN_SPEAK | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | 
-F:SMART | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | MOVE_BODY | 
-F:EVIL | UNDEAD | IM_ELEC | IM_COLD | SUSCEP_FIRE | 
-F:IM_POIS | NO_CONF | NO_SLEEP | JOKEANGBAND | NO_CUT | NO_STUN
-S:1_IN_3 | 
-S:BLIND | HOLD | SCARE | CAUSE_4 | BA_FIRE | BA_NETH | ANIM_DEAD 
-S:S_MONSTERS | S_UNDEAD | S_HI_UNDEAD | DRAIN_MANA | 
+F:BASH_DOOR
+F:CAN_SPEAK
+F:COLD_BLOOD
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_ELEC
+F:IM_POIS
+F:JOKEANGBAND
+F:MALE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:SUSCEP_FIRE
+F:UNDEAD
+F:UNIQUE
+S:1_IN_3
+S:BA_FIRE
+S:BA_NETH
+S:BLIND
+S:CAUSE_4
+S:DRAIN_MANA
+S:HOLD
+S:SCARE
+S:S_HI_UNDEAD
+S:S_MONSTERS
+S:S_UNDEAD
 D:The most powerful Dark Judge, whose touch means death. 
 
 N:687:Ariel, Queen of Air
@@ -11331,15 +15102,32 @@ B:HIT:HURT:4d6
 B:HIT:CONFUSE:4d4
 B:HIT:HURT:4d6
 B:HIT:CONFUSE:4d4
-F:UNIQUE | FEMALE | AURA_ELEC | CAN_SPEAK |
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:RAND_25 | CAN_FLY |
-F:EMPTY_MIND | COLD_BLOOD | 
-F:KILL_ITEM | KILL_BODY | BASH_DOOR | POWERFUL | 
-F:IM_ACID | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_5 | 
-S:BO_ELEC | BA_COLD | BA_ELEC
+F:AURA_ELEC
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FEMALE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_POIS
+F:KILL_BODY
+F:KILL_ITEM
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_25
+F:UNIQUE
+S:1_IN_5
+S:BA_COLD
+S:BA_ELEC
+S:BO_ELEC
 D:A towering air elemental, Ariel the sorceress avoids your blows 
 D:with her extreme speed. 
 
@@ -11353,13 +15141,26 @@ B:BITE:FIRE:3d12
 B:BITE:FIRE:3d12
 B:BITE:FIRE:3d12
 B:BITE:FIRE:3d12
-F:FORCE_SLEEP | WILD_TOO | WILD_SHORE | WILD_SWAMP | 
-F:ONLY_GOLD | DROP_2D2 | DROP_4D2 | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | MOVE_BODY | 
-F:ANIMAL | IM_FIRE | CAN_SWIM | 
-F:MORTAL | BASEANGBAND
-S:1_IN_4 | 
-S:SCARE | BO_FIRE | BO_PLAS | BA_FIRE | BR_FIRE
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:IM_FIRE
+F:MORTAL
+F:MOVE_BODY
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:WILD_SHORE
+F:WILD_TOO
+S:1_IN_4
+S:BA_FIRE
+S:BO_FIRE
+S:BO_PLAS
+S:BR_FIRE
+S:SCARE
 D:A strange reptilian hybrid with eleven smouldering heads. 
 
 N:689:Patriarch
@@ -11371,15 +15172,30 @@ O:0:10:90:0
 B:HIT:HURT:3d4
 B:HIT:HURT:3d4
 B:HIT:HURT:3d5
-F:MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_90 | DROP_2D2 | 
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | NO_CONF | NO_SLEEP | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:HEAL | BLIND | HOLD | CAUSE_4 | CAUSE_3 | ANIM_DEAD | 
-S:S_MONSTERS | S_UNDEAD
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+S:1_IN_2
+S:BLIND
+S:CAUSE_3
+S:CAUSE_4
+S:HEAL
+S:HOLD
+S:S_MONSTERS
+S:S_UNDEAD
 D:An evil priest, dressed all in black.  Deadly spells hit you at an 
 D:alarming rate as his black spiked mace rains down blow after blow on your 
 D:pitiful frame. 
@@ -11394,14 +15210,34 @@ B:HIT:HURT:6d6
 B:HIT:HURT:6d6
 B:HIT:LOSE_STR:3d4
 B:HIT:LOSE_STR:3d4
-F:FORCE_SLEEP | FORCE_MAXHP | RAND_25 | 
-F:ONLY_ITEM | DROP_1D2 | DROP_4D2 | CAN_FLY |
-F:SMART | TAKE_ITEM | INVISIBLE | COLD_BLOOD | PASS_WALL | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_4D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
 F:NO_CUT
-S:1_IN_9 | 
-S:TELE_LEVEL | BLIND | HOLD | CONF | CAUSE_4 | DRAIN_MANA | BO_NETH | 
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PASS_WALL
+F:RAND_25
+F:SMART
+F:TAKE_ITEM
+F:UNDEAD
+S:1_IN_9
+S:BLIND
+S:BO_NETH
+S:CAUSE_4
+S:CONF
+S:DRAIN_MANA
+S:HOLD
 S:S_UNDEAD
+S:TELE_LEVEL
 D:It is an unlife of power almost unequalled. An affront to existence, its 
 D:very touch abuses and disrupts the flow of life, and its unearthly limbs, 
 D:of purest black, crush rock and flesh with ease. 
@@ -11416,15 +15252,31 @@ B:CLAW:HURT:3d10
 B:CLAW:HURT:3d10
 B:BITE:POISON:5d10
 B:BITE:POISON:5d10
-F:FORCE_SLEEP | FORCE_MAXHP | RES_TELE | 
-F:EMPTY_MIND | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:DRAGON | IM_FIRE | IM_COLD | 
-F:IM_ELEC | IM_POIS | CAN_SWIM |
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | BASEANGBAND | NO_CUT
 F:ATTR_MULTI
-S:1_IN_6 | 
-S:BLIND | SLOW | CONF | ARROW_3 | 
+F:BASH_DOOR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:DRAGON
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:RES_TELE
+S:1_IN_6
+S:ARROW_3
+S:BLIND
 S:BR_POIS
+S:CONF
+S:SLOW
 D:A constructed dragon, the drolem has massive strength. Powerful spells 
 D:weaved during its creation make it a fearsome adversary. Its eyes show 
 D:little intelligence, but it has been instructed to destroy all it meets. 
@@ -11439,34 +15291,33 @@ B:CLAW:HURT:4d10
 B:CLAW:HURT:4d10
 B:BITE:COLD:4d14
 B:BITE:COLD:4d14
-F:UNIQUE | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | SUSCEP_FIRE |
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_CORPSE
-F:BASH_DOOR | POWERFUL | MOVE_BODY | CAN_FLY |
-F:EVIL | DRAGON | IM_COLD | NO_CONF | BASEANGBAND | HAS_LITE
-S:1_IN_4 | 
-S:CONF | CAUSE_3 | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:MALE
+F:MOVE_BODY
+F:NO_CONF
+F:ONLY_ITEM
+F:POWERFUL
+F:SUSCEP_FIRE
+F:UNIQUE
+S:1_IN_4
 S:BR_COLD
+S:CAUSE_3
+S:CONF
 D:An ancient and wise dragon, Scatha has grown clever over the long years. 
 D:His scales are covered with frost, and his breath sends a shower of ice 
 D:into the air. 
 
-N:693:Warrior of the Dawn
-G:p:R
-I:120:25d25:20:70:20
-W:45:2:1600:500
-E:1:1:1:2:1:1
-O:0:0:0:0
-B:HIT:HURT:5d5
-B:HIT:HURT:5d5
-F:IM_POIS | IM_FIRE | IM_ELEC | IM_ACID | IM_COLD |
-F:NO_SLEEP | NO_FEAR |
-F:FRIENDS |
-F:MALE | OPEN_DOOR | BASH_DOOR | ZANGBAND | HAS_LITE
-D:Fierce, barbaric warriors, armed with great spiked clubs, and surrounded 
-D:in an aura of scarlet. Whenever one of them is slain, another appears 
-D:out of nowhere to take his place. 
-
 N:694:Lesser black reaver
 G:L:D
 I:120:25d100:20:120:50
@@ -11477,45 +15328,38 @@ B:HIT:UN_BONUS:4d8
 B:HIT:UN_BONUS:4d8
 B:HIT:LOSE_STR:4d6
 B:HIT:LOSE_STR:4d6
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | 
-F:ONLY_ITEM  | DROP_2D2 | DROP_GOOD | CAN_SWIM |
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | RES_TELE
-F:NO_CONF | NO_SLEEP | KILL_WALL | NO_FEAR
-F:MORTAL | BASEANGBAND | NO_CUT
-S:1_IN_3 | 
-S:TELE_TO | BLIND | HOLD | CONF | CAUSE_3 | DRAIN_MANA | 
-S:MIND_BLAST | BA_NETH | ANIM_DEAD
+F:BASH_DOOR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:KILL_WALL
+F:MORTAL
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:SMART
+F:UNDEAD
+S:1_IN_3
+S:BA_NETH
+S:BLIND
+S:CAUSE_3
+S:CONF
+S:DRAIN_MANA
+S:HOLD
+S:MIND_BLAST
+S:TELE_TO
 D:A humanoid form, black as night, advancing steadily and unstoppably. 
 
-N:695:Zoth-Ommog
-G:R:v
-I:120:25d100:12:50:50
-W:45:4:0:18000
-E:0:0:0:0:0:0
-O:0:0:0:0
-B:CRUSH:HURT:25d3
-B:CRUSH:HURT:25d3
-B:BITE:LOSE_DEX:2d10
-B:BITE:LOSE_CON:2d10
-F:UNIQUE | CAN_SPEAK |
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:RAND_25 | CAN_SWIM | ELDRITCH_HORROR |
-F:KILL_ITEM |  BASH_DOOR | POWERFUL | 
-F:EVIL | IM_ACID | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_FEAR | CTHANGBAND
-S:1_IN_5 | 
-S:S_MONSTER | SCARE | CAUSE_4 | S_HYDRA | S_SPIDER | 
-S:BA_NETH | BA_POIS | BA_ACID | CAUSE_3 | HOLD | MIND_BLAST
-D:"A body shaped like a road-based, truncated cone. A flat, blunt, 
-D:wedge-shaped, vaguely reptilian head surmounts this conical torso, 
-D:and the head is almost entirely hidden behind swirling tresses. 
-D:This hair, or beard and mane, consists of thickly carved and 
-D:coiling ropes, like serpents or worms... Through this repulsive 
-D:Medusa-mane of ropy tendrils, two fierce, serpent-like eyes 
-D:glare in a horrible intermingling of cold, inhuman mockery and 
-D:what I can only describe as gloating menace." 
-
 N:696:Grand master thief
 G:p:b
 I:130:15d100:50:75:40
@@ -11526,11 +15370,18 @@ B:HIT:EAT_ITEM:5d5
 B:HIT:EAT_ITEM:5d5
 B:HIT:EAT_GOLD:5d5
 B:HIT:EAT_GOLD:5d5
-F:MALE | DROP_2D2 |
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR |
-F:EVIL | BASEANGBAND
-S:1_IN_2 |
-S:BLINK | TPORT | TELE_TO | CONF | TRAPS | ARROW_2
+F:BASH_DOOR
+F:DROP_2D2
+F:EVIL
+F:MALE
+F:OPEN_DOOR
+F:TAKE_ITEM
+S:1_IN_2
+S:ARROW_2
+S:BLINK
+S:CONF
+S:TELE_TO
+S:TPORT
 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. 
 
@@ -11544,38 +15395,37 @@ B:CLAW:HURT:4d12
 B:CLAW:HURT:4d12
 B:BITE:FIRE:5d14
 B:BITE:FIRE:5d14
-F:UNIQUE | MALE | REFLECTING | CAN_FLY | DROP_CORPSE | 
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_SPEAK |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | DROP_GREAT |
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:SMART | EVIL | DRAGON | IM_FIRE | BASEANGBAND
-F:HAS_LITE
-S:1_IN_4 | 
-S:CONF | CAUSE_3 | 
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:DRAGON
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:MALE
+F:MOVE_BODY
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:REFLECTING
+F:SMART
+F:UNIQUE
+S:1_IN_4
 S:BR_FIRE
+S:CAUSE_3
+S:CONF
 D:Smaug is one of the Uruloki that still survive, a fire-drake of immense 
 D:cunning and intelligence.  His speed through air is matched by few other 
 D:dragons, his dragonfire is legendary, and his hide is 
 D:armoured with diamonds. He is believed to be the greatest dragon still 
 D:surviving into the Third Age. 
 
-N:698:The Stormbringer
-G:|:D
-I:120:13d123:20:99:20
-W:45:2:0:13333
-E:0:0:0:0:0:0
-O:0:0:0:0
-B:WAIL:TERRIFY
-B:HIT:EXP_80:64d1
-B:HIT:EXP_80:64d1
-B:HIT:EXP_80:8d8
-F:CHAR_MULTI | EVIL | IM_POIS | IM_COLD | IM_FIRE | RES_NETH |
-F:FORCE_SLEEP | UNIQUE | FORCE_MAXHP | CAN_FLY |
-F:COLD_BLOOD | BASH_DOOR | NONLIVING |
-F:NO_CONF | NO_SLEEP | NO_FEAR | ZANGBAND | HAS_LITE | NO_CUT | NO_STUN
-D:The mightiest of hellblades, a black runesword which thirsts for 
-D:your soul. 
-
 N:699:Knight Templar
 G:p:w
 I:120:60d20:20:60:10
@@ -11585,14 +15435,39 @@ O:0:100:0:0
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
-F:IM_POIS | IM_FIRE | IM_ELEC | IM_ACID | IM_COLD | GOOD |
-F:RES_NETH | RES_NEXU | RES_DISE | RES_TELE | DROP_SKELETON | DROP_CORPSE
-F:NO_SLEEP | NO_CONF | NO_FEAR | NO_STUN | 
-F:DROP_2D2 | DROP_90 | REFLECTING |
-F:MALE | OPEN_DOOR | BASH_DOOR | FORCE_MAXHP | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_4 | 
-S:HEAL | CAUSE_3 | CAUSE_4 | HASTE | SCARE | BLIND | S_ANGEL
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:OPEN_DOOR
+F:REFLECTING
+F:RES_DISE
+F:RES_NETH
+F:RES_NEXU
+F:RES_TELE
+S:1_IN_4
+S:BLIND
+S:CAUSE_3
+S:CAUSE_4
+S:HASTE
+S:HEAL
+S:SCARE
+S:S_ANGEL
 D:It seems that the more devout the person, the more likely they are to cross 
 D:the boundary between piety and sanctimoniousness.  And such is the case with 
 D:the Order of the Knights Templar; they are among the most pious and 
@@ -11600,22 +15475,6 @@ D:powerful of the religious knightly orders, but noted for their intolerance.
 D:Thus it is Morgoth's will that is unwittingly done, as the forces of good 
 D:are set against each other. 
 
-N:700:Leprechaun fanatic
-G:h:r
-I:123:6d6:8:13:8
-W:46:6:800:80
-E:1:1:1:2:1:1
-O:0:0:0:0
-B:EXPLODE:HURT:20d3
-F:RAND_25 | TAKE_ITEM | SMART |
-F:EVIL | OPEN_DOOR | MALE |
-F:MORTAL | ZANGBAND
-S:MULTIPLY | 
-S:1_IN_6 | 
-S:BLINK | TPORT | TELE_TO  
-D:These leprechauns are not afraid to die for their cause. They are 
-D:carrying explosives and making terrorist strikes... 
-
 N:701:Dracolich
 G:D:G
 I:120:35d100:25:120:80
@@ -11625,15 +15484,33 @@ O:10:50:40:0
 B:CLAW:HURT:4d12
 B:CLAW:HURT:4d12
 B:BITE:EXP_80:7d14
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | RES_TELE | 
-F:COLD_BLOOD | CAN_FLY |
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DRAGON | UNDEAD | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT | ATTR_MULTI
-S:1_IN_6 | 
-S:CONF | SCARE | 
-S:BR_COLD | BR_NETH
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DRAGON
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:MOVE_BODY
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:RES_TELE
+F:TAKE_ITEM
+F:UNDEAD
+S:1_IN_6
+S:BR_COLD
+S:BR_NETH
+S:CONF
+S:SCARE
 D:The skeletal form of a once-great dragon, enchanted by magic most 
 D:perilous. Its animated form strikes with speed and drains life from its 
 D:prey to satisfy its hunger. 
@@ -11648,13 +15525,27 @@ B:HIT:CONFUSE:12d12
 B:HIT:CONFUSE:12d12
 B:HIT:CONFUSE:12d12
 B:HIT:CONFUSE:12d12
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_4D2 | DROP_1D2 | DROP_GOOD | MOVE_BODY |
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR |
-F:EVIL | GIANT | MALE | BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:HEAL | TELE_TO | 
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GIANT
+F:HAS_LITE
+F:MALE
+F:MOVE_BODY
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:TAKE_ITEM
+S:1_IN_3
+S:HEAL
 S:S_MONSTERS
+S:TELE_TO
 D:A forty foot tall humanoid that shakes the ground as it walks. The power 
 D:radiating from its frame shakes your courage, its hatred inspired by your 
 D:defiance. 
@@ -11669,14 +15560,30 @@ B:CLAW:HURT:4d12
 B:CLAW:HURT:4d12
 B:BITE:FIRE:7d14
 B:GAZE:PARALYZE
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | RES_NEXU | RES_TELE | 
-F:ANIMAL | EVIL | DRAGON | IM_ACID | IM_FIRE | NO_CONF | NO_SLEEP | 
-F:BASEANGBAND | ATTR_MULTI
-S:1_IN_6 | 
-S:HOLD | SCARE | 
-S:BR_FIRE | BR_NEXU
+F:ANIMAL
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_FIRE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_NEXU
+F:RES_TELE
+S:1_IN_6
+S:BR_FIRE
+S:BR_NEXU
+S:HOLD
+S:SCARE
 D:A mixture of dragon and basilisk, the dracolisk stares at you with deep 
 D:piercing eyes, its evil breath burning the ground where it stands. 
 
@@ -11688,81 +15595,25 @@ B:CLAW:HURT:3d8
 B:CLAW:HURT:3d8
 B:BITE:EXP_40:4d6
 B:BITE:EXP_40:4d6
-F:ANIMAL | MORTAL | EVIL | CAN_FLY | BASH_DOOR | IM_COLD | IM_POIS
-F:WILD_TOO | WILD_WASTE | WILD_WOOD | WILD_SWAMP | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:EVIL
+F:IM_COLD
+F:IM_POIS
+F:MORTAL
+F:WILD_TOO
+F:WILD_WASTE
+F:WILD_WOOD
 S:1_IN_6
-S:BR_NETH | BR_DARK | BR_POIS
+S:BR_DARK
+S:BR_NETH
+S:BR_POIS
 D:A terrifying sight:  a winged creature greater than any bird you have ever 
 D:seen, and with no feathers on its horrid black leathery wings.  Descended 
 D:from a creature of an older world perhaps, bred by Sauron to be a winged 
 D:steed for his Ringwraiths. 
 
-N:705:Spectral tyrannosaur
-G:R:G
-I:120:70d50:25:120:30
-W:46:3:0:15000
-E:0:0:0:0:0:0
-O:20:20:20:20
-B:BITE:EXP_40:2d13
-B:BITE:EXP_40:2d13
-B:BITE:LOSE_STR:5d8
-B:GAZE:TERRIFY
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:EVIL | UNDEAD | ANIMAL | RES_NEXU | RES_TELE
-F:NO_CONF | NO_FEAR | NO_SLEEP | 
-F:IM_POIS | IM_ACID | IM_COLD |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | MOVE_BODY | ZANGBAND | NO_CUT
-S:1_IN_6 | 
-S:HOLD | SCARE | 
-S:BR_NEXU | BR_POIS | BR_NETH
-D:A deadly undead horror which looks like a skeletal tyrannosaur 
-D:surrounded by a sickly green glow. 
-
-N:706:Yibb-Tstll, the Patient One
-G:P:D
-I:120:99d21:20:100:20
-W:46:2:0:16000
-E:0:0:0:0:0:0
-O:0:0:100:0
-B:TOUCH:LOSE_ALL:1d166
-B:TOUCH:LOSE_ALL:1d166
-F:UNIQUE | FORCE_SLEEP | FORCE_MAXHP | 
-F:ELDRITCH_HORROR | NEVER_MOVE | REGENERATE | POWERFUL | 
-F:DROP_2D2 | DROP_4D2 | DROP_GOOD | ONLY_ITEM | 
-F:SMART | IM_FIRE | IM_COLD | IM_ELEC | IM_ACID | IM_POIS | CTHANGBAND
-S:1_IN_4 | 
-S:BR_NUKE | S_DEMON | DARKNESS | S_UNDEAD | ANIM_DEAD 
-S:BR_NEXU | BR_CHAO
-D:"There, about the pulsating body of the Ancient One, hugely 
-D:winged reptilian creatures without faces cluttered and clutched 
-D:at a multitude of blackly writhing, pendulous breasts! Its eyes 
-D:moved quickly, independently -- sliding with vile viscosity over 
-D:the whole rotten surface of Yib-Tstll's pulpy, glistening head!" 
-
-N:707:Ghatanothoa
-G:v:D
-I:120:100d20:20:100:20
-W:46:2:0:16000
-E:0:0:0:0:0:0
-O:0:0:100:0
-B:CLAW:LOSE_INT:5d10
-B:CLAW:LOSE_WIS:5d10
-B:BITE:CONFUSE:5d10
-F:FORCE_SLEEP | ELDRITCH_HORROR | PASS_WALL | UNIQUE |
-F:INVISIBLE | DROP_2D2 | DROP_4D2 | CAN_FLY | DROP_GOOD | ONLY_ITEM |
-F:OPEN_DOOR | BASH_DOOR | MOVE_BODY | POWERFUL | NO_CONF | NO_SLEEP |
-F:SMART | IM_FIRE | IM_COLD | IM_ELEC | IM_ACID | IM_POIS | 
-F:MORTAL | CTHANGBAND | NO_CUT
-S:1_IN_4 | 
-S:BR_WALL | TELE_AWAY | BR_GRAV | TELE_LEVEL | S_DEMON | S_UNDEAD | S_KIN | 
-S:BRAIN_SMASH | HASTE | BLIND | BLINK | BR_INER | CAUSE_3 | CAUSE_4
-D:The chief among the creatures known as Lloigor. Ghatanothoa, unlike most of 
-D:his kind, has assumed a shape, and one which is too horrible to describe:  
-D:"Nothing I could say could even adumbrate the loathsome, unholy, non-human, 
-D:extra-galactic horror and hatefulness and unutterable evil of that forbidden 
-D:spawn of black chaos, and illimitable night." 
-
 N:708:Ent
 G:#:G
 I:110:40d100:30:120:15
@@ -11773,10 +15624,20 @@ B:CRUSH:HURT:12d13
 B:CRUSH:HURT:12d13
 B:CRUSH:HURT:12d13
 B:CRUSH:HURT:12d13
-F:FORCE_SLEEP | FORCE_MAXHP | PET | SUSCEP_FIRE | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | MOVE_BODY |
-F:SMART | TAKE_ITEM | KILL_WALL | BASH_DOOR |
-F:GOOD | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:DROP_4D2
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:KILL_WALL
+F:MOVE_BODY
+F:NO_CUT
+F:ONLY_ITEM
+F:PET
+F:SMART
+F:SUSCEP_FIRE
+F:TAKE_ITEM
 D:A tree-herd: a sentient, moving tree. Its wrath is fearsome, and it could 
 D:split stones and even the very rock of Isengard with its roots. 
 
@@ -11790,10 +15651,22 @@ B:HIT:SHATTER:12d13
 B:HIT:SHATTER:12d13
 B:HIT:SHATTER:12d13
 B:HIT:SHATTER:12d13
-F:FORCE_SLEEP | FORCE_MAXHP | HURT_ROCK |
-F:ONLY_GOLD | DROP_4D2 | MOVE_BODY | KILL_WALL |
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR |
-F:EVIL | GIANT | MALE | HAS_LITE | NO_CUT
+F:BASH_DOOR
+F:DROP_4D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GIANT
+F:HAS_LITE
+F:HURT_ROCK
+F:KILL_WALL
+F:MALE
+F:MOVE_BODY
+F:NO_CUT
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:SMART
+F:TAKE_ITEM
 D:A rock giant, a being made of living stone. 
 
 N:710:Itangast the Fire Drake
@@ -11806,14 +15679,28 @@ B:CLAW:HURT:4d10
 B:CLAW:HURT:4d10
 B:BITE:FIRE:4d14
 B:BITE:FIRE:4d14
-F:UNIQUE | MALE |
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | DROP_CORPSE
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | SUSCEP_COLD |
-F:BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DRAGON | IM_FIRE | BASEANGBAND | HAS_LITE
-S:1_IN_4 | 
-S:CONF | CAUSE_3 | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:MALE
+F:MOVE_BODY
+F:ONLY_ITEM
+F:POWERFUL
+F:SUSCEP_COLD
+F:UNIQUE
+S:1_IN_4
 S:BR_FIRE
+S:CAUSE_3
+S:CONF
 D:A mighty ancient dragon, Itangast's form scorches your flesh. Wisps of 
 D:smoke curl up from his nostrils as he regards you with disdain. 
 
@@ -11827,59 +15714,23 @@ B:SPORE:UN_BONUS:7d7
 B:SPORE:UN_BONUS:7d7
 B:SPORE:UN_BONUS:7d7
 B:SPORE:EXP_80:5d5
-F:FORCE_SLEEP | NEVER_MOVE | CAN_SWIM |
-F:EVIL | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:EVIL
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
 D:It is the epitome of all that is evil, in a mold. Its lifeless form draws 
 D:power from sucking the souls of those that approach it; a nimbus of pure 
 D:evil surrounds it. Luckily for you, it can't move... 
 
-N:712:Fafner the Dragon
-G:D:G
-I:120:25d110:30:130:80
-W:48:2:170000:25000
-E:0:1:0:6:1:0
-O:50:50:0:0
-B:CLAW:HURT:4d12
-B:CLAW:HURT:4d12
-B:BITE:FIRE:5d14
-B:BITE:POISON:5d14
-F:UNIQUE | MALE | SUSCEP_COLD |
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_SPEAK | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:BASH_DOOR | POWERFUL | MOVE_BODY | INVISIBLE | 
-F:EVIL | DRAGON | IM_FIRE | IM_POIS | ZANGBAND | 
-F:HAS_LITE
-S:1_IN_3 | 
-S:CONF | CAUSE_3 | 
-S:BR_FIRE | BR_POIS | SCARE | CAUSE_3 | CONF
-D:The mighty dragon of myth, Fafner was a giant who slew his 
-D:brother to win a treasure hoard, and then transformed himself 
-D:into a dragon, greedily watching over his gold. 
-
-N:713:Charon, Boatman of the Styx
-G:W:B
-I:120:28d100:30:100:10
-W:47:3:0:25000
-E:1:1:1:2:1:1
-O:0:0:0:0
-B:WAIL:LOSE_ALL
-B:TOUCH:UN_POWER
-B:HIT:EXP_80:8d12
-B:HIT:EAT_GOLD:8d12
-F:UNIQUE | MALE | SMART | CAN_SWIM | 
-F:FORCE_SLEEP | FORCE_MAXHP |
-F:ONLY_GOLD | DROP_3D2 | DROP_4D2 |
-F:COLD_BLOOD | PASS_WALL | OPEN_DOOR | BASH_DOOR | MOVE_BODY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | 
-F:NO_STUN | NO_CONF | NO_SLEEP | RES_TELE | ZANGBAND | NO_CUT
-S:1_IN_3 |
-S:BLIND | HOLD | SCARE | CAUSE_3 | DARKNESS |
-S:BO_ICEE | BO_NETH | BA_COLD | BA_NETH | BA_WATE |
-S:S_UNDEAD
-D:The ferryman across the river Styx to the land of the dead. 
-D:He wishes to receive payment for your entry. 
-
 N:714:Quickbeam, the Ent
 G:#:G
 I:120:40d100:30:120:15
@@ -11890,10 +15741,22 @@ B:CRUSH:HURT:12d13
 B:CRUSH:HURT:12d13
 B:CRUSH:HURT:12d13
 B:CRUSH:HURT:12d13
-F:FORCE_SLEEP | FORCE_MAXHP | UNIQUE | CAN_SPEAK | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | MOVE_BODY | SUSCEP_FIRE | 
-F:SMART | TAKE_ITEM | KILL_WALL | BASH_DOOR |
-F:GOOD | PET | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_4D2
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:KILL_WALL
+F:MOVE_BODY
+F:NO_CUT
+F:ONLY_ITEM
+F:PET
+F:SMART
+F:SUSCEP_FIRE
+F:TAKE_ITEM
+F:UNIQUE
 D:Unusually hasty, for an ent.  Quickbeam hates evil creatures, and orcs in 
 D:particular, since the destruction of his beloved rowan-trees to feed the 
 D:fires of Orthanc. 
@@ -11908,15 +15771,37 @@ B:CLAW:HURT:5d12
 B:CLAW:HURT:5d12
 B:BITE:FIRE:8d14
 B:BITE:POISON:8d14
-F:UNIQUE | MALE | CAN_SPEAK | DROP_CORPSE |
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | DROP_RANDART
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:SMART | EVIL | DRAGON | IM_POIS | IM_FIRE | 
-F:BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:BLIND | CONF | SCARE | 
-S:BR_FIRE | BR_POIS | BR_SOUN | S_HI_DRAGON
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:DRAGON
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:DROP_RANDART
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:SMART
+F:UNIQUE
+S:1_IN_3
+S:BLIND
+S:BR_FIRE
+S:BR_POIS
+S:BR_SOUN
+S:CONF
+S:SCARE
+S:S_HI_DRAGON
 D:Glaurung is the father of all dragons, and was for a long time the most 
 D:powerful.  Though this is no longer so, he still has full command over 
 D:his brood and can command them to appear whenever he so wishes.  He is 
@@ -11932,36 +15817,24 @@ B:BITE:FIRE:5d8
 B:BITE:FIRE:5d8
 B:CRUSH:HURT:3d15
 B:CRUSH:HURT:3d15
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_SWIM | ANIMAL | AQUATIC | 
-F:IM_FIRE | IM_ACID | IM_COLD | IM_POIS | DROP_CORPSE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:CAN_SWIM
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
 S:1_IN_9
 S:BR_FIRE
 D:A great water-beast, with an almost impenetrable skin. 
 
-N:717:Garm, Guardian of Hel
-G:C:b
-I:120:30d100:20:120:70
-W:49:2:0:25000
-E:0:1:0:2:1:0
-O:50:50:0:0
-B:CLAW:HURT:7d13
-B:CLAW:HURT:7d13
-B:BITE:HURT:8d13
-B:BITE:HURT:8d13
-F:UNIQUE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | MOVE_BODY | RES_NETH |
-F:ANIMAL | EVIL | IM_FIRE | NO_SLEEP | ZANGBAND
-S:1_IN_3 | 
-S:BR_NETH | BR_COLD | BR_DARK | 
-S:S_HOUND | S_UNDEAD
-D:Garm is a gigantic hound, whose job is to guard that none escapes 
-D:the tortures of Hel, the place of punishment for the wicked 
-D:and cowardly dead. 
-
 N:718:Greater wall monster
 G:#:W
 I:120:15d40:20:80:20
@@ -11971,11 +15844,25 @@ O:0:0:0:0
 B:HIT:HURT:3d6
 B:HIT:HURT:3d6
 B:HIT:HURT:3d6
-F:FORCE_SLEEP | COLD_BLOOD | EMPTY_MIND | PASS_WALL | RAND_50 | 
-F:BASH_DOOR | IM_COLD | IM_ACID | IM_FIRE | IM_ELEC | IM_POIS | NONLIVING | 
-F:HURT_ROCK | NO_CONF | NO_SLEEP | CHAR_MULTI | CAN_FLY | BASEANGBAND
+F:BASH_DOOR
+F:CAN_FLY
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HURT_ROCK
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NONLIVING
+F:NO_CONF
 F:NO_CUT
-S:MULTIPLY | 
+F:NO_SLEEP
+F:PASS_WALL
+F:RAND_50
+S:MULTIPLY
 D:A sentient, moving section of wall. 
 
 N:719:Nycadaemon
@@ -11988,13 +15875,32 @@ B:TOUCH:TERRIFY
 B:CLAW:HURT:6d6
 B:CLAW:HURT:6d6
 B:CLAW:HURT:6d6
-F:FORCE_SLEEP | FORCE_MAXHP | AURA_FIRE | NONLIVING | 
-F:REGENERATE | IM_ACID | IM_COLD | IM_FIRE | CAN_FLY |
-F:NO_SLEEP | NO_STUN | NO_CONF | EVIL | DEMON |
-F:INVISIBLE | KILL_WALL |
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | BASEANGBAND
-S:1_IN_4 | 
-S:HOLD | BLINK | CONF | S_DEMON | BRAIN_SMASH | BR_NETH
+F:AURA_FIRE
+F:CAN_FLY
+F:DEMON
+F:DROP_1D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_FIRE
+F:INVISIBLE
+F:KILL_WALL
+F:NONLIVING
+F:NO_CONF
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:REGENERATE
+S:1_IN_4
+S:BLINK
+S:BRAIN_SMASH
+S:BR_NETH
+S:CONF
+S:HOLD
+S:S_DEMON
 D:A loathsome, sturdy, winged, horned demon, with talons that could tear 
 D:a stone wall down. 
 
@@ -12008,37 +15914,27 @@ B:HIT:HURT:4d10
 B:HIT:HURT:4d10
 B:HIT:LOSE_CON:10d2
 B:STING:POISON:5d5
-F:FORCE_SLEEP | FORCE_MAXHP | FRIENDS | 
-F:ONLY_ITEM | DROP_1D2 | NONLIVING | BASEANGBAND | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | 
-F:EVIL | DEMON | IM_POIS | NO_CONF | NO_SLEEP
-S:1_IN_7 | 
-S:SCARE | S_DEMON
+F:BASH_DOOR
+F:DEMON
+F:DROP_1D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:FRIENDS
+F:IM_POIS
+F:NONLIVING
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+S:1_IN_7
+S:SCARE
+S:S_DEMON
 D:A foul, humanoid creature with a long tail, clawed hands and feet, 
 D:and a disgusting, wiry, snaky beard.  They are the elite shock troops 
 D:of the hells, capable of a terrifying berserk fury. 
 
-N:721:Goat of Mendes
-G:q:D
-I:120:18d111:30:66:40
-W:50:3:0:6666
-E:0:1:0:2:1:0
-O:0:0:100:0
-B:GAZE:TERRIFY
-B:BUTT:HURT:6d6
-B:BITE:EXP_40
-B:BITE:LOSE_CON
-F:EVIL | DEMON | FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_2D2 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | SMART | NONLIVING |
-F:NO_CONF | NO_SLEEP | HURT_LITE | IM_FIRE | IM_COLD | ZANGBAND
-S:1_IN_4 | 
-S:BLIND | CONF | BRAIN_SMASH | SCARE | ANIM_DEAD
-S:BA_NETH | FORGET | S_UNDEAD | DRAIN_MANA |
-S:S_DEMON | CAUSE_4 | BA_COLD
-D:It is a demonic creature from the lowest hell, vaguely resembling a 
-D:large black he-goat. 
-
 N:722:Nightwing
 G:W:D
 I:120:60d60:20:120:10
@@ -12049,14 +15945,34 @@ B:TOUCH:POISON:6d5
 B:TOUCH:POISON:6d5
 B:HIT:UN_BONUS:6d8
 B:HIT:UN_BONUS:6d8
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
-F:SMART | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | RES_TELE | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_4 | 
-S:BLIND | SCARE | CAUSE_4 | BRAIN_SMASH | 
-S:BO_MANA | BO_NETH | BA_NETH | S_UNDEAD
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:SMART
+F:UNDEAD
+S:1_IN_4
+S:BA_NETH
+S:BLIND
+S:BO_MANA
+S:BO_NETH
+S:BRAIN_SMASH
+S:CAUSE_4
+S:SCARE
+S:S_UNDEAD
 D:Everywhere colours seem paler and the air chiller. At the centre of the 
 D:cold stands a mighty figure. Its wings envelop you in the chill of death 
 D:as the nightwing reaches out to draw you into oblivion. Your muscles sag 
@@ -12073,12 +15989,21 @@ B:HIT:SHATTER:8d8
 B:HIT:SHATTER:8d8
 B:BUTT:HURT:4d6
 B:BUTT:HURT:4d6
-F:ONLY_ITEM | DROP_60 | DROP_GOOD | RES_TELE |
-F:BASH_DOOR | STUPID | DROP_CORPSE | 
-F:EVIL | IM_FIRE | FORCE_SLEEP | FORCE_MAXHP | 
-F:MORTAL | BASEANGBAND
-S:1_IN_5 |
-S:BO_PLAS | BA_FIRE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_FIRE
+F:MORTAL
+F:ONLY_ITEM
+F:RES_TELE
+F:STUPID
+S:1_IN_5
+S:BA_FIRE
+S:BO_PLAS
 D:It is a belligerent minotaur with a destructive magical arsenal, armed 
 D:with a hammer. 
 
@@ -12092,12 +16017,19 @@ B:CLAW:HURT:2d12
 B:CLAW:HURT:2d12
 B:BITE:HURT:2d12
 B:BITE:HURT:2d12
-F:FORCE_SLEEP | 
-F:FRIENDS | RES_NETH | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:ANIMAL | NO_CONF | NO_SLEEP | 
-F:MORTAL | BASEANGBAND | NO_CUT
-S:1_IN_5 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:MORTAL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:RES_NETH
+S:1_IN_5
 S:BR_NETH
 D:You feel a soul-tearing chill upon viewing this beast, a ghostly form of 
 D:darkness in the shape of a large dog. 
@@ -12112,12 +16044,17 @@ B:CLAW:HURT:2d12
 B:CLAW:HURT:2d12
 B:BITE:HURT:2d12
 B:BITE:HURT:2d12
-F:FORCE_SLEEP | 
-F:FRIENDS | 
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | NO_CONF | NO_SLEEP | 
-F:MORTAL | BASEANGBAND
-S:1_IN_5 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:OPEN_DOOR
+S:1_IN_5
 S:BR_TIME
 D:You get a terrible sense of deja vu, or is it a premonition?  All at once 
 D:you see a little puppy and a toothless old dog. Perhaps you should give 
@@ -12133,12 +16070,22 @@ B:CLAW:HURT:2d12
 B:CLAW:HURT:2d12
 B:BITE:HURT:2d12
 B:BITE:HURT:2d12
-F:FORCE_SLEEP | SUSCEP_COLD |
-F:FRIENDS | RES_PLAS |
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | IM_FIRE | NO_CONF | NO_SLEEP | 
-F:MORTAL | BASEANGBAND | HAS_LITE | NO_CUT
-S:1_IN_5 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:HAS_LITE
+F:IM_FIRE
+F:MORTAL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:RES_PLAS
+F:SUSCEP_COLD
+S:1_IN_5
 S:BR_PLAS
 D:The very air warps as pure elemental energy stalks towards you in the 
 D:shape of a giant hound. Your hair stands on end and your palms itch as 
@@ -12150,12 +16097,20 @@ I:120:48d10:20:1:0
 W:45:1:3000:3000
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:FORCE_SLEEP | FORCE_MAXHP | NEVER_MOVE | NEVER_BLOW | 
-F:INVISIBLE | EMPTY_MIND | ANIMAL | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND
-S:1_IN_2 | 
-S:BLINK | TPORT | 
+F:ANIMAL
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:INVISIBLE
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+S:1_IN_2
+S:BLINK
 S:S_DEMON
+S:TPORT
 D:A pile of pulsing flesh that glows with an inner hellish fire. The world 
 D:itself seems to cry out against it. 
 
@@ -12169,14 +16124,31 @@ B:CLAW:HURT:4d12
 B:CLAW:HURT:4d12
 B:BITE:ELEC:6d14
 B:BITE:ELEC:6d14
-F:FORCE_SLEEP | FORCE_MAXHP | AURA_ELEC | CAN_FLY |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:BASH_DOOR | POWERFUL | MOVE_BODY | DROP_CORPSE | 
-F:EVIL | DRAGON | IM_ELEC | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
 F:ATTR_MULTI
-S:1_IN_4 | 
-S:BLIND | CONF | SCARE | 
+F:AURA_ELEC
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ELEC
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:POWERFUL
+S:1_IN_4
+S:BLIND
 S:BR_ELEC
+S:CONF
+S:SCARE
 D:A vast dragon of power. Storms and lightning crash around its titanic 
 D:form. Deep blue scales reflect the flashes and highlight the creature's 
 D:great muscles. It regards you with contempt. 
@@ -12190,13 +16162,30 @@ O:0:100:0:0
 B:HIT:SHATTER:20d12
 B:HIT:SHATTER:20d12
 B:BITE:POISON:6d14
-F:UNIQUE | MALE | CAN_SPEAK |
-F:FORCE_SLEEP | FORCE_MAXHP | SPECIAL_GENE | 
-F:ONLY_ITEM | DROP_1D2 | DROP_4D2 | DROP_GOOD | 
-F:DROP_90 | REGENERATE | KILL_WALL | RES_TELE | KILL_BODY | 
-F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | 
-F:EVIL | TROLL | IM_POIS |
-F:IM_ELEC | IM_COLD | IM_FIRE | BASEANGBAND
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:KILL_WALL
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:RES_TELE
+F:SPECIAL_GENE
+F:TROLL
+F:UNIQUE
 D:Ulik is the strongest troll who has ever lived. He could challenge 
 D:the immortals and pound them to dust with his great strength. 
 
@@ -12210,15 +16199,28 @@ B:BUTT:HURT:12d13
 B:BUTT:HURT:12d13
 B:HIT:HURT:10d10
 B:HIT:HURT:10d10
-F:UNIQUE | MALE | CAN_SPEAK |
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_1D2 | DROP_4D2 | DROP_GOOD | 
-F:BASH_DOOR | DROP_CORPSE | 
-F:EVIL | IM_FIRE | IM_POIS |
-F:MORTAL | BASEANGBAND
-S:1_IN_6 | 
-S:SLOW | ARROW_4 | BO_MANA | BO_PLAS | BA_ELEC | 
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:UNIQUE
+S:1_IN_6
+S:ARROW_4
+S:BA_ELEC
+S:BO_MANA
+S:BO_PLAS
 S:BR_WALL
+S:SLOW
 D:A fearsome bull-headed monster, Baphomet swings a mighty axe as he curses 
 D:all that defy him. 
 
@@ -12232,14 +16234,34 @@ B:HIT:HURT:10d5
 B:HIT:HURT:10d5
 B:HIT:EXP_80:10d5
 B:HIT:EXP_80:10d5
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | IM_FIRE | IM_COLD | IM_POIS |
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | RES_NETH | RES_NEXU | RES_PLAS |
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | IM_COLD | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_5 | 
-S:BLIND | SCARE | CAUSE_3 | BA_NETH | BA_FIRE | BO_PLAS
-S:S_MONSTERS | S_DEMON
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_2D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_NETH
+F:RES_NEXU
+F:RES_PLAS
+F:SMART
+S:1_IN_5
+S:BA_FIRE
+S:BA_NETH
+S:BLIND
+S:BO_PLAS
+S:CAUSE_3
+S:SCARE
+S:S_DEMON
+S:S_MONSTERS
 D:It is a humanoid form dressed in armour of ancient style. From beneath 
 D:its helmet, eyes glow with hellfire. 
 
@@ -12253,14 +16275,28 @@ B:CHARGE:EAT_GOLD:5d5
 B:CHARGE:EAT_ITEM:5d5
 B:SPIT:BLIND:10d5
 B:DROOL:DISEASE:8d5
-F:UNIQUE | MALE | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE
-F:FORCE_SLEEP | FORCE_MAXHP |
-F:ONLY_ITEM | DROP_1D2 | DROP_4D2 | DROP_GOOD | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:IM_POIS | EVIL | RES_TELE
-F:MORTAL | JOKEANGBAND | HAS_LITE
-S:1_IN_6 | 
-S:TRAPS | S_BUG
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_POIS
+F:JOKEANGBAND
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:TAKE_ITEM
+F:UNIQUE
+S:1_IN_6
+S:S_BUG
 D:He may not code worth a dime, but he certainly knows how to make money. 
 
 N:733:Santa Claus
@@ -12273,113 +16309,47 @@ B:HIT:LOSE_CHR:5d5
 B:TOUCH:LOSE_ALL:10d1
 B:TOUCH:LOSE_ALL:10d1
 B:CHARGE:EAT_GOLD
-F:UNIQUE | MALE | CAN_SPEAK | REFLECTING | DROP_SKELETON | DROP_CORPSE
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | 
-F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT |
-F:NO_STUN | NO_SLEEP |
-F:IM_ELEC | IM_FIRE | IM_POIS | IM_COLD |
-F:COLD_BLOOD | RES_TELE | JOKEANGBAND | HAS_LITE
-S:1_IN_3 |
-S:CAUSE_4 | HOLD | DRAIN_MANA | SCARE | BLIND | 
-S:S_UNDEAD | S_HI_UNDEAD | S_HI_DRAGON | S_UNIQUE | 
-S:BA_NETH | FORGET | TRAPS | BRAIN_SMASH | TELE_AWAY 
+F:CAN_SPEAK
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:JOKEANGBAND
+F:MALE
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:REFLECTING
+F:RES_TELE
+F:SMART
+F:UNIQUE
+S:1_IN_3
+S:BA_NETH
+S:BLIND
+S:BRAIN_SMASH
+S:CAUSE_4
+S:DRAIN_MANA
+S:FORGET
+S:HOLD
+S:SCARE
+S:S_HI_DRAGON
+S:S_HI_UNDEAD
+S:S_UNDEAD
+S:S_UNIQUE
+S:TELE_AWAY
 D:Why would anybody want to kill Santa Claus? To get all the presents, 
 D:of course! 
 
-N:734:Eihort, the Thing in the Labyrinth
-G:j:R
-I:120:33d100:50:90:10
-W:53:3:0:45000
-E:0:0:0:0:0:0
-O:0:0:100:0
-B:BITE:PARALYZE:8d1
-B:CRUSH:HURT:10d10
-B:CRUSH:HURT:10d10
-B:CRUSH:HURT:10d10
-F:UNIQUE | CAN_SPEAK | ESCORT | REGENERATE |
-F:FORCE_SLEEP | FORCE_MAXHP | ELDRITCH_HORROR |
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:SMART | OPEN_DOOR | BASH_DOOR | MOVE_BODY | 
-F:EVIL | IM_ACID | IM_FIRE | IM_COLD | IM_POIS | 
-F:HURT_LITE | NO_SLEEP | RES_TELE | CTHANGBAND | NO_CUT
-S:1_IN_4 | 
-S:S_UNDEAD | S_DEMON | S_MONSTER | BLINK | BA_ACID | FORGET
-D:"Then came pale movement in the well, and something clambered 
-D:up from the dark, a bloated blanched oval supported on myriad 
-D:fleshless legs. Eyes formed in the gelatinous oval and stared 
-D:at him." 
-
-N:735:The King in Yellow
-G:L:y
-I:120:32d100:90:100:10
-W:53:3:0:50000
-E:0:0:0:0:0:0
-O:50:0:40:10
-B:CRUSH:HURT:12d12
-B:CRUSH:HURT:12d12
-B:GAZE:LOSE_WIS:5d10
-B:GAZE:TERRIFY:5d10
-F:UNIQUE | MALE | CAN_SPEAK | ATTR_MULTI | ATTR_ANY |
-F:FORCE_SLEEP | FORCE_MAXHP | CTHANGBAND | 
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:SMART | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | MOVE_BODY | 
-F:EVIL | UNDEAD | IM_ACID | IM_FIRE | IM_COLD | IM_POIS | 
-F:HURT_LITE | NO_CONF | NO_SLEEP | RES_TELE | NO_CUT
-S:1_IN_2 | 
-S:S_DEMON | S_UNDEAD | S_KIN | SCARE | CAUSE_3 | CAUSE_4 | ANIM_DEAD 
-S:TELE_AWAY | TPORT | BRAIN_SMASH | CONF
-D:The King in Yellow is an Avatar of Hastur: "He has no 
-D:face, and is twice as tall as a man. He wears pointed shoes under 
-D:his tattered, fantastically colored robes, and a streamer of silk 
-D:appears to fall from the pointed tip of his hood. At times he appears 
-D:to be winged; at others, haloed." 
-
-N:736:Great unclean one
-G:U:g
-I:120:80d80:30:150:20
-W:53:3:0:17500
-E:0:0:0:0:0:0
-O:50:0:50:0
-B:BITE:DISEASE:10d10
-B:BITE:ACID:10d10
-B:BITE:POISON:10d10
-B:BITE:CONFUSE:10d10
-F:DEMON | EVIL | NONLIVING | CAN_SWIM |
-F:FORCE_SLEEP | FORCE_MAXHP | ONLY_ITEM | DROP_2D2 | ELDRITCH_HORROR |
-F:OPEN_DOOR | BASH_DOOR | SMART | POWERFUL | DROP_GOOD | KILL_BODY |
-F:IM_ACID | IM_COLD | IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP
-F:KILL_ITEM | ZANGBAND
-S:1_IN_3
-S:BR_ACID | BR_POIS | BR_NUKE | SCARE | ANIM_DEAD 
-S:CAUSE_3 | CAUSE_4 | S_DEMON | S_UNDEAD 
-D:This disgusting demon resembles a shambling pile of rotting 
-D:green flesh, with dozens of mouths drooling and leaving a 
-D:trail of foul-smelling goo behind. Nurgle must be 
-D:proud of himself to have created this atrocity! 
-
-N:737:Lord of Chaos
-G:p:v
-I:130:45d55:30:80:5
-W:60:3:0:17500
-E:1:1:1:2:1:1
-O:0:0:100:0
-B:KICK:HURT:20d2
-B:KICK:HURT:10d2
-B:HIT:POISON:20d1
-B:HIT:LOSE_ALL:15d1
-F:MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_SKELETON |
-F:ONLY_ITEM | DROP_4D2 | ATTR_MULTI | EVIL | SHAPECHANGER | ATTR_ANY |
-F:INVISIBLE | OPEN_DOOR | BASH_DOOR | SMART | POWERFUL | EVIL |
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP | 
-F:ZANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:HEAL | MIND_BLAST | BA_CHAO |
-S:S_SPIDER | S_HOUND | S_DEMON 
-D:He is one of the few true masters of the art, being extremely skillful in 
-D:all forms of unarmed combat and controlling the Chaos 
-D:with disdainful ease. 
-
 N:738:Old Sorcerer
 G:p:R
 I:130:52d25:20:60:10
@@ -12389,15 +16359,33 @@ O:0:0:100:0
 B:HIT:HURT:6d8
 B:HIT:HURT:6d8
 B:HIT:HURT:6d8
-F:MALE |
-F:FORCE_SLEEP | FORCE_MAXHP |
-F:ONLY_ITEM | DROP_4D2 | 
-F:OPEN_DOOR | BASH_DOOR | TAKE_ITEM |
-F:EVIL | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
-S:1_IN_2 |
-S:BLINK | TELE_TO | BLIND | CONF | CAUSE_3 | CAUSE_4 | TRAPS |
-S:BO_ACID | BA_FIRE | BA_COLD | BA_POIS |
-S:S_MONSTER | S_DEMON | S_HI_DRAGON | S_UNDEAD
+F:BASH_DOOR
+F:DROP_4D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:TAKE_ITEM
+S:1_IN_2
+S:BA_COLD
+S:BA_FIRE
+S:BA_POIS
+S:BLIND
+S:BLINK
+S:BO_ACID
+S:CAUSE_3
+S:CAUSE_4
+S:CONF
+S:S_DEMON
+S:S_HI_DRAGON
+S:S_MONSTER
+S:S_UNDEAD
+S:TELE_TO
 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. 
@@ -12412,11 +16400,15 @@ B:BITE:HURT:2d12
 B:BITE:HURT:2d12
 B:BITE:HURT:2d12
 B:CLAW:HURT:2d12
-F:FORCE_SLEEP | FRIENDS | 
-F:INVISIBLE | PASS_WALL | 
-F:ANIMAL | NO_CONF | NO_SLEEP | 
-F:MORTAL | BASEANGBAND
-S:1_IN_5 | 
+F:ANIMAL
+F:FORCE_SLEEP
+F:FRIENDS
+F:INVISIBLE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:PASS_WALL
+S:1_IN_5
 S:BR_NETH
 D:A pale green hound. Pulsing red lines and strange fluorescent light 
 D:hint at internal organs best left to the imagination. 
@@ -12431,13 +16423,36 @@ B:CRUSH:HURT:16d12
 B:CRUSH:HURT:16d12
 B:CRUSH:HURT:16d12
 B:CRUSH:HURT:16d12
-F:FORCE_SLEEP | FORCE_MAXHP | AQUATIC | WILD_TOO | WILD_OCEAN |
-F:ONLY_ITEM | DROP_3D2 | DROP_GOOD | DROP_CORPSE | 
-F:BASH_DOOR | POWERFUL | MOVE_BODY | SMART | RES_WATE |
-F:EVIL | IM_ELEC | NO_CONF | NO_SLEEP | IM_POIS | IM_FIRE | BASEANGBAND
-S:1_IN_4 | 
-S:BLIND | CONF | SCARE | CAUSE_4 | CAUSE_3 |
-S:BA_WATE | DARKNESS | BR_DARK | TELE_TO 
+F:AQUATIC
+F:BASH_DOOR
+F:DROP_3D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:POWERFUL
+F:RES_WATE
+F:SMART
+F:WILD_OCEAN
+F:WILD_TOO
+S:1_IN_4
+S:BA_WATE
+S:BLIND
+S:BR_DARK
+S:CAUSE_3
+S:CAUSE_4
+S:CONF
+S:DARKNESS
+S:SCARE
+S:TELE_TO
 D:An enormously fearsome and powerful inhabitant of the depths. It 
 D:resembles a gargantuan octopus and its evil is almost tangible. 
 
@@ -12451,14 +16466,32 @@ B:CLAW:HURT:4d12
 B:CLAW:HURT:4d12
 B:BITE:COLD:6d14
 B:BITE:COLD:6d14
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | AURA_COLD |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | SUSCEP_FIRE |
-F:BASH_DOOR | POWERFUL | MOVE_BODY | DROP_CORPSE
-F:EVIL | DRAGON | IM_COLD | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
 F:ATTR_MULTI
-S:1_IN_4 | 
-S:BLIND | CONF | SCARE | 
+F:AURA_COLD
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:POWERFUL
+F:SUSCEP_FIRE
+S:1_IN_4
+S:BLIND
 S:BR_COLD
+S:CONF
+S:SCARE
 D:An immense dragon capable of awesome destruction. You have never felt 
 D:such extreme cold, or witnessed such an icy stare. Begone quickly or feel 
 D:its wrath! 
@@ -12473,15 +16506,42 @@ B:TOUCH:EXP_80
 B:TOUCH:UN_POWER
 B:TOUCH:LOSE_DEX:4d12
 B:TOUCH:LOSE_DEX:4d12
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | RES_TELE | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 |  DROP_GOOD |
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | CAN_FLY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND
-F:NO_CUT
-S:1_IN_3 | 
-S:BLINK | TELE_TO | BLIND | HOLD | CONF | SCARE | CAUSE_3 | CAUSE_4 | 
-S:DRAIN_MANA | BRAIN_SMASH | S_HI_UNDEAD | S_UNDEAD | FORGET | S_DEMON | 
-S:TPORT | HEAL | ANIM_DEAD
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:SMART
+F:UNDEAD
+S:1_IN_3
+S:BLIND
+S:BLINK
+S:BRAIN_SMASH
+S:CAUSE_3
+S:CAUSE_4
+S:CONF
+S:DRAIN_MANA
+S:FORGET
+S:HEAL
+S:HOLD
+S:SCARE
+S:S_DEMON
+S:S_HI_UNDEAD
+S:S_UNDEAD
+S:TELE_TO
+S:TPORT
 D:A lich who is partially immaterial, on its way to a new, ethereal form. 
 
 N:743:The Phoenix
@@ -12494,15 +16554,35 @@ B:BITE:FIRE:12d6
 B:BITE:FIRE:12d6
 B:HIT:FIRE:9d12
 B:HIT:FIRE:9d12
-F:UNIQUE | CAN_SPEAK | RES_PLAS | AURA_FIRE |
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | SUSCEP_COLD |
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:ANIMAL | IM_ACID | IM_FIRE | IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP
-F:BASEANGBAND | HAS_LITE | REGENERATE
-S:1_IN_3 | 
-S:BO_FIRE | BO_PLAS | BA_FIRE | 
-S:BR_FIRE | BR_LITE | BR_PLAS
+F:ANIMAL
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:RES_PLAS
+F:SUSCEP_COLD
+F:UNIQUE
+S:1_IN_3
+S:BA_FIRE
+S:BO_FIRE
+S:BO_PLAS
+S:BR_FIRE
+S:BR_LITE
+S:BR_PLAS
 D:A massive glowing eagle bathed in flames. The searing heat chars your 
 D:skin and melts your armour. 
 
@@ -12516,98 +16596,76 @@ B:STING:LOSE_CON:8d8
 B:STING:LOSE_CON:8d8
 B:BITE:ACID:10d10
 B:BITE:ACID:10d10
-F:FORCE_SLEEP | SMART | KILL_WALL | CAN_SWIM | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_GOOD | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_FIRE | IM_COLD | IM_POIS | RES_TELE | 
-F:HURT_LITE | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_4 | 
-S:BLIND | SCARE | BRAIN_SMASH | 
-S:BO_MANA | BO_NETH | BA_NETH | BR_NETH | S_UNDEAD
+F:BASH_DOOR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_2D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:KILL_WALL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:SMART
+F:UNDEAD
+S:1_IN_4
+S:BA_NETH
+S:BLIND
+S:BO_MANA
+S:BO_NETH
+S:BRAIN_SMASH
+S:BR_NETH
+S:SCARE
+S:S_UNDEAD
 D:This intensely evil creature bears the form of a gargantuan black worm. 
 D:Its gaping maw is a void of blackness, and acid drips from its steely hide. 
 D:It is like nothing you have ever seen before, and a terrible chill runs 
 D:down your spine as you face it. 
 
-N:745:Lord of Change
-G:U:v
-I:130:50d70:30:150:20
-W:54:3:0:17000
-E:0:1:1:0:1:0
-O:0:0:100:0
-B:CLAW:CONFUSE:10d10
-B:CLAW:CONFUSE:10d10
-B:BITE:BLIND:12d12
-F:DEMON | EVIL | ATTR_MULTI | DROP_GOOD | MOVE_BODY | NONLIVING |
-F:FORCE_SLEEP | FORCE_MAXHP | ONLY_ITEM | DROP_2D2 | ELDRITCH_HORROR |
-F:INVISIBLE | OPEN_DOOR | BASH_DOOR | SMART | POWERFUL | CAN_FLY |
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP | 
-F:ZANGBAND
-S:1_IN_3
-S:MIND_BLAST | BA_CHAO | SCARE | BRAIN_SMASH | DRAIN_MANA |
-S:S_HOUND | S_DEMON | S_DRAGON | TPORT | HASTE | CONF | SCARE |
-S:TELE_AWAY | FORGET 
-D:The most powerful of Tzeentch's servitors. This demon looks like 
-D:a huge bird-creature, with the head of a predatory bird and 
-D:fantastically multi-coloured wings. 
-
-N:746:Keeper of Secrets
-G:H:G
-I:130:60d70:30:150:20
-W:54:3:0:17000
-E:2:0:2:2:1:1
-O:0:0:100:0
-B:HIT:CONFUSE:10d10
-B:HIT:TERRIFY:10d10
-B:HIT:BLIND:10d10
-B:HIT:TERRIFY:10d10
-F:DEMON | EVIL | DROP_GOOD | NONLIVING | CAN_SWIM |
-F:FORCE_SLEEP | FORCE_MAXHP | ONLY_ITEM | DROP_2D2 | ELDRITCH_HORROR |
-F:OPEN_DOOR | BASH_DOOR | SMART | POWERFUL | MOVE_BODY |
-F:IM_ACID | IM_FIRE | IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | ZANGBAND
-S:1_IN_3
-S:SCARE | BRAIN_SMASH | DRAIN_MANA | 
-S:BR_CONF | S_DEMON | S_UNDEAD | TPORT | HEAL |
-S:TELE_AWAY
-D:This demonic keeper of forbidden secrets looks like a hairless 
-D:minotaur with extra arms, decorated with tattoos and nose rings. 
-D:It is the embodiment of Slaanesh's perverted magic. 
-
-N:747:Shudde M'ell
-G:w:s
-I:125:100d40:20:90:20
-W:59:2:0:23000
-E:0:0:0:0:0:0
-O:0:0:0:0
-B:CRUSH:SHATTER:55d2
-B:CRUSH:SHATTER:55d2
-B:TOUCH:LOSE_CON:1d2
-B:TOUCH:LOSE_CON:1d2
-F:IM_FIRE | RES_PLAS | IM_COLD | IM_POIS | ELDRITCH_HORROR | RES_TELE | 
-F:KILL_WALL | ONLY_GOLD | DROP_4D2 | DROP_2D2 | CAN_SWIM |
-F:EVIL | FORCE_MAXHP | SMART | UNIQUE | CTHANGBAND | NO_STUN
-S:1_IN_5 | 
-S:SCARE | CONF | HOLD | S_DEMON | S_KIN |
-S:HEAL | HASTE | FORGET | BRAIN_SMASH | 
-S:BR_DARK | BR_ACID | BR_DISE
-D:The most powerful and most evil of all Chthonians. 
-D:"A great gray thing a mile long chanting and exuding strange acids... 
-D:charging through the depths of the earth at a fantastic speed, in a 
-D:dreadful fury... melting basaltic rocks like butter under a blowtorch." 
-
 N:748:Hand druj
 G:s:y
 I:130:60d10:20:110:10
 W:57:2:10:18000
 E:0:0:0:1:0:0
 O:0:0:0:0
-F:FORCE_SLEEP | FORCE_MAXHP | NEVER_MOVE | NEVER_BLOW | RES_TELE | 
-F:SMART | COLD_BLOOD | CAN_SWIM |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_1 | 
-S:TELE_AWAY | BLIND | CONF | SCARE | CAUSE_3 | FORGET | DARKNESS | 
-S:BO_FIRE | BO_ACID | BO_COLD | BO_ELEC
+F:CAN_SWIM
+F:COLD_BLOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RES_TELE
+F:SMART
+F:UNDEAD
+S:1_IN_1
+S:BLIND
+S:BO_ACID
+S:BO_COLD
+S:BO_ELEC
+S:BO_FIRE
+S:CAUSE_3
+S:CONF
+S:DARKNESS
+S:FORGET
+S:SCARE
+S:TELE_AWAY
 D:A skeletal hand floating in the air, motionless except for its flexing 
 D:fingers.
 
@@ -12617,13 +16675,29 @@ I:130:10d100:20:90:10
 W:58:2:2:21000
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:FORCE_SLEEP | FORCE_MAXHP | NEVER_MOVE | NEVER_BLOW | RES_TELE | 
-F:SMART | COLD_BLOOD |
-F:EVIL | UNDEAD | CAN_SWIM |
-F:IM_FIRE | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_1 | 
-S:BO_MANA | BO_NETH | BA_NETH | BRAIN_SMASH | S_UNDEAD 
+F:CAN_SWIM
+F:COLD_BLOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RES_TELE
+F:SMART
+F:UNDEAD
+S:1_IN_1
+S:BA_NETH
+S:BO_MANA
+S:BO_NETH
+S:BRAIN_SMASH
+S:S_UNDEAD
 D:A bloodshot eyeball floating in the air, you'd be forgiven for assuming it 
 D:harmless. 
 
@@ -12633,14 +16707,31 @@ I:130:14d100:20:120:10
 W:59:2:1000:24000
 E:0:0:0:0:1:0
 O:0:0:0:0
-F:FORCE_SLEEP | FORCE_MAXHP | NEVER_MOVE | RES_TELE | 
-F:SMART | COLD_BLOOD | 
-F:EVIL | UNDEAD | CAN_SWIM |
-F:IM_FIRE | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_1 | 
-S:SLOW | CAUSE_4 | MIND_BLAST | BRAIN_SMASH | TRAPS | BO_PLAS | 
-S:BO_NETH | BA_WATE | S_UNDEAD
+F:CAN_SWIM
+F:COLD_BLOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RES_TELE
+F:SMART
+F:UNDEAD
+S:1_IN_1
+S:BA_WATE
+S:BO_NETH
+S:BO_PLAS
+S:BRAIN_SMASH
+S:CAUSE_4
+S:MIND_BLAST
+S:SLOW
+S:S_UNDEAD
 D:A glowing skull possessed by sorcerous power. It need not move, but 
 D:merely blast you with mighty magic. 
 
@@ -12654,11 +16745,21 @@ B:ENGULF:CONFUSE:5d5
 B:ENGULF:CONFUSE:5d5
 B:ENGULF:HURT:5d5
 B:ENGULF:HURT:5d5
-F:ATTR_MULTI | ATTR_ANY | FORCE_SLEEP | 
-F:RAND_50 | RAND_25 | CAN_FLY |
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | BASEANGBAND | NO_CUT
-S:1_IN_6 | 
+F:ATTR_ANY
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_25
+F:RAND_50
+S:1_IN_6
 S:BR_CHAO
 D:Void, nothingness, spinning destructively. 
 
@@ -12672,40 +16773,54 @@ B:ENGULF:ELEC:5d5
 B:ENGULF:FIRE:5d5
 B:ENGULF:ACID:5d5
 B:ENGULF:COLD:5d5
-F:ATTR_MULTI | ATTR_ANY | FORCE_SLEEP | CAN_FLY |
-F:RAND_50 | RAND_25 | AURA_COLD | RES_WATE | RES_DISE | 
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | RES_NETH | RES_NEXU |
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | AURA_FIRE | AURA_ELEC |
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | RES_PLAS | BASEANGBAND | NO_CUT
-S:1_IN_6 | 
-S:BR_ACID | BR_FIRE | BR_COLD | BR_ELEC | BR_POIS | BR_LITE | 
-S:BR_DARK | BR_SOUN | BR_CONF | BR_CHAO | BR_SHAR | BR_NETH | 
-S:BR_WALL | BR_INER | BR_TIME | BR_GRAV | BR_PLAS | BR_NEXU
+F:ATTR_ANY
+F:ATTR_MULTI
+F:AURA_COLD
+F:AURA_ELEC
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_25
+F:RAND_50
+F:RES_DISE
+F:RES_NETH
+F:RES_NEXU
+F:RES_PLAS
+F:RES_WATE
+S:1_IN_6
+S:BR_ACID
+S:BR_CHAO
+S:BR_COLD
+S:BR_CONF
+S:BR_DARK
+S:BR_ELEC
+S:BR_FIRE
+S:BR_GRAV
+S:BR_INER
+S:BR_LITE
+S:BR_NETH
+S:BR_NEXU
+S:BR_PLAS
+S:BR_POIS
+S:BR_SHAR
+S:BR_SOUN
+S:BR_TIME
+S:BR_WALL
 D:An awesome vortex of pure magic, power radiates from its frame. 
 
-N:753:Nidhogg, the Hel-Drake
-G:D:D
-I:120:39d111:20:133:70
-W:55:2:260000:25000
-E:0:1:0:6:1:0
-O:50:50:0:0
-B:CLAW:LOSE_CON:8d12
-B:CLAW:LOSE_CON:8d12
-B:BITE:EXP_80:8d15
-B:BITE:EXP_80:8d15
-F:UNIQUE | CAN_FLY | RES_NETH |
-F:FORCE_SLEEP | FORCE_MAXHP | SMART |
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | IM_POIS |
-F:BASH_DOOR | POWERFUL | MOVE_BODY | CAN_SPEAK | IM_ACID |
-F:EVIL | DRAGON | IM_FIRE | NO_SLEEP | IM_COLD | ZANGBAND | 
-F:HAS_LITE
-S:1_IN_5 | 
-S:CAUSE_3 | BR_NETH | BR_COLD |
-S:BR_ACID | BR_POIS |
-S:S_DRAGON | S_UNDEAD
-D:In the bowels of Hel, the dread Nidhogg, a dragon blacker than the 
-D:night, feasts on the essences of the dead. 
-
 N:754:The Lernaean Hydra
 G:M:v
 I:120:45d100:20:140:20
@@ -12716,17 +16831,39 @@ B:BITE:POISON:8d6
 B:BITE:POISON:8d6
 B:BITE:FIRE:12d6
 B:BITE:FIRE:12d6
-F:UNIQUE | SUSCEP_COLD |
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | DROP_CORPSE | 
-F:ONLY_GOLD | DROP_3D2 | DROP_4D2 | WILD_TOO | WILD_SHORE | WILD_SWAMP |
-F:OPEN_DOOR | BASH_DOOR | KILL_BODY | POWERFUL | REGENERATE | 
-F:ANIMAL | IM_FIRE | IM_POIS | 
-F:NO_CONF | NO_STUN | CAN_SWIM |
-F:MORTAL | BASEANGBAND
-S:1_IN_3 | 
-S:SCARE | 
-S:BO_FIRE | BO_PLAS | BA_FIRE | BA_POIS | 
-S:BR_FIRE | BR_POIS | S_HYDRA | S_KIN
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:MORTAL
+F:NO_CONF
+F:NO_STUN
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:POWERFUL
+F:REGENERATE
+F:SMART
+F:SUSCEP_COLD
+F:UNIQUE
+F:WILD_SHORE
+F:WILD_TOO
+S:1_IN_3
+S:BA_FIRE
+S:BA_POIS
+S:BO_FIRE
+S:BO_PLAS
+S:BR_FIRE
+S:BR_POIS
+S:SCARE
+S:S_HYDRA
+S:S_KIN
 D:A massive legendary hydra. It has twelve powerful heads. Its many eyes 
 D:stare at you as clouds of smoke and poisonous vapour rise from its 
 D:seething form.  It grows new heads as fast as you chop them off. 
@@ -12741,15 +16878,44 @@ B:BITE:EXP_80:6d6
 B:BITE:EXP_80:6d6
 B:HIT:CONFUSE:6d6
 B:HIT:CONFUSE:6d6
-F:UNIQUE | FEMALE | SPECIAL_GENE | 
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | CAN_SPEAK | CAN_FLY |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | REGENERATE |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP | NO_STUN
-F:RES_TELE | BASEANGBAND | NO_CUT
-S:1_IN_3 | 
-S:BLIND | HOLD | SCARE | CAUSE_3 | CAUSE_4 | DRAIN_MANA | 
-S:BRAIN_SMASH | BA_NETH | S_KIN | S_HI_UNDEAD
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:RES_TELE
+F:SMART
+F:SPECIAL_GENE
+F:UNDEAD
+F:UNIQUE
+S:1_IN_3
+S:BA_NETH
+S:BLIND
+S:BRAIN_SMASH
+S:CAUSE_3
+S:CAUSE_4
+S:DRAIN_MANA
+S:HOLD
+S:SCARE
+S:S_HI_UNDEAD
+S:S_KIN
 D:Chief messenger between Sauron and Morgoth, she is the most deadly of her 
 D:vampire race on Middle-earth.  At first she is charming to meet, but her 
 D:wings and eyes give away her true form. 
@@ -12764,122 +16930,59 @@ B:CLAW:HURT:4d12
 B:CLAW:HURT:4d12
 B:BITE:FIRE:6d14
 B:BITE:FIRE:6d14
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | SUSCEP_COLD |
-F:BASH_DOOR | POWERFUL | MOVE_BODY | AURA_FIRE |
-F:EVIL | DRAGON | IM_FIRE | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
 F:ATTR_MULTI
-S:1_IN_4 | 
-S:BLIND | CONF | SCARE | 
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:POWERFUL
+F:SUSCEP_COLD
+S:1_IN_4
+S:BLIND
 S:BR_FIRE
+S:CONF
+S:SCARE
 D:A vast dragon of immense power. Fire leaps continuously from its huge 
 D:form. The air around it scalds you. Its slightest glance burns you, and 
 D:you realise how truly insignificant you are. 
 
-N:757:Hastur the Unspeakable
-G:H:b
-I:120:55d95:20:150:10
-W:55:4:0:23000
-E:2:0:2:4:1:0
-O:25:25:25:10
-B:CRUSH:HURT:14d8
-B:CRUSH:HURT:14d8
-B:BITE:EXP_80:6d6
-B:BITE:EXP_80:6d6
-F:UNIQUE | ELDRITCH_HORROR | CAN_SWIM |
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | CAN_SPEAK | AURA_ELEC |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | POWERFUL | SMART | NONLIVING |
-F:EVIL | DEMON | IM_COLD | IM_POIS | HURT_LITE | NO_SLEEP | 
-F:RES_TELE | CTHANGBAND
-S:1_IN_3 | 
-S:BLIND | HOLD | SCARE | CAUSE_4 | DRAIN_MANA | 
-S:BRAIN_SMASH | BA_WATE | S_DEMON | HASTE |
-S:TPORT | TELE_AWAY | TELE_TO | HEAL | BR_DARK | BR_NETH
-D:His form is partially that of a reptile, partially that of a gigantic 
-D:octopus. He will destroy you. 
-
-N:758:Bloodthirster
-G:U:r
-I:130:60d70:30:180:20
-W:55:3:0:18500
-E:1:1:1:2:1:1
-O:0:100:0:0
-B:HIT:HURT:50d1
-B:HIT:HURT:50d1
-B:HIT:HURT:50d1
-F:DEMON | EVIL | DROP_GOOD | REGENERATE | CAN_FLY | NONLIVING |
-F:FORCE_SLEEP | FORCE_MAXHP | ONLY_ITEM | DROP_4D2 | ELDRITCH_HORROR |
-F:OPEN_DOOR | BASH_DOOR | RES_NETH | RES_NEXU | RES_TELE | MOVE_BODY |
-F:IM_ACID | IM_FIRE | IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | NO_FEAR
-F:CAN_FLY | ZANGBAND | HAS_LITE
-D:Khorne's mightiest servant, a winged hound-demon walking on 
-D:two paws and wielding a mighty axe and a whip in the other 
-D:two. Intelligent, bloodthirsty eyes leer at you from inside 
-D:the blood-soaked demon armour. 
-
 N:759:Draconic quylthulg
 G:Q:g
 I:120:48d10:20:1:0
 W:45:1:3000:3000
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:FORCE_SLEEP | FORCE_MAXHP | NEVER_MOVE | NEVER_BLOW |
-F:INVISIBLE | EMPTY_MIND | ANIMAL | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND
-S:1_IN_2 | 
-S:BLINK | TPORT | 
+F:ANIMAL
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:INVISIBLE
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+S:1_IN_2
+S:BLINK
 S:S_DRAGON
+S:TPORT
 D:It looks like it was once a dragon corpse, now deeply infected with 
 D:magical bacteria that make it pulse in a foul and degrading way. 
 
-N:760:Nyogtha, the Thing that Should not Be
-G:j:D
-I:130:55d99:20:120:20
-W:56:2:0:20000
-E:0:0:0:0:0:0
-O:50:0:40:10
-B:CRUSH:ACID:10d6
-B:CRUSH:ACID:10d6
-B:CRUSH:ACID:10d6
-B:CRUSH:HURT:16d16
-F:UNIQUE | ELDRITCH_HORROR |
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_SPEAK | SMART | CAN_SWIM |
-F:ONLY_ITEM | DROP_1D2 | DROP_4D2 | DROP_GOOD |
-F:REGENERATE | ONLY_ITEM | KILL_ITEM | DROP_2D2 | DROP_90 | DROP_60 |
-F:BASH_DOOR | EVIL | NO_CONF | NO_SLEEP | KILL_BODY |
-F:FORCE_MAXHP | FORCE_SLEEP | HURT_LITE | POWERFUL | RES_NETH | NONLIVING |
-F:IM_ACID | IM_FIRE | RES_PLAS | IM_POIS | IM_COLD | IM_ELEC | RES_TELE
-F:CTHANGBAND | NO_CUT
-S:1_IN_5 |
-S:BRAIN_SMASH | MIND_BLAST | HASTE | TPORT |
-S:S_DEMON | S_UNDEAD | S_HI_UNDEAD | S_KIN |
-S:BR_DARK | BR_NUKE | BR_ACID | BR_POIS
-D:"...a little finger of blackness crept out from beneath its edge 
-D:a great wave of iridescent blackness, neither liquid nor solid, 
-D:a frightful gelatinous mass." 
-
-N:761:Ahtu, Avatar of Nyarlathotep
-G:#:D
-I:130:50d110:30:120:15
-W:56:3:0:22500
-E:1:1:1:2:1:1
-O:0:30:60:10
-B:CRUSH:HURT:13d13
-B:CRUSH:FIRE:10d10
-B:CRUSH:HURT:13d13
-B:CRUSH:FIRE:10d10
-F:FORCE_SLEEP | FORCE_MAXHP | UNIQUE | CAN_SPEAK |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | MOVE_BODY |
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR |
-F:EVIL | DEMON | NONLIVING | ELDRITCH_HORROR | CTHANGBAND | NO_CUT | NO_SLEEP | NO_CONF | NO_STUN
-S:1_IN_6
-S:BR_FIRE | S_DEMON | CAUSE_4 | BR_PLAS | BR_NETH | BRAIN_SMASH |
-S:S_UNDEAD | BA_DARK 
-D:"Higher already than the giants of the forest ringing it, the 
-D:fifty-foot-thick column... sprouted a ring of tendrils, ruddy and 
-D:golden and glittering overall with inclusions of quartz." 
-
 N:762:Fundin Bluecloak
 G:h:B
 I:130:50d100:25:195:10
@@ -12890,15 +16993,39 @@ B:HIT:HURT:10d10
 B:HIT:HURT:8d6
 B:HIT:HURT:8d6
 B:HIT:HURT:8d6
-F:UNIQUE | MALE | CAN_SPEAK | DROP_CORPSE
-F:FORCE_SLEEP | FORCE_MAXHP | PET |
-F:ONLY_ITEM | DROP_1D2 | DROP_4D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_4 | 
-S:HEAL | BLIND | CONF | SCARE | CAUSE_3 | CAUSE_4 | BRAIN_SMASH | 
-S:FORGET | S_MONSTERS | S_ANIMALS
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:PET
+F:UNIQUE
+S:1_IN_4
+S:BLIND
+S:BRAIN_SMASH
+S:CAUSE_3
+S:CAUSE_4
+S:CONF
+S:FORGET
+S:HEAL
+S:SCARE
+S:S_ANIMALS
+S:S_MONSTERS
 D:He is one of the greatest dwarven priests to walk the earth. Fundin has 
 D:earned a high position in the church, and his skill with both weapon and 
 D:spell only justify his position further. His combination of both dwarven 
@@ -12914,12 +17041,27 @@ B:HIT:HURT:8d8
 B:HIT:HURT:8d8
 B:CRUSH:ACID:9d9
 B:CRUSH:ACID:9d9
-F:FORCE_SLEEP | FORCE_MAXHP | BASEANGBAND | 
-F:ONLY_ITEM | DROP_3D2 | DROP_GOOD | 
-F:BASH_DOOR | POWERFUL | NONLIVING | 
-F:EVIL | DEMON | IM_POIS | IM_ACID | NO_CONF | NO_SLEEP
-S:1_IN_6 | 
-S:BR_POIS | BR_ACID | S_DEMON | BLIND | CONF | ARROW_4
+F:BASH_DOOR
+F:DEMON
+F:DROP_3D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_POIS
+F:NONLIVING
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:POWERFUL
+S:1_IN_6
+S:ARROW_4
+S:BLIND
+S:BR_ACID
+S:BR_POIS
+S:CONF
+S:S_DEMON
 D:It's big.  It's fat.  It's red.  It's ugly.  It's got a severe attack of 
 D:highly poisonous flatulence.  And its insides are corrosive.  All of which 
 D:go together to make the single most repulsive sight - and smell - you have 
@@ -12935,16 +17077,43 @@ B:HIT:FIRE:4d12
 B:HIT:FIRE:4d12
 B:HIT:HURT:10d10
 B:HIT:HURT:10d10
-F:UNIQUE | MALE | CAN_SPEAK | NO_FEAR | GOOD | AURA_FIRE | REFLECTING |
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | SUSCEP_COLD |
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | NO_SLEEP
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:IM_ACID | IM_FIRE | IM_ELEC | IM_POIS | RES_TELE | BASEANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:TELE_TO | BLIND | 
-S:BO_FIRE | BO_MANA | BA_FIRE | 
-S:BR_FIRE | BR_PLAS | 
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:REFLECTING
+F:RES_TELE
+F:SMART
+F:SUSCEP_COLD
+F:TAKE_ITEM
+F:UNIQUE
+S:1_IN_2
+S:BA_FIRE
+S:BLIND
+S:BO_FIRE
+S:BO_MANA
+S:BR_FIRE
+S:BR_PLAS
 S:S_ANGEL
+S:TELE_TO
 D:A creature of godly appearance. You dare not challenge Uriel's supremacy. 
 D:Those who stood against him before are but a memory, cremated by his 
 D:mastery of elemental fire.
@@ -12959,17 +17128,44 @@ B:HIT:EXP_80:10d5
 B:HIT:EXP_80:10d5
 B:HIT:HURT:10d10
 B:HIT:HURT:10d10
-F:UNIQUE | MALE | CAN_SPEAK | RES_NETH | NO_FEAR | GOOD |
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | REFLECTING | AURA_COLD |
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | CAN_FLY | NO_SLEEP
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | RES_TELE | BASEANGBAND
-F:HAS_LITE
-S:1_IN_2 | 
-S:TELE_TO | BLIND | 
-S:BO_MANA | BO_NETH | BA_NETH | 
-S:BR_NETH | 
+F:AURA_COLD
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:REFLECTING
+F:RES_NETH
+F:RES_TELE
+F:SMART
+F:SMART
+F:TAKE_ITEM
+F:UNIQUE
+S:1_IN_2
+S:BA_NETH
+S:BLIND
+S:BO_MANA
+S:BO_NETH
+S:BR_NETH
 S:S_ANGEL
+S:TELE_TO
 D:Azriel commands awesome power, his visage holy enough to shrivel your 
 D:soul. You shriek with disbelief as his mastery of death draws you to your 
 D:grave. It is truly beyond all but the mightiest of warriors to stand 
@@ -12985,47 +17181,43 @@ B:CLAW:HURT:10d12
 B:CLAW:HURT:10d12
 B:BITE:HURT:10d14
 B:BITE:HURT:10d14
-F:UNIQUE | MALE | CAN_FLY | DROP_CORPSE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ESCORT |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DRAGON | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | NO_CONF |
-F:BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:BR_ACID | BR_FIRE | BR_DISI | BR_WALL | BR_TIME | 
-S:S_HI_DRAGON | S_KIN
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:NO_CONF
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:UNIQUE
+S:1_IN_3
+S:BR_ACID
+S:BR_DISI
+S:BR_FIRE
+S:BR_TIME
+S:BR_WALL
+S:S_HI_DRAGON
+S:S_KIN
 D:"Rushing Jaws" is his name, and death is his game; the greatest and most 
 D:terrible of all dragonkind, his power dismayed even the Valar for a time. 
 
-N:767:Daoloth, the Render of the Veils
-G:U:s
-I:120:72d100:20:125:70
-W:58:3:0:27500
-E:0:0:0:0:0:0
-O:0:0:100:0
-B:TOUCH:CONFUSE:5d12
-B:TOUCH:CONFUSE:5d12
-B:TOUCH:CONFUSE:5d12
-B:TOUCH:CONFUSE:5d12
-F:UNIQUE | CAN_SPEAK |
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:IM_ACID | IM_FIRE | IM_POIS | IM_COLD |  ELDRITCH_HORROR |
-F:NEVER_MOVE | RES_NEXU | REFLECTING | PASS_WALL
-F:NO_CONF | NO_SLEEP | NO_CUT | NO_STUN | NO_FEAR | CTHANGBAND
-S:1_IN_3 | 
-S:TELE_AWAY | S_MONSTERS | TELE_LEVEL | BR_NEXU | TPORT | BLINK
-D:"Not shapeless, but so complex that the eye could recognise no 
-D:describable shape. There were hemispheres and shining metal, 
-D:coupled by long plastic rods. The rods were of a flat gray color, 
-D:so that he could not make out which were nearer; they merged into 
-D:a flat mass from which protruded individual cylinders. As he looked 
-D:at it, he had a curious feeling that eyes gleamed from between 
-D:these rods; but wherever he glanced at the construction, he saw 
-D:only the spaces between them." 
-
 N:768:Nightwalker
 G:W:D
 I:130:80d70:20:175:10
@@ -13036,14 +17228,35 @@ B:HIT:UN_BONUS:10d10
 B:HIT:UN_BONUS:10d10
 B:HIT:UN_BONUS:7d7
 B:HIT:UN_BONUS:7d7
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | CAN_SWIM |
-F:SMART | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | RES_TELE | 
-F:EVIL | UNDEAD | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:HURT_LITE | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_4 | 
-S:BLIND | SCARE | BRAIN_SMASH | 
-S:BO_MANA | BO_NETH | BA_NETH | S_UNDEAD
+F:BASH_DOOR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:SMART
+F:UNDEAD
+S:1_IN_4
+S:BA_NETH
+S:BLIND
+S:BO_MANA
+S:BO_NETH
+S:BRAIN_SMASH
+S:SCARE
+S:S_UNDEAD
 D:A huge giant garbed in black, more massive than a titan and stronger than 
 D:a dragon. With terrible blows, it breaks your armour from your back, 
 D:leaving you defenceless against its evil wrath. It can smell your fear, 
@@ -13060,63 +17273,104 @@ B:HIT:UN_BONUS:6d8
 B:HIT:FIRE:6d8
 B:HIT:BLIND:10d10
 B:HIT:BLIND:10d10
-F:UNIQUE | MALE | FORCE_MAXHP | CAN_SPEAK | NO_SLEEP | GOOD |
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | AURA_ELEC | REFLECTING | RES_TELE
-F:ESCORT | CAN_FLY |
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | BASEANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:TELE_TO | BLIND | BO_MANA | 
-S:S_ANGEL | S_KIN
+F:AURA_ELEC
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_GOOD
+F:ESCORT
+F:FORCE_MAXHP
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:REFLECTING
+F:RES_TELE
+F:SMART
+F:SMART
+F:TAKE_ITEM
+F:UNIQUE
+S:1_IN_2
+S:BLIND
+S:BO_MANA
+S:S_ANGEL
+S:S_KIN
+S:TELE_TO
 D:Commanding a legion of angels, Gabriel will destroy you for your sins. He 
 D:will crush you like the pitiful insignificant being he sees you to be. 
 D:Your very soul will be taken into judgement by his supreme authority as he 
 D:cleanses the world of evil. 
 
-N:770:Artsi, the Champion of Chaos
-G:h:v
-I:130:11d666:25:175:10
-W:59:2:1600:20000
-E:1:1:1:2:1:1
-O:0:100:0:0
-B:HIT:EXP_80:10d10
-B:HIT:EXP_80:10d10
-B:HIT:EXP_80:10d10
-F:UNIQUE | MALE | CAN_SPEAK | ATTR_MULTI | 
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | DROP_CORPSE
-F:ONLY_ITEM | DROP_1D2 | DROP_4D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | RES_NEXU | RES_NETH |  
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP | 
-F:ZANGBAND | HAS_LITE
-S:1_IN_4 | 
-S:BA_FIRE | BA_CHAO | CONF | TPORT | S_DEMON | BR_CHAO | BA_MANA
-D:He is one of the greatest warriors of chaos to walk the earth. 
-D:His bloody blade has slain thousands and tens of thousands, and still 
-D:hungers for more. 
-
 N:771:Saruman of Many Colours
 G:p:v
 I:120:70d100:100:100:0
 W:60:1:1600:35000
 E:1:1:1:2:1:1
 O:0:0:100:0
+A:202:30
 B:HIT:UN_BONUS:6d8
 B:HIT:UN_BONUS:6d8
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
-F:UNIQUE | MALE | ATTR_MULTI | CAN_SPEAK |
-F:FORCE_SLEEP | FORCE_MAXHP | REFLECTING | RES_TELE
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD |
-F:DROP_GREAT | DROP_CHOSEN |
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | IM_FIRE | IM_COLD | 
-F:IM_ELEC | IM_POIS | BASEANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:HEAL | HASTE | TPORT | TELE_AWAY | BLIND | CONF | SCARE | 
-S:CAUSE_4 | MIND_BLAST | FORGET | TRAPS | ANIM_DEAD | BO_MANA | 
-S:BO_ICEE | BA_ACID | BA_FIRE | BA_COLD | BA_WATE | BA_CHAO | 
-S:S_UNDEAD | S_DEMON | S_HI_DRAGON | S_ANIMALS
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CHOSEN
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REFLECTING
+F:RES_TELE
+F:SMART
+F:UNIQUE
+S:1_IN_2
+S:BA_ACID
+S:BA_CHAO
+S:BA_COLD
+S:BA_FIRE
+S:BA_WATE
+S:BLIND
+S:BO_ICEE
+S:BO_MANA
+S:CAUSE_4
+S:CONF
+S:FORGET
+S:HASTE
+S:HEAL
+S:MIND_BLAST
+S:SCARE
+S:S_ANIMALS
+S:S_DEMON
+S:S_HI_DRAGON
+S:S_UNDEAD
+S:TELE_AWAY
+S:TPORT
 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. 
@@ -13131,13 +17385,23 @@ B:TOUCH:EAT_GOLD:5d5
 B:TOUCH:EAT_ITEM:5d5
 B:HIT:BLIND:10d5
 B:HIT:POISON:8d5
-F:UNIQUE | MALE | CAN_SPEAK | SMART | 
-F:FORCE_SLEEP | FORCE_MAXHP | MOVE_BODY | 
-F:ONLY_ITEM | DROP_1D2 | DROP_4D2 | DROP_GOOD | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:IM_POIS | BASEANGBAND
-S:1_IN_6 | 
-S:TELE_TO | TRAPS
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:TAKE_ITEM
+F:UNIQUE
+S:1_IN_6
+S:TELE_TO
 D:He is a master of disguise, an expert of stealth, a genius at traps, and 
 D:moves with blinding speed. Check your pockets! 
 
@@ -13151,13 +17415,33 @@ B:HIT:LOSE_CHR:8d8
 B:HIT:LOSE_CHR:8d8
 B:BITE:POISON:10d10
 B:STING:LOSE_STR:9d9
-F:FORCE_SLEEP | FORCE_MAXHP | NONLIVING | 
-F:ONLY_ITEM | DROP_3D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY
-F:EVIL | DEMON | NO_CONF | NO_SLEEP | INVISIBLE | BASEANGBAND | 
-F:IM_ACID | IM_ELEC | IM_POIS | IM_COLD | IM_FIRE | NO_CUT
-S:1_IN_6 | 
-S:BA_ELEC | BA_COLD | BO_ICEE | SCARE | S_DEMON
+F:BASH_DOOR
+F:DEMON
+F:DROP_3D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:MOVE_BODY
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+S:1_IN_6
+S:BA_COLD
+S:BA_ELEC
+S:BO_ICEE
+S:SCARE
+S:S_DEMON
 D:It is a demon made almost entirely out of bones.  It is humanoid, but with 
 D:a large tail similar to that of a giant scorpion, and emits a foul smell 
 D:of decay and rot.  They are despised even in the hells. 
@@ -13172,15 +17456,37 @@ B:HIT:EXP_40:6d6
 B:HIT:EXP_40:6d6
 B:HIT:LOSE_STR:4d6
 B:HIT:LOSE_STR:4d6
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | 
-F:INVISIBLE | COLD_BLOOD | TAKE_ITEM | PASS_WALL | 
-F:EVIL | UNDEAD | CAN_FLY |
-F:IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | RES_TELE | BASEANGBAND | NO_CUT
-S:1_IN_3 |
-S:HOLD | DRAIN_MANA | BLIND | S_UNDEAD | CONF |
-S:SCARE | TELE_TO | TPORT | BRAIN_SMASH | ANIM_DEAD
-S:BA_NETH | DARKNESS
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PASS_WALL
+F:RES_TELE
+F:TAKE_ITEM
+F:UNDEAD
+S:1_IN_3
+S:BA_NETH
+S:BLIND
+S:BRAIN_SMASH
+S:CONF
+S:DARKNESS
+S:DRAIN_MANA
+S:HOLD
+S:SCARE
+S:S_UNDEAD
+S:TELE_TO
+S:TPORT
 D:It is a massive form of animated death, its colour deeper than black.  It 
 D:drinks in light, and space around it is twisted and torn by the weight of 
 D:its evil.  It is unlife and it knows nothing but the stealing of souls and 
@@ -13196,13 +17502,39 @@ B:CRUSH:HURT:15d15
 B:CRUSH:HURT:15d15
 B:CRUSH:HURT:15d15
 B:CRUSH:HURT:15d15
-F:FORCE_SLEEP | FORCE_MAXHP | AQUATIC | WILD_TOO | WILD_OCEAN |
-F:ONLY_ITEM | DROP_3D2 | DROP_GOOD | DROP_CORPSE | 
-F:BASH_DOOR | POWERFUL | MOVE_BODY | SMART | RES_WATE |
-F:EVIL | IM_ELEC | NO_CONF | NO_SLEEP | IM_POIS | IM_FIRE | BASEANGBAND
-S:1_IN_3 | 
-S:BLIND | CONF | SCARE | CAUSE_4 | CAUSE_3 | TELE_TO | TELE_AWAY |
-S:BA_WATE | DARKNESS | BR_DARK | BR_ACID | BR_POIS
+F:AQUATIC
+F:BASH_DOOR
+F:DROP_3D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:POWERFUL
+F:RES_WATE
+F:SMART
+F:WILD_OCEAN
+F:WILD_TOO
+S:1_IN_3
+S:BA_WATE
+S:BLIND
+S:BR_ACID
+S:BR_DARK
+S:BR_POIS
+S:CAUSE_3
+S:CAUSE_4
+S:CONF
+S:DARKNESS
+S:SCARE
+S:TELE_AWAY
+S:TELE_TO
 D:An enormously fearsome and powerful inhabitant of the depths. It 
 D:resembles a gargantuan octopus and its evil is almost tangible. 
 
@@ -13216,15 +17548,41 @@ B:TOUCH:EXP_80
 B:TOUCH:UN_POWER
 B:TOUCH:LOSE_DEX:8d12
 B:TOUCH:LOSE_DEX:8d12
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | RES_TELE | CAN_FLY |
-F:ONLY_ITEM | DROP_4D2 |  DROP_2D2 | DROP_GOOD |
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | PASS_WALL |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND
-F:NO_CUT
-S:1_IN_3 | 
-S:BLINK | TELE_TO | BLIND | HOLD | SCARE | CAUSE_4 | 
-S:DRAIN_MANA | BRAIN_SMASH | S_HI_UNDEAD | FORGET |
-S:TPORT | HEAL | S_DEMON | BA_NETH | ANIM_DEAD
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:PASS_WALL
+F:RES_TELE
+F:SMART
+F:UNDEAD
+S:1_IN_3
+S:BA_NETH
+S:BLIND
+S:BLINK
+S:BRAIN_SMASH
+S:CAUSE_4
+S:DRAIN_MANA
+S:FORGET
+S:HEAL
+S:HOLD
+S:SCARE
+S:S_DEMON
+S:S_HI_UNDEAD
+S:TELE_TO
+S:TPORT
 D:A lich who has reached its ultimate evolutionary stage: a completely 
 D:immaterial state. 
 
@@ -13238,14 +17596,25 @@ B:CLAW:CONFUSE:12d12
 B:CLAW:LOSE_DEX:2d12
 B:CLAW:BLIND:10d5
 B:BITE:PARALYZE:15d1
-F:UNIQUE | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ESCORT | ESCORTS | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | 
-F:INVISIBLE | OPEN_DOOR | BASH_DOOR | 
-F:IM_FIRE | IM_COLD | IM_POIS | NO_CONF | BASEANGBAND
-S:1_IN_3 | 
-S:TELE_TO | S_KIN
+F:BASH_DOOR
+F:DROP_4D2
+F:DROP_GOOD
+F:ESCORT
+F:ESCORTS
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:MALE
+F:NO_CONF
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNIQUE
+S:1_IN_3
+S:S_KIN
+S:TELE_TO
 D:Master of all things feline, the Cat Lord moves with catlike stealth. 
 
 N:778:Jabberwock
@@ -13258,14 +17627,21 @@ B:CLAW:HURT:10d10
 B:CLAW:HURT:10d10
 B:BITE:HURT:10d10
 B:BITE:HURT:10d10
-F:ATTR_MULTI | 
-F:FORCE_SLEEP | FORCE_MAXHP | RES_TELE | 
-F:ONLY_ITEM | DROP_60 | DROP_90 | 
-F:BASH_DOOR | CAN_FLY | DROP_CORPSE | 
-F:ANIMAL | MORTAL | BASEANGBAND | 
-S:1_IN_5 | 
-S:CAUSE_4 | 
+F:ANIMAL
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_60
+F:DROP_90
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:MORTAL
+F:ONLY_ITEM
+F:RES_TELE
+S:1_IN_5
 S:BR_CHAO
+S:CAUSE_4
 D:'Twas brillig, and the slithy toves / Did gyre and gimble in the wabe: /
 D:All mimsy were the borogoves, / And the mome raths outgrabe. /
 D:"Beware the Jabberwock, my son! / The jaws that bite, the claws that catch!" 
@@ -13280,36 +17656,22 @@ B:BITE:HURT:2d12
 B:BITE:HURT:2d12
 B:BITE:HURT:2d12
 B:CLAW:HURT:2d12
-F:ATTR_MULTI | ATTR_ANY | DROP_SKELETON | DROP_CORPSE | 
-F:FORCE_SLEEP | FRIENDS | BASH_DOOR | 
-F:ANIMAL | NO_CONF | NO_SLEEP | BASEANGBAND
-S:1_IN_5 | 
+F:ANIMAL
+F:ATTR_ANY
+F:ATTR_MULTI
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:NO_CONF
+F:NO_SLEEP
+S:1_IN_5
 S:BR_CHAO
 D:A constantly changing canine form, this hound rushes towards you as if 
 D:expecting mayhem and chaos ahead. It appears to have an almost kamikaze 
 D:relish for combat. You suspect all may not be as it seems. 
 
-N:780:Vlad Dracula, Prince of Darkness
-G:V:D
-I:130:70d100:20:166:10
-W:76:4:1800:33333
-E:1:1:1:2:1:1
-O:0:10:90:0
-B:BITE:EXP_80:8d8
-B:BITE:EXP_80:8d8
-B:HIT:CONFUSE:8d8
-B:HIT:CONFUSE:8d8
-F:UNIQUE | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | CAN_SPEAK | CAN_FLY |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | REGENERATE | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP | 
-F:RES_TELE | ZANGBAND | NO_CUT
-S:1_IN_3 | 
-S:BLIND | HOLD | SCARE | CAUSE_3 | CAUSE_4 | DRAIN_MANA | S_HI_UNDEAD | 
-S:BRAIN_SMASH | BA_NETH | S_KIN | DARKNESS | BA_DARK
-D:The most feared of all vampires, the Prince of Darkness himself. 
-
 N:781:Beholder hive-mother
 G:e:y
 I:120:40d100:30:80:10
@@ -13320,12 +17682,31 @@ B:BITE:EXP_80:6d6
 B:GAZE:PARALYZE:5d5
 B:GAZE:INSANITY:5d5
 B:GAZE:UN_POWER:5d5
-F:FORCE_SLEEP | FORCE_MAXHP  | RES_TELE | CAN_FLY |
-F:BASH_DOOR | FEMALE | SMART | DROP_CORPSE | 
-F:EVIL | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND
-S:1_IN_2 | 
-S:BLIND | CONF | FORGET | SCARE | DRAIN_MANA | BRAIN_SMASH | 
-S:BA_DARK | BO_MANA | BA_ACID | BA_FIRE | BA_COLD | BO_NETH | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_POIS
+F:NO_CONF
+F:NO_SLEEP
+F:RES_TELE
+F:SMART
+S:1_IN_2
+S:BA_ACID
+S:BA_COLD
+S:BA_DARK
+S:BA_FIRE
+S:BLIND
+S:BO_MANA
+S:BO_NETH
+S:BRAIN_SMASH
+S:CONF
+S:DRAIN_MANA
+S:FORGET
+S:SCARE
 S:S_KIN
 D:A hive mother of the race of beholders, she can summon her brood to her aid 
 D:whenever she wishes. 
@@ -13340,12 +17721,31 @@ B:BITE:FIRE:5d12
 B:BITE:FIRE:5d12
 B:CRUSH:HURT:6d15
 B:CRUSH:HURT:6d15
-F:FORCE_SLEEP | FORCE_MAXHP | AQUATIC | WILD_TOO | WILD_OCEAN |
-F:IM_FIRE | IM_ACID | IM_COLD | IM_POIS |
-F:ANIMAL | NO_CONF | NO_SLEEP | NO_FEAR | DROP_CORPSE | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:WILD_OCEAN
+F:WILD_TOO
 S:1_IN_9
-S:BR_FIRE | BR_ACID | BR_DARK | BR_POIS | BA_WATE | 
-S:S_DRAGON | S_HYDRA | HEAL | CONF | DARKNESS
+S:BA_WATE
+S:BR_ACID
+S:BR_DARK
+S:BR_FIRE
+S:BR_POIS
+S:CONF
+S:DARKNESS
+S:HEAL
+S:S_DRAGON
+S:S_HYDRA
 D:An enormous, terrible sea-monster, the true master of the ocean.
 
 N:783:Great Wyrm of Chaos
@@ -13358,15 +17758,34 @@ B:CLAW:HURT:5d12
 B:CLAW:HURT:5d12
 B:BITE:HURT:7d14
 B:BITE:HURT:7d14
-F:ATTR_MULTI | ATTR_ANY |
-F:FORCE_SLEEP | FORCE_MAXHP | RES_DISE | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:BASH_DOOR | POWERFUL | MOVE_BODY | CAN_FLY |
-F:EVIL | DRAGON | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
-S:1_IN_4 | 
-S:BLIND | CONF | SCARE | 
-S:BR_CHAO | BR_DISE | 
-S:S_DRAGON | S_HI_DRAGON
+F:ATTR_ANY
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:POWERFUL
+F:RES_DISE
+S:1_IN_4
+S:BLIND
+S:BR_CHAO
+S:BR_DISE
+S:CONF
+S:SCARE
+S:S_DRAGON
+S:S_HI_DRAGON
 D:A massive dragon of changing form. As you watch, it appears first fair 
 D:and then foul. Its body is twisted by chaotic forces as it strives to 
 D:stay real. Its very existence distorts the universe around it. 
@@ -13381,15 +17800,33 @@ B:CLAW:HURT:5d12
 B:CLAW:HURT:5d12
 B:BITE:HURT:7d14
 B:BITE:HURT:7d14
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:BASH_DOOR | POWERFUL | MOVE_BODY | CAN_FLY |
-F:EVIL | DRAGON | NO_STUN | NO_SLEEP | BASEANGBAND | HAS_LITE | NO_CUT
 F:ATTR_MULTI
-S:1_IN_4 | 
-S:BLIND | CONF | SCARE | 
-S:BR_SOUN | BR_SHAR | 
-S:S_DRAGON | S_HI_DRAGON
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MOVE_BODY
+F:NO_CUT
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:POWERFUL
+S:1_IN_4
+S:BLIND
+S:BR_SHAR
+S:BR_SOUN
+S:CONF
+S:SCARE
+S:S_DRAGON
+S:S_HI_DRAGON
 D:A massive dragon of powerful intellect. It seeks to dominate the universe 
 D:and despises all other life. It sees all who do not obey it as mere 
 D:insects to be crushed underfoot. 
@@ -13404,38 +17841,41 @@ B:CLAW:HURT:6d12
 B:CLAW:HURT:6d12
 B:BITE:HURT:8d14
 B:BITE:HURT:8d14
-F:DRAGON | EVIL | DROP_CORPSE | 
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:BASH_DOOR | POWERFUL | MOVE_BODY | RES_DISE |
-F:NO_STUN | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE | NO_CUT | ATTR_MULTI
-S:1_IN_4 | 
-S:BLIND | CONF | SCARE | 
-S:BR_SOUN | BR_CHAO | BR_SHAR | BR_DISE | 
-S:S_DRAGON | S_HI_DRAGON
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:POWERFUL
+F:RES_DISE
+S:1_IN_4
+S:BLIND
+S:BR_CHAO
+S:BR_DISE
+S:BR_SHAR
+S:BR_SOUN
+S:CONF
+S:SCARE
+S:S_DRAGON
+S:S_HI_DRAGON
 D:A massive dragon, it is thousands of 
 D:years old and seeks to maintain the Cosmic Balance. It sees you as an 
 D:upstart troublemaker without the wisdom to control your actions. 
 
-N:786:Shambler
-G:E:W
-I:130:50d100:40:150:50
-W:67:4:9000:22500
-E:0:0:0:0:0:0
-O:20:20:60:0
-B:CLAW:HURT:3d12
-B:CLAW:HURT:3d12
-B:CRUSH:HURT:8d12
-B:CRUSH:HURT:8d12
-F:FORCE_SLEEP | FORCE_MAXHP | RES_TELE | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | CAN_SWIM | DROP_CORPSE | 
-F:BASH_DOOR | OPEN_DOOR | POWERFUL | MOVE_BODY | 
-F:NO_CONF | NO_SLEEP | EVIL | ZANGBAND | NO_CUT
-S:1_IN_3 |
-S:BR_ELEC
-D:This elemental creature is power incarnate; it looks like a huge polar bear 
-D:with a huge gaping maw instead of a head. 
-
 N:787:Gelugon
 G:U:w
 I:130:45d100:20:100:80
@@ -13446,45 +17886,37 @@ B:CLAW:COLD:6d10
 B:CLAW:COLD:6d10
 B:BITE:COLD:9d9
 B:HIT:PARALYZE:8d8
-F:FORCE_SLEEP | FORCE_MAXHP | BASEANGBAND | NONLIVING | 
-F:ONLY_ITEM | DROP_GOOD | DROP_4D2 | CAN_FLY | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | REGENERATE | 
-F:EVIL | DEMON | IM_COLD | NO_CONF | NO_SLEEP 
+F:BASH_DOOR
+F:CAN_FLY
+F:DEMON
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:NONLIVING
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:REGENERATE
 S:1_IN_6
-S:BR_COLD | BR_SHAR | BA_COLD | BO_ICEE | S_HI_DEMON | 
-S:SLOW | SCARE | HOLD
+S:BA_COLD
+S:BO_ICEE
+S:BR_COLD
+S:BR_SHAR
+S:HOLD
+S:SCARE
+S:SLOW
+S:S_HI_DEMON
 D:This demon from the ice planes is a truly terrifying sight.  It has an 
 D:extremely large, insect-like body towering a full twelve feet tall, with 
 D:great claws on its hands and pincers on its mouth, and its head bulges 
 D:with great multi-faceted eyes.  Its tail is covered with razor-sharp 
 D:spikes. 
 
-N:788:Glaaki
-G:~:v
-I:130:52d99:20:150:10
-W:67:2:0:36000
-E:0:0:0:0:1:0
-O:0:0:100:0
-B:STING:HURT:20d1
-B:STING:DISEASE:20d1
-B:CRUSH:HURT:3d20
-F:UNIQUE | CAN_SPEAK | ATTR_MULTI | ELDRITCH_HORROR |
-F:NO_STUN | RES_NEXU | RES_WATE | CAN_SWIM | REGENERATE |
-F:FORCE_SLEEP | FORCE_MAXHP | EVIL | SMART | DEMON |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD |
-F:NO_STUN | 
-F:IM_POIS | IM_COLD | IM_ACID | CTHANGBAND
-S:1_IN_5
-S:BA_WATE | S_HYDRA | S_DRAGON | S_DEMON | SCARE |
-S:BLIND | CONF | CAUSE_4 | BR_POIS
-D:"From an oval body protruded countless thin, pointed spines of 
-D:multi-colored metal; at the more rounded end of the oval a 
-D:circular, thick-lipped mouth formed the centre of a spongy 
-D:face, from which rose three yellow eyes on thin stalks. Around 
-D:the underside of the body were many white pyramids, presumably 
-D:used for locomotion. The diameter of the body must have been 
-D:at least ten feet at its least wide..." 
-
 N:789:Trone, the Rebel Thunderlord
 G:B:D
 I:130:80d100:20:120:80
@@ -13495,15 +17927,38 @@ B:HIT:HURT:12d10
 B:HIT:HURT:12d10
 B:CHARGE:HURT:10d10
 B:CHARGE:HURT:10d10
-F:UNIQUE | MALE | CAN_SPEAK | RES_TELE | SPECIAL_GENE | 
-F:FORCE_MAXHP | REGENERATE | THUNDERLORD | CAN_FLY |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT |
-F:SMART | OPEN_DOOR | BASH_DOOR | DROP_CHOSEN |
-F:EVIL | IM_FIRE | IM_COLD | IM_POIS | 
-F:MORTAL | HAS_LITE
-S:1_IN_4 | 
-S:TELE_TO | SCARE | BR_TIME | BR_FIRE |
-S:BO_MANA | S_THUNDERLORD
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CHOSEN
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:RES_TELE
+F:SMART
+F:SPECIAL_GENE
+F:THUNDERLORD
+F:UNIQUE
+S:1_IN_4
+S:BO_MANA
+S:BR_FIRE
+S:BR_TIME
+S:SCARE
+S:S_THUNDERLORD
+S:TELE_TO
 D:As the Thunderlords came from afar to help the elves, Trone and his rebel 
 D:wing came to defend Morgoth! He is an evil and powerful Thunderlord. 
 
@@ -13517,15 +17972,41 @@ B:CLAW:HURT:6d12
 B:CLAW:HURT:6d12
 B:CLAW:HURT:8d14
 B:BITE:HURT:8d14
-F:ATTR_MULTI | CAN_FLY |
-F:FORCE_SLEEP | FORCE_MAXHP | AURA_FIRE | AURA_ELEC | RES_TELE | 
-F:IM_FIRE | IM_ACID | IM_POIS | IM_COLD | IM_ELEC | AURA_COLD |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD |
-F:BASH_DOOR | POWERFUL | MOVE_BODY | DROP_CORPSE | 
-F:DRAGON | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
-S:1_IN_4 |
-S:BR_POIS | BR_ELEC | BR_ACID | BR_FIRE | BR_COLD |
-S:CONF | SCARE | BLIND
+F:ATTR_MULTI
+F:AURA_COLD
+F:AURA_ELEC
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:POWERFUL
+F:RES_TELE
+S:1_IN_4
+S:BLIND
+S:BR_ACID
+S:BR_COLD
+S:BR_ELEC
+S:BR_FIRE
+S:BR_POIS
+S:CONF
+S:SCARE
 D:A huge dragon whose scales shimmer in myriad hues. 
 
 N:791:Marda, rider of gold Laronth
@@ -13534,19 +18015,47 @@ I:130:100d85:100:100:50
 W:75:6:420000:35000
 E:1:1:1:2:1:1
 O:50:50:0:0
+A:26:50
 B:HIT:HURT:12d15
 B:HIT:HURT:12d15
 B:HIT:HURT:12d15
 B:HIT:HURT:12d15
-F:UNIQUE | FEMALE | CAN_SPEAK | THUNDERLORD | ONLY_ITEM | RES_TELE | 
-F:DROP_CHOSEN | DROP_CORPSE | DROP_SKELETON | CAN_FLY | 
-F:FORCE_SLEEP | FORCE_MAXHP |
-F:DROP_4D2 | DROP_1D2 | DROP_GOOD | DROP_60 | DROP_90 |
-F:EVIL | IM_POIS | IM_ELEC | SMART | REGENERATE | OPEN_DOOR | BASH_DOOR |
-F:MORTAL | HAS_LITE
-S:1_IN_4 |
-S:SCARE | BLIND | TPORT | BLINK | TELE_AWAY | TELE_TO | 
-S:BR_FIRE | BA_MANA | S_THUNDERLORD
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_60
+F:DROP_90
+F:DROP_CHOSEN
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ELEC
+F:IM_POIS
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:RES_TELE
+F:SMART
+F:THUNDERLORD
+F:UNIQUE
+S:1_IN_4
+S:BA_MANA
+S:BLIND
+S:BLINK
+S:BR_FIRE
+S:SCARE
+S:S_THUNDERLORD
+S:TELE_AWAY
+S:TELE_TO
+S:TPORT
 D:Former leader among the Thunderlords, she and Trone have fallen under the 
 D:control of Morgoth. Laronth, her eagle, can summon Thunderlords to her aid. 
 
@@ -13560,16 +18069,37 @@ B:HIT:HURT:10d10
 B:HIT:HURT:10d10
 B:HIT:LOSE_STR:4d6
 B:HIT:LOSE_STR:4d6
-F:UNIQUE | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_SPEAK | CAN_FLY |
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | 
-F:EVIL | UNDEAD | IM_COLD | AURA_COLD |
-F:IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT | NO_STUN
-S:1_IN_3 | 
-S:BLIND | HOLD | CONF | 
-S:BA_DARK | BA_NETH | 
-S:S_WRAITH | S_HI_UNDEAD | S_KIN
+F:AURA_COLD
+F:CAN_FLY
+F:CAN_SPEAK
+F:COLD_BLOOD
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:MALE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:PASS_WALL
+F:UNDEAD
+F:UNIQUE
+S:1_IN_3
+S:BA_DARK
+S:BA_NETH
+S:BLIND
+S:CONF
+S:HOLD
+S:S_HI_UNDEAD
+S:S_KIN
+S:S_WRAITH
 D:This huge affront to existence twists and tears at the fabric of space. 
 D:Darkness itself recoils from the touch of Tselakus as he leaves a trail 
 D:of death and destruction. Mighty claws rend reality as he 
@@ -13585,40 +18115,38 @@ B:CLAW:HURT:6d12
 B:CLAW:HURT:6d12
 B:BITE:ELEC:8d14
 B:BITE:ELEC:8d14
-F:FORCE_SLEEP | FORCE_MAXHP | AURA_ELEC | AURA_COLD | DROP_CORPSE | 
-F:IM_ELEC | EVIL | CAN_FLY |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:DRAGON | NO_CONF | NO_SLEEP | RES_TELE | BASEANGBAND | HAS_LITE
 F:ATTR_MULTI
-S:1_IN_4 |
-S:BR_ELEC | BR_GRAV | BR_LITE |
-S:S_DRAGON | S_HI_DRAGON |
-S:SCARE | BLIND
+F:AURA_COLD
+F:AURA_ELEC
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ELEC
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:POWERFUL
+F:RES_TELE
+S:1_IN_4
+S:BLIND
+S:BR_ELEC
+S:BR_GRAV
+S:BR_LITE
+S:SCARE
+S:S_DRAGON
+S:S_HI_DRAGON
 D:The mightiest elemental dragon of air, it can destroy you with ease. 
 
-N:794:Eilinel the Entrapped
-G:p:D
-I:120:90d10:10:40:1
-W:42:10:0:3500
-E:1:1:1:2:1:1
-O:20:20:50:10
-B:HIT:HURT:3d5
-B:HIT:HURT:3d5
-B:TOUCH:UN_POWER:3d3
-B:TOUCH:UN_BONUS:3d3
-F:UNIQUE | FEMALE |
-F:FORCE_MAXHP |
-F:DROP_1D2 | DROP_2D2 | DROP_3D2 | DROP_GOOD |
-F:SMART | OPEN_DOOR | BASH_DOOR |
-F:EVIL | UNDEAD | IM_COLD | IM_FIRE | NO_CONF | NO_SLEEP | ZANGBAND | NO_CUT | NO_STUN
-S:1_IN_2 |
-S:BLINK | TELE_TO | HEAL | S_MONSTER | BO_ACID | BO_MANA | CAUSE_3
-D:In life, she was the wife of Gorlim. In death, her shade was 
-D:entrapped by Morgoth and used to trick her husband into betraying 
-D:Barahir. Now she is totally entrapped by Morgoth's power, and uses 
-D:her magic to do his bidding. 
-
 N:795:Horned Reaper
 G:U:B
 I:130:50d100:40:120:80
@@ -13629,68 +18157,38 @@ B:HIT:HURT:11d11
 B:HIT:HURT:11d11
 B:HIT:HURT:11d11
 B:HIT:HURT:11d11
-F:FORCE_SLEEP | FORCE_MAXHP | REGENERATE | NONLIVING | 
-F:ONLY_ITEM | DROP_GOOD | DROP_4D2 | DROP_2D2 | BASEANGBAND | 
-F:OPEN_DOOR | BASH_DOOR | KILL_BODY | POWERFUL | 
-F:EVIL | DEMON | NO_CONF | NO_SLEEP | CAN_FLY | 
-F:IM_FIRE | IM_COLD | IM_POIS | IM_ACID | IM_ELEC
-S:1_IN_5 | 
-S:HASTE | SLOW | SCARE | S_HI_DEMON 
+F:BASH_DOOR
+F:CAN_FLY
+F:DEMON
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:NONLIVING
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:REGENERATE
+S:1_IN_5
+S:HASTE
+S:SCARE
+S:SLOW
+S:S_HI_DEMON
 D:A giant humanoid demon wielding a massive, heavy and sharp scythe.  Feared 
 D:by foes and friends alike when it flies into one of its berserk rages, the 
 D:Horned Reaper will cut down anything in its path between it and you - even 
 D:the minions it has just summoned. 
 
-N:796:The Norsa
-G:H:B
-I:130:100d100:20:125:70
-W:70:4:16000:47500
-E:0:1:0:2:1:0
-O:50:0:50:0
-B:CRUSH:ACID:8d12
-B:CRUSH:FIRE:8d12
-B:CRUSH:ELEC:8d12
-B:CRUSH:POISON:10d14
-F:ATTR_MULTI | ELDRITCH_HORROR | DROP_CORPSE | 
-F:UNIQUE | CAN_SPEAK | AURA_FIRE | AURA_ELEC | AURA_COLD |
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT |
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | EVIL |
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:ZANGBAND
-S:1_IN_2 | 
-S:BLIND | CONF | SCARE | 
-S:BR_NETH | BR_CHAO | BR_TIME | BR_GRAV | BR_DISI | 
-S:S_HI_DRAGON | S_MONSTERS
-D:An elephantine horror with five trunks, each capable of breathing 
-D:destructive blasts. It is said that it is better to face the fury 
-D:of a thousand raging lions than the Norsa! 
-
-N:797:Rhan-Tegoth
-G:S:b
-I:130:90d100:20:125:70
-W:70:4:0:42500
-E:0:1:0:2:1:0
-O:0:50:50:0
-B:CLAW:HURT:8d12
-B:CRUSH:LOSE_STR:5d12
-B:CLAW:HURT:8d12
-B:CRUSH:ACID:5d12
-F:ELDRITCH_HORROR | CAN_SWIM | EVIL |
-F:UNIQUE | CAN_SPEAK | AURA_FIRE | AURA_ELEC |
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:IM_ACID | IM_ELEC | IM_POIS | NO_SLEEP | RES_WATE | CTHANGBAND
-S:1_IN_5 | 
-S:S_DEMON | BR_ACID | S_UNDEAD | S_KIN | CONF | SCARE |
-S:MIND_BLAST | BR_CONF 
-D:"An almost globular torso, with six long, sinuous limbs terminating 
-D:in crab-like claws. From the upper end a subsidiary globe bulged 
-D:forward bubble-like; its triangle of three staring, fishy eyes, 
-D:its foot-long and evidently flexible proboscis, and a distended 
-D:lateral system analogous to gills, suggested that it was a head." 
-
 N:798:Black reaver
 G:L:D
 I:120:50d100:20:170:50
@@ -13701,15 +18199,40 @@ B:HIT:UN_BONUS:6d8
 B:HIT:UN_BONUS:6d8
 B:HIT:LOSE_STR:4d6
 B:HIT:LOSE_STR:4d6
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | CAN_SWIM |
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_GOOD | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | RES_TELE | 
-F:NO_CONF | NO_SLEEP | KILL_WALL | NO_FEAR | 
-F:MORTAL | BASEANGBAND | NO_CUT
-S:1_IN_3 | 
-S:TELE_TO | BLIND | HOLD | CONF | CAUSE_3 | CAUSE_4 | DRAIN_MANA | 
-S:BRAIN_SMASH | BA_MANA | BA_NETH | S_UNDEAD
+F:BASH_DOOR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_2D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:KILL_WALL
+F:MORTAL
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:SMART
+F:UNDEAD
+S:1_IN_3
+S:BA_MANA
+S:BA_NETH
+S:BLIND
+S:BRAIN_SMASH
+S:CAUSE_3
+S:CAUSE_4
+S:CONF
+S:DRAIN_MANA
+S:HOLD
+S:S_UNDEAD
+S:TELE_TO
 D:A humanoid form,  black as night, advancing steadily and unstoppably, even 
 D:the very rock of the dungeon cannot prevent it reaching you. 
 
@@ -13722,13 +18245,38 @@ O:20:40:40:0
 B:HIT:HURT:4d5
 B:HIT:HURT:4d5
 B:HIT:HURT:4d5
-F:MALE | ONLY_ITEM | FORCE_SLEEP | FORCE_MAXHP | DROP_4D2 |
-F:SMART | BASH_DOOR | TAKE_ITEM | MOVE_BODY | 
-F:EVIL | IM_FIRE | IM_ELEC | IM_POIS | BASEANGBAND | 
-F:NO_CONF | NO_SLEEP | NO_STUN | NO_FEAR
-S:1_IN_2 | 
-S:HEAL | BLIND | HOLD | CONF | SCARE | TPORT | BA_COLD | BA_FIRE | 
-S:MIND_BLAST | BRAIN_SMASH | S_MONSTERS | TELE_AWAY | BLINK | BO_NETH
+F:BASH_DOOR
+F:DROP_4D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:SMART
+F:TAKE_ITEM
+S:1_IN_2
+S:BA_COLD
+S:BA_FIRE
+S:BLIND
+S:BLINK
+S:BO_NETH
+S:BRAIN_SMASH
+S:CONF
+S:HEAL
+S:HOLD
+S:MIND_BLAST
+S:SCARE
+S:S_MONSTERS
+S:TELE_AWAY
+S:TPORT
 D:A mindcrafter of the highest order.  Powerful and evil, and a dangerous 
 D:enemy: a master of mind over matter, of his own mind, and of the minds of 
 D:others, who slavishly follow him into battle when he calls them.
@@ -13739,12 +18287,21 @@ I:120:15d100:20:1:0
 W:71:2:5000:10500
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:FORCE_SLEEP | FORCE_MAXHP | NEVER_MOVE | NEVER_BLOW | 
-F:INVISIBLE | EMPTY_MIND | ANIMAL | RES_TELE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND
-S:1_IN_2 | 
-S:BLINK | TELE_TO | 
+F:ANIMAL
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:INVISIBLE
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:RES_TELE
+S:1_IN_2
+S:BLINK
 S:S_HI_DEMON
+S:TELE_TO
 D:A massive pulsating mound of flesh, glowing with an inner hellish light. 
 
 N:801:Greater draconic quylthulg
@@ -13753,12 +18310,21 @@ I:120:15d100:20:1:0
 W:71:2:5000:10500
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:FORCE_SLEEP | FORCE_MAXHP | NEVER_MOVE | NEVER_BLOW | 
-F:INVISIBLE | EMPTY_MIND | ANIMAL | RES_TELE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND
-S:1_IN_2 | 
-S:BLINK | TELE_TO | 
+F:ANIMAL
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:INVISIBLE
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:RES_TELE
+S:1_IN_2
+S:BLINK
 S:S_HI_DRAGON
+S:TELE_TO
 D:A massive mound of scaled flesh, throbbing and pulsating with multi-hued 
 D:light. 
 
@@ -13768,33 +18334,25 @@ I:120:15d100:20:1:0
 W:71:2:5000:10500
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:FORCE_SLEEP | FORCE_MAXHP | NEVER_MOVE | NEVER_BLOW | 
-F:INVISIBLE | EMPTY_MIND | ANIMAL | RES_TELE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND |NO_CUT
-S:1_IN_2 | 
-S:BLINK | TELE_TO | 
+F:ANIMAL
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:INVISIBLE
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RES_TELE
+S:1_IN_2
+S:BLINK
 S:S_HI_UNDEAD
+S:TELE_TO
 D:A massive pile of rotting flesh. A disgusting stench fills the air as it 
 D:throbs and writhes. 
 
-N:803:Null, the Living Void
-G:.:d
-I:110:50d100:30:100:20
-W:72:2:0:32500
-E:0:0:0:0:0:0
-O:0:0:0:0
-B:TOUCH:LOSE_ALL:6d16
-B:TOUCH:EXP_80:6d16
-B:TOUCH:UN_POWER:6d16
-F:PASS_WALL | NONLIVING | IM_ACID | CAN_FLY |
-F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | DROP_GOOD | SMART | EMPTY_MIND | 
-F:ELDRITCH_HORROR | IM_COLD | RES_NETH | NO_STUN | UNIQUE | NO_SLEEP | NO_CONF | NO_FEAR |
-F:REGENERATE | ZANGBAND | NO_CUT
-S:1_IN_5
-S:BR_NETH | BRAIN_SMASH | SCARE | S_UNDEAD | S_HI_UNDEAD |
-S:DRAIN_MANA | HEAL | ANIM_DEAD
-D:A black hole in the fabric of reality. It simply is not there. 
-
 N:804:Feagwath, the Undead Sorcerer
 G:L:y
 I:130:60d100:20:85:50
@@ -13805,18 +18363,43 @@ B:TOUCH:EXP_80:6d12
 B:TOUCH:UN_POWER:6d12
 B:TOUCH:LOSE_DEX:6d12
 B:TOUCH:LOSE_DEX:6d12
-F:UNIQUE | MALE | CAN_SPEAK | RES_TELE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ESCORT | SPECIAL_GENE | 
-F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT | 
-F:SMART | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_COLD | 
-F:IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_2 | 
-S:BLINK | TELE_TO | HOLD | SCARE | CAUSE_4 | 
-S:BRAIN_SMASH | TRAPS | BA_MANA | 
-S:BO_MANA | BA_NETH | 
-S:S_MONSTERS | S_UNDEAD | S_KIN | ANIM_DEAD
+F:BASH_DOOR
+F:CAN_SPEAK
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_GOOD
+F:DROP_GREAT
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:MALE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:SMART
+F:SPECIAL_GENE
+F:UNDEAD
+F:UNIQUE
+S:1_IN_2
+S:BA_MANA
+S:BA_NETH
+S:BLINK
+S:BO_MANA
+S:BRAIN_SMASH
+S:CAUSE_4
+S:HOLD
+S:SCARE
+S:S_KIN
+S:S_MONSTERS
+S:S_UNDEAD
+S:TELE_TO
 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. 
 
@@ -13830,44 +18413,35 @@ B:GAZE:UN_BONUS:6d6
 B:GAZE:UN_POWER:6d6
 B:GAZE:INSANITY:6d6
 B:BITE:EXP_80:8d8
-F:UNIQUE | MALE | CAN_SPEAK | RES_TELE | 
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:SMART | BASH_DOOR | 
-F:EVIL | IM_POIS | 
-F:BASEANGBAND
-S:1_IN_2 | 
-S:BLIND | CONF | FORGET | SCARE | DRAIN_MANA | BRAIN_SMASH | 
-S:BA_DARK | BO_MANA | BA_NETH | BA_ACID | BA_FIRE | BA_COLD | 
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_POIS
+F:MALE
+F:RES_TELE
+F:SMART
+F:UNIQUE
+S:1_IN_2
+S:BA_ACID
+S:BA_COLD
+S:BA_DARK
+S:BA_FIRE
+S:BA_NETH
+S:BLIND
+S:BO_MANA
+S:BRAIN_SMASH
+S:CONF
+S:DRAIN_MANA
+S:FORGET
+S:SCARE
 S:S_KIN
 D:A beholder of great size and age, floating in the air.  His gaze seems to 
 D:shred your soul and his spells crush your will.  He is ancient, his history 
 D:steeped in forgotten evils, his atrocities numerous and sickening. 
 
-N:806:Tsathoggua, the Sleeper of N'kai
-G:R:D
-I:130:66d100:30:80:100
-W:74:4:0:16500
-E:0:0:0:0:0:0
-O:0:50:50:0
-B:CRUSH:LOSE_ALL:5d6
-B:CRUSH:ACID:5d6
-B:CRUSH:LOSE_ALL:5d6
-B:CRUSH:ACID:5d6
-F:UNIQUE | CAN_SPEAK | RES_TELE | ELDRITCH_HORROR |
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_1D2 | DROP_2D2 | 
-F:ONLY_ITEM | DROP_GOOD | MOVE_BODY |
-F:SMART | BASH_DOOR | 
-F:EVIL | DEMON | IM_POIS | IM_ACID | IM_COLD |
-F:NO_CONF | NO_SLEEP | CTHANGBAND | HAS_LITE | NO_CUT
-S:1_IN_2 | 
-S:S_DEMON | S_MONSTERS | S_UNDEAD | HOLD | SCARE | MIND_BLAST |
-S:BR_ACID | BR_NETH | CAUSE_4 
-D:"...the formless bulking of a couchant mass. And the mass stirred 
-D:a little... and put forth with infinite slothfulness a huge and 
-D:toad-shaped head. And the head opened its eyes very slowly, as if 
-D:half awakened from slumber, so that they were visible as two slits 
-D:of oozing phosphor in the black browless face." 
-
 N:807:Greater Balrog
 G:U:v
 I:130:75d100:40:140:40
@@ -13878,15 +18452,41 @@ B:HIT:FIRE:8d12
 B:HIT:FIRE:8d12
 B:CRUSH:HURT:7d12
 B:TOUCH:UN_POWER
-F:FORCE_SLEEP | FORCE_MAXHP | AURA_FIRE | CAN_FLY |
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | NONLIVING |
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | SMART | 
-F:EVIL | DEMON | IM_FIRE | NO_CONF | NO_SLEEP | KILL_WALL |
-F:RES_NETH | RES_PLAS | REGENERATE | BASEANGBAND | HAS_LITE
-S:1_IN_3 |
-S:BLIND | CONF | BRAIN_SMASH | 
-S:BR_FIRE | BA_NETH | BA_FIRE | BR_PLAS | BO_PLAS |
-S:S_HI_DEMON | S_UNDEAD | S_DEMON | 
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:DEMON
+F:DROP_2D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:KILL_WALL
+F:MOVE_BODY
+F:NONLIVING
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:REGENERATE
+F:RES_NETH
+F:RES_PLAS
+F:SMART
+S:1_IN_3
+S:BA_FIRE
+S:BA_NETH
+S:BLIND
+S:BO_PLAS
+S:BRAIN_SMASH
+S:BR_FIRE
+S:BR_PLAS
+S:CONF
+S:S_DEMON
+S:S_HI_DEMON
+S:S_UNDEAD
 D:Originally of the semi-divine Maiar, this evil spirit swore allegiance 
 D:to Morgoth at the beginning of time and is now one of his most terrible 
 D:demonic servants.  With its flaming whip and sword it seeks to destroy you. 
@@ -13901,68 +18501,41 @@ B:CLAW:POISON:8d6
 B:CLAW:POISON:8d6
 B:BITE:PARALYZE:8d10
 B:STING:LOSE_STR:8d4
-F:UNIQUE | FEMALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | 
-F:SMART | BASH_DOOR | IM_ACID | 
-F:ANIMAL | SPIDER | EVIL | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP
-F:BASEANGBAND
-S:1_IN_3 | 
-S:HEAL | BLIND | SLOW | CONF | SCARE | DARKNESS | BA_DARK | 
-S:BR_POIS | BR_DARK | S_SPIDER
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_ACID
+F:IM_POIS
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:SMART
+F:SPIDER
+F:UNIQUE
+S:1_IN_3
+S:BA_DARK
+S:BLIND
+S:BR_DARK
+S:BR_POIS
+S:CONF
+S:DARKNESS
+S:HEAL
+S:SCARE
+S:SLOW
+S:S_SPIDER
 D:This enormous, hideous spirit of void is in the form of a spider of 
 D:immense proportions.  She is surrounded by a cloud of Unlight as she sucks 
 D:in all living light into her bloated body, and breathes out the blackest of 
 D:darkness.  She is always ravenously hungry and would even eat herself to 
 D:avoid starvation. 
 
-N:809:Atlach-Nacha, the Spider God
-G:S:D
-I:120:110d100:8:160:80
-W:73:1:2000:31000
-E:0:1:0:2:1:0
-O:60:0:40:0
-B:BITE:POISON:3d9
-B:BITE:LOSE_STR:3d9
-B:STING:POISON:2d9
-B:STING:LOSE_STR:2d9
-F:UNIQUE | CAN_SPEAK | ELDRITCH_HORROR | RES_TELE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | 
-F:SMART | BASH_DOOR | MOVE_BODY | NONLIVING |
-F:ANIMAL | SPIDER | EVIL | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP | 
-F:CTHANGBAND
-S:1_IN_3 |
-S:SCARE | BLIND | CONF | HOLD | BR_POIS |
-S:DARKNESS | BR_DARK | S_KIN | S_HI_DEMON
-D:"...there was a kind of face on the squat ebon body, low down amid 
-D:the several-jointed legs. The face peered up with a weird expression 
-D:of doubt and inquiry..." 
-
-N:810:Y'golonac
-G:H:R
-I:120:130d99:8:160:80
-W:75:1:0:37500
-E:0:0:0:0:0:0
-O:0:0:100:0
-B:TOUCH:LOSE_INT:1d20
-B:BITE:HURT:40d1
-B:TOUCH:LOSE_WIS:1d20
-B:BITE:HURT:40d1
-F:UNIQUE | CAN_SPEAK | ELDRITCH_HORROR | RES_TELE |
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | 
-F:SMART | BASH_DOOR | MOVE_BODY | NONLIVING |
-F:EVIL | IM_POIS | CTHANGBAND
-S:1_IN_3 |
-S:SCARE | BLIND | CONF | HOLD | HASTE | DRAIN_MANA | HASTE |
-S:CAUSE_3 | CAUSE_4 | DARKNESS | FORGET | S_DEMON | S_HOUND |
-S:TPORT | TELE_TO
-D:"He saw why the shadow on the frosted pane yesterday had been 
-D:headless and he screamed... but before he could scream out his 
-D:protest his breath was cut off, as the hands descended on his 
-D:face and the wet red mouths opened in their palms." 
-
 N:811:Aether hound
 G:Z:v
 I:120:60d40:30:100:0
@@ -13973,18 +18546,50 @@ B:BITE:HURT:3d12
 B:BITE:HURT:3d12
 B:CLAW:HURT:3d12
 B:CLAW:HURT:3d12
-F:ATTR_MULTI | ATTR_ANY |
-F:FORCE_SLEEP | CAN_FLY |
-F:FRIENDS | RES_NETH | RES_PLAS | RES_NEXU | RES_DISE |
-F:BASH_DOOR | AURA_FIRE | AURA_ELEC | AURA_COLD | 
-F:DROP_CORPSE | DROP_SKELETON |
-F:ANIMAL | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_5 | 
-S:BR_ACID | BR_FIRE | BR_COLD | BR_ELEC | BR_POIS | 
-S:BR_LITE | BR_DARK | BR_SOUN | BR_CONF | BR_CHAO | BR_SHAR | 
-S:BR_NETH | BR_DISE | BR_WALL | BR_INER | BR_TIME | 
-S:BR_GRAV | BR_PLAS | BR_NEXU
+F:ANIMAL
+F:ATTR_ANY
+F:ATTR_MULTI
+F:AURA_COLD
+F:AURA_ELEC
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:RES_DISE
+F:RES_NETH
+F:RES_NEXU
+F:RES_PLAS
+S:1_IN_5
+S:BR_ACID
+S:BR_CHAO
+S:BR_COLD
+S:BR_CONF
+S:BR_DARK
+S:BR_DISE
+S:BR_ELEC
+S:BR_FIRE
+S:BR_GRAV
+S:BR_INER
+S:BR_LITE
+S:BR_NETH
+S:BR_NEXU
+S:BR_PLAS
+S:BR_POIS
+S:BR_SHAR
+S:BR_SOUN
+S:BR_TIME
+S:BR_WALL
 D:A shifting, swirling form. It seems to be all colours and sizes and 
 D:shapes, though the dominant form is that of a huge dog. You feel very 
 D:uncertain all of a sudden. 
@@ -13999,130 +18604,40 @@ B:CLAW:FIRE:8d10
 B:CLAW:FIRE:8d10
 B:BITE:POISON:7d10
 B:BITE:LOSE_CON:7d10
-F:FORCE_SLEEP | FORCE_MAXHP | REGENERATE | NONLIVING | 
-F:ONLY_ITEM | DROP_GOOD | DROP_4D2 | DROP_2D2 | BASEANGBAND | 
-F:OPEN_DOOR | BASH_DOOR | MOVE_BODY | POWERFUL | CAN_FLY | 
-F:EVIL | DEMON | IM_FIRE | IM_POIS | NO_CONF | NO_SLEEP
-S:1_IN_5 | 
-S:S_HI_DEMON | S_HI_DRAGON | BR_FIRE | BR_POIS | BR_CHAO | BA_CHAO | 
-S:SCARE | BA_FIRE | CAUSE_4 
+F:BASH_DOOR
+F:CAN_FLY
+F:DEMON
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_FIRE
+F:IM_POIS
+F:MOVE_BODY
+F:NONLIVING
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:REGENERATE
+S:1_IN_5
+S:BA_CHAO
+S:BA_FIRE
+S:BR_CHAO
+S:BR_FIRE
+S:BR_POIS
+S:CAUSE_4
+S:SCARE
+S:S_HI_DEMON
+S:S_HI_DRAGON
 D:Appearing as a giant, clawed and winged humanoid with a scaly red body 
 D:and massive fangs dripping a foul green liquid, the Pit Fiend is a 
 D:dreadful enemy from the lowest depths of the hells.  They are often the 
 D:commanders of vast demon armies. 
 
-N:813:The Serpent of Chaos
-G:J:v
-I:130:66d100:30:180:150
-W:75:2:0:25000
-E:0:0:0:0:1:0
-O:40:40:20:0
-B:CRUSH:POISON:15d10
-B:CRUSH:CONFUSE:15d10
-B:CRUSH:UN_BONUS:10d15
-B:CRUSH:UN_POWER:10d15
-F:UNIQUE | ATTR_MULTI | ATTR_ANY | AURA_FIRE | AURA_COLD | 
-F:FORCE_SLEEP | FORCE_MAXHP | POWERFUL | REGENERATE | 
-F:DROP_2D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT | 
-F:OPEN_DOOR | BASH_DOOR | ANIMAL | EVIL | CAN_FLY |
-F:KILL_ITEM | KILL_BODY |
-F:NO_CONF | NO_SLEEP | NO_STUN | NO_FEAR | ZANGBAND | 
-F:IM_COLD | IM_FIRE | IM_POIS
-S:1_IN_3 | 
-S:BR_CHAO | BR_DISI | BA_CHAO | BR_NETH | BR_MANA | 
-S:S_MONSTERS | S_HI_DEMON | S_HI_DRAGON
-D:Writhing coil upon coil, this mighty spawn of Chaos constantly disintegrates 
-D:and reforms before your dazzled eyes. It gazes balefully upon you with its 
-D:one remaining eye, and seeks to destroy you utterly. 
-
-N:814:Yig, Father of Serpents
-G:J:b
-I:130:111d60:100:100:15
-W:76:1:2300:37500
-E:0:0:0:0:1:0
-O:80:0:20:0
-B:CLAW:POISON:8d10
-B:CLAW:POISON:8d10
-B:CRUSH:HURT:8d15
-B:BITE:HURT:100d1
-F:UNIQUE | MALE | CAN_SPEAK | SMART | RES_TELE | ANIMAL |
-F:ESCORT | ESCORTS | CAN_SWIM | ELDRITCH_HORROR |
-F:OPEN_DOOR | BASH_DOOR |
-F:FORCE_SLEEP | FORCE_MAXHP |
-F:DROP_4D2 | DROP_1D2 | DROP_GOOD | DROP_60 | DROP_90 | ONLY_ITEM |
-F:EVIL | IM_POIS | IM_ACID | IM_ELEC | REGENERATE | ZANGBAND
-S:1_IN_4 |
-S:BR_POIS | BR_NUKE | BR_ACID | S_HYDRA | S_KIN | S_DEMON |
-D:"The half-human father of serpents... the snake-god of the central 
-D:plains tribes -- presumably the primal source of the more 
-D:southerly Quetzalcoatl or Kukulcan -- was odd, half-anthropomorphic 
-D:devil."
-
-N:815:Unmaker
-G:E:v
-I:120:6d66:60:50:60
-W:77:4:0:10000
-E:0:0:0:0:0:0
-O:20:50:20:0
-B:TOUCH:LOSE_ALL:10d10
-B:TOUCH:UN_BONUS:10d10
-B:TOUCH:UN_POWER:10d10
-F:KILL_WALL | KILL_ITEM | KILL_BODY | NO_FEAR |
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:ATTR_MULTI | SHAPECHANGER | ATTR_ANY |
-F:DROP_60 | DROP_GOOD | POWERFUL | AURA_ELEC | AURA_FIRE | AURA_COLD |
-F:BASH_DOOR | IM_ELEC | IM_FIRE | RES_NEXU | IM_COLD | ZANGBAND | 
-F:IM_POIS | IM_ACID | RES_PLAS | RES_DISE | COLD_BLOOD | NONLIVING | RAND_50
-F:NO_CUT
-S:MULTIPLY | 
-S:1_IN_5 |
-S:BR_CHAO
-D:Spawned from the Pits of the Abyss, it is a mass of sentient Chaos, 
-D:spreading uncontrollably and destroying everything in its path. 
-
-N:816:Cyberdemon
-G:U:u
-I:120:70d101:90:90:90
-W:77:4:15000:30000
-E:1:1:1:2:1:1
-O:0:100:0:0
-B:HIT:HURT:1d50
-B:HIT:HURT:1d50
-B:HIT:HURT:1d50
-B:HIT:HURT:1d50
-F:RAND_25 | EVIL | DEMON |
-F:DROP_2D2 | DROP_GOOD | ONLY_ITEM | RES_TELE | SUSCEP_ACID |
-F:IM_POIS | IM_FIRE | FORCE_SLEEP | FORCE_MAXHP | NONLIVING
-F:MORTAL | ZANGBAND | HAS_LITE
-S:1_IN_4 |
-S:ROCKET
-D:Reverbrant metal steps announce the arrival of this huge creature, 
-D:half demon half machine. It has an unsurpassable firepower. 
-
-N:817:Hela, Queen of the Dead
-G:p:G
-I:130:74d100:60:110:10
-W:74:3:8000:45000
-E:1:1:1:2:1:1
-O:0:0:100:0
-B:TOUCH:LOSE_ALL:50d1
-B:TOUCH:EXP_80:50d1
-B:TOUCH:UN_BONUS:50d1
-F:UNIQUE | FEMALE | CAN_SPEAK | POWERFUL | RES_TELE |
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GREAT | DROP_GOOD |
-F:INVISIBLE | OPEN_DOOR | BASH_DOOR | CAN_FLY |
-F:EVIL | RES_NETH | IM_COLD | IM_POIS |
-F:IM_FIRE | NO_CONF | NO_SLEEP | ZANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:CAUSE_3 | CAUSE_4 | HAND_DOOM | TELE_TO | HOLD |
-S:S_UNDEAD | S_HI_UNDEAD | S_HI_DRAGON | FORGET | SCARE | BLIND |
-S:BA_DARK | BA_NETH | HEAL | ANIM_DEAD
-D:The Norse ruler of Hel is a merciless queen, who ever hunts for more 
-D:souls to add to her collection of tortured spirits. She arrives in 
-D:an ominous green robe, a certain sign of impending doom, to claim 
-D:as her own those who die an ignoble death. 
-
 N:818:The Mouth of Sauron
 G:p:v
 I:130:90d100:60:100:10
@@ -14133,16 +18648,35 @@ B:HIT:UN_BONUS:6d8
 B:HIT:UN_BONUS:6d8
 B:TOUCH:UN_POWER
 B:TOUCH:UN_POWER
-F:UNIQUE | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | 
-F:ONLY_ITEM | DROP_1D2 | DROP_4D2 | DROP_GOOD | 
-F:INVISIBLE | OPEN_DOOR | BASH_DOOR |
-F:EVIL | IM_FIRE | IM_COLD | 
-F:IM_ELEC | BASEANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:TELE_TO | HOLD | CAUSE_3 | TRAPS | ANIM_DEAD |
-S:BO_PLAS | BA_DARK | BA_MANA | BA_FIRE | BA_WATE | BA_NETH
-S:S_HI_DEMON | S_HI_UNDEAD
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:INVISIBLE
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:UNIQUE
+S:1_IN_2
+S:BA_DARK
+S:BA_FIRE
+S:BA_MANA
+S:BA_NETH
+S:BA_WATE
+S:BO_PLAS
+S:CAUSE_3
+S:HOLD
+S:S_HI_DEMON
+S:S_HI_UNDEAD
+S:TELE_TO
 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 
@@ -14158,16 +18692,42 @@ B:HIT:UN_BONUS:6d8
 B:HIT:UN_POWER:6d8
 B:HIT:BLIND:6d8
 B:HIT:CONFUSE:6d8
-F:UNIQUE | MALE | CAN_SPEAK | POWERFUL | RES_TELE | 
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GREAT | DROP_GOOD | SPECIAL_GENE | 
-F:INVISIBLE | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | IM_FIRE | IM_COLD | 
-F:IM_ELEC | NO_CONF | NO_SLEEP | BASEANGBAND
-S:1_IN_2 | 
-S:CAUSE_3 | TELE_TO | BA_FIRE | DRAIN_MANA | HOLD |
-S:TRAPS | BA_WATE | BO_PLAS | BA_NETH |
-S:BA_MANA | BA_DARK | S_HI_UNDEAD | BA_CHAO | HAND_DOOM | ANIM_DEAD
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:INVISIBLE
+F:MALE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:RES_TELE
+F:SMART
+F:SPECIAL_GENE
+F:UNIQUE
+S:1_IN_2
+S:BA_CHAO
+S:BA_DARK
+S:BA_FIRE
+S:BA_MANA
+S:BA_NETH
+S:BA_WATE
+S:BO_PLAS
+S:CAUSE_3
+S:DRAIN_MANA
+S:HAND_DOOM
+S:HOLD
+S:S_HI_UNDEAD
+S:TELE_TO
 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 
@@ -14183,15 +18743,44 @@ B:HIT:HURT:10d15
 B:HIT:HURT:10d15
 B:HIT:HURT:10d15
 B:HIT:HURT:10d15
-F:UNIQUE | FEMALE | THUNDERLORD | RES_TELE | CAN_FLY | GOOD |
-F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | DROP_SKELETON | CAN_SPEAK |
-F:FORCE_SLEEP | FORCE_MAXHP | PET |
-F:DROP_4D2 | DROP_1D2 | DROP_GOOD | DROP_60 | DROP_90 | ONLY_ITEM |
-F:IM_COLD | IM_POIS | IM_ACID | IM_ELEC | REGENERATE | 
-F:MORTAL | HAS_LITE
-S:1_IN_4 |
-S:TPORT | TELE_TO | BR_FIRE | S_THUNDERLORD | 
-S:TELE_AWAY | HEAL | BA_NETH | BO_NETH | BA_FIRE | BO_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_60
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:FEMALE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_POIS
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:PET
+F:REGENERATE
+F:RES_TELE
+F:THUNDERLORD
+F:UNIQUE
+S:1_IN_4
+S:BA_FIRE
+S:BA_NETH
+S:BO_FIRE
+S:BO_NETH
+S:BR_FIRE
+S:HEAL
+S:S_THUNDERLORD
+S:TELE_AWAY
+S:TELE_TO
+S:TPORT
 D:She came to help you. 
 
 N:821:Master quylthulg
@@ -14200,11 +18789,25 @@ I:120:30d100:20:1:0
 W:76:2:7000:15000
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:FORCE_SLEEP | FORCE_MAXHP | NEVER_MOVE | NEVER_BLOW | 
-F:INVISIBLE | EMPTY_MIND | ANIMAL | RES_TELE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND
-S:1_IN_2 | 
-S:S_MONSTERS | S_HI_UNDEAD | S_HI_DRAGON | S_HI_DEMON | S_ANIMALS | BLINK | TELE_TO
+F:ANIMAL
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:INVISIBLE
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:RES_TELE
+S:1_IN_2
+S:BLINK
+S:S_ANIMALS
+S:S_HI_DEMON
+S:S_HI_DRAGON
+S:S_HI_UNDEAD
+S:S_MONSTERS
+S:TELE_TO
 D:A giant seething mass of flesh, overwhelming you with monster after monster. 
 
 N:822:Qlzqqlzuup, the Lord of Flesh
@@ -14213,40 +18816,39 @@ I:130:50d100:30:1:0
 W:79:3:10000:20000
 E:0:0:0:0:0:0
 O:20:20:20:20
-F:UNIQUE | RES_TELE | 
-F:FORCE_SLEEP | FORCE_MAXHP | NEVER_MOVE | NEVER_BLOW | 
-F:ONLY_ITEM | DROP_4D2 | 
-F:INVISIBLE | ATTR_MULTI | EMPTY_MIND | ANIMAL | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND
-S:1_IN_1 | 
-S:S_MONSTERS | S_ANGEL | S_HOUND | S_HYDRA | S_SPIDER | S_ANT | S_ANIMALS | 
-S:S_HI_UNDEAD | S_HI_DRAGON | S_HI_DEMON | S_WRAITH | S_UNIQUE | S_KIN
+F:ANIMAL
+F:ATTR_MULTI
+F:DROP_4D2
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:INVISIBLE
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:RES_TELE
+F:UNIQUE
+S:1_IN_1
+S:S_ANGEL
+S:S_ANIMALS
+S:S_ANT
+S:S_HI_DEMON
+S:S_HI_DRAGON
+S:S_HI_UNDEAD
+S:S_HOUND
+S:S_HYDRA
+S:S_KIN
+S:S_MONSTERS
+S:S_SPIDER
+S:S_UNIQUE
+S:S_WRAITH
 D:A gigantic seething mass of flesh, Qlzqqlzuup changes colours in front 
 D:of your eyes.  Pulsating first one colour then the next, it knows only it 
 D:must bring help to protect itself. 
 
-N:823:Cthugha, the Living Flame
-G:E:R
-I:133:50d100:30:1:20
-W:78:3:0:17500
-E:0:0:0:0:0:0
-O:0:0:100:0
-B:TOUCH:BLIND
-B:TOUCH:FIRE:12d10
-B:TOUCH:FIRE:12d10
-B:TOUCH:FIRE:12d10
-F:UNIQUE | RES_TELE | AURA_FIRE | IM_FIRE | CAN_FLY | RES_PLAS |
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_4D2 | SMART | ELDRITCH_HORROR |
-F:EVIL | KILL_ITEM | KILL_BODY |
-F:NO_CONF | NO_SLEEP | NO_FEAR | CTHANGBAND | HAS_LITE | NO_CUT
-S:1_IN_4 | 
-S:BR_FIRE | S_KIN
-D:"But even though we had shielded our eyes, it was impossible not 
-D:to see the great amorphous shapes streaming skyward from the 
-D:accursed place, nor the equally great being hovering like a cloud 
-D:of living fire above the trees." 
-
 N:824:Flare, rider of bronze Moonth
 G:B:U
 I:130:70d100:100:100:15
@@ -14257,15 +18859,44 @@ B:HIT:HURT:15d15
 B:HIT:HURT:15d15
 B:HIT:HURT:15d15
 B:HIT:HURT:15d15
-F:UNIQUE | MALE | THUNDERLORD | RES_TELE | CAN_FLY | CAN_SPEAK |
-F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | DROP_SKELETON |
-F:FORCE_SLEEP | FORCE_MAXHP | PET | GOOD |
-F:DROP_4D2 | DROP_1D2 | DROP_GOOD | DROP_60 | DROP_90 | ONLY_ITEM |
-F:IM_COLD | IM_POIS | IM_ACID | IM_ELEC | IM_FIRE | REGENERATE | 
-F:MORTAL | HAS_LITE
-S:1_IN_4 |
-S:SCARE | TPORT | TELE_TO | S_THUNDERLORD | 
-S:TELE_LEVEL | HEAL | BR_FIRE | BR_TIME | ROCKET
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_60
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:PET
+F:REGENERATE
+F:RES_TELE
+F:THUNDERLORD
+F:UNIQUE
+S:1_IN_4
+S:BR_FIRE
+S:BR_TIME
+S:HEAL
+S:ROCKET
+S:SCARE
+S:S_THUNDERLORD
+S:TELE_LEVEL
+S:TELE_TO
+S:TPORT
 D:A leader from afar, he has come with his eagle to help you in 
 D:your battle. Having already saved his home, he now wants to save Arda! 
 
@@ -14279,49 +18910,45 @@ B:HIT:HURT:8d8
 B:HIT:HURT:8d8
 B:HIT:HURT:8d8
 B:HIT:HURT:8d8
-F:UNIQUE | MALE | 
-F:FORCE_MAXHP | CAN_SPEAK | SMART | EVIL | AI_SPECIAL | 
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT | 
-F:OPEN_DOOR | BASH_DOOR | KILL_WALL | MOVE_BODY | TAKE_ITEM |
-F:IM_FIRE | IM_COLD | IM_POIS | SPECIAL_GENE | 
-F:REGENERATE | REFLECTING | DROP_SKELETON | DROP_CORPSE | BASEANGBAND
-F:HAS_LITE
-S:1_IN_6 | 
-S:S_MONSTERS | S_WRAITH | S_HI_UNDEAD | 
-S:S_HI_DRAGON | S_HI_DEMON | S_UNIQUE | S_ANIMALS
+F:AI_SPECIAL
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:KILL_WALL
+F:MALE
+F:MOVE_BODY
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REFLECTING
+F:REGENERATE
+F:SMART
+F:SPECIAL_GENE
+F:TAKE_ITEM
+F:UNIQUE
+S:1_IN_6
+S:S_ANIMALS
+S:S_HI_DEMON
+S:S_HI_DRAGON
+S:S_HI_UNDEAD
+S:S_MONSTERS
+S:S_UNIQUE
+S:S_WRAITH
 D:The son of Eol the Dark Elf, Maeglin is every bit as evil as his father 
 D:and more.  His greed for gold led him to betray the Hidden Kingdom of 
 D:Gondolin to Morgoth's forces.  He is a mighty warrior himself, and some 
 D:of Morgoth's greatest servants answer to his call. 
 
-N:826:Cyaegha
-G:e:G
-I:130:64d100:90:120:10
-W:80:3:0:44444
-E:0:0:0:0:0:0
-O:20:50:30:0
-B:CRUSH:HURT:15d15
-B:CRUSH:HURT:15d15
-B:CRUSH:HURT:15d15
-B:CRUSH:HURT:15d15
-F:UNIQUE | CAN_SPEAK | RES_TELE | ELDRITCH_HORROR | CAN_FLY |
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | 
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | MOVE_BODY | 
-F:EVIL | DEMON | IM_ACID | IM_ELEC |
-F:IM_COLD | IM_POIS | CTHANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:TELE_AWAY | BLIND | HOLD | SCARE |  BRAIN_SMASH | 
-S:BR_DARK | BA_DARK | BR_NETH | HAND_DOOM |
-S:S_HI_UNDEAD | S_DEMON | S_MONSTERS | S_HYDRA
-D:"...it was a gigantic eye staring down at them. Around the eye, 
-D:the sky split; deep clefts opened through which the darkness 
-D:began to ooze, a darkness blacker than the night, which crawled 
-D:down as a set of slimy tentacles, taking on more form, more 
-D:definite shape... something was standing, outlined against 
-D:the black sky, something which had tentacles of darkness 
-D:and a green-glowing eye." 
-
 N:827:Pazuzu, Lord of Air
 G:U:b
 I:140:55d100:40:125:10
@@ -14332,39 +18959,35 @@ B:HIT:ELEC:12d12
 B:HIT:ELEC:12d12
 B:HIT:ELEC:12d12
 B:HIT:ELEC:12d12
-F:UNIQUE | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | 
-F:INVISIBLE | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DEMON | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | 
-F:IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND
-S:1_IN_3 | 
-S:MIND_BLAST | BO_ELEC | BO_MANA | BA_ELEC | S_HI_DEMON
+F:BASH_DOOR
+F:CAN_FLY
+F:DEMON
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:MALE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNIQUE
+S:1_IN_3
+S:BA_ELEC
+S:BO_ELEC
+S:BO_MANA
+S:MIND_BLAST
+S:S_HI_DEMON
 D:A winged humanoid demon from the Planes of Hell, Pazuzu grins inhumanely at you 
 D:as he decides your fate. 
 
-N:828:Ithaqua the Windwalker
-G:Y:B
-I:140:55d100:40:125:10
-W:82:2:0:32500
-E:1:1:1:2:1:1
-O:0:0:100:0
-B:CLAW:COLD:12d12
-B:CLAW:COLD:12d12
-B:CRUSH:ELEC:12d12
-B:CRUSH:ELEC:12d12
-F:UNIQUE | CAN_SPEAK | ESCORT | RES_TELE | 
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | AURA_COLD |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | AURA_ELEC |
-F:INVISIBLE | OPEN_DOOR | BASH_DOOR | NONLIVING |
-F:EVIL | DEMON | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | 
-F:IM_POIS | NO_CONF | NO_SLEEP | CTHANGBAND
-S:1_IN_3 | 
-S:BO_MANA | SCARE | BR_COLD | S_DEMON | BO_ELEC | BA_ELEC |
-S:MIND_BLAST | CAUSE_4 | BA_CHAO | BA_WATE | S_HI_UNDEAD | S_KIN
-D:The Wendigo, moving so fast that you can see little except two 
-D:glowing eyes burning with hatred. 
-
 N:829:Greater Hellhound
 G:C:r
 I:120:48d30:25:80:30
@@ -14374,11 +18997,21 @@ O:0:0:0:0
 B:BITE:FIRE:5d12
 B:BITE:FIRE:5d12
 B:BITE:FIRE:5d12
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE 
-F:RAND_25 | FRIENDS | AURA_FIRE | SUSCEP_COLD |
-F:BASH_DOOR | MOVE_BODY | 
-F:ANIMAL | EVIL | IM_FIRE | BASEANGBAND | HAS_LITE | 
-S:1_IN_5 | BR_FIRE
+F:ANIMAL
+F:AURA_FIRE
+F:BASH_DOOR
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:FRIENDS
+F:HAS_LITE
+F:IM_FIRE
+F:MOVE_BODY
+F:RAND_25
+F:SUSCEP_COLD
+S:1_IN_5
+S:BR_FIRE
 D:It is a giant dog that glows with heat. Flames pour from its nostrils. 
 
 N:830:Cantoras, the Skeletal Lord
@@ -14391,42 +19024,46 @@ B:GAZE:EXP_80:5d5
 B:GAZE:EXP_80:5d5
 B:TOUCH:POISON:5d5
 B:TOUCH:POISON:5d5
-F:UNIQUE | MALE | CAN_SPEAK | RES_TELE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT |
-F:SMART | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_FIRE | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_2 | 
-S:TELE_TO | SLOW | SCARE | CAUSE_4 | BRAIN_SMASH | 
-S:BO_ICEE | BO_MANA | BA_WATE | BA_NETH | 
-S:S_HI_UNDEAD | ANIM_DEAD
+F:BASH_DOOR
+F:CAN_SPEAK
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:SMART
+F:UNDEAD
+F:UNIQUE
+S:1_IN_2
+S:BA_NETH
+S:BA_WATE
+S:BO_ICEE
+S:BO_MANA
+S:BRAIN_SMASH
+S:CAUSE_4
+S:SCARE
+S:SLOW
+S:S_HI_UNDEAD
+S:TELE_TO
 D:A legion of evil undead druj animating the skeleton of a once mighty 
 D:sorcerer. His power is devastating and his speed unmatched in the 
 D:underworld. Flee his wrath! 
 
-N:831:Mephistopheles, Lord of Hell
-G:U:r
-I:140:30d222:20:150:50
-W:84:2:0:42500
-E:1:1:1:2:1:1
-O:0:100:0:0
-B:GAZE:EXP_80:10d5
-B:GAZE:TERRIFY:10d5
-B:TOUCH:FIRE:4d15
-B:TOUCH:UN_POWER:4d15
-F:MALE | UNIQUE | CAN_SPEAK | CAN_FLY |
-F:FORCE_SLEEP | FORCE_MAXHP | OPEN_DOOR | BASH_DOOR | MOVE_BODY |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT |
-F:IM_FIRE | RES_PLAS | RES_NETH | AURA_FIRE |
-F:NO_CONF | NO_SLEEP | NONLIVING | EVIL | DEMON |
-F:ESCORTS | IM_COLD | IM_POIS | ZANGBAND | HAS_LITE
-S:1_IN_3 |
-S:TELE_TO | SCARE | HOLD | BRAIN_SMASH |
-S:S_DEMON | S_HI_UNDEAD | S_UNDEAD |
-S:BR_FIRE | BR_NETH | S_HI_DEMON | HAND_DOOM | ANIM_DEAD
-D:A duke of hell, in the flesh. 
-
 N:832:Godzilla
 G:R:v
 I:130:85d100:50:185:20
@@ -14437,138 +19074,37 @@ B:CLAW:POISON:5d10
 B:CLAW:POISON:5d10
 B:BITE:HURT:20d10
 B:CRUSH:UN_BONUS:5d12
-F:UNIQUE | CAN_SWIM | DROP_CORPSE
-F:FORCE_SLEEP | FORCE_MAXHP | RES_PLAS | RES_DISE | RES_TELE
-F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | IM_FIRE | IM_COLD | IM_POIS
-F:MORTAL | JOKEANGBAND
-S:1_IN_2 | 
-S:BR_DISE | BR_PLAS | BR_NUKE | BR_POIS | BR_ACID
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:JOKEANGBAND
+F:MORTAL
+F:MOVE_BODY
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:RES_DISE
+F:RES_PLAS
+F:RES_TELE
+F:UNIQUE
+S:1_IN_2
+S:BR_ACID
+S:BR_DISE
+S:BR_NUKE
+S:BR_PLAS
+S:BR_POIS
 D:Godzilla rose from the contaminated sea.  This terrible creature could 
 D:level whole cities in anger.
 
-N:833:Abhoth, Source of Uncleanness
-G:j:G
-I:130:80d105:50:150:0
-W:85:3:0:40000
-E:0:0:0:0:0:0
-O:0:0:100:0
-B:TOUCH:ACID:11d11
-B:TOUCH:DISEASE:11d11
-B:TOUCH:ACID:11d11
-B:TOUCH:POISON:11d11
-F:ONLY_ITEM | DROP_1D2 | CAN_SWIM |
-F:DROP_GOOD | DROP_GREAT |
-F:CAN_SPEAK | EVIL | UNIQUE | NEVER_MOVE | FORCE_MAXHP | FORCE_SLEEP |
-F:IM_ACID | IM_POIS | IM_COLD | IM_ELEC | RES_NETH | RES_WATE | RES_NEXU | 
-F:NO_FEAR | NO_CONF | NO_SLEEP | DEMON | SMART | ELDRITCH_HORROR |
-F:COLD_BLOOD | RES_DISE | NO_STUN | CTHANGBAND | NO_CUT
-S:1_IN_6 |
-S:S_MONSTERS | S_DEMON | S_HI_DRAGON | S_HI_UNDEAD | HEAL |
-S:TELE_AWAY | TPORT | CAUSE_4 | BRAIN_SMASH | DRAIN_MANA | 
-S:BR_NUKE | BR_POIS | BR_CHAO | BR_NEXU | ANIM_DEAD
-D:"...in the pool [there was] a grayish, horrid mass that nearly choked 
-D:it from rim to rim. Here, it seemed, was the ultimate source of all 
-D:miscreation and abomination. For the gray mass quobbed and quivered, 
-D:and swelled perpetually; and from it, in manifold fission, were 
-D:spawned the anatomies that crept away on every side through the 
-D:grotto." 
-
-N:834:Ymir, the Ice Giant
-G:P:w
-I:130:86d110:50:160:20
-W:71:2:0:32500
-E:1:1:1:2:1:1
-O:0:100:0:0
-B:HIT:COLD:9d11
-B:HIT:HURT:9d11
-B:HIT:COLD:9d11
-B:HIT:HURT:9d11
-F:UNIQUE | CAN_SPEAK | SUSCEP_FIRE | 
-F:FORCE_SLEEP | FORCE_MAXHP | RES_TELE | RES_NETH | RES_WATE | MALE | 
-F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | DROP_GOOD | EVIL | ESCORT | GIANT |
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | TAKE_ITEM | RES_DISE |
-F:EVIL | IM_COLD | IM_POIS | SUSCEP_FIRE | 
-F:COLD_BLOOD | AURA_COLD | DROP_CORPSE | ZANGBAND | HAS_LITE | NO_CUT
-S:1_IN_5 | 
-S:BR_COLD | BO_ICEE | DARKNESS | TELE_TO | S_KIN | S_HI_UNDEAD | 
-S:TELE_AWAY | HAND_DOOM
-D:Ymir is one of the oldest beings in existence. He looks like a giant 
-D:humanoid made of ice. 
-
-N:835:Loki, the Trickster
-G:P:D
-I:130:110d100:50:160:20
-W:85:2:0:75000
-E:1:1:1:2:1:1
-O:0:0:100:0
-B:HIT:BLIND:6d11
-B:HIT:UN_BONUS:6d11
-B:HIT:UN_POWER:6d11
-F:UNIQUE | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | RES_TELE | RES_NETH | RES_PLAS | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | DROP_GREAT | EVIL | AURA_FIRE |
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | TAKE_ITEM | CAN_SPEAK |
-F:EVIL | IM_FIRE | NO_CONF | NO_SLEEP | IM_POIS | SUSCEP_COLD | GIANT | 
-F:REGENERATE | ZANGBAND | HAS_LITE
-S:1_IN_5 | 
-S:SHRIEK | HASTE | HEAL | DRAIN_MANA | TPORT | TELE_TO | TELE_AWAY |
-S:TELE_LEVEL | FORGET | S_HI_DEMON | HAND_DOOM | S_HI_UNDEAD |
-S:S_UNIQUE | S_HI_DRAGON | BA_DARK | BA_MANA | ANIM_DEAD
-D:Loki, the god of mischief, is a nasty person. He will use every 
-D:dirty trick in the book, and then some. In the end, his half-giant 
-D:heritage is bound to show, as he will defect to the side of the 
-D:giants and fight against the other gods of Asgard. 
-
-N:836:Star-spawn of Cthulhu
-G:U:G
-I:130:75d100:90:90:90
-W:86:2:0:44000
-E:0:0:0:0:0:0
-O:0:0:100:0
-B:CLAW:POISON:1d30
-B:CLAW:ACID:1d30
-B:TOUCH:UN_POWER:1d10
-B:CRUSH:UN_BONUS:2d33
-F:RAND_25 | KILL_ITEM | OPEN_DOOR | BASH_DOOR | RES_NETH | ELDRITCH_HORROR |
-F:DROP_1D2 | DROP_2D2 | DROP_90 | ONLY_ITEM | FORCE_SLEEP | FORCE_MAXHP |
-F:EVIL | DEMON | IM_POIS | IM_COLD | IM_ACID | IM_ELEC | RES_TELE | NONLIVING |
-F:POWERFUL | IM_FIRE | CAN_SWIM | CTHANGBAND
-S:1_IN_3
-S:SCARE | CONF | S_DEMON | S_UNDEAD | DRAIN_MANA | BR_ACID |
-S:BR_FIRE | TPORT | S_MONSTERS | BRAIN_SMASH | BR_NETH |
-S:HEAL | MIND_BLAST | BA_NUKE | ANIM_DEAD
-D:The last remnants of sanity threaten to leave your brain as you 
-D:behold this titanic bat-winged, octopus-headed unholy abomination. 
-D:"They all lay in stone houses in their great city of R'lyeh, 
-D:preserved by the spells of mighty Cthulhu for a glorious 
-D:resurrection when the stars and the earth might once more 
-D:be ready..." 
-
-N:837:Surtur, the Fire Giant
-G:P:r
-I:130:86d110:50:160:20
-W:71:2:0:32500
-E:1:1:1:2:1:1
-O:0:100:0:0
-B:HIT:FIRE:9d11
-B:HIT:HURT:9d11
-B:HIT:FIRE:9d11
-B:HIT:HURT:9d11
-F:UNIQUE | SUSCEP_COLD |
-F:FORCE_SLEEP | FORCE_MAXHP | RES_TELE | RES_NETH | RES_PLAS | MALE |
-F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | DROP_GOOD | EVIL | AURA_FIRE |
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | TAKE_ITEM | CAN_SPEAK |
-F:EVIL | IM_FIRE | NO_CONF | NO_SLEEP | IM_POIS | SUSCEP_COLD | GIANT | 
-F:ZANGBAND | HAS_LITE
-S:1_IN_5 | 
-S:BR_FIRE | BR_PLAS | BLIND | TELE_TO | S_KIN | 
-S:HAND_DOOM | TELE_AWAY | S_HI_DEMON
-D:Surtur is another of the most ancient of all creatures. He is a demonic 
-D:giant of fire, who is destined to set the nine worlds afire with his 
-D:accursed sword of doom on the day of Ragnarok. 
-
 N:838:The Tarrasque
 G:R:v
 I:130:130d100:50:185:20
@@ -14579,13 +19115,27 @@ B:HIT:HURT:10d10
 B:HIT:HURT:10d10
 B:TOUCH:UN_POWER:10d10
 B:TOUCH:UN_POWER:10d10
-F:UNIQUE | ATTR_MULTI | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | IM_FIRE | IM_COLD | NO_SLEEP | BASEANGBAND
-S:1_IN_2 | 
-S:BR_FIRE | BR_COLD | BR_DISE
+F:ATTR_MULTI
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_FIRE
+F:MOVE_BODY
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:UNIQUE
+S:1_IN_2
+S:BR_COLD
+S:BR_DISE
+S:BR_FIRE
 D:The Tarrasque is a massive reptile of legend, rumoured to be unkillable 
 D:and immune to magic. Fear its anger, for its devastation is unmatched! 
 
@@ -14599,17 +19149,36 @@ B:HIT:FIRE:8d12
 B:HIT:FIRE:8d12
 B:CRUSH:HURT:8d12
 B:TOUCH:UN_POWER
-F:UNIQUE | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ESCORT | ESCORTS | CAN_FLY |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DEMON | IM_FIRE | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
-S:1_IN_4 | 
-S:BLIND | CONF | SCARE | 
-S:BR_FIRE | BR_PLAS | 
-S:S_HI_DEMON | S_UNDEAD
+F:BASH_DOOR
+F:CAN_FLY
+F:DEMON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_GOOD
+F:ESCORT
+F:ESCORTS
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:MALE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:UNIQUE
+S:1_IN_4
+S:BLIND
+S:BR_FIRE
+S:BR_PLAS
+S:CONF
+S:SCARE
+S:S_HI_DEMON
+S:S_UNDEAD
 D:A massive form cloaked in flame. Lungorthin stares balefully at you with 
 D:eyes that smoulder red. The dungeon floor where he stands is scorched by 
 D:the heat of his body. 
@@ -14624,65 +19193,32 @@ B:CLAW:HURT:6d8
 B:CLAW:HURT:6d8
 B:BITE:POISON:6d6
 B:BITE:POISON:6d6
-F:UNIQUE | MALE | CAN_SPEAK |
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ESCORT | ESCORTS | DROP_CORPSE | 
-F:RAND_25 | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | MOVE_BODY | 
-F:ANIMAL | EVIL | IM_POIS | BASEANGBAND
-S:1_IN_3 | 
-S:SCARE | S_MONSTERS | S_HOUND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:ESCORT
+F:ESCORTS
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RAND_25
+F:TAKE_ITEM
+F:UNIQUE
+S:1_IN_3
+S:SCARE
+S:S_HOUND
+S:S_MONSTERS
 D:Draugluin provides Sauron with a fearsome personal guard. He is an 
 D:enormous wolf inhabited by a human spirit. He is chief of all his kind. 
 
-N:841:Shuma-Gorath
-G:e:G
-I:130:85d100:50:150:0
-W:88:3:0:47000
-E:0:0:0:0:0:0
-O:0:0:100:0
-B:CRUSH:HURT:12d12
-B:CRUSH:HURT:12d12
-B:GAZE:LOSE_INT:2d12
-B:GAZE:LOSE_WIS:2d12
-F:ONLY_ITEM | DROP_1D2 | CAN_SWIM |
-F:DROP_GOOD | DROP_GREAT |
-F:CAN_SPEAK | EVIL | UNIQUE | NEVER_MOVE | FORCE_MAXHP | FORCE_SLEEP |
-F:IM_ACID | IM_POIS | IM_COLD | IM_ELEC | RES_NETH | RES_WATE | RES_NEXU | 
-F:NO_FEAR | NO_CONF | NO_SLEEP | DEMON | SMART | ELDRITCH_HORROR |
-F:COLD_BLOOD | RES_DISE | CTHANGBAND | NO_CUT
-S:1_IN_2 |
-S:FORGET | HEAL | HAND_DOOM | BA_MANA | TPORT | TELE_AWAY |
-S:TELE_LEVEL | CONF | BLIND | BRAIN_SMASH | DRAIN_MANA |
-S:S_MONSTERS | S_KIN | S_HI_DEMON | S_HOUND | S_HYDRA | 
-S:S_UNIQUE | S_HI_UNDEAD | S_HI_DRAGON | ANIM_DEAD
-D:Shuma-Gorath is one of the immortal lords of chaos. The true form of 
-D:this blasphemous horror is a huge, all-seeing eye surrounded by tentacles. 
-
-N:842:Tulzscha, the Green Flame
-G:E:G
-I:130:100d100:90:100:50
-W:89:4:0:45000
-E:0:0:0:0:0:0
-O:0:100:0:0
-B:HIT:HURT:2d50
-B:HIT:HURT:2d50
-B:HIT:HURT:2d50
-B:HIT:HURT:2d50
-F:RAND_25 | EVIL | DEMON | AURA_FIRE | AURA_COLD | ELDRITCH_HORROR |
-F:DROP_2D2 | DROP_4D2 | DROP_GOOD | ONLY_ITEM | RES_TELE | 
-F:IM_POIS | IM_FIRE | FORCE_SLEEP | FORCE_MAXHP | NONLIVING | 
-F:IM_COLD | IM_ACID | IM_ELEC | RES_NEXU | RES_NETH | RES_PLAS | 
-F:REGENERATE | UNIQUE | CTHANGBAND | HAS_LITE | NO_CUT | NO_SLEEP | NO_FEAR
-S:1_IN_3 |
-S:BR_NEXU | BR_NETH | BR_COLD | BR_FIRE
-D:"A belching column of sick greenish flame... spouting volcanically 
-D:from the depths profound and inconceivable, casting no shadows as 
-D:healthy flame should, and coating the nitrous stone with a nasty, 
-D:venomous verdigris. For all that seething combustion no warmth 
-D:lay, but only the clamminess of death and corruption." 
-
 N:843:Oremorj, the Cyberdemon Lord
 G:U:u
 I:130:90d100:90:90:90
@@ -14693,12 +19229,27 @@ B:HIT:HURT:2d50
 B:HIT:HURT:2d50
 B:HIT:HURT:2d50
 B:HIT:HURT:2d50
-F:RAND_25 | EVIL | DEMON | SUSCEP_ACID |
-F:DROP_2D2 | DROP_GOOD | ONLY_ITEM | RES_TELE | DROP_GREAT | UNIQUE | NO_SLEEP |
-F:IM_POIS | IM_FIRE | FORCE_SLEEP | FORCE_MAXHP | NONLIVING | JOKEANGBAND | 
+F:DEMON
+F:DROP_2D2
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
 F:HAS_LITE
-S:1_IN_3 |
-S:ROCKET | S_HI_DEMON
+F:IM_FIRE
+F:IM_POIS
+F:JOKEANGBAND
+F:NONLIVING
+F:NO_SLEEP
+F:ONLY_ITEM
+F:RAND_25
+F:RES_TELE
+F:SUSCEP_ACID
+F:UNIQUE
+S:1_IN_3
+S:ROCKET
+S:S_HI_DEMON
 D:The mightiest of Cyberdemons, their lord and ruler. 
 
 N:844:Vecna, the Emperor Lich
@@ -14711,67 +19262,49 @@ B:HIT:EXP_80:7d12
 B:HIT:LOSE_DEX:7d12
 B:HIT:UN_POWER:7d12
 B:HIT:UN_POWER:7d12
-F:UNIQUE | MALE | CAN_SPEAK | RES_TELE
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ESCORT | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT | 
-F:SMART | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | NO_SLEEP | BASEANGBAND
-F:NO_CUT
-S:1_IN_3 | 
-S:TPORT | BLIND | SCARE | CAUSE_4 | BRAIN_SMASH | 
-S:BA_MANA | BO_MANA | BA_FIRE | BA_NETH | 
-S:S_MONSTERS | S_HI_DEMON | S_HI_UNDEAD | S_KIN | HAND_DOOM | ANIM_DEAD
+F:BASH_DOOR
+F:CAN_SPEAK
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_GOOD
+F:DROP_GREAT
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:SMART
+F:UNDEAD
+F:UNIQUE
+S:1_IN_3
+S:BA_FIRE
+S:BA_MANA
+S:BA_NETH
+S:BLIND
+S:BO_MANA
+S:BRAIN_SMASH
+S:CAUSE_4
+S:HAND_DOOM
+S:SCARE
+S:S_HI_DEMON
+S:S_HI_UNDEAD
+S:S_KIN
+S:S_MONSTERS
+S:TPORT
 D:The greatest of all undead sorcerers, even the gods once feared him.  This 
 D:ancient shadow of death wilts every living thing it passes. 
 
-N:845:Yog-Sothoth, the All-in-One
-G:j:v
-I:130:66d99:100:100:20
-W:90:3:0:45000
-E:0:0:0:0:0:0
-O:0:0:100:0
-B:TOUCH:HURT:40d5
-B:TOUCH:LOSE_CON:16d2
-B:TOUCH:LOSE_CON:16d2
-F:UNIQUE | CAN_SPEAK | SMART | ELDRITCH_HORROR | RES_TELE
-F:PASS_WALL | FORCE_SLEEP | FORCE_MAXHP | AURA_ELEC | AURA_FIRE |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | ATTR_MULTI | ATTR_ANY | AURA_COLD |
-F:SMART | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | NONLIVING | CAN_FLY |
-F:EVIL | IM_ACID | IM_COLD | IM_ELEC | IM_POIS | IM_FIRE | NO_CONF | NO_SLEEP
-F:CTHANGBAND | HAS_LITE | NO_CUT
-S:1_IN_3 |
-S:BO_MANA | BRAIN_SMASH | BA_MANA | S_MONSTERS | S_HI_DEMON |
-S:BA_CHAO | S_DEMON | S_HI_UNDEAD | S_HOUND | BR_MANA | BR_DISI
-D:"Great globes of light massing towards the opening... the breaking 
-D:apart of the nearest globes, and the protoplasmic flesh that 
-D:flowed blackly outward to join together and form that eldritch, 
-D:hideous horror from outer space... whose mask was a congeries 
-D:of iridescent globes... who froths as primal slime in nuclear 
-D:chaos forever beyond the nethermost outposts of space and time!" 
-
-N:846:Fenris Wolf
-G:C:D
-I:130:70d100:80:90:40
-W:90:2:0:35000
-E:0:1:0:2:1:0
-O:20:0:80:0
-B:BITE:HURT:20d6
-B:CLAW:HURT:8d8
-B:CLAW:HURT:8d8
-B:BITE:HURT:20d6
-F:UNIQUE | CAN_SPEAK | DROP_CORPSE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:RAND_25 | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | KILL_BODY | NO_SLEEP
-F:ANIMAL | EVIL | IM_POIS | IM_FIRE | IM_COLD | ZANGBAND
-S:1_IN_8 | 
-S:BR_DARK | BR_POIS | BR_COLD
-D:The immensely huge wolf who would swallow the sun to satisfy its 
-D:hunger - and leave the gods for dessert. 
-
 N:847:Great Wyrm of Power
 G:D:v
 I:130:111d111:40:160:70
@@ -14782,69 +19315,69 @@ B:CLAW:HURT:8d12
 B:CLAW:HURT:8d12
 B:BITE:HURT:10d14
 B:BITE:HURT:10d14
-F:FORCE_SLEEP | FORCE_MAXHP | MOVE_BODY | AURA_FIRE | REFLECTING | AURA_ELEC |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | AURA_COLD |
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | RES_NETH | RES_DISE |
-F:DRAGON | GOOD | RES_TELE | DROP_CORPSE | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP |
-F:RES_NEXU | RES_PLAS | CAN_FLY | BASEANGBAND | HAS_LITE | NO_CUT
 F:ATTR_MULTI
-S:1_IN_4 |
-S:S_HI_DRAGON | S_DRAGON | S_KIN | 
-S:BR_ACID | BR_ELEC | BR_FIRE |
-S:BR_COLD | BR_POIS | BR_NETH | BR_LITE | BR_DARK |
-S:BR_CONF | BR_SOUN | BR_CHAO | BR_DISE | BR_NEXU |
-S:BR_TIME | BR_INER | BR_GRAV | BR_SHAR | BR_PLAS |
-S:BR_WALL | BR_MANA | BR_DISI
+F:AURA_COLD
+F:AURA_ELEC
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MOVE_BODY
+F:MOVE_BODY
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:REFLECTING
+F:RES_DISE
+F:RES_NETH
+F:RES_NEXU
+F:RES_PLAS
+F:RES_TELE
+S:1_IN_4
+S:BR_ACID
+S:BR_CHAO
+S:BR_COLD
+S:BR_CONF
+S:BR_DARK
+S:BR_DISE
+S:BR_DISI
+S:BR_ELEC
+S:BR_FIRE
+S:BR_GRAV
+S:BR_INER
+S:BR_LITE
+S:BR_MANA
+S:BR_NETH
+S:BR_NEXU
+S:BR_PLAS
+S:BR_POIS
+S:BR_SHAR
+S:BR_SOUN
+S:BR_TIME
+S:BR_WALL
+S:S_DRAGON
+S:S_HI_DRAGON
+S:S_KIN
 D:The mightiest of all dragonkind, a great wyrm of power is seldom 
 D:encountered in our world. It can crush stars with its might. 
 
-N:848:Shub-Niggurath, Black Goat of the Woods
-G:U:D
-I:130:65d99:100:100:20
-W:91:3:0:47500
-E:0:0:0:0:0:0
-O:0:0:100:0
-B:CRUSH:LOSE_WIS:20d5
-B:CRUSH:LOSE_INT:20d5
-B:BITE:LOSE_STR:10d2
-B:BITE:LOSE_CON:10d2
-F:UNIQUE | CAN_SPEAK | FEMALE | ELDRITCH_HORROR | AURA_ELEC | RES_TELE | 
-F:ATTR_MULTI | FORCE_SLEEP | FORCE_MAXHP | PASS_WALL | ATTR_ANY | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | DROP_90 | NONLIVING | CAN_FLY |
-F:SMART | OPEN_DOOR | BASH_DOOR | REGENERATE | DEMON | AURA_COLD | 
-F:EVIL | IM_ACID | IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | CTHANGBAND
-S:1_IN_3 |
-S:BO_MANA | BRAIN_SMASH | BA_DARK | S_MONSTERS |
-S:CAUSE_4 | HEAL | BR_CHAO | BR_CONF | BR_POIS | BR_NUKE |
-S:BA_CHAO | S_HI_DEMON | S_HI_UNDEAD | S_UNIQUE | ANIM_DEAD
-D:This horrendous outer god looks like a writhing cloudy mass filled 
-D:with mouths and tentacles. 
-
-N:849:Nodens, Lord of the Great Abyss
-G:P:W
-I:130:75d99:100:100:20
-W:81:3:0:48000
-E:1:1:1:2:1:1
-O:0:50:50:0
-B:HIT:HURT:2d66
-B:HIT:HURT:2d66
-B:HIT:HURT:2d66
-B:HIT:HURT:2d66
-F:UNIQUE | CAN_SPEAK | MALE |
-F:FORCE_SLEEP | FORCE_MAXHP | PASS_WALL |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | DROP_90 | DROP_GREAT |
-F:SMART | OPEN_DOOR | BASH_DOOR | REGENERATE | CAN_FLY |
-F:GOOD | IM_ACID | IM_COLD | IM_POIS | IM_FIRE | IM_ELEC |
-F:RES_NEXU | RES_NETH | RES_WATE | ZANGBAND | HAS_LITE
-S:1_IN_1 |
-S:TELE_AWAY | TELE_TO | TELE_LEVEL | TPORT |
-S:BO_MANA | BA_MANA | S_MONSTERS | HEAL |
-S:CAUSE_4 | HASTE | HAND_DOOM | 
-S:S_ANGEL | S_UNIQUE
-D:The hoary Lord of the Great Abyss seems a wizened man, 
-D:but appearances can be deceiving. 
-
 N:850:Carcharoth, the Jaws of Thirst
 G:C:D
 I:130:90d100:80:110:10
@@ -14855,74 +19388,34 @@ B:CLAW:POISON:9d12
 B:CLAW:POISON:9d12
 B:BITE:FIRE:9d12
 B:BITE:FIRE:9d12
-F:UNIQUE | MALE | CAN_SPEAK | DROP_CORPSE
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | AURA_FIRE |
-F:SMART | OPEN_DOOR | BASH_DOOR | MOVE_BODY | 
-F:ANIMAL | EVIL | IM_FIRE | IM_POIS | BASEANGBAND
-S:1_IN_3 | 
-S:BR_DARK | BR_POIS | BR_FIRE | BR_NETH | S_HOUND
+F:ANIMAL
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:UNIQUE
+S:1_IN_3
+S:BR_DARK
+S:BR_FIRE
+S:BR_NETH
+S:BR_POIS
+S:S_HOUND
 D:The first guard of Angband, Carcharoth, also known as 'The Red Maw', is 
 D:the largest wolf to ever walk the earth. He is highly intelligent and a 
 D:deadly opponent in combat. 
 
-N:851:Nyarlathotep, the Crawling Chaos
-G:U:r
-I:130:90d99:100:100:20
-W:93:3:0:49000
-E:0:0:0:0:0:0
-O:0:50:50:0
-B:CRUSH:LOSE_CON:30d4
-B:CRUSH:LOSE_STR:30d4
-B:GAZE:LOSE_INT:1d50
-B:GAZE:LOSE_WIS:1d50
-F:UNIQUE | CAN_SPEAK | ELDRITCH_HORROR | RES_TELE | NONLIVING |
-F:FORCE_SLEEP | FORCE_MAXHP | PASS_WALL | DEMON | RES_NEXU |
-F:SHAPECHANGER | ATTR_MULTI | ATTR_ANY | MALE | AURA_ELEC |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | DROP_GREAT | DROP_90 |
-F:SMART | OPEN_DOOR | BASH_DOOR | REGENERATE | AURA_COLD |
-F:EVIL | IM_ACID | IM_POIS | IM_FIRE | NO_CONF | NO_SLEEP | CTHANGBAND
-S:1_IN_3 |
-S:TELE_AWAY | TELE_TO | TELE_LEVEL | TPORT | BR_NEXU | BA_CHAO |
-S:BA_MANA | BA_FIRE | S_MONSTERS | BRAIN_SMASH | MIND_BLAST |
-S:CAUSE_4 | HASTE | S_HI_UNDEAD | S_HI_DRAGON | ANIM_DEAD | 
-S:S_ANGEL | HEAL | S_SPIDER | S_HOUND | S_HI_DEMON | HAND_DOOM
-D:Nyarlathothep is the messenger, the heart and the soul of the outer gods. 
-D:He is a shapechanger capable of assuming thousands of nightmarish forms. 
-D:One of them looks like this: "A tall, slim figure with the young face of 
-D:an antique pharaoh, gay with prismatic robes and crowned with a 
-D:pshent that glowed with inherent light... the fascination of a 
-D:dark god or fallen archangel, and around whose eyes there lurked 
-D:the languid sparkle of capricious humor." 
-
-N:852:Azathoth, the Daemon Sultan
-G:E:B
-I:130:99d99:100:150:100
-W:93:3:0:50000
-E:0:0:0:0:0:0
-O:0:50:0:50
-B:CRUSH:HURT:35d5
-B:CRAWL:ACID:35d5
-B:CRUSH:HURT:35d5
-B:CRAWL:ACID:35d5
-F:UNIQUE | ELDRITCH_HORROR | RES_TELE
-F:FORCE_SLEEP | FORCE_MAXHP | KILL_WALL | DEMON | AURA_FIRE | AURA_ELEC |
-F:ATTR_MULTI | ESCORTS | ESCORT | POWERFUL | ATTR_ANY | NONLIVING |
-F:KILL_ITEM | KILL_WALL | CAN_SWIM | AURA_COLD
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | DROP_90 | RES_DISE |
-F:STUPID | OPEN_DOOR | BASH_DOOR | REGENERATE | EMPTY_MIND |
-F:EVIL | IM_ACID | IM_POIS | IM_FIRE | NO_CONF | NO_SLEEP | NO_STUN | CTHANGBAND
-F:HAS_LITE | NO_CUT
-S:1_IN_5 |
-S:S_DEMON | BR_CHAO | BR_DISE | BR_MANA | BA_WATE | BR_DISI
-D:"That last amorphous blight of nethermost confusion which 
-D:blasphemes and bubbles at the centre of all infinity -- 
-D:the boundless daemon sultan Azathoth, whose name no lips 
-D:dare speak aloud, and who gnaws hungrily in inconceivable, 
-D:unlighted chambers beyond time amidst the muffled, maddening 
-D:beating of vile drums and the thin monotonous whine of 
-D:accursed flutes." 
-
 N:853:Huan, Wolfhound of the Valar
 G:C:W
 I:130:90d100:50:160:10
@@ -14933,117 +19426,85 @@ B:CLAW:COLD:9d12
 B:CLAW:COLD:9d12
 B:BITE:COLD:9d12
 B:BITE:COLD:9d12
-F:UNIQUE | MALE | CAN_SPEAK | DROP_CORPSE
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | AURA_COLD | 
-F:SMART | OPEN_DOOR | BASH_DOOR | KILL_BODY | 
-F:ANIMAL | GOOD |
-F:IM_COLD | IM_ACID | IM_ELEC | BASEANGBAND
-S:1_IN_5 | 
-S:BR_COLD | BR_SHAR | BR_SOUN | BR_LITE | 
+F:ANIMAL
+F:AURA_COLD
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:KILL_BODY
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:UNIQUE
+S:1_IN_5
+S:BR_COLD
+S:BR_LITE
+S:BR_SHAR
+S:BR_SOUN
 D:The wolfhound of the Valar, Huan has served many masters in his time, from 
 D:Celegorm son of Feanor to Beren son of Barahir: but now he runs wild and 
 D:acknowledges no master save himself, as he hunts alone for his nemesis - 
 D:Carcharoth, the terrible wolf of Angband. 
 
-N:854:Jormungand the Midgard Serpent
-G:J:v
-I:130:120d120:100:200:0
-W:94:1:3000:45000
-E:0:1:0:2:1:0
-O:0:0:0:0
-B:CRUSH:HURT:20d10
-B:CRUSH:HURT:20d10
-B:BITE:HURT:5d50
-F:UNIQUE | FORCE_MAXHP | FORCE_SLEEP | WILD_TOO | WILD_OCEAN | WILD_SWAMP | 
-F:MOVE_BODY | KILL_WALL | IM_FIRE | IM_POIS | IM_ACID | IM_COLD | COLD_BLOOD | 
-F:RES_WATE | RES_PLAS | RES_NEXU | NO_STUN | REGENERATE | DROP_CORPSE | 
-F:NO_CONF | NO_SLEEP | ZANGBAND
-S:1_IN_3
-S:BA_WATE | BR_MANA | BR_NETH | BR_POIS | BR_DISI | S_KIN
-D:The Midgard Serpent is so huge that its body surrounds the world of 
-D:mortal men. It could grind even the gods into lifeless pulp. 
-
-N:855:The Destroyer
-G:g:v
-I:130:140d140:100:200:0
-W:94:1:0:45000
-E:1:1:1:2:1:1
-O:0:0:0:0
-B:HIT:HURT:30d9
-B:HIT:HURT:30d9
-B:HIT:HURT:30d9
-B:HIT:HURT:30d9
-F:UNIQUE | NONLIVING | NO_FEAR | FORCE_MAXHP | FORCE_SLEEP | REFLECTING |
-F:MOVE_BODY | KILL_WALL | IM_FIRE | IM_ELEC | IM_POIS | IM_ACID | IM_COLD |
-F:RES_NETH | RES_WATE | RES_PLAS | RES_NEXU | NO_STUN | REGENERATE |
-F:NO_CONF | NO_SLEEP | NO_STUN | CAN_FLY |
-F:EMPTY_MIND | COLD_BLOOD | BASH_DOOR | ZANGBAND | NO_CUT
-S:1_IN_3 |
-S:BR_DISI | BO_MANA
-D:The Destroyer was built by the Norse deities to be their ultimate weapon 
-D:against the space gods who had arrived to judge the world. Unfortunately, 
-D:the Destroyer has gone berserk and is destroying everything it sees. The 
-D:mystical Destroyer is nearly indestructible, and it is said that when it 
-D:uses its power of complete disintegration, the day of Ragnarok is near. 
-
 N:856:Gothmog, the High Captain of Balrogs
 G:U:v
 I:130:120d100:100:140:0
 W:95:1:17000:43000
 E:1:1:1:2:1:1
 O:0:100:0:0
+A:123:50
 B:HIT:FIRE:9d12
 B:HIT:FIRE:9d12
 B:CRUSH:HURT:8d12
 B:TOUCH:UN_POWER
-F:UNIQUE | MALE | CAN_SPEAK | CAN_FLY |
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ESCORT | ESCORTS | KILL_WALL | AURA_FIRE | NONLIVING |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DEMON | 
-F:IM_FIRE | IM_ELEC | BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:BLIND | CONF | SCARE | 
-S:BR_FIRE | S_KIN |
-S:S_HI_DEMON | S_HI_UNDEAD
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:DEMON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_GOOD
+F:DROP_GREAT
+F:ESCORT
+F:ESCORTS
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ELEC
+F:IM_FIRE
+F:KILL_WALL
+F:MALE
+F:MOVE_BODY
+F:NONLIVING
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:UNIQUE
+S:1_IN_3
+S:BLIND
+S:BR_FIRE
+S:CONF
+S:SCARE
+S:S_HI_DEMON
+S:S_HI_UNDEAD
+S:S_KIN
 D:Gothmog is the Chief Balrog in Morgoth's personal guard. He is renowned 
 D:for slaying three High Kings of the Noldor Elves, and he has never been 
 D:defeated in combat. With his whip of flame and awesome fiery breath he 
 D:saved his master from Ungoliant's rage. 
 
-N:857:Great Cthulhu
-G:U:g
-I:130:100d100:100:140:100
-W:97:2:4000:62500
-E:0:0:0:0:0:0
-O:0:50:50:0
-B:CRUSH:HURT:50d4
-B:CLAW:UN_POWER:15d2
-B:CLAW:UN_BONUS:15d2
-B:TOUCH:DISEASE:100d1
-F:UNIQUE | CAN_SPEAK | DEMON | ELDRITCH_HORROR | NONLIVING |
-F:FORCE_SLEEP | FORCE_MAXHP | ESCORT | ESCORTS | SMART | RES_PLAS | RES_NEXU |
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | REGENERATE | RES_NETH |
-F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | DROP_1D2 | DROP_GOOD |
-F:DROP_GREAT | RES_DISE | RES_TELE | CAN_SWIM |
-F:EVIL | DEMON | IM_FIRE | IM_POIS | IM_ELEC | IM_ACID | NO_CONF | NO_SLEEP |
-F:CTHANGBAND
-S:1_IN_3
-S:TPORT | SCARE | BLIND | MIND_BLAST | BRAIN_SMASH | DRAIN_MANA |
-S:BR_POIS | BR_ACID | BR_FIRE | CONF | DARKNESS | FORGET | S_HI_UNDEAD |
-S:BR_NUKE | BR_NETH | BR_CHAO | BR_DISE | BR_DARK | BR_PLAS | BR_CONF
-S:BR_NEXU | S_HI_DEMON | BR_DISI | HAND_DOOM | 
-S:ANIM_DEAD
-D:This creature is death incarnate. "A monster of vaguely anthropoid 
-D:outline, but with an octopus-like head whose face was a mass of 
-D:feelers, a scaly, rubbery-looking body, prodigious claws on hind 
-D:fore feet, and long, narrow wings behind. This thing... was a 
-D:somewhat bloated corpulence... It lumbered slobberingly into sight 
-D:and gropingly squeezed its gelatinous green immensity through the 
-D:black doorway... A mountain shambled or walked." 
-
 N:858:Sarko, rider of gold Foronth
 G:B:y
 I:145:99d111:100:165:0
@@ -15054,42 +19515,51 @@ B:HIT:HURT:12d12
 B:HIT:HURT:12d12
 B:HIT:FIRE:12d12
 B:HIT:FIRE:12d12
-F:UNIQUE | FEMALE | DROP_CORPSE | 
-F:ATTR_MULTI | THUNDERLORD | RES_TELE | PET | CAN_SPEAK |
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | GOOD |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT |
-F:DROP_CHOSEN | REFLECTING | AURA_FIRE | AURA_ELEC | 
-F:SMART | OPEN_DOOR | BASH_DOOR | MOVE_BODY | REGENERATE | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | POWERFUL |
-F:MORTAL | HAS_LITE
-S:1_IN_4 | 
-S:TPORT | TELE_TO | BR_FIRE | BR_TIME | S_THUNDERLORD | TELE_AWAY |
+F:ATTR_MULTI
+F:AURA_ELEC
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CHOSEN
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:FEMALE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:MOVE_BODY
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:PET
+F:POWERFUL
+F:REFLECTING
+F:REGENERATE
+F:RES_TELE
+F:SMART
+F:THUNDERLORD
+F:UNIQUE
+S:1_IN_4
+S:BR_FIRE
+S:BR_TIME
+S:S_THUNDERLORD
+S:TELE_AWAY
+S:TELE_TO
+S:TPORT
 D:Foronth is the first Eagle queen, and Sarko the first to discover 
 D:the Firebirds, the ancestor of the Thunderlord eagles. She will try to 
 D:help you! 
 
-N:859:The Unicorn of Order
-G:q:w
-I:130:66d100:30:170:150
-W:75:2:0:65000
-E:0:1:0:2:1:0
-O:25:50:25:0
-B:KICK:UN_POWER:13d13
-B:KICK:UN_POWER:12d12
-B:BUTT:UN_BONUS:11d11
-B:BITE:TIME:10d10
-F:UNIQUE | FORCE_SLEEP | FORCE_MAXHP | REFLECTING | AURA_COLD | 
-F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT | 
-F:SMART | KILL_BODY | POWERFUL | BASH_DOOR | REGENERATE | CAN_FLY |
-F:ANIMAL | GOOD | IM_ACID | IM_COLD | IM_ELEC | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | NO_STUN | RES_TELE | ZANGBAND
-S:1_IN_3 | 
-S:BR_SOUN | BR_LITE | BR_TIME | BR_SHAR | BR_MANA | 
-S:S_MONSTERS | HEAL | S_ANGEL
-D:The Unicorn of Order, who once stole an eye from the great Serpent 
-D:of Chaos, regards you as a mortal meddling in the affairs of immortals, 
-D:and thus is attempting to eliminate you. 
-
 N:860:Sauron, the Sorcerer
 G:p:v
 I:130:100d225:100:160:0
@@ -15100,18 +19570,59 @@ B:HIT:UN_BONUS:10d12
 B:HIT:UN_BONUS:10d12
 B:HIT:UN_POWER:8d12
 B:HIT:UN_POWER:8d12
-F:UNIQUE | MALE | CAN_SPEAK | REFLECTING |
-F:FORCE_SLEEP | FORCE_MAXHP | FORCE_DEPTH |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT |
-F:SMART | OPEN_DOOR | BASH_DOOR | MOVE_BODY | REGENERATE | NO_SLEEP | NO_FEAR | NO_CONF |
-F:EVIL | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:RES_TELE | BASEANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:TPORT | TELE_LEVEL | BLIND | CONF | SCARE | CAUSE_4 | 
-S:BRAIN_SMASH | FORGET | BO_ICEE | BO_MANA | BO_PLAS | 
-S:BA_MANA | BA_FIRE | BA_WATE | BA_NETH | BA_DARK | BA_CHAO | 
-S:S_MONSTERS | S_HI_DEMON | S_HI_UNDEAD | S_HI_DRAGON | S_WRAITH | S_UNIQUE | 
-S:HAND_DOOM | ANIM_DEAD
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_DEPTH
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REFLECTING
+F:REGENERATE
+F:RES_TELE
+F:SMART
+F:UNIQUE
+S:1_IN_2
+S:BA_CHAO
+S:BA_DARK
+S:BA_FIRE
+S:BA_MANA
+S:BA_NETH
+S:BA_WATE
+S:BLIND
+S:BO_ICEE
+S:BO_MANA
+S:BO_PLAS
+S:BRAIN_SMASH
+S:CAUSE_4
+S:CONF
+S:FORGET
+S:HAND_DOOM
+S:SCARE
+S:S_HI_DEMON
+S:S_HI_DRAGON
+S:S_HI_UNDEAD
+S:S_MONSTERS
+S:S_UNIQUE
+S:S_WRAITH
+S:TELE_LEVEL
+S:TPORT
 D:Mighty in spells and enchantments, he created the One Ring. 
 D:His eyes glow with power and with his gaze he seeks to destroy 
 D:your soul. He has many servants, and rarely fights without them. 
@@ -15126,21 +19637,73 @@ B:GAZE:EAT_GOLD:20d10
 B:HIT:SHATTER:20d10
 B:BITE:LOSE_ALL:10d12
 B:TOUCH:UN_POWER
-F:UNIQUE | CAN_SPEAK | ATTR_MULTI | ATTR_ANY | MALE |
-F:FORCE_MAXHP | WEIRD_MIND | DROP_CORPSE | DROP_SKELETON |
-F:REFLECTING | AURA_FIRE | AURA_ELEC | AURA_COLD |
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_3D2 | DROP_4D2 | 
-F:DROP_GOOD | DROP_GREAT | RES_NETH | INVISIBLE | 
-F:SMART | KILL_WALL | KILL_BODY | POWERFUL | RES_TELE | 
-F:REGENERATE | CAN_FLY | CAN_SWIM | DG_CURSE | WYRM_PROTECT | 
-F:EVIL | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF |NO_FEAR | NO_STUN | RES_TELE
-F:MORTAL | JOKEANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:S_THUNDERLORD | BR_CHAO | BA_CHAO | ROCKET | BRAIN_SMASH | S_HI_DEMON | 
-S:BR_NETH | HASTE | BR_MANA | S_HI_UNDEAD | S_HI_DRAGON | TRAPS | FORGET | 
-S:BR_NUKE | BR_POIS | BR_DISI | HAND_DOOM | HEAL | TPORT | TELE_TO |
-S:S_BUG | S_RNG |
+F:ATTR_ANY
+F:ATTR_MULTI
+F:AURA_COLD
+F:AURA_ELEC
+F:AURA_FIRE
+F:CAN_FLY
+F:CAN_SPEAK
+F:CAN_SWIM
+F:DG_CURSE
+F:DROP_1D2
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:JOKEANGBAND
+F:KILL_BODY
+F:KILL_WALL
+F:MALE
+F:MORTAL
+F:NO_CONF
+F:NO_FEAR
+F:NO_STUN
+F:ONLY_ITEM
+F:POWERFUL
+F:REFLECTING
+F:REGENERATE
+F:RES_NETH
+F:RES_TELE
+F:RES_TELE
+F:SMART
+F:UNIQUE
+F:WEIRD_MIND
+F:WYRM_PROTECT
+S:1_IN_2
+S:BA_CHAO
+S:BRAIN_SMASH
+S:BR_CHAO
+S:BR_DISI
+S:BR_MANA
+S:BR_NETH
+S:BR_NUKE
+S:BR_POIS
+S:FORGET
+S:HAND_DOOM
+S:HASTE
+S:HEAL
+S:ROCKET
+S:S_BUG
+S:S_HI_DEMON
+S:S_HI_DRAGON
+S:S_HI_UNDEAD
+S:S_RNG
+S:S_THUNDERLORD
+S:TELE_TO
+S:TPORT
 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 
@@ -15158,19 +19721,56 @@ B:HIT:SHATTER:24d10
 B:HIT:SHATTER:24d10
 B:HIT:LOSE_ALL:10d12
 B:TOUCH:UN_POWER
-F:UNIQUE | CAN_SPEAK | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | FORCE_DEPTH | 
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_3D2 | DROP_4D2 | 
-F:DROP_GOOD | DROP_GREAT | DROP_CHOSEN | RES_NETH |
-F:SMART | KILL_WALL | MOVE_BODY | AURA_COLD |
-F:REGENERATE | POWERFUL |
-F:EVIL | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_STUN | NO_SLEEP | NO_FEAR | RES_TELE | BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:BRAIN_SMASH | 
-S:BA_MANA | BO_MANA | BA_NETH | BA_CHAO | BA_DARK | ANIM_DEAD | 
-S:S_MONSTERS | S_UNIQUE | S_HI_DEMON | S_HI_UNDEAD | S_HI_DRAGON | 
-S:ROCKET | BR_NETH | BR_DISI | HAND_DOOM | S_WRAITH
+F:AURA_COLD
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CHOSEN
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_DEPTH
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_WALL
+F:MALE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:POWERFUL
+F:REGENERATE
+F:RES_NETH
+F:RES_TELE
+F:SMART
+F:UNIQUE
+S:1_IN_3
+S:BA_CHAO
+S:BA_DARK
+S:BA_MANA
+S:BA_NETH
+S:BO_MANA
+S:BRAIN_SMASH
+S:BR_DISI
+S:BR_NETH
+S:HAND_DOOM
+S:ROCKET
+S:S_HI_DEMON
+S:S_HI_DRAGON
+S:S_HI_UNDEAD
+S:S_MONSTERS
+S:S_UNIQUE
+S:S_WRAITH
 D:He was the most powerful of the Valar, the equal of Manwe. 
 D:He is the Master of the Pits of Angband. His figure is like a black 
 D:mountain crowned with Lightning. He rages with everlasting anger, his 
@@ -15191,12 +19791,17 @@ W:0:20:1700:0
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:5d8
-F:MALE |
-F:PET | FRIENDS | WILD_ONLY |
-F:ONLY_GOLD | DROP_1D2 |
-F:OPEN_DOOR | BASH_DOOR
-F:DROP_CORPSE |
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:FRIENDS
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:PET
+F:WILD_ONLY
 D:They are used as the main assault force of the human kings. 
 D:They will help you in some quests. 
 
@@ -15207,14 +19812,22 @@ W:0:20:1400:0
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:2d8
-F:MALE |
-F:PET | FRIENDS | WILD_ONLY |
-F:ONLY_GOLD | DROP_1D2 |
-F:OPEN_DOOR | BASH_DOOR
-F:DROP_CORPSE |
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_1 |
-S:ARROW_2 | ARROW_1 | ARROW_2 | ARROW_1 |
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:FRIENDS
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:PET
+F:WILD_ONLY
+S:1_IN_1
+S:ARROW_1
+S:ARROW_1
+S:ARROW_2
+S:ARROW_2
 D:They are used as the main assault force of the elven kings. 
 D:They will help you in some quests. 
 
@@ -15225,12 +19838,17 @@ W:0:20:1500:0
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:6d8
-F:MALE |
-F:PET | FRIENDS | WILD_ONLY |
-F:ONLY_GOLD | DROP_1D2 |
-F:OPEN_DOOR | BASH_DOOR
-F:DROP_CORPSE |
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:FRIENDS
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:PET
+F:WILD_ONLY
 D:They are used as the main assault force of the dwarven kings. 
 D:They will help you in some quests. 
 
@@ -15242,12 +19860,20 @@ E:1:1:1:2:1:1
 O:10:90:0:0
 B:HIT:HURT:8d5
 B:HIT:HURT:8d5
-F:MALE | 
-F:FORCE_MAXHP | FRIENDS | DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | ORC | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_8 |
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FRIENDS
+F:HAS_LITE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:ORC
+S:1_IN_8
 S:ARROW_2
 D:It is a cunning orc of power, taller than a man, and stronger. It fears 
 D:little. 
@@ -15262,13 +19888,33 @@ B:GAZE:CONFUSE:15d5
 B:GAZE:PARALYZE:15d5
 B:TOUCH:INSANITY:5d5
 B:TOUCH:EXP_40:5d5
-F:FEMALE | UNIQUE | FORCE_MAXHP |
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_GOOD | DROP_GREAT |
-F:CAN_SPEAK | WEIRD_MIND | DROP_SKELETON | DROP_CORPSE |
-F:EVIL | NO_CONF | NO_SLEEP | JOKEANGBAND | HAS_LITE
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:DROP_SKELETON
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:HAS_LITE
+F:JOKEANGBAND
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:UNIQUE
+F:WEIRD_MIND
 S:1_IN_3
-S:BR_CONF | BR_SOUN | BR_CHAO | BR_TIME |
-S:HOLD | SCARE | SLOW | CONF | FORGET
+S:BR_CHAO
+S:BR_CONF
+S:BR_SOUN
+S:BR_TIME
+S:CONF
+S:FORGET
+S:HOLD
+S:SCARE
+S:SLOW
 D:She is a feared teacher, mistress of chaos and strangely minded. 
 D:She wants to take your mind. Fear her and flee while you can.
 
@@ -15281,12 +19927,24 @@ O:20:20:20:20
 B:INSULT:*
 B:HIT:INSANITY:1d8
 B:HIT:LOSE_WIS:1d8
-F:ONLY_ITEM | DROP_2D2 | UNIQUE | CAN_FLY |
-F:DROP_GOOD | WEIRD_MIND | CAN_SPEAK |
-F:RAND_50 | RAND_25 | INVISIBLE | EVIL |
-F:MORTAL | JOKEANGBAND | HAS_LITE
+F:CAN_FLY
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_GOOD
+F:EVIL
+F:HAS_LITE
+F:INVISIBLE
+F:JOKEANGBAND
+F:MORTAL
+F:ONLY_ITEM
+F:RAND_25
+F:RAND_50
+F:UNIQUE
+F:WEIRD_MIND
 S:1_IN_2
-S:S_BUG | S_RNG | BR_CONF
+S:BR_CONF
+S:S_BUG
+S:S_RNG
 D:A deranged programmer, scattering bizarre ideas and bad code everywhere. 
 
 N:869:Random Number Generator
@@ -15298,8 +19956,12 @@ O:20:20:20:20
 B:INSULT:*
 B:MOAN:*
 B:HIT:CONFUSE:1d6
-F:DROP_1D2 | EVIL |
-F:EMPTY_MIND | RAND_50 | RAND_25 | JOKEANGBAND
+F:DROP_1D2
+F:EMPTY_MIND
+F:EVIL
+F:JOKEANGBAND
+F:RAND_25
+F:RAND_50
 S:MULTIPLY
 D:A feared creation of the Variant Maintainer, it tries to generate Morgoth 
 D:in the town and the One Ring in the magic shop. 
@@ -15311,10 +19973,19 @@ W:50:10:0:100
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:POISON:10d5
-F:NEVER_MOVE | IM_POIS | NONLIVING | IM_ACID | STUPID |
-F:FORCE_MAXHP | UNDEAD | EVIL | JOKEANGBAND | NO_CUT
+F:EVIL
+F:FORCE_MAXHP
+F:IM_ACID
+F:IM_POIS
+F:JOKEANGBAND
+F:NEVER_MOVE
+F:NONLIVING
+F:NO_CUT
+F:STUPID
+F:UNDEAD
 S:1_IN_4
-S:ROCKET | ARROW_4
+S:ARROW_4
+S:ROCKET
 D:It was left here to be used against intruders. 
 
 N:871:Bouncing mine
@@ -15324,10 +19995,23 @@ W:70:10:0:200
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:POISON:10d5
-F:NEVER_MOVE | IM_POIS | NONLIVING | IM_ACID | STUPID |
-F:FORCE_MAXHP | UNDEAD | EVIL | JOKEANGBAND | NO_CUT
+F:EVIL
+F:FORCE_MAXHP
+F:IM_ACID
+F:IM_POIS
+F:JOKEANGBAND
+F:NEVER_MOVE
+F:NONLIVING
+F:NO_CUT
+F:STUPID
+F:UNDEAD
 S:1_IN_3
-S:ROCKET | ARROW_4 | BLINK | BR_POIS | BR_CHAO | BR_NEXU
+S:ARROW_4
+S:BLINK
+S:BR_CHAO
+S:BR_NEXU
+S:BR_POIS
+S:ROCKET
 D:It was left here to be used against intruders. 
 
 N:872:Durin's Bane
@@ -15336,21 +20020,43 @@ I:130:30d100:20:100:80
 W:50:3:13000:30000
 E:1:1:1:2:1:1
 O:0:50:50:0
+A:71:60
 B:HIT:FIRE:6d12
 B:HIT:FIRE:6d12
 B:CRUSH:HURT:5d12
 B:TOUCH:UN_POWER
-F:UNIQUE | MALE | SPECIAL_GENE | DROP_RANDART
-F:FORCE_SLEEP | FORCE_MAXHP | KILL_WALL | 
-F:ESCORT | ESCORTS | DROP_CORPSE | NONLIVING | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_CHOSEN | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DEMON | IM_FIRE | 
-F:NO_CONF | BASEANGBAND | HAS_LITE
-S:1_IN_4 | 
-S:CONF | SCARE | 
-S:BR_FIRE | 
-S:S_UNDEAD | S_DEMON
+F:BASH_DOOR
+F:DEMON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CHOSEN
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_RANDART
+F:ESCORT
+F:ESCORTS
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:KILL_WALL
+F:MALE
+F:MOVE_BODY
+F:NONLIVING
+F:NO_CONF
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:SPECIAL_GENE
+F:UNIQUE
+S:1_IN_4
+S:BR_FIRE
+S:CONF
+S:SCARE
+S:S_DEMON
+S:S_UNDEAD
 D:A huge Balrog surrounded by raging pillars of fire, this is indeed a 
 D:terrible opponent. Wielding a great whip of fire and a blazing sword, his 
 D:fury blisters your skin and melts your flesh! 
@@ -15365,14 +20071,34 @@ B:CRAWL:POISON:3d4
 B:CRAWL:EAT_FOOD:3d4
 B:TOUCH:ACID:3d5
 B:HIT:HURT:3d5
-F:UNIQUE | FEMALE | 
-F:FORCE_MAXHP | CAN_SPEAK | SMART | ESCORT | ESCORTS | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | DROP_CORPSE |
-F:WEIRD_MIND | TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | IM_ACID | IM_ELEC | IM_FIRE | IM_COLD | IM_POIS | 
-F:MORTAL | BASEANGBAND
-S:1_IN_5 | 
-S:DRAIN_MANA | BLIND | CONF | SCARE | S_KIN
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:ESCORT
+F:ESCORTS
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:TAKE_ITEM
+F:UNIQUE
+F:WEIRD_MIND
+S:1_IN_5
+S:BLIND
+S:CONF
+S:DRAIN_MANA
+S:SCARE
+S:S_KIN
 D:And you thought her offspring were icky! 
 
 N:874:Rot jelly
@@ -15383,10 +20109,16 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:EAT_FOOD:2d3
 B:TOUCH:LOSE_CHR:2d3
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | CAN_SWIM | 
-F:HURT_LITE | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:EMPTY_MIND
+F:HURT_LITE
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:It is a large pile of rotting flesh, whose touch spoils your food.  The terrible 
 D:smell it exudes is also very hard to get rid of... 
 
@@ -15400,11 +20132,23 @@ B:HIT:HURT:20d5
 B:HIT:HURT:20d5
 B:TOUCH:EXP_80:20d5
 B:TOUCH:EXP_80:20d5
-F:UNIQUE | 
-F:FORCE_MAXHP | DROP_CORPSE |
-F:DROP_GOOD | DROP_GREAT | DROP_60 | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | PASS_WALL | NO_SLEEP | NO_STUN | NO_CONF |
-F:EVIL | UNDEAD | JOKEANGBAND | NO_CUT
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_MAXHP
+F:JOKEANGBAND
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:NO_STUN
+F:OPEN_DOOR
+F:PASS_WALL
+F:UNDEAD
+F:UNIQUE
 D:"And I looked, and behold a pale horse: and his name that sat on him was
 D:Death, and Hell followed with him. And power was given unto them over the
 D:fourth part of the earth, to kill with sword, and with hunger, and with
@@ -15420,11 +20164,24 @@ B:TOUCH:EAT_FOOD:20d4
 B:GAZE:UN_BONUS:20d4
 B:WAIL:LOSE_INT:10d5
 B:WAIL:LOSE_DEX:10d5
-F:UNIQUE | MALE | 
-F:FORCE_MAXHP | DROP_CORPSE |
-F:DROP_GOOD | DROP_GREAT | DROP_60 | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | PASS_WALL | NO_STUN | NO_SLEEP | NO_CONF |
-F:EVIL | UNDEAD | JOKEANGBAND | NO_CUT
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_MAXHP
+F:JOKEANGBAND
+F:MALE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:NO_STUN
+F:OPEN_DOOR
+F:PASS_WALL
+F:UNDEAD
+F:UNIQUE
 D:One of the horsemen of the apocalypse, before you lies Famine. A 
 D:figure so gaunt that the shape of the bones beneath are revealed, 
 D:Famine rides a pale grey mare that appears near death. 
@@ -15439,13 +20196,27 @@ B:TOUCH:POISON:20d4
 B:TOUCH:POISON:20d4
 B:TOUCH:DISEASE:16d5
 B:TOUCH:DISEASE:16d5
-F:UNIQUE | MALE | 
-F:FORCE_MAXHP | DROP_CORPSE |
-F:DROP_GOOD | DROP_GREAT | DROP_60 | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | PASS_WALL | NO_SLEEP | NO_STUN | NO_CONF |
-F:EVIL | UNDEAD | JOKEANGBAND | NO_CUT
-S:1_IN_2 |
-S:S_ANT | S_SPIDER
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_MAXHP
+F:JOKEANGBAND
+F:MALE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:NO_STUN
+F:OPEN_DOOR
+F:PASS_WALL
+F:UNDEAD
+F:UNIQUE
+S:1_IN_2
+S:S_ANT
+S:S_SPIDER
 D:One of the horsemen of the apocalypse, before you lies Pestilence. 
 D:At first, it looks like a human, but then you notice ants, worms, and 
 D:worse peeking out of the flesh. Pestilence rides a purple horse with 
@@ -15461,12 +20232,26 @@ B:TOUCH:PARALYZE:20d4
 B:WAIL:CONFUSE:20d4
 B:GAZE:BLIND:20d4
 B:WAIL:TERRIFY:20d4
-F:UNIQUE | MALE | 
-F:FORCE_MAXHP | DROP_CORPSE |
-F:DROP_GOOD | DROP_GREAT | DROP_60 | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | PASS_WALL | NO_SLEEP | NO_STUN | NO_CONF | NO_FEAR |
-F:EVIL | UNDEAD | JOKEANGBAND | NO_CUT
-S:1_IN_2 |
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_MAXHP
+F:JOKEANGBAND
+F:MALE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:OPEN_DOOR
+F:PASS_WALL
+F:UNDEAD
+F:UNIQUE
+S:1_IN_2
 S:S_MONSTER
 D:One of the horsemen of the apocalypse, before you lies War. A healthy and 
 D:hearty warrior, War grins a little too wide at you as he prepares for 
@@ -15482,8 +20267,12 @@ W:2:1:100:7
 E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:2d3
-F:ANIMAL | AQUATIC  | STUPID | DROP_CORPSE | COLD_BLOOD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:DROP_CORPSE
+F:MORTAL
+F:STUPID
 D:It's a common fresh-water predatory fish. 
 
 N:880:Electric eel
@@ -15495,9 +20284,15 @@ O:0:0:0:0
 B:TOUCH:ELEC:2d7
 B:TOUCH:ELEC:2d7
 B:TOUCH:ELEC:2d7
-F:AQUATIC | ANIMAL | RAND_25 | IM_ELEC | RES_WATE | 
-F:WILD_TOO | WILD_OCEAN | COLD_BLOOD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:IM_ELEC
+F:MORTAL
+F:RAND_25
+F:RES_WATE
+F:WILD_OCEAN
+F:WILD_TOO
 D:This serpentine creature can create a deadly voltage.  Better watch out! 
 
 N:881:Giant crayfish
@@ -15508,25 +20303,15 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:CLAW:HURT:3d4
 B:CLAW:HURT:3d4
-F:ANIMAL | AQUATIC | STUPID | WEIRD_MIND | DROP_CORPSE | COLD_BLOOD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:DROP_CORPSE
+F:MORTAL
+F:STUPID
+F:WEIRD_MIND
 D:A man-sized, heavily armoured fresh-water relative of the lobster. 
 
-N:882:Mermaid
-G:h:G
-I:110:5d8:50:30:0
-W:4:1:1600:20
-E:1:1:1:2:1:0
-O:20:50:10:5
-B:TOUCH:LOSE_WIS
-B:TOUCH:INSANITY:2d3
-B:TOUCH:CONFUSE
-F:FEMALE | RAND_25 | DROP_60 | SMART | AQUATIC | NO_CONF | DROP_CORPSE |
-F:MORTAL | ZANGBAND
-D:A green-skinned humanoid with a fishtail. Beware - there are rumours 
-D:of adventures losing their minds under the fearsome 
-D:charms of mermaids. 
-
 N:883:Box jellyfish
 G:~:B
 I:110:10d10:20:30:75
@@ -15535,8 +20320,12 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:PARALYZE:1d6
 B:TOUCH:PARALYZE:1d6
-F:ANIMAL | AQUATIC | IM_POIS | WILD_TOO | COLD_BLOOD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:IM_POIS
+F:MORTAL
+F:WILD_TOO
 D:A strange water creature, whose touch can be deadly. 
 
 N:884:Giant piranha
@@ -15547,9 +20336,13 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:5d1
 B:BITE:HURT:5d1
-F:NO_SLEEP | WILD_TOO | COLD_BLOOD | 
-F:FRIENDS | AQUATIC | ANIMAL | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:FRIENDS
+F:MORTAL
+F:NO_SLEEP
+F:WILD_TOO
 D:A very large and bloodthirsty fish. 
 
 N:885:Piranha
@@ -15559,8 +20352,12 @@ W:3:1:200:8
 E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d6
-F:FRIENDS | AQUATIC | ANIMAL | WILD_TOO | COLD_BLOOD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:FRIENDS
+F:MORTAL
+F:WILD_TOO
 D:Bloodthirsty fish who can smell your blood from a great distance. 
 
 N:886:Bullywug
@@ -15571,8 +20368,16 @@ E:1:1:1:2:1:1
 O:30:40:10:10
 B:HIT:HURT:2d4
 B:HIT:HURT:2d4
-F:MALE | ONLY_ITEM | DROP_1D2 | SMART  | AQUATIC | DROP_CORPSE | FRIENDS | 
-F:MORTAL | BASEANGBAND | HAS_LITE | COLD_BLOOD 
+F:AQUATIC
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_CORPSE
+F:FRIENDS
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:SMART
 D:A vaguely humanoid creature, it looks like a cross between a hobbit and a 
 D:frog. 
 
@@ -15584,8 +20389,15 @@ E:1:1:1:2:1:1
 O:15:60:10:10
 B:HIT:HURT:2d5
 B:HIT:HURT:2d5
-F:MALE | ONLY_ITEM | DROP_1D2 | SMART  | AQUATIC | DROP_CORPSE |
-F:MORTAL | BASEANGBAND | HAS_LITE | COLD_BLOOD
+F:AQUATIC
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_CORPSE
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:SMART
 D:A member of the frog-people clan. He is wielding a long, sharp shark tooth. 
 
 N:888:Bullywug shaman
@@ -15596,10 +20408,23 @@ E:1:1:1:2:1:1
 O:25:10:50:10
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
-F:MALE | ONLY_ITEM | DROP_1D2 | SMART  | AQUATIC | DROP_CORPSE |
-F:MORTAL | BASEANGBAND | HAS_LITE | COLD_BLOOD
-S:1_IN_5 |
-S:BLIND | CONF | DARKNESS | BO_COLD | HEAL | MISSILE | CAUSE_2
+F:AQUATIC
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_CORPSE
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:SMART
+S:1_IN_5
+S:BLIND
+S:BO_COLD
+S:CAUSE_2
+S:CONF
+S:DARKNESS
+S:HEAL
+S:MISSILE
 D:A leader of a clan of frog-people, he is cloaked in a cloak made of 
 D:shark skin. 
 
@@ -15611,9 +20436,13 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:CRUSH:HURT:1d20
 B:CRUSH:HURT:1d20
-F:RAND_25 | FORCE_MAXHP | RES_WATE | 
-F:ANIMAL | AQUATIC | WILD_TOO |
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:FORCE_MAXHP
+F:MORTAL
+F:RAND_25
+F:RES_WATE
+F:WILD_TOO
 D:Although it looks like a fish and lives in water, it is in fact 
 D:a mammal. And it is huge! 
 
@@ -15625,9 +20454,15 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:BITE:POISON:3d6
 B:BITE:POISON:3d6
-F:AQUATIC | ANIMAL | IM_POIS | FRIENDS | 
-F:CHAR_CLEAR | ATTR_CLEAR | DROP_CORPSE | COLD_BLOOD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:ATTR_CLEAR
+F:CHAR_CLEAR
+F:COLD_BLOOD
+F:DROP_CORPSE
+F:FRIENDS
+F:IM_POIS
+F:MORTAL
 S:MULTIPLY
 D:A relative of crabs and shrimp, this is a tiny creature that inhabits sandy 
 D:bottoms. It has a pair of dangerous-looking claws. 
@@ -15642,8 +20477,14 @@ B:SPIT:BLIND:1d3
 B:CRUSH:HURT:6d3
 B:CRUSH:HURT:6d3
 B:CRUSH:HURT:6d3
-F:RAND_25 | IM_COLD | RES_WATE | AQUATIC | ANIMAL | WILD_TOO | COLD_BLOOD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:IM_COLD
+F:MORTAL
+F:RAND_25
+F:RES_WATE
+F:WILD_TOO
 D:It doesn't move very fast, but when it does - watch out! 
 
 N:892:Giant octopus
@@ -15656,11 +20497,23 @@ B:SPIT:BLIND:1d4
 B:CRUSH:HURT:8d4
 B:CRUSH:HURT:8d4
 B:CRUSH:PARALYZE:8d4
-F:AQUATIC | SMART | IM_POIS | ANIMAL | NO_CONF | NO_SLEEP | 
-F:NO_FEAR  | SMART  | WEIRD_MIND | DROP_CORPSE | COLD_BLOOD | 
-F:MORTAL | BASEANGBAND
-S:1_IN_15 |
-S:DARKNESS | SLOW | CONF | SCARE
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:DROP_CORPSE
+F:IM_POIS
+F:MORTAL
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:SMART
+F:SMART
+F:WEIRD_MIND
+S:1_IN_15
+S:CONF
+S:DARKNESS
+S:SCARE
+S:SLOW
 D:A cunning and dangerous undersea opponent. 
 
 N:893:Eye of the deep
@@ -15673,12 +20526,30 @@ B:GAZE:EXP_20:2d6
 B:GAZE:UN_POWER:2d6
 B:GAZE:INSANITY:2d6
 B:BITE:HURT:6d6
-F:EVIL | IM_POIS | NO_CONF | NO_SLEEP | AQUATIC | 
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | RES_TELE | 
-F:SMART | DROP_CORPSE | BASEANGBAND
-S:1_IN_2 |
-S:BLIND | SLOW | CONF | SCARE | DRAIN_MANA | MIND_BLAST | 
-S:FORGET | DARKNESS | BO_WATE | BO_ICEE | BO_MANA | BO_COLD
+F:AQUATIC
+F:CAN_FLY
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_POIS
+F:NO_CONF
+F:NO_SLEEP
+F:RES_TELE
+F:SMART
+S:1_IN_2
+S:BLIND
+S:BO_COLD
+S:BO_ICEE
+S:BO_MANA
+S:BO_WATE
+S:CONF
+S:DARKNESS
+S:DRAIN_MANA
+S:FORGET
+S:MIND_BLAST
+S:SCARE
+S:SLOW
 D:A beholder that inhabits the depths of the sea, sleeping and pondering 
 D:alien thoughts for centuries. Occasionally, it will float to the 
 D:surface to wreck the lives of surface dwellers. 
@@ -15693,12 +20564,27 @@ B:BITE:POISON:5d10
 B:CLAW:PARALYZE
 B:STING:INSANITY:5d10
 B:STING:UN_BONUS
-F:AQUATIC | ANIMAL | WEIRD_MIND | FORCE_MAXHP | HURT_LITE |
-F:EVIL | SMART   | NO_CONF | NO_SLEEP | DROP_CORPSE |
-F:MORTAL | BASEANGBAND
-S:1_IN_5 | 
-S:BA_POIS | BR_DARK | BLIND | BR_POIS | SLOW | CONF | MIND_BLAST |
-S:BRAIN_SMASH | DARKNESS
+F:ANIMAL
+F:AQUATIC
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:HURT_LITE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:SMART
+F:WEIRD_MIND
+S:1_IN_5
+S:BA_POIS
+S:BLIND
+S:BRAIN_SMASH
+S:BR_DARK
+S:BR_POIS
+S:CONF
+S:DARKNESS
+S:MIND_BLAST
+S:SLOW
 D:A gigantic aquatic monster, somewhat resembling a cross between a 
 D:lobster and a spider. It is coated in poisonous slime and noxious 
 D:parasites. This foul creature hides in the silt of the deep ocean floor, 
@@ -15713,10 +20599,22 @@ O:0:0:0:0
 B:TOUCH:BLIND:3d3
 B:TOUCH:POISON:2d4
 B:WAIL:TERRIFY
-F:COLD_BLOOD | EMPTY_MIND | EVIL | AQUATIC | UNDEAD | IM_COLD | INVISIBLE | 
-F:IM_POIS | NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:AQUATIC
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:UNDEAD
 S:1_IN_8
-S:BLIND | HOLD | CONF
+S:BLIND
+S:CONF
+S:HOLD
 D:A ghastly victim of drowning, forever doomed to wander the ocean waters 
 D:looking for revenge. 
 
@@ -15727,8 +20625,12 @@ W:12:1:3000:40
 E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:4d4
-F:RAND_25 | AQUATIC | ANIMAL | STUPID | DROP_CORPSE |
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:DROP_CORPSE
+F:MORTAL
+F:RAND_25
+F:STUPID
 D:A small species of shark, although the teeth are still as deadly. 
 
 N:897:Hammerhead shark
@@ -15740,8 +20642,11 @@ O:0:0:0:0
 B:BITE:HURT:3d4
 B:BUTT:HURT:3d4
 B:BITE:HURT:3d4
-F:ANIMAL | AQUATIC | WILD_TOO | COLD_BLOOD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:MORTAL
+F:WILD_TOO
 D:A hungry shark with a strange head. 
 
 N:898:Great white shark
@@ -15753,8 +20658,11 @@ O:0:0:0:0
 B:BITE:HURT:4d6
 B:BITE:HURT:4d6
 B:BITE:HURT:4d6
-F:FORCE_SLEEP | AQUATIC | COLD_BLOOD | 
-F:ANIMAL MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:FORCE_SLEEP
+F:MORTAL
 D:A very large carnivorous fish. 
 
 N:899:Aquatic golem
@@ -15765,9 +20673,17 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:3d10
 B:HIT:HURT:3d10
-F:COLD_BLOOD | EMPTY_MIND | AQUATIC | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:AQUATIC
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
 D:An ingenious gnomish invention -- a golem designed for underwater 
 D:usage. 
 
@@ -15778,8 +20694,12 @@ W:5:1:1500:35
 E:1:1:1:2:1:1
 O:0:50:0:30
 B:HIT:HURT:1d10
-F:DROP_90 | EVIL | IM_POIS | AQUATIC  | DROP_CORPSE |
-F:MORTAL | BASEANGBAND
+F:AQUATIC
+F:DROP_90
+F:DROP_CORPSE
+F:EVIL
+F:IM_POIS
+F:MORTAL
 D:Yes, your favourite denizen of evil also comes in an aquatic variety. 
 
 N:901:White shark
@@ -15791,8 +20711,11 @@ O:0:0:0:0
 B:BITE:HURT:3d5
 B:BITE:HURT:3d5
 B:BITE:HURT:3d5
-F:ANIMAL | AQUATIC | WILD_TOO | COLD_BLOOD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:MORTAL
+F:WILD_TOO
 D:A fast-moving hunter of the depths. When this creature moves, 
 D:everybody in the water is in danger! 
 
@@ -15806,68 +20729,24 @@ B:HIT:HURT:1d10
 B:HIT:HURT:1d10
 B:HIT:HURT:3d2
 B:HIT:HURT:3d2
-F:MALE | 
-F:FORCE_MAXHP | AQUATIC | REGENERATE | 
-F:FRIENDS | DROP_60 | WILD_TOO | WILD_OCEAN |
-F:OPEN_DOOR | BASH_DOOR | RES_WATE | 
-F:EVIL | TROLL | IM_COLD | IM_POIS | HURT_LITE | BASEANGBAND
+F:AQUATIC
+F:BASH_DOOR
+F:DROP_60
+F:EVIL
+F:FORCE_MAXHP
+F:FRIENDS
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:MALE
+F:OPEN_DOOR
+F:REGENERATE
+F:RES_WATE
+F:TROLL
+F:WILD_OCEAN
+F:WILD_TOO
 D:A troll of the sea, he reeks of brine. 
 
-N:903:Jaws
-G:~:w
-I:130:100d20:200:80:70
-W:40:2:7000:2000
-E:0:0:0:0:1:0
-O:0:0:0:0
-B:BITE:HURT:11d2
-B:BITE:HURT:22d1
-B:BITE:HURT:11d2
-B:BITE:HURT:22d1
-F:FORCE_MAXHP | UNIQUE | MOVE_BODY | 
-F:WILD_OCEAN | WILD_TOO | COLD_BLOOD | 
-F:BASH_DOOR | IM_COLD | IM_ELEC | IM_POIS | ANIMAL | AQUATIC |
-F:NO_CONF | NO_SLEEP | 
-F:MORTAL | ZANGBAND
-D:The biggest white shark who has ever lived, it is hunting for you now! 
-
-N:904:Aquatic elf
-G:h:b
-I:110:14d8:30:30:6
-W:9:1:1400:25
-E:1:1:1:2:1:0
-O:20:20:50:10
-B:HIT:HURT:3d4
-F:MALE | AQUATIC | SMART | DROP_CORPSE |
-F:FRIENDS | DROP_60 | ZANGBAND | HAS_LITE
-D:A sleek form vaguely shaped like a dolphin, except with a humanoid 
-D:head and arms. The facial features are decidedly elven. 
-
-N:905:Aquatic elven warrior
-G:h:b
-I:110:20d8:40:35:5
-W:10:1:1500:35
-E:1:1:1:2:1:0
-O:20:60:10:10
-B:HIT:HURT:4d4
-B:HIT:HURT:4d4
-F:MALE | AQUATIC | FRIENDS | SMART | DROP_60 | DROP_CORPSE | ZANGBAND |
-F:HAS_LITE
-D:An aquatic elf trained in all forms of combat. 
-
-N:906:Aquatic elven shaman
-G:h:b
-I:110:12d8:30:30:6
-W:10:1:1400:35
-E:1:1:1:2:1:0
-O:10:10:70:10
-B:TOUCH:UN_BONUS
-F:MALE | AQUATIC | SMART | DROP_2D2 | DROP_CORPSE | ZANGBAND | 
-F:HAS_LITE
-S:1_IN_12 |
-S:BO_MANA | BO_COLD | S_MONSTERS
-D:A wizened aquatic elf skilled in the magical arts. You can see an 
-D:iridescent film coating the water around him. 
-
 N:907:Stargazer
 G:~:y
 I:100:15d9:10:25:30
@@ -15875,9 +20754,13 @@ W:21:1:800:60
 E:0:0:0:0:1:0
 O:0:0:0:0
 B:GAZE:PARALYZE
-F:AQUATIC | ANIMAL | SMART  | RAND_25 | DROP_CORPSE |
-F:MORTAL | BASEANGBAND
-S:1_IN_10 |
+F:ANIMAL
+F:AQUATIC
+F:DROP_CORPSE
+F:MORTAL
+F:RAND_25
+F:SMART
+S:1_IN_10
 S:S_MONSTER
 D:A giant fish shaped like a flounder. There are two enormous eyes 
 D:occupying half of the creature's body. 
@@ -15890,9 +20773,12 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:GAZE:PARALYZE
 B:GAZE:CONFUSE
-F:AQUATIC | ANIMAL | SMART | DROP_CORPSE |
-F:MORTAL | BASEANGBAND
-S:1_IN_10 |
+F:ANIMAL
+F:AQUATIC
+F:DROP_CORPSE
+F:MORTAL
+F:SMART
+S:1_IN_10
 S:S_MONSTERS
 D:A stargazer a bit larger than average, covered with barnacles. 
 
@@ -15903,8 +20789,13 @@ W:13:1:700:55
 E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:2d6
-F:AQUATIC | ANIMAL | RAND_25 | INVISIBLE | ATTR_CLEAR | DROP_CORPSE |
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:ATTR_CLEAR
+F:DROP_CORPSE
+F:INVISIBLE
+F:MORTAL
+F:RAND_25
 D:A flattened fish which is able to change body colouring for 
 D:camouflage. 
 
@@ -15916,8 +20807,10 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:2d2
 B:BITE:HURT:2d2
-F:ANIMAL | AQUATIC | DROP_CORPSE |
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:DROP_CORPSE
+F:MORTAL
 D:A giant turtle with flippers, adapted for life in the ocean. 
 
 N:911:Baby dragon turtle
@@ -15929,10 +20822,17 @@ O:0:0:0:0
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
 B:BITE:HURT:1d5
-F:FORCE_MAXHP | FORCE_SLEEP | DROP_CORPSE |
-F:ONLY_GOLD | DROP_60 | DROP_1D2 | 
-F:EVIL | DRAGON  | AQUATIC | BASEANGBAND | ATTR_MULTI
-S:1_IN_12 | 
+F:AQUATIC
+F:ATTR_MULTI
+F:DRAGON
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:ONLY_GOLD
+S:1_IN_12
 S:BR_SOUN
 D:A newly-hatched dragon turtle. It still hasn't grown a proper shell. 
 
@@ -15945,12 +20845,17 @@ O:50:50:0:0
 B:CLAW:HURT:2d6
 B:CLAW:HURT:2d6
 B:BITE:HURT:2d8
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE |
-F:DROP_3D2 | 
-F:EVIL | DRAGON  | AQUATIC | BASEANGBAND | ATTR_MULTI
-S:1_IN_11 | 
-S:SCARE | 
+F:AQUATIC
+F:ATTR_MULTI
+F:DRAGON
+F:DROP_3D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+S:1_IN_11
 S:BR_SOUN
+S:SCARE
 D:A dragon-like creature inhabiting lightless reaches of ocean caves. It has 
 D:a long neck with a tiny head, and four massive flippers. It has a soft and 
 D:flexible shell. 
@@ -15964,13 +20869,20 @@ O:50:50:0:0
 B:CLAW:HURT:2d10
 B:CLAW:HURT:2d10
 B:BITE:HURT:4d10
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE |
-F:DROP_4D2 | 
-F:EVIL | DRAGON | NO_CONF | NO_SLEEP | AQUATIC | BASEANGBAND | HAS_LITE
+F:AQUATIC
 F:ATTR_MULTI
-S:1_IN_9 | 
-S:SCARE | 
+F:DRAGON
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:NO_CONF
+F:NO_SLEEP
+S:1_IN_9
 S:BR_SOUN
+S:SCARE
 D:A large dragon turtle, covered with a tough white shell. 
 
 N:914:Ancient dragon turtle
@@ -15982,13 +20894,26 @@ O:50:50:0:0
 B:CLAW:HURT:4d8
 B:CLAW:HURT:4d8
 B:BITE:HURT:7d8
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE |
-F:DROP_1D2 | DROP_4D2 |
-F:SMART | AQUATIC | POWERFUL | MOVE_BODY  |
-F:EVIL | DRAGON | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE | ATTR_MULTI
-S:1_IN_9 | 
-S:BLIND | CONF | SCARE | 
+F:AQUATIC
+F:ATTR_MULTI
+F:DRAGON
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:POWERFUL
+F:SMART
+S:1_IN_9
+S:BLIND
 S:BR_SOUN
+S:CONF
+S:SCARE
 D:A huge dragon turtle. You can see many barnacles covering its body. 
 
 N:915:Fastitocalon
@@ -16001,11 +20926,26 @@ B:BITE:HURT:5d8
 B:BITE:HURT:5d8
 B:CRUSH:POISON:3d10
 B:CRUSH:POISON:3d10
-F:FORCE_SLEEP | FORCE_MAXHP | RES_TELE | AQUATIC | WILD_TOO | WILD_OCEAN |
-F:IM_FIRE | IM_ACID | IM_COLD | IM_POIS |
-F:DRAGON | NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | ATTR_MULTI
-S:1_IN_6 | 
-S:BR_FIRE | BR_ACID | BR_SOUN | BA_WATE
+F:AQUATIC
+F:ATTR_MULTI
+F:DRAGON
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:RES_TELE
+F:WILD_OCEAN
+F:WILD_TOO
+S:1_IN_6
+S:BA_WATE
+S:BR_ACID
+S:BR_FIRE
+S:BR_SOUN
 D:A huge aquatic dragon-turtle, its shell is as large as a small island. 
 
 N:916:Undead stargazer
@@ -16016,9 +20956,15 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:GAZE:PARALYZE
 B:GAZE:EXP_20
-F:AQUATIC | ANIMAL | SMART | INVISIBLE | UNDEAD | BASEANGBAND | NO_CUT
-S:1_IN_10 |
-S:S_UNDEAD | S_MONSTER
+F:ANIMAL
+F:AQUATIC
+F:INVISIBLE
+F:NO_CUT
+F:SMART
+F:UNDEAD
+S:1_IN_10
+S:S_MONSTER
+S:S_UNDEAD
 D:A stargazer brought back from the dead under control of some unholy 
 D:sorceror. 
 
@@ -16030,8 +20976,11 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:7d4
 B:BITE:HURT:7d4
-F:AQUATIC | WILD_TOO | WILD_OCEAN | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:MORTAL
+F:WILD_OCEAN
+F:WILD_TOO
 D:An almost beautiful, deadly beast. 
 
 N:918:Merrow
@@ -16042,10 +20991,21 @@ E:1:1:1:2:1:1
 O:20:70:0:10
 B:HIT:HURT:3d8
 B:HIT:HURT:3d8
-F:FRIENDS | DROP_60 | DROP_CORPSE | AQUATIC | WILD_TOO | WILD_OCEAN | 
-F:OPEN_DOOR | BASH_DOOR | RES_WATE | IM_COLD | IM_POIS | 
-F:EVIL | GIANT | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:AQUATIC
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FRIENDS
+F:GIANT
+F:HAS_LITE
+F:IM_COLD
+F:IM_POIS
+F:MORTAL
+F:OPEN_DOOR
+F:RES_WATE
+F:WILD_OCEAN
+F:WILD_TOO
 D:A great ogre of the sea, it is violent and stupid. 
 
 N:919:Water naga
@@ -16058,41 +21018,24 @@ B:CRUSH:HURT:2d8
 B:CRUSH:HURT:2d8
 B:BITE:POISON:1d8
 B:BITE:POISON:1d8
-F:FEMALE |
-F:AQUATIC | DROP_CORPSE |
-F:ONLY_ITEM | DROP_90 | DROP_2D2 | 
-F:EVIL | NO_CONF | NO_SLEEP | SMART | 
-F:MORTAL | BASEANGBAND
-S:1_IN_7 | 
-S:DARKNESS | CAUSE_3 | BO_ICEE
+F:AQUATIC
+F:DROP_2D2
+F:DROP_90
+F:DROP_CORPSE
+F:EVIL
+F:FEMALE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:SMART
+S:1_IN_7
+S:BO_ICEE
+S:CAUSE_3
+S:DARKNESS
 D:A naga adapted to underwater life. She has a fish-like tail and a pair 
 D:of gills. 
 
-N:920:Devilfish
-G:~:s
-I:105:10d5:10:10:5
-W:12:1:900:60
-E:0:0:0:0:1:0
-O:0:0:0:0
-F:NEVER_BLOW | ATTR_MULTI | AQUATIC | NO_CONF | DROP_CORPSE |
-F:MORTAL | ZANGBAND
-S:1_IN_4 |
-S:BR_CHAO | BR_LITE | BR_SOUN | BR_DISE | BR_TIME
-D:A disgusting fish, it has a large gaping mouth and a small lantern dangling 
-D:from an outgrowth on its head. 
-
-N:921:Undead devilfish
-G:~:D
-I:105:10d5:10:10:5
-W:15:1:0:75
-E:0:0:0:0:1:0
-O:0:0:0:0
-F:NEVER_BLOW | ATTR_MULTI | AQUATIC | INVISIBLE | NO_CONF | UNDEAD |
-F:ZANGBAND | NO_CUT
-S:1_IN_4 |
-S:BR_NETH | BR_DISE | BR_TIME | BR_NEXU | BR_POIS 
-D:A devilfish brought back from the dead. 
-
 N:922:Moby Dick, the White Whale
 G:~:w
 I:120:100d25:200:80:70
@@ -16103,11 +21046,22 @@ B:CRUSH:HURT:10d10
 B:CRUSH:HURT:10d10
 B:CRUSH:HURT:10d10
 B:CRUSH:HURT:10d10
-F:FORCE_MAXHP | UNIQUE | MOVE_BODY | 
-F:WILD_OCEAN | WILD_TOO | COLD_BLOOD | 
-F:BASH_DOOR | IM_COLD | IM_ELEC | IM_POIS | ANIMAL | AQUATIC |
-F:MORTAL | JOKEANGBAND
-S:1_IN_6 | BA_WATE
+F:ANIMAL
+F:AQUATIC
+F:BASH_DOOR
+F:COLD_BLOOD
+F:FORCE_MAXHP
+F:IM_COLD
+F:IM_ELEC
+F:IM_POIS
+F:JOKEANGBAND
+F:MORTAL
+F:MOVE_BODY
+F:UNIQUE
+F:WILD_OCEAN
+F:WILD_TOO
+S:1_IN_6
+S:BA_WATE
 D:The mightiest whale of the seas, he has sunk many ships in his time. With 
 D:a mere flick of his tail he can create a mighty whirlpool, to the ruin 
 D:of all who would travel the ocean. 
@@ -16121,11 +21075,14 @@ O:0:0:0:0
 B:BITE:CONFUSE:2d8
 B:BITE:HURT:2d8
 B:CLAW:POISON:2d8
-F:FRIENDS | DROP_CORPSE |
-F:ANIMAL | AQUATIC |
-F:MORTAL | BASEANGBAND
-S:1_IN_10 | 
-S:BO_ICEE | BO_WATE
+F:ANIMAL
+F:AQUATIC
+F:DROP_CORPSE
+F:FRIENDS
+F:MORTAL
+S:1_IN_10
+S:BO_ICEE
+S:BO_WATE
 D:A dog with a finned tail and large, muscular flippers for hind legs. 
 D:It has a rubbery skin instead of fur. 
 
@@ -16138,13 +21095,23 @@ O:20:60:20:0
 B:HIT:HURT:3d4
 B:GAZE:POISON:8d12
 B:CLAW:INSANITY:8d12
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:FRIENDS | SMART  |
-F:ONLY_ITEM | DROP_60 | 
-F:AQUATIC | POWERFUL | 
-F:EVIL | DEMON | IM_ACID | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
-S:1_IN_8 | 
-S:BO_ICEE | BA_WATE
+F:AQUATIC
+F:DEMON
+F:DROP_60
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:FRIENDS
+F:HAS_LITE
+F:IM_ACID
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:POWERFUL
+F:SMART
+S:1_IN_8
+S:BA_WATE
+S:BO_ICEE
 D:A hideous scaled demon, it is a sleek form with many fins but no visible 
 D:arms or legs. It has a toothed gaping maw, reminiscent of a caricature 
 D:of a shark's jaws. 
@@ -16157,8 +21124,13 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:STING:POISON:2d5
 B:STING:POISON:2d5
-F:ANIMAL | EVIL | AQUATIC | IM_POIS | WILD_TOO | COLD_BLOOD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:EVIL
+F:IM_POIS
+F:MORTAL
+F:WILD_TOO
 D:An intelligent devil-ray of the depths. 
 
 N:926:Ixitxachitl priest
@@ -16169,10 +21141,20 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:STING:POISON:2d7
 B:STING:POISON:2d7
-F:ANIMAL | EVIL | AQUATIC | IM_POIS | WILD_TOO | COLD_BLOOD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:EVIL
+F:IM_POIS
+F:MORTAL
+F:WILD_TOO
 S:1_IN_6
-S:TELE_TO | HEAL | SCARE | CAUSE_2 | BLIND | S_MONSTER
+S:BLIND
+S:CAUSE_2
+S:HEAL
+S:SCARE
+S:S_MONSTER
+S:TELE_TO
 D:A devil-ray of the depths, with priestly magic. 
 
 N:927:Vampiric ixitxachitl
@@ -16183,10 +21165,20 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:STING:POISON:3d8
 B:STING:EXP_40:3d8
-F:ANIMAL | EVIL | AQUATIC | RES_NETH | IM_POIS | WILD_TOO |
-F:BASEANGBAND | COLD_BLOOD
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:EVIL
+F:IM_POIS
+F:RES_NETH
+F:WILD_TOO
 S:1_IN_6
-S:HEAL | SCARE | CAUSE_3 | BLIND | FORGET | HASTE
+S:BLIND
+S:CAUSE_3
+S:FORGET
+S:HASTE
+S:HEAL
+S:SCARE
 D:A devil-ray of the depths, with vampiric powers. 
 
 N:928:Mathilde, the Science Student
@@ -16195,11 +21187,23 @@ I:110:220d100:40:10:3
 W:0:4:1100:0
 E:0:1:1:2:1:1
 O:20:20:20:20
-F:UNIQUE | FEMALE | CAN_SPEAK | DROP_CORPSE | DROP_SKELETON |
-F:FORCE_MAXHP | WILD_TOWN | WILD_ONLY | RAND_25
-F:ONLY_ITEM | DROP_90 | DROP_GOOD | 
-F:OPEN_DOOR | DG_CURSE |
-F:MORTAL | JOKEANGBAND | HAS_LITE
+F:CAN_SPEAK
+F:DG_CURSE
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:FEMALE
+F:FORCE_MAXHP
+F:HAS_LITE
+F:JOKEANGBAND
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RAND_25
+F:UNIQUE
+F:WILD_ONLY
+F:WILD_TOWN
 D:She loves joking, and she's constantly giggling. A very happy girl. 
 D:Beware, it is rumoured that Dark God has put a mighty curse on her. 
 
@@ -16212,9 +21216,18 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:TERRIFY
 B:TOUCH:HURT:3d4
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | UNDEAD |
-F:IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | SMART | PET | UNDEAD | 
-F:BASEANGBAND | NO_CUT
+F:COLD_BLOOD
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
+F:PET
+F:SMART
+F:UNDEAD
+F:UNDEAD
 D:A helpful spirit from beyond the grave. 
 
 N:930:Young spirit
@@ -16225,9 +21238,18 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:TERRIFY
 B:TOUCH:HURT:9d4
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | UNDEAD |
-F:IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | SMART | PET | UNDEAD | 
-F:BASEANGBAND | NO_CUT
+F:COLD_BLOOD
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
+F:PET
+F:SMART
+F:UNDEAD
+F:UNDEAD
 D:A helpful spirit from beyond the grave. 
 
 N:931:Mature spirit
@@ -16238,9 +21260,18 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:TERRIFY
 B:TOUCH:HURT:18d4
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | UNDEAD |
-F:IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | SMART | PET | UNDEAD | 
-F:BASEANGBAND | NO_CUT
+F:COLD_BLOOD
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
+F:PET
+F:SMART
+F:UNDEAD
+F:UNDEAD
 D:A helpful spirit from beyond the grave. 
 
 N:932:Experienced spirit
@@ -16251,9 +21282,18 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:TERRIFY
 B:TOUCH:HURT:20d4
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | UNDEAD |
-F:IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | SMART | PET | UNDEAD | 
-F:BASEANGBAND | NO_CUT
+F:COLD_BLOOD
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
+F:PET
+F:SMART
+F:UNDEAD
+F:UNDEAD
 D:A helpful spirit from beyond the grave. 
 
 N:933:Wise spirit
@@ -16264,9 +21304,18 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:TERRIFY
 B:TOUCH:HURT:30d4
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | UNDEAD |
-F:IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | SMART | PET | UNDEAD | 
-F:BASEANGBAND | NO_CUT
+F:COLD_BLOOD
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
+F:PET
+F:SMART
+F:UNDEAD
+F:UNDEAD
 D:A helpful spirit from beyond the grave. 
 
 N:934:Fangorn the Treebeard, Lord of the Ents
@@ -16279,10 +21328,24 @@ B:CRUSH:HURT:13d13
 B:CRUSH:HURT:13d13
 B:CRUSH:HURT:13d13
 B:CRUSH:HURT:13d13
-F:FORCE_SLEEP | FORCE_MAXHP | UNIQUE | CAN_SPEAK | SUSCEP_FIRE |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | MOVE_BODY | DROP_CORPSE |
-F:SMART | TAKE_ITEM | BASH_DOOR | KILL_WALL | NO_SLEEP |
-F:GOOD | PET | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:KILL_WALL
+F:MOVE_BODY
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PET
+F:SMART
+F:SUSCEP_FIRE
+F:TAKE_ITEM
+F:UNIQUE
 D:The first being to awoke on Arda, apart from the Valar themselves.  He is the 
 D:first, oldest, greatest and most respected of all the Ents:  and though he is 
 D:slow to anger, he is a terrible foe when roused. 
@@ -16297,17 +21360,49 @@ B:HIT:UN_BONUS:6d8
 B:HIT:UN_BONUS:6d8
 B:HIT:TERRIFY:5d5
 B:HIT:TERRIFY:5d5
-F:UNIQUE | MALE | CAN_SPEAK | PET | DROP_CORPSE |
-F:FORCE_SLEEP | FORCE_MAXHP | REFLECTING | RES_TELE |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD |
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:GOOD | IM_FIRE | IM_COLD | 
-F:IM_ELEC | IM_POIS | BASEANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:HEAL | HASTE | TPORT | TELE_AWAY | BLIND | CONF | SCARE | 
-S:CAUSE_4 | BRAIN_SMASH | FORGET | TRAPS | 
-S:BA_FIRE | BO_FIRE | BO_PLAS | BO_MANA | CAUSE_4 |
-S:S_MONSTERS | S_ANGEL | S_DRAGON | S_KIN 
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:PET
+F:REFLECTING
+F:RES_TELE
+F:SMART
+F:UNIQUE
+S:1_IN_2
+S:BA_FIRE
+S:BLIND
+S:BO_FIRE
+S:BO_MANA
+S:BO_PLAS
+S:BRAIN_SMASH
+S:CAUSE_4
+S:CAUSE_4
+S:CONF
+S:FORGET
+S:HASTE
+S:HEAL
+S:SCARE
+S:S_ANGEL
+S:S_DRAGON
+S:S_KIN
+S:S_MONSTERS
+S:TELE_AWAY
+S:TPORT
 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. 
@@ -16322,13 +21417,24 @@ B:HIT:HURT:3d5
 B:HIT:HURT:3d5
 B:HIT:HURT:3d5
 B:HIT:HURT:3d5
-F:UNIQUE | MALE |
-F:FORCE_MAXHP | FORCE_SLEEP |
-F:OPEN_DOOR | BASH_DOOR |
-F:IM_FIRE | IM_COLD | IM_POIS |
-F:DROP_CORPSE | DROP_SKELETON | BASEANGBAND | HAS_LITE
-S:1_IN_6 | 
-S:HEAL | BLIND | CONF | CAUSE_2 | MIND_BLAST 
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:OPEN_DOOR
+F:UNIQUE
+S:1_IN_6
+S:BLIND
+S:CAUSE_2
+S:CONF
+S:HEAL
+S:MIND_BLAST
 D:The friend and companion of the dwarven king Thror, he went mad with 
 D:grief after Thror's death at the hands of Azog the Orc.  With torn beard 
 D:and ragged clothes, he seems to have fixed on you as a convenient target 
@@ -16341,10 +21447,21 @@ W:8:1:900:18
 E:1:1:1:2:1:1
 O:0:50:0:30
 B:HIT:HURT:1d6
-F:DROP_60 | WILD_TOO | FRIENDS | 
-F:OPEN_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND | HAS_LITE | NO_CONF | NO_SLEEP
-S:1_IN_12 | BLIND | SLOW | CONF | SCARE
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FRIENDS
+F:HAS_LITE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:OPEN_DOOR
+F:WILD_TOO
+S:1_IN_12
+S:BLIND
+S:CONF
+S:SCARE
+S:SLOW
 D:A novice in the arts of mind over matter.
 
 N:938:Great Swamp Wyrm
@@ -16357,14 +21474,30 @@ B:CLAW:HURT:4d12
 B:CLAW:HURT:4d12
 B:BITE:POISON:6d14
 B:BITE:POISON:6d14
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:BASH_DOOR | POWERFUL | MOVE_BODY | DROP_CORPSE | 
-F:EVIL | DRAGON | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
 F:ATTR_MULTI
-S:1_IN_4 | 
-S:BLIND | CONF | SCARE | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_POIS
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:POWERFUL
+S:1_IN_4
+S:BLIND
 S:BR_POIS
+S:CONF
+S:SCARE
 D:A truly enormous dragon with great powers.  The foul gases issuing 
 D:from the beast nearly make you vomit; and while you may try to hold 
 D:your breath as you fight it, it sees no reason to do likewise. 
@@ -16379,14 +21512,30 @@ B:CLAW:HURT:4d12
 B:CLAW:HURT:4d12
 B:BITE:ACID:6d14
 B:BITE:ACID:6d14
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:BASH_DOOR | POWERFUL | MOVE_BODY | DROP_CORPSE | 
-F:EVIL | DRAGON | IM_ACID | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
 F:ATTR_MULTI
-S:1_IN_4 | 
-S:BLIND | CONF | SCARE | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:POWERFUL
+S:1_IN_4
+S:BLIND
 S:BR_ACID
+S:CONF
+S:SCARE
 D:A huge and very powerful dragon.  Great steaming pools of acid drip from 
 D:its form onto the ground.  You shudder when you see the acid eating away 
 D:the very stones of the dungeon - what could it do to you?
@@ -16399,11 +21548,22 @@ E:0:1:0:6:1:0
 O:0:0:0:0
 B:CLAW:HURT:3d4
 B:CLAW:FIRE:5d4
-F:IM_COLD | IM_FIRE | IM_POIS | NO_CONF | NO_SLEEP | IMPRESED |
-F:CAN_FLY | SMART | PET | DROP_CORPSE | HAS_EGG | GOOD |
-F:MORTAL |  HAS_LITE
+F:CAN_FLY
+F:DROP_CORPSE
+F:GOOD
+F:HAS_EGG
+F:HAS_LITE
+F:IMPRESED
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:PET
+F:SMART
 S:1_IN_10
-S:TELE_TO |
+S:TELE_TO
 D:The ancestors of the Eagles of the Thunderlords, these are 
 D:friendly funny flying creatures with power.
 
@@ -16415,11 +21575,22 @@ E:0:1:0:6:1:0
 O:0:0:0:0
 B:CLAW:HURT:4d4
 B:CLAW:FIRE:5d4
-F:IM_COLD | IM_FIRE | IM_POIS | NO_CONF | NO_SLEEP | IMPRESED |
-F:CAN_FLY | SMART | PET | DROP_CORPSE | HAS_EGG | GOOD |
-F:MORTAL | HAS_LITE
+F:CAN_FLY
+F:DROP_CORPSE
+F:GOOD
+F:HAS_EGG
+F:HAS_LITE
+F:IMPRESED
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:PET
+F:SMART
 S:1_IN_10
-S:TELE_TO |
+S:TELE_TO
 D:The ancestors of the Eagles of the Thunderlords, these are 
 D:friendly funny flying creatures with power. 
 
@@ -16431,11 +21602,22 @@ E:0:1:0:6:1:0
 O:0:0:0:0
 B:CLAW:HURT:5d4
 B:CLAW:FIRE:7d4
-F:IM_COLD | IM_FIRE | IM_POIS | NO_CONF | NO_SLEEP | IMPRESED |
-F:CAN_FLY | SMART | PET | DROP_CORPSE | HAS_EGG | GOOD |
-F:MORTAL | HAS_LITE
+F:CAN_FLY
+F:DROP_CORPSE
+F:GOOD
+F:HAS_EGG
+F:HAS_LITE
+F:IMPRESED
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:PET
+F:SMART
 S:1_IN_10
-S:TELE_TO |
+S:TELE_TO
 D:The ancestors of the Eagles of the Thunderlords, these are 
 D:friendly funny flying creatures with power. 
 
@@ -16447,11 +21629,22 @@ E:0:1:0:6:1:0
 O:0:0:0:0
 B:CLAW:HURT:6d4
 B:CLAW:FIRE:7d4
-F:IM_COLD | IM_FIRE | IM_POIS | NO_CONF | NO_SLEEP | IMPRESED |
-F:CAN_FLY | SMART | PET | DROP_CORPSE | HAS_EGG | GOOD |
-F:MORTAL | HAS_LITE
+F:CAN_FLY
+F:DROP_CORPSE
+F:GOOD
+F:HAS_EGG
+F:HAS_LITE
+F:IMPRESED
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:PET
+F:SMART
 S:1_IN_10
-S:TELE_TO |
+S:TELE_TO
 D:The ancestors of the Eagles of the Thunderlords, these are 
 D:friendly funny flying creatures with power. 
 
@@ -16463,11 +21656,22 @@ E:0:1:0:6:1:0
 O:0:0:0:0
 B:CLAW:HURT:6d4
 B:CLAW:FIRE:8d4
-F:IM_COLD | IM_FIRE | IM_POIS | NO_CONF | NO_SLEEP | IMPRESED |
-F:CAN_FLY | SMART | PET | DROP_CORPSE | HAS_EGG | GOOD |
-F:MORTAL | HAS_LITE
+F:CAN_FLY
+F:DROP_CORPSE
+F:GOOD
+F:HAS_EGG
+F:HAS_LITE
+F:IMPRESED
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:PET
+F:SMART
 S:1_IN_10
-S:TELE_TO |
+S:TELE_TO
 D:The ancestors of the Eagles of the Thunderlords, these are 
 D:friendly funny flying creatures with power. 
 
@@ -16479,11 +21683,22 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:10d8
 B:HIT:HURT:10d8
-F:MALE | FRIENDS | OPEN_DOOR | BASH_DOOR |
-F:GOOD | DROP_SKELETON | DROP_CORPSE | SMART | PET |
-F:IM_ACID | IM_COLD | RES_WATE | RES_NETH |
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_2 |
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FRIENDS
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:PET
+F:RES_NETH
+F:RES_WATE
+F:SMART
+S:1_IN_2
 S:ARROW_4
 D:An elf cloaked in green wielding a longbow. 
 
@@ -16497,12 +21712,27 @@ B:HIT:HURT:6d6
 B:HIT:HURT:6d6
 B:HIT:EXP_80:4d6
 B:HIT:EXP_80:4d6
-F:UNIQUE | MALE |
-F:FORCE_MAXHP |
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | NAZGUL |
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | MOVE_BODY | DROP_CHOSEN |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP | 
-F:BASEANGBAND | SPECIAL_GENE | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_CHOSEN
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:NAZGUL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SPECIAL_GENE
+F:UNDEAD
+F:UNIQUE
 D:A tall black Ringwraith, he is a master of horsemanship. He longs 
 D:to taste your blood. 
 
@@ -16516,15 +21746,37 @@ B:HIT:HURT:6d6
 B:HIT:HURT:6d6
 B:TOUCH:EXP_80:5d6
 B:TOUCH:EXP_80:5d6
-F:UNIQUE | FEMALE |
-F:FORCE_SLEEP | FORCE_MAXHP | NAZGUL | DROP_CHOSEN |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD |
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | MOVE_BODY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP | 
-F:BASEANGBAND | NO_CUT
-S:1_IN_3 |
-S:BLIND | HOLD | SCARE | CAUSE_3 | FORGET |
-S:BO_ACID | BO_FIRE | BO_COLD | BO_NETH |
+F:COLD_BLOOD
+F:DROP_4D2
+F:DROP_CHOSEN
+F:DROP_GOOD
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:MOVE_BODY
+F:NAZGUL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PASS_WALL
+F:UNDEAD
+F:UNIQUE
+S:1_IN_3
+S:BLIND
+S:BO_ACID
+S:BO_COLD
+S:BO_FIRE
+S:BO_NETH
+S:CAUSE_3
+S:FORGET
+S:HOLD
+S:SCARE
 S:S_MONSTER
 D:A sorceress in life, Adunaphel quickly fell under Sauron's sway and the 
 D:power of the rings. 
@@ -16539,15 +21791,37 @@ B:HIT:HURT:7d6
 B:HIT:HURT:7d6
 B:GAZE:EXP_80:6d6
 B:WAIL:TERRIFY:6d6
-F:UNIQUE | MALE |
-F:FORCE_SLEEP | FORCE_MAXHP | NAZGUL | DROP_CHOSEN |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD |
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | MOVE_BODY |
-F:EVIL | UNDEAD | IM_FIRE | IM_COLD | IM_POIS | 
-F:HURT_LITE | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_3 |
-S:BLIND | HOLD | SCARE | CAUSE_3 | DARKNESS |
-S:BO_FIRE | BO_COLD | BO_NETH |
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_4D2
+F:DROP_CHOSEN
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:NAZGUL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNDEAD
+F:UNIQUE
+S:1_IN_3
+S:BLIND
+S:BO_COLD
+S:BO_FIRE
+S:BO_NETH
+S:CAUSE_3
+S:DARKNESS
+S:HOLD
+S:SCARE
 S:S_MONSTERS
 D:A mighty sorcerer king, Akhorahil was blind in life. With powerful 
 D:enchantments, he created jewelled eyes that enabled him to see better than 
@@ -16563,14 +21837,37 @@ B:HIT:HURT:7d7
 B:HIT:HURT:7d7
 B:TOUCH:EXP_80:6d7
 B:WAIL:TERRIFY:6d7
-F:UNIQUE | MALE |
-F:FORCE_SLEEP | FORCE_MAXHP | NAZGUL | DROP_CHOSEN |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD |
-F:INVISIBLE | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | MOVE_BODY |
-F:EVIL | UNDEAD | IM_FIRE | IM_COLD | IM_POIS | 
-F:HURT_LITE | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_3 |
-S:BLIND | HOLD | SCARE | CAUSE_3 | BO_FIRE | BO_NETH | BA_FIRE |
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_4D2
+F:DROP_CHOSEN
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:MALE
+F:MOVE_BODY
+F:NAZGUL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNDEAD
+F:UNIQUE
+S:1_IN_3
+S:BA_FIRE
+S:BLIND
+S:BO_FIRE
+S:BO_NETH
+S:CAUSE_3
+S:HOLD
+S:SCARE
 S:S_MONSTER
 D:Ren was an insane eastern king who believed himself to be the son of a 
 D:volcano god. At an early age his sanity was destroyed by a plague that 
@@ -16586,15 +21883,39 @@ B:HIT:HURT:8d7
 B:HIT:HURT:8d7
 B:TOUCH:EXP_40:6d7
 B:TOUCH:EXP_40:6d7
-F:UNIQUE | MALE |
-F:FORCE_SLEEP | FORCE_MAXHP |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | NAZGUL | DROP_CHOSEN |
-F:INVISIBLE | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | MOVE_BODY |
-F:EVIL | UNDEAD | IM_FIRE | IM_COLD | IM_POIS | 
-F:HURT_LITE | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_3 | 
-S:BLIND | HOLD | SCARE | CAUSE_3 | 
-S:BA_FIRE | BA_NETH | BA_COLD | BA_ELEC | BA_ACID | 
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_4D2
+F:DROP_CHOSEN
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:MALE
+F:MOVE_BODY
+F:NAZGUL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNDEAD
+F:UNIQUE
+S:1_IN_3
+S:BA_ACID
+S:BA_COLD
+S:BA_ELEC
+S:BA_FIRE
+S:BA_NETH
+S:BLIND
+S:CAUSE_3
+S:HOLD
+S:SCARE
 S:S_UNDEAD
 D:This Ringwraith was a weak-minded sorcerer-king who fell easily under 
 D:Sauron's power. 
@@ -16609,15 +21930,39 @@ B:HIT:HURT:8d8
 B:HIT:HURT:8d8
 B:BITE:EXP_40:6d7
 B:WAIL:TERRIFY:6d7
-F:UNIQUE | MALE |
-F:FORCE_SLEEP | FORCE_MAXHP | NAZGUL | DROP_CHOSEN |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD |
-F:SMART | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | MOVE_BODY |
-F:EVIL | UNDEAD | IM_FIRE | IM_COLD | IM_POIS | 
-F:HURT_LITE | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_3 |
-S:BLIND | HOLD | SCARE | CAUSE_3 | BA_FIRE | BA_NETH |
-S:S_MONSTERS | S_UNDEAD | S_HOUND
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_4D2
+F:DROP_CHOSEN
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:NAZGUL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:UNDEAD
+F:UNIQUE
+S:1_IN_3
+S:BA_FIRE
+S:BA_NETH
+S:BLIND
+S:CAUSE_3
+S:HOLD
+S:SCARE
+S:S_HOUND
+S:S_MONSTERS
+S:S_UNDEAD
 D:Dwar had a special affinity for dogs in life, and can still command them 
 D:at will. He howls manically as he reaches out to destroy you. 
 
@@ -16631,15 +21976,39 @@ B:HIT:HURT:9d9
 B:HIT:HURT:9d9
 B:TOUCH:EXP_80:6d7
 B:WAIL:TERRIFY:6d7
-F:UNIQUE | MALE |
-F:FORCE_SLEEP | FORCE_MAXHP | SMART |
-F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | DROP_GOOD |
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | MOVE_BODY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | NAZGUL | DROP_CHOSEN |
-F:HURT_LITE | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_3 |
-S:BLIND | HOLD | SCARE | CAUSE_3 | CAUSE_4 | MIND_BLAST | 
-S:BO_COLD | BA_COLD | BA_NETH |
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_CHOSEN
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:NAZGUL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:UNDEAD
+F:UNIQUE
+S:1_IN_3
+S:BA_COLD
+S:BA_NETH
+S:BLIND
+S:BO_COLD
+S:CAUSE_3
+S:CAUSE_4
+S:HOLD
+S:MIND_BLAST
+S:SCARE
 S:S_UNDEAD
 D:A Ringwraith powerful in fell sorcery, he yearns for the life he has 
 D:exchanged for an unlife of everlasting torment. 
@@ -16654,16 +22023,46 @@ B:HIT:HURT:9d10
 B:HIT:HURT:9d10
 B:TOUCH:EXP_80:7d7
 B:TOUCH:EXP_80:7d7
-F:UNIQUE | MALE | CAN_SPEAK | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | NAZGUL | DROP_CHOSEN |
-F:SMART | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | MOVE_BODY | 
-F:EVIL | UNDEAD | IM_ACID | IM_FIRE | IM_COLD | IM_POIS | 
-F:HURT_LITE | NO_CONF | NO_SLEEP | RES_TELE | BASEANGBAND | NO_CUT
-S:1_IN_2 | 
-S:TELE_LEVEL | BLIND | HOLD | SCARE | CAUSE_3 | CAUSE_4 | BO_MANA | 
-S:BA_FIRE | BA_COLD | BA_NETH | ANIM_DEAD | 
-S:S_HI_UNDEAD | S_KIN
+F:BASH_DOOR
+F:CAN_SPEAK
+F:COLD_BLOOD
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CHOSEN
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:NAZGUL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:SMART
+F:UNDEAD
+F:UNIQUE
+S:1_IN_2
+S:BA_COLD
+S:BA_FIRE
+S:BA_NETH
+S:BLIND
+S:BO_MANA
+S:CAUSE_3
+S:CAUSE_4
+S:HOLD
+S:SCARE
+S:S_HI_UNDEAD
+S:S_KIN
+S:TELE_LEVEL
 D:He was the warrior-king of the East, now a Ringwraith. Khamul is a powerful opponent, his skill in 
 D:combat awesome and his form twisted by evil cunning. 
 
@@ -16677,16 +22076,45 @@ B:HIT:HURT:10d10
 B:HIT:HURT:10d10
 B:HIT:EXP_80:7d7
 B:HIT:EXP_80:7d7
-F:UNIQUE | MALE | CAN_SPEAK | RES_TELE
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | 
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | MOVE_BODY | NAZGUL |
-F:EVIL | UNDEAD | DROP_CHOSEN |
-F:IM_COLD | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_2 | 
-S:TELE_AWAY | BLIND | HOLD | SCARE | CAUSE_3 | BRAIN_SMASH | 
-S:BO_MANA | BA_NETH | S_WRAITH | 
-S:S_KIN | S_HI_UNDEAD | S_HI_DRAGON | S_MONSTERS | ANIM_DEAD
+F:BASH_DOOR
+F:CAN_SPEAK
+F:COLD_BLOOD
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CHOSEN
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:NAZGUL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:SMART
+F:UNDEAD
+F:UNIQUE
+S:1_IN_2
+S:BA_NETH
+S:BLIND
+S:BO_MANA
+S:BRAIN_SMASH
+S:CAUSE_3
+S:HOLD
+S:SCARE
+S:S_HI_DRAGON
+S:S_HI_UNDEAD
+S:S_KIN
+S:S_MONSTERS
+S:S_WRAITH
+S:TELE_AWAY
 D:The Chief of the Ringwraiths. A fell being of devastating power, his 
 D:spells are lethal and his combat blows crushingly hard. He moves at 
 D:speed, and commands legions of evil to do his bidding. It is said that he 
@@ -16700,14 +22128,26 @@ E:1:1:1:2:1:1
 O:50:50:0:0
 B:HIT:HURT:8d6
 B:HIT:HURT:8d6
-F:FEMALE |
-F:THUNDERLORD | DROP_SKELETON | DROP_CORPSE |
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD |
-F:IM_FIRE | REGENERATE | OPEN_DOOR | BASH_DOOR |
-F:RES_TELE | NO_CONF | NO_SLEEP | CAN_FLY | HAS_LITE
-S:1_IN_4 |
-S:BR_FIRE |
-S:BLINK | TELE_AWAY
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:FEMALE
+F:HAS_LITE
+F:IM_FIRE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:RES_TELE
+F:THUNDERLORD
+S:1_IN_4
+S:BLINK
+S:BR_FIRE
+S:TELE_AWAY
 D:A Thunderlord. Among the weaker breeds, but still dangerous. 
 
 N:956:Blue Thunderlord
@@ -16718,14 +22158,27 @@ E:1:1:1:2:1:1
 O:50:50:0:0
 B:HIT:HURT:8d7
 B:HIT:HURT:8d7
-F:MALE | SMART |
-F:THUNDERLORD | DROP_SKELETON | DROP_CORPSE |
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD |
-F:IM_FIRE | REGENERATE | OPEN_DOOR | BASH_DOOR |
-F:RES_TELE | NO_CONF | NO_SLEEP | CAN_FLY | HAS_LITE
-S:1_IN_4 |
-S:BR_FIRE |
-S:TPORT | BLINK
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:HAS_LITE
+F:IM_FIRE
+F:MALE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:RES_TELE
+F:SMART
+F:THUNDERLORD
+S:1_IN_4
+S:BLINK
+S:BR_FIRE
+S:TPORT
 D:A Thunderlord. Among the weaker breeds, but still dangerous. 
 
 N:957:Brown Thunderlord
@@ -16736,14 +22189,27 @@ E:1:1:1:2:1:1
 O:50:50:0:0
 B:HIT:HURT:8d9
 B:HIT:HURT:8d9
-F:MALE | SMART |
-F:THUNDERLORD | DROP_SKELETON | DROP_CORPSE |
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD |
-F:IM_FIRE | REGENERATE | OPEN_DOOR | BASH_DOOR |
-F:RES_TELE | NO_CONF | NO_SLEEP | CAN_FLY |  HAS_LITE
-S:1_IN_4 |
-S:BR_FIRE |
-S:TPORT | BLINK
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:HAS_LITE
+F:IM_FIRE
+F:MALE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:RES_TELE
+F:SMART
+F:THUNDERLORD
+S:1_IN_4
+S:BLINK
+S:BR_FIRE
+S:TPORT
 D:A Thunderlord. Beware its flame. 
 
 N:958:Bronze Thunderlord
@@ -16754,14 +22220,28 @@ E:1:1:1:2:1:1
 O:50:50:0:0
 B:HIT:HURT:10d9
 B:HIT:HURT:10d9
-F:MALE | SMART |
-F:THUNDERLORD | DROP_SKELETON | DROP_CORPSE |
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD |
-F:IM_FIRE | REGENERATE | OPEN_DOOR | BASH_DOOR |
-F:RES_TELE | NO_CONF | NO_SLEEP | CAN_FLY | HAS_LITE
-S:1_IN_4 |
-S:BR_FIRE | BR_TIME |
-S:TPORT | BLINK
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:HAS_LITE
+F:IM_FIRE
+F:MALE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:RES_TELE
+F:SMART
+F:THUNDERLORD
+S:1_IN_4
+S:BLINK
+S:BR_FIRE
+S:BR_TIME
+S:TPORT
 D:A Thunderlord, mightiest among the males. 
 
 N:959:Gold Thunderlord
@@ -16774,15 +22254,31 @@ B:HIT:HURT:10d9
 B:HIT:HURT:10d9
 B:HIT:HURT:10d9
 B:HIT:HURT:10d9
-F:FEMALE | SMART |
-F:THUNDERLORD | DROP_SKELETON | DROP_CORPSE |
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD |
-F:IM_FIRE | REGENERATE | OPEN_DOOR | BASH_DOOR |
-F:RES_TELE | NO_CONF | NO_SLEEP | CAN_FLY | HAS_LITE
-S:1_IN_4 |
-S:BR_FIRE | BR_TIME | 
-S:TPORT | BLINK | TELE_TO | TELE_AWAY |
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:FEMALE
+F:HAS_LITE
+F:IM_FIRE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:RES_TELE
+F:SMART
+F:THUNDERLORD
+S:1_IN_4
+S:BLINK
+S:BR_FIRE
+S:BR_TIME
 S:S_THUNDERLORD
+S:TELE_AWAY
+S:TELE_TO
+S:TPORT
 D:A Thunderlord, among the queens of their kind. 
 
 N:960:Blood Sprout
@@ -16795,10 +22291,17 @@ B:TOUCH:HURT:3d15
 B:TOUCH:HURT:3d15
 B:TOUCH:HURT:3d15
 B:TOUCH:HURT:3d15
-F:STUPID | EMPTY_MIND | KILL_TREES | 
-F:IM_POIS | IM_ELEC | IM_ACID | IM_COLD |
-F:NO_CONF | NO_SLEEP | NO_FEAR | 
+F:EMPTY_MIND
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_POIS
+F:KILL_TREES
 F:MORTAL
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 S:MULTIPLY
 D:A kind of giant mycorrhiza, corrupted into a carnivore by Morgoth.
 
@@ -16812,14 +22315,29 @@ B:HIT:HURT:8d6
 B:HIT:HURT:8d6
 B:HIT:UN_BONUS:6d8
 B:HIT:UN_BONUS:6d8
-F:UNIQUE | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE | DROP_SKELETON | 
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:IM_ACID | IM_COLD | IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND
-F:HAS_LITE
-S:1_IN_2 | 
-S:CAUSE_3 | BO_WATE | BO_MANA
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_POIS
+F:MALE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:UNIQUE
+S:1_IN_2
+S:BO_MANA
+S:BO_WATE
+S:CAUSE_3
 D:This sad creature - once a mighty warrior - betrayed his former friends to 
 D:Morgoth's army in return for, he thought, safety for himself and his wife.  
 D:And so he fell under Morgoth's power and became little more than a mindless 
@@ -16835,10 +22353,22 @@ B:CLAW:HURT:2d5
 B:TOUCH:EAT_ITEM
 B:TOUCH:INSANITY:2d5
 B:TOUCH:INSANITY:2d5
-F:MALE | DROP_CORPSE | DROP_SKELETON | WILD_TOO | 
-F:RAND_25 | UNIQUE | STUPID | MALE | FORCE_MAXHP |
-F:TAKE_ITEM | CAN_SPEAK | CAN_SWIM | EVIL |
-F:MORTAL | JOKEANGBAND | HAS_LITE
+F:CAN_SPEAK
+F:CAN_SWIM
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:JOKEANGBAND
+F:MALE
+F:MALE
+F:MORTAL
+F:RAND_25
+F:STUPID
+F:TAKE_ITEM
+F:UNIQUE
+F:WILD_TOO
 S:1_IN_8
 S:SHRIEK
 D:He tends to blubber a lot, he was a simple blubbering idiot before he lost 
@@ -16855,11 +22385,22 @@ B:CLAW:POISON:2d8
 B:CLAW:POISON:2d8
 B:BITE:POISON:2d6
 B:BITE:POISON:2d6
-F:DROP_SKELETON | FORCE_MAXHP | FRIENDS |
-F:OPEN_DOOR | BASH_DOOR | HURT_LITE |
-F:ANIMAL | SPIDER | EVIL | IM_POIS | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FRIENDS
+F:HURT_LITE
+F:IM_POIS
+F:OPEN_DOOR
+F:SPIDER
 S:1_IN_4
-S:BO_FIRE | SLOW | HOLD | CAUSE_3 | MISSILE
+S:BO_FIRE
+S:CAUSE_3
+S:HOLD
+S:MISSILE
+S:SLOW
 D:A red arachnid with legs weaving spells in the air. 
 
 N:964:Elder aranea
@@ -16872,12 +22413,27 @@ B:CLAW:POISON:5d8
 B:CLAW:POISON:5d8
 B:BITE:HALLU:5d6
 B:BITE:HALLU:5d6
-F:DROP_SKELETON | FORCE_MAXHP |
-F:OPEN_DOOR | BASH_DOOR | HURT_LITE | SMART |
-F:ANIMAL | SPIDER | EVIL | IM_FIRE | IM_POIS | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:HURT_LITE
+F:IM_FIRE
+F:IM_POIS
+F:OPEN_DOOR
+F:SMART
+F:SPIDER
 S:1_IN_6
-S:SLOW | HOLD | DRAIN_MANA | MIND_BLAST | HEAL | 
-S:BA_FIRE | BO_FIRE | CAUSE_3 | S_SPIDER
+S:BA_FIRE
+S:BO_FIRE
+S:CAUSE_3
+S:DRAIN_MANA
+S:HEAL
+S:HOLD
+S:MIND_BLAST
+S:SLOW
+S:S_SPIDER
 D:A vast, bloated arachnid, master of its brood: among the more terrible of 
 D:Ungoliant's descendants, this is a monster such as those who haunted the dread 
 D:valley of Nan Dungortheb long ago. 
@@ -16890,8 +22446,12 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:POISON:2d6
 B:STING:BLIND:1d1
-F:WEIRD_MIND | BASH_DOOR | CAN_FLY | 
-F:ANIMAL | IM_POIS | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:IM_POIS
+F:MORTAL
+F:WEIRD_MIND
 D:It is moving slowly towards you. 
 
 N:966:Wavelord
@@ -16904,13 +22464,34 @@ B:HIT:HURT:8d9
 B:HIT:COLD:8d9
 B:HIT:HURT:8d9
 B:HIT:COLD:8d9
-F:SMART | PET | DROP_CORPSE | FRIENDS | WILD_SHORE | WILD_OCEAN | WILD_TOO | 
-F:IM_POIS | AQUATIC | CAN_SWIM | DROP_USEFUL |
-F:NO_CONF | NO_SLEEP | NO_FEAR | DROP_GOOD | DROP_3D2 |
-F:MORTAL | REGENERATE | TAKE_ITEM | GOOD | SUSCEP_FIRE |
-F:RES_WATE | RES_NEXU | HAS_LITE
+F:AQUATIC
+F:CAN_SWIM
+F:DROP_3D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_USEFUL
+F:FRIENDS
+F:GOOD
+F:HAS_LITE
+F:IM_POIS
+F:MORTAL
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:PET
+F:REGENERATE
+F:RES_NEXU
+F:RES_WATE
+F:SMART
+F:SUSCEP_FIRE
+F:TAKE_ITEM
+F:WILD_OCEAN
+F:WILD_SHORE
+F:WILD_TOO
 S:1_IN_4
-S:BO_WATE | BA_WATE | BO_ICEE
+S:BA_WATE
+S:BO_ICEE
+S:BO_WATE
 D:The Dolphiners came with the Thunderlords from their far home. 
 D:These friendly beings ride their sharks into combat to assist you. 
 
@@ -16920,8 +22501,9 @@ I:110:1d1:30:1:10
 W:10:3:10:0
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:SMART | POSSESSOR | 
-F:BASEANGBAND | NO_CUT
+F:NO_CUT
+F:POSSESSOR
+F:SMART
 D:It does not look that powerful. 
 
 N:968:Bat of Gorgoroth
@@ -16932,11 +22514,23 @@ E:0:1:1:0:1:0
 O:0:0:0:0
 B:BITE:POISON:1d10
 B:CLAW:HURT:1d4
-F:DROP_60 | RAND_25 | MOVE_BODY | CAN_FLY | DROP_CORPSE | 
-F:BASH_DOOR | MOVE_BODY | FRIENDS | WEIRD_MIND | 
-F:ANIMAL | IM_POIS | AI_ANNOY | MORTAL | BASEANGBAND
-S:1_IN_8 | 
-S:SCARE | BR_POIS | BR_DARK
+F:AI_ANNOY
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_60
+F:DROP_CORPSE
+F:FRIENDS
+F:IM_POIS
+F:MORTAL
+F:MOVE_BODY
+F:MOVE_BODY
+F:RAND_25
+F:WEIRD_MIND
+S:1_IN_8
+S:BR_DARK
+S:BR_POIS
+S:SCARE
 D:Fed with horrid meats and grown to enormous size, this slavering creature 
 D:seeks livelier prey. 
 
@@ -16946,10 +22540,19 @@ I:110:1d1:40:250:3
 W:0:4:730:0
 E:0:1:1:2:1:1
 O:0:0:1:0
-F:FEMALE | CAN_SPEAK
-F:FORCE_MAXHP | SPECIAL_GENE | NO_TARGET
-F:NEVER_MOVE | NEVER_BLOW | GOOD | NO_DEATH | RES_TELE
-F:MORTAL | BASEANGBAND | UNIQUE | PET | 
+F:CAN_SPEAK
+F:FEMALE
+F:FORCE_MAXHP
+F:GOOD
+F:MORTAL
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_DEATH
+F:NO_TARGET
+F:PET
+F:RES_TELE
+F:SPECIAL_GENE
+F:UNIQUE
 D:The princess of an unknown kingdom, you need to save her! 
 
 N:970:Merton Proudfoot, the lost hobbit
@@ -16958,10 +22561,18 @@ I:110:1d1:40:250:3
 W:1:1:730:0
 E:0:1:1:2:1:1
 O:0:0:0:1
-F:MALE | CAN_SPEAK
-F:FORCE_MAXHP | SPECIAL_GENE
-F:NEVER_MOVE | NEVER_BLOW | GOOD | NO_TARGET
-F:MORTAL | BASEANGBAND | UNIQUE | PET | NO_DEATH
+F:CAN_SPEAK
+F:FORCE_MAXHP
+F:GOOD
+F:MALE
+F:MORTAL
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_DEATH
+F:NO_TARGET
+F:PET
+F:SPECIAL_GENE
+F:UNIQUE
 D:The poor hobbit got lost in the dreadful maze! 
 
 N:971:The Wight-King of the Barrow-downs
@@ -16974,12 +22585,29 @@ B:HIT:HURT:2d10
 B:WAIL:PARALYZE:2d6
 B:TOUCH:EXP_80:4d8
 B:TOUCH:EXP_80:4d8
-F:SPECIAL_GENE | FORCE_MAXHP | SMART | CAN_SPEAK | 
-F:DROP_4D2 | DROP_2D2 | COLD_BLOOD | UNIQUE | 
-F:CAN_SWIM | CAN_FLY | EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_4 |
-S:HOLD | SCARE | CAUSE_3 | BA_NETH
+F:CAN_FLY
+F:CAN_SPEAK
+F:CAN_SWIM
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_4D2
+F:EVIL
+F:FORCE_MAXHP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:SMART
+F:SPECIAL_GENE
+F:UNDEAD
+F:UNIQUE
+S:1_IN_4
+S:BA_NETH
+S:CAUSE_3
+S:HOLD
+S:SCARE
 D:He has lived in the Barrow-Downs for centuries after his first death at the 
 D:hands of the Witch-King of Angmar.  A once loyal captain under the 
 D:Witch-King's command, he now awaits a time when his undead forces shall 
@@ -16993,9 +22621,13 @@ O:50:50:0:0
 B:HIT:HURT:2d6
 B:PUNCH:HURT:1d7
 B:KICK:HURT:1d8
-F:SPECIAL_GENE | SMART | OPEN_DOOR
-F:FORCE_MAXHP | CAN_SWIM | BASEANGBAND | 
-F:NO_SLEEP | NO_CONF
+F:CAN_SWIM
+F:FORCE_MAXHP
+F:NO_CONF
+F:NO_SLEEP
+F:OPEN_DOOR
+F:SMART
+F:SPECIAL_GENE
 D:A great warrior. 
 
 N:973:Experienced possessor (soul)
@@ -17003,8 +22635,9 @@ G:G:D
 I:120:5d5:30:50:10
 W:30:3:10:0
 O:0:0:0:0
-F:SMART | POSSESSOR | 
-F:BASEANGBAND | NO_CUT
+F:NO_CUT
+F:POSSESSOR
+F:SMART
 S:1_IN_9
 S:S_KIN
 D:It does not look that powerful. 
@@ -17014,30 +22647,13 @@ G:G:D
 I:130:10d10:30:100:10
 W:95:3:10:0
 O:0:0:0:0
-F:SMART | POSSESSOR | 
-F:BASEANGBAND | NO_CUT
+F:NO_CUT
+F:POSSESSOR
+F:SMART
 S:1_IN_4
 S:S_KIN
 D:It does not look that powerful. 
 
-N:975:Death orb
-G:E:D
-I:130:40d100:255:75:0
-W:80:5:10:5000
-E:0:0:0:0:0:0
-O:0:0:0:0
-B:ENGULF:PARASITE:20d10
-B:ENGULF:ACID:6d5
-B:ENGULF:EXP_80:6d5
-B:ENGULF:LOSE_ALL:6d5
-F:FORCE_MAXHP | ZANGBAND | KILL_ITEM | KILL_WALL | KILL_BODY | 
-F:NONLIVING | COLD_BLOOD | EMPTY_MIND | CAN_SWIM | 
-F:NO_CONF | NO_SLEEP | NO_STUN | REGENERATE | 
-F:IM_ACID | IM_FIRE | IM_ELEC | IM_COLD | IM_POIS | 
-F:RES_NETH | RES_PLAS | RES_WATE | RES_DISE | RES_NEXU | 
-F:DEATH_ORB | NO_CUT
-D:A small, apparently unassuming orb which spawns death and destruction. 
-
 N:976:Bronze dragon worm
 G:w:U
 I:100:10d15:10:40:80
@@ -17047,13 +22663,21 @@ O:0:0:0:0
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
 B:BITE:HURT:3d5
-F:RAND_50 | RAND_25 |
-F:DROP_60 | ONLY_GOLD | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DRAGON | NO_CONF | 
-F:MORTAL | BASEANGBAND | ATTR_MULTI
-S:MULTIPLY | 
-S:1_IN_6 | BR_CONF
+F:ATTR_MULTI
+F:BASH_DOOR
+F:DRAGON
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:MORTAL
+F:NO_CONF
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:RAND_25
+F:RAND_50
+S:1_IN_6
+S:BR_CONF
+S:MULTIPLY
 D:You thought dragons used eggs, but this worm has the scales, and the bad 
 D:breath, and the fiery eyes, of a real dragon. Its scales glitter in 
 D:a multitude of perplexing and distracting ways. 
@@ -17067,13 +22691,21 @@ O:0:0:0:0
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
 B:BITE:HURT:3d5
-F:RAND_50 | RAND_25 |
-F:DROP_60 | ONLY_GOLD | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DRAGON | NO_STUN | 
-F:MORTAL | BASEANGBAND | ATTR_MULTI
-S:MULTIPLY | 
-S:1_IN_6 | BR_SOUN
+F:ATTR_MULTI
+F:BASH_DOOR
+F:DRAGON
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:MORTAL
+F:NO_STUN
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:RAND_25
+F:RAND_50
+S:1_IN_6
+S:BR_SOUN
+S:MULTIPLY
 D:You thought dragons used eggs, but this worm has the scales, and the bad 
 D:breath, and the fiery eyes, of a real dragon. You can feel the air itself 
 D:vibrating as you near it. 
@@ -17084,11 +22716,20 @@ I:100:1d1:1:1:0
 W:1:1:20:3
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:NEVER_MOVE | UNIQUE |
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | FORCE_DEPTH |
-F:NO_CONF | NO_SLEEP | NO_FEAR |
-F:MORTAL | WYRM_PROTECT | ONLY_DEPTH | JOKEANGBAND | NO_CUT
+F:EMPTY_MIND
+F:FORCE_DEPTH
+F:IM_POIS
+F:JOKEANGBAND
+F:MORTAL
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_DEPTH
+F:STUPID
+F:UNIQUE
+F:WYRM_PROTECT
 D:A small strange growth. It seems to be defenceless... 
 
 N:979:The Physics Teacher
@@ -17101,15 +22742,35 @@ B:TOUCH:LOSE_INT:13d13
 B:TOUCH:LOSE_WIS:13d13
 B:GAZE:PARALYZE
 B:WAIL:EXP_80
-F:UNIQUE | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_SPEAK | DROP_CORPSE |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | DROP_GREAT | 
-F:PASS_WALL | MOVE_BODY | AURA_FIRE |
-F:SMART | OPEN_DOOR | BASH_DOOR |
-F:EVIL | ANIMAL | DEMON | UNDEAD | JOKEANGBAND | NO_CUT
+F:ANIMAL
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DEMON
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:JOKEANGBAND
+F:MALE
+F:MOVE_BODY
+F:NO_CUT
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:PASS_WALL
+F:SMART
+F:UNDEAD
+F:UNIQUE
 S:1_IN_3
-S:BR_FIRE | BR_PLAS | BR_TIME | BA_WATE | ROCKET | 
+S:BA_WATE
+S:BR_FIRE
+S:BR_PLAS
+S:BR_TIME
 S:FORGET
+S:ROCKET
 D:A keeper of forbidden wisdom, this Teacher bombards you with his mastery 
 D:over elements of matter. 
 
@@ -17123,12 +22784,30 @@ B:HIT:HURT:8d12
 B:HIT:HURT:8d12
 B:HIT:HURT:8d12
 B:HIT:HURT:8d12
-F:FORCE_SLEEP | FORCE_MAXHP | UNIQUE | CAN_SPEAK | SPECIAL_GENE | 
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_GOOD | DROP_SKELETON | DROP_CORPSE | 
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR | MOVE_BODY | BASEANGBAND | 
-F:HAS_LITE | AQUATIC
-S:1_IN_6 |
-S:HEAL | HASTE | TELE_AWAY | S_MONSTERS | S_KIN
+F:AQUATIC
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MOVE_BODY
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:SPECIAL_GENE
+F:TAKE_ITEM
+F:UNIQUE
+S:1_IN_6
+S:HASTE
+S:HEAL
+S:S_KIN
+S:S_MONSTERS
+S:TELE_AWAY
 D:Last and proudest king of ancient Numenor. Corrupted by power and 
 D:avarice, he fell victim to Sauron's wiles, tried to fight the immortals 
 D:themselves, and condemned Numenor to oblivion. 
@@ -17138,7 +22817,10 @@ G:@:w
 I:1:1d1:1:1:1
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:NEVER_MOVE | NEVER_BLOW | DOPPLEGANGER | BASEANGBAND | HAS_LITE
+F:DOPPLEGANGER
+F:HAS_LITE
+F:NEVER_BLOW
+F:NEVER_MOVE
 D:It looks like you... 
 
 N:982:Marylene, Heartbreakeress of the Netherworld
@@ -17151,21 +22833,79 @@ B:GAZE:PARALYZE:20d15
 B:HIT:EXP_80:20d17
 B:BITE:LOSE_ALL:10d12
 B:TOUCH:INSANITY:12d9
-F:UNIQUE | CAN_SPEAK | ATTR_MULTI | ATTR_ANY | FEMALE |
-F:FORCE_MAXHP | WEIRD_MIND | DROP_CORPSE | DROP_SKELETON |
-F:REFLECTING | AURA_FIRE | AURA_ELEC | AURA_COLD |
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_3D2 | DROP_4D2 | 
-F:DROP_GOOD | DROP_GREAT | RES_NETH | INVISIBLE | 
-F:SMART | KILL_WALL | KILL_BODY | POWERFUL | RES_TELE |
-F:REGENERATE | CAN_FLY | CAN_SWIM | WYRM_PROTECT | 
-F:EVIL | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | NO_STUN | RES_TELE | DEMON |
-F:MORTAL | DG_CURSE | JOKEANGBAND | HAS_LITE
-S:1_IN_1 | 
-S:BR_CHAO | BA_CHAO | BRAIN_SMASH | SHRIEK | BR_CONF | BR_SOUN |
-S:BR_NETH | HASTE | TRAPS | FORGET | BR_DISE | BR_TIME | MIND_BLAST |
-S:HEAL | TPORT | TELE_TO | CAUSE_1 | CAUSE_2 | CAUSE_3 | CAUSE_4 | BLIND |
-S:CONF | SLOW | HOLD | S_ANGEL | S_UNIQUE
+F:ATTR_ANY
+F:ATTR_MULTI
+F:AURA_COLD
+F:AURA_ELEC
+F:AURA_FIRE
+F:CAN_FLY
+F:CAN_SPEAK
+F:CAN_SWIM
+F:DEMON
+F:DG_CURSE
+F:DROP_1D2
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:DROP_SKELETON
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:JOKEANGBAND
+F:KILL_BODY
+F:KILL_WALL
+F:MORTAL
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:POWERFUL
+F:REFLECTING
+F:REGENERATE
+F:RES_NETH
+F:RES_TELE
+F:RES_TELE
+F:SMART
+F:UNIQUE
+F:WEIRD_MIND
+F:WYRM_PROTECT
+S:1_IN_1
+S:BA_CHAO
+S:BLIND
+S:BRAIN_SMASH
+S:BR_CHAO
+S:BR_CONF
+S:BR_DISE
+S:BR_NETH
+S:BR_SOUN
+S:BR_TIME
+S:CAUSE_1
+S:CAUSE_2
+S:CAUSE_3
+S:CAUSE_4
+S:CONF
+S:FORGET
+S:HASTE
+S:HEAL
+S:HOLD
+S:MIND_BLAST
+S:SHRIEK
+S:SLOW
+S:S_ANGEL
+S:S_UNIQUE
+S:TELE_TO
+S:TPORT
 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. 
@@ -17183,41 +22923,58 @@ B:GAZE:PARALYZE:20d15
 B:HIT:HURT:15d10
 B:TOUCH:EXP_80:10d5
 B:TOUCH:EAT_ITEM
-F:RAND_50 | TAKE_ITEM | FORCE_MAXHP | UNIQUE |
-F:DROP_3D2 | DROP_GOOD | DROP_GREAT | WYRM_PROTECT | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | NO_STUN | RES_TELE | DEMON |
-F:EVIL | WEIRD_MIND | RES_NETH | INVISIBLE | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | JOKEANGBAND | NO_CUT
+F:DEMON
+F:DROP_3D2
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_MAXHP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:JOKEANGBAND
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:RAND_50
+F:RES_NETH
+F:RES_TELE
+F:TAKE_ITEM
+F:UNIQUE
+F:WEIRD_MIND
+F:WYRM_PROTECT
 S:1_IN_2
-S:CONF | SHRIEK | BR_CONF | BR_TIME | BR_INER | BR_GRAV | BRAIN_SMASH |
-S:SCARE | BLIND | SLOW | HOLD | HASTE | HEAL | TELE_TO | FORGET |
-S:S_HI_DEMON | S_MONSTERS | S_HYDRA | S_HI_DRAGON | S_HI_UNDEAD | S_ANGEL |
-S:S_HOUND | S_UNIQUE |
+S:BLIND
+S:BRAIN_SMASH
+S:BR_CONF
+S:BR_GRAV
+S:BR_INER
+S:BR_TIME
+S:CONF
+S:FORGET
+S:HASTE
+S:HEAL
+S:HOLD
+S:SCARE
+S:SHRIEK
+S:SLOW
+S:S_ANGEL
+S:S_HI_DEMON
+S:S_HI_DRAGON
+S:S_HI_UNDEAD
+S:S_HOUND
+S:S_HYDRA
+S:S_MONSTERS
+S:S_UNIQUE
+S:TELE_TO
 D:It is even worse than the RNG, coming from Mangband, 
 D:it seeks to crush you to pulp... and surely can. 
 
-N:984:Hrungnir, the Stone Giant
-G:P:W
-I:130:99d110:50:160:20
-W:78:2:0:45000
-E:1:1:1:2:1:1
-O:0:100:0:0
-B:HIT:SHATTER:9d11
-B:HIT:SHATTER:9d11
-B:HIT:HURT:9d11
-B:HIT:HURT:9d11
-F:UNIQUE | SUSCEP_ACID | HURT_ROCK | 
-F:FORCE_SLEEP | FORCE_MAXHP | RES_TELE | RES_NETH | RES_PLAS | MALE |
-F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | DROP_GOOD | EVIL | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | TAKE_ITEM | CAN_SPEAK |
-F:EVIL | IM_FIRE | IM_POIS | GIANT | 
-F:ZANGBAND | HAS_LITE | NO_CUT
-S:1_IN_5 | 
-S:BR_WALL | BR_GRAV | BR_SHAR | BLIND | TELE_TO | S_KIN | S_MONSTERS | 
-S:HAND_DOOM | TELE_AWAY | 
-D:Hrungnir is the strongest of all the Stone Giants: one who would even dare 
-D:to challenge Thor himself to single combat. 
-
 N:985:Bullroarer the Hobbit
 G:h:U
 I:120:6d10:16:8:10
@@ -17226,11 +22983,19 @@ E:1:1:1:2:1:1
 O:25:55:0:20
 B:HIT:HURT:1d8
 B:HIT:HURT:1d8
-F:UNIQUE | MALE | CAN_SPEAK | DROP_CORPSE | DROP_SKELETON | 
-F:FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNIQUE
 D:He is a sturdy hobbit who is renowned for his unusual strength and 
 D:vigour. He can prove a troublesome opponent. 
 
@@ -17243,11 +23008,20 @@ O:0:0:0:0
 B:BITE:HURT:2d6
 B:BITE:HURT:2d6
 B:BITE:HURT:2d6
-F:FORCE_SLEEP | WILD_TOO | WILD_SHORE | WILD_SWAMP | CAN_SWIM | 
-F:DROP_CORPSE | DROP_SKELETON | ONLY_GOLD | DROP_2D2 | 
-F:OPEN_DOOR | BASH_DOOR | MOVE_BODY | 
-F:ANIMAL | MORTAL | BASEANGBAND
-S:1_IN_9 | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:MORTAL
+F:MOVE_BODY
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:WILD_SHORE
+F:WILD_TOO
+S:1_IN_9
 S:SCARE
 D:A strange reptilian creature with three heads, guarding its hoard. 
 
@@ -17261,12 +23035,23 @@ B:HIT:HURT:4d6
 B:HIT:HURT:4d6
 B:HIT:HURT:4d6
 B:HIT:HURT:4d6
-F:UNIQUE | MALE | CAN_SPEAK | DROP_CORPSE | DROP_SKELETON | 
-F:FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_10 | S_KIN
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:TAKE_ITEM
+F:UNIQUE
+S:1_IN_10
+S:S_KIN
 D:An evil and cunning man from the East.  Having once sworn allegiance to the 
 D:sons of Feanor, it was Uldor's treachery that turned the tide of the Battle 
 D:of Unnumbered Tears in Morgoth's favour. 
@@ -17281,15 +23066,26 @@ B:KICK:HURT:10d2
 B:KICK:HURT:10d2
 B:KICK:HURT:10d2
 B:KICK:HURT:10d2
-F:MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE | DROP_SKELETON | 
-F:ONLY_ITEM | DROP_1D2 | 
-F:INVISIBLE | OPEN_DOOR | BASH_DOOR | 
-F:IM_ACID | IM_POIS | NO_CONF | NO_SLEEP | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_6 | 
-S:HEAL | 
-S:S_SPIDER | S_ANIMAL
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_POIS
+F:INVISIBLE
+F:MALE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+S:1_IN_6
+S:HEAL
+S:S_ANIMAL
+S:S_SPIDER
 D:An adept at unarmed combat, the mystic strikes with stunning power. He 
 D:can summon help from nature and is able to focus his power to ease any 
 D:pain. 
@@ -17304,14 +23100,36 @@ B:HIT:HURT:4d6
 B:HIT:HURT:4d6
 B:BITE:EXP_80:5d6
 B:BITE:EXP_80:5d6
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:DROP_60 | DROP_4D2 | DROP_GOOD | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | REGENERATE | RES_TELE | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_7 | 
-S:BLIND | HOLD | SCARE | CAUSE_3 | CAUSE_4 | DRAIN_MANA | 
-S:BRAIN_SMASH | DARKNESS | BO_NETH | S_UNDEAD
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_4D2
+F:DROP_60
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:REGENERATE
+F:RES_TELE
+F:UNDEAD
+S:1_IN_7
+S:BLIND
+S:BO_NETH
+S:BRAIN_SMASH
+S:CAUSE_3
+S:CAUSE_4
+S:DARKNESS
+S:DRAIN_MANA
+S:HOLD
+S:SCARE
+S:S_UNDEAD
 D:A terrible robed undead figure, this creature has existed in its 
 D:unlife for many centuries by stealing the life of others. It can 
 D:summon the very shades of its victims from beyond the grave to 
@@ -17327,12 +23145,29 @@ B:HIT:HURT:5d8
 B:HIT:HURT:5d8
 B:HIT:HURT:5d8
 B:HIT:HURT:5d8
-F:UNIQUE | MALE | CAN_SPEAK | DROP_CORPSE | DROP_SKELETON | 
-F:FORCE_MAXHP | IM_FIRE | IM_COLD | IM_ELEC | SPECIAL_GENE | 
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | DROP_RANDART
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_10 | S_KIN | S_MONSTERS
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_RANDART
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SPECIAL_GENE
+F:TAKE_ITEM
+F:UNIQUE
+S:1_IN_10
+S:S_KIN
+S:S_MONSTERS
 D:A short and swarthy Easterling dressed in black.  He and his three sons 
 D:once openly swore allegiance to the High Elves, but were secretly in the 
 D:pay of Morgoth. 
@@ -17346,15 +23181,26 @@ O:0:0:100:0
 B:HIT:HURT:2d6
 B:HIT:HURT:2d6
 B:HIT:HURT:2d6
-F:MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE | DROP_SKELETON
-F:RES_NETH | RES_NEXU | 
-F:ONLY_ITEM | DROP_1D2 | 
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:TPORT | HOLD | 
-S:S_DEMON | BO_FIRE
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_NETH
+F:RES_NEXU
+F:SMART
+S:1_IN_2
+S:BO_FIRE
+S:HOLD
+S:S_DEMON
+S:TPORT
 D:A figure twisted by evil standing in robes of deepest crimson. 
 
 N:992:Hezrou
@@ -17365,13 +23211,22 @@ E:1:1:1:2:1:1
 O:0:50:50:0
 B:HIT:HURT:3d4
 B:HIT:HURT:3d4
-F:FORCE_SLEEP | FORCE_MAXHP | FRIENDS
-F:ONLY_ITEM | DROP_2D2 | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | 
-F:EVIL | DEMON | IM_FIRE | NO_CONF | NO_SLEEP | NONLIVING 
-F:BASEANGBAND
-S:1_IN_9 | 
-S:BO_FIRE | 
+F:BASH_DOOR
+F:DEMON
+F:DROP_2D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:FRIENDS
+F:IM_FIRE
+F:NONLIVING
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+S:1_IN_9
+S:BO_FIRE
 S:S_DEMON
 D:It is a demon of lizard form with cruel-looking jaws. 
 
@@ -17383,13 +23238,21 @@ E:1:1:1:2:1:1
 O:0:50:50:0
 B:HIT:HURT:3d4
 B:HIT:HURT:3d4
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_90 | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | 
-F:EVIL | DEMON | IM_FIRE | NO_CONF | NO_SLEEP | NONLIVING | 
-F:BASEANGBAND
-S:1_IN_9 | 
-S:BO_FIRE | 
+F:BASH_DOOR
+F:DEMON
+F:DROP_90
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_FIRE
+F:NONLIVING
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+S:1_IN_9
+S:BO_FIRE
 S:S_DEMON
 D:It is a demon with arms and pincers, its form a true mockery of life. 
 
@@ -17402,15 +23265,24 @@ O:0:50:50:0
 B:HIT:HURT:3d4
 B:HIT:HURT:3d4
 B:HIT:HURT:3d4
-F:FORCE_SLEEP | FORCE_MAXHP | AURA_FIRE
-F:ONLY_ITEM | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | 
-F:EVIL | DEMON | 
-F:IM_FIRE | NO_CONF | NO_SLEEP | NONLIVING
-F:BASEANGBAND
-S:1_IN_9 | 
-S:BLIND | CONF | 
-S:BR_FIRE | 
+F:AURA_FIRE
+F:BASH_DOOR
+F:DEMON
+F:DROP_1D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_FIRE
+F:NONLIVING
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+S:1_IN_9
+S:BLIND
+S:BR_FIRE
+S:CONF
 S:S_DEMON
 D:It is a large demon with the head of a giant boar. Flames run up and down 
 D:its length. 
@@ -17425,14 +23297,24 @@ B:HIT:HURT:3d6
 B:HIT:HURT:3d6
 B:HIT:HURT:3d6
 B:HIT:HURT:3d6
-F:FEMALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_1D2 | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | 
-F:EVIL | DEMON | IM_FIRE | NO_CONF | NO_SLEEP | NONLIVING | 
-F:BASEANGBAND
-S:1_IN_9 | 
-S:BLIND | CAUSE_2 | 
+F:BASH_DOOR
+F:DEMON
+F:DROP_1D2
+F:DROP_CORPSE
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_FIRE
+F:NONLIVING
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+S:1_IN_9
+S:BLIND
+S:CAUSE_2
 S:S_DEMON
 D:She is a demon of female form with many arms, each bearing deadly weapons. 
 
@@ -17446,14 +23328,29 @@ B:HIT:FIRE:4d12
 B:HIT:FIRE:4d12
 B:CRUSH:HURT:3d12
 B:TOUCH:UN_POWER
-F:FORCE_SLEEP | FORCE_MAXHP | AURA_FIRE | KILL_WALL | 
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DEMON | IM_FIRE | NO_CONF | NO_SLEEP | NONLIVING | 
-F:BASEANGBAND | HAS_LITE
-S:1_IN_4 | 
-S:BLIND | CONF | 
-S:BR_FIRE | 
+F:AURA_FIRE
+F:BASH_DOOR
+F:DEMON
+F:DROP_1D2
+F:DROP_2D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:KILL_WALL
+F:MOVE_BODY
+F:NONLIVING
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+S:1_IN_4
+S:BLIND
+S:BR_FIRE
+S:CONF
 S:S_DEMON
 D:It is a massive humanoid demon wreathed in flames. 
 
@@ -17467,16 +23364,30 @@ B:KICK:HURT:10d2
 B:KICK:HURT:10d2
 B:HIT:POISON:20d1
 B:HIT:PARALYZE:15d1
-F:MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE | DROP_SKELETON | 
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | 
-F:INVISIBLE | OPEN_DOOR | BASH_DOOR | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:HEAL | 
-S:S_SPIDER | S_ANIMALS
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:MALE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+S:1_IN_3
+S:HEAL
+S:S_ANIMALS
+S:S_SPIDER
 D:A lord of all that is natural, skilled in the mystic ways. He is a master 
 D:of martial arts and is at one with nature, able to summon help from the 
 D:wild if need be.
@@ -17491,15 +23402,31 @@ B:KICK:HURT:20d2
 B:KICK:HURT:10d2
 B:HIT:POISON:20d1
 B:HIT:PARALYZE:15d1
-F:MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE | DROP_SKELETON | 
-F:ONLY_ITEM | DROP_4D2 | 
-F:INVISIBLE | OPEN_DOOR | BASH_DOOR | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:HEAL | MIND_BLAST | 
-S:S_SPIDER | S_HOUND | S_ANIMALS
+F:BASH_DOOR
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:MALE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+S:1_IN_2
+S:HEAL
+S:MIND_BLAST
+S:S_ANIMALS
+S:S_HOUND
+S:S_SPIDER
 D:He is one of the few true masters of the art, being extremely skillful in 
 D:all forms of unarmed combat and controlling the world's natural creatures 
 D:with disdainful ease. 
@@ -17512,15 +23439,24 @@ E:1:1:1:2:1:1
 O:0:50:50:0
 B:HIT:HURT:3d4
 B:TOUCH:LOSE_STR:1d5
-F:FEMALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | 
-F:EVIL | DEMON | 
-F:IM_FIRE | IM_POIS | NO_CONF | NO_SLEEP | 
-F:BASEANGBAND
-S:1_IN_7 | 
-S:BLIND | CONF | BO_FIRE
+F:BASH_DOOR
+F:DEMON
+F:DROP_60
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+S:1_IN_7
+S:BLIND
+S:BO_FIRE
+S:CONF
 D:It is a lesser demon of female form; however, she takes little time to 
 D:show her true colours. 
 
@@ -17531,10 +23467,20 @@ W:4:1:900:18
 E:1:1:1:2:1:1
 O:0:50:0:30
 B:HIT:HURT:1d6
-F:DROP_60 | WILD_TOO |
-F:OPEN_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND | HAS_LITE | NO_CONF | NO_SLEEP
-S:1_IN_9 | BLIND | SLOW | CONF | SCARE
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:OPEN_DOOR
+F:WILD_TOO
+S:1_IN_9
+S:BLIND
+S:CONF
+S:SCARE
+S:SLOW
 D:A novice in the arts of mind over matter.
 
 N:1001:Polyphemus, the Blind Cyclops
@@ -17547,13 +23493,33 @@ B:HIT:HURT:11d10
 B:HIT:SHATTER:11d10
 B:HIT:HURT:11d10
 B:HIT:SHATTER:11d10
-F:UNIQUE | MALE | BASEANGBAND | HAS_LITE | CAN_SWIM | 
-F:FORCE_SLEEP | FORCE_MAXHP | RAND_25 | DROP_CORPSE | 
-F:DROP_2D2 | DROP_3D2 | DROP_GOOD | ONLY_ITEM | KILL_ITEM | 
-F:BASH_DOOR | KILL_BODY | 
-F:EVIL | GIANT | IM_ACID | IM_POIS | IM_FIRE | IM_COLD | 
-S:1_IN_5 | 
-S:BO_WATE | BA_WATE | BO_ICEE | BA_ACID | ARROW_4
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GIANT
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:KILL_ITEM
+F:MALE
+F:ONLY_ITEM
+F:RAND_25
+F:UNIQUE
+S:1_IN_5
+S:ARROW_4
+S:BA_ACID
+S:BA_WATE
+S:BO_ICEE
+S:BO_WATE
 D:No ordinary cyclops, but the son of a sea-god:  he wields the powers of 
 D:elemental water as well as the considerable strength of a cyclops.  His 
 D:one eye was blinded long ago by the warrior Odysseus, but he has trained 
@@ -17569,36 +23535,34 @@ B:CLAW:HURT:4d12
 B:CLAW:HURT:4d12
 B:BITE:CONFUSE:6d14
 B:BITE:CONFUSE:6d14
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:SMART | BASH_DOOR | POWERFUL | MOVE_BODY | DROP_CORPSE | 
-F:EVIL | DRAGON | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE | ATTR_MULTI
-S:1_IN_4 | 
-S:BLIND | CONF | SCARE | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:POWERFUL
+F:SMART
+S:1_IN_4
+S:BLIND
 S:BR_CONF
+S:CONF
+S:SCARE
 D:A dragon of great size and power.  Its polished bronze scales reflect the 
 D:light in strange and confusing patterns, and you find it hard to keep your 
 D:mind on the job of fighting for your life. 
 
-N:1003:Hound of Tindalos
-G:Z:s
-I:120:60d15:30:100:0
-W:59:3:600:8000
-E:0:1:0:2:1:0
-O:0:0:0:0
-B:BITE:TIME:2d12
-B:BITE:TIME:2d12
-B:CLAW:HURT:2d12
-B:CLAW:HURT:2d12
-F:FORCE_SLEEP | FRIENDS | RES_NETH |
-F:INVISIBLE | PASS_WALL | EVIL | CAN_FLY |
-F:ANIMAL | NO_CONF | NO_SLEEP | CTHANGBAND
-S:1_IN_5 | BLINK | TELE_TO |  
-S:BR_NETH | BR_TIME
-D:"They are lean and athirst!... All the evil in the universe 
-D:was concentrated in their lean, hungry bodies. Or had they 
-D:bodies? I saw them only for a moment, I cannot be certain." 
-
 N:1004:Great Wyrm of Thunder
 G:D:y
 I:120:50d100:30:150:80
@@ -17609,14 +23573,30 @@ B:CLAW:HURT:4d12
 B:CLAW:HURT:4d12
 B:BITE:HURT:6d14
 B:BITE:HURT:6d14
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:BASH_DOOR | POWERFUL | MOVE_BODY | DROP_CORPSE | 
-F:EVIL | DRAGON | NO_CONF | NO_SLEEP | NO_STUN | BASEANGBAND | HAS_LITE
 F:ATTR_MULTI
-S:1_IN_4 | 
-S:BLIND | CONF | SCARE | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:POWERFUL
+S:1_IN_4
+S:BLIND
 S:BR_SOUN
+S:CONF
+S:SCARE
 D:A dragon of gigantic proportions, with destructive abilities to match.  The
 D:sheer loudness of its roar leaves you stunned and unable to think clearly 
 D:enough to defend yourself adequately. 
@@ -17628,8 +23608,11 @@ W:4:1:200:1
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:EAT_LITE:1d2
-F:RAND_25 | CAN_SWIM | ANIMAL | 
-F:DROP_CORPSE | MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_SWIM
+F:DROP_CORPSE
+F:MORTAL
+F:RAND_25
 S:MULTIPLY
 D:It is about three feet long with large teeth.  As the light of your lamp falls 
 D:on it, it seems to grow stronger.
@@ -17644,9 +23627,15 @@ B:CLAW:HURT:3d2
 B:CLAW:HURT:3d2
 B:BITE:DISEASE:4d2
 B:BITE:DISEASE:4d2
-F:UNIQUE | ESCORT | ESCORTS | FORCE_MAXHP |
-F:BASH_DOOR | ANIMAL | NO_CONF | NO_SLEEP
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:ESCORT
+F:ESCORTS
+F:FORCE_MAXHP
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:UNIQUE
 D:A massive rat. He's the leader of the pack.
 
 N:1007:Vort the Kobold Queen
@@ -17657,14 +23646,28 @@ E:1:1:1:2:1:1
 O:0:100:0:0
 B:HIT:HURT:1d10
 B:HIT:HURT:1d10
-F:UNIQUE | FEMALE | CAN_SPEAK | 
-F:FORCE_MAXHP | 
-F:ESCORT | ESCORTS | DROP_SKELETON | DROP_CORPSE 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_6 | MISSILE | HEAL | CAUSE_1 | CONF
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:ESCORTS
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_POIS
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNIQUE
+S:1_IN_6
+S:CAUSE_1
+S:CONF
+S:HEAL
+S:MISSILE
 D:Where Mughash is the strongest of his kind, his consort Vort is the 
 D:wisest: she is her tribe's chief shamaness. 
 
@@ -17675,8 +23678,12 @@ W:14:1:100:3
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:BITE:HURT:1d2
-F:RAND_50 | RAND_25 | CAN_FLY | WEIRD_MIND | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:MORTAL
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
 S:MULTIPLY
 D:It is six inches long. 
 
@@ -17687,13 +23694,31 @@ W:34:5:0:1200
 E:0:0:0:0:0:0
 O:0:0:100:0
 B:HIT:HURT:5d5
-F:UNIQUE | MALE | CAN_SPEAK
-F:FORCE_MAXHP | UNDEAD | NO_CONF | NO_SLEEP | REGENERATE | NO_STUN |
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | PASS_WALL | 
-F:MORTAL | BASEANGBAND | HAS_LITE | NO_CUT
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:PASS_WALL
+F:REGENERATE
+F:TAKE_ITEM
+F:UNDEAD
+F:UNIQUE
 S:1_IN_6
-S:BR_FIRE | HOLD | CONF | SCARE | MIND_BLAST
+S:BR_FIRE
+S:CONF
+S:HOLD
+S:MIND_BLAST
+S:SCARE
 D:He's back from the grave for vengeance on those who 
 D:burnt him. He has no mercy for those in his way. 
 
@@ -17704,41 +23729,39 @@ W:36:2:1500:1200
 E:1:1:1:2:1:1
 O:20:20:20:20
 B:HIT:HURT:3d8
-F:UNIQUE | MALE | CAN_SPEAK | ATTR_MULTI | 
-F:FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | DROP_SKELETON | DROP_CORPSE
-F:OPEN_DOOR | BASH_DOOR | RAND_25 |
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR
-F:JOKEANGBAND | HAS_LITE
-S:1_IN_4 | 
-S:TELE_TO | SHRIEK | SCARE
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:JOKEANGBAND
+F:MALE
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RAND_25
+F:UNIQUE
+S:1_IN_4
+S:SCARE
+S:SHRIEK
+S:TELE_TO
 D:Once a powerful adventurer, this poor fighter has seen a few too many 
 D:software bugs in his time. Any shred of lucidity is long gone, but 
 D:he still remains dangerous. He wanders aimlessly through the dungeon 
 D:randomly striking at foes both real and imagined, all the while screaming 
 D:out at the world that caused his condition. 
 
-N:1011:Glaryssa, Succubus Queen
-G:U:W
-I:120:12d100:90:60:10
-W:41:3:3000:8000
-E:1:1:1:2:1:1
-O:0:50:50:0
-B:CLAW:HURT:5d5
-B:HIT:LOSE_STR:4d4
-B:TOUCH:EXP_80:8d3
-F:UNIQUE | FEMALE | CAN_SPEAK | 
-F:FORCE_SLEEP | FORCE_MAXHP | NO_SLEEP | NO_CONF
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | 
-F:COLD_BLOOD | PASS_WALL | MOVE_BODY | NONLIVING |
-F:OPEN_DOOR | BASH_DOOR | IM_POIS | IM_COLD | DEMON | EVIL | 
-F:ZANGBAND
-S:1_IN_3 |
-S:CAUSE_3 | HOLD | BLIND | BO_ACID | S_DEMON |
-S:FORGET | BO_NETH | MIND_BLAST | DARKNESS
-D:Drop dead gorgeous - literally. 
-
 N:1012:Vermicious Knid
 G:j:s
 I:110:90d10:20:55:100
@@ -17748,11 +23771,20 @@ O:40:30:20:10
 B:TOUCH:TERRIFY:4d6
 B:CRAWL:HURT:4d6
 B:ENGULF:HURT:4d6
-F:FRIENDS | EVIL | IM_COLD | SMART |
-F:COLD_BLOOD | NO_FEAR | WEIRD_MIND |
-F:OPEN_DOOR | ONLY_ITEM | DROP_2D2 | HURT_ROCK | 
-F:NONLIVING | 
-F:JOKEANGBAND | NO_CUT
+F:COLD_BLOOD
+F:DROP_2D2
+F:EVIL
+F:FRIENDS
+F:HURT_ROCK
+F:IM_COLD
+F:JOKEANGBAND
+F:NONLIVING
+F:NO_CUT
+F:NO_FEAR
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:WEIRD_MIND
 D:An amorphous shape that looks like wet grey clay with two pale eyes. 
 D:It is totally silent as it oozes towards you.  
 
@@ -17766,32 +23798,34 @@ B:HIT:UN_BONUS:8d8
 B:HIT:UN_BONUS:8d8
 B:HIT:LOSE_STR:6d6
 B:HIT:LOSE_STR:6d6
-F:FORCE_SLEEP | FORCE_MAXHP | EMPTY_MIND | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | IM_FIRE | IM_ELEC | RES_TELE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | BASEANGBAND | NO_CUT
-S:1_IN_3 | 
-S:TELE_TO | CAUSE_4 | DRAIN_MANA | 
-S:BRAIN_SMASH | BA_NETH | S_HI_UNDEAD
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:RES_TELE
+F:UNDEAD
+S:1_IN_3
+S:BA_NETH
+S:BRAIN_SMASH
+S:CAUSE_4
+S:DRAIN_MANA
+S:S_HI_UNDEAD
+S:TELE_TO
 D:A skeletal form, black as night, constructed from the bones of its 
 D:previous victims. 
 
-N:1014:Snake of Yig
-G:J:b
-I:120:48d10:25:80:30
-W:38:4:2000:600
-E:0:0:0:0:1:0
-O:0:0:0:0
-B:BITE:POISON:3d12
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:RAND_25 | FRIENDS | AURA_FIRE |
-F:BASH_DOOR | MOVE_BODY | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | HAS_EGG | EVIL | IM_FIRE | IM_POIS | 
-F:MORTAL | ZANGBAND
-S:1_IN_5 | 
-S:BR_POIS
-D:It is a giant snake that drips with poison. 
-
 N:1015:Bronze golem
 G:g:o
 E:2:1:2:4:1:1
@@ -17802,154 +23836,30 @@ B:HIT:HURT:10d10
 B:HIT:HURT:10d10
 B:HIT:HURT:10d10
 B:HIT:HURT:10d10
-F:FORCE_MAXHP | FORCE_SLEEP | EMPTY_MIND | COLD_BLOOD | 
-F:OPEN_DOOR | BASH_DOOR | IM_FIRE | IM_ELEC | IM_POIS | RES_TELE | 
-F:NO_CONF | NO_SLEEP | NO_STUN | NO_FEAR | NONLIVING | BASEANGBAND | NO_CUT
-S:1_IN_3 |
-S:BO_PLAS | BA_FIRE | BR_FIRE | BA_ELEC | S_HI_DEMON | TELE_TO
-D:A gigantic four-armed animated bronze statue, glowing with great heat. 
-
-N:1016:Dimensional shambler
-G:h:B
-I:120:40d10:30:68:255
-W:29:6:1100:400
-E:0:0:0:0:0:0
-O:20:40:40:0
-B:HIT:HURT:3d5
-B:HIT:HURT:3d5
-B:HIT:HURT:3d5
-F:FORCE_MAXHP | FORCE_SLEEP | NO_FEAR | GOOD |
-F:ONLY_ITEM | DROP_2D2 | NONLIVING | 
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR | POWERFUL | 
-F:IM_FIRE | IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | RES_TELE | 
-F:CTHANGBAND
-S:1_IN_3 | 
-S:HEAL | HASTE | BLIND | CONF | SCARE | TPORT | BLINK
-D:A shabby humanoid with a wrinkled skin. It seems to shift 
-D:in and out of existence as you watch. 
-
-N:1017:Cultist
-G:p:G
-I:110:14d8:20:22:40
-W:17:1:1500:36
-E:1:1:1:2:1:1
-O:10:0:90:0
-B:HIT:HURT:4d3
-F:MALE | 
-F:FORCE_SLEEP | 
-F:DROP_1D2 | EVIL |
-F:DROP_SKELETON | DROP_CORPSE | 
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | CTHANGBAND | HAS_LITE
-S:1_IN_3 |
-S:HEAL | SCARE | CAUSE_2 |
-S:S_MONSTER | MIND_BLAST
-D:A robed humanoid dedicated to a demonic outer god. 
-
-N:1018:Cult leader
-G:p:G
-I:120:52d14:20:60:10
-W:47:2:1800:1800
-E:1:1:1:2:1:1
-O:20:0:80:0
-B:HIT:HURT:6d4
-B:HIT:HURT:6d4
-F:MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_90 | DROP_2D2 | 
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | NO_CONF | NO_SLEEP | 
-F:MORTAL | CTHANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:HEAL | BLIND | HOLD | CONF | CAUSE_3 | 
-S:S_MONSTER | S_UNDEAD | S_DEMON | BA_CHAO | BRAIN_SMASH
-D:An evil priest, dressed all in black and devoted to one of the netherworld
-D:demons that call themselves "the outer gods". 
-
-N:1019:Servitor of the outer gods
-G:H:y
-I:130:100d35:30:140:255
-W:41:6:2100:15000
-E:0:0:0:0:0:0
-O:10:20:70:0
-B:GAZE:TERRIFY:4d4
-B:HIT:HURT:8d6
-F:FORCE_SLEEP | 
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | NO_FEAR | REFLECTING |
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | NONLIVING | 
-F:RES_TELE | ELDRITCH_HORROR | SHAPECHANGER | ATTR_MULTI | 
-F:CTHANGBAND
-S:1_IN_3 | 
-S:TELE_TO | BLIND | SCARE | CAUSE_2 | CAUSE_4 | BO_MANA | 
-S:S_UNDEAD
-D:"Toad-like creatures which seemed constantly to be changing shape and 
-D:appearance, and from whom emanated, by some means I could not distinguish, 
-D:a ghostly ululation, a piping." August Derleth - "The Lurker at The 
-D:Threshold". 
-
-N:1020:Avatar of Nyarlathotep
-G:p:R
-I:120:25d25:20:70:20
-W:45:2:0:500
-E:0:0:0:0:0:0
-O:0:0:0:0
-B:HIT:HURT:5d5
-F:IM_POIS | IM_FIRE | IM_ELEC | IM_ACID | IM_COLD |
-F:NO_SLEEP | NO_FEAR | SHAPECHANGER | ELDRITCH_HORROR | NONLIVING | 
-F:MALE | OPEN_DOOR | BASH_DOOR | 
-F:CTHANGBAND | HAS_LITE
-D:The Crawling Chaos with a thousand forms. Nyarlathotep is amused at your 
-D:puny attempts to kill him, and will keep coming back for another go 
-D:until he gets bored with the game. 
-
-N:1021:Thiazi, the Storm Giant
-G:P:B
-I:130:99d110:50:160:20
-W:78:2:0:45000
-E:1:1:1:2:1:1
-O:0:100:0:0
-B:HIT:ELEC:9d11
-B:HIT:HURT:9d11
-B:HIT:ELEC:9d11
-B:HIT:HURT:9d11
-F:UNIQUE | SUSCEP_COLD | CAN_FLY | 
-F:FORCE_SLEEP | FORCE_MAXHP | RES_TELE | RES_NETH | RES_PLAS | MALE |
-F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | DROP_GOOD | EVIL | AURA_ELEC | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | TAKE_ITEM | CAN_SPEAK |
-F:EVIL | IM_FIRE | IM_POIS | SUSCEP_COLD | GIANT | DEMON
-F:ZANGBAND | HAS_LITE
-S:1_IN_5 | 
-S:BR_ELEC | BR_PLAS | BR_MANA | BLIND | TELE_TO | S_KIN | S_HI_DRAGON | 
-S:HAND_DOOM | TELE_AWAY
-D:Thiazi is the greatest of all the Storm Giants: when travelling, he takes 
-D:the form of a giant eagle.  It was he who succeeded in kidnapping Iduna and 
-D:her apples of youth from Asgard itself. 
-
-N:1022:Hypnos, Lord of Sleep
-G:p:G
-I:130:51d99:20:150:10
-W:67:2:5000:36000
-E:1:1:1:2:1:1
-O:0:0:100:0
-B:TOUCH:LOSE_ALL:2d25
-B:GAZE:PARALYZE:1d20
-B:GAZE:TERRIFY:1d20
-B:GAZE:BLIND:1d20
-F:UNIQUE | MALE | CAN_SPEAK | ATTR_MULTI | 
-F:NO_STUN | RES_DISE | RES_NEXU | CAN_FLY |
-F:FORCE_SLEEP | FORCE_MAXHP | EVIL | SMART | DROP_CORPSE
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD |
-F:NO_SLEEP | NO_CONF | NO_STUN | IM_POIS | IM_COLD | IM_FIRE | IM_ACID
-F:ZANGBAND | HAS_LITE
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:OPEN_DOOR
+F:RES_TELE
 S:1_IN_3
-S:BR_NEXU | BR_CHAO | HOLD | SLOW | BR_INER | BA_NUKE |
-S:MIND_BLAST | BRAIN_SMASH | CONF | BLIND | TELE_TO | HEAL |
-S:TELE_AWAY | TELE_LEVEL | TPORT | S_UNDEAD | S_DEMON | DRAIN_MANA
-D:"Young with the youth that is outside time, and with a handsome 
-D:bearded face, curved, smiling lips, Olympian brow; and dense locks 
-D:waving and poppy-crowned." 
+S:BA_ELEC
+S:BA_FIRE
+S:BO_PLAS
+S:BR_FIRE
+S:S_HI_DEMON
+S:TELE_TO
+D:A gigantic four-armed animated bronze statue, glowing with great heat. 
 
 N:1023:Blue dragon worm
 G:w:B
@@ -17960,13 +23870,21 @@ O:0:0:0:0
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
 B:BITE:HURT:3d5
-F:RAND_50 | RAND_25 |
-F:DROP_60 | ONLY_GOLD | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DRAGON | IM_ELEC | 
-F:MORTAL | BASEANGBAND | ATTR_MULTI
-S:MULTIPLY | 
-S:1_IN_6 | BR_ELEC
+F:ATTR_MULTI
+F:BASH_DOOR
+F:DRAGON
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:IM_ELEC
+F:MORTAL
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:RAND_25
+F:RAND_50
+S:1_IN_6
+S:BR_ELEC
+S:MULTIPLY
 D:You thought dragons used eggs, but this worm has the scales, and the bad  
 D:breath, and the fiery eyes, of a real dragon. Sparks fly from its jaws.
 
@@ -17979,13 +23897,21 @@ O:0:0:0:0
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
 B:BITE:HURT:3d5
-F:RAND_50 | RAND_25 |
-F:DROP_60 | ONLY_GOLD | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DRAGON | IM_COLD | 
-F:MORTAL | BASEANGBAND | ATTR_MULTI
-S:MULTIPLY | 
-S:1_IN_6 | BR_COLD
+F:ATTR_MULTI
+F:BASH_DOOR
+F:DRAGON
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:IM_COLD
+F:MORTAL
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:RAND_25
+F:RAND_50
+S:1_IN_6
+S:BR_COLD
+S:MULTIPLY
 D:You thought dragons used eggs, but this worm has the scales, and the bad  
 D:breath, and the fiery eyes, of a real dragon. Its breath condenses in the air.
 
@@ -17998,13 +23924,21 @@ O:0:0:0:0
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
 B:BITE:HURT:3d5
-F:RAND_50 | RAND_25 |
-F:DROP_60 | ONLY_GOLD | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DRAGON | IM_POIS | 
-F:MORTAL | BASEANGBAND | ATTR_MULTI
-S:MULTIPLY | 
-S:1_IN_6 | BR_POIS
+F:ATTR_MULTI
+F:BASH_DOOR
+F:DRAGON
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:IM_POIS
+F:MORTAL
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:RAND_25
+F:RAND_50
+S:1_IN_6
+S:BR_POIS
+S:MULTIPLY
 D:You thought dragons used eggs, but this worm has the scales, and the bad 
 D:breath, and the fiery eyes, of a real dragon. You can smell foul gases 
 D:on its breath.
@@ -18018,13 +23952,21 @@ O:0:0:0:0
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
 B:BITE:HURT:3d5
-F:RAND_50 | RAND_25 |
-F:DROP_60 | ONLY_GOLD | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DRAGON | IM_ACID | 
-F:MORTAL | BASEANGBAND | ATTR_MULTI
-S:MULTIPLY | 
-S:1_IN_6 | BR_ACID
+F:ATTR_MULTI
+F:BASH_DOOR
+F:DRAGON
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:IM_ACID
+F:MORTAL
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:RAND_25
+F:RAND_50
+S:1_IN_6
+S:BR_ACID
+S:MULTIPLY
 D:You thought dragons used eggs, but this worm has the scales, and the bad  
 D:breath, and the fiery eyes, of a real dragon. Acidic drool drips from its jaws.
 
@@ -18037,13 +23979,21 @@ O:0:0:0:0
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
 B:BITE:HURT:3d5
-F:RAND_50 | RAND_25 |
-F:DROP_60 | ONLY_GOLD | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DRAGON | IM_FIRE | 
-F:MORTAL | BASEANGBAND | ATTR_MULTI
-S:MULTIPLY | 
-S:1_IN_6 | BR_FIRE
+F:ATTR_MULTI
+F:BASH_DOOR
+F:DRAGON
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:IM_FIRE
+F:MORTAL
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:RAND_25
+F:RAND_50
+S:1_IN_6
+S:BR_FIRE
+S:MULTIPLY
 D:You thought dragons used eggs, but this worm has the scales, and the bad  
 D:breath, and the fiery eyes, of a real dragon. Smoke comes from its mouth. 
 
@@ -18056,13 +24006,29 @@ O:0:0:0:0
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
 B:BITE:HURT:3d5
-F:RAND_50 | RAND_25 | ATTR_MULTI | 
-F:DROP_60 | ONLY_GOLD | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DRAGON | IM_ELEC | IM_FIRE | IM_ACID | IM_COLD | IM_POIS | 
-F:MORTAL | BASEANGBAND
-S:MULTIPLY | 
-S:1_IN_6 | BR_ELEC | BR_COLD | BR_FIRE | BR_ACID | BR_POIS
+F:ATTR_MULTI
+F:BASH_DOOR
+F:DRAGON
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:RAND_25
+F:RAND_50
+S:1_IN_6
+S:BR_ACID
+S:BR_COLD
+S:BR_ELEC
+S:BR_FIRE
+S:BR_POIS
+S:MULTIPLY
 D:You thought dragons used eggs, but this worm has the scales, and the bad 
 D:breath, and the fiery eyes, of a real dragon. Its scales shimmer different 
 D:colours as you watch. 
@@ -18077,9 +24043,13 @@ B:BUTT:HURT:4d6
 B:BUTT:HURT:4d6
 B:BUTT:HURT:3d6
 B:BUTT:HURT:3d6
-F:BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | UNIQUE | SPECIAL_GENE | 
-F:MORTAL | BASEANGBAND
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:MORTAL
+F:SPECIAL_GENE
+F:UNIQUE
 D:It is a cross between a human and a bull. 
 
 N:1030:The Sandworm Queen
@@ -18092,11 +24062,32 @@ B:CLAW:ACID:5d4
 B:CLAW:POISON:5d4
 B:BITE:FIRE:5d4
 B:BITE:ELEC:5d4
-F:FORCE_MAXHP | DROP_60 | ONLY_ITEM | DROP_GREAT | DROP_GOOD | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | FEMALE | POWERFUL | SPECIAL_GENE | REFLECTING |
-F:EVIL | ANIMAL | IM_ELEC | IM_FIRE | IM_ACID | IM_POIS | ESCORT | 
-F:MORTAL | BASEANGBAND | EMPTY_MIND | UNIQUE | NO_CONF
-S:1_IN_2 | BR_POIS | S_KIN
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:EMPTY_MIND
+F:ESCORT
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:IM_ACID
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:NO_CONF
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:REFLECTING
+F:SPECIAL_GENE
+F:UNIQUE
+S:1_IN_2
+S:BR_POIS
+S:S_KIN
 D:Queen and mother of the sandworms, fear her and her prolific children. 
 
 N:1031:Sandworm
@@ -18109,10 +24100,16 @@ B:CLAW:POISON:4d4
 B:CLAW:POISON:4d4
 B:CLAW:POISON:4d4
 B:BITE:HURT:5d5
-F:RAND_25 |
-F:FORCE_MAXHP | DROP_CORPSE | POWERFUL | 
-F:EVIL | IM_ELEC | IM_FIRE | IM_POIS | EMPTY_MIND | 
-F:MORTAL | BASEANGBAND
+F:DROP_CORPSE
+F:EMPTY_MIND
+F:EVIL
+F:FORCE_MAXHP
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:POWERFUL
+F:RAND_25
 S:MULTIPLY
 D:Offbreed of the Sandworm Queen, they are harmless alone... 
 
@@ -18127,17 +24124,41 @@ B:GAZE:UN_BONUS:10d10
 B:GAZE:TIME:10d10
 B:GAZE:INSANITY:10d10
 B:GAZE:INSANITY:10d5
-F:UNIQUE | SPECIAL_GENE | 
-F:FORCE_MAXHP | POWERFUL | 
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT | 
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | WEIRD_MIND | 
-F:EVIL | UNDEAD | IM_COLD | IM_FIRE | IM_ACID | IM_ELEC | AURA_COLD |
-F:IM_POIS | RES_NETH | BASEANGBAND | NO_CUT
-S:1_IN_2 | 
-S:S_UNDEAD | S_DEMON | S_DRAGON | 
-S:S_UNIQUE | S_WRAITH | S_HI_DEMON | 
-S:S_HI_UNDEAD | S_HI_DRAGON | S_KIN | 
-S:BR_DISE | BA_NETH
+F:AURA_COLD
+F:COLD_BLOOD
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_MAXHP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:NO_CUT
+F:ONLY_ITEM
+F:PASS_WALL
+F:POWERFUL
+F:RES_NETH
+F:SPECIAL_GENE
+F:UNDEAD
+F:UNIQUE
+F:WEIRD_MIND
+S:1_IN_2
+S:BA_NETH
+S:BR_DISE
+S:S_DEMON
+S:S_DRAGON
+S:S_HI_DEMON
+S:S_HI_DRAGON
+S:S_HI_UNDEAD
+S:S_KIN
+S:S_UNDEAD
+S:S_UNIQUE
+S:S_WRAITH
 D:A disembodied and barely sentient mind, Tik'srvzllat floated 
 D:through the void for eons before being awakened by sorcery, pulled 
 D:into the nether realm, and shaped into the being you see before you.  
@@ -18155,13 +24176,37 @@ B:HIT:INSANITY:5d6
 B:HIT:INSANITY:6d6
 B:HIT:INSANITY:7d6
 B:HIT:INSANITY:6d6
-F:COLD_BLOOD | EMPTY_MIND | KILL_WALL | FORCE_MAXHP | POWERFUL | SPECIAL_GENE | 
-F:BASH_DOOR | IM_COLD | IM_ACID | IM_FIRE | IM_ELEC | IM_POIS | NONLIVING | 
-F:ESCORTS | ESCORT | UNIQUE | NO_SLEEP | NO_CONF | NO_FEAR | NO_STUN
-F:CHAR_MULTI | CAN_FLY | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CAN_FLY
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:ESCORT
+F:ESCORTS
+F:FORCE_MAXHP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_WALL
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:POWERFUL
+F:SPECIAL_GENE
+F:UNIQUE
 S:1_IN_4
-S:BR_CONF | BR_LITE | BR_DARK | BR_WALL
-S:S_KIN | TELE_LEVEL | SHRIEK
+S:BR_CONF
+S:BR_DARK
+S:BR_LITE
+S:BR_WALL
+S:SHRIEK
+S:S_KIN
+S:TELE_LEVEL
 D:One of the last creations of the petty dwarves of Ludarin, its existence 
 D:explains their destruction. A creation of finest glass, the body of this 
 D:creature bends and amplifies light in a way that makes you unsure of its 
@@ -18178,14 +24223,37 @@ B:HIT:COLD:4d12
 B:HIT:COLD:4d12
 B:CRUSH:HURT:3d12
 B:TOUCH:UN_POWER
-F:UNIQUE | FORCE_SLEEP | FORCE_MAXHP | AURA_COLD | CAN_FLY |
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | NONLIVING | DROP_RANDART
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | SMART | 
-F:EVIL | DEMON | IM_COLD | NO_CONF | KILL_WALL | BASEANGBAND | 
-F:HAS_LITE | SPECIAL_GENE
-S:1_IN_4 | 
-S:BLIND | CONF | BRAIN_SMASH | 
-S:BR_COLD | BO_COLD | BA_NETH | S_UNDEAD | S_DEMON
+F:AURA_COLD
+F:BASH_DOOR
+F:CAN_FLY
+F:DEMON
+F:DROP_2D2
+F:DROP_GOOD
+F:DROP_RANDART
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:KILL_WALL
+F:MOVE_BODY
+F:NONLIVING
+F:NO_CONF
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:SMART
+F:SPECIAL_GENE
+F:UNIQUE
+S:1_IN_4
+S:BA_NETH
+S:BLIND
+S:BO_COLD
+S:BRAIN_SMASH
+S:BR_COLD
+S:CONF
+S:S_DEMON
+S:S_UNDEAD
 D:It is a massive humanoid demon wreathed in frost, wielding a cruel looking 
 D:pike in its hands. 
 
@@ -18198,11 +24266,31 @@ O:60:0:40:0
 B:HIT:HURT:4d6
 B:HIT:HURT:4d6
 B:HIT:HURT:4d6
-F:FORCE_SLEEP | COLD_BLOOD | EMPTY_MIND | PASS_WALL | KILL_BODY | ESCORT | 
-F:BASH_DOOR | IM_COLD | IM_ACID | IM_ELEC | IM_POIS | NONLIVING | UNIQUE
-F:HURT_ROCK | NO_CONF | NO_SLEEP | NO_CUT | CHAR_MULTI | BASEANGBAND | SPECIAL_GENE
-F:NO_CUT | DROP_RANDART
-S:1_IN_10 | S_KIN | BO_ACID | BA_FIRE
+F:BASH_DOOR
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:DROP_RANDART
+F:EMPTY_MIND
+F:ESCORT
+F:FORCE_SLEEP
+F:HURT_ROCK
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_POIS
+F:KILL_BODY
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
+F:SPECIAL_GENE
+F:UNIQUE
+S:1_IN_10
+S:BA_FIRE
+S:BO_ACID
+S:S_KIN
 D:Deep in the heart of the earth, even the rock itself is sentient 
 D:and has learned to despise intruders. 
 
@@ -18216,12 +24304,29 @@ B:HIT:SHATTER:13d13
 B:HIT:CONFUSE:13d13
 B:HIT:SHATTER:13d13
 B:HIT:CONFUSE:13d13
-F:UNIQUE | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_GOOD | DROP_4D2 | KILL_BODY | KILL_WALL |
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_CORPSE | 
-F:EVIL | GIANT | HURT_ROCK | BASEANGBAND | HAS_LITE | 
-F:IM_FIRE | IM_COLD | IM_ACID | IM_ELEC | IM_POIS
+F:BASH_DOOR
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GIANT
+F:HAS_LITE
+F:HURT_ROCK
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:KILL_WALL
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:TAKE_ITEM
+F:UNIQUE
 D:The strongest of all the Titans.  Legend has it that he once held the sky 
 D:on his shoulders; and the mountain range that now does so is named after him. 
 
@@ -18235,15 +24340,38 @@ B:HIT:CONFUSE:12d12
 B:HIT:CONFUSE:12d12
 E:1:1:1:2:1:1
 O:0:100:0:0
-F:UNIQUE | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | MOVE_BODY | 
-F:ONLY_ITEM | DROP_4D2 | DROP_3D2 | DROP_GOOD | 
-F:SMART | TAKE_ITEM | BASH_DOOR | HAS_LITE | 
-F:EVIL | GIANT | ESCORT | BASEANGBAND | DROP_CORPSE | 
-F:IM_FIRE | IM_COLD | IM_ACID | IM_POIS | IM_ELEC
-S:1_IN_3 |
-S:BR_FIRE | BR_COLD | BR_SHAR | BR_SOUN | ROCKET | 
-S:S_MONSTERS | S_KIN | TELE_TO | HEAL 
+F:BASH_DOOR
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GIANT
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:ONLY_ITEM
+F:SMART
+F:TAKE_ITEM
+F:UNIQUE
+S:1_IN_3
+S:BR_COLD
+S:BR_FIRE
+S:BR_SHAR
+S:BR_SOUN
+S:HEAL
+S:ROCKET
+S:S_KIN
+S:S_MONSTERS
+S:TELE_TO
 D:The lord of the Titans, he has broken loose from his confinement in 
 D:the nether hells to seek revenge on the world. 
 
@@ -18256,9 +24384,17 @@ B:CLAW:HURT:1d4
 B:CLAW:HURT:1d4
 E:0:1:0:2:1:0
 O:0:0:0:0
-F:FORCE_SLEEP | BASH_DOOR | DROP_CORPSE | FRIENDS
-F:ANIMAL | IM_COLD | MORTAL | BASEANGBAND | RES_WATE | NO_CUT
-S:1_IN_5 | BA_WATE
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:FRIENDS
+F:IM_COLD
+F:MORTAL
+F:NO_CUT
+F:RES_WATE
+S:1_IN_5
+S:BA_WATE
 D:The sound of a hundred waterfalls rushes through your ears as 
 D:a huge wave of water, vaguely hound-shaped, rushes towards you.
 
@@ -18272,18 +24408,48 @@ B:SPORE:UN_BONUS:10d10
 B:SPORE:EXP_80:10d10
 B:SPORE:TIME:10d10
 B:SPORE:TIME:10d10
-F:UNIQUE | NEVER_MOVE | CAN_SWIM |
-F:FORCE_MAXHP | WEIRD_MIND | DROP_CORPSE |
-F:REFLECTING | AURA_ELEC | ONLY_ITEM | DROP_4D2 |
-F:DROP_GOOD | DROP_GREAT | FORCE_SLEEP | RES_NETH |
-F:SMART | POWERFUL | RES_TELE | REGENERATE | CAN_FLY |
-F:DG_CURSE | WYRM_PROTECT | EVIL |
-F:IM_ACID | IM_FIRE | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | NO_STUN |
-F:JOKEANGBAND | HAS_LITE | RES_WATE | NO_CUT
-S:1_IN_2 |
-S:S_HI_DRAGON | S_KIN | BR_DISI | HEAL | TPORT |
-S:TELE_LEVEL | TELE_TO
+F:AURA_ELEC
+F:CAN_FLY
+F:CAN_SWIM
+F:DG_CURSE
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:JOKEANGBAND
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:POWERFUL
+F:REFLECTING
+F:REGENERATE
+F:RES_NETH
+F:RES_TELE
+F:RES_WATE
+F:SMART
+F:UNIQUE
+F:WEIRD_MIND
+F:WYRM_PROTECT
+S:1_IN_2
+S:BR_DISI
+S:HEAL
+S:S_HI_DRAGON
+S:S_KIN
+S:TELE_LEVEL
+S:TELE_TO
+S:TPORT
 D:An assistant to DarkGod, Improv has chosen the form of a dense 
 D:purple smog for his incarnation into Middle-earth. It travels the 
 D:dungeons, killing software bugs and creating random artifacts for 
@@ -18299,15 +24465,35 @@ B:HIT:POISON:5d5
 B:HIT:POISON:5d5
 B:HIT:POISON:5d5
 B:HIT:POISON:5d5
-F:MIMIC | UNIQUE
-F:FORCE_SLEEP |
-F:EMPTY_MIND | COLD_BLOOD |
-F:IM_ACID | IM_FIRE | IM_ELEC | IM_COLD | IM_POIS |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_1 | 
-S:BLIND | CONF | SCARE | CAUSE_4 | CAUSE_3 | FORGET | 
-S:BA_ACID | BA_FIRE | BA_COLD | BA_ELEC | 
-S:S_MONSTER | S_KIN | SHRIEK | BRAIN_SMASH | TRAPS
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MIMIC
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:UNIQUE
+S:1_IN_1
+S:BA_ACID
+S:BA_COLD
+S:BA_ELEC
+S:BA_FIRE
+S:BLIND
+S:BRAIN_SMASH
+S:CAUSE_3
+S:CAUSE_4
+S:CONF
+S:FORGET
+S:SCARE
+S:SHRIEK
+S:S_KIN
+S:S_MONSTER
 D:A strange creature that disguises itself as an object to lure 
 D:unsuspecting adventurers within reach of its venomous claws. 
 
@@ -18317,10 +24503,18 @@ I:110:1d1:40:250:3
 W:1:1:730:0
 E:0:1:1:2:1:1
 O:0:0:0:1
-F:FEMALE | CAN_SPEAK
-F:FORCE_MAXHP | SPECIAL_GENE
-F:NEVER_MOVE | NEVER_BLOW | GOOD | NO_TARGET
-F:MORTAL | BASEANGBAND | UNIQUE | NEUTRAL | NO_DEATH
+F:CAN_SPEAK
+F:FEMALE
+F:FORCE_MAXHP
+F:GOOD
+F:MORTAL
+F:NEUTRAL
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_DEATH
+F:NO_TARGET
+F:SPECIAL_GENE
+F:UNIQUE
 D:She seems to seek someone, you may help...
 
 N:1042:Thrain, the King Under the Mountain
@@ -18329,10 +24523,18 @@ I:110:1d1:40:250:3
 W:60:1:730:0
 E:0:1:1:2:1:1
 O:0:0:0:1
-F:MALE | CAN_SPEAK
-F:FORCE_MAXHP | SPECIAL_GENE
-F:NEVER_MOVE | NEVER_BLOW | GOOD | NO_TARGET
-F:MORTAL | BASEANGBAND | UNIQUE | NEUTRAL | NO_DEATH
+F:CAN_SPEAK
+F:FORCE_MAXHP
+F:GOOD
+F:MALE
+F:MORTAL
+F:NEUTRAL
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_DEATH
+F:NO_TARGET
+F:SPECIAL_GENE
+F:UNIQUE
 D:He must have suffered horrible tortures...
 
 N:1043:Fire golem
@@ -18345,11 +24547,20 @@ B:HIT:HURT:2d6
 B:HIT:HURT:2d6
 B:HIT:FIRE:3d6
 B:HIT:FIRE:3d6
-F:BASH_DOOR | AURA_FIRE | HAS_LITE
-F:IM_FIRE | SPECIAL_GENE
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | NO_STUN
-F:MORTAL | BASEANGBAND | NO_CUT | AI_PLAYER
-S:1_IN_10 | 
+F:AI_PLAYER
+F:AURA_FIRE
+F:BASH_DOOR
+F:HAS_LITE
+F:IM_FIRE
+F:MORTAL
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:SPECIAL_GENE
+S:1_IN_10
 S:BR_FIRE
 D:A sentient mass of pure fire. 
 
@@ -18363,20 +24574,63 @@ B:HIT:ABOMINATION:3d10
 B:HIT:TIME:24d10
 B:HIT:INSANITY:24d10
 B:HIT:LOSE_ALL:24d10
-F:UNIQUE | CAN_SPEAK | MALE |
-F:FORCE_MAXHP | SPIRIT
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_3D2 | DROP_4D2 | 
-F:DROP_GOOD | DROP_GREAT | DROP_CHOSEN | RES_NETH |
-F:SMART | KILL_WALL | MOVE_BODY | AURA_FIRE |
-F:REGENERATE | POWERFUL | SPECIAL_GENE | CAN_FLY | KILL_TREES
-F:EVIL | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_STUN | NO_SLEEP | NO_FEAR | RES_TELE | BASEANGBAND |
-S:1_IN_4 | 
-S:BRAIN_SMASH | 
-S:BA_MANA | BO_MANA | BA_NETH | BA_CHAO | BA_DARK | ANIM_DEAD | S_KIN |
-S:S_MONSTERS | S_UNIQUE | S_HI_DEMON | S_HI_UNDEAD | S_HI_DRAGON | 
-S:BR_NETH | BR_DISI | HAND_DOOM | S_WRAITH | HEAL | BRAIN_SMASH |
-S:DRAIN_MANA | TELE_TO | DARKNESS | SHRIEK
+F:AURA_FIRE
+F:CAN_FLY
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CHOSEN
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_MAXHP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_TREES
+F:KILL_WALL
+F:MALE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:POWERFUL
+F:REGENERATE
+F:RES_NETH
+F:RES_TELE
+F:SMART
+F:SPECIAL_GENE
+F:SPIRIT
+F:UNIQUE
+S:1_IN_4
+S:BA_CHAO
+S:BA_DARK
+S:BA_MANA
+S:BA_NETH
+S:BO_MANA
+S:BRAIN_SMASH
+S:BRAIN_SMASH
+S:BR_DISI
+S:BR_NETH
+S:DARKNESS
+S:DRAIN_MANA
+S:HAND_DOOM
+S:HEAL
+S:SHRIEK
+S:S_HI_DEMON
+S:S_HI_DRAGON
+S:S_HI_UNDEAD
+S:S_KIN
+S:S_MONSTERS
+S:S_UNIQUE
+S:S_WRAITH
+S:TELE_TO
 D:He was the most powerful of the Valar, the equal of Manwe. 
 D:You banned him here, in the Void, and now you must destroy him 
 D:forever. However here in the Void, his spirit gained much power 
@@ -18396,9 +24650,13 @@ E:0:1:1:2:0:0
 O:25:0:75:0
 B:TOUCH:EXP_80:10d10
 B:TOUCH:EXP_80:10d10
-F:SPIRIT | BASEANGBAND | NEVER_MOVE | EMPTY_MIND | NO_CUT |
-F:COLD_BLOOD | INVISIBLE 
-S:1_IN_1 |
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:INVISIBLE
+F:NEVER_MOVE
+F:NO_CUT
+F:SPIRIT
+S:1_IN_1
 S:BA_NETH
 D:This strange, almost intangible spirit keeps assaulting you! 
 
@@ -18413,8 +24671,11 @@ B:TOUCH:POISON:10d10
 B:CRAWL:POISON:10d10
 B:CRAWL:EAT_ITEM:10d9
 B:BITE:UN_BONUS:9d9
-F:SPIRIT | BASEANGBAND | WEIRD_MIND | FRIENDS |
-F:AI_ANNOY | PASS_WALL
+F:AI_ANNOY
+F:FRIENDS
+F:PASS_WALL
+F:SPIRIT
+F:WEIRD_MIND
 S:MULTIPLY
 D:These things multiply at an apparently unstoppable rate! 
 
@@ -18428,9 +24689,15 @@ O:0:0:0:0
 B:TOUCH:LOSE_DEX:2d3
 B:TOUCH:PARALYZE:1d12
 B:TOUCH:PARALYZE:1d12
-F:SPIRIT | BASEANGBAND | NO_SLEEP | PASS_WALL | WEIRD_MIND 
-S:1_IN_2 |
-S:SLOW | BLINK | HOLD | HASTE
+F:NO_SLEEP
+F:PASS_WALL
+F:SPIRIT
+F:WEIRD_MIND
+S:1_IN_2
+S:BLINK
+S:HASTE
+S:HOLD
+S:SLOW
 D:Coming towards you quickly, it seems intent on moving faster than you. 
 
 # Spirit of confusion
@@ -18444,11 +24711,24 @@ B:ENGULF:HALLU:16d8
 B:ENGULF:HALLU:16d8
 B:ENGULF:CONFUSE:16d8
 B:ENGULF:CONFUSE:16d8
-F:SPIRIT | BASEANGBAND | RES_NEXU |  AURA_ELEC | IM_FIRE | IM_ELEC |
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | CAN_FLY | ATTR_MULTI |
-F:NO_CONF | NO_SLEEP | NO_FEAR | NO_CUT
-S:1_IN_3 |
-S:BR_CHAO | BR_NEXU | BR_CONF
+F:ATTR_MULTI
+F:AURA_ELEC
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:IM_ELEC
+F:IM_FIRE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RES_NEXU
+F:SPIRIT
+S:1_IN_3
+S:BR_CHAO
+S:BR_CONF
+S:BR_NEXU
 D:A swirling mass, constantly changing its appearance. 
 
 # Spirit of brawn
@@ -18462,10 +24742,23 @@ B:HIT:SHATTER:18d18
 B:HIT:CONFUSE:18d18
 B:HIT:SHATTER:18d18
 B:HIT:CONFUSE:18d18
-F:SPIRIT | BASEANGBAND | DROP_4D2 | KILL_BODY | KILL_WALL |
-F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | KILL_TREES | 
-F:EVIL | GIANT | HURT_ROCK | BASEANGBAND | HAS_LITE | 
-F:IM_FIRE | IM_COLD | IM_ACID | IM_ELEC | IM_POIS
+F:BASH_DOOR
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:GIANT
+F:HAS_LITE
+F:HURT_ROCK
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:KILL_TREES
+F:KILL_WALL
+F:OPEN_DOOR
+F:SPIRIT
 D:Strong and swarthy, this spirit could bend metal with his bare hands.
 
 # Spirit of Wyrms
@@ -18479,19 +24772,65 @@ B:CLAW:HURT:10d15
 B:CLAW:HURT:10d15
 B:BITE:HURT:14d18
 B:BITE:HURT:14d18
-F:SPIRIT | FORCE_MAXHP | MOVE_BODY | AURA_FIRE | REFLECTING | AURA_ELEC |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | AURA_COLD |
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | RES_NETH | RES_DISE |
-F:DRAGON | GOOD | RES_TELE | DROP_CORPSE | KILL_TREES | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP |
-F:RES_NEXU | RES_PLAS | CAN_FLY | BASEANGBAND | HAS_LITE | NO_CUT
-S:1_IN_3 |
-S:S_HI_DRAGON | S_DRAGON | S_KIN | 
-S:BR_ACID | BR_ELEC | BR_FIRE |
-S:BR_COLD | BR_POIS | BR_NETH | BR_LITE | BR_DARK |
-S:BR_CONF | BR_SOUN | BR_CHAO | BR_DISE | BR_NEXU |
-S:BR_TIME | BR_INER | BR_GRAV | BR_SHAR | BR_PLAS |
-S:BR_WALL | BR_MANA | BR_DISI
+F:AURA_COLD
+F:AURA_ELEC
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_TREES
+F:MOVE_BODY
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:REFLECTING
+F:RES_DISE
+F:RES_NETH
+F:RES_NEXU
+F:RES_PLAS
+F:RES_TELE
+F:SPIRIT
+S:1_IN_3
+S:BR_ACID
+S:BR_CHAO
+S:BR_COLD
+S:BR_CONF
+S:BR_DARK
+S:BR_DISE
+S:BR_DISI
+S:BR_ELEC
+S:BR_FIRE
+S:BR_GRAV
+S:BR_INER
+S:BR_LITE
+S:BR_MANA
+S:BR_NETH
+S:BR_NEXU
+S:BR_PLAS
+S:BR_POIS
+S:BR_SHAR
+S:BR_SOUN
+S:BR_TIME
+S:BR_WALL
+S:S_DRAGON
+S:S_HI_DRAGON
+S:S_KIN
 D:This spirit bears a remarkable similarity to some of the most powerful 
 D:types of dragonkind found in Middle-earth. It appears to be even more 
 D:fearsome though! 
@@ -18506,11 +24845,22 @@ O:25:20:25:20
 B:BITE:POISON:15d15
 B:BITE:POISON:15d15
 B:BITE:LOSE_ALL:10d12
-F:SPIRIT | CAN_SWIM | IM_POIS | IM_ACID |
-F:DROP_60 | DROP_2D2 | FRIENDS | DROP_CORPSE |
-F:OPEN_DOOR | BASH_DOOR | EVIL | BASEANGBAND
-S:1_IN_4 |
-S:BA_POIS | S_MONSTER | SCARE | HOLD
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_2D2
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FRIENDS
+F:IM_ACID
+F:IM_POIS
+F:OPEN_DOOR
+F:SPIRIT
+S:1_IN_4
+S:BA_POIS
+S:HOLD
+S:SCARE
+S:S_MONSTER
 D:It slides towards you, a horrible scaly, slidy thing. 
 
 # Spirit of seeing
@@ -18524,11 +24874,24 @@ B:GAZE:UN_BONUS:12d12
 B:GAZE:UN_POWER:12d10
 B:GAZE:INSANITY:12d14
 B:GAZE:LOSE_ALL:6d6
-F:SPIRIT | BASH_DOOR | EVIL | IM_POIS | 
-F:CAN_FLY | BASEANGBAND
-S:1_IN_2 | 
-S:BLIND | CONF | FORGET | SCARE | DRAIN_MANA | BRAIN_SMASH | 
-S:BA_DARK | BO_MANA | BA_NETH | BA_ACID | BA_FIRE | BA_COLD 
+F:BASH_DOOR
+F:CAN_FLY
+F:EVIL
+F:IM_POIS
+F:SPIRIT
+S:1_IN_2
+S:BA_ACID
+S:BA_COLD
+S:BA_DARK
+S:BA_FIRE
+S:BA_NETH
+S:BLIND
+S:BO_MANA
+S:BRAIN_SMASH
+S:CONF
+S:DRAIN_MANA
+S:FORGET
+S:SCARE
 D:You will find it difficult to avoid being seen by this spirit! And 
 D:once it has you in its sight, beware! 
 
@@ -18543,12 +24906,29 @@ B:TOUCH:UN_BONUS:12d12
 B:TOUCH:UN_POWER:12d10
 B:TOUCH:INSANITY:12d14
 B:TOUCH:LOSE_ALL:6d6
-F:SPIRIT | CAN_FLY | REFLECTING |
-F:SMART | BASH_DOOR | COLD_BLOOD | INVISIBLE | EMPTY_MIND |
-F:EVIL | BASEANGBAND | CHAR_MULTI | CHAR_CLEAR | ATTR_CLEAR
-S:1_IN_3 | 
-S:DRAIN_MANA | BLINK | BLIND | SCARE | CONF | 
-S:HEAL | TELE_AWAY | DARKNESS | TRAPS | FORGET | SHRIEK
+F:ATTR_CLEAR
+F:BASH_DOOR
+F:CAN_FLY
+F:CHAR_CLEAR
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:INVISIBLE
+F:REFLECTING
+F:SMART
+F:SPIRIT
+S:1_IN_3
+S:BLIND
+S:BLINK
+S:CONF
+S:DARKNESS
+S:DRAIN_MANA
+S:FORGET
+S:HEAL
+S:SCARE
+S:SHRIEK
+S:TELE_AWAY
 D:Hopefully you will kill this spirit before you realise it exists. 
 
 # Spirit of ickyness
@@ -18562,12 +24942,23 @@ B:CRAWL:POISON:12d14
 B:CRAWL:EAT_FOOD:12d14
 B:TOUCH:ACID:13d15
 B:HIT:HURT:13d15
-F:SPIRIT | BASEANGBAND |
-F:EMPTY_MIND | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | IM_ACID | IM_ELEC | IM_FIRE | IM_COLD | IM_POIS | 
-F:EMPTY_MIND 
-S:1_IN_4 | 
-S:DRAIN_MANA | BLIND | CONF | SCARE | S_KIN
+F:BASH_DOOR
+F:EMPTY_MIND
+F:EMPTY_MIND
+F:EVIL
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:OPEN_DOOR
+F:SPIRIT
+S:1_IN_4
+S:BLIND
+S:CONF
+S:DRAIN_MANA
+S:SCARE
+S:S_KIN
 D:A horrible slimy spirit, that seems to ooze evilness. I wouldn't get 
 D:too close to it if I were you. 
 
@@ -18582,10 +24973,12 @@ B:BITE:HURT:12d12
 B:BITE:HURT:12d12
 B:BITE:HURT:12d8
 B:BITE:HURT:12d8
-F:SPIRIT | BASEANGBAND |
-F:ESCORT | ESCORTS |
-F:OPEN_DOOR | BASH_DOOR 
-S:1_IN_2 | 
+F:BASH_DOOR
+F:ESCORT
+F:ESCORTS
+F:OPEN_DOOR
+F:SPIRIT
+S:1_IN_2
 S:S_KIN
 D:This spirit appears to have lots of friends! 
 
@@ -18600,11 +24993,21 @@ B:WAIL:TERRIFY:8d9
 B:HIT:HURT:10d10
 B:HIT:ABOMINATION:6d10
 B:HIT:ABOMINATION:6d10
-F:SPIRIT | BASEANGBAND |
-F:EVIL | UNDEAD | IM_POIS | IM_COLD | NO_CONF | NO_SLEEP | 
-F:COLD_BLOOD | HURT_LITE | NO_CUT 
-S:1_IN_3 |
-S:SCARE | HOLD | DARKNESS | SCARE 
+F:COLD_BLOOD
+F:EVIL
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:SPIRIT
+F:UNDEAD
+S:1_IN_3
+S:DARKNESS
+S:HOLD
+S:SCARE
+S:SCARE
 D:It seems to have been woken from the dead, this spirit. It lumbers 
 D:towards you, seeking to turn you into a form as hideous as its own! 
 
@@ -18620,9 +25023,19 @@ O:0:100:0:0
 B:HIT:LOSE_STR:4d8
 B:HIT:LOSE_STR:4d8
 B:HIT:LOSE_STR:4d8
-F:SPIRIT | BASEANGBAND | DROP_2D2 | KILL_BODY | KILL_WALL |
-F:BASH_DOOR | EVIL | GIANT | HURT_ROCK | 
-F:IM_FIRE | IM_COLD | IM_ACID | IM_ELEC | IM_POIS
+F:BASH_DOOR
+F:DROP_2D2
+F:EVIL
+F:GIANT
+F:HURT_ROCK
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:KILL_WALL
+F:SPIRIT
 D:It is coming for you, this massive imposing tower of strength.
 D:It appears almost unstoppable! 
 
@@ -18636,12 +25049,26 @@ O:0:0:100:0
 B:HIT:LOSE_INT:4d8
 B:HIT:LOSE_INT:4d8
 B:HIT:LOSE_INT:4d8
-F:EVIL | SPIRIT | BASEANGBAND | DROP_2D2 | 
-F:OPEN_DOOR | SMART |
-F:IM_FIRE | IM_COLD | IM_ACID | IM_ELEC | IM_POIS
-S:1_IN_2 |
-S:HASTE | TPORT | TELE_TO | BLIND | CONF | 
-S:BO_MANA | BO_FIRE | BO_COLD | BO_ELEC | 
+F:DROP_2D2
+F:EVIL
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:OPEN_DOOR
+F:SMART
+F:SPIRIT
+S:1_IN_2
+S:BLIND
+S:BO_COLD
+S:BO_ELEC
+S:BO_FIRE
+S:BO_MANA
+S:CONF
+S:HASTE
+S:TELE_TO
+S:TPORT
 D:This spirit looks very clever, cunning almost. 
 
 # Spirit of wisdom
@@ -18654,12 +25081,23 @@ O:0:50:50:0
 B:HIT:LOSE_WIS:4d8
 B:HIT:LOSE_WIS:4d8
 B:HIT:LOSE_WIS:4d8
-F:EVIL | SPIRIT | BASEANGBAND | DROP_2D2 | 
-F:OPEN_DOOR | 
-F:IM_FIRE | IM_COLD | IM_ACID | IM_ELEC | IM_POIS
-S:1_IN_2 |
-S:HEAL | MIND_BLAST | CAUSE_4 | SCARE | 
-S:DRAIN_MANA | BRAIN_SMASH | FORGET |
+F:DROP_2D2
+F:EVIL
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:OPEN_DOOR
+F:SPIRIT
+S:1_IN_2
+S:BRAIN_SMASH
+S:CAUSE_4
+S:DRAIN_MANA
+S:FORGET
+S:HEAL
+S:MIND_BLAST
+S:SCARE
 D:This spirit has something of a priestly look about it. 
 
 # Spirit of dexterity
@@ -18672,10 +25110,17 @@ O:0:50:25:25
 B:HIT:LOSE_DEX:4d8
 B:HIT:LOSE_DEX:4d8
 B:HIT:LOSE_DEX:4d8
-F:EVIL | SPIRIT | BASEANGBAND | DROP_2D2 | 
-F:OPEN_DOOR | SMART |
-F:IM_FIRE | IM_COLD | IM_ACID | IM_ELEC | IM_POIS
-S:1_IN_1 |
+F:DROP_2D2
+F:EVIL
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:OPEN_DOOR
+F:SMART
+F:SPIRIT
+S:1_IN_1
 S:ARROW_4
 D:This spirit moves almost too quickly for you to see him. 
 
@@ -18689,8 +25134,15 @@ O:0:50:0:50
 B:HIT:LOSE_CON:4d8
 B:HIT:LOSE_CON:4d8
 B:HIT:LOSE_CON:4d8
-F:EVIL | SPIRIT | BASEANGBAND | DROP_2D2 | BASH_DOOR |
-F:IM_FIRE | IM_COLD | IM_ACID | IM_ELEC | IM_POIS
+F:BASH_DOOR
+F:DROP_2D2
+F:EVIL
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:SPIRIT
 D:This spirit moves slower than most, but thunders on and on 
 D:towards you. 
 
@@ -18704,11 +25156,21 @@ O:70:10:10:10
 B:HIT:LOSE_CHR:4d8
 B:HIT:LOSE_CHR:4d8
 B:HIT:LOSE_CHR:4d8
-F:SPIRIT | BASEANGBAND | DROP_2D2 | 
-F:OPEN_DOOR | EVIL | TAKE_ITEM |
-F:IM_FIRE | IM_COLD | IM_ACID | IM_ELEC | IM_POIS
-S:1_IN_2 |
-S:TRAPS | ARROW_3 | BLINK | TELE_TO | CONF 
+F:DROP_2D2
+F:EVIL
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:OPEN_DOOR
+F:SPIRIT
+F:TAKE_ITEM
+S:1_IN_2
+S:ARROW_3
+S:BLINK
+S:CONF
+S:TELE_TO
 D:There is something attractive about this spirit, and it seems 
 D:to have a full purse. 
 
@@ -18724,9 +25186,14 @@ O:25:60:0:15
 B:HIT:FIRE:10d8
 B:HIT:FIRE:10d8
 B:HIT:FIRE:10d8
-F:SPIRIT | BASEANGBAND | AI_ANNOY | IM_FIRE | AURA_FIRE | HAS_LITE
-S:1_IN_2 |
-S:BO_FIRE | BA_FIRE
+F:AI_ANNOY
+F:AURA_FIRE
+F:HAS_LITE
+F:IM_FIRE
+F:SPIRIT
+S:1_IN_2
+S:BA_FIRE
+S:BO_FIRE
 D:Flickering towards you, and then away, this spirit will burn you badly! 
 
 # Spirit of icy cold
@@ -18739,10 +25206,14 @@ O:25:60:0:15
 B:HIT:COLD:10d8
 B:HIT:COLD:10d8
 B:HIT:COLD:10d8
-F:SPIRIT | BASEANGBAND | IM_COLD | AURA_COLD | 
-F:COLD_BLOOD | BASH_DOOR 
-S:1_IN_2 |
-S:BO_COLD | BA_COLD
+F:AURA_COLD
+F:BASH_DOOR
+F:COLD_BLOOD
+F:IM_COLD
+F:SPIRIT
+S:1_IN_2
+S:BA_COLD
+S:BO_COLD
 D:The temperature around you drops as soon as you set eyes on this spirit. 
 
 # Spirit of corrosion (acid)
@@ -18755,9 +25226,13 @@ O:25:60:0:15
 B:HIT:ACID:10d8
 B:HIT:ACID:10d8
 B:HIT:ACID:10d8
-F:SPIRIT | BASEANGBAND | IM_ACID | BASH_DOOR | KILL_TREES 
-S:1_IN_2 |
-S:BO_ACID | BA_ACID
+F:BASH_DOOR
+F:IM_ACID
+F:KILL_TREES
+F:SPIRIT
+S:1_IN_2
+S:BA_ACID
+S:BO_ACID
 D:The very fabric of the void heals itself where this spirit walks. 
 
 # Spirit of shocking (electricity)
@@ -18770,9 +25245,13 @@ O:25:60:0:15
 B:HIT:ELEC:10d8
 B:HIT:ELEC:10d8
 B:HIT:ELEC:10d8
-F:SPIRIT | BASEANGBAND | IM_ELEC | AURA_ELEC | BASH_DOOR 
-S:1_IN_2 |
-S:BO_ELEC | BA_ELEC
+F:AURA_ELEC
+F:BASH_DOOR
+F:IM_ELEC
+F:SPIRIT
+S:1_IN_2
+S:BA_ELEC
+S:BO_ELEC
 D:The air crackles as this spirit approaches, and you smell singed flesh. 
 
 # Spirit of Valaraukar (Balrogs)
@@ -18786,12 +25265,27 @@ B:HIT:FIRE:11d12
 B:HIT:FIRE:11d12
 B:CRUSH:HURT:10d12
 B:TOUCH:UN_POWER
-F:SPIRIT | CAN_FLY | KILL_WALL | AURA_FIRE | NONLIVING |
-F:ONLY_ITEM | DROP_2D2 | EVIL | DEMON | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:IM_FIRE | IM_ELEC | BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:BLIND | CONF | SCARE | BR_FIRE 
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:DEMON
+F:DROP_2D2
+F:EVIL
+F:HAS_LITE
+F:IM_ELEC
+F:IM_FIRE
+F:KILL_WALL
+F:MOVE_BODY
+F:NONLIVING
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:SPIRIT
+S:1_IN_3
+S:BLIND
+S:BR_FIRE
+S:CONF
+S:SCARE
 D:Carrying a whip of fire, this spirit looks not dissimilar to a certain 
 D:Balrog. 
 
@@ -18806,11 +25300,26 @@ B:HIT:HURT:10d10
 B:HIT:HURT:10d10
 B:TOUCH:EXP_80:20d8
 B:TOUCH:EXP_40:20d8
-F:SPIRIT | BASEANGBAND | REFLECTING | REGENERATE |
-F:IM_ACID | IM_ELEC | IM_COLD | IM_FIRE | IM_POIS | RES_TELE |
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | SMART | POWERFUL 
-S:1_IN_3 |
-S:BLIND | HEAL | BA_DARK | HASTE | CONF 
+F:BASH_DOOR
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:OPEN_DOOR
+F:POWERFUL
+F:REFLECTING
+F:REGENERATE
+F:RES_TELE
+F:SMART
+F:SPIRIT
+F:TAKE_ITEM
+S:1_IN_3
+S:BA_DARK
+S:BLIND
+S:CONF
+S:HASTE
+S:HEAL
 D:Deriving his strength from the shadows, this spirit 
 D:steals only for the challenge. 
 
@@ -18825,14 +25334,35 @@ B:HIT:HURT:10d9
 B:HIT:HURT:9d9
 B:BITE:EXP_80:9d9
 B:BITE:EXP_80:9d9
-F:SPIRIT | FORCE_SLEEP | CAN_FLY |
-F:DROP_60 | DROP_4D2 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | REGENERATE | RES_TELE | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT | SPIRIT
-S:1_IN_3 | 
-S:BLIND | HOLD | SCARE | CAUSE_3 | CAUSE_4 | DRAIN_MANA | 
-S:BRAIN_SMASH | DARKNESS | BO_NETH 
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_4D2
+F:DROP_60
+F:EVIL
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:REGENERATE
+F:RES_TELE
+F:SPIRIT
+F:SPIRIT
+F:UNDEAD
+S:1_IN_3
+S:BLIND
+S:BO_NETH
+S:BRAIN_SMASH
+S:CAUSE_3
+S:CAUSE_4
+S:DARKNESS
+S:DRAIN_MANA
+S:HOLD
+S:SCARE
 D:Your blood curdles and your bones chill as this spirit approaches. 
 
 # Spirit of unresistability (hehehehe)
@@ -18846,13 +25376,28 @@ B:HIT:SHATTER:18d10
 B:HIT:SHATTER:18d10
 B:HIT:LOSE_ALL:8d8
 B:TOUCH:UN_POWER
-F:BASEANGBAND | SPIRIT | SMART | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL |
-F:RES_NEXU | RES_NETH | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | 
-F:IM_POIS | IM_ELEC | IM_ACID | IM_COLD |
-S:1_IN_2 |
-S:BA_MANA | BR_PLAS | BR_TIME | ROCKET | HAND_DOOM | FORGET | BA_WATE
+F:BASH_DOOR
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_POIS
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:POWERFUL
+F:RES_NETH
+F:RES_NEXU
+F:SMART
+F:SPIRIT
+S:1_IN_2
+S:BA_MANA
+S:BA_WATE
+S:BR_PLAS
+S:BR_TIME
+S:FORGET
+S:HAND_DOOM
+S:ROCKET
 D:This spirit appears to be afraid of very little, and confident in its 
 D:ability to destroy you. 
 
@@ -18867,11 +25412,19 @@ B:TOUCH:TIME:6d12
 B:TOUCH:TIME:6d12
 B:TOUCH:TIME:6d12
 B:TOUCH:TIME:6d12
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | NO_CONF | NO_SLEEP | 
-F:SPIRIT | BASEANGBAND
-S:1_IN_2 | 
-S:BR_TIME | SLOW | HASTE | HOLD
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:NO_CONF
+F:NO_SLEEP
+F:OPEN_DOOR
+F:SPIRIT
+S:1_IN_2
+S:BR_TIME
+S:HASTE
+S:HOLD
+S:SLOW
 D:All at once you see that which is to come and that which has gone before. 
 
 # Spirit of Gold
@@ -18885,12 +25438,28 @@ B:TOUCH:EAT_GOLD:7d15
 B:TOUCH:EAT_GOLD:7d15
 B:HIT:POISON:6d12
 B:HIT:POISON:6d12
-F:ONLY_GOLD | SPIRIT | BASEANGBAND |
-F:DROP_4D2 | DROP_4D2 | DROP_4D2 | REFLECTING | COLD_BLOOD | REGENERATE | 
-F:BASH_DOOR | MOVE_BODY | IM_ELEC | IM_COLD | IM_POIS | 
-F:RES_TELE | NO_FEAR | NO_STUN | NO_CONF | NO_SLEEP
-S:1_IN_4 | 
-S:ARROW_4 | HEAL | FORGET 
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_4D2
+F:DROP_4D2
+F:DROP_4D2
+F:IM_COLD
+F:IM_ELEC
+F:IM_POIS
+F:MOVE_BODY
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_GOLD
+F:REFLECTING
+F:REGENERATE
+F:RES_TELE
+F:SPIRIT
+S:1_IN_4
+S:ARROW_4
+S:FORGET
+S:HEAL
 D:It is the very essence of financial greed... 
 
 # Spirit of doom 
@@ -18903,11 +25472,18 @@ O:0:10:90:0
 B:HIT:HURT:14d14
 B:HIT:HURT:14d14
 B:HIT:HURT:14d14
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | NO_CONF | NO_SLEEP | 
-F:SPIRIT | BASEANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:HAND_DOOM | CAUSE_4 | DARKNESS 
+F:BASH_DOOR
+F:EVIL
+F:HAS_LITE
+F:NO_CONF
+F:NO_SLEEP
+F:OPEN_DOOR
+F:SMART
+F:SPIRIT
+S:1_IN_2
+S:CAUSE_4
+S:DARKNESS
+S:HAND_DOOM
 D:The very presence of this creature fills the air with an aura of doom. 
 D:You feel waves of depression descending on you as it approaches. 
 
@@ -18920,12 +25496,23 @@ E:0:1:0:6:1:0
 B:CLAW:HURT:14d10
 B:CLAW:HURT:14d10
 B:BITE:HURT:17d10
-F:INVISIBLE | CAN_FLY | SPIRIT | WEIRD_MIND |
-F:PASS_WALL | POWERFUL | MOVE_BODY | 
-F:EVIL | NO_CONF | NO_SLEEP | BASEANGBAND | SPIRIT
-S:1_IN_2 | 
-S:BLIND | CONF | 
-S:BR_LITE | BR_DARK | BR_CONF
+F:CAN_FLY
+F:EVIL
+F:INVISIBLE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:PASS_WALL
+F:POWERFUL
+F:SPIRIT
+F:SPIRIT
+F:WEIRD_MIND
+S:1_IN_2
+S:BLIND
+S:BR_CONF
+S:BR_DARK
+S:BR_LITE
+S:CONF
 D:This sprit seems to flicker in and out of this plane, and is a master 
 D:of light and dark.
 
@@ -18939,9 +25526,15 @@ O:10:90:0:0
 B:HIT:HURT:10d10
 B:HIT:HURT:10d10
 B:HIT:HURT:10d10
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | IM_POIS | ONLY_ITEM |
-F:MORTAL | BASEANGBAND | HAS_LITE | SPIRIT
+F:BASH_DOOR
+F:EVIL
+F:HAS_LITE
+F:IM_POIS
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:ORC
+F:SPIRIT
 D:Stupid but strong, this spirit has an orcish aura about him.
 
 ### Here endeth the Spirits ###
@@ -18957,22 +25550,41 @@ O:0:5:90:5
 # Sorceror, not warrior
 B:HIT:HURT:1d1
 B:HIT:HURT:1d1
-F:OPEN_DOOR | SMART | MALE | DROP_SKELETON | DROP_CORPSE
-F:MORTAL | HAS_LITE | JOKEANGBAND | UNIQUE
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:JOKEANGBAND
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:SMART
+F:UNIQUE
 # Trone, of course
-F:CAN_FLY | REFLECTING | IM_FIRE
+F:CAN_FLY
+F:IM_FIRE
+F:REFLECTING
 # Thorin
-F:IM_ACID | FORCE_MAXHP
+F:FORCE_MAXHP
+F:IM_ACID
 # No cold or random gen... waiting on elven rings only at bottom of Erebor
 F:SPECIAL_GENE
 # Dig
 F:KILL_WALL
 # Obvious resistances
-F:NO_CONF | NO_SLEEP | NO_STUN | NO_FEAR
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
 # Well, he's been there a while
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | DROP_GREAT
+F:DROP_4D2
+F:DROP_GOOD
+F:DROP_GREAT
+F:ONLY_ITEM
 # Essence of speed, Manathrust, Noxious Cloud, and Fireflash
-S:1_IN_1 | 
-S:HASTE | BO_MANA | BA_POIS | BA_FIRE
+S:1_IN_1
+S:BA_FIRE
+S:BA_POIS
+S:BO_MANA
+S:HASTE
 D:He looks like he is looking for something, and the flecks of dragon
 D:blood on his face tell you he means business!
diff --git a/lib/edit/ra_info.txt b/lib/edit/ra_info.txt
index 57dcee95..6ac58484 100644
--- a/lib/edit/ra_info.txt
+++ b/lib/edit/ra_info.txt
@@ -16,10 +16,6 @@
 # C:max to dam:max to hit:max to AC:max to pval
 # F:flags
 
-# Version stamp (required)
-
-V:2.0.0
-
 # General info, number of powers
 G:100:1d5:1
 G:14:0d0:1
@@ -1533,14 +1529,16 @@ X:20:1
 T:35:0:255
 W:10:1:17
 C:0:0:0:0
-F:SH_FIRE | RES_FIRE
+F:RES_FIRE
+F:SH_FIRE
 
 N:338
 X:22:1
 T:35:0:255
 W:10:1:20
 C:0:0:0:0
-F:SH_ELEC | RES_ELEC
+F:RES_ELEC
+F:SH_ELEC
 
 N:339
 X:18:1
@@ -1801,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
@@ -1883,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/edit/re_info.txt b/lib/edit/re_info.txt
index c0e36a92..f71da68d 100644
--- a/lib/edit/re_info.txt
+++ b/lib/edit/re_info.txt
@@ -6,8 +6,6 @@
 # Do not modify this file unless you know exactly what you are doing,
 # unless you wish to risk possible system crashes and broken savefiles.
 
-# Version stamp (required)
-
 # Most values can be used with the +, -, % and = operators, = will set the
 # monster value, + and - will modify it based on the normal monster
 # % will apply that percentage to the monster value
@@ -28,8 +26,6 @@
 # S:monster spells to add for the ego-type
 # T:monster spells to remove, use MF_ALL for all
 
-V:2.0.0
-
 # A few undeads, to be created by the ANIM_DEAD spell
 
 N:1:Skeleton
@@ -37,11 +33,35 @@ G:s:*
 I:%100:+1d+1:+0:+5:-5
 W:+5:13:%30:%95:B
 F:DROP_SKELETON
-H:UNDEAD | NONLIVING | R_CHAR_Z | R_CHAR_A | R_CHAR_E | R_CHAR_g
-M:DROP_SKELETON | UNDEAD | IM_COLD | IM_POIS | NO_FEAR | NO_CONF | 
-M:NO_SLEEP | EMPTY_MIND | COLD_BLOOD | STUPID | EVIL
-O:GOOD | DROP_CORPSE | FRIEND | FRIENDS | ESCORT | ESCORTS | SMART | 
-O:DROP_GREAT | DROP_GOOD | RAND_25 | RAND_50 | MORTAL
+H:NONLIVING
+H:R_CHAR_A
+H:R_CHAR_E
+H:R_CHAR_Z
+H:R_CHAR_g
+H:UNDEAD
+M:COLD_BLOOD
+M:DROP_SKELETON
+M:EMPTY_MIND
+M:EVIL
+M:IM_COLD
+M:IM_POIS
+M:NO_CONF
+M:NO_FEAR
+M:NO_SLEEP
+M:STUPID
+M:UNDEAD
+O:DROP_CORPSE
+O:DROP_GOOD
+O:DROP_GREAT
+O:ESCORT
+O:ESCORTS
+O:FRIEND
+O:FRIENDS
+O:GOOD
+O:MORTAL
+O:RAND_25
+O:RAND_50
+O:SMART
 T:MF_ALL
 
 N:2:Zombie
@@ -49,11 +69,36 @@ G:z:*
 I:%95:%110d%100:%90:+10:-5
 W:+10:14:%70:%100:B
 F:DROP_CORPSE
-H:UNDEAD | NONLIVING | R_CHAR_Z | R_CHAR_A | R_CHAR_E | R_CHAR_g
-M:DROP_CORPSE | UNDEAD | IM_COLD | IM_POIS | NO_FEAR | NO_CONF
-M:NO_SLEEP | EVIL | EMPTY_MIND | COLD_BLOOD | STUPID | EVIL
-O:GOOD | DROP_SKELETON | FRIEND | FRIENDS | ESCORT | ESCORTS | SMART
-O:DROP_GREAT | DROP_GOOD | RAND_25 | RAND_50 | MORTAL
+H:NONLIVING
+H:R_CHAR_A
+H:R_CHAR_E
+H:R_CHAR_Z
+H:R_CHAR_g
+H:UNDEAD
+M:COLD_BLOOD
+M:DROP_CORPSE
+M:EMPTY_MIND
+M:EVIL
+M:EVIL
+M:IM_COLD
+M:IM_POIS
+M:NO_CONF
+M:NO_FEAR
+M:NO_SLEEP
+M:STUPID
+M:UNDEAD
+O:DROP_GOOD
+O:DROP_GREAT
+O:DROP_SKELETON
+O:ESCORT
+O:ESCORTS
+O:FRIEND
+O:FRIENDS
+O:GOOD
+O:MORTAL
+O:RAND_25
+O:RAND_50
+O:SMART
 T:MF_ALL
 
 N:3:Lich
@@ -64,15 +109,49 @@ B:TOUCH:LOSE_DEX:+0d+0
 B:TOUCH:LOSE_DEX:+0d+0
 B:TOUCH:UN_POWER:+0d+0
 B:TOUCH:EXP_40:+0d+0
-F:DROP_SKELETON | SMART | R_CHAR_h | R_CHAR_p | R_CHAR_P | R_CHAR_O
-H:UNDEAD | NONLIVING | R_CHAR_Z | R_CHAR_A | R_CHAR_E | R_CHAR_g
-M:UNDEAD | IM_COLD | IM_POIS | NO_FEAR | NO_CONF
-M:NO_SLEEP | SMART | EVIL | COLD_BLOOD
-O:DROP_SKELETON | GOOD | DROP_CORPSE | FRIEND | FRIENDS | ESCORT | ESCORTS | 
-O:DROP_GREAT | RAND_25 | RAND_50 | MORTAL
-S:1_IN_4 | 
-S:BLINK | TELE_TO | TELE_AWAY | BRAIN_SMASH | DRAIN_MANA | CAUSE_3 | 
-S:BLIND | HOLD | SLOW | SCARE
+F:DROP_SKELETON
+F:R_CHAR_O
+F:R_CHAR_P
+F:R_CHAR_h
+F:R_CHAR_p
+F:SMART
+H:NONLIVING
+H:R_CHAR_A
+H:R_CHAR_E
+H:R_CHAR_Z
+H:R_CHAR_g
+H:UNDEAD
+M:COLD_BLOOD
+M:EVIL
+M:IM_COLD
+M:IM_POIS
+M:NO_CONF
+M:NO_FEAR
+M:NO_SLEEP
+M:SMART
+M:UNDEAD
+O:DROP_CORPSE
+O:DROP_GREAT
+O:DROP_SKELETON
+O:ESCORT
+O:ESCORTS
+O:FRIEND
+O:FRIENDS
+O:GOOD
+O:MORTAL
+O:RAND_25
+O:RAND_50
+S:1_IN_4
+S:BLIND
+S:BLINK
+S:BRAIN_SMASH
+S:CAUSE_3
+S:DRAIN_MANA
+S:HOLD
+S:SCARE
+S:SLOW
+S:TELE_AWAY
+S:TELE_TO
 
 N:4:Spectral
 G:G:*
@@ -81,12 +160,35 @@ W:+20:20:%10:%110:B
 B:*:EXP_20:+0d+0
 B:*:EXP_20:+0d+0
 F:DROP_CORPSE
-H:UNDEAD | NONLIVING | R_CHAR_Z | R_CHAR_A | R_CHAR_E | R_CHAR_g
-M:UNDEAD | IM_COLD | IM_POIS | NO_FEAR | NO_CONF
-M:NO_SLEEP | PASS_WALL | EVIL | COLD_BLOOD
-O:GOOD | DROP_CORPSE | FRIEND | FRIENDS | ESCORT | ESCORTS | 
-O:DROP_GREAT | EMPTY_MIND | RAND_50 | MORTAL
-S:1_IN_5 | BLIND | HOLD | SCARE
+H:NONLIVING
+H:R_CHAR_A
+H:R_CHAR_E
+H:R_CHAR_Z
+H:R_CHAR_g
+H:UNDEAD
+M:COLD_BLOOD
+M:EVIL
+M:IM_COLD
+M:IM_POIS
+M:NO_CONF
+M:NO_FEAR
+M:NO_SLEEP
+M:PASS_WALL
+M:UNDEAD
+O:DROP_CORPSE
+O:DROP_GREAT
+O:EMPTY_MIND
+O:ESCORT
+O:ESCORTS
+O:FRIEND
+O:FRIENDS
+O:GOOD
+O:MORTAL
+O:RAND_50
+S:1_IN_5
+S:BLIND
+S:HOLD
+S:SCARE
 T:MF_ALL
 
 N:5:Captain
@@ -97,8 +199,13 @@ B:*:*:+0d+1
 B:*:*:+0d+1
 B:*:*:+0d+1
 B:*:*:+0d+1
-F:R_CHAR_o | R_CHAR_y | R_CHAR_k | BASEANGBAND
-M:FORCE_MAXHP | FRIENDS | SMART | DROP_1D2
+F:R_CHAR_k
+F:R_CHAR_o
+F:R_CHAR_y
+M:DROP_1D2
+M:FORCE_MAXHP
+M:FRIENDS
+M:SMART
 
 N:6:Chieftain
 G:*:*
@@ -108,25 +215,49 @@ B:*:*:+1d+2
 B:*:*:+1d+2
 B:*:*:+1d+2
 B:*:*:+1d+2
-F:R_CHAR_T | R_CHAR_P | R_CHAR_O | BASEANGBAND
-M:FORCE_MAXHP | FRIENDS | SMART | DROP_1D2
+F:R_CHAR_O
+F:R_CHAR_P
+F:R_CHAR_T
+M:DROP_1D2
+M:FORCE_MAXHP
+M:FRIENDS
+M:SMART
 
 N:7:Shaman
 G:*:r
 I:+0:%90d%100:+10:%90:+0
 W:+2:1:%90:%120:A
-F:R_CHAR_o | R_CHAR_k | R_CHAR_n | BASEANGBAND
-M:SMART | FORCE_MAXHP | DROP_1D2
+F:R_CHAR_k
+F:R_CHAR_n
+F:R_CHAR_o
+M:DROP_1D2
+M:FORCE_MAXHP
+M:SMART
 O:FRIENDS
-S:1_IN_6 | MISSILE | CAUSE_1 | CONF | BLINK
+S:1_IN_6
+S:BLINK
+S:CAUSE_1
+S:CONF
+S:MISSILE
 
 N:8:Priest
 G:*:G
 I:+0:%90d%100:+10:%90:+0
 W:+3:2:%90:%120:A
-F:R_CHAR_T | R_CHAR_P | R_CHAR_O | BASEANGBAND
-M:FRIENDS | SMART | FORCE_MAXHP | DROP_1D2
-S:1_IN_6 | CAUSE_2 | MISSILE | DARKNESS | CONF | SCARE | BLINK
+F:R_CHAR_O
+F:R_CHAR_P
+F:R_CHAR_T
+M:DROP_1D2
+M:FORCE_MAXHP
+M:FRIENDS
+M:SMART
+S:1_IN_6
+S:BLINK
+S:CAUSE_2
+S:CONF
+S:DARKNESS
+S:MISSILE
+S:SCARE
 
 N:9:Mage
 G:*:r
@@ -136,24 +267,38 @@ B:*:*:+0d+0
 B:*:*:+0d+0
 B:HIT:HURT:=2d=8
 B:HIT:HURT:=2d=8
-F:R_CHAR_O | BASEANGBAND
-M:SMART | FORCE_MAXHP | DROP_1D2
+F:R_CHAR_O
+M:DROP_1D2
+M:FORCE_MAXHP
+M:SMART
 O:FRIENDS
-S:1_IN_6 | BA_COLD | BO_FIRE | TRAPS | HEAL | HOLD | S_MONSTER | TPORT
+S:1_IN_6
+S:BA_COLD
+S:BO_FIRE
+S:HEAL
+S:HOLD
+S:S_MONSTER
+S:TPORT
 
 N:10:Archer
 G:*:W
 I:+0:+0d+0:+0:+0:+0
 W:+1:1:%100:%110:A
-F:R_CHAR_y | R_CHAR_k | R_CHAR_O | R_CHAR_o | BASEANGBAND
-S:1_IN_4 | ARROW_2
+F:R_CHAR_O
+F:R_CHAR_k
+F:R_CHAR_o
+F:R_CHAR_y
+S:1_IN_4
+S:ARROW_2
 
 N:11:Rogue
 G:*:b
 I:+2:+0d+0:+0:+10:-30
 W:+1:2:%90:%100:A
 B:*:EAT_GOLD:+0d+0
-F:R_CHAR_y | R_CHAR_k | R_CHAR_o
+F:R_CHAR_k
+F:R_CHAR_o
+F:R_CHAR_y
 
 # For townpeople
 N:12:Elven
diff --git a/lib/edit/readme.txt b/lib/edit/readme.txt
index 4c0ecbe7..70cf126e 100644
--- a/lib/edit/readme.txt
+++ b/lib/edit/readme.txt
@@ -77,11 +77,6 @@
 # Defines the preferences for the town features
 # You will find there entries as in f_info.txt
 
-# File: tr_info.txt
-# This file comes from Angband64 written by Jurriaan Kalkman
-# and describes the traps items can have
-# You will find traps like 'Summon Fast Quylthulgs Trap' , 'Wisdom Trap' etc.
-
 # File: v_info.txt
 # This file is used to initialize the "vault template" information for the Angband game.
 # You will find vaults like 'The I in the Storm' , 'Greater vault (mortuary temple of sety)' , 
diff --git a/lib/edit/s_crypt.map b/lib/edit/s_crypt.map
index 3d6ce71c..e6600cd6 100644
--- a/lib/edit/s_crypt.map
+++ b/lib/edit/s_crypt.map
@@ -67,30 +67,30 @@ D:X.%%@=-=-X99X.....X..XLL..X%X..LLX..XhVV..X99X=-=-..GGX
 D:X%%@@...XXX9XX....XX.XX...X.X...XX.XXVVVVXX9XXX=-=.XGGX
 D:X@@@....X8X-=XgggggX..X..dX4Xd..X..XWWWWWX-=X8X-=-.XGGX
 D:X......XX%XX=XXgddgXX.XX8GXXXG8XX.XXWWWWXX-XX%XX...XGGX
-D:XIXIXXIX*X=X-=XgddggX..X8G^.^G8X..XWWWWWX-=X.X.X&&&XGGX
-D:XXXIXIXX*X-XX=XXggggXX.XXG^.^GXX.XXWWWWXX-XX.X.XX&&XGGX
-D:XXXXXIX**X=-X=-XIIXXXX..XG^.^GX..XVWWWVX=-XX.XddX@@XGGX
-D:X^^^^XX**X=-XX=XXIXIIXX.XX^.^XX.XXVVVVXX-XX%.XedXX@XGGX
-D:X^^f^Xe**X%%.X=-XXIXXIXbbX^.^XbbX.VV.XX=-XbX.XXXIX@IIGX
-D:X^^^XXe..X...XX=-XXXIXXXbXX.XXbXX...XX=-XXbX.XaaaXXXIGX
-D:X^^XXbbb.XGGG.XX=-XXIIXXbbXDXbbX...XX=-XXbbX.XaaaaXXIGX
-D:X^XXcbab.XVdG.cXX=-XXXIXXabXbaXX.XXX=-XXbbbX.XaaaaaXXfX
+D:XIXIXXIX*X=X-=XgddggX..X8G...G8X..XWWWWWX-=X.X.X&&&XGGX
+D:XXXIXIXX*X-XX=XXggggXX.XXG...GXX.XXWWWWXX-XX.X.XX&&XGGX
+D:XXXXXIX**X=-X=-XIIXXXX..XG...GX..XVWWWVX=-XX.XddX@@XGGX
+D:X....XX**X=-XX=XXIXIIXX.XX...XX.XXVVVVXX-XX%.XedXX@XGGX
+D:X..f.Xe**X%%.X=-XXIXXIXbbX...XbbX.VV.XX=-XbX.XXXIX@IIGX
+D:X...XXe..X...XX=-XXXIXXXbXX.XXbXX...XX=-XXbX.XaaaXXXIGX
+D:X..XXbbb.XGGG.XX=-XXIIXXbbXDXbbX...XX=-XXbbX.XaaaaXXIGX
+D:X.XXcbab.XVdG.cXX=-XXXIXXabXbaXX.XXX=-XXbbbX.XaaaaaXXfX
 D:X%XbbbbbbXVWG.%.XX.DbXDXXXbXbXXXDXbD.XX....G.XGGGGGGX%X
 D:XX.bababa%eWG.%.BXXXbcbbbbX.XbbbbcbXXXC...fX.%.......XX
 D:X%XbbbbbbXVWG.%.XX.DbXDXXXbXbXXXDXbD.XX....G.XGGGGGGX%X
 D:X8XXcbab.XVdG.cXX=-XXX.XXabXbaXXLXXX=-XXbbbX.XaaaaaXX.X
 D:X88XXbbb.XGGG.XX=-XX...XbbXDXbbXLLLXX=-XXbbX.XaaaaXXX.X
 D:XXXIXXe..X...XX=-XX.GGXXbXX.XXbXXILIXX=-XXbX.XaaaXXXX.X
-D:X9889Xe**X%%.X=-XXG.GdXbbX^.^XbbXILLIXX=-XbX.XXXIXhGG.X
-D:XXIXXXX**X=-XX=XXdG.GXX.XX^.^XX.XXILIIXX-XX%.XedXXXXX.X
-D:X99999X**X=-X=-XGGG..X..XI^a^IX..XILLIIX=-XX.XddX..eeeX
-D:XXXXIXXX*X=XX-XX....XX.XXI^a^IXX.XXILLIXX=XX.X.XX.GGGGX
-D:X^^^^^cX*X-X=-X.....X..X.I^a^I.X..XIILLIX=-X.X.Xdddd..X
-D:XllllX^XX%XX=XXG.GGXX.XX.IXXXI.XX.XXIILIXX-XX%XXXXXXX.X
-D:X^^^cl^=X8X-=XeG.GeX..X...X4X...X..XILLLIX-=X8X.aaaaaaX
-D:XLLX^l^-XXX9XXGG.GXX.XX...X.X...XX.XXLLLLXX9XXX.GGGGGGX
-D:X..L^l^=-X99X.....X..XWW..X%X..WWX..XLLLL.X99XXbbbbb..X
-D:X7.L^l^=-X8XX5...XX.XXWWW..c..WWWXX.XXLL.AXX8XXbbbbb.6X
+D:X9889Xe**X%%.X=-XXG.GdXbbX...XbbXILLIXX=-XbX.XXXIXhGG.X
+D:XXIXXXX**X=-XX=XXdG.GXX.XX...XX.XXILIIXX-XX%.XedXXXXX.X
+D:X99999X**X=-X=-XGGG..X..XI.a.IX..XILLIIX=-XX.XddX..eeeX
+D:XXXXIXXX*X=XX-XX....XX.XXI.a.IXX.XXILLIXX=XX.X.XX.GGGGX
+D:X.....cX*X-X=-X.....X..X.I.a.I.X..XIILLIX=-X.X.Xdddd..X
+D:XllllX.XX%XX=XXG.GGXX.XX.IXXXI.XX.XXIILIXX-XX%XXXXXXX.X
+D:X...cl.=X8X-=XeG.GeX..X...X4X...X..XILLLIX-=X8X.aaaaaaX
+D:XLLX.l.-XXX9XXGG.GXX.XX...X.X...XX.XXLLLLXX9XXX.GGGGGGX
+D:X..L.l.=-X99X.....X..XWW..X%X..WWX..XLLLL.X99XXbbbbb..X
+D:X7.L.l.=-X8XX5...XX.XXWWW..c..WWWXX.XXLL.AXX8XXbbbbb.6X
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 D:XXXXXXXIIIIXIIIIXXIIIXIIIIXXIIIXXXXggggXc..cXaaaaXbb.CX
 D:XIIIIIXIXXIIIXXIIXIXIXIXXIXXIXIXXXXgddg%....%aaaa%bb..X
diff --git a/lib/edit/s_doom.map b/lib/edit/s_doom.map
index 5be3b67d..12ff7d06 100644
--- a/lib/edit/s_doom.map
+++ b/lib/edit/s_doom.map
@@ -15,7 +15,7 @@ F:$:178:0
 F:%:205:0
 
 # Hidden Door
-F:+:48:0:0:0:0:0:0:0:177
+F:+:48:0:0:0:0:0:0:177
 
 # Normal Door
 F:D:32:0
@@ -29,12 +29,6 @@ F:L:85:0
 # Treasure (random) on shallow lava
 F:*:86:0:0:*
 
-# Trap (random) on deep lava
-F:^:85:0:0:0:0:0:*
-
-# Trap (random) on shallow lava
-F:t:86:0:0:0:0:0:*
-
 # up staircase
 F:<:6:0
 
@@ -194,28 +188,28 @@ D:X          #%%NNLL...JJJ....LL#
 D:X #####    #NNNN...Ljjjjj..LLL#   #############################################..1!!!!...L###  X
 D:X##.LL##   #nNNN...LLJJj.LLLLL#   #L....&!&!&....L%%%%%%%L..mRR%R%%M%MML%LL...DL...!1&..@L%%#  X
 D:X#LL<..#   #nn.LL.LLLL...%%%LL#   #..##########################################LLL....LLL%%%#  X
-D:X##%LL##   #....LLL%%LLL..^LLL#   #.L#                                        #LL2.t..q.LLL##  X
+D:X##%LL##   #....LLL%%LLL..LLLL#   #.L#                                        #LL2....q.LLL##  X
 D:X ###+#    #D##############+#######.L#                                       ##%%.LLLL&L...#   X
-D:X   #!#    #.#            #.......L%%#                                      ##%%LL..2...t.##   X
-D:X   #^#    #.############ ##########+#             XXXXXXXXXX                ##.9.t.LLLLL##    X
+D:X   #!#    #.#            #.......L%%#                                      ##%%LL..2.....##   X
+D:X   #L#    #.############ ##########+#             XXXXXXXXXX                ##.9...LLLLL##    X
 D:X   #.#    #LL%%%%LL...p#      #11111#             X########X     ###############.2..LQ#+#     X
-D:X  ##.#    ############D##     #11211#             X#9....9#X     #o.....t...#  ###^L..#(#     X
+D:X  ##.#    ############D##     #11211#             X#9....9#X     #o.........#  ###LL..#(#     X
 D:X  #L##             ##%%V##    #12221#        XXXXXX#..$$..#XXXXXX#LLLLKkk...#    ###D####     X
-D:X  ##!#            ##.VH^%##   #12221#        X######t....m######X#LLLLkkk.LL#      #.#        X
-D:X   #.#           ##.iH%%hv##  #11211###      X#sSSSrrt%.mVVVLLe#X#.LL.kkk...#     ##.#        X
-D:X ###D#########   #tiI%HHhvL#  #11111+9#      X#rRssRr.%.mVvvm..#X#%...LLL...#    ##Lo######   X
-D:X #.^t^LLL...L##  #.LIH%Hc..#  #########      X#.MmmM..%..MMLLL.#X#%%......L&#   ##.L##EBBB#   X
-D:X #.jJ%%%L....L#  ##..ICCL.##                 X#.L..L..%ttL.....#X########D###   #.####LAAB##  X
+D:X  ##!#            ##.VHL%##   #12221#        X######.....m######X#LLLLkkk.LL#      #.#        X
+D:X   #.#           ##.iH%%hv##  #11211###      X#sSSSrr.%.mVVVLLe#X#.LL.kkk...#     ##.#        X
+D:X ###D#########   #.iI%HHhvL#  #11111+9#      X#rRssRr.%.mVvvm..#X#%...LLL...#    ##Lo######   X
+D:X #.L.LLLL...L##  #.LIH%Hc..#  #########      X#.MmmM..%..MMLLL.#X#%%......L&#   ##.L##EBBB#   X
+D:X #.jJ%%%L....L#  ##..ICCL.##                 X#.L..L..%..L.....#X########D###   #.####LAAB##  X
 D:X #JJJJL%LLL&..#   ##..L.L##                  X#9LLL...%..LL(LLq#X   #..L..#     #.LL..LB%%L#  X
-D:X #J%J..LLL%%LL##   ##.t.##                   X######......######X   #L.####     ###..LL%%%L## X
-D:X #jJJ^..bL%LL..##   ##D#################     XXXXXX#.LUUL.#XXXXXX   #.L#          #.PL%%%@(L# X
-D:X ##....BABLL..L.##   #.uLL^L..L%^^..L%%#          X#.L%%LL#X        #L.####       ###.L%LL..##X
-D:X  ##....B%%L.....##  #################L#          X#LLL..t#X        #..twW#        #L..LL...+pX
+D:X #J%J..LLL%%LL##   ##...##                   X######......######X   #L.####     ###..LL%%%L## X
+D:X #jJJL..bL%LL..##   ##D#################     XXXXXX#.LUUL.#XXXXXX   #.L#          #.PL%%%@(L# X
+D:X ##....BABLL..L.##   #.uLLLL..L%LL..L%%#          X#.L%%LL#X        #L.####       ###.L%LL..##X
+D:X  ##....B%%L.....##  #################L#          X#LLL...#X        #...wW#        #L..LL...+pX
 D:X  ###....LLL...LLL####################.#          X#%L..7.#X        #####L#      ###LL...1###oX
-D:X  #9+L%%L...LLL....D.+..%%oF.%%^..%%LL.#          X#LLLLt.#X            #p#      #%%%!@..## #tX
-D:X  ##################L###.L###..###.L####          X#7tt.LL#X            #.#      #########  #EX
+D:X  #9+L%%L...LLL....D.+..%%oF.%%L..%%LL.#          X#LLLL..#X            #p#      #%%%!@..## #.X
+D:X  ##################L###.L###..###.L####          X#7...LL#X            #.#      #########  #EX
 D:X  ##################.# ##############             X#.LLLL.#X       ######D###################LX
-D:X      ##11!!!&LL.+(#L#                            X#LL%%LL#X       #G..LLL.LL...D..LL....^LLL%X
+D:X      ##11!!!&LL.+(#L#                            X#LL%%LL#X       #G..LLL.LL...D..LL....LLLL%X
 D:X     ##1!!!%%%%Lp###L#                            X#L%%%%Q#X       #..LF....K...##############X
 D:X     ##!!%%%%%LLL..#.#                            XXXXDDXXXX########.LLLL..KKK..####          X
 D:X      ##.LLLLLLL...+.#                               #%%%%%%%%%%%%%+LL7..LL.k..L+o7#          X
diff --git a/lib/edit/s_factory.map b/lib/edit/s_factory.map
index 111829f1..f7432f83 100755
--- a/lib/edit/s_factory.map
+++ b/lib/edit/s_factory.map
@@ -83,65 +83,62 @@ F:<:6:0
 F:>:7:0
 
 # between gate 1
-F:1:160:6:0:0:0:0:0:845
+F:1:160:6:0:0:0:0:845
 
 # between gate 2
-F:2:160:6:0:0:0:0:0:846
+F:2:160:6:0:0:0:0:846
 
 # between gate 3
-F:3:160:6:0:0:0:0:0:4370
+F:3:160:6:0:0:0:0:4370
 
 # between gate 4
-F:4:160:6:0:0:0:0:0:3339
+F:4:160:6:0:0:0:0:3339
 
 # between gate 5
-F:5:160:6:0:0:0:0:0:4119
+F:5:160:6:0:0:0:0:4119
 
 # between gate 6
-F:6:160:6:0:0:0:0:0:6659
+F:6:160:6:0:0:0:0:6659
 
 # between gate 7
-F:7:160:6:0:0:0:0:0:9257
+F:7:160:6:0:0:0:0:9257
 
 # between gate 8
-F:8:160:6:0:0:0:0:0:8018
+F:8:160:6:0:0:0:0:8018
 
 # between gate 9
-F:9:160:6:0:0:0:0:0:9298
+F:9:160:6:0:0:0:0:9298
 
 # between gate A
-F:A:160:6:0:0:0:0:0:805
+F:A:160:6:0:0:0:0:805
 
 # between gate B
-F:B:160:6:0:0:0:0:0:831
+F:B:160:6:0:0:0:0:831
 
 # between gate D
-F:D:160:6:0:0:0:0:0:809
+F:D:160:6:0:0:0:0:809
 
 # between gate E
-F:E:160:6:0:0:0:0:0:2826
+F:E:160:6:0:0:0:0:2826
 
 # between gate F
-F:F:160:6:0:0:0:0:0:2831
+F:F:160:6:0:0:0:0:2831
 
 # between gate H
-F:H:160:6:0:0:0:0:0:4631
+F:H:160:6:0:0:0:0:4631
 
 # between gate J
-F:J:160:6:0:0:0:0:0:7198
+F:J:160:6:0:0:0:0:7198
 
 # between gate K
-F:K:160:6:0:0:0:0:0:7990
+F:K:160:6:0:0:0:0:7990
 
 # between gate N
-F:N:160:6:0:0:0:0:0:9253
+F:N:160:6:0:0:0:0:9253
 
 # Treasure on floor
 F:$:1:0:0:*65
 
-# Trap (random) on floor
-F:^:1:0:0:0:0:0:*
-
 
 ### Monsters
 
@@ -203,9 +200,9 @@ D:X&XXXe.XX~XXeeeXX~XXe..XX~~~~~~ttttXX.....X,,,,Ll,ll,X..XII.X.X.i.XXG_XXXXL%%L
 D:X..&..XX~~~XXeXX~?~XX.&X~~~~t~ttttttX.;.;.X,lllll,ll,XX_..XX.XX#X..X#XXf.X_GG_X.fX
 D:XGXGXGX?~~~~_c_~~~~~X.&XX~~~~t~ttttXX.....X,L,,,,,lL,.X.#XXi..G.XXiX..XX.........X
 D:X.....XX~~?XXcXX~~~XXa..XXX__XX__XXXX.;.;.X,L,.XXX%L%XXXXcXX.XXX.X.X.X.XX.X.ff.X.X
-D:XXgXgXgXX~XXcccXX?XXXXX.a^^a.^^a...bXXXGXXX%L%XX.XX%XXa.aXIX.Xi#.XiXI.X.X........X
-D:XgXgXgXgXXX^^^^^XXX,ccXXXXXXXXXXXb.XX#...#XX%XX.XI_XX....X.X.#XXXIX.#GX.X.X....X.X
-D:X.......4X.^^5^^.X.c.c..c..c.c..c.XX.#...#.XXXIXX.X.a.c..XXi..I.X._.X.XXX...&&...X
+D:XXgXgXgXX~XXcccXX?XXXXX.a..a...a...bXXXGXXX%L%XX.XX%XXa.aXIX.Xi#.XiXI.X.X........X
+D:XgXgXgXgXXX.....XXX,ccXXXXXXXXXXXb.XX#...#XX%XX.XI_XX....X.X.#XXXIX.#GX.X.X....X.X
+D:X.......4X...5...X.c.c..c..c.c..c.XX.#...#.XXXIXX.X.a.c..XXi..I.X._.X.XXX...&&...X
 D:X..&&...XXXXXXXXXXc,c,c.XX_XX..ccXX..#...#..XX#iiX.X.a..a.XX.#XX._X.XX.XX.X....X.X
 D:X......XXEX,,,c,c,cc,ccXXMRMXXc.XX...#...#...XXX#iXXXXXc..IXGX.XXiX.....X........X
 D:XXXXXXXX..X,,,,,,,,,,,XXM..RMXXXX$$XXX...XXX$$XX..XX_GXXXXXX.Ii.X_X.X#XXX.X....X.X
@@ -217,20 +214,20 @@ D:Xs.s._..&.&.XlX_._XlX..gg....X$$$#....%%%....#$$$X.IIX.X..XIXX.X.G#X..dXLl#_._
 D:X.s.s_g....XXlXXGXXlXX.g..d&.XX$$XXXXX...XXXXX$$XXXX._XG#X.XX.X_X.XX.c.XXXX...XXXX
 D:XXXXXXXXXXIXLLLXGXLLLXgg.g.d..XX$$$XXX...XXX$$$XX<...XiXX.X.Xi.X.X.Xd..X.........X
 D:Xgg.gXg.gXIXL%LXGXL%LXGXXX__XXXXX$$XXX...XXX$$XXXXXXIXXiX#XX#XX#X_XX...XXXXXXXIXXX
-D:X^^X^X^X^X^XX_XXGXX_XXGXXg..g.%.XX...X...X...XX.GI.X._iXXG...I..I.GX..dIX#I#I#I#IX
-D:X^^X^X^X^X^Xhl,&c.a&g.l.XX.g.g%RRXX..X###X..XX..#_X..XXX_iXXIXiXi_.Xc..X.IX.XXXIXX
-D:X^^X^X^X^X^X&,,,l&,lac.&.__.g.%.R.XX...>...XX#X.X..XX#.._X.X.X.#.XGX.X.XX_XX.X#i.X
+D:X..X.X.X.X.XX_XXGXX_XXGXXg..g.%.XX...X...X...XX.GI.X._iXXG...I..I.GX..dIX#I#I#I#IX
+D:X..X.X.X.X.Xhl,&c.a&g.l.XX.g.g%RRXX..X###X..XX..#_X..XXX_iXXIXiXi_.Xc..X.IX.XXXIXX
+D:X..X.X.X.X.X&,,,l&,lac.&.__.g.%.R.XX...>...XX#X.X..XX#.._X.X.X.#.XGX.X.XX_XX.X#i.X
 D:XH.Xg.gXg.gXla,ca&,f.fl.leXX..%R.RRXX.....XX.G.XX#XXI.XX.#.XGXXXiX.#X.XX.i._X.XGX#
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXGXXXXXXXG.X..X#XXX.XX.XXI._XIX.XIXXI#.XXX.X
 D:X,.,G,&&,ee,ff,hgg,&&,,,.,,I7XXXc..aX.;.;.X&..XXXG#XX.G.XXX..XG######.G.#..##..iXX
-D:X^X,G.&&.ee,ff..gg,&&,.,,,,XXX..MRM.X.....X.....XXX.IIX.XGI.XX..IXXXXXXXXXXX._.X._
-D:X^X,XXXXXXXXXXX.XXXXXX,,.XXX..$.....X.;.;.Xh..&...GXXXGXi#IXX.IXX..#.....#.XX##XXX
-D:X^X,llL,LlLL,LXXXlll,XXXXX..aMR..$.cX.....X.....XXXX8XXXXXXXX#IX###..##.#..#XI.XKX
-D:X^XlLCCCCCCCCLllll%%l.R.R.R.R..M.R..X.;.;.X&..XXX.#X#.i.#.XXX#X...###.#.##.#.X#IXX
-D:X^X,lL,llL,Ll,XXX,lllXXXXXc.M..R.c..X.....XXXXX#.#.XIX#Xi.X...X###.#####.#...X#XXX
-D:X^X,XXXXXXXXXXX.XXXXXX,.,XXX...$.M..X.;.;.Xh.##i#.#XX_IX.#X.##I....#.#.###.##X#I.X
-D:X^X.G,&&,,gg.&.,ee,ff,,.,.,XXXa..R..X.....X..#.###.XIXX.X.X.##XX####..#..###II.X.X
-D:X,,,G,&&,,gg.&h.ee,ff,..,.,I^XXXM..9X.;J;.Xh.##.###..iiX#.X....II.....#....IX..XNX
+D:X.X,G.&&.ee,ff..gg,&&,.,,,,XXX..MRM.X.....X.....XXX.IIX.XGI.XX..IXXXXXXXXXXX._.X._
+D:X.X,XXXXXXXXXXX.XXXXXX,,.XXX..$.....X.;.;.Xh..&...GXXXGXi#IXX.IXX..#.....#.XX##XXX
+D:X.X,llL,LlLL,LXXXlll,XXXXX..aMR..$.cX.....X.....XXXX8XXXXXXXX#IX###..##.#..#XI.XKX
+D:X.XlLCCCCCCCCLllll%%l.R.R.R.R..M.R..X.;.;.X&..XXX.#X#.i.#.XXX#X...###.#.##.#.X#IXX
+D:X.X,lL,llL,Ll,XXX,lllXXXXXc.M..R.c..X.....XXXXX#.#.XIX#Xi.X...X###.#####.#...X#XXX
+D:X.X,XXXXXXXXXXX.XXXXXX,.,XXX...$.M..X.;.;.Xh.##i#.#XX_IX.#X.##I....#.#.###.##X#I.X
+D:X.X.G,&&,,gg.&.,ee,ff,,.,.,XXXa..R..X.....X..#.###.XIXX.X.X.##XX####..#..###II.X.X
+D:X,,,G,&&,,gg.&h.ee,ff,..,.,I.XXXM..9X.;J;.Xh.##.###..iiX#.X....II.....#....IX..XNX
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 
 
diff --git a/lib/edit/s_gates.map b/lib/edit/s_gates.map
index 3ac7ccbf..37d39f22 100644
--- a/lib/edit/s_gates.map
+++ b/lib/edit/s_gates.map
@@ -55,35 +55,35 @@ F:1:1:0:0:0:0:10
 
 ### Level design
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-D:X*****...@%...aX.X9@********%%%%%%X9.VV....Xd.............A^^.......dX
-D:X*****...@%...aX.X@@********%%%%%%X.VVVV.X.XX.............B^^........X
-D:X*****...@%...aX.X99*XXX****%%88%%XVVWWVVX..XX.............^^.......9X
-D:X*****...@%...aX.X@@XXdXX***%%88%%XVVWWVVX...XX............^^.......CX
-D:X*****...@%...aX.X@XX...XX**%%%%%%X.VVVV.X.X..XX..........5^^........X
-D:X........@%...aX.XXX.....XX*%%%%%%X9.VV..X.XX..XX.........F^^.......dX
+D:X*****...@%...aX.X9@********%%%%%%X9.VV....Xd.............A.........dX
+D:X*****...@%...aX.X@@********%%%%%%X.VVVV.X.XX.............B..........X
+D:X*****...@%...aX.X99*XXX****%%88%%XVVWWVVX..XX......................9X
+D:X*****...@%...aX.X@@XXdXX***%%88%%XVVWWVVX...XX.....................CX
+D:X*****...@%...aX.X@XX...XX**%%%%%%X.VVVV.X.X..XX..........5..........X
+D:X........@%...aX.XXX.....XX*%%%%%%X9.VV..X.XX..XX.........F.........dX
 D:X%X......@%...aX.X........XIXXXXXXXXXXX..X..XX..XXXXIXXXXXXXXXXXXXXXXX
 D:X.XXX....@%...aX.X..........XXX..>X...X..X...XX..XXXaXaXaXaXaXaXaXaXaX
 D:X...XXX..@%...aI.X..........XXX7..X...D..X.X..XX..XX.................X
 D:X.....XXX@%...aX.X..........XXXXXXXXXXX..X.XX..XX..XX................X
 D:X.......XXX...aX.X..........XXXXXXXaG....X..XX..XX..XX...............X
-D:X..X......XXX.XX%XX^^^^^X...XXXXXXXaG....X...XX..XX..XX..............X
-D:X^^XX.......XXX***X^^^^^X...XIIII7XXXXXXXXXX..XX..XX..XXXXXXXXXXXX+X8X
-D:X^^XX.........X.6.X^^^^^X...XIXXXXX&&&&&&&&XX..XX..XX...........cX.XXX
-D:X..XXX........X***X^^^^^X...XIXXXXX.........XX..XX..XXXXXXXXXXXXXX..XX
-D:X^^X8X........XXXXX^^^^^X...XIIIIIXVVV.......XX..XX.............bXX..X
+D:X..X......XXX.XX%XX.....X...XXXXXXXaG....X...XX..XX..XX..............X
+D:X..XX.......XXX***X.....X...XIIII7XXXXXXXXXX..XX..XX..XXXXXXXXXXXX+X8X
+D:X..XX.........X.6.X.....X...XIXXXXX&&&&&&&&XX..XX..XX...........cX.XXX
+D:X..XXX........X***X.....X...XIXXXXX.........XX..XX..XXXXXXXXXXXXXX..XX
+D:X..X8X........XXXXX.....X...XIIIIIXVVV.......XX..XX.............bXX..X
 D:X..X8XX................XX...XXXXXIXVVVV.......XX..XXXXXXXXXXXXXXXXXX+X
-D:X^^X88X................XX...XIIIIIXVVVVVV..@...XX.^^^^^^^^^^^^^a.....X
-D:X^^X99XX...............XX...XIXXXXX4..VVVV......XXXXXXXXXXXXXXXXXXXXXX
+D:X..X88X................XX...XIIIIIXVVVVVV..@...XX..............a.....X
+D:X..X99XX...............XX...XIXXXXX4..VVVV......XXXXXXXXXXXXXXXXXXXXXX
 D:X..X999X...............XX...XIXXXXXXXXX.VVVV....***********.........bX
-D:X^^XIIIXX..............XX...XIX...5..fX...VVVVV.@....................X
+D:X..XIIIXX..............XX...XIX...5..fX...VVVVV.@....................X
 D:X..X....X........d.....XX...XIXf......X...VVVVVVV...............@....X
-D:X^^X....XX............XXX...XIXXXXXXXXX.......VVVVVVV................X
-D:X^^X&&&&&X............XXX...XIIIIIXe...........VVVVVVVVVVVV..........X
+D:X..X....XX............XXX...XIXXXXXXXXX.......VVVVVVV................X
+D:X..X&&&&&X............XXX...XIIIIIXe...........VVVVVVVVVVVV..........X
 D:X..X%%%.%XX..........XXX....XXXXXIX.............@VVVVVVVVVVVV@.......X
-D:X^^X88%.%8X.........XXX.....XXXXXIX...................VVVVVVVVVV.....X
+D:X..X88%.%8X.........XXX.....XXXXXIX...................VVVVVVVVVV.....X
 D:X..X%%%.%%XX........XX......XXXXXIX@.....................VVVVVVVVVVVVX
-D:X^^X......cX......XXXX......XXXXXIX........@..........@....VVVVVVVVVVX
-D:X^^^......cXX888XXXXX......dIIIIIIX.........................b.VVV...6X
+D:X..X......cX......XXXX......XXXXXIX........@..........@....VVVVVVVVVVX
+D:X.........cXX888XXXXX......dIIIIIIX.........................b.VVV...6X
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
@@ -97,9 +97,9 @@ D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXLgXXXXXXXXXXXXXXXXXXXXXXXXLLLLXXXXXXXXXXXX
 D:XXXXXXXXXXXXXXXXXXXfXXXXXXXXLXXXXXXXXXXXXXXXXXXXXXXXXXgLLLLXXXXXXXXXXX
 D:XXXXXXXXXXXXXXXXXXX.XXXXXXXghgXXXXbXXXXXXXXaXXXXXXXXXXXXXXLLLLgXXXXXXX
 D:XXXXXXXXXXXXXXXXXXX.XXXXXXXg1gXXXX.XXXXXXXX.XXXXXXXXXXXXXXXXgLLXXXXXXX
-D:XXXXXXXXXXXXXXXXXXX^XXXXXXXXXXXXXX^XXXXXXXX^XXXXXXXXXXXXXXXXXXLXXXXXXX
-D:XXXXXXXXXXXXXXX4..^^^..^^^.......^^^......^^^.........EXXXXXXXLXXXXXXX
-D:XXXXXXXXXXXXXXXXXXXXXXXX^XXXXXXXXX^XXXXXXXX^XXXXXXXXXXXXXXXXXLLXXXXXXX
+D:XXXXXXXXXXXXXXXXXXX.XXXXXXXXXXXXXX.XXXXXXXX.XXXXXXXXXXXXXXXXXXLXXXXXXX
+D:XXXXXXXXXXXXXXX4......................................EXXXXXXXLXXXXXXX
+D:XXXXXXXXXXXXXXXXXXXXXXXX.XXXXXXXXX.XXXXXXXX.XXXXXXXXXXXXXXXXXLLXXXXXXX
 D:XXXXXXXXXXXXXXXXXXXXXXXX.XXXXXXXXX.XXXXXXXX.XXXXXXXXXXXXXXXXLLLXXXXXXX
 D:XXXXXXXXXXXXXXXXXXXXXXXX.XXXXXXXXXcXXXXXXXXaXXXXXXXXXXXXXXXLLXXXXXXXXX
 D:XXXXXXXXXXXXXXXXXXXXXXXXeXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXgLLLXXXXXXXXXX
diff --git a/lib/edit/s_info.txt b/lib/edit/s_info.txt
index 5e41fe97..9ad2eee7 100644
--- a/lib/edit/s_info.txt
+++ b/lib/edit/s_info.txt
@@ -14,156 +14,123 @@
 # N:idx:name
 # D:desc
 # A:action mkey:action desc
-# I:rate
 
 # E:exclusive skill:exclusive skill
-# O:skill:opposing skill%percent
 # A:skill:friendly skill%percent
 
 # T:father:child
 
-# Version stamp (required)
-
-V:2.0.0
-
 ################################## MAGIC ##################################
 
 N:56:Magic-Device
 D:Eases the use of magical devices, such as wands, staves and rods
 D:It also helps pseudo-id of magic objects
-I:1000
 F:RANDOM_GAIN
 
 N:54:Spell-learning
 D:You should not see that ! that is a BUG!
 #A:18:Learn a spell from a realm
-I:1000
 F:HIDDEN
 
 N:41:Sorcery
 D:Ability to use all the magic schools as if their skill was sorcery
 D:But the price to channel that much magic is your health
 A:17:Cast a spell
-I:1000
 
 N:1:Conveyance
 D:Ability to learn and use spells from the Conveyance school
 D:Spells use the intelligence stat
 A:17:Cast a spell
-I:1000
 F:RANDOM_GAIN
 
 N:2:Mana
 D:Ability to learn and use spells from the Mana school
 D:Spells use the intelligence stat
 A:17:Cast a spell
-I:1000
 
 N:3:Fire
 D:Ability to learn and use spells from the Fire school
 D:Spells use the intelligence stat
 A:17:Cast a spell
-I:1000
 
 N:4:Air
 D:Ability to learn and use spells from the Air school
 D:Spells use the intelligence stat
 A:17:Cast a spell
-I:1000
 
 N:5:Water
 D:Ability to learn and use spells from the Water school
 D:Spells use the intelligence stat
 A:17:Cast a spell
-I:1000
 
 N:6:Nature
 D:Ability to learn and use spells from the Nature school
 D:Spells use the intelligence stat
 A:17:Cast a spell
-I:1000
 
 N:7:Earth
 D:Ability to learn and use spells from the Earth school
 D:Spells use the intelligence stat
 A:17:Cast a spell
-I:1000
 
 N:10:Divination
 D:Ability to learn and use spells from the Divination school
 D:Spells use the intelligence stat
 A:17:Cast a spell
-I:1000
 F:RANDOM_GAIN
 
 N:11:Temporal
 D:Ability to learn and use spells from the Temporal school
 D:Spells use the intelligence stat
 A:17:Cast a spell
-I:1000
 
 N:14:Meta
 D:Ability to learn and use spells from the Meta school
 D:Spells use the intelligence stat
 A:17:Cast a spell
-I:1000
 
 N:51:Mind
 D:Ability to learn and use spells from the Mind school
 D:Spells use the intelligence stat
 A:17:Cast a spell
-I:1000
 
 N:55:Udun
 D:Ability to learn and use spells from the Udun school
 D:Spells use the intelligence stat
 A:17:Cast a spell
-I:1000
 F:HIDDEN
 
 N:13:Demonology
 D:Ability to use incantations from the Demonblades
 D:Spells use the intelligence stat
 A:17:Cast a spell
-I:1000
 
 N:31:Necromancy
 D:Ability to harness the powers of the dead
 D:Spells use the intelligence stat
 A:7:Use Necromancy
-I:1000
 F:RANDOM_GAIN
 G:60
 
-N:34:Runecraft
-D:Ability to combine magic runes to create your own spells
-D:Runespells use the dexterity stat
-A:9:Use Runespells
-I:1000
-
 N:43:Thaumaturgy
 D:Ability to gain and cast innate spells
 D:Spells use the intelligence stat
 A:8:Cast a thaumaturgy spell
-I:1000
 F:RANDOM_GAIN
 
 N:15:Magic
 D:General ability to do magic, also affects mana reserves and
 D:magic device ability. Helps pseudo-id of magic objects
 A:19:Copy a spell
-I:1000
 F:RANDOM_GAIN
 
 N:45:Spell-power
 D:Ability to increase the power of spells
-I:1000
 
 N:59:Geomancy
 D:Ability to understand the raw elemental forces of nature and use
 D:them to your advantage. Most spells need Fire/Water/Earth/Air skills
 A:101:Use Geomancy
-I:1000
 
 # All magic skills affect magic skill
 f:Magic-Device:Magic%7
@@ -187,7 +154,6 @@ f:Mind:Magic%10
 f:Udun:Magic%10
 f:Demonology:Magic%10
 f:Necromancy:Magic%4
-f:Runecraft:Magic%12
 f:Thaumaturgy:Magic%6
 
 
@@ -197,81 +163,65 @@ f:Thaumaturgy:Magic%6
 N:16:Combat
 D:General ability to fight and to pseudo-id armour and weapons
 D:It also allows the use of heavier armour without penalties
-I:1000
 F:RANDOM_GAIN
 
 N:17:Weaponmastery
 D:General ability to use melee weapons
-I:1000
 F:RANDOM_GAIN
 
 N:18:Sword-mastery
 D:Ability to use swords
-I:1000
 
 N:19:Axe-mastery
 D:Ability to use axes
-I:1000
 
 N:20:Polearm-mastery
 D:Ability to use polearms
-I:1000
 
 N:21:Hafted-mastery
 D:Ability to use hafted weapons
-I:1000
 
 N:22:Backstab
 D:Ability to backstab fleeing and sleeping monsters to increase damage
-I:1000
 
 N:23:Archery
 D:General ability to use ranged weapons
-I:1000
 F:RANDOM_GAIN
 
 N:24:Sling-mastery
 D:Ability to use slings
 A:23:Fire piercing shots
-I:1000
 
 N:25:Bow-mastery
 D:Ability to use bows
 A:23:Fire piercing shots
-I:1000
 
 N:26:Crossbow-mastery
 D:Ability to use crossbows
 A:23:Fire piercing shots
-I:1000
 
 N:27:Boomerang-mastery
 D:Ability to use boomerangs
-I:1000
 
 N:58:Boulder-throwing
 D:Ability to make and throw boulders
 A:21:Tear down a wall to create boulders
-I:1000
 
 N:42:Barehand-combat
 D:Ability to fight barehanded
-I:1000
 F:RANDOM_GAIN
 G:70
 
 N:47:Bearform-combat
 D:Ability to fight in bear form
-I:1000
-F:HIDDEN | AUTO_HIDE
+F:AUTO_HIDE
+F:HIDDEN
 
 N:52:Critical-hits
 D:Ability to deal critical hits with swords < 5lb
-I:1000
 
 N:57:Stunning-blows
 D:Ability to stun opponents when doing critical hits with hafted weapons > 5 lb
-I:1000
 
 # List of combat friendly skills
 
@@ -303,41 +253,28 @@ f:Boomerang-mastery:Combat%7
 f:Barehand-combat:Combat%50
 f:Boulder-throwing:Combat%40
 
-# No more, let's see how it turns out
-# Sorcery and Weaponmastery aren't exactly friendly to each other
-#O:Sorcery:Weaponmastery%100
-#O:Sorcery:Archery%100
-#O:Sorcery:Barehand-combat%100
-#O:Weaponmastery:Sorcery%100
-#O:Archery:Sorcery%100
-#O:Barehand-combat:Sorcery%100
-
 
 
 ############################### SPIRITUALITY SKILLS ###########################
 
 N:28:Spirituality
 D:General ability to use spiritual skills and also influence your Saving Throw
-I:1000
 F:RANDOM_GAIN
 
 N:53:Prayer
 D:Ability to learn and use spells from the gods' schools
 D:Spells use the wisdom stat and cost piety instead of mana
 A:17:Cast a spell
-I:1000
 
 N:12:Druidistic
 D:Ability to learn and use prayers from the Druidistic realm
 D:Nature powers use the wisdom stat
 A:1:Cast a druidistic spell
-I:1000
 
 N:29:Mindcraft
 D:Ability to focus the powers of the mind
 D:Mindpowers use the wisdom stat
 A:2:Use Mindcraft
-I:1000
 F:RANDOM_GAIN
 G:50
 
@@ -345,7 +282,6 @@ N:9:Music
 D:Ability to learn and sing songs
 D:Songs use the charisma stat
 A:17:Cast a spell
-I:1000
 
 f:Prayer:Spirituality%10
 f:Druidistic:Spirituality%10
@@ -362,20 +298,13 @@ f:Music:Magic%10
 
 N:30:Misc
 D:Not a real skill, it is only used to regroup some skills
-I:0
 
 N:33:Antimagic
 D:Ability to generate an antimagic field
 A:3:Use antimagic
-I:1000
 F:RANDOM_GAIN
 G:80
 
-N:39:Alchemy
-D:Ability to use essences to modify/create magic items
-A:5:Use Alchemy
-I:1000
-
 # Antimagic exclude all magic
 E:Magic-Device:Antimagic
 E:Mana:Antimagic
@@ -393,7 +322,6 @@ E:Nature:Antimagic
 E:Udun:Antimagic
 E:Sorcery:Antimagic
 E:Demonology:Antimagic
-E:Runecraft:Antimagic
 E:Necromancy:Antimagic
 E:Mindcraft:Antimagic
 E:Music:Antimagic
@@ -403,37 +331,21 @@ E:Thaumaturgy:Antimagic
 
 ################################## SNEAKINESS SKILLS ###############################
 
-N:35:Sneakiness
-D:General ability at the sneakiness skills.
-D:It also affects the searching abilities
-I:0
-F:RANDOM_GAIN
-
 N:36:Stealth
 D:Ability to move unnoticed, silently
-I:0
-F:RANDOM_GAIN
-
-N:37:Disarming
-D:Ability to disarm the various traps
-I:0
 F:RANDOM_GAIN
 
 N:40:Stealing
 D:Ability to steal objects
 A:15:Steal object
-I:0
 
 N:46:Dodging
 D:Ability to dodge blows and bolts
 A:16:Check dodge chance
-I:0
 
-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 ################################
@@ -441,38 +353,32 @@ f:Dodging:Sneakiness%10
 N:48:Monster-lore
 D:General ability at the monster related skills, ability to gain experience
 D:from friendly kills. It also affects the number of companions you can have
-I:0
 A:22:Turn pet into companion
 F:RANDOM_GAIN
 
 N:44:Summoning
 D:Ability to create totems from monsters and use them to summon monsters
 A:13:Manipulate totems
-I:1000
 F:RANDOM_GAIN
 G:60
 
 N:49:Corpse-preservation
 D:Ability not to destroy the monsters' corpses when killing them
-I:0
 
 N:50:Possession
 D:Ability to incarnate into monsters
 A:11:Use the possession skill
-I:0
 
 N:8:Symbiosis
 D:Ability to enter in symbiosis with monsters unable to move by themselves
 D:Spells use the intelligence stat
 A:20:Use symbiotic powers
-I:1000
 F:RANDOM_GAIN
 G:70
 
 N:32:Mimicry
 D:Ability to use cloaks of mimicry to change form
 A:6:Use Mimicry
-I:1000
 F:RANDOM_GAIN
 G:80
 
@@ -502,12 +408,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
@@ -524,9 +428,7 @@ T:Magic:Nature
 T:Magic:Udun
 T:Magic:Demonology
 T:Magic:Necromancy
-T:Magic:Runecraft
 T:Magic:Thaumaturgy
-T:Magic:Alchemy
 
 T:Geomancy:Fire
 T:Geomancy:Water
diff --git a/lib/edit/s_name.map b/lib/edit/s_name.map
index 795d8786..e1a352ef 100644
--- a/lib/edit/s_name.map
+++ b/lib/edit/s_name.map
@@ -62,46 +62,46 @@ F:1:1:0:0:0:0:16
 
 ### Level Design
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-D:X.....LLLLLLLLL.....XXX.G=-&&=-G^.........>X
-D:X.LLL...........LLLXX...G=-&.=-G^........1.X
-D:X.L9L.LLLLLLLLLLLLX%...EGE.=&.FG^..........X
-D:X.L99.L&..........X%....G..&-..G^....j.....X
-D:X.LLLLL&LLLLLLLLL.LXX...G=-=&-=G^..........X
-D:X....&&&L.......L.L*XXX.G-=&&-=G^^^^^^^^^^^X
+D:X.....LLLLLLLLL.....XXX.G=-&&=-G..........>X
+D:X.LLL...........LLLXX...G=-&.=-G.........1.X
+D:X.L9L.LLLLLLLLLLLLX%...EGE.=&.FG...........X
+D:X.L99.L&..........X%....G..&-..G.....j.....X
+D:X.LLLLL&LLLLLLLLL.LXX...G=-=&-=G...........X
+D:X....&&&L.......L.L*XXX.G-=&&-=G...........X
 D:XLLLLLLLL.LLLLL..&L**XXXXXXXGGGG%XXXXXXXXXXX
-D:XXXXXXLL..L***LLLLLLLX^^^^8Xi....%@@^^.^^@@X
-D:X5..8X.&.XXXXXX......D^^^^8XIIIIIXbb^^.^^ccX
-D:X...8X...XA...X.LLLLLX^^^^8X.....X..^^.^^..X
-D:X...8X.XXXC...X.LL...XXXIXXX^^^^^X..^^.^^..X
-D:XGXXXX.LfX7...X&LL.L.Xa^^^aXf...fX..^^.^^..X
-D:X.X5XL.L*XB...X&&..L.X^b^b^X^^^^^X..^^.^^..X
-D:X.X^XL.L*XXXXXXLLLLL.X^^7^^X.....X..^^.^^..X
-D:X.X^XL.L***fXL.....&&X^b^b^XIIIIIX..^^.^^..X
-D:X.X^XL.LLLLLXL.LLLLLLXa^^^aXi....X..^^.^^..X
-D:X.X^XL.........XXXXXXXXX%XXXXXXXXX..^^.^^..X
-D:X.X^XXXXXXXXXXLX^...^Xe-^=dX^^..&X..^^.^^..X
-D:X.X^^^^^^^^^^XLX.^^^.X-^^^=X^^..&X..^^.^^..X
-D:X.XXXXXXXXXX^X8Xf^B^.%^^6^^%^^C.&X..^^.^^..X
-D:X.LLLLLLLLL+^XXX.^^^.X-^^^=X^^..&X..^^.^^..X
-D:X.XXXXXXXXXXXXXX^...^Xd-^=eX^^..&X..^^.^^..X
-D:X.Xbbbbb......XXXXXXXXXX%XXXXXXXXX..^^.^^..X
-D:X.XbbbbXXXX^^^^XX....X^^^^^X...h.X..^^.^^..X
-D:X.XbbbXX^^XXX^^^XX...X^ccc^X....0X..^^.^^..X
-D:X.XbbXX.^X%bXX^^^XX..X^.A.^X.....X..^^0^^..X
-D:X.IbXX..XXbbbXX^^^XX.X^ccc^XIXXXXXXXXXXXXXXX
-D:X.XXX..XX.....X%^^^XXX^^^^^XlllllllllllllllX
-D:X.X99.XXW......XX^^^XXXXXXXXlllllllllllllllX
-D:X.X99XXWWW...a..XX^^.XXllllllLLLLLlXXXX%XXXX
-D:X.XXXX..WWW.....cXX^.XXXXXlllllllllXVVVVVVVX
-D:X.X8.....WWW....ccX^.X^^^XLLLlLLLLLXVVVVVVVX
-D:X.X%XXXXXXXWW...cXXX.X+X^XlllllllllXV%%%%%VX
-D:X.X.......XWWW..X%^X.XLX^XlLLLLLLLLXV%8^8%VX
-D:X.XXXXXX%.X.WWWXX^^X.XLX^XlllllllllXV%^a^%VX
-D:X.X.IIIIX.X..WXX..XXcXLX^XLLLlLLLLlXV%^^^%VX
-D:X.X%XXXIX.X..XX..XXccXLX^XlglllLgllXV%^^^%VX
-D:X.Xa.6XIX.X.XX..XXcccXLX^XlllllXXXXXV%^a^%VX
-D:X+XXX.XIX.X.X99XXccccXLX^XXXXXXX888XV%8^8%VX
-D:X%%%Xa%.X.%8X99XcccccXLX^^^^^^4X...XV%%%%%VX
+D:XXXXXXLL..L***LLLLLLLX....8Xi....%@@.....@@X
+D:X5..8X.&.XXXXXX......D....8XIIIIIXbb.....ccX
+D:X...8X...XA...X.LLLLLX....8X.....X.........X
+D:X...8X.XXXC...X.LL...XXXIXXX.....X.........X
+D:XGXXXX.LfX7...X&LL.L.Xa...aXf...fX.........X
+D:X.X5XL.L*XB...X&&..L.X.b.b.X.....X.........X
+D:X.X.XL.L*XXXXXXLLLLL.X..7..X.....X.........X
+D:X.X.XL.L***fXL.....&&X.b.b.XIIIIIX.........X
+D:X.X.XL.LLLLLXL.LLLLLLXa...aXi....X.........X
+D:X.X.XL.........XXXXXXXXX%XXXXXXXXX.........X
+D:X.X.XXXXXXXXXXLX.....Xe-.=dX....&X.........X
+D:X.X..........XLX.....X-...=X....&X.........X
+D:X.XXXXXXXXXX.X8Xf.B..%..6..%..C.&X.........X
+D:X.LLLLLLLLL+.XXX.....X-...=X....&X.........X
+D:X.XXXXXXXXXXXXXX.....Xd-.=eX....&X.........X
+D:X.Xbbbbb......XXXXXXXXXX%XXXXXXXXX.........X
+D:X.XbbbbXXXX....XX....X.....X...h.X.........X
+D:X.XbbbXX..XXX...XX...X.ccc.X....0X.........X
+D:X.XbbXX..X%bXX...XX..X..A..X.....X....0....X
+D:X.IbXX..XXbbbXX...XX.X.ccc.XIXXXXXXXXXXXXXXX
+D:X.XXX..XX.....X%...XXX.....XlllllllllllllllX
+D:X.X99.XXW......XX...XXXXXXXXlllllllllllllllX
+D:X.X99XXWWW...a..XX...XXllllllLLLLLlXXXX%XXXX
+D:X.XXXX..WWW.....cXX..XXXXXlllllllllXVVVVVVVX
+D:X.X8.....WWW....ccX..X...XLLLlLLLLLXVVVVVVVX
+D:X.X%XXXXXXXWW...cXXX.X+X.XlllllllllXV%%%%%VX
+D:X.X.......XWWW..X%.X.XLX.XlLLLLLLLLXV%8.8%VX
+D:X.XXXXXX%.X.WWWXX..X.XLX.XlllllllllXV%.a.%VX
+D:X.X.IIIIX.X..WXX..XXcXLX.XLLLlLLLLlXV%...%VX
+D:X.X%XXXIX.X..XX..XXccXLX.XlglllLgllXV%...%VX
+D:X.Xa.6XIX.X.XX..XXcccXLX.XlllllXXXXXV%.a.%VX
+D:X+XXX.XIX.X.X99XXccccXLX.XXXXXXX888XV%8.8%VX
+D:X%%%Xa%.X.%8X99XcccccXLX......4X...XV%%%%%VX
 D:X%.%XXXXXXXXXXXXIXXXXXLXXXXXXXXX...XVVVVVVVX
 D:X.%%+..........................G..4X...F...X
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
diff --git a/lib/edit/s_ship.map b/lib/edit/s_ship.map
index f429d4ec..69a94fa3 100755
--- a/lib/edit/s_ship.map
+++ b/lib/edit/s_ship.map
@@ -19,8 +19,6 @@
 # I'm not sure esp. about the correct exit of gate #3.
 
 
-#%:special.txt
-
 
 ### Terrain Features
 
@@ -157,15 +155,6 @@ F:$:90:0:0:*47
 # Treasure (good) on ice
 F:%:90:0:0:*60
 
-# Trap (random) on ice
-F:^:90:0:0:0:0:0:*
-
-# Trap (random) on shallow water
-F:t:84:0:0:0:0:0:*
-
-# Trap (random) on fog
-F:@:210:0:0:0:0:0:*
-
 # Human skeleton on ice
 F:x:90:0:0:395
 
@@ -173,16 +162,16 @@ F:x:90:0:0:395
 ### Between Gates
 
 # between gate 3: was 711
-F:3:160:6:0:0:0:0:0:1136
+F:3:160:6:0:0:0:0:1136
 
 # between gate A: was 6247
-F:A:160:6:0:0:0:0:0:6761
+F:A:160:6:0:0:0:0:6761
 
 # between gate 4: was 3339
-F:4:160:6:0:0:0:0:0:3853
+F:4:160:6:0:0:0:0:3853
 
 # between gate B: was 3085
-F:B:160:6:0:0:0:0:0:3599
+F:B:160:6:0:0:0:0:3599
 
 
 ### Guaranteed Items
@@ -197,33 +186,33 @@ D:XXXXXXXXXXXXXXXX                  XXXXXXXXXXXX
 D:X###############..~  .#. k    w ~.#XX######### .~~     s                                 G..#####..  w  .###.######X##~~ .GX.### 
 D:X####%####...~      ~.~      s .#.X#~~.#####  .~                             s       w G..#.##.#.XGG~XXk~.####A####.~X   ~~.X... 
 D:X##%#$#######...~ w       wXXXXXX#XXXX###XXX #~XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX..XX....~.XX  X#xX.#..#.#G. w ~X G~~ 
-D:X##$#########....     s   XXXTT^...~.~#####w~###~~~~8....**.tE.&E ^^.M^.xx.....x..ZZ..^XTTTT M...GG.~..  w G.###~XX~~#XX .  s X  
-D:X#########...~   w      XXXTTTT.^..x~.H####  ###~~D....8**.~M~.E..M^.MM^..xh.h...ZZZZ^~M.,.,.,.~~ .G...~~  ~###.   w  . w  M.d.  
-D:X#####.x.x~~~         XXXTTTXXXMxx.H.####### ~##~~~8...#.**.~tE&EE^^~%M^.h.x.E.xh.ZZ..^X.,.^....~ ...G.~  s ~#  XX ~~    w   X   
-D:X######...~~  MM~  w XXX^^XXX.MMMxx...G#####w  ~#~.~..&...**E.MEt.^^.MM^~..i.....ZZZZ^~M.,.,,.gM.~.,~.,G.G~~ G~.  G~.MM XX..~    
-D:X##.....~~        XXX^E=^XX$b.MMMMxH..HG#.##  w ~#~##~8....*E~.&EM^^.M^h..i..x.x..ZZ..^XTTTTX.,.,~........~.G~~..w . G~...G~X    
-D:X...~~~    K    XXX^^EXXXX$$$..MMXXXXXXX####   #####XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX..,.X..M~.........~G..G ~~.G...G~    
-D: ~~~   w      XXX^^EXXXdX%d$$b$$XXd~~~~#####  s   ###.,.W.**,.x.,.,.,.,.,.***,,....,x....,,.SX.,.,.,..,o.,.,.~~.G..~.G..G..~X k  
-D: w  MMM.  w XXX^E^XXX.,*XDDd$$$XXd$..~~~~####    ###.,.,.,.**..,.,i.,.,W,.,**..z.,.,.q...g.,......~.,.,.,.,.~.~..F.~M~......~    
-D:    MM.   XXX4EEXXXi^**.XX%%$dXX$d$.H#####~G~~####.~.,~..,.h*,,~,.,.,.,~,.,.,.H.,.~.,..~,.,,,.~,.,.~.,.,.X.~,g.~~..~.~..,..,X    
-D:   s    XXXBXXXXX^.**.W.,XDD%XXb$$b####..G~~~G###~.,,.,.,.,...,,.x,.~.,.,~..,.~.,.,~,.,.,,.,.,~,.,.,.~,.,..,X.,.***.~***,W.,X    
-D:      XXX.o..X.g***i.*.,.XX%XX######^^^^t      ##ttt^^^^^t^^^^^^t^^^^^t^^^^^^^t^^^^^^t^^^^t^^tt^^^tt^^^^t^tXo..x************X    
-D: k  XXX^E..o.XX8.****,.g..XXX..#........~~~~~ttt###~~.,.G~.......XXXXX..~,..,,..,,.~.,..,.,..,,..,.,x..,.ooX******W***g.*.g*X    
-D:  XXX%S^^E..ooX,*****,..,.X.....h........XXX~~~tt#tt   w ~~G~...XXXXXXX.,**.,..D.**.G.,~,..XXX...~~~.....o8X***.~.,.****$$..X    
-D: XX%%%^mm.E..oXH**.^.*i.....#.....i..*..XXXXX~~            G~~.XXXXXXXXX~.*..,.,*..~,..,.,XXXXX...~..,.XXXXXo.W.$$.g.x....o.X    
-D:  XXX%S^^E..ooX8.*~~...,~~##...,..,.***,.XXX~G~     k       ~~~~XXXXXXX.,.*. g...*..x..W.~.XXX.***.,,o..oO8X.o.,.o.xx$$$XXXXX    
-D:    XXX^E..o.XXH.###....###~~~.,h..,.*.,..~~.~~           s   ~~.XXXXX.~..**...i~**.....~.,,.,,.***~,,,.oXXXXXXXXXXXXXXXX.!.X    
-D: s    XXX.o..X&..w~##..##~~~X~^^^^^^^^^^t^ttt^tt   w   tt^tttt^^tt^^^^^ttt^^^^ttt@@^^^^ttt^^^^^ttt@^^ttXXXW ^^.M*.t^oo.^^...X  s 
-D:   ~~~  XXX>XXH~G..#####~G~~Gt..,.,..,.,xx..x ~~~     i~~xx.~...x....~.~..~..,~..***..~..~...,~.~*.~.XXXE.^^H..SM.~^.oo....JX    
-D: ~~....~~ XXX$8w~.^####G~G ~i.XX.,,.,...........G~~~s~~ iiF~...........~.......x.,.**~....,~....~.*XXX.EE.W.^^.M*.~^^^o^O^..X    
-D: ~.#..#..~~ XXX8##t..##~#.G.t..XX..,H...,.W...,...,~~...,...*,,.x...,.i.....g.....**.........XXXXXXX...EE.^^H..SM.~.^oo...^JX    
-D: ~.##.##..~   XXX###GG~~~*h~.^..XX.....,....,.W...,.G....W.***...,...,...,....,...,**..q....SX3tttW#...EE.W.^^.M*.t.oo.^.^.XX    
-D: ~~.###..~~     X##.##~~G^~~~~i*^XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX~~   
-D: ~~...###.~  k  ~###X.G~~@Gh~x*~^..^i.zX8~i.~..h....zzzXiX..^$.T.t$......F.t..XX..^TTT*..M..Y....^.Y.^*.^..~....X.x..x~.<XX~.    
-D: ~.....####.....#####XXXx@@~i~.z..z.it,#**t..h..Gzh.zzX@.@Xd*t.~...*~.t......^X..T.^T*@*TXMM...^....^**@.^.x*...+..~....XX..~    
-D:    ~~.#$%#########....XXX~h~i.HH...h,i^X*.H..h.^G..WX@.E.^X**8..Y.~*8...Y...^+XXXXXXXXXXXMF...~....^.*..x.***..X..x..~XX...~~w  
-D:   ~~.#$$######.~   ~w  XXX$~.x..~G^..,i.,.~.h.^~~..zzX@.@Xd*......F**..~....^XbM..^~ZZZZXMM..*.....~^......*.XXXXXXXIXX.~~#~w   
-D: L  ~~xx########.~~       XXX$$.G#GX#.i,,^ih.^W.zG^zzzXiX.$.t88.~..^**F..T...tXX~~.^^ZZZZM~..**@~~.Y~..^#^..xXI&X8&..XX ~~~## w  
+D:X##$#########....     s   XXXTT....~.~#####w~###~~~~8....**.~E.&E ...M..xx.....x..ZZ...XTTTT M...GG.~..  w G.###~XX~~#XX .  s X  
+D:X#########...~   w      XXXTTTT....x~.H####  ###~~D....8**.~M~.E..M..MM...xh.h...ZZZZ.~M.,.,.,.~~ .G...~~  ~###.   w  . w  M.d.  
+D:X#####.x.x~~~         XXXTTTXXXMxx.H.####### ~##~~~8...#.**.~~E&EE..~%M..h.x.E.xh.ZZ...X.,......~ ...G.~  s ~#  XX ~~    w   X   
+D:X######...~~  MM~  w XXX..XXX.MMMxx...G#####w  ~#~.~..&...**E.ME~....MM.~..i.....ZZZZ.~M.,.,,.gM.~.,~.,G.G~~ G~.  G~.MM XX..~    
+D:X##.....~~        XXX.E=.XX$b.MMMMxH..HG#.##  w ~#~##~8....*E~.&EM...M.h..i..x.x..ZZ...XTTTTX.,.,~........~.G~~..w . G~...G~X    
+D:X...~~~    K    XXX..EXXXX$$$..MMXXXXXXX####   #####XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX..,.X..M~.........~G..G ~~.G...G~    
+D: ~~~   w      XXX..EXXXdX%d$$b$$XXd~~~~#####  s   ###.,.W.**,.x.,.,.,.,.,.***,,....,x....,,.SX.,.,.,..,o.,.,.~~.G..~.G..G..~X k  
+D: w  MMM.  w XXX.E.XXX.,*XDDd$$$XXd$..~~~~####    ###.,.,.,.**..,.,i.,.,W,.,**..z.,.,.q...g.,......~.,.,.,.,.~.~..F.~M~......~    
+D:    MM.   XXX4EEXXXi.**.XX%%$dXX$d$.H#####~G~~####.~.,~..,.h*,,~,.,.,.,~,.,.,.H.,.~.,..~,.,,,.~,.,.~.,.,.X.~,g.~~..~.~..,..,X    
+D:   s    XXXBXXXXX..**.W.,XDD%XXb$$b####..G~~~G###~.,,.,.,.,...,,.x,.~.,.,~..,.~.,.,~,.,.,,.,.,~,.,.,.~,.,..,X.,.***.~***,W.,X    
+D:      XXX.o..X.g***i.*.,.XX%XX######....~      ##~~~.....~......~.....~.......~......~....~..~~...~~....~.~Xo..x************X    
+D: k  XXX.E..o.XX8.****,.g..XXX..#........~~~~~~~~###~~.,.G~.......XXXXX..~,..,,..,,.~.,..,.,..,,..,.,x..,.ooX******W***g.*.g*X    
+D:  XXX%S..E..ooX,*****,..,.X.....h........XXX~~~~~#~~   w ~~G~...XXXXXXX.,**.,..D.**.G.,~,..XXX...~~~.....o8X***.~.,.****$$..X    
+D: XX%%%.mm.E..oXH**...*i.....#.....i..*..XXXXX~~            G~~.XXXXXXXXX~.*..,.,*..~,..,.,XXXXX...~..,.XXXXXo.W.$$.g.x....o.X    
+D:  XXX%S..E..ooX8.*~~...,~~##...,..,.***,.XXX~G~     k       ~~~~XXXXXXX.,.*. g...*..x..W.~.XXX.***.,,o..oO8X.o.,.o.xx$$$XXXXX    
+D:    XXX.E..o.XXH.###....###~~~.,h..,.*.,..~~.~~           s   ~~.XXXXX.~..**...i~**.....~.,,.,,.***~,,,.oXXXXXXXXXXXXXXXX.!.X    
+D: s    XXX.o..X&..w~##..##~~~X~..........~.~~~.~~   w   ~~.~~~~..~~.....~~~....~~~**....~~~.....~~~*..~~XXXW ...M*.~.oo......X  s 
+D:   ~~~  XXX>XXH~G..#####~G~~G~..,.,..,.,xx..x ~~~     i~~xx.~...x....~.~..~..,~..***..~..~...,~.~*.~.XXXE...H..SM.~..oo....JX    
+D: ~~....~~ XXX$8w~..####G~G ~i.XX.,,.,...........G~~~s~~ iiF~...........~.......x.,.**~....,~....~.*XXX.EE.W....M*.~...o.O...X    
+D: ~.#..#..~~ XXX8##~..##~#.G.~..XX..,H...,.W...,...,~~...,...*,,.x...,.i.....g.....**.........XXXXXXX...EE...H..SM.~..oo....JX    
+D: ~.##.##..~   XXX###GG~~~*h~....XX.....,....,.W...,.G....W.***...,...,...,....,...,**..q....SX3~~~W#...EE.W....M*.~.oo.....XX    
+D: ~~.###..~~     X##.##~~G.~~~~i*.XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX~~   
+D: ~~...###.~  k  ~###X.G~~*Gh~x*~....i.zX8~i.~..h....zzzXiX...$.T.~$......F.~..XX...TTT*..M..Y......Y..*....~....X.x..x~.<XX~.    
+D: ~.....####.....#####XXXx**~i~.z..z.i~,#**~..h..Gzh.zzX*.*Xd*~.~...*~.~.......X..T..T***TXMM.........***...x*...+..~....XX..~    
+D:    ~~.#$%#########....XXX~h~i.HH...h,i.X*.H..h..G..WX*.E..X**8..Y.~*8...Y....+XXXXXXXXXXXMF...~......*..x.***..X..x..~XX...~~w  
+D:   ~~.#$$######.~   ~w  XXX$~.x..~G...,i.,.~.h..~~..zzX*.*Xd*......F**..~.....XbM...~ZZZZXMM..*.....~.......*.XXXXXXXIXX.~~#~w   
+D: L  ~~xx########.~~       XXX$$.G#GX#.i,,.ih..W.zG.zzzXiX.$.~88.~...**F..T...~XX~~...ZZZZM~..***~~.Y~...#...xXI&X8&..XX ~~~## w  
 D:     ~.########..~~        XXXXX~#X~X#XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX   ~###~w  
 D:  ~~.#########..~ w    K   w     ~#####    w  ~.M.~                    ~..####.~  s~~~~.~~              s  K            ~##..~   
 D:  ~..#########.~                  ~#####      ~...~             k     ~..###.~    ~~####~~~          w            w    ~###..~   
diff --git a/lib/edit/set_info.txt b/lib/edit/set_info.txt
index b6141e01..c803d79f 100644
--- a/lib/edit/set_info.txt
+++ b/lib/edit/set_info.txt
@@ -7,25 +7,24 @@
 # Do not modify this file unless you know exactly what you are doing,
 # unless you wish to risk possible system crashes and broken savefiles.
 
-# Version stamp (required)
-
 # N:idx:name
 # D:description
 # P:artifact index:number of item needed:pval
 # F:flags
 
-V:2.0.0
-
 # The Elven Gifts, took from Oangband
 
 N:0:Elven Gifts
 D:It is from a group of Elven items once entrusted to Hobbits
 # Phial of Galadriel
 P:1:2:1
-F:WIS | CHR | RES_DARK
+F:CHR
+F:RES_DARK
+F:WIS
 # Sting
 P:88:2:2
-F:STEALTH | REGEN
+F:REGEN
+F:STEALTH
 
 
 # The Dragon Slayer
@@ -34,7 +33,9 @@ N:1:Dragon Slayer
 D:It is from a group of items rumoured to be the bane of dragons.
 # Bow of bard
 P:125:2:3
-F:DEX | CON | RES_FIRE
+F:CON
+F:DEX
+F:RES_FIRE
 # Arrow of Bard
 P:63:2:5
 F:SPEED
@@ -48,17 +49,22 @@ D:It is one of the 3 legendary daggers.
 P:66:2:2
 F:STR
 P:66:3:1
-F:KILL_DRAGON | REGEN | SH_FIRE
+F:KILL_DRAGON
+F:REGEN
+F:SH_FIRE
 # Nimthanc
 P:67:2:2
 F:CON
 P:67:3:1
-F:KILL_DEMON | IM_COLD
+F:IM_COLD
+F:KILL_DEMON
 # Dethanc
 P:68:2:2
 F:DEX
 P:68:3:1
-F:KILL_UNDEAD | SH_ELEC | FLY
+F:FLY
+F:KILL_UNDEAD
+F:SH_ELEC
 
 
 # Gothmog's Armoury -- Demonologists set
@@ -68,10 +74,17 @@ D:It is from a group of items that once belonged to Gothmog,
 D:the High Captain of the Balrogs
 # The demonblade of Gothmog
 P:181:3:7
-F:STR | CON | SPEED | VAMPIRIC
+F:CON
+F:SPEED
+F:STR
+F:VAMPIRIC
 # The demonshield of Gothmog
 P:182:3:0
-F:IM_FIRE | IM_COLD | SH_ELEC
+F:IM_COLD
+F:IM_FIRE
+F:SH_ELEC
 # The demonhorn of Gothmog
 P:183:3:0
-F:ESP_EVIL | ESP_GOOD | AUTO_ID
+F:AUTO_ID
+F:ESP_EVIL
+F:ESP_GOOD
diff --git a/lib/edit/special.txt b/lib/edit/special.txt
index 8d1c94b9..4ac3f0ac 100644
--- a/lib/edit/special.txt
+++ b/lib/edit/special.txt
@@ -48,20 +48,17 @@ F:I:189:0
 # Treasure (random) on normal floor
 F:*:1:0:0:*
 
-# Trap (random) on normal floor
-F:^:1:0:0:0:0:0:*
-
 # down staircase
 F:>:7:0
 
 # between gates
-F:4:160:0:0:0:0:0:0:-1
-F:5:160:0:0:0:0:0:0:-1
-F:6:160:0:0:0:0:0:0:-1
-F:7:160:0:0:0:0:0:0:-1
-F:A:160:0:0:0:0:0:0:-1
-F:B:160:0:0:0:0:0:0:-1
-F:C:160:0:0:0:0:0:0:-1
-F:E:160:0:0:0:0:0:0:-1
-F:F:160:0:0:0:0:0:0:-1
-F:0:160:0:0:0:0:0:0:-1
+F:4:160:0:0:0:0:0:-1
+F:5:160:0:0:0:0:0:-1
+F:6:160:0:0:0:0:0:-1
+F:7:160:0:0:0:0:0:-1
+F:A:160:0:0:0:0:0:-1
+F:B:160:0:0:0:0:0:-1
+F:C:160:0:0:0:0:0:-1
+F:E:160:0:0:0:0:0:-1
+F:F:160:0:0:0:0:0:-1
+F:0:160:0:0:0:0:0:-1
diff --git a/lib/edit/spiders.map b/lib/edit/spiders.map
index 146c152c..f473cc31 100644
--- a/lib/edit/spiders.map
+++ b/lib/edit/spiders.map
@@ -20,10 +20,10 @@ F:b:89:3:275
 F:c:89:3:277
 
 # Grass with Aranea
-F:d:89:3:963:0:0:0:0:0:0:2
+F:d:89:3:963:0:0:0:0:0:2
 
 # Grass with Elder aranea
-F:e:89:3:964:0:0:0:0:0:0:2
+F:e:89:3:964:0:0:0:0:0:2
 
 # Dungeon layout
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
diff --git a/lib/edit/st_info.txt b/lib/edit/st_info.txt
index 3762d0c5..b5ae29cf 100644
--- a/lib/edit/st_info.txt
+++ b/lib/edit/st_info.txt
@@ -1,13 +1,5 @@
 # File: st_info.txt
 
-# Fixed Potions of Cure Light/Serious Wounds in the Temple, Potions of 
-# Restore Str/Con in the Alchemist
-# Magic Shop - Amulet of Slow Digestion, Wand of Light, Staffs of Enlightenment,
-# Door/Stair Location, Detect Invis/Evil, and Remove Curse
-
-# This file is used to initialize the "lib/raw/st_info.raw" file, which is
-# used to initialize the "store info type" information for the Angband game.
-
 # Do not modify this file unless you know exactly what you are doing,
 # unless you wish to risk possible system crashes and broken savefiles.
 
@@ -22,10 +14,6 @@
 
 # proba is the chance(out of 100) of the item being generated
 
-# Version stamp (required)
-
-V:2.0.0
-
 N:0:General Store
 I:100:& Wooden Torch~
 I:95:& Brass Lantern~
@@ -177,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
@@ -236,7 +223,6 @@ I:100:Lightning Resistance
 I:100:Searching
 I:100:Cure Light Wounds
 # Rods
-I:100:Probing
 I:25:& Wooden Rod~ of#
 # Book
 T:100:111:50
@@ -264,14 +250,15 @@ N:6:Black Market
 A:30:0:1:2:3:4
 O:38:39:40:41
 G:7:D
-F:ALL_ITEM | MEDIUM_LEVEL
+F:ALL_ITEM
+F:MEDIUM_LEVEL
 W:24
 
 N:7:Home
 A:0:0:54:55:3:0
 O:0:0:0:0
 G:8:y
-W:24
+W:240
 
 N:8:Book Store
 # & Book~ of Beginner Cantrips
@@ -348,10 +335,7 @@ G:+:s
 W:0
 
 N:16:Beastmaster Shanty
-# Disabled the bounty list for the time being to not confuse people
-# with the bounty quest
-# A:18:0:19:20:21:22
-A:18:0:21:22:0:0
+A:0:0:21:22:0:0
 O:19:19:19:19
 G:+:g
 W:0
@@ -494,7 +478,8 @@ T:100:24:256
 A:0:0:1:2:3:4
 O:12:13:14:15
 G:3:w
-F:RANDOM | MEDIUM_LEVEL
+F:MEDIUM_LEVEL
+F:RANDOM
 W:12
 
 N:39:Hafted Smith
@@ -502,7 +487,8 @@ T:100:21:256
 A:0:0:1:2:3:4
 O:12:13:14:15
 G:3:w
-F:RANDOM | MEDIUM_LEVEL
+F:MEDIUM_LEVEL
+F:RANDOM
 W:12
 
 N:40:Polearm Smith
@@ -510,7 +496,8 @@ T:100:22:256
 A:0:0:1:2:3:4
 O:12:13:14:15
 G:3:w
-F:RANDOM | MEDIUM_LEVEL
+F:MEDIUM_LEVEL
+F:RANDOM
 W:12
 
 N:41:Sword Smith
@@ -518,7 +505,8 @@ T:100:23:256
 A:0:0:1:2:3:4
 O:12:13:14:15
 G:3:w
-F:RANDOM | MEDIUM_LEVEL
+F:MEDIUM_LEVEL
+F:RANDOM
 W:12
 
 N:42:Rare Jewelry Shop
@@ -527,7 +515,10 @@ T:100:45:256
 A:0:0:1:2:3:4
 O:34:35:36:37
 G:6:v
-F:RANDOM | DEPEND_LEVEL | DEEP_LEVEL | FORCE_LEVEL
+F:DEEP_LEVEL
+F:DEPEND_LEVEL
+F:FORCE_LEVEL
+F:RANDOM
 F:VERY_RARE
 W:10
 
@@ -537,7 +528,10 @@ T:100:45:256
 A:0:0:1:2:3:4
 O:34:35:36:37
 G:6:y
-F:RANDOM | DEPEND_LEVEL | MEDIUM_LEVEL | FORCE_LEVEL
+F:DEPEND_LEVEL
+F:FORCE_LEVEL
+F:MEDIUM_LEVEL
+F:RANDOM
 F:RARE
 W:20
 
@@ -546,8 +540,9 @@ T:100:30:256
 A:0:0:1:2:3:4
 O:8:9:10:11
 G:2:r
-F:RANDOM | MEDIUM_LEVEL
 F:COMMON
+F:MEDIUM_LEVEL
+F:RANDOM
 W:12
 
 N:45:Rare Footwear Shop
@@ -555,7 +550,9 @@ T:100:30:256
 A:0:0:1:2:3:4
 O:8:9:10:11
 G:2:r
-F:RANDOM | DEEP_LEVEL | MEDIUM_LEVEL
+F:DEEP_LEVEL
+F:MEDIUM_LEVEL
+F:RANDOM
 F:VERY_RARE
 W:8
 
@@ -579,7 +576,9 @@ T:100:125:256
 A:27:0:1:2:3:4
 O:8:9:10:11
 G:9:y
-F:RANDOM | DEPEND_LEVEL | MEDIUM_LEVEL
+F:DEPEND_LEVEL
+F:MEDIUM_LEVEL
+F:RANDOM
 W:24
 
 N:47:Forbidden Library
@@ -602,7 +601,9 @@ T:100:125:256
 A:27:0:1:2:3:4
 O:8:9:10:11
 G:9:v
-F:RANDOM | DEPEND_LEVEL | DEEP_LEVEL
+F:DEEP_LEVEL
+F:DEPEND_LEVEL
+F:RANDOM
 F:RARE
 W:12
 
@@ -610,7 +611,11 @@ N:48:Expensive Black Market
 A:0:0:1:2:3:4
 O:38:39:40:41
 G:7:v
-F:RANDOM | ALL_ITEM | DEEP_LEVEL | DEPEND_LEVEL | MEDIUM_LEVEL
+F:ALL_ITEM
+F:DEEP_LEVEL
+F:DEPEND_LEVEL
+F:MEDIUM_LEVEL
+F:RANDOM
 W:12
 
 N:49:Common Shop
@@ -638,7 +643,9 @@ T:100:38:256
 A:0:0:1:2:3:4
 O:8:9:10:11
 G:2:v
-F:RANDOM | DEEP_LEVEL | DEPEND_LEVEL
+F:DEEP_LEVEL
+F:DEPEND_LEVEL
+F:RANDOM
 F:VERY_RARE
 W:12
 
@@ -647,7 +654,9 @@ T:100:45:31
 A:0:0:1:2:3:4
 O:34:35:36:37
 G:6:G
-F:RANDOM | SHALLOW_LEVEL | DEPEND_LEVEL
+F:DEPEND_LEVEL
+F:RANDOM
+F:SHALLOW_LEVEL
 F:VERY_RARE
 W:6
 
@@ -656,7 +665,9 @@ T:100:70:256
 A:0:0:1:2:3:4
 O:8:9:10:11
 G:5:B
-F:RANDOM | MEDIUM_LEVEL | DEPEND_LEVEL
+F:DEPEND_LEVEL
+F:MEDIUM_LEVEL
+F:RANDOM
 W:12
 
 N:53:Potion Store
@@ -665,7 +676,9 @@ T:100:72:256
 A:0:0:1:2:3:4
 O:8:9:10:11
 G:5:B
-F:RANDOM | MEDIUM_LEVEL | DEPEND_LEVEL
+F:DEPEND_LEVEL
+F:MEDIUM_LEVEL
+F:RANDOM
 W:12
 
 N:54:Recaller
@@ -673,7 +686,8 @@ I:100:Word of Recall
 A:33:0:1:2:3:0
 O:8:9:10:11
 G:+:b
-F:RANDOM | COMMON
+F:COMMON
+F:RANDOM
 W:2
 
 N:55:Master Archer
@@ -688,16 +702,12 @@ T:50:18:256
 A:0:0:1:2:3:4
 O:12:13:14:15
 G:3:g
-F:RANDOM | MEDIUM_LEVEL | DEPEND_LEVEL
+F:DEPEND_LEVEL
+F:MEDIUM_LEVEL
+F:RANDOM
 F:RARE
 W:24
 
-N:56:Merchants Guild
-A:0:0:56:57:58:0
-O:68:68:68:68
-G:+:g
-W:0
-
 N:57:The Mathom-house
 A:0:0:59:0:3:0
 O:0:0:0:0
diff --git a/lib/edit/t_basic.txt b/lib/edit/t_basic.txt
deleted file mode 100644
index 78103425..00000000
--- a/lib/edit/t_basic.txt
+++ /dev/null
@@ -1,80 +0,0 @@
-# File: t_lite.txt
-
-# *Basic* town (vanilla style)
-
-
-############### Town Layout ###############
-
-F:*:7:3:0:0:0:0:0:8
-
-D:######################################################################################################################################################################################################
-D:######################################################################################################################################################################################################
-D:######################################################################################################################################################################################################
-D:######################################################################################################################################################################################################
-D:######################################################################################################################################################################################################
-D:######################################################################################################################################################################################################
-D:######################################################################################################################################################################################################
-D:######################################################################################################################################################################################################
-D:######################################################################################################################################################################################################
-D:######################################################################################################################################################################################################
-D:######################################################################################################################################################################################################
-D:######################################################################################################################################################################################################
-D:######################################################################################################################################################################################################
-D:######################################################################################################################################################################################################
-D:######################################################################################################################################################################################################
-D:######################################################################################################################################################################################################
-D:######################################################################################################################################################################################################
-D:######################################################################################################################################################################################################
-D:######################################################################################################################################################################################################
-D:######################################################################################################################################################################################################
-D:######################################################################################################################################################################################################
-D:######################################################################################################################################################################################################
-D:######################################################################################################################################################################################################
-D:###################################################################................................................................###################################################################
-D:###################################################################................................................................###################################################################
-D:###################################################################................................................................###################################################################
-D:###################################################################.....................#########...................#########......###################################################################
-D:###################################################################.......#########.....#########......#######......#########......###################################################################
-D:###################################################################.......#########.....####3####......#######......####1####......###################################################################
-D:###################################################################.......####4####....................#######.....................###################################################################
-D:###################################################################....................................###2###.....................###################################################################
-D:###################################################################................................................................###################################################################
-D:###################################################################.................................*..............................###################################################################
-D:###################################################################...##8##........................................................###################################################################
-D:###################################################################...#####..............####5####...................###7###.......###################################################################
-D:###################################################################...#####..............#########.....####6####.....#######.......###################################################################
-D:###################################################################...#####..............#########.....#########.....#######.......###################################################################
-D:###################################################################...........###9###....#########.....#########.....#######.......###################################################################
-D:###################################################################...........#######..................#########.....#######.......###################################################################
-D:###################################################################...........#######................................#######.......###################################################################
-D:###################################################################..................................................#######.......###################################################################
-D:###################################################################................................................................###################################################################
-D:###################################################################................................................................###################################################################
-D:######################################################################################################################################################################################################
-D:######################################################################################################################################################################################################
-D:######################################################################################################################################################################################################
-D:######################################################################################################################################################################################################
-D:######################################################################################################################################################################################################
-D:######################################################################################################################################################################################################
-D:######################################################################################################################################################################################################
-D:######################################################################################################################################################################################################
-D:######################################################################################################################################################################################################
-D:######################################################################################################################################################################################################
-D:######################################################################################################################################################################################################
-D:######################################################################################################################################################################################################
-D:######################################################################################################################################################################################################
-D:######################################################################################################################################################################################################
-D:######################################################################################################################################################################################################
-D:######################################################################################################################################################################################################
-D:######################################################################################################################################################################################################
-D:######################################################################################################################################################################################################
-D:######################################################################################################################################################################################################
-D:######################################################################################################################################################################################################
-D:######################################################################################################################################################################################################
-D:######################################################################################################################################################################################################
-D:######################################################################################################################################################################################################
-
-############### Starting positions ###############
-
-# Standard starting position for normal races
-P:32:100    
diff --git a/lib/edit/t_bree.txt b/lib/edit/t_bree.txt
index c74fd58a..3d19b888 100644
--- a/lib/edit/t_bree.txt
+++ b/lib/edit/t_bree.txt
@@ -5,7 +5,7 @@
 ############### Additional default terrain settings ###############
 
 # Default for Quest 1 = entrance is quest entrance
-F:z:8:3:0:0:0:0:0:4
+F:z:8:3:0:0:0:0:4
 
 # Default for Quest 18 = entrance is tree
 F:y:96:3
@@ -15,40 +15,37 @@ F:x:96:3
 
 ############### Quest 4 - Thieves Hideout finished = house ###############
 ?:[EQU $QUEST4 2]
-F:z:74:3:0:0:0:0:0:7
+F:z:74:3:0:0:0:0:7
 ?:[EQU $QUEST4 5]
-F:z:74:3:0:0:0:0:0:7
+F:z:74:3:0:0:0:0:7
 ?:1
 
 ############### Quest 8 - Troll Glade ###############
 ?:[AND [EQU $QUEST8 1] [EQU $DAYTIME 0] ]
-F:y:8:3:0:0:0:0:0:8
+F:y:8:3:0:0:0:0:8
 ?:1
 
 ############### Quest 9 - Wights Grave ###############
 ?:[EQU $QUEST9 1]
-F:x:8:3:0:0:0:0:0:9
+F:x:8:3:0:0:0:0:9
 ?:1
 
 ###### Additionnal buildings #######
 
 # Castle: Plot Bree
-F:B:75:3:0:0:0:0:0:1
+F:B:75:3:0:0:0:0:1
 
 # Mayor's house
-F:b:74:3:0:0:0:0:0:10
+F:b:74:3:0:0:0:0:10
 
 # The Prancing Pony
-F:a:74:3:0:0:0:0:0:58
+F:a:74:3:0:0:0:0:58
 
 # Soothsayer
-F:c:74:3:0:0:0:0:0:12
-
-# Merchant Guild
-F:d:74:3:0:0:0:0:0:56
+F:c:74:3:0:0:0:0:12
 
 # The Mathom-house
-F:e:74:3:0:0:0:0:0:57
+F:e:74:3:0:0:0:0:57
 
 ############### Town Layout ###############
 
@@ -93,7 +90,7 @@ D:#    ----     ----                                           ,,CT--.B#.-SStSS-
 D:#  -------      ----                                         ,,CTT-....-sssss--,,,,,,-------------OO-,--SSSSSt-ss-,-,---...-T^^  ^ ^           -,                         OOOO                       #
 D:#    -------   ------                                        ,,CCTT---..#2###-,sssss,-SSSSSSSS-----OO,--ssssss-tS--,.....---^^ ^^     ^^^     -,                   OOOOOOOO                          #
 D:#   -----        -----                                        ,,CCT----..,,,,,-StSSS,-ssssssss------OOO-#1##a#-ss....-----T^^        ^^      -,-               OOOOO                                 #
-D:#      ----  --------                                         ,,CCTT----..----,sssss,-##7###d#--------OO,.,,.,-##.----TTTT^^     ^  ^^       -,            OOOOO                                     #
+D:#      ----  --------                                         ,,CCTT----..----,sssss,-##7#####--------OO,.,,.,-##.----TTTT^^     ^  ^^       -,            OOOOO                                     #
 D:#     ---------------                                         ,,,CCTTTT--..---,##3##-,--,,,---------...OOOOOOOOOOOTTTTTCC^^^   ^^  ^^        ,-          OOO                                         #
 D:#        --------                                              ,,,CCCC  --..........,-,,---,--.......-------TTTTTOCCCCC,,^^^^^^^^^^^        -.-      OOOOO                                           #
 D:#      ----------                                              ,, ,,CCCTT----------.....-......-------TTTTTTTCCCCO,,,,,     ^^^^^^^         -.-      O                                               #
diff --git a/lib/edit/t_gondol.txt b/lib/edit/t_gondol.txt
index 779c4fbb..63f78d6c 100644
--- a/lib/edit/t_gondol.txt
+++ b/lib/edit/t_gondol.txt
@@ -15,7 +15,7 @@ F:y:1:3
 F:x:1:3
 
 # Default for Quest 23 = entrance is quest entrance
-F:w:8:3:0:0:0:0:0:23
+F:w:8:3:0:0:0:0:23
 
 # Decoration = Straight Road (B)
 F:":66:3
@@ -33,7 +33,7 @@ F:Z:63:3
 
 # Quest 13 assigned, entrance is quest entrance
 ?:[EQU $QUEST13 1]
-F:z:8:3:0:0:0:0:0:13
+F:z:8:3:0:0:0:0:13
 
 ?:1
 
@@ -41,11 +41,11 @@ F:z:8:3:0:0:0:0:0:13
 
 # Quest 14 assigned, entrance is quest entrance
 ?:[EQU $QUEST14 1]
-F:y:8:3:0:0:0:0:0:14
+F:y:8:3:0:0:0:0:14
 
 # Quest 14 finished, reward is a rare jewelry shop
 ?:[EQU $QUEST14 5]
-F:!:74:3:0:0:0:0:0:42
+F:!:74:3:0:0:0:0:42
 
 ?:1
 
@@ -53,7 +53,7 @@ F:!:74:3:0:0:0:0:0:42
 
 # Quest 15 assigned, entrance is quest entrance
 ?:[EQU $QUEST15 1]
-F:x:8:3:0:0:0:0:0:15
+F:x:8:3:0:0:0:0:15
 
 ?:1
 
@@ -61,15 +61,15 @@ F:x:8:3:0:0:0:0:0:15
 
 # Quest 16 finished, reward is a between gate
 ?:[EQU $QUEST16 5]
-F:Z:176:3:0:0:0:0:0:1
+F:Z:176:3:0:0:0:0:1
 
 ?:1
 
 ############### Quest 23 - Wolves hut finished = house ###############
 ?:[EQU $QUEST23 2]
-F:w:74:3:0:0:0:0:0:7
+F:w:74:3:0:0:0:0:7
 ?:[EQU $QUEST23 5]
-F:w:74:3:0:0:0:0:0:7
+F:w:74:3:0:0:0:0:7
 ?:1
 
 #################### Buildings ####################
@@ -82,49 +82,46 @@ F:w:74:3:0:0:0:0:0:7
 # m: White (Paladin)
 
 # Tower of the King
-F:a:74:3:0:0:0:0:0:27
+F:a:74:3:0:0:0:0:27
 
 # Library
-F:b:74:3:0:0:0:0:0:28
+F:b:74:3:0:0:0:0:28
 
 # Castle: Gondolin Plot
-F:B:75:3:0:0:0:0:0:4
+F:B:75:3:0:0:0:0:4
 
 # The White Tree:Aerandir:High-Elf
-F:c:74:3:0:0:0:0:0:29
+F:c:74:3:0:0:0:0:29
 
 # Craftsmaster
-F:d:74:3:0:0:0:0:0:30
+F:d:74:3:0:0:0:0:30
 
 # Earth-Dome
-F:e:74:3:0:0:0:0:0:31
+F:e:74:3:0:0:0:0:31
 
 # Prophet
-F:f:74:3:0:0:0:0:0:12
+F:f:74:3:0:0:0:0:12
 
 # Minstrels Haven
-F:h:74:3:0:0:0:0:0:32
+F:h:74:3:0:0:0:0:32
 
 # Star-Dome:Sulraen:High-Elf
-F:i:74:3:0:0:0:0:0:33
+F:i:74:3:0:0:0:0:33
 
 # Valarin Temple
-F:j:74:3:0:0:0:0:0:34
+F:j:74:3:0:0:0:0:34
 
 # Sea-Dome
-F:k:74:3:0:0:0:0:0:35
+F:k:74:3:0:0:0:0:35
 
 # The Golden Flower
-F:l:74:3:0:0:0:0:0:36
+F:l:74:3:0:0:0:0:36
 
 # The Fountain
-F:m:74:3:0:0:0:0:0:37
+F:m:74:3:0:0:0:0:37
 
 # Thunderlord's Hide
-F:n:74:3:0:0:0:0:0:22
-
-# Merchant guild
-F:o:74:3:0:0:0:0:0:56
+F:n:74:3:0:0:0:0:22
 
 # Force elven monsters
 f:ELVEN
@@ -178,7 +175,7 @@ D:######$$$$$$$$$$$$$$$$$###                       ...
 D:######$$$$$$$$$$$$$$$$$$##                       ...                                 C##T.V#######V...........TTTT#######TTTT..................TT####C----,--TTT##TTT----TTT##TTTTTT------,,,,,^^^^###
 D:#####$$$$$$$$$$$$$$$$$$$##           #########   ...   #############                 CC#T.VV#####VV.............................................TTT#CC----,---TT#TT--------TT##T-T-TT------,,,,^^^^###
 D:#####$$$$$$$#####$$$$$$$##           #########   ...   #############                  C#T..VV###VV.....TTTTTTTTTTT.......TTTTTTTTTTT..............T#C-----,,,,,,,,,,,,,,,,,,,e#TT-TTT------,,,,^^^^###
-D:####$$$$#############$$$$#           ########o.........7############                  C#T...VVVVV....TTT#########TTT...TTT#########TTT............T#C----------T#TT--------TT##TTT-------,,,,^^^^^^###
+D:####$$$$#############$$$$#           #########.........7############                  C#T...VVVVV....TTT#########TTT...TTT#########TTT............T#C----------T#TT--------TT##TTT-------,,,,^^^^^^###
 D:####$###################$#           #########   ...   #############                  C#TT..........TT###VVVVVV####TT.TT####WWWWWW###TT..........TT#C--------TTT##TTT----TTT##TTTTT-----,,,,^^^^^^^###
 D:##########################           #########   ...   #############                  C##T..........T##VVV....VVV###TTT###WWW....WWW##T..........T##C-------TTTTT###TTTTTT###TTTTT-----,,,,,^^^^^^^###
 D:###########################                      ...                                  CC#T..........T#VV........VV#######WW........WW#T..........T#CC -----TTTT-TTT########TTTTTT------,,,,,,,^^^^^###
diff --git a/lib/edit/t_khazad.txt b/lib/edit/t_khazad.txt
index 0139fa40..d2d6b6ac 100644
--- a/lib/edit/t_khazad.txt
+++ b/lib/edit/t_khazad.txt
@@ -8,28 +8,28 @@ F:o:207:3
 ###################### Buildings ########################
 
 # Fighters Hall
-F:f:74:3:0:0:0:0:0:17
+F:f:74:3:0:0:0:0:17
 
 # Paladins Guild
-F:g:74:3:0:0:0:0:0:20
+F:g:74:3:0:0:0:0:20
 
 # Inner Temple
-F:h:74:3:0:0:0:0:0:19
+F:h:74:3:0:0:0:0:19
 
 # Mining Supplies
-F:i:74:3:0:0:0:0:0:59
+F:i:74:3:0:0:0:0:59
 
 # Default for Quest 25 = entrance is quest entrance
-F:w:8:3:0:0:0:0:0:25
+F:w:8:3:0:0:0:0:25
 
 # Force dwarven monsters
 f:DWARVEN
 
 ############### Quest 25 - Evil cave finished = house ###############
 ?:[EQU $QUEST25 2]
-F:w:74:3:0:0:0:0:0:7
+F:w:74:3:0:0:0:0:7
 ?:[EQU $QUEST25 5]
-F:w:74:3:0:0:0:0:0:7
+F:w:74:3:0:0:0:0:7
 ?:1
 
 # Town Layout
diff --git a/lib/edit/t_lorien.txt b/lib/edit/t_lorien.txt
index 9c8c8ad3..b8ecaac4 100644
--- a/lib/edit/t_lorien.txt
+++ b/lib/edit/t_lorien.txt
@@ -16,63 +16,63 @@ F:x:96:3
 F:v:88:3
 
 # Default for Quest 22 = entrance is quest entrance
-F:w:8:3:0:0:0:0:0:22
+F:w:8:3:0:0:0:0:22
 
 ############### Quest 22 - Wolves hut finished = house ###############
 ?:[EQU $QUEST22 2]
-F:w:74:3:0:0:0:0:0:7
+F:w:74:3:0:0:0:0:7
 ?:[EQU $QUEST22 5]
-F:w:74:3:0:0:0:0:0:7
+F:w:74:3:0:0:0:0:7
 ?:1
 
 ############### Entrance to the Void ###############
 ?:[EQU $QUEST20 1]
-F:v:7:3:0:0:0:0:0:11
+F:v:7:3:0:0:0:0:11
 ?:1
 
 ############### Quest 10 - Spiders of Mirkwood ###############
 # Quest 10 taken, entrance is quest entrance
 ?:[EQU $QUEST10 1]
-F:y:8:3:0:0:0:0:0:10
+F:y:8:3:0:0:0:0:10
 ?:1
 
 ############### Quest - Mage/Fireroof quest ###############
 # Mage/Fireproof Quest taken, entrance is quest entrance
 ?:[EQU $QUEST"Old Mages quest" 1]
-F:z:8:3:0:0:0:0:0:"Old Mages quest"
+F:z:8:3:0:0:0:0:"Old Mages quest"
 ?:1
 
 ###################### Buildings ########################
 
 # The Mirror
-F:a:74:3:0:0:0:0:0:23
+F:a:74:3:0:0:0:0:23
 
 # Castle: Plot Lorien
-F:B:75:3:0:0:0:0:0:2
+F:B:75:3:0:0:0:0:2
 
 # Seat of Ruling
-F:b:74:3:0:0:0:0:0:24
+F:b:74:3:0:0:0:0:24
 
 # Inn
-F:c:74:3:0:0:0:0:0:11
+F:c:74:3:0:0:0:0:11
 
 # Beastmaster Shanty
-F:d:74:3:0:0:0:0:0:16
+F:d:74:3:0:0:0:0:16
 
 # Fighters Hall
-F:f:74:3:0:0:0:0:0:17
+F:f:74:3:0:0:0:0:17
 
 # Wizards Spire
-F:g:74:3:0:0:0:0:0:25
+F:g:74:3:0:0:0:0:25
 
 # Priests Circle
-F:h:74:3:0:0:0:0:0:26
+F:h:74:3:0:0:0:0:26
 
 # Rangers Guild allows Ranger
-F:i:74:3:0:0:0:0:0:21
+F:i:74:3:0:0:0:0:21
 
 # Nest
-F:j:74:3:0:0:0:0:0:22
+F:j:74:3:0:0:0:0:22
 
 # Altars
 F:k:161:3
diff --git a/lib/edit/t_minas.txt b/lib/edit/t_minas.txt
index 51c74da3..b6e78672 100644
--- a/lib/edit/t_minas.txt
+++ b/lib/edit/t_minas.txt
@@ -9,69 +9,66 @@
 F:Z:63:3
 
 # Default for Quest 24 = entrance is quest entrance
-F:w:8:3:0:0:0:0:0:24
+F:w:8:3:0:0:0:0:24
 
 #################### Quest 16 - The last Alliance ####################
 
 # Quest 16 finished, reward is a between gate
 ?:[EQU $QUEST16 5]
-F:Z:176:3:0:0:0:0:0:0
+F:Z:176:3:0:0:0:0:0
 
 ?:1
 
 ############### Quest 24 - Haunted House finished = house ###############
 ?:[EQU $QUEST24 2]
-F:w:74:3:0:0:0:0:0:7
+F:w:74:3:0:0:0:0:7
 ?:[EQU $QUEST24 5]
-F:w:74:3:0:0:0:0:0:7
+F:w:74:3:0:0:0:0:7
 ?:1
 
 #################### Buildings ####################
 
 # Library
-F:a:74:3:0:0:0:0:0:60
+F:a:74:3:0:0:0:0:60
 
 # Castle
-F:b:74:3:0:0:0:0:0:14
+F:b:74:3:0:0:0:0:14
 
 # Casino
-F:d:74:3:0:0:0:0:0:15
+F:d:74:3:0:0:0:0:15
 
 # Inn
-F:e:74:3:0:0:0:0:0:11
+F:e:74:3:0:0:0:0:11
 
 # Beastmaster Shanty
-F:f:74:3:0:0:0:0:0:16
+F:f:74:3:0:0:0:0:16
 
 # Fighters hall
-F:g:74:3:0:0:0:0:0:17
+F:g:74:3:0:0:0:0:17
 
 # Tower of Magery
-F:h:74:3:0:0:0:0:0:18
+F:h:74:3:0:0:0:0:18
 
 # Inner temple
-F:i:74:3:0:0:0:0:0:19
+F:i:74:3:0:0:0:0:19
 
 # Paladin guild
-F:j:74:3:0:0:0:0:0:20
+F:j:74:3:0:0:0:0:20
 
 # Ranger guild
-F:k:74:3:0:0:0:0:0:21
+F:k:74:3:0:0:0:0:21
 
 # Thunderlord's Hide
-F:l:74:3:0:0:0:0:0:22
+F:l:74:3:0:0:0:0:22
 
 # Castle: Plot Minas Anor
-F:B:75:3:0:0:0:0:0:5
-
-# Merchant guild
-F:m:74:3:0:0:0:0:0:56
+F:B:75:3:0:0:0:0:5
 
 # Library Quest
 F:x:63:3
 
 ?:[EQU $QUEST"Library quest" 1]
-F:x:8:3:0:0:0:0:0:"Library quest"
+F:x:8:3:0:0:0:0:"Library quest"
 ?:1
 
 ############### Town Layout ###############
@@ -84,7 +81,7 @@ D:#^^----ssss-----###--------####------        ^^^^^^
 D:#^^^---StSS-------###--#ssss--###-------      ^^^^^^^^                                           @@VVVVVVVV@VVV@@@@@@@@ @@@V@@          @@@@VV@@@@                              ,                    #
 D:#^^----ssss----OO---##--#StSS---####------     ^^^^^^^^                                           @@V@V,@@@@@@VVVVVVVV@@@VVV@              @@VVVV@@                            ,,                    #
 D:#^^----x#a#-----OOO--##--#sssss----###------    ^^^^^^^^                                           @@@@@     @@@@@@@@VVVVV@@@               @@@@VV@@@                        ,,,                     #
-D:#^ ---------------OO--###-#m#7#------###-----   ^^^^^^^^^^                                                           @VVV@@                    @@VVV@@                       ,O,                     #
+D:#^ ---------------OO--###-###7#------###-----   ^^^^^^^^^^                                                           @VVV@@                    @@VVV@@                       ,O,                     #
 D:#^ StSSSS-----ss---OO---##-----OOOOO---###----   ^^^^^^^^^^^                                                          @@@                       @@VVV@@                      OO                      #
 D:#^^ssssss----Ssss---OOO--##---OOOOOOOO---##----   ^l^^^^^^^                                                                                     @@VVV@                      OO                       #
 D:#^ ####9#---sstSss---OOO--##-OOOOOOOOOOO--##----    ^^^^^                                                                                      @@VVV@@                     OO                        #
diff --git a/lib/edit/t_pref.txt b/lib/edit/t_pref.txt
index 84ff947d..454d6a00 100644
--- a/lib/edit/t_pref.txt
+++ b/lib/edit/t_pref.txt
@@ -1,19 +1,19 @@
 # File: t_pref.txt
 
 # Defines the preferences for the town features
-# letter:feature:cave_info:monster:object:ego:artifact:trap:special
+# letter:feature:cave_info:monster:object:ego:artifact:special
 
 # Barrow-Downs entrance
-F:{:7:3:0:0:0:0:0:4
+F:{:7:3:0:0:0:0:4
 
 # Mirkwood Forest entrance
-F:~:7:3:0:0:0:0:0:1
+F:~:7:3:0:0:0:0:1
 
 # Land of Mordor entrance
-F:|:7:3:0:0:0:0:0:2
+F:|:7:3:0:0:0:0:2
 
 # Angband Dungeon entrance
-F:>:7:3:0:0:0:0:0:3
+F:>:7:3:0:0:0:0:3
 
 # Mountain chain
 F:^:97:3
@@ -72,34 +72,34 @@ F:Y:192:3
 F:O:200:3
 
 # General Store
-F:1:74:3:0:0:0:0:0:0
+F:1:74:3:0:0:0:0:0
 
 # Armoury
-F:2:74:3:0:0:0:0:0:1
+F:2:74:3:0:0:0:0:1
 
 # Weapons Smith
-F:3:74:3:0:0:0:0:0:2
+F:3:74:3:0:0:0:0:2
 
 # Temple
-F:4:74:3:0:0:0:0:0:3
+F:4:74:3:0:0:0:0:3
 
 # Alchemy Shop
-F:5:74:3:0:0:0:0:0:4
+F:5:74:3:0:0:0:0:4
 
 # Magic Shop
-F:6:74:3:0:0:0:0:0:5
+F:6:74:3:0:0:0:0:5
 
 # Black Market
-F:7:74:3:0:0:0:0:0:6
+F:7:74:3:0:0:0:0:6
 
 # Home
-F:8:74:3:0:0:0:0:0:7
+F:8:74:3:0:0:0:0:7
 
 # Bookstore
-F:9:74:3:0:0:0:0:0:8
+F:9:74:3:0:0:0:0:8
 
 # Pet Shop
-F:0:74:3:0:0:0:0:0:9
+F:0:74:3:0:0:0:0:9
 
 # Underground Tunnels -- used for tunnels in towns
 F:I:173:3
diff --git a/lib/edit/thieves.map b/lib/edit/thieves.map
index a2cdb442..bab5721e 100644
--- a/lib/edit/thieves.map
+++ b/lib/edit/thieves.map
@@ -23,19 +23,19 @@ F:d:4:6
 F:<:6:8
 
 # Floor with Novice rogue
-F:a:1:6:44:0:0:0:0:0:0:2
+F:a:1:6:44:0:0:0:0:0:2
 
 # Floor with Bandit
-F:b:1:6:150:43:*:0:0:0:0:2
+F:b:1:6:150:43:*:0:0:0:2
 
 # Floor with novice warrior
-F:c:1:6:43:0:0:0:0:0:0:2
+F:c:1:6:43:0:0:0:0:0:2
 
 # Floor with novice mage
-F:e:1:6:46:0:0:0:0:0:0:2
+F:e:1:6:46:0:0:0:0:0:2
 
 # Dark floor with novice warrior
-F:f:1:4:43:0:0:0:0:0:0:2
+F:f:1:4:43:0:0:0:0:0:2
 
 # Floor with human skeleton
 F:z:1:6:0:395
diff --git a/lib/edit/thrain.map b/lib/edit/thrain.map
index 8adc41be..7c60a839 100644
--- a/lib/edit/thrain.map
+++ b/lib/edit/thrain.map
@@ -1,25 +1,22 @@
 # Floor
-F:.:1:0:0:0:0:0:0:0:61
+F:.:1:0:0:0:0:0:0:61
 
 # Some Nazguls
-F:1:1:0:951:0:0:0:0:0:61:2
-F:2:1:0:952:0:0:0:0:0:61:2
-F:o:1:0:866:0:0:0:0:0:61
+F:1:1:0:951:0:0:0:0:61:2
+F:2:1:0:952:0:0:0:0:61:2
+F:o:1:0:866:0:0:0:0:61
 
 # Marker
-F:,:172:6:0:0:0:0:0:0:61
+F:,:172:6:0:0:0:0:0:61
 
 # Lit permanent wall
 F:x:61:6
 
 # Door
-F:D:48:0:0:0:0:0:0:0:61
-
-# Floor with Trap
-F:t:1:8:0:0:0:0:*
+F:D:48:0:0:0:0:0:0:61
 
 # Deep lava
-F:l:85:0:0:0:0:0:0:0:61
+F:l:85:0:0:0:0:0:0:61
 
 # Dungeon layout
 D:          
diff --git a/lib/edit/tr_info.txt b/lib/edit/tr_info.txt
deleted file mode 100644
index e86d9617..00000000
--- a/lib/edit/tr_info.txt
+++ /dev/null
@@ -1,817 +0,0 @@
-# This file comes from Angband64 written by Jurriaan Kalkman
-# and describes the traps items can have
-#
-#  byte type;            /* this goes into sval */
-#  s16b probability;     /* probability of existence in 1000 */
-#  s16b another;         /* does this trap easily combine in 1000 */
-#  s16b pvalinc;         /* how much does this trap attribute to pval */
-#  byte difficulty;      /* how difficult to disarm */
-#  byte level;           /* minimum level - disenchantment trap at 200' is */
-#                        /* not so nice */
-#  byte color;
-#  cptr name;            /* what name does this trap have */
-#
-#  d TERM_DARK  |r TERM_RED  |D TERM_L_DARK |R TERM_L_RED
-#  w TERM_WHITE |g TERM_GREEN|W TERM_L_WHITE|G TERM_L_GREEN
-#  s TERM_SLATE |b TERM_BLUE |v TERM_VIOLET |B TERM_L_BLUE
-#  o TERM_ORANGE|u TERM_UMBER|y TERM_YELLOW |U TERM_L_UMBER
-#
-# b blue   for stat traps
-# w white  for teleport traps
-# o orange for dungeon rearrangement traps
-# v violet for summoning traps
-# y yellow for stealing/equipment traps
-# r red    for other character affecting traps
-# g green  for elemental bolt trap
-# B umber  for elemental ball trap
-# R l red  for arrow/dagger traps
-# W        for compound trap!!!
-# don't use U or you'll get trapped doors that are indistinguishable from untrapped doors!
-#
-#  an unknown character is multi-hued!
-#
-# N:type:name
-# I:diff:prob:another:pval:minlevel:damage:color
-# I:diff:prob:            :minlevel:      :color
-# D:description
-
-V:2.0.0
-
-#
-# stat traps
-#
-
-N:1:Weakness Trap
-I:2:100:5:5:2:0d0:b
-D:A poisoned needle weakens you!
-F:FLOOR | CHEST | DOOR
-
-N:2:Weakness Trap
-I:5:100:5:5:20:0d0:b
-D:A poisoned needle seriously weakens you!
-F:FLOOR | CHEST | DOOR
-
-N:3:Weakness Trap
-I:7:100:5:8:40:0d0:b
-D:A poisoned needle permanently weakens you!
-F:FLOOR | CHEST | DOOR
-
-N:4:Intelligence Trap
-I:2:100:5:2:2:0d0:b
-D:A poisoned needle makes you feel stupid!
-F:FLOOR | CHEST | DOOR
-
-N:5:Intelligence Trap
-I:5:100:5:5:20:0d0:b
-D:A poisoned needle makes you feel very stupid!
-F:FLOOR | CHEST | DOOR
-
-N:6:Intelligence Trap
-I:7:100:5:8:40:0d0:b
-D:A poisoned needle makes you feel permanently stupid!
-F:FLOOR | CHEST | DOOR
-
-N:7:Wisdom Trap
-I:2:100:5:2:2:0d0:b
-D:A poisoned needle makes you feel naive!
-F:FLOOR | CHEST | DOOR
-
-N:8:Wisdom Trap
-I:5:100:5:5:20:0d0:b
-D:A poisoned needle makes you feel very naive!
-F:FLOOR | CHEST | DOOR
-
-N:9:Wisdom Trap
-I:7:100:5:8:40:0d0:b
-D:A poisoned needle makes you feel permanently naive!
-F:FLOOR | CHEST | DOOR
-
-N:10:Fumbling Fingers Trap
-I:2:100:5:2:2:0d0:b
-D:A poisoned needle makes you feel clumsy!
-F:FLOOR | CHEST | DOOR
-
-N:11:Fumbling Fingers Trap
-I:5:100:5:5:20:0d0:b
-D:A poisoned needle makes you feel very clumsy!
-F:FLOOR | CHEST | DOOR
-
-N:12:Fumbling Fingers Trap
-I:7:100:5:8:40:0d0:b
-D:A poisoned needle makes you feel permanently clumsy!
-F:FLOOR | CHEST | DOOR
-
-N:13:Wasting Trap
-I:2:100:5:2:2:0d0:b
-D:A poisoned needle makes you feel sickly!
-F:FLOOR | CHEST | DOOR
-
-N:14:Wasting Trap
-I:5:100:5:5:20:0d0:b
-D:A poisoned needle makes you feel very sickly!
-F:FLOOR | CHEST | DOOR
-
-N:15:Wasting Trap
-I:7:100:5:8:40:0d0:b
-D:A poisoned needle makes you feel permanently sickly!
-F:FLOOR | CHEST | DOOR
-
-N:16:Beauty Trap
-I:2:100:5:2:2:0d0:b
-D:A poisoned needle scars you!
-F:FLOOR | CHEST | DOOR
-
-N:17:Beauty Trap
-I:5:100:5:5:20:0d0:b
-D:A poisoned needle scars you horribly!
-F:FLOOR | CHEST | DOOR
-
-N:18:Beauty Trap
-I:7:100:5:8:40:0d0:b
-D:A poisoned needle scars you permanently!
-F:FLOOR | CHEST | DOOR
-
-#
-# miscellaneous traps
-#
-
-N:20:Trap of Curse Weapon
-I:5:10:0:12:20:0d0:y
-D:Your weapon will never be the same...
-F:FLOOR | CHEST | DOOR
-
-N:21:Trap of Curse Armour
-I:5:15:0:12:20:0d0:y
-D:Your armour doesn't exactly get better by setting off this trap...
-F:FLOOR | CHEST | DOOR
-
-N:22:Earthquake Trap
-I:5:20:0:10:10:0d0:o
-D:The ceiling collapses around you!
-F:FLOOR | CHEST | DOOR
-
-N:23:Poison Needle Trap
-I:1:50:50:3:2:0d0:r
-D:A poisoned needle pricks you!
-F:FLOOR | CHEST | DOOR
-
-N:24:Summon Monster Trap
-I:2:50:40:4:2:0d0:v
-D:Monsters defend the memory of the owner...
-F:FLOOR | CHEST | DOOR
-
-N:25:Summon Undead Trap
-I:4:25:40:6:10:0d0:v
-D:Undead rise from the grave to defend this!
-F:FLOOR | CHEST | DOOR
-
-N:26:Summon Greater Undead Trap
-I:8:10:50:20:20:0d0:v
-D:Greater undead defend this!
-F:FLOOR | CHEST | DOOR
-
-N:27:Teleport Trap
-I:3:100:50:3:2:0d0:w
-D:Now you know why nobody ever got close enough to disarm this trap...
-F:FLOOR | CHEST | DOOR
-
-N:28:Paralysing Trap
-I:1:100:20:2:2:0d0:r
-D:You suddenly cannot move!
-F:FLOOR | CHEST | DOOR
-
-N:29:Explosive Device
-I:3:100:80:0:3:3d8:r
-D:Ha! It explodes before your hands can illegally touch it!
-F:FLOOR | CHEST | DOOR
-
-N:30:Teleport Item Trap
-I:3:50:50:3:5:0d0:w
-D:The item magically disappears from your greedy hands!
-F:FLOOR | CHEST
-
-N:31:Lose Memory Trap
-I:6:30:30:6:10:0d0:r
-D:You suddenly can't remember what you were doing here...
-F:FLOOR | CHEST | DOOR
-
-N:32:Bitter Regret Trap
-I:9:15:20:9:20:0d0:r
-D:You already regret trying this...
-F:FLOOR | CHEST | DOOR
-
-N:33:Bowel Cramps Trap
-I:1:90:20:1:6:0d0:r
-D:Your stomach twists with a sharp pang!
-F:FLOOR | CHEST | DOOR
-
-N:34:Blindness/Confusion Trap
-I:4:100:50:4:6:0d0:r
-D:You suddenly can't see, and thinking is difficult too....
-F:FLOOR | CHEST | DOOR
-
-N:35:Aggravation Trap
-I:2:100:50:2:3:0d0:o
-D:Your hear a high-pitched humming noise...
-F:FLOOR | CHEST | DOOR
-
-N:36:Multiplication Trap
-I:3:90:0:3:5:0d0:o
-D:The floor around you doesn't seem the same...
-F:FLOOR | CHEST | DOOR
-
-N:37:Steal Item Trap
-I:3:100:50:3:6:0d0:y
-D:The chest seems to swell, while your backpack feels lighter..
-F:FLOOR | CHEST
-
-N:38:Summon Fast Quylthulgs Trap
-I:8:50:10:10:25:0d0:v
-D:Parts of the owner seem to return from somewhere else, as you slow in awe.
-F:FLOOR | CHEST | DOOR
-
-N:39:Trap of Sinking
-I:2:50:0:0:3:0d0:w
-D:A trapdoor opens up under you!
-F:FLOOR | DOOR
-
-N:40:Trap of Mana Drain
-I:4:100:50:3:4:0d0:r
-D:You suddenly can't think so clearly any more...
-F:FLOOR | CHEST | DOOR
-
-N:41:Trap of Missing Money
-I:2:100:50:2:2:0d0:y
-D:Money isn't everything, they say...
-F:FLOOR | CHEST | DOOR
-
-N:42:Trap of No Return
-I:5:20:10:4:8:0d0:y
-D:Do stay a while!
-F:FLOOR | CHEST | DOOR
-
-N:43:Trap of Silent Switching
-I:4:100:50:3:6:0d0:y
-D:You suddenly are a different person!
-F:FLOOR | CHEST | DOOR
-
-N:44:Trap of Walls
-I:6:100:50:2:10:0d0:o
-D:The room seems to shrink!
-F:FLOOR | CHEST | DOOR
-
-N:45:Trap of Calling Out
-I:10:100:100:5:15:0d0:v
-D:You hear something coming closer, much closer.
-F:FLOOR | CHEST | DOOR
-
-N:46:Trap of Sliding
-I:8:50:50:4:8:0d0:r
-D:Your feet seem to have a life of their own!
-F:FLOOR | CHEST | DOOR
-
-N:47:Trap of Charges Drain
-I:6:100:70:2:3:0d0:y
-D:You feel as if you've just lost something...
-F:FLOOR | CHEST | DOOR
-
-N:48:Trap of Stair Movement
-I:6:0:50:3:4:0d0:o
-D:The dungeon seems different...
-F:FLOOR | CHEST | DOOR
-
-N:49:Trap of New Trap
-I:5:100:5:0:4:0d0:o
-D:Somehow, disarming isn't over, you feel...
-F:FLOOR | CHEST | DOOR
-
-N:50:Trap of Scatter Items
-I:10:50:50:6:12:0d0:w
-D:You hear crashing sounds from all over the dungeon!
-F:FLOOR | CHEST | DOOR
-
-N:51:Trap of Decay
-I:4:100:50:4:4:0d0:r
-D:Your stomach isn't empty, but suddenly you think of food.
-F:FLOOR | CHEST | DOOR
-
-N:52:Trap of Wasting Wands
-I:6:100:40:4:5:0d0:y
-D:Your wands seem different...
-F:FLOOR | CHEST | DOOR
-
-N:53:Trap of Filling
-I:10:100:0:10:25:0d0:o
-D:The whole room vibrates in a strange way...
-F:FLOOR | CHEST | DOOR
-
-N:54:Trap of Drain Speed
-I:8:50:10:25:80:0d0:y
-D:You suddenly seem to have more time to self-reflect...
-F:FLOOR | CHEST | DOOR
-
-#
-# bolt traps
-#
-
-N:60:Lightning Bolt Trap
-I:2:80:5:3:2:2d8:g
-D:You are jolted with electricity!
-F:FLOOR | CHEST | DOOR | LEVEL1
-
-N:61:Poison Bolt Trap
-I:2:80:5:3:2:2d8:g
-D:A blast of poison gas hits you!
-F:FLOOR | CHEST | DOOR | LEVEL1
-
-N:62:Acid Bolt Trap
-I:2:80:5:3:2:2d8:g
-D:A jet of acid shoots out at you!
-F:FLOOR | CHEST | DOOR | LEVEL1
-
-N:63:Cold Bolt Trap
-I:2:80:5:3:2:2d8:g
-D:You are suddenly very cold!
-F:FLOOR | CHEST | DOOR | LEVEL1
-
-N:64:Fire Bolt Trap
-I:2:80:5:3:2:2d8:g
-D:You are suddenly very hot!
-F:FLOOR | CHEST | DOOR | LEVEL1
-
-N:65:Plasma Bolt Trap
-I:6:80:5:6:15:10d12:g
-D:A bolt of plasma hits you!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:66:Water Bolt Trap
-I:4:80:5:5:8:5d10:g
-D:A gush of water hits you!
-F:FLOOR | CHEST | DOOR | LEVEL2
-
-N:67:Light Bolt Trap
-I:4:80:5:5:8:5d10:g
-D:There is a sudden flash of light around you!
-F:FLOOR | CHEST | DOOR | LEVEL2
-
-N:68:Dark Bolt Trap
-I:4:80:5:5:8:5d10:g
-D:A bolt of pure elemental darkness hits you!
-F:FLOOR | CHEST | DOOR | LEVEL2
-
-N:69:Shards Bolt Trap
-I:6:80:5:6:15:6d10:g
-D:A blast of crystal shards hits you!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:70:Sound Bolt Trap
-I:6:80:5:6:15:10d12:g
-D:A sudden roar of sound hurts your eardrums!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:71:Confusion Bolt Trap
-I:4:80:5:5:8:6d10:g
-D:A blast of confusion gas engulfs you!
-F:FLOOR | CHEST | DOOR | LEVEL2
-
-N:72:Force Bolt Trap
-I:6:80:5:6:15:10d12:g
-D:A bolt of pure force hits you!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:73:Inertia Bolt Trap
-I:6:80:5:6:15:10d12:g
-D:Your feet feel like lead!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:74:Mana Bolt Trap
-I:8:80:5:9:25:15d16:g
-D:A bolt of pure magic hits you!
-F:FLOOR | CHEST | DOOR | LEVEL4
-
-N:75:Ice Bolt Trap
-I:4:80:5:5:8:5d10:g
-D:A bolt of ice hits you!
-F:FLOOR | CHEST | DOOR | LEVEL2
-
-N:76:Chaos Bolt Trap
-I:6:80:5:6:15:10d12:g
-D:A blast of raw chaos hits you!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:77:Nether Bolt Trap
-I:8:80:5:9:25:15d16:g
-D:A bolt of negative energy hits you!
-F:FLOOR | CHEST | DOOR | LEVEL4
-
-N:78:Disenchantment Bolt Trap
-I:8:80:5:9:25:15d16:g
-D:There is a static feeling in the air...
-F:FLOOR | CHEST | DOOR | LEVEL4
-
-N:79:Nexus Bolt Trap
-I:6:80:5:6:15:10d12:g
-D:A bolt of nexus hits you!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:80:Time Bolt Trap
-I:8:80:5:9:25:15d16:g
-D:Suddenly, several months pass by in a second!
-F:FLOOR | CHEST | DOOR | LEVEL4
-
-N:81:Gravity Bolt Trap
-I:6:80:5:6:15:10d12:g
-D:Gravity suddenly warps around you!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-#
-# ball traps
-#
-
-N:82:Lightning Ball Trap
-I:3:60:5:5:8:3d10:B
-D:A massive electrical charge shoots through you!
-F:FLOOR | CHEST | DOOR | LEVEL1
-
-N:83:Poison Ball Trap
-I:3:60:5:5:8:3d10:B
-D:A large cloud of poison gas envelops you!
-F:FLOOR | CHEST | DOOR | LEVEL1
-
-N:84:Acid Ball Trap
-I:3:60:5:5:8:3d10:B
-D:You are suddenly drenched in acid!
-F:FLOOR | CHEST | DOOR | LEVEL1
-
-N:85:Cold Ball Trap
-I:3:60:5:5:8:3d10:B
-D:A blast of hideously cold air envelops you!
-F:FLOOR | CHEST | DOOR | LEVEL1
-
-N:86:Fire Ball Trap
-I:3:60:5:5:8:3d10:B
-D:You are suddenly in the centre of a raging inferno!
-F:FLOOR | CHEST | DOOR | LEVEL1
-
-N:87:Plasma Ball Trap
-I:8:60:5:8:20:12d18:B
-D:You are engulfed in plasma!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:88:Water Ball Trap
-I:5:60:5:6:15:8d12:B
-D:A whirlpool engulfs you!
-F:FLOOR | CHEST | DOOR | LEVEL2
-
-N:89:Light Ball Trap
-I:5:60:5:6:15:8d12:B
-D:A massive flash of light erupts around you!
-F:FLOOR | CHEST | DOOR | LEVEL2
-
-N:90:Darkness Ball Trap
-I:5:60:5:6:15:8d12:B
-D:A large patch of darkness erupts around you!
-F:FLOOR | CHEST | DOOR | LEVEL2
-
-N:91:Shards Ball Trap
-I:8:60:5:8:20:12d18:B
-D:A violent blast of crystal shards hits you!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:92:Sound Ball Trap
-I:8:60:5:8:20:12d18:B
-D:BOOM! Your eardrums nearly explode!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:93:Confusion Ball Trap
-I:5:60:5:6:15:8d12:B
-D:You are enveloped in a cloud of confusion gas!
-F:FLOOR | CHEST | DOOR | LEVEL2
-
-N:94:Force Ball Trap
-I:8:60:5:8:20:12d18:B
-D:A violent blast of pure force smashes down around you!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:95:Inertia Ball Trap
-I:8:60:5:8:20:12d18:B
-D:Suddenly, your entire body feels like lead!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:96:Mana Ball Trap
-I:10:60:5:10:30:16d20:B
-D:You are hit by a blast of pure magic!
-F:FLOOR | CHEST | DOOR | LEVEL4
-
-N:97:Ice Ball Trap
-I:5:60:5:6:15:8d12:B
-D:A massive blast of ice crystals engulfs you!
-F:FLOOR | CHEST | DOOR | LEVEL2
-
-N:98:Chaos Ball Trap
-I:8:60:5:8:20:12d18:B
-D:A violent blast of raw chaos engulfs you!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:99:Nether Ball Trap
-I:10:60:5:10:30:16d20:g
-D:A blast of energy from the netherworld engulfs you!
-F:FLOOR | CHEST | DOOR | LEVEL4
-
-# N:type:name
-# I:diff:prob:another:pval:minlevel:color
-# D:description
-
-N:100:Disenchantment Ball Trap
-I:10:60:5:10:30:16d20:B
-D:You are hit by a blast of pure anti-magic!
-F:FLOOR | CHEST | DOOR | LEVEL4
-
-N:101:Nexus Ball Trap
-I:8:60:5:8:20:12d18:B
-D:A ball of nexus hits you!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:102:Time Ball Trap
-I:10:60:5:10:30:16d20:B
-D:Suddenly, several years pass by in a second!
-F:FLOOR | CHEST | DOOR | LEVEL4
-
-N:103:Gravity Ball Trap
-I:8:60:5:8:20:12d18:B
-D:You suddenly feel gravity warp violently around you!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:110:Arrow Trap
-I:2:100:0:5:2:0d0:R
-D:An arrow shoots out at you.
-F:FLOOR | CHEST | DOOR
-
-N:111:Bolt Trap
-I:2:100:0:5:5:0d0:R
-D:A bolt shoots out at you.
-F:FLOOR | CHEST | DOOR
-
-N:112:Seeker Arrow Trap
-I:2:100:0:6:10:0d0:R
-D:A seeker arrow shoots out at you.
-F:FLOOR | CHEST | DOOR
-
-N:113:Seeker Bolt Trap
-I:2:100:0:6:12:0d0:R
-D:A seeker bolt shoots out at you.
-F:FLOOR | CHEST | DOOR
-
-N:114:Poison Arrow Trap
-I:2:100:0:5:4:0d0:R
-D:A poisoned arrow shoots out at you.
-F:FLOOR | CHEST | DOOR
-
-N:115:Poison Bolt Trap
-I:2:100:0:6:6:0d0:R
-D:A poisoned bolt shoots out at you.
-F:FLOOR | CHEST | DOOR
-
-N:116:Poison Seeker Arrow Trap
-I:2:100:0:7:12:0d0:R
-D:A poisoned seeker arrow shoots out at you.
-F:FLOOR | CHEST | DOOR
-
-N:117:Poison Seeker Bolt Trap
-I:2:100:0:7:15:0d0:R
-D:A poisoned seeker bolt shoots out at you.
-F:FLOOR | CHEST | DOOR
-
-N:118:Broken Dagger Trap
-I:2:100:0:5:2:0d0:R
-D:An broken dagger shoots out at you.
-F:FLOOR | CHEST | DOOR
-
-N:119:Dagger Trap
-I:2:100:0:5:5:0d0:R
-D:A dagger shoots out at you.
-F:FLOOR | CHEST | DOOR
-
-N:120:Poison Broken Dagger Trap
-I:2:100:0:5:4:0d0:R
-D:A poisoned broken dagger shoots out at you.
-F:FLOOR | CHEST | DOOR
-
-N:121:Poison Dagger Trap
-I:2:100:0:6:6:0d0:R
-D:A poisoned dagger shoots out at you.
-F:FLOOR | CHEST | DOOR
-
-#
-# multiple arrows/daggers traps
-#
-
-N:122:Arrows Trap
-I:4:100:0:7:16:0d0:R
-D:Some arrows shoot out at you.
-F:FLOOR | CHEST | DOOR
-
-N:123:Bolts Trap
-I:4:100:0:7:18:0d0:R
-D:Some bolts shoot out at you.
-F:FLOOR | CHEST | DOOR
-
-N:124:Seeker Arrow Trap
-I:5:100:0:8:20:0d0:R
-D:Some seeker arrows shoot out at you.
-F:FLOOR | CHEST | DOOR
-
-N:125:Seeker Bolt Trap
-I:5:100:0:8:24:0d0:R
-D:Some seeker bolts shoot out at you.
-F:FLOOR | CHEST | DOOR
-
-N:126:Poison Arrows Trap
-I:5:100:0:8:18:0d0:R
-D:Some poisoned arrows shoot out at you.
-F:FLOOR | CHEST | DOOR
-
-N:127:Poison Bolt Trap
-I:6:100:0:8:20:0d0:R
-D:Some poisoned bolts shoot out at you.
-F:FLOOR | CHEST | DOOR
-
-N:128:Poison Seeker Arrows Trap
-I:7:100:0:9:27:0d0:R
-D:Some poisoned seeker arrows shoot out at you.
-F:FLOOR | CHEST | DOOR
-
-N:129:Poison Seeker Bolts Trap
-I:9:100:0:9:30:0d0:R
-D:Some poisoned seeker bolts shoot out at you.
-F:FLOOR | CHEST | DOOR
-
-N:130:Broken Daggers Trap
-I:4:100:0:6:12:0d0:R
-D:Some broken daggers shoot out at you.
-F:FLOOR | CHEST | DOOR
-
-N:131:Dagger Trap
-I:4:100:0:6:15:0d0:R
-D:Some daggers shoot out at you.
-F:FLOOR | CHEST | DOOR
-
-N:132:Poison Broken Daggers Trap
-I:5:100:0:7:18:0d0:R
-D:Some poisoned broken daggers shoot out at you.
-F:FLOOR | CHEST | DOOR
-
-N:133:Poison Daggers Trap
-I:6:100:0:7:23:0d0:R
-D:Some poisoned daggers shoot out at you.
-F:FLOOR | CHEST | DOOR
-
-N:140:Trap of Drop Item
-I:3:50:0:2:5:0d0:y
-D:A sudden sound startles you and you drop something!
-F:FLOOR | CHEST | DOOR
-
-N:141:Trap of Drop Items
-I:5:50:0:5:12:0d0:y
-D:A sudden sound startles you and you drop several things!
-F:FLOOR | CHEST | DOOR
-
-N:142:Trap of Drop Everything
-I:8:50:0:8:20:0d0:y
-D:A sudden sound startles you and you drop everything!
-F:FLOOR | CHEST | DOOR
-
-#-SC-
-N:150:Trap of Femininity
-I:4:30:5:0:10:2d8:r
-D:You feel like a new woman!
-F:FLOOR | CHEST | DOOR
-
-N:151:Trap of Masculinity
-I:4:30:5:0:10:2d8:r
-D:You feel like a new man!
-F:FLOOR | CHEST | DOOR
-
-N:152:Trap of Neutrality
-I:4:30:5:0:10:2d8:r
-D:You feel like a new woman... erm, a new man... er, WHAT did you say???
-F:FLOOR | CHEST | DOOR
-
-N:153:Trap of Aging
-I:5:50:5:0:15:1d8:r
-D:You suddenly age very fast!
-F:CHEST | DOOR
-
-N:154:Trap of Growing
-I:3:75:5:0:5:1d8:r
-D:You begin to grow!
-F:FLOOR | CHEST | DOOR
-
-N:155:Trap of Shrinking
-I:3:75:5:0:5:1d8:r
-D:You begin to shrink!
-F:FLOOR | CHEST | DOOR
-
-#N:156: UNUSED
-
-#N:157: UNUSED
-
-N:158:Trap of Divine Anger
-I:6:100:5:0:15:0d0:G
-D:A voice booms out "Have a care, mortal!"
-F:FLOOR | CHEST | DOOR
-
-N:159:Trap of Divine Wrath
-I:9:50:5:0:30:0d0:G
-D:A voice booms out "Sacrilege!"
-F:FLOOR | CHEST | DOOR
-
-N:160:Hallucination Trap
-I:3:100:10:0:4:0d0:r
-D:Your vision is clouded by a blast of kaleidoscopic light!
-F:FLOOR | CHEST | DOOR
-
-# Bolt traps
-N:161:Greater Magic Missile Trap
-I:6:80:5:6:75:25d20:g
-D:A greater magic missile hits you!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-#N:162:Foulness Trap
-#I:6:80:5:6:15:10d12:g
-#D:You feel foul!
-#F:FLOOR | CHEST | DOOR | LEVEL3
-
-#N:163:Trap of Death Ray
-#I:8:80:5:9:25:15d16:g
-#D:A Ray of Death hits you!
-#F:FLOOR | CHEST | DOOR | LEVEL4
-
-N:164:Trap of Holy Fire
-I:6:80:5:6:15:10d12:g
-D:Holy fire rises around you!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:165:Trap of Hell Fire
-I:6:80:5:6:15:10d12:g
-D:Hellfire rises around you!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:166:Psi Bolt Trap
-I:6:80:5:6:15:10d12:g
-D:Your mind is suddenly blasted!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:167:Psi Drain Trap
-I:6:80:5:6:15:8d10:r
-D:You suddenly can't think clearly any more...
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-# Ball Traps
-
-### this one *ought* to be a Nuke Ball trap, not plasma ball, as trap 87 
-### is also plasma ball. I've put the description right in advance.
-
-#N:168:Plasma Ball Trap
-#I:8:60:5:8:20:12d18:B
-#D:A blast of radiation engulfs you!
-#F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:169:Psi Ball Trap
-I:8:60:5:8:20:12d18:B
-D:Your brain is suddenly blasted!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-# Useful traps
-
-N:170:Acquirement Trap
-I:1:40:5:5:18:0d0:v
-D:Whoa!
-F:FLOOR | DOOR
-
-# More bolt traps
-
-N:171:Greater Lightning Bolt Trap
-I:3:60:5:3:6:6d6:g
-D:You are jolted with electricity!
-F:FLOOR | CHEST | DOOR | LEVEL1
-
-N:172:Greater Poison Bolt Trap
-I:3:60:5:3:6:6d6:g
-D:A blast of deadly poison gas hits you! 
-F:FLOOR | CHEST | DOOR | LEVEL1
-
-N:173:Greater Acid Bolt Trap
-I:3:60:5:3:6:6d6:g
-D:A jet of acid shoots out at you! It burns severely!
-F:FLOOR | CHEST | DOOR | LEVEL1
-
-N:174:Greater Cold Bolt Trap
-I:3:60:5:3:6:6d6:g
-D:You are suddenly extremely cold!
-F:FLOOR | CHEST | DOOR | LEVEL1
-
-N:175:Greater Fire Bolt Trap
-I:3:60:5:3:6:6d6:g
-D:You are suddenly extremely hot!
-F:FLOOR | CHEST | DOOR | LEVEL1
diff --git a/lib/edit/trolls.map b/lib/edit/trolls.map
index e5d104fd..c54a5418 100644
--- a/lib/edit/trolls.map
+++ b/lib/edit/trolls.map
@@ -17,19 +17,19 @@ F:.:88:3
 F:;:89:3
 
 # Floor with forest troll
-F:f:89:3:297:0:0:0:0:0:0:2
+F:f:89:3:297:0:0:0:0:0:2
 
 # Floor with stone troll
-F:s:89:3:401:0:0:0:0:0:0:2
+F:s:89:3:401:0:0:0:0:0:2
 
 # Floor with algroth
-F:a:89:3:424:0:0:0:0:0:0:2
+F:a:89:3:424:0:0:0:0:0:2
 
 # Floor with Bert
-F:b:89:3:493:0:0:0:0:0:0:2
+F:b:89:3:493:0:0:0:0:0:2
 
 # Floor with Bill
-F:i:89:3:494:0:0:0:0:0:0:2
+F:i:89:3:494:0:0:0:0:0:2
 
 # Floor with a Dwarven skeleton
 F:k:89:8:0:396
diff --git a/lib/edit/v_info.txt b/lib/edit/v_info.txt
index fb4a4d20..d5a92ee2 100644
--- a/lib/edit/v_info.txt
+++ b/lib/edit/v_info.txt
@@ -16,11 +16,6 @@
 
 # Quest vaults added - rr9
 
-# Version stamp (required)
-
-V:2.0.0
-
-
 ### Simple Vaults (type 7) -- maximum size 44x22 ###
 
 
@@ -233,7 +228,7 @@ D:%........XXXXXXXXXXX.%
 D:%%%%%%%%%%%%%%%%%%%%%%
 
 N:12:Lesser vault (prison)
-X:7:10:16:35
+X:7:10:15:35
 D:%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 D:%.+..&..+..&..+..&..+..&..+..&..+.%
 D:%.###.#####.#####.#####.#####.###.%
diff --git a/lib/edit/volcano.txt b/lib/edit/volcano.txt
index 1b89cf3d..c7e64dee 100644
--- a/lib/edit/volcano.txt
+++ b/lib/edit/volcano.txt
@@ -1,10 +1,10 @@
 # File: volcano.txt
 
 # Stairway to the Hell
-F:$:7:3:0:0:0:0:0:6
+F:$:7:3:0:0:0:0:6
 
 # Hole to the center of the Volcano
-F:>:7:3:0:0:0:0:0:5
+F:>:7:3:0:0:0:0:5
 
 ############### Town Layout ###############
 
diff --git a/lib/edit/wf_info.txt b/lib/edit/wf_info.txt
index 80ab14a6..1d4b25f9 100644
--- a/lib/edit/wf_info.txt
+++ b/lib/edit/wf_info.txt
@@ -28,10 +28,6 @@
 # if < 1000 then it points to a town
 # if >= 1000 then it points to the x - 1000 dungeon type
 
-# Version stamp (required)
-
-V:2.0.0
-
 N:0:Ekkaia
 D:the Encircling Sea
 W:1:0:0:182:0:X
diff --git a/lib/edit/wights.map b/lib/edit/wights.map
index d35c20ee..9e2ea0ce 100644
--- a/lib/edit/wights.map
+++ b/lib/edit/wights.map
@@ -17,13 +17,13 @@ F:;:88:3
 F:f:88:3:381
 
 # Floor with grave wight
-F:g:88:3:470:0:0:0:0:0:0:2
+F:g:88:3:470:0:0:0:0:0:2
 
 # Floor with barrow wight
-F:b:88:3:499:0:0:0:0:0:0:2
+F:b:88:3:499:0:0:0:0:0:2
 
 # Floor with Emperor Wight
-F:e:88:3:604:0:0:0:0:0:0:2
+F:e:88:3:604:0:0:0:0:0:2
 
 # Floor with a Human Skeleton
 F:k:88:8:0:395
@@ -32,31 +32,31 @@ F:k:88:8:0:395
 F:,:172:6
 
 # between gate 1
-F:1:160:6:0:0:0:0:0:2057
+F:1:160:6:0:0:0:0:2057
 
 # between gate 2
-F:2:160:6:0:0:0:0:0:1036
+F:2:160:6:0:0:0:0:1036
 
 # between gate 3
-F:3:160:6:0:0:0:0:0:3847
+F:3:160:6:0:0:0:0:3847
 
 # between gate 4
-F:4:160:6:0:0:0:0:0:2321
+F:4:160:6:0:0:0:0:2321
 
 # between gate 5
-F:5:160:6:0:0:0:0:0:1043
+F:5:160:6:0:0:0:0:1043
 
 # between gate 6
-F:6:160:6:0:0:0:0:0:3599
+F:6:160:6:0:0:0:0:3599
 
 # between gate 7
-F:7:160:6:0:0:0:0:0:2071
+F:7:160:6:0:0:0:0:2071
 
 # between gate 8
-F:8:160:6:0:0:0:0:0:3350
+F:8:160:6:0:0:0:0:3350
 
 # between gate 9
-F:9:160:6:0:0:0:0:0:771
+F:9:160:6:0:0:0:0:771
 
 # Dungeon layout
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
diff --git a/lib/file/elvish.txt b/lib/file/elvish.txt
deleted file mode 100644
index a00b5a22..00000000
--- a/lib/file/elvish.txt
+++ /dev/null
@@ -1,218 +0,0 @@
-216
-******** BUFFER LINE *********************************** DO NOT REMOVE *******
-adan
-ael
-in
-agl
-ar
-aina
-alda
-al
-qua
-am
-arth
-amon
-anca
-an
-dune
-anga
-anna
-ann
-on
-ar
-ien
-atar
-band
-bar
-ad
-bel
-eg
-brag
-ol
-breth
-il
-brith
-cal
-en
-gal
-en
-cam
-car
-ak
-cel
-eb
-cor
-on
-cu
-cui
-vie
-cul
-curu
-dae
-dag
-or
-del
-din
-dol
-dor
-draug
-du
-duin
-dur
-ear
-ech
-or
-edh
-el
-eith
-elen
-er
-ereg
-es
-gal
-fal
-as
-far
-oth
-faug
-fea
-fin
-for
-men
-fuin
-gaer
-gaur
-gil
-gir
-ith
-glin
-gol
-odh
-gond
-gor
-groth
-grod
-gul
-gurth
-gwaith
-gwath
-wath
-had
-hod
-haudh
-heru
-him
-hini
-hith
-hoth
-hyar
-men
-ia
-iant
-iath
-iaur
-ilm
-iluve
-kal
-gal
-kano
-kel
-kemen
-khel
-ek
-khil
-kir
-lad
-laure
-lhach
-lin
-lith
-lok
-lom
-lome
-londe
-los
-loth
-luin
-maeg
-mal
-man
-mel
-men
-menel
-mer
-eth
-min
-as
-mir
-mith
-mor
-moth
-nan
-nar
-naug
-dil
-dur
-nel
-dor
-nen
-nim
-orn
-orod
-os
-pal
-an
-pel
-quen
-quet
-ram
-ran
-rant
-ras
-rauko
-ril
-rim
-ring
-ris
-roch
-rom
-rond
-ros
-ruin
-ruth
-sarn
-ser
-eg
-sil
-sir
-sul
-tal
-dal
-tal
-ath
-tar
-tath
-ar
-taur
-tel
-thal
-thang
-thar
-thaur
-thin
-thol
-thon
-thor
-on
-til
-tin
-tir
-tol
-tum
-tur
-uial
-ur
-val
-wen
-wing
-yave
diff --git a/lib/help/ability.txt b/lib/help/ability.txt
index 175d6745..17d89dbc 100644
--- a/lib/help/ability.txt
+++ b/lib/help/ability.txt
@@ -27,11 +27,15 @@ playable, and maybe even powerful enough to win the game!
 
 Here follows a list of all the available abilities:
 
-*****ability.txt*02[Spread blows]               *****ability.txt*03[Tree walking]
-*****ability.txt*04[Perfect casting]            *****ability.txt*05[Extra Max Blow(1)]
-*****ability.txt*06[Extra Max Blow(2)]          *****ability.txt*07[Ammo creation]
-*****ability.txt*08[Touch of death]             *****ability.txt*09[Artifact Creation]
-*****ability.txt*10[Far reaching attack]        *****ability.txt*11[Trapping]
+*****ability.txt*02[Spread blows]
+*****ability.txt*03[Tree walking]
+*****ability.txt*04[Perfect casting]
+*****ability.txt*05[Extra Max Blow(1)]
+*****ability.txt*06[Extra Max Blow(2)]
+*****ability.txt*07[Ammo creation]
+*****ability.txt*08[Touch of death]
+*****ability.txt*10[Far reaching attack]
+*****ability.txt*11[Trapping]
 *****ability.txt*12[Undead Form]
 
 ~~~~~02|Abilities|Spread blows
@@ -84,12 +88,6 @@ for that kill.
 You must activate this from your 'm' menu.
 #####UPrereq: Necromancy skill@50, Combat skill@40, DEX@30, STR@30
 #####rCost: 15
-~~~~~09|Abilities|Artifact Creation
-[[[[[BArtifact Creation]
-In combination with a high alchemy skill this ability will let you
-design your very own artifacts.
-Prereq: Alchemy@40, INT@35, WIS@35
-#####rCost: 70
 ~~~~~10|Abilities|Far reaching attack
 [[[[[BFar reaching attack]
 You can attack an enemy one square far using a long polearm.
diff --git a/lib/help/advanced.hlp b/lib/help/advanced.hlp
index 3f6fe4bd..8595712b 100644
--- a/lib/help/advanced.hlp
+++ b/lib/help/advanced.hlp
@@ -7,9 +7,8 @@ Please choose one of the following help files:
      *****/aoption.txt*0[(a) Options] 
      *****/bmacrofaq.txt*0[(b) Macros]
      *****/cautomat.txt*0[(c) Automatizer help] 
-     (d) Lua scripting help - coming soon
-     *****/edebug.txt*0[(e) Debug commands] 
-     *****/fversion.txt*0[(f) Version information] A history of ToME's roots
+     *****/ddebug.txt*0[(d) Debug commands]
+     *****/eversion.txt*0[(e) Version information] A history of ToME's roots
 
      *****/zhelp.hlp*0[(z) Main Help menu]
 
diff --git a/lib/help/automat.txt b/lib/help/automat.txt
index bf6478f8..c09630a5 100644
--- a/lib/help/automat.txt
+++ b/lib/help/automat.txt
@@ -25,10 +25,9 @@ things providing you are of a certain level.
 #####GSounds quite cool, but wha...
 STOP RIGHT THERE! I haven't finished yet! Let's look at some other examples.
 Most of the time, scrolls of darkness are pretty useless. Unless you are a
-vampire, or an alchemist, right? So you might think it was no good to add
-auto-destroy of scrolls of darkness to the automatizer. But you'd be wrong, for
-you can add rules that are dependent on certain conditions, like that you are
-of a certain race, or class.
+vampire, right? So you might think it was no good to add auto-destroy of scrolls
+of darkness to the automatizer. But you'd be wrong, for you can add rules that
+are dependent on certain conditions, like that you are of a certain race, or class.
 
 #####GHey this is sounding good. What if it destroys my artifacts?
 It can't. Artifacts can never be destroyed, by the automatizer. However, watch
@@ -250,9 +249,8 @@ instead of <tval>23</tval> you could write <tval>TV_SWORD</tval>.
 
 #####GAh that would be better. But where can I find out what all the names, and
 #####Gnumbers of tvalues are?
-Well I've written a *****defines.txt*0[file] which lists tvalues and one which lists svalues for you
-to check on, and you may want to check the objects entry in k_info.txt in your
-lib/edit directory. If you look at the entry for dagger you'll see:
+Have a look at the object entry in k_info.txt in your lib/edit directory. If you
+check the entry for dagger you'll see:
 
 N:43:& Dagger~
 G:|:W
diff --git a/lib/help/birth.txt b/lib/help/birth.txt
index 00b1a921..89b04d53 100644
--- a/lib/help/birth.txt
+++ b/lib/help/birth.txt
@@ -240,8 +240,8 @@ Paladin. For the first few adventures it is suggested that you run a warrior
 or rogue. Spell casting generally requires a more experienced player that is
 familiar with survival techniques.
 
-     *****c_alchem.txt*0[Alchemist]                 *****c_mage.txt*0[Mage]                     *****c_rogue.txt*0[Rogue]
-     *****c_archer.txt*0[Archer]                    *****c_mimic.txt*0[Mimic]                    *****c_runecr.txt*0[Runecrafter]   
+                                                    *****c_mage.txt*0[Mage]                     *****c_rogue.txt*0[Rogue]
+     *****c_archer.txt*0[Archer]                    *****c_mimic.txt*0[Mimic]
      *****c_assass.txt*0[Assassin]                  *****c_mindcr.txt*0[Mindcrafter]              *****c_sorcer.txt*0[Sorceror]       
      *****c_axemas.txt*0[Axemaster]                 *****c_monk.txt*0[Monk]                     *****c_summon.txt*0[Summoner]
      *****c_bard.txt*0[Bard]                      *****c_necro.txt*0[Necromancer]              *****c_swordm.txt*0[Swordmaster]
@@ -504,11 +504,9 @@ are listed in the following table.
            Unbeliever    +5      -2      -2      +2      +2      -1
            Warrior       +5      -2      -2      +2      +2      -1
 
-           Alchemist     -5      +3       0      +1      -2      +1
            Geomancer     -5      +3       0      +1      -2      +1
            Mage          -5      +3       0      +1      -2      +1
            Necromancer   -5      +3       0      +1      -2      +1
-           Runecrafter   -5      +3       0      +1      -2      +1
            Sorceror      -5      +3       0      +1      -2      +1
            Thaumaturgist -5      +3       0      +1      -2      +1
            Warper        -5      +3       0      +1      -2      +1
diff --git a/lib/help/c_alchem.txt b/lib/help/c_alchem.txt
deleted file mode 100644
index 2f7cd58c..00000000
--- a/lib/help/c_alchem.txt
+++ /dev/null
@@ -1,135 +0,0 @@
-|||||oy
-~~~~~01|Alchemist
-~~~~~02|Classes|Alchemist
-#####R=== Alchemists ===
-
-#####GDescription
-Alchemists are the only class that can harness the abilities of the 
-essences found in the dungeon. They can add these essences to staves, 
-rings, wands, rods, and sometimes weapons and armour to create new items
-or recharge old ones. They can also extract essences from magical items
-they find. Using these abilities, Alchemists can get very good items at
-low levels. The trouble is getting them to survive later on.
-
-Alchemists are extremely proficient with all kinds of magical devices,
-and have made a fine art of extracting, storing, and using these 
-objects' magical energies.  Because they neither fight well nor cast 
-powerful spells, Alchemists rely on their craftsmanship to cope with 
-the dangers of the dungeons.  They will quickly learn to create damage-
-dealing wands, rods, and staffs, forge powerful weapons and armour, 
-make highly useful objects of other kinds, and eventually, at great cost 
-to other knowledge, they can learn the perilous art of artifact creation 
-itself.
-
-#####GStarting Stat Modifiers
-Strength         -5
-Intelligence     +3
-Wisdom           +0
-Dexterity        +1
-Constitution     -2
-Charisma         +1
-Hit Die          +d0
-Spell Points     +0%
-Exp Penalty      30%
-
-#####GStarting Skills:
-#####BSkill                   Start Level     Skill Point Gains
-Combat                  1.000           [0.700]
-  Weaponmastery         0.700           [0.700]
-Sneakiness              1.000           [0.900]
-  Stealth               0.000           [0.400]
-Magic                   3.000           [0.900]
-  Magic-Device          1.000           [1.250]
-  Geomancy
-    Fire                0.000           [0.100]
-    Water               0.000           [0.100]
-    Air                 0.000           [0.100]
-    Earth               0.000           [0.100]
-  Meta                  0.000           [0.500]
-  Conveyance            0.000           [0.100]
-  Divination            0.000           [0.500]
-  Temporal              0.000           [0.100]
-  Mind                  0.000           [0.100]
-  Nature                0.000           [0.100]
-  Necromancy            0.000           [0.100]
-  Runecraft             0.000           [0.700]
-  Thaumaturgy           0.000           [0.100]
-  Alchemy               1.000           [0.800]
-Spirituality            1.000           [0.800]
-  Prayer                0.000           [0.500]
-Monster-lore            0.000           [0.500]
-
-*An Alchemist cannot learn the Geomancy skill, but it is shown in his skill 
-screen because the elemental schools are sub-skills of it.
-
-#####GInnate Abilities:
-#####BAbility              Character level
-Perfect casting             1
-
-#####GStarting Equipment
-An Alchemist begins the game with:
-    a Dagger
-    six Essences of Explosion
-    an Empty Bottle
-    a Set of Leather Gloves
-~~~~~03|Alchemist|Alchemy powers explained
-~~~~~05|Skills|Alchemy - Alchemy powers
-#####GAlchemy
-[[[[[BThe alchemical techniques are accessed using the 'm' key.]  
-Alchemists may then 'E'xtract essences or add 'P'owers. The Alchemist [[[[[vmust]
-be wearing GLOVES to use their alchemy powers.
-
-An Alchemist is also capable of [[[[[Bcreating their own artifacts], but
-this is a time-consuming, and costly, activity. To do so, he must first 
-learn the ability *****ability.txt*09[Artifact Creation], which costs a whopping 70 skill points
-to learn, and requires some high pre-requisites. Once he has done so, 
-he needs to imbue an ego item with a number of essences of magic (equal
-to their skill level) and then wield the item. While using the item, 
-it will gain experience (which reduces the amount of exp the wearer 
-gains during this time). When the Alchemist feels that the item is 
-powerful enough, he can finalise the artifact by "buying" powers using
-the experience the artifact has collected. He will also require exotic
-ingredients to add the abilities.
-
-Most (but not all) potions, scrolls, wands, staffs, rods, rings, and 
-amulets contain usable magical energies.  An Alchemist taps that 
-energy, using the technique "'E'xtract essences" to create one or more
-essences of a type appropriate to the original object.
-
-The drained object itself is now called "of nothing".  Unlike any
-other kind of object, it can have new magics added to it.
-
-An Alchemist can add power to such items by using essences he made or
-found.  He does this with the technique "'P'ower".  He can then select
-the object he wishes to enchant, and the kind of object he wishes to
-create. Only object types for which he knows the recipe will be displayed,
-and ones for which essences are lacking will be displayed in red. Objects
-whose level exceeds his own are sometimes difficult to create, though
-he can always add gold to improve the chances of his success.
-
-[[[[[BA few pointers:]
-     -Recipes are (usually) logical. Acid essences don't make Dragon 
-      Weapons. And you can always look at the recipes you know with
-      the "recipe 'B'ook" command.
-     -Not all objects or ego-item types can be made using alchemy.
-     -Alchemy is mostly reversible.  Most items that you can 
-      'E'xtract from, you can later re-create, if you learn about
-      them when extracting from them. You won't always get enough
-      essences from destroying an item to recreate it, though the 
-      chance of doing so will get higher as you increase in skill.
-     -*Identifying* an object that you can destroy will always teach
-      you how to create it (if creating it is possible).
-     -Since you can't create abilities in artifacts that you aren't
-      aware of, make sure to *identify* all the artifacts you can.
-     -You can't *identify* things you buy in shops, so you'll have
-      to extract from them and take your chances.
-
-[[[[[BSome Recipes:]
-Any Alchemist worth his salt knows lots of recipes.  By extracting from
-items in the dungeon, he learns to create more and more items. You can
-see the recipes you know using the "recipe 'B'ook" command. The Alchemist
-starts off knowing some basic recipes, and gains more recipes as time 
-goes on.
-
-More details can be found in the *****essences.txt*0[Essences SPOILER]).
-
diff --git a/lib/help/c_geoman.txt b/lib/help/c_geoman.txt
index 47855875..ba8eaa66 100644
--- a/lib/help/c_geoman.txt
+++ b/lib/help/c_geoman.txt
@@ -43,7 +43,6 @@ Magic                   1.000           [0.900]
   Mind                  0.000           [0.700]
   Nature                0.000           [0.700]
   Necromancy            0.000           [0.700]
-  Runecraft             0.000           [0.700]
   Thaumaturgy           0.000           [0.700]
 Spirituality            1.000           [0.550]
   Prayer                0.000           [0.500]
diff --git a/lib/help/c_mage.txt b/lib/help/c_mage.txt
index 949d3bcc..9bfd6a3c 100644
--- a/lib/help/c_mage.txt
+++ b/lib/help/c_mage.txt
@@ -48,7 +48,6 @@ Magic                   1.000           [0.900]
   Mind                  0.000           [0.900]
   Nature                0.000           [0.900]
   Necromancy            0.000           [0.700]
-  Runecraft             0.000           [0.700]
   Thaumaturgy           0.000           [0.700]
 Spirituality            1.000           [0.550]
   Prayer                0.000           [0.500]
diff --git a/lib/help/c_merch.txt b/lib/help/c_merch.txt
deleted file mode 100644
index 31fb60dd..00000000
--- a/lib/help/c_merch.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-#####R=== Merchants ===
-
-#####GDescription
-A Merchant is neither a warrior nor a spellcaster. They still have some great
-advantages, they can use chests to warp items into other items, they can
-indentify items, they soon learn to detect all objects in the area, and
-at higher level they can see all monsters carrying objects. They will also
-get the power to appraise items and to turn them into gold. A merchant will
-naturraly get better prices in shops and get access to the merchant guild
-services, loan and item request.
-
-#####GPrimary Stats
-Charisma
-Intelligence (Ability stat)
-
-#####GMagic Usage
-Merchants can use portable holes to carry more stuff than other classes but
-at the cost of an increased weight. To do that they must wear a portable hole
-and use it with 'm'.
-They also can use their merchants abilities and midas touch in the 'U' menu.
-
-#####GStarting Equipment
-A merchant begins the game with:
-    A portable hole
-    A small steel chest containing gold and items
-    A long sword
-    A wand of tame monsters
-
-
diff --git a/lib/help/c_necro.txt b/lib/help/c_necro.txt
index f3a5ad2c..c4b05e3c 100644
--- a/lib/help/c_necro.txt
+++ b/lib/help/c_necro.txt
@@ -42,7 +42,6 @@ Magic                   1.000           [0.900]
   Mind                  0.000           [0.900]
   Nature                0.000           [0.500]
   Necromancy            1.000           [1.000]
-  Runecraft             0.000           [0.700]
   Thaumaturgy           0.000           [0.700]
 Spirituality            1.000           [0.550]
   Prayer                0.000           [0.500]
diff --git a/lib/help/c_runecr.txt b/lib/help/c_runecr.txt
deleted file mode 100644
index 8388eff9..00000000
--- a/lib/help/c_runecr.txt
+++ /dev/null
@@ -1,110 +0,0 @@
-~~~~~01|Runecrafter
-~~~~~02|Classes|Runecrafter
-#####R=== Runecrafters ===
-
-#####GDescription
-Instead of using spellbooks like the other spellcasters they instead 
-use mystic runes. To cast a spell they select a primary rune of the 
-elements (fire, cold, etc.) and they also choose a set of secondary runes,
-which shape the effect of the first one. The secondary runes include 
-Self, Arrow, Ray, ... and Armageddon. After that they chose the amount 
-of mana to use and the spell is cast! But the more secondary runes they
-chose the more mana is used to cast the spell. They also are bad 
-fighters, but if they concentrate all their mana in one spell 
-(especially with a mage staff of mana) they could kill nearly anything.
-
-#####GStarting Stat Modifiers
-Strength         -5
-Intelligence     +3
-Wisdom           +0
-Dexterity        +1
-Constitution     -2
-Charisma         +1
-Hit Die          +d0
-Spell Points    +50%
-Exp Penalty      30%
-
-#####GStarting Skills:
-#####BSkill                   Start Level     Skill Point Gains
-Combat                  1.000           [0.200]
-  Weaponmastery         0.700           [0.400]
-Sneakiness              1.000           [0.900]
-  Stealth               0.000           [0.400]
-Magic                   2.000           [0.950]
-  Magic-Device          1.000           [1.200]
-  Spell-power           0.000           [0.600]
-  Mana                  1.000           [0.600]
-  Geomancy
-    Fire                0.000           [0.700]
-    Water               0.000           [0.700]
-    Air                 0.000           [0.700]
-    Earth               0.000           [0.700]
-  Meta                  0.000           [0.700]
-  Conveyance            0.000           [0.700]
-  Divination            0.000           [0.700]
-  Temporal              0.000           [0.700]
-  Mind                  0.000           [0.700]
-  Nature                0.000           [0.700]
-  Necromancy            0.000           [0.700]
-  Runecraft             1.000           [1.000]
-  Thaumaturgy           0.000           [0.700]
-Spirituality            1.000           [0.550]
-  Prayer                0.000           [0.500]
-Monster-lore            0.000           [0.500]
-
-*A Runecrafter cannot learn the Geomancy skill, but it is shown in his skill 
-screen because the elemental schools are sub-skills of it.
-
-#####GInnate Abilities:
-#####BAbility              Character level
-Perfect casting             1
-
-~~~~~03|Runecrafter|Runecrafter powers
-~~~~~04|Skills|Runecrafting - Runecrafter powers
-#####GRune Magic
-Runecrafters combine runes using the 'm' command.  They first select a 
-rune that controls magic type, then apply one or more runes to fine-tune
-effects, (pressing ESC when done), and then input the amount of mana 
-they wish to expend on the spell.
-
-Runecrafters can cast the spells from their runes in several ways:
-1. On-the-fly by combining runes when they need them.
-2. Memorise rune combinations for quick use when needed (and they don't
-   need to be able to see then!), and then later cast from memory.
-3. Carving them into a Runestone, then using the Runestone later (takes
-   less mana, but they have to be able to see).
-
-[[[[[BSpell Types:] 
-(Some kinds are not listed, and are left for the reader to discover...)
-     Knowledge:  Identify all objects in affected grids, Self-knowledge 
-          if Self rune is used.
-     Life:  Heals monsters in affected grids, heals player if Self rune 
-          is used.
-     Fire, Cold, Lightning, Acid:  Casts magics of that element.
-     Elements:  Irresistible damage.
-     Mind:  A mind blast that badly effects intelligent monsters.  
-          Temporary ESP if Self rune is used.
-     Gravity:  A gravity spell that both does damage and whisks affected 
-          creatures around.
-
-[[[[[BSpell Effects] (all are listed):
-     Self:  Effects the caster.  This rune can be used with any other;
-          if used alone, only the caster's grid is affected.
-     Arrow:  Spell will include a bolt effect.  This allows aiming.
-     Ray:  Spell will include a beam effect.  This allows aiming.  
-          Increases difficulty slightly.
-     Sphere:  Spell will end with a circular explosion.  Increases 
-          difficulty a bit.  Can be used alone, or with Self, Arrow, or 
-          Ray.
-     Power Surge:  Not currently recommended for use.  Increases
-          difficulty a lot.
-     Armageddon:  Hurls down meteors of the magical type in the vicinity
-          of the caster.  Increases difficulty noticeably, but can do a
-          great deal of damage.
-
-#####GStarting Equipment
-A Runecrafter begins the game with:
-    a Rune [Fire]
-    a Rune [Arrow]
-    a Dagger
-
diff --git a/lib/help/c_sorcer.txt b/lib/help/c_sorcer.txt
index 8a33184f..c2fbdbb0 100644
--- a/lib/help/c_sorcer.txt
+++ b/lib/help/c_sorcer.txt
@@ -48,7 +48,6 @@ Magic                   1.000           [1.000]
   Mind                  0.000           [1.000]
   Nature                0.000           [1.000]
   Necromancy            0.000           [1.000]
-  Runecraft             0.000           [0.900]
   Thaumaturgy           0.000           [0.900]
 Spirituality            1.000           [0.550]
   Prayer                0.000           [0.500]
diff --git a/lib/help/c_thaum.txt b/lib/help/c_thaum.txt
index 653e84fa..2680a1c4 100644
--- a/lib/help/c_thaum.txt
+++ b/lib/help/c_thaum.txt
@@ -46,7 +46,6 @@ Magic                   3.000           [0.950]
   Mind                  0.000           [0.700]
   Nature                0.000           [0.700]
   Necromancy            0.000           [0.700]
-  Runecraft             0.000           [0.700]
   Thaumaturgy           1.000           [1.000]
 Spirituality            1.000           [0.550]
   Prayer                0.000           [0.500]
diff --git a/lib/help/c_warper.txt b/lib/help/c_warper.txt
index 55d16be5..1c461049 100644
--- a/lib/help/c_warper.txt
+++ b/lib/help/c_warper.txt
@@ -41,7 +41,6 @@ Magic                   1.000           [0.900]
   Mind                  0.000           [0.700]
   Nature                0.000           [0.800]
   Necromancy            0.000           [0.700]
-  Runecraft             0.000           [0.700]
   Thaumaturgy           0.000           [0.700]
 Spirituality            1.000           [0.550]
   Prayer                0.000           [0.500]
diff --git a/lib/help/command.txt b/lib/help/command.txt
index 6616c252..11ed1df4 100644
--- a/lib/help/command.txt
+++ b/lib/help/command.txt
@@ -29,7 +29,7 @@ the game that you wish to do the command multiple times, unless you press a
 key or are otherwise disturbed.  To enter a "repeat count", type '0', followed
 by the numerical count, followed by the command.  You must type "space" before
 entering certain commands.  Skipping the numerical count yields a count of 99.
-An option allows certain commands (open, disarm, tunnel, etc) to auto-repeat.
+An option allows certain commands (open, tunnel, etc) to auto-repeat.
 
     Some commands will prompt for extra information, such as a direction, an
 inventory or equipment item, a spell, a textual inscription, the symbol of a
@@ -88,7 +88,7 @@ that you can always, for example, use "\" + "." + "6", to specify "run east".
  *****command.txt*1[a  Aim a wand]                           *****command.txt*2[A  Activate an artifact]
  *****command.txt*3[b  Browse a book]                        *****command.txt*4[B  Bash a door]
  *****command.txt*5[c  Close a door]                         *****command.txt*6[C  Character description]
- *****command.txt*7[d  Drop an item]                         *****command.txt*8[D  Disarm a trap]
+ *****command.txt*7[d  Drop an item]                         D  (unused)
  *****command.txt*9[e  Equipment list]                       *****command.txt*10[E  Eat some food]
  *****command.txt*11[f  Fire (shoot) an item]                 *****command.txt*12[F  Fuel your lantern/torch]
  *****command.txt*13[g  Stay still (flip pickup)]             *****command.txt*14[G  Gain new skills]
@@ -136,8 +136,8 @@ that you can always, for example, use "\" + "." + "6", to specify "run east".
  *****command.txt*72[,  Stay still (with pickup)]            ^W  (special - wizard mode)
  *****command.txt*74[<  Go up staircase]                     *****command.txt*75[^X  Save and quit]
  *****command.txt*76[.  Run]                                 ^Y  (unused)
- *****command.txt*77[>  Go down staircase]                   ^Z  (special - borg command)
- *****command.txt*79[\  (special - bypass keymap)]            *****command.txt*80[|  Do cmovies]
+ *****command.txt*77[>  Go down staircase]                   ^Z  (unused)
+ *****command.txt*79[\  (special - bypass keymap)]
  *****command.txt*81[`  (special - escape)]                   *****command.txt*82[~  Display current knowledge]
  *****command.txt*83[/  Identify symbol]                      *****command.txt*84[?  Help]
                                         *****command.txt*98[^\]  Take an html screenshot]
@@ -149,7 +149,7 @@ that you can always, for example, use "\" + "." + "6", to specify "run east".
  *****command.txt*45[a  Zap a rod (Activate)]                 *****command.txt*2[A  Activate an artifact]
  *****command.txt*95[b  (walk - south west)]                  *****command.txt*95[B  (run - south west)]
  *****command.txt*5[c  Close a door]                         *****command.txt*6[C  Character description]
- *****command.txt*7[d  Drop an item]                         *****command.txt*8[D  Disarm a trap or chest]
+ *****command.txt*7[d  Drop an item]                         D  (unused)
  *****command.txt*9[e  Equipment list]                       *****command.txt*10[E  Eat some food]
  *****command.txt*4[f  Bash a door (force)]                  *****command.txt*12[F  Fuel your lantern/torch]
  *****command.txt*13[g  Stay still (flip pickup)]             *****command.txt*14[G  Gain new skills]
@@ -197,14 +197,14 @@ that you can always, for example, use "\" + "." + "6", to specify "run east".
  *****command.txt*76[,  Run]                                 ^W  (special - wizard mode)
  *****command.txt*74[<  Go up staircase]                     *****command.txt*75[^X  Save and quit]
  *****command.txt*72[.  Stay still (with pickup)]            *****command.txt*95[^Y  (tunnel - north west)]
- *****command.txt*77[>  Go down staircase]                   ^Z  (special - borg command)
- *****command.txt*79[\  (special - bypass keymap)]            *****command.txt*80[|  Do cmovies]
+ *****command.txt*77[>  Go down staircase]                   ^Z  (unused)
+ *****command.txt*79[\  (special - bypass keymap)]
  *****command.txt*81[`  (special - escape)]                   *****command.txt*82[~  Display current knowledge]
  *****command.txt*83[/  Identify symbol]                      *****command.txt*84[?  Help]
 
 ~~~~~102|Commands|Special keys
 #####R=== Special Keys ===
- 
+
         Certain special keys may be intercepted by the operating system or
 the host machine, causing unexpected results.  In general, these special keys
 are control keys, and often, you can disable their special effects.
@@ -265,8 +265,8 @@ ESCAPE which are always ignored as commands in case you type the command
 just after the count expires.
 
         You can tell ToME to automatically use a repeat count of 99
-with commands you normally want to repeat (open, disarm, tunnel, bash,
-alter, etc) by setting the "always_repeat" option.
+with commands you normally want to repeat (open, tunnel, bash, alter,
+etc) by setting the "always_repeat" option.
  
  
 #####R===  Selection of Objects ===
@@ -471,7 +471,7 @@ plus the "underlying command" key.  This is followed by the command name
 and "roguelike" keyset key, if different from the underlying command key.
 Then comes a brief description of the command, including information about
 alternative methods of specifying the command in each keyset, when needed.
-Several commands (tunnel, disarm, bash, open) are repeated 99 times if the
+Several commands (tunnel, bash, open) are repeated 99 times if the
 "always_repeat" option is set and no repeat count is given.  Some commands
 use the "repeat count" to automatically repeat the command several times,
 while others use the "repeat count" as an "argument", for example, commands
@@ -498,12 +498,7 @@ for a quantity will convert any "letters" into the maximal legal value.
         each corresponding to a different location on the body, and each of
         which may contain only a single object at a time, and each of which
         may only contain objects of the proper "type".
-        If the option "show_labels" is set, the slots are labelled as follows:  
-        Wielding (weapon), Shooting (missile launcher or instruments),
-        On finger (ring), Around neck (amulet), Light source (light source),
-        On body (armor), About body (cloak), On arm (shield), On head (helmet),
-        On hands (gloves), On feet (boots), Carrying (symbiote), Quiver (ammo),
-        Using (tool). You must be using an object to receive any of its special
+        You must be using an object to receive any of its special
         powers.
 ~~~~~7
 [[[[[GDrop an item (d)]
@@ -518,8 +513,7 @@ for a quantity will convert any "letters" into the maximal legal value.
 [[[[[GDestroy an item (k) or Destroy an item (^D)]
         This destroys an item in your inventory or on the dungeon floor.
         If the selected pile contains multiple objects, you may specify
-        a quantity.  You must always verify this command, unless the item
-        is cursed or worthless and the option "auto_destroy" is set.
+        a quantity.  You must always verify this command.
 ~~~~~42
 [[[[[GWear/Wield equipment (w)]
         To wear or wield an object in your inventory, use this command.
@@ -657,11 +651,10 @@ for a quantity will convert any "letters" into the maximal legal value.
 [[[[[GOpen a door or chest (o)]
         To open an object such as a door or chest, you must use this
         command.  If the object is locked, you will attempt to pick the
-        lock based on your disarming ability.  If you open a trapped chest
-        without disarming the traps first, the trap will be set off.  Some
-        doors will be jammed shut and may have to be forced open.  You may
-        need several tries to open a door or chest.  Open can take a count,
-        requires a direction, and is affected by the "always_repeat" option.
+        lock based.  Some doors will be jammed shut and may have to be
+        forced open.  You may need several tries to open a door or chest.
+        Open can take a count, requires a direction, and is affected by
+        the "always_repeat" option.
 ~~~~~5
 [[[[[GClose a door (c)]
         Non-intelligent and some other creatures cannot open doors, so
@@ -687,19 +680,12 @@ for a quantity will convert any "letters" into the maximal legal value.
         may permanently break it so that it can never be closed.  Bash or
         Force can take a count, requires a direction, and is affected by
         the "always_repeat" option.
-~~~~~8
-[[[[[GDisarm a trap or chest (D)]
-        You can attempt to disarm traps on the floor or on chests.  If you
-        fail, there is a chance that you will blunder and set it off.  You
-        can only disarm a trap after you have found it (usually with the
-        Search command).  Disarm can take a count, requires a direction,
-        and is affected by the "always_repeat" option.
 ~~~~~63
 [[[[[GAlter (+)]
         This special command allows the use of a single keypress to select
         any of the "obvious" commands above (attack, tunnel, bash, open,
-        disarm, close), and, by using macros or keymaps, to combine this
-        keypress with directions.  In general, this allows the use of the
+        close), and, by using macros or keymaps, to combine this keypress
+        with directions.  In general, this allows the use of the
         "control" key plus the appropriate "direction" key (including the
         roguelike direction keys in roguelike mode) as a kind of generic
         "alter the terrain feature of an adjacent grid" command.  Alter
@@ -789,9 +775,9 @@ for a quantity will convert any "letters" into the maximal legal value.
         Use this command to read a scroll.  Scroll spells usually have an
         area effect, except for a few cases where they act on other objects.
         Reading a scroll causes the parchment to disintegrate as the scroll
-        takes effect, unless you are an Alchemist.  Most scrolls which prompt
-        for more information can be aborted (by pressing escape), which will
-        stop reading the scroll before it disintegrates.
+        takes effect.  Most scrolls which prompt for more information can
+        be aborted (by pressing escape), which will stop reading the scroll
+        before it disintegrates.
 ~~~~~58 
 [[[[[GInscribe an object ({)]
         This command inscribes a string on an object.  The inscription is
@@ -997,10 +983,8 @@ for a quantity will convert any "letters" into the maximal legal value.
 ~~~~~69
 [[[[[GTake notes (:)]
         This command allows you to take notes, which will then appear in your
-        note file, if the birth-option "take_notes" was set (the default), or
-        in your message list (prefixed with "Note:"), if the option was not set.
-        The note file can be displayed through the "Display Current Knowledge"
-        command (~ or |). This command takes no time.
+        note file. The note file can be displayed through the "Display Current
+        Knowledge" command (~ or |). This command takes no time.
 ~~~~~123|Commands|Game status
 #####R--- Game Status Commands ---
 ~~~~~6
@@ -1054,9 +1038,8 @@ for a quantity will convert any "letters" into the maximal legal value.
         Display known dungeon towns
         
         Display notes
-        If the option "take_notes" is set shows you your notes file, where all
-        remarkable events are noted. You can add notes yourself by using the
-        "Take notes" command (:).
+        Shows you your notes file, where all remarkable events are noted.
+        You can add notes yourself by using the "Take notes" command (:).
         
 ~~~~~70
 [[[[[GTime of the day (^T)]
@@ -1218,17 +1201,6 @@ for a quantity will convert any "letters" into the maximal legal value.
         command allows the player to force the game to finish the current song
         and move on to another one (i.e. if you are tired of hearing the current
         song, you can change it).
-~~~~~80
-[[[[[GDo cmovies (|)]
-        The cmovie command (press | key in both normal or roguelike set) allows
-        you to make a "movie" that you can send to people showing your movement
-        through a part of the dungeon (like clearing that GCV . . .)
-
-        It asks for a name (it will add the extension itself) and then if you wish
-        to play or record it.
-
-        The cmovie files (.cmv) are located in lib/cmov, note that they quickly
-        become huge and so you REALLY should compress them before sending to friends.
 ~~~~~97
 [[[[[GRecord macros ($)]
         This is an easier way to create macros. Activate it, press the key
diff --git a/lib/help/debug.txt b/lib/help/debug.txt
index 4d5e75da..8aea13ee 100644
--- a/lib/help/debug.txt
+++ b/lib/help/debug.txt
@@ -12,7 +12,7 @@ will not be scored if you use debug commands.
 ~~~~~100|Debug|Command List
 #####R=== Command List Summary ===
 
- *****debug.txt*1[a  Autorestore]                          *****debug.txt*2[A  Show all stats]
+ *****debug.txt*1[a  Autorestore]
  *****debug.txt*3[b  Teleport to target]                   *****debug.txt*4[B  HP to zero]
  *****debug.txt*5[c  Create object]                        *****debug.txt*6[C  Create artifact]
  *****debug.txt*7[d  Detect all]                           *****debug.txt*8[D  Teleport to the wilderness]
@@ -29,7 +29,7 @@ will not be scored if you use debug commands.
  *****debug.txt*29[o  Edit object attributes]               O  (unused)
  *****debug.txt*31[p  Phase door]                           P  (unused)
  *****debug.txt*33[q  Get a quest]                          Q  (unused)
- *****debug.txt*35[r  Gain reward]                          *****debug.txt*36[R  Create a trap]
+ r  (unused)                                                R  (unused)
  *****debug.txt*37[s  Summon monster]                       *****debug.txt*38[S  Change the feature of the map]
  *****debug.txt*39[t  Teleport]                             *****debug.txt*40[T  Teleport to a town]
  *****debug.txt*41[u  Complete map]                         *****debug.txt*42[U  Become undead]
@@ -53,17 +53,17 @@ will not be scored if you use debug commands.
  [  (unused)                            ^M  (unused)
  ]  (unused)                            ^N  (unused)
  *****debug.txt*67[-  Create object]                       ^O  (unused)
- *****debug.txt*69[_  The path to the god dark]            ^P  (unused)
+                                        ^P  (unused)
  *****debug.txt*71[+  Gain a fate]                         ^Q  (unused)
  *****debug.txt*73[=  Align monster]                       ^R  (unused)
  ;  (unused)                            ^S  (unused)
  :  (unused)                            ^T  (unused)
  '  (unused)                            ^U  (unused)
- *****debug.txt*75["  Create spoiler]                      ^V  (unused)
+                                        ^V  (unused)
  ,  (unused)                            ^W  (unused)
  <  (unused)                            ^X  (unused)
  .  (unused)                            ^Y  (unused)
- *****debug.txt*81[>  Lua script]                          ^Z  (unused)
+                                        ^Z  (unused)
  \  (unused)                             |  (unused)
  `  (unused)                             ~  (unused)
  *****debug.txt*91[/  Summon monster]                       *****debug.txt*92[?  Help]
@@ -85,10 +85,6 @@ maximal legal value.
 ~~~~~1
 [[[[[GAutorestore (a)]
         Restores all your stats.  This includes HP, SP, hunger, lost levels, etc.
-~~~~~2
-[[[[[GShow all stats (A)]
-        This brings up the Character status menu, where you can view
-        all the stats about your character.
 ~~~~~3
 [[[[[GTeleport to target (b)]
         You first need to have a monster targeted, then you can use
@@ -109,7 +105,7 @@ maximal legal value.
         For example : 03^AC will create the Arkenstone of Thrane (+3)
 ~~~~~7
 [[[[[GDetect all (d)]
-        Sense ways out/monsters/objects/traps.
+        Sense ways out/monsters/objects.
 ~~~~~8
 [[[[[GTeleport to the wilderness (D)]
         From a dungeon this will teleport you to the wilderness level
@@ -138,8 +134,7 @@ maximal legal value.
         Change your life rating.
 ~~~~~16
 [[[[[GHostile monster creation (H)]
-        Summons a Pack of Creatures of the same kind. Will only work
-        if MONSTER_HORDES has been defined at compile time.
+        Summons a Pack of Creatures of the same kind.
 ~~~~~17
 [[[[[GIdentify (i)]
         Like a Scroll of Identify.
@@ -184,11 +179,6 @@ maximal legal value.
 ~~~~~35
 [[[[[GGain reward (r)]
         Some high being grants you a reward.
-~~~~~36
-[[[[[GCreate a trap (R)]
-        Use the "Command count", aka 0, to specify a number from
-        tr_info.txt to put a trap on the ground where you are
-        standing.
 ~~~~~37
 [[[[[GSummon monster (s)]
         Summon a random monster, next to where you stand.
@@ -244,10 +234,6 @@ maximal legal value.
 [[[[[GCreate object (-)]
         Allows you to create a new object where you stand. You must
         specify an object number from k_info.txt.
-~~~~~69
-[[[[[GThe path to the god dark (_)]
-        Do not use this as it is used by DarkGod as a test for Lua
-        and will CRASH the game. You have been warned.
 ~~~~~71
 [[[[[GGain a fate (+)]
         Unearth more of your prophecy.
@@ -261,12 +247,6 @@ maximal legal value.
             3 monster becomes pet
             4 monster becomes companion
         You then point at an enemy and press space.
-~~~~~75
-[[[[[GCreate spoiler (")]
-        Brings up a menu that allows you to create a spoiler file.
-~~~~~81
-[[[[[GLua script (>)]
-        Allows you to run a Lua script.
 ~~~~~91
 [[[[[GSummon monster (/)]
         Summons a random monster next to you.
diff --git a/lib/help/def.aux b/lib/help/def.aux
deleted file mode 100644
index 983e9683..00000000
--- a/lib/help/def.aux
+++ /dev/null
@@ -1,3 +0,0 @@
-file_ext="html"
-link_prefix=""
-link_suffix=""
diff --git a/lib/help/defines.txt b/lib/help/defines.txt
deleted file mode 100644
index ac997501..00000000
--- a/lib/help/defines.txt
+++ /dev/null
@@ -1,639 +0,0 @@
-|||||oy
-~~~~~81|Defines
-~~~~~85|Defines|Tvals
-~~~~~82|Automatizer|Defines
-~~~~~83|Tvals
-#####R             /----------------------------------------\
-#####R            <             Tvals and svals              >
-#####R             \----------------------------------------/
-
-Some objects don't have svals as such. Spellbooks, wands, and staves for
-instance don't have svalues as they are defined in lua.
-
-TV_SKELETON      1      /* Skeletons ('s') */
-TV_BOTTLE        2      /* Empty bottles ('!') */
-*****defines.txt*04[TV_BATERIE]       4      /* For the Alchemists */
-TV_SPIKE         5      /* Spikes ('~') */
-TV_MSTAFF        6      /* Mage Staffs */
-TV_CHEST         7      /* Chests ('~') */
-TV_PARCHMENT     8      /* Parchments from Kamband */
-*****defines.txt*09[TV_CORPSE]        9      /* Monster corpses */
-TV_EGG          10      /* Monster Eggs */
-TV_JUNK         11      /* Sticks, Pottery, etc ('~') */
-*****defines.txt*12[TV_TOOL]         12      /* Tools */
-*****defines.txt*14[TV_INSTRUMENT]   14      /* Musical instruments */
-*****defines.txt*15[TV_BOOMERANG]    15      /* Boomerangs */
-*****defines.txt*16[TV_SHOT]         16      /* Ammo for slings */
-*****defines.txt*16[TV_ARROW]        17      /* Ammo for bows */
-*****defines.txt*16[TV_BOLT]         18      /* Ammo for x-bows */
-*****defines.txt*19[TV_BOW]          19      /* Slings/Bows/Xbows */
-*****defines.txt*20[TV_DIGGING]      20      /* Shovels/Picks */
-*****defines.txt*21[TV_HAFTED]       21      /* Priest Weapons */
-*****defines.txt*22[TV_POLEARM]      22      /* Pikes/Glaives/Spears/etc. */
-*****defines.txt*23[TV_SWORD]        23      /* Edged Weapons */
-*****defines.txt*24[TV_AXE]          24      /* Axes/Cleavers */
-*****defines.txt*30[TV_BOOTS]        30      /* Boots */
-*****defines.txt*31[TV_GLOVES]       31      /* Gloves */
-*****defines.txt*32[TV_HELM]         32      /* Helms */
-*****defines.txt*32[TV_CROWN]        33      /* Crowns */
-*****defines.txt*34[TV_SHIELD]       34      /* Shields */
-*****defines.txt*35[TV_CLOAK]        35      /* Cloaks */
-*****defines.txt*36[TV_SOFT_ARMOR]   36      /* Soft Armor */
-*****defines.txt*37[TV_HARD_ARMOR]   37      /* Hard Armor */
-*****defines.txt*38[TV_DRAG_ARMOR]   38      /* Dragon Scale Mail */
-*****defines.txt*39[TV_LITE]         39      /* Lites (including Specials) */
-*****defines.txt*40[TV_AMULET]       40      /* Amulets (including Specials) */
-*****defines.txt*45[TV_RING]         45      /* Rings (including Specials) */
-*****defines.txt*46[TV_TRAPKIT]      46      /* Trapkits */
-TV_TOTEM        54      /* Summoner totems */
-*****defines.txt*55[TV_STAFF]        55      /* Staffs */
-*****defines.txt*65[TV_WAND]         65      /* Wands */
-*****defines.txt*66[TV_ROD]          66      /* Rod tips */
-*****defines.txt*67[TV_ROD_MAIN]     67      /* Rod body's */
-*****defines.txt*70[TV_SCROLL]       70      /* Scrolls */
-*****defines.txt*71[TV_POTION]       71      /* potions */
-*****defines.txt*72[TV_POTION2]      72      /* Second set of potion */
-TV_FLASK        77      /* Flasks of oil */
-*****defines.txt*80[TV_FOOD]         80      /* Food, including mushrooms */
-TV_HYPNOS       99      /* To wield monsters !:) */
-TV_GOLD         100     /* Gold can only be picked up by players */
-TV_RANDART      102     /* Random Artifacts */
-TV_RUNE1        104     /* Base runes */
-TV_RUNE2        105     /* Modifier runes */
-TV_BOOK         111     /* spell books */
-*****defines.txt*115[TV_DAEMON_BOOK]  115     /* Demon blades, shields and horns */
-~~~~~84|Defines|Svals
-~~~~~12|Svals
-/* The "sval" codes for TV_TOOL */
- SV_TOOL_CLIMB 0
- SV_PORTABLE_HOLE 1
-~~~~~16
-/* The "sval" codes for TV_SHOT/TV_ARROW/TV_BOLT */
- SV_AMMO_LIGHT                    0	/* pebbles */
- SV_AMMO_NORMAL                   1	/* shots, arrows, bolts */
- SV_AMMO_HEAVY                    2	/* seeker arrows and bolts, mithril shots */
-~~~~~14
-/* The "sval" codes for TV_INSTRUMENT */
- SV_FLUTE                         1
- SV_BANJO                         2
- SV_LUTE                          3
- SV_MANDOLIN                      4
- SV_DRUM                          5
- SV_HARP                          6
- SV_HORN                          7
-~~~~~46
-/* The "sval" codes for TV_TRAPKIT */
- SV_TRAPKIT_SLING                 1
- SV_TRAPKIT_BOW                   2
- SV_TRAPKIT_XBOW                  3
- SV_TRAPKIT_POTION                4
- SV_TRAPKIT_SCROLL                5
- SV_TRAPKIT_DEVICE                6
-~~~~~15
-/* The "sval" codes for TV_BOOMERANG */
- SV_BOOM_S_WOOD                   1      /* 1d4  */
- SV_BOOM_WOOD                     2      /* 1d9  */
- SV_BOOM_S_METAL                  3      /* 1d8  */
- SV_BOOM_METAL                    4      /* 2d4  */
-~~~~~19
-/* The "sval" codes for TV_BOW (note information in "sval") */
- SV_SLING                         2	/* (x2) */
- SV_SHORT_BOW                    12	/* (x2) */
- SV_LONG_BOW                     13	/* (x3) */
- SV_LIGHT_XBOW                   23	/* (x3) */
- SV_HEAVY_XBOW                   24	/* (x4) */
-~~~~~20
-/* The "sval" codes for TV_DIGGING */
- SV_SHOVEL                        1
- SV_GNOMISH_SHOVEL                2
- SV_DWARVEN_SHOVEL                3
- SV_PICK                          4
- SV_ORCISH_PICK                   5
- SV_DWARVEN_PICK                  6
- SV_MATTOCK                       7
-~~~~~21
-/* The "sval" values for TV_HAFTED */
- SV_CLUB                          1	/* 1d4  */
- SV_WHIP                          2	/* 1d6  */
- SV_QUARTERSTAFF                  3	/* 1d9  */
- SV_NUNCHAKU                      4	/* 2d3  */
- SV_MACE                          5	/* 2d4  */
- SV_BALL_AND_CHAIN                6	/* 2d4  */
- SV_WAR_HAMMER                    8	/* 3d3  */
- SV_LUCERN_HAMMER                10	/* 2d5  */
- SV_THREE_PIECE_ROD              11	/* 3d3  */
- SV_MORNING_STAR                 12	/* 2d6  */
- SV_FLAIL                        13	/* 2d6  */
- SV_LEAD_FILLED_MACE             15	/* 3d4  */
- SV_TWO_HANDED_FLAIL             18	/* 3d6  */
- SV_GREAT_HAMMER                 19	/* 4d6  */
- SV_MACE_OF_DISRUPTION           20	/* 5d8  */
- SV_GROND                        50	/* 3d4  */
-~~~~~24
-/* The "sval" values for TV_AXE */
- SV_HATCHET                       1	/* 1d5 */
- SV_CLEAVER                       2      /* 2d4 */
- SV_LIGHT_WAR_AXE                 8      /* 2d5 */
- SV_BEAKED_AXE                   10	/* 2d6 */
- SV_BROAD_AXE                    11	/* 2d6 */
- SV_BATTLE_AXE                   22	/* 2d8 */
- SV_GREAT_AXE                    25	/* 4d4 */
- SV_LOCHABER_AXE                 28	/* 3d8 */
- SV_SLAUGHTER_AXE                30      /* 5d7 */
-~~~~~22
-/* The "sval" values for TV_POLEARM */
- SV_SPEAR                         2	/* 1d6 */
- SV_SICKLE                        3	/* 2d3 */
- SV_AWL_PIKE                      4	/* 1d8 */
- SV_TRIDENT                       5	/* 1d9 */
- SV_FAUCHARD                      6  /* 1d10 */
- SV_BROAD_SPEAR                   7	/* 1d9 */
- SV_PIKE                          8	/* 2d5 */
- SV_GLAIVE                       13	/* 2d6 */
- SV_HALBERD                      15	/* 3d4 */
- SV_GUISARME                     16  /* 2d5 */
- SV_SCYTHE                       17	/* 5d3 */
- SV_LANCE                        20	/* 2d8 */
- SV_TRIFURCATE_SPEAR             26	/* 2d9 */
- SV_HEAVY_LANCE                  29  /* 4d8 */
- SV_SCYTHE_OF_SLICING            30	/* 8d4 */
-~~~~~23
-/* The "sval" codes for TV_SWORD */
- SV_BROKEN_DAGGER                 1  /* 1d1 */
- SV_BROKEN_SWORD                  2  /* 1d2 */
- SV_DAGGER                        4  /* 1d4 */
- SV_MAIN_GAUCHE                   5  /* 1d5 */
- SV_RAPIER                        7  /* 1d6 */
- SV_SMALL_SWORD                   8  /* 1d6 */
- SV_BASILLARD                     9  /* 1d8 */
- SV_SHORT_SWORD                  10  /* 1d7 */
- SV_SABRE                        11  /* 1d7 */
- SV_CUTLASS                      12  /* 1d7 */
- SV_KHOPESH                      14  /* 2d4 */
- SV_TULWAR                       15  /* 2d4 */
- SV_BROAD_SWORD                  16  /* 2d5 */
- SV_LONG_SWORD                   17  /* 2d5 */
- SV_SCIMITAR                     18  /* 2d5 */
- SV_KATANA                       20  /* 3d4 */
- SV_BASTARD_SWORD                21  /* 3d4 */
- SV_GREAT_SCIMITAR               22  /* 4d5 */
- SV_CLAYMORE                     23  /* 2d8 */
- SV_ESPADON                      24  /* 2d9 */
- SV_TWO_HANDED_SWORD             25  /* 3d6 */
- SV_FLAMBERGE                    26  /* 3d7 */
- SV_EXECUTIONERS_SWORD           28  /* 4d5 */
- SV_ZWEIHANDER                   29  /* 4d6 */
- SV_BLADE_OF_CHAOS               30  /* 6d5 */
- SV_SHADOW_BLADE                 31  /* 4d4 */
- SV_BLUESTEEL_BLADE              32  /* 3d9 */
- SV_DARK_SWORD                   33  /* 3d7 */
-~~~~~34
-/* The "sval" codes for TV_SHIELD */
- SV_SMALL_LEATHER_SHIELD          2
- SV_SMALL_METAL_SHIELD            3
- SV_LARGE_LEATHER_SHIELD          4
- SV_LARGE_METAL_SHIELD            5
- SV_DRAGON_SHIELD                 6
- SV_SHIELD_OF_DEFLECTION         10
-~~~~~32
-/* The "sval" codes for TV_HELM */
- SV_HARD_LEATHER_CAP              2
- SV_METAL_CAP                     3
- SV_IRON_HELM                     5
- SV_STEEL_HELM                    6
- SV_DRAGON_HELM                   7
- SV_IRON_CROWN                   10
- SV_GOLDEN_CROWN                 11
- SV_JEWELED_CROWN                12
- SV_MORGOTH                      50
-~~~~~30
-/* The "sval" codes for TV_BOOTS */
- SV_PAIR_OF_SOFT_LEATHER_BOOTS    2
- SV_PAIR_OF_HARD_LEATHER_BOOTS    3
- SV_PAIR_OF_METAL_SHOD_BOOTS      6
-~~~~~35
-/* The "sval" codes for TV_CLOAK */
- SV_CLOAK                         1
- SV_ELVEN_CLOAK                   2
- SV_FUR_CLOAK                     3
- SV_SHADOW_CLOAK                  6
-~~~~~31
-/* The "sval" codes for TV_GLOVES */
- SV_SET_OF_LEATHER_GLOVES         1
- SV_SET_OF_GAUNTLETS              2
- SV_SET_OF_CESTI                  5
-~~~~~36
-/* The "sval" codes for TV_SOFT_ARMOR */
- SV_FILTHY_RAG                    1
- SV_ROBE                          2
- SV_PAPER_ARMOR                   3  /* 4 */
- SV_SOFT_LEATHER_ARMOR            4
- SV_SOFT_STUDDED_LEATHER          5
- SV_HARD_LEATHER_ARMOR            6
- SV_HARD_STUDDED_LEATHER          7
- SV_RHINO_HIDE_ARMOR              8
- SV_CORD_ARMOR                    9  /*  6 */
- SV_PADDED_ARMOR                 10  /*  4 */
- SV_LEATHER_SCALE_MAIL           11
- SV_LEATHER_JACK                 12
- SV_STONE_AND_HIDE_ARMOR         15  /* 15 */
- SV_THUNDERLORD_SUIT             16
-~~~~~37
-/* The "sval" codes for TV_HARD_ARMOR */
- SV_RUSTY_CHAIN_MAIL              1  /* 14- */
- SV_RING_MAIL                     2  /* 12  */
- SV_METAL_SCALE_MAIL              3  /* 13  */
- SV_CHAIN_MAIL                    4  /* 14  */
- SV_DOUBLE_RING_MAIL              5  /* 15  */
- SV_AUGMENTED_CHAIN_MAIL          6  /* 16  */
- SV_DOUBLE_CHAIN_MAIL             7  /* 16  */
- SV_BAR_CHAIN_MAIL                8  /* 18  */
- SV_METAL_BRIGANDINE_ARMOUR       9  /* 19  */
- SV_SPLINT_MAIL                  10  /* 19  */
- SV_PARTIAL_PLATE_ARMOUR         12  /* 22  */
- SV_METAL_LAMELLAR_ARMOUR        13  /* 23  */
- SV_FULL_PLATE_ARMOUR            15  /* 25  */
- SV_RIBBED_PLATE_ARMOUR          18  /* 28  */
- SV_MITHRIL_CHAIN_MAIL           20  /* 28+ */
- SV_MITHRIL_PLATE_MAIL           25  /* 35+ */
- SV_ADAMANTITE_PLATE_MAIL        30  /* 40+ */
-~~~~~38
-/* The "sval" codes for TV_DRAG_ARMOR */
- SV_DRAGON_BLACK                  1
- SV_DRAGON_BLUE                   2
- SV_DRAGON_WHITE                  3
- SV_DRAGON_RED                    4
- SV_DRAGON_GREEN                  5
- SV_DRAGON_MULTIHUED              6
- SV_DRAGON_SHINING               10
- SV_DRAGON_LAW                   12
- SV_DRAGON_BRONZE                14
- SV_DRAGON_GOLD                  16
- SV_DRAGON_CHAOS                 18
- SV_DRAGON_BALANCE               20
- SV_DRAGON_POWER                 30
-~~~~~39
-/* The sval codes for TV_LITE */
- SV_LITE_TORCH                    0
- SV_LITE_LANTERN                  1
- SV_LITE_TORCH_EVER               2
- SV_LITE_DWARVEN                  3
- SV_LITE_FEANORIAN                4
- SV_LITE_GALADRIEL                100
- SV_LITE_ELENDIL                  101
- SV_LITE_THRAIN                   102
- SV_LITE_UNDEATH                  103
- SV_LITE_PALANTIR                 104
- SV_ANCHOR_SPACETIME              105
- SV_STONE_LORE                    106
-~~~~~40
-/* The "sval" codes for TV_AMULET */
- SV_AMULET_DOOM                   0
- SV_AMULET_TELEPORT               1
- SV_AMULET_ADORNMENT              2
- SV_AMULET_SLOW_DIGEST            3
- SV_AMULET_RESIST_ACID            4
- SV_AMULET_SEARCHING              5
- SV_AMULET_BRILLANCE              6
- SV_AMULET_CHARISMA               7
- SV_AMULET_THE_MAGI               8
- SV_AMULET_REFLECTION             9
- SV_AMULET_CARLAMMAS             10
- SV_AMULET_INGWE                 11
- SV_AMULET_DWARVES               12
- SV_AMULET_NO_MAGIC              13
- SV_AMULET_NO_TELE               14
- SV_AMULET_RESISTANCE            15
- SV_AMULET_NOTHING               16
- SV_AMULET_SERPENT               17
- SV_AMULET_TORIS_MEJISTOS        18
- SV_AMULET_ELESSAR               19
- SV_AMULET_EVENSTAR              20
- SV_AMULET_SUSTENANCE            21
- SV_AMULET_TELEPATHY             22
- SV_AMULET_TRICKERY              23
- SV_AMULET_WEAPONMASTERY         24
- SV_AMULET_DEVOTION              25
- SV_AMULET_INFRA                 26
- SV_AMULET_SPELL                 27
- SV_AMULET_WISDOM                28
- SV_AMULET_RESIST_ELEC           29
- SV_AMULET_REGEN                 30
-~~~~~45
-/* The sval codes for TV_RING */
- SV_RING_WOE                      0
- SV_RING_AGGRAVATION              1
- SV_RING_WEAKNESS                 2
- SV_RING_STUPIDITY                3
- SV_RING_TELEPORTATION            4
- SV_RING_SPECIAL                  5
- SV_RING_SLOW_DIGESTION           6
- SV_RING_FEATHER_FALL             7
- SV_RING_RESIST_FIRE              8
- SV_RING_RESIST_COLD              9
- SV_RING_SUSTAIN_STR             10
- SV_RING_SUSTAIN_INT             11
- SV_RING_SUSTAIN_WIS             12
- SV_RING_SUSTAIN_CON             13
- SV_RING_SUSTAIN_DEX             14
- SV_RING_SUSTAIN_CHR             15
- SV_RING_PROTECTION              16
- SV_RING_ACID                    17
- SV_RING_FLAMES                  18
- SV_RING_ICE                     19
- SV_RING_RESIST_POIS             20
- SV_RING_FREE_ACTION             21
- SV_RING_SEE_INVIS               22
- SV_RING_SEARCHING               23
- SV_RING_STR                     24
- SV_RING_INT                     25
- SV_RING_DEX                     26
- SV_RING_CON                     27
- SV_RING_ACCURACY                28
- SV_RING_DAMAGE                  29
- SV_RING_SLAYING                 30
- SV_RING_SPEED                   31
- SV_RING_BARAHIR                 32
- SV_RING_TULKAS                  33
- SV_RING_NARYA                   34
- SV_RING_NENYA                   35
- SV_RING_VILYA                   36
- SV_RING_POWER                   37
- SV_RING_RES_FEAR                38
- SV_RING_RES_LD                  39
- SV_RING_RES_NETHER              40
- SV_RING_RES_NEXUS               41
- SV_RING_RES_SOUND               42
- SV_RING_RES_CONFUSION           43
- SV_RING_RES_SHARDS              44
- SV_RING_RES_DISENCHANT          45
- SV_RING_RES_CHAOS               46
- SV_RING_RES_BLINDNESS           47
- SV_RING_LORDLY                  48
- SV_RING_ATTACKS                 49
- SV_RING_NOTHING                 50
- SV_RING_PRECONITION             51
- SV_RING_FLAR                    52
- SV_RING_INVIS                   53
- SV_RING_FLYING                  54
- SV_RING_WRAITH                  55
- SV_RING_ELEC                    56
- SV_RING_DURIN                   57
- SV_RING_SPELL                   58
- SV_RING_CRIT                    59
-~~~~~55
-/* The "sval" codes for TV_STAFF */
- SV_STAFF_SCHOOL                 1
- SV_STAFF_NOTHING                2
-~~~~~65
-/* The "sval" codes for TV_WAND */
- SV_WAND_SCHOOL                  1
- SV_WAND_NOTHING                 2
-~~~~~66
-/* The "sval" codes for TV_ROD(Rod Tips) */
- SV_ROD_NOTHING                   0
- SV_ROD_DETECT_DOOR               1
- SV_ROD_IDENTIFY                  2
- SV_ROD_RECALL                    3
- SV_ROD_ILLUMINATION              4
- SV_ROD_MAPPING                   5
- SV_ROD_DETECTION                 6
- SV_ROD_PROBING                   7
- SV_ROD_CURING                    8
- SV_ROD_HEALING                   9
- SV_ROD_RESTORATION              10
- SV_ROD_SPEED                    11
- SV_ROD_TELEPORT_AWAY            13
- SV_ROD_DISARMING                14
- SV_ROD_LITE                     15
- SV_ROD_SLEEP_MONSTER            16
- SV_ROD_SLOW_MONSTER             17
- SV_ROD_DRAIN_LIFE               18
- SV_ROD_POLYMORPH                19
- SV_ROD_ACID_BOLT                20
- SV_ROD_ELEC_BOLT                21
- SV_ROD_FIRE_BOLT                22
- SV_ROD_COLD_BOLT                23
- SV_ROD_ACID_BALL                24
- SV_ROD_ELEC_BALL                25
- SV_ROD_FIRE_BALL                26
- SV_ROD_COLD_BALL                27
- SV_ROD_HAVOC                    28
- SV_ROD_DETECT_TRAP              29
- SV_ROD_HOME                     30
-~~~~~67
-/* The "sval" codes for TV_ROD_MAIN(Rods) */
- SV_ROD_WOODEN                   10
- SV_ROD_COPPER                   20
- SV_ROD_IRON                     50
- SV_ROD_ALUMINIUM                75
- SV_ROD_SILVER                   100
- SV_ROD_GOLDEN                   125
- SV_ROD_MITHRIL                  160
- SV_ROD_ADMANTITE                200
-~~~~~70
-/* The "sval" codes for TV_SCROLL */
- SV_SCROLL_DARKNESS               0
- SV_SCROLL_AGGRAVATE_MONSTER      1
- SV_SCROLL_CURSE_ARMOR            2
- SV_SCROLL_CURSE_WEAPON           3
- SV_SCROLL_SUMMON_MONSTER         4
- SV_SCROLL_SUMMON_UNDEAD          5
- SV_SCROLL_SUMMON_MINE            6
- SV_SCROLL_TRAP_CREATION          7
- SV_SCROLL_PHASE_DOOR             8
- SV_SCROLL_TELEPORT               9
- SV_SCROLL_TELEPORT_LEVEL        10
- SV_SCROLL_WORD_OF_RECALL        11
- SV_SCROLL_IDENTIFY              12
- SV_SCROLL_STAR_IDENTIFY         13
- SV_SCROLL_REMOVE_CURSE          14
- SV_SCROLL_STAR_REMOVE_CURSE     15
- SV_SCROLL_ENCHANT_ARMOR         16
- SV_SCROLL_ENCHANT_WEAPON_TO_HIT 17
- SV_SCROLL_ENCHANT_WEAPON_TO_DAM 18
- SV_SCROLL_ENCHANT_WEAPON_PVAL   19
- SV_SCROLL_STAR_ENCHANT_ARMOR    20
- SV_SCROLL_STAR_ENCHANT_WEAPON   21
- SV_SCROLL_RECHARGING            22
- SV_SCROLL_RESET_RECALL          23
- SV_SCROLL_LIGHT                 24
- SV_SCROLL_MAPPING               25
- SV_SCROLL_DETECT_GOLD           26
- SV_SCROLL_DETECT_ITEM           27
- SV_SCROLL_DETECT_TRAP           28
- SV_SCROLL_DETECT_DOOR           29
- SV_SCROLL_DETECT_INVIS          30
- SV_SCROLL_DIVINATION            31
- SV_SCROLL_SATISFY_HUNGER        32
- SV_SCROLL_BLESSING              33
- SV_SCROLL_HOLY_CHANT            34
- SV_SCROLL_HOLY_PRAYER           35
- SV_SCROLL_MONSTER_CONFUSION     36
- SV_SCROLL_PROTECTION_FROM_EVIL  37
- SV_SCROLL_RUNE_OF_PROTECTION    38
- SV_SCROLL_TRAP_DOOR_DESTRUCTION 39
- SV_SCROLL_DEINCARNATION         40
- SV_SCROLL_STAR_DESTRUCTION      41
- SV_SCROLL_DISPEL_UNDEAD         42
- SV_SCROLL_MASS_RESURECTION      43
- SV_SCROLL_GENOCIDE              44
- SV_SCROLL_MASS_GENOCIDE         45
- SV_SCROLL_ACQUIREMENT           46
- SV_SCROLL_STAR_ACQUIREMENT      47
- SV_SCROLL_FIRE                  48
- SV_SCROLL_ICE                   49
- SV_SCROLL_CHAOS                 50
- SV_SCROLL_RUMOR                 51
- SV_SCROLL_ARTIFACT              52
- SV_SCROLL_NOTHING               53
- SV_SCROLL_SPELL                 54
-~~~~~71
-/* The "sval" codes for TV_POTION */
- SV_POTION_WATER                  0
- SV_POTION_APPLE_JUICE            1
- SV_POTION_SLIME_MOLD             2
- SV_POTION_BLOOD                  3
- SV_POTION_SLOWNESS               4
- SV_POTION_SALT_WATER             5
- SV_POTION_POISON                 6
- SV_POTION_BLINDNESS              7
- SV_POTION_INVIS                  8
- SV_POTION_CONFUSION              9
- SV_POTION_MUTATION              10
- SV_POTION_SLEEP                 11
- SV_POTION_LEARNING              12
- SV_POTION_LOSE_MEMORIES         13
- SV_POTION_RUINATION             15
- SV_POTION_DEC_STR               16
- SV_POTION_DEC_INT               17
- SV_POTION_DEC_WIS               18
- SV_POTION_DEC_DEX               19
- SV_POTION_DEC_CON               20
- SV_POTION_DEC_CHR               21
- SV_POTION_DETONATIONS           22
- SV_POTION_DEATH                 23
- SV_POTION_INFRAVISION           24
- SV_POTION_DETECT_INVIS          25
- SV_POTION_SLOW_POISON           26
- SV_POTION_CURE_POISON           27
- SV_POTION_BOLDNESS              28
- SV_POTION_SPEED                 29
- SV_POTION_RESIST_HEAT           30
- SV_POTION_RESIST_COLD           31
- SV_POTION_HEROISM               32
- SV_POTION_BESERK_STRENGTH       33
- SV_POTION_CURE_LIGHT            34
- SV_POTION_CURE_SERIOUS          35
- SV_POTION_CURE_CRITICAL         36
- SV_POTION_HEALING               37
- SV_POTION_STAR_HEALING          38
- SV_POTION_LIFE                  39
- SV_POTION_RESTORE_MANA          40
- SV_POTION_RESTORE_EXP           41
- SV_POTION_RES_STR               42
- SV_POTION_RES_INT               43
- SV_POTION_RES_WIS               44
- SV_POTION_RES_DEX               45
- SV_POTION_RES_CON               46
- SV_POTION_RES_CHR               47
- SV_POTION_INC_STR               48
- SV_POTION_INC_INT               49
- SV_POTION_INC_WIS               50
- SV_POTION_INC_DEX               51
- SV_POTION_INC_CON               52
- SV_POTION_INC_CHR               53
- SV_POTION_AUGMENTATION          55
- SV_POTION_ENLIGHTENMENT         56
- SV_POTION_STAR_ENLIGHTENMENT    57
- SV_POTION_SELF_KNOWLEDGE        58
- SV_POTION_EXPERIENCE            59
- SV_POTION_RESISTANCE            60
- SV_POTION_CURING                61
- SV_POTION_INVULNERABILITY       62
- SV_POTION_NEW_LIFE              63
-~~~~~72
-/* The "sval" codes for TV_POTION2 */
- SV_POTION2_MIMIC_ABOMINATION     1
- SV_POTION2_MIMIC_WOLF            2
- SV_POTION2_MIMIC_APE             3
- SV_POTION2_MIMIC_GOAT            4
- SV_POTION2_MIMIC_INSECT          5
- SV_POTION2_MIMIC_SPARROW         6
- SV_POTION2_MIMIC_STATUE          7
- SV_POTION2_MIMIC_VAMPIRE         8
- SV_POTION2_MIMIC_SPIDER          9
- SV_POTION2_MIMIC_MANA_BALL       10
- SV_POTION2_MIMIC_FIRE_CLOUD      11
- SV_POTION2_MIMIC_COLD_CLOUD      12
- SV_POTION2_MIMIC_CHAOS_CLOUD     13
- SV_POTION2_CURE_LIGHT_SANITY     14
- SV_POTION2_CURE_SERIOUS_SANITY   15
- SV_POTION2_CURE_CRITICAL_SANITY  16
- SV_POTION2_CURE_SANITY           17
- SV_POTION2_CURE_WATER            18
-~~~~~80
-/* The "sval" codes for TV_FOOD */
- SV_FOOD_POISON                   0
- SV_FOOD_BLINDNESS                1
- SV_FOOD_PARANOIA                 2
- SV_FOOD_CONFUSION                3
- SV_FOOD_HALLUCINATION            4
- SV_FOOD_PARALYSIS                5
- SV_FOOD_WEAKNESS                 6
- SV_FOOD_SICKNESS                 7
- SV_FOOD_STUPIDITY                8
- SV_FOOD_NAIVETY                  9
- SV_FOOD_UNHEALTH                10
- SV_FOOD_DISEASE                 11
- SV_FOOD_CURE_POISON             12
- SV_FOOD_CURE_BLINDNESS          13
- SV_FOOD_CURE_PARANOIA           14
- SV_FOOD_CURE_CONFUSION          15
- SV_FOOD_CURE_SERIOUS            16
- SV_FOOD_RESTORE_STR             17
- SV_FOOD_RESTORE_CON             18
- SV_FOOD_RESTORING               19
- SV_FOOD_BISCUIT                 32
- SV_FOOD_JERKY                   33
- SV_FOOD_RATION                  35
- SV_FOOD_SLIME_MOLD              36
- SV_FOOD_WAYBREAD                37
- SV_FOOD_PINT_OF_ALE             38
- SV_FOOD_PINT_OF_WINE            39
- SV_FOOD_ATHELAS                 40
- SV_FOOD_GREAT_HEALTH            41
- SV_FOOD_FORTUNE_COOKIE          42
-~~~~~04
-/* The "sval" codes for TV_BATERIE */
- SV_BATERIE_POISON    1
- SV_BATERIE_EXPLOSION 2
- SV_BATERIE_TELEPORT  3
- SV_BATERIE_COLD      4
- SV_BATERIE_FIRE      5
- SV_BATERIE_ACID      6
- SV_BATERIE_LIFE      7
- SV_BATERIE_CONFUSION 8
- SV_BATERIE_LITE      9
- SV_BATERIE_CHAOS     10
- SV_BATERIE_TIME      11
- SV_BATERIE_MAGIC     12
- SV_BATERIE_XTRA_LIFE 13
- SV_BATERIE_DARKNESS  14
- SV_BATERIE_KNOWLEDGE 15
- SV_BATERIE_FORCE     16
- SV_BATERIE_LIGHTNING 17
- SV_BATERIE_MANA      18
- MAX_BATERIE_SVAL     18
-~~~~~09
-/* The "sval" codes for TV_CORPSE */
- SV_CORPSE_CORPSE     1
- SV_CORPSE_SKELETON   2
- SV_CORPSE_HEAD       3
- SV_CORPSE_SKULL      4
- SV_CORPSE_MEAT       5
-~~~~~115
-/* The "sval" codes for TV_DAEMON_BOOK */
- SV_DEMONBLADE  55
- SV_DEMONSHIELD 56
- SV_DEMONHORN   57
diff --git a/lib/help/dungeon.txt b/lib/help/dungeon.txt
index eca8046d..f719fabc 100644
--- a/lib/help/dungeon.txt
+++ b/lib/help/dungeon.txt
@@ -98,7 +98,7 @@ something you are more comfortable with.
   ~   Lites, Tools, Chests, etc       )   A shield
   ~   Junk, Sticks, Skeletons, etc    `   Trapping kit, climbing set
   ~   Stone, random artifact          o   Egg
-  *   An essence                      &   (unused)
+                                      &   (unused)
 
 ~~~~~05|Monsters
 #####G                             Monsters
diff --git a/lib/help/essences.txt b/lib/help/essences.txt
deleted file mode 100644
index f329fa80..00000000
--- a/lib/help/essences.txt
+++ /dev/null
@@ -1,219 +0,0 @@
-|||||oy
-~~~~~01|Spoilers|Essences
-~~~~~02|Alchemist|Essence Spoiler
-#####REssence Spoiler for ToME 2.2.0
-#####R------------------------------
-
-Essences are the tools of the trade for Alchemists, and unfortunately are
-useless for any other class. Alchemists use essences to create magical
-items for them to use.
-
-They can be either found on the floor while exploring the dungeon, or
-extracted from other magical items the alchemist finds during his
-adventures.
-
-To create an artifact, the alchemist will first have to have learnt the 
-Artifact Creation ability. This ability costs 70 skill points (yes, 70, 
-it's a very powerful ability!). And you need an alchemy skill of at least 
-40, plus INT and WIS at 35 (thats 18/170 in non-linear form).
-To create the artifact, the alchemist will have to sacrifice 10 hit points,
-and an amount of magic essence similar to his skill in alchemy. The
-alchemist then allows the artifact to gain experience, and when it has
-enough, uses that experience to add abilities to the artifact. The
-alchemist can allow the artifact to continue to gain experience, thus
-keeping open the option to add more abilities later. This requires a
-similar amount of magic essence, but does not require the sacrifice of
-more hit points.
-
-Note that the experience you gain is divided among the artifacts that you
-have as well as going to yourself, so you will gain levels more slowly when
-empowering artifacts. Also, the artifact only gets 60% of the experience.
-So killing a creature worth 20xp would gain 10 for you, and 6 for the
-artifact.
-
-You can also modify existing artifacts when you attain skill level 50. Also
-at skill level 50 you will gain the ability to make temporary artifacts,
-which don't require the complex empowerments that regular items require,
-but also vanish after awhile.
-
-You cannot give an artifact an ability unless you have *Identified* an
-artifact which has that ability.
-
-For every four levels gained in the alchemy skill, the alchemist learns
-about objects of level (skill level)/4, starting by learning about level 1
-objects at skill level 0. (actually 1, but who's counting?)
-
-At skill level 5 you gain the ability to make ego items - but watch it!
-Your base failure rate will be 90%, and won't be 0% until you reach skill
-level 50. Adding gold will increase the chances of success in direct
-proportion to the value of the item you are trying to create. Note that
-this results in automatic success when the item you are trying to create
-happens to pick up a curse in the process.
-
-At skill level 5 you also gain knowledge of some basic ego item recipes.
-These are: Acidic, Shocking, Fiery, Frozen, Venomous, and Chaotic weapons,
-Resist Fire armour, and light sources of Fearlessness.
-
-At skill level 10 you will gain knowledge of digging ego items, if you have
-selected the option "always generate very unusual rooms" (ironman_rooms).
-
-At skill level 15 you can create ego wands, staves, rings, etc.
-
-At skill level 25 you gain the ability to empower double ego items.
-
-At skill level 50 you gain the ability to create temporary artifacts, which
-don't require any exotic ingredients beyond a single corpse of any type.
-
-Between skill levels 25 and 50, you will steadily gain the ability to set
-more and more flags.
-
-To finalise an artifact, you "P"ower it, and select the powers you want.
-Powers are divided into the following six categories:
-*****essences.txt*03[Stats, Sustains, Luck, Speed, Vision, etc.]
-*****essences.txt*04[Misc. (Auras, Light, See Invisibility, etc.)]
-*****essences.txt*05[Weapon Brands]
-*****essences.txt*06[Resistances and Immunities]
-*****essences.txt*07[ESP and Curses]
-*****essences.txt*08[Artifact Activations]
-
-~~~~~03
-#####GStats, Sustains, Luck, Speed, Vision, etc.
-lvl     xp   Power
-40     5000  Add to Strength          Ring of Strength
-43     5000  Add to Intelligence      Ring of Intelligence
-46     5000  Add to Wisdom            Amulet of Wisdom
-46     5000  Add to Dexterity         Ring of Dexterity
-42     5000  Add to Constitution      Ring of Constitution
-30     5000  Add to Charisma          Amulet of Adornment
-32     1000  Sustain Strength         Ring of Sustain Strength
-34     1000  Sustain Intelligence     Ring of Sustain Intelligence
-28     1000  Sustain Wisdom           Ring of Sustain Wisdom
-36     1000  Sustain Dexterity        Ring of Sustain Dexterity
-36     1000  Sustain Constitution     Ring of Sustain Constitution
-25     1000  Sustain Charisma         Ring of Sustain Charisma
-40    50000  Speed                    Ring of Speed
-38   150000  Extra Attacks            Ring of Extra Attacks
-32     5000  Stealthy                 Left Insole from a Used Soft Boot
-29     2000  Adds to Searching        Filthy Rag
- 6     1000  Helps Infravision        Brass Lantern
-30     1000  Lucky                    Rabbit's Left Forefoot
-25    30000  Aids in digging          Pick
-40    50000  Multiplies Life          Troll's Heart
-
-~~~~~04
-#####GMisc. (Auras, Light, See Invisibility, etc.)
-lvl     xp   Power
-20    15000  Invisibility             Potion of Invisibility
-20     4000  See Invisible            Potion of Invisibility
-20    30000  Free Action              Iron Spike
-38    90000  Reflection               Large Metal Shield
-20    30000  Aura of Fire             Lungs from an Ancient Red Dragon
-25    30000  Aura of Lightning        Lungs from an Ancient Blue Dragon
- 8     1000  Light                    Everburning Torch
-20    10000  Bright Light             Dwarven Lantern
-40   100000  Sunlight                 Feanorian Lamp
-40   200000  Flight                   Suit of Dragon Armour (any colour)
-50 10000000  Automatically IDs        Morgoth's Testicles
-29     2000  Anti-Teleportation       Teleport Inhibiting Amulet
-34     2000  Anti-Magic               Magic Inhibiting Amulet
-50   100000  Wraith Form              Potion of Invulnerability
-15     1000  Levitation               Potion of Berserk Strength
-20    10000  Slow Digestion           Lembas Wafer
-32    20000  Regenerate               Mushroom of Unhealth
-12    20000  Teleport                 Mushroom of Confusion
-
-~~~~~05
-#####GWeapon Brands
-lvl     xp   Power
-30    20000  Extra Critical Hits      Whip
-30    30000  Wounds Monsters          Blade of Chaos
-26     6000  Vampiric                 Rod Tip of Drain Life
-16     2000  Slay Animal              Dead Animal's Body
-25     2000  Slay Evil                Evil Dead Thing's Remains
-30     2000  Slay Undead              Remains of Undead Monster
-40     1500  Slay Demon               Demon's Corpse
-10      700  Slay Orc                 Dead Orc
-16      700  Slay Troll               Dead Troll
-25      900  Slay Giant               Dead Giant
-33     2000  Slay Dragon              Dead Dragon (any size will do)
-41     5000  *Slay* Dragon            Mature Multi-Hued Dragon's Remains
-41    90000  *Slay* Undead            Dead Summoner of Greater Undead
-41    90000  *Slay* Demon             Lesser Balrog's Corpse
-36    20000  Vorpal                   
-40    90000  Earthquakes              
- 3     2000  Poison Brand             
-12     2000  Acid Brand               
-10     2000  Lightning Brand          
- 6     2000  Fire Brand               
- 8     2000  Frost Brand              
-30     3000  Extra Might (Bows Only)  
-35     3000  Extra Shots (Bows Only)  
-
-~~~~~06
-#####GResistances and Immunities
-lvl     xp   Power
-49   500000  Immune to Acid           Ancient Black Dragon's Foreskin
-50   500000  Immune to Lightning      Ancient Blue Dragon's Foreskin
-49   500000  Immune to Fire           Ancient Red Dragon's Foreskin
-50   500000  Immune to Cold           Ancient White Dragon's Foreskin
-30    30000  Hold Life                Amulet of the Magi
-12    10000  Resist Acid              Ring of Acid
-15    10000  Resist Lightning         Ring of Lightning
-13    10000  Resist Fire              Potion of Resist Heat
-14    10000  Resist Cold              Potion of Resist Cold
-25    30000  Resist Poison            Potion of Cure Poison
-26    10000  Resist Fear              Ring of Fear Resistance
-31    60000  Resist Light             Ring of Light and Darkness Resistance
-31    60000  Resist Darkness          Ring of Light and Darkness Resistance
-30    30000  Resist Blindness         Ring of Blindness Resistance
-30    30000  Resist Confusion         Ring of Confusion Resistance
-30    60000  Resist Sound             Ring of Sound Resistance
-30    60000  Resist Shards            Ring of Shard Resistance
-30    60000  Resist Nether            Ring of Nether Resistance
-30    60000  Resist Nexus             Ring of Nexus Resistance
-30    60000  Resist Chaos             Ring of Chaos Resistance
-30    60000  Resist Disenchantment    Ring of Disenchantment Resistance
-
-~~~~~07
-#####GESP and Curses
-lvl     xp   Power
-50  -100000  Temporary Item           Corpse, any corpse
-10    -2000  Self-Cursing             Filthy Rag
-45   -10000  Causes the Black Breath  Sprig of Athelas
-40    -5000  Ancient Curse            Scroll of *Remove Curse*
-40    -5000  Drains your Experience   
-30    -5000  Aggravates Monsters      
-30     -500  Curse                    Scroll of Remove Curse
-50    -5000  Permanently Cursed       
-35    -2000  Can't be Dropped         
-45    -5000  Drains your Hit Points   
-20   -50000  Wielder Can't Move       
-40    20000  Telepathy                Formerly Floating Eye
-25     3000  Sense Orcs               
-25     3000  Sense Trolls             
-25     5000  Sense Dragons            
-25     5000  Sense Giants             
-25     5000  Sense Demons             
-25     5000  Sense Undead             
-25     5000  Sense Evil               
-25     5000  Sense Animals            
-25     5000  Sense Thunderlords       
-25     5000  Sense Good               
-25     5000  Sense Nonliving          
-25     5000  Sense Unique Monsters    
-25     2000  Sense Spiders            
-
-~~~~~08
-#####GArtifact Activations
-lvl     xp   Power
-40    40000  Sunlight                 Brass Lantern
-20     4000  Magic Missile (1)        
-30   300000  Magic Missile (2)        
-40   400000  Ball of Missiles         
-30   300000  Bolt of Lightning        
-30   300000  Ball of Lightning        
-35   350000  Ball of Lightning(2)     
-40   400000  Ball of Lightning(3)     
-40   400000  Ball of Lightning(4)     
-45   450000  Breath Lightning         
-50    40000  Fire a Rocket
diff --git a/lib/help/index.txt b/lib/help/index.txt
index d306b688..a22e26d5 100644
--- a/lib/help/index.txt
+++ b/lib/help/index.txt
@@ -27,7 +27,6 @@ Don't forget you can browse the help from the *****help.hlp*02[Main menu].
     *****birth.txt*26[SP]
   *****ability.txt*01[Abilities]
     *****ability.txt*07[Ammo creation]
-    *****ability.txt*09[Artifact Creation]
     *****ability.txt*05[Extra Max Blow 1]
     *****ability.txt*06[Extra Max Blow 2]
     *****ability.txt*10[Far reaching attack]
@@ -38,9 +37,6 @@ Don't forget you can browse the help from the *****help.hlp*02[Main menu].
     *****ability.txt*03[Tree walking]
     *****ability.txt*12[Undead Form]
   *****m_air.txt*02[Air Magic]
-  *****c_alchem.txt*01[Alchemist]
-    *****c_alchem.txt*03[Alchemy powers explained]
-    *****essences.txt*02[Essence Spoiler]
   *****tome_faq.txt*03[Altars]
   *****tome_faq.txt*37[Anti-magic Amulets and the Anti-magic shell]
   *****c_unbel.txt*04[Antimagic]
@@ -58,7 +54,6 @@ Don't forget you can browse the help from the *****help.hlp*02[Main menu].
   *****automat.txt*03[Auto destroy]
   *****automat.txt*02[Auto pick-up]
   *****automat.txt*01[Automatizer]
-    *****defines.txt*82[Defines]
   *****automat.txt*04[Autosquelch]
   *****c_axemas.txt*01[Axemaster]
 ~~~~~66
@@ -88,7 +83,6 @@ Don't forget you can browse the help from the *****help.hlp*02[Main menu].
   *****tome_faq.txt*34[Character choice is too confusing]
   *****birth.txt*45[Charisma]
   *****birth.txt*05[Classes]
-    *****c_alchem.txt*02[Alchemist]
     *****c_archer.txt*02[Archer]
     *****c_assass.txt*02[Assassin]
     *****c_axemas.txt*02[Axemaster]
@@ -112,7 +106,6 @@ Don't forget you can browse the help from the *****help.hlp*02[Main menu].
     *****c_pr_man.txt*02[Priest - Manwe]
     *****c_ranger.txt*02[Ranger]
     *****c_rogue.txt*02[Rogue]
-    *****c_runecr.txt*02[Runecrafter]
     *****c_sorcer.txt*02[Sorceror]
     *****birth.txt*77[Stat Bonuses]
     *****c_summon.txt*02[Summoners]
@@ -165,9 +158,6 @@ Don't forget you can browse the help from the *****help.hlp*02[Main menu].
     *****debug.txt*100[Command List]
     *****debug.txt*111[Command descriptions ]
     *****debug.txt*112[General]
-  *****defines.txt*81[Defines]
-    *****defines.txt*84[Svals]
-    *****defines.txt*85[Tvals]
   *****c_demono.txt*01[Demonologist]
   *****m_demono.txt*02[Demonology Magic]
   *****version.txt*01[Development history]
@@ -192,7 +182,6 @@ Don't forget you can browse the help from the *****help.hlp*02[Main menu].
   *****g_eru.txt*02[Eru]
     *****g_eru.txt*03[Prayers]
     *****c_pr_eru.txt*03[Priest - Eru]
-  *****tome_faq.txt*10[Essences]
   *****experien.hlp*01[Experience]
   *****explore.hlp*02[Exploring menu]
 ~~~~~70
@@ -409,8 +398,6 @@ Don't forget you can browse the help from the *****help.hlp*02[Main menu].
   *****c_ranger.txt*01[Ranger]
   *****c_rogue.txt*01[Rogue]
   *****r_rohank.txt*01[RohanKnight]
-  *****c_runecr.txt*01[Runecrafter]
-    *****c_runecr.txt*03[Runecrafter powers]
   *****tome_faq.txt*11[Runes]
 ~~~~~83
 *****/Sindex.txt*83[S]
@@ -424,8 +411,6 @@ Don't forget you can browse the help from the *****help.hlp*02[Main menu].
   *****skills.txt*55[Skills]
     *****skills.txt*27[Air]
     *****m_air.txt*03[Air - Spell Info]
-    *****skills.txt*49[Alchemy]
-    *****c_alchem.txt*05[Alchemy - Alchemy powers]
     *****skills.txt*50[Antimagic]
     *****c_unbel.txt*05[Antimagic powers]
     *****skills.txt*08[Archery]
@@ -479,8 +464,6 @@ Don't forget you can browse the help from the *****help.hlp*02[Main menu].
     *****skills.txt*45[Possession]
     *****c_posses.txt*04[Possession - Possessor powers ]
     *****skills.txt*39[Prayer]
-    *****skills.txt*36[Runecraft]
-    *****c_runecr.txt*04[Runecrafting - Runecrafter powers]
     *****skills.txt*56[Screen]
     *****skills.txt*09[Sling-mastery]
     *****skills.txt*14[Sneakiness]
@@ -509,7 +492,6 @@ Don't forget you can browse the help from the *****help.hlp*02[Main menu].
   *****spoiler.hlp*01[Spoilers]
     *****corspoil.txt*02[Corruptions]
     *****dunspoil.txt*02[Dungeons]
-    *****essences.txt*01[Essences]
     *****fatespoi.txt*01[Fates]
     *****inscrip.txt*02[Floor Inscriptions]
     *****spoil_faq.txt*20[God Quest - directions]
@@ -535,7 +517,6 @@ Don't forget you can browse the help from the *****help.hlp*02[Main menu].
   *****birth.txt*34[Strength]
   *****c_summon.txt*01[Summoners]
     *****c_summon.txt*03[Summoning]
-  *****defines.txt*12[Svals]
   *****c_swordm.txt*01[Swordmasters]
   *****c_symbia.txt*01[Symbiant]
     *****c_symbia.txt*03[Naming your symbiote]
@@ -558,7 +539,6 @@ Don't forget you can browse the help from the *****help.hlp*02[Main menu].
   *****g_tulkas.txt*01[Tulkas]
     *****c_palad.txt*03[Paladin]
     *****g_tulkas.txt*03[Prayers]
-  *****defines.txt*83[Tvals]
 ~~~~~85
 *****/Uindex.txt*85[U]
   *****m_udun.txt*02[Udun Magic]
diff --git a/lib/help/lua.hlp b/lib/help/lua.hlp
deleted file mode 100644
index ba61676a..00000000
--- a/lib/help/lua.hlp
+++ /dev/null
@@ -1,34 +0,0 @@
-|||||oy
-~~~~~01|Help|Lua scripting for ToME
-#####R     Welcome to the ToME Lua Help System.
-#####R=============================================
-
-Please choose one of the following help files:
-
-     *****/alua_intr.txt*0[(a) An Introduction to scripting]
-     *****/blua_pow.txt*0[(b) Adding a racial power (the 'U' menu)]
-     *****/clua_skil.txt*0[(c) Adding new skills (the 'm' menu)]
-     *****/dlua_ques.txt*0[(d) Adding a quest]
-
-     
-     *****/elua_mon.txt*0[(e) Useful functions in monster.pkg]
-     *****/flua_play.txt*0[(f) Useful functions in player.pkg]
-     *****/glua_spel.txt*0[(g) Useful functions in spell.pkg]
-     *****/hlua_util.txt*0[(h) Useful functions in util.pkg]
-
-     *****/ilua_gf.txt*0[(g) A list of GF_FOO flags]
-
-
-     *****/zhelp.hlp*0[(z) Main Help menu]
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/help/lua_gf.txt b/lib/help/lua_gf.txt
deleted file mode 100644
index 000f4af5..00000000
--- a/lib/help/lua_gf.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-|||||oy
-#####R /--------------------------\
-#####R< A partial list of GF_FLAGS >
-#####R \--------------------------/
-
-GF_ARROW:       arrows 
-GF_MISSILE:     magic missiles
-GF_MANA:        mana
-GF_LITE_WEAK:   light
-GF_DARK_WEAK:   dark
-GF_WATER:       water
-GF_PLASMA:      plasma
-GF_METEOR:      meteors
-GF_ICE:         ice
-GF_GRAVITY:     gravity
-GF_INERTIA:     inertia
-GF_FORCE:       force
-GF_TIME:        pure time
-GF_ACID:        acid
-GF_ELEC:        lightning
-GF_FIRE:        flames
-GF_COLD:        cold
-GF_POIS:        poison
-GF_LITE:        pure light
-GF_DARK:        pure dark
-GF_CONFUSION:   confusion
-GF_SOUND:       sound
-GF_SHARDS:      shards
-GF_NEXUS:       nexus
-GF_NETHER:      nether
-GF_CHAOS:       chaos
-GF_DISENCHANT:  disenchantment
-GF_KILL_WALL:   wall destruction
-GF_KILL_DOOR:   door destruction
-GF_KILL_TRAP:   trap destruction
-GF_STONE_WALL:  wall creation
-GF_MAKE_DOOR:   door creation
-GF_MAKE_TRAP:   trap creation
-GF_DESTRUCTION: destruction
-
-Back to the *****lua.hlp*0[lua help index] .
-
-                             [[[[[gThis file by fearoffours (fearoffours@moppy.co.uk)]
-
-
diff --git a/lib/help/lua_intr.txt b/lib/help/lua_intr.txt
deleted file mode 100644
index ccb87067..00000000
--- a/lib/help/lua_intr.txt
+++ /dev/null
@@ -1,133 +0,0 @@
-|||||oy
-#####R             /----------------------------------------\
-#####R            <        Scripting for ToME with lua       >
-#####R             \----------------------------------------/
-
-So, you want to patch ToME eh? Maybe you've had a look at how the edit files 
-work, maybe even added your own race/class, but want to go further and add 
-new racial (U) or magic (m) powers. Well these help files will show a little 
-bit of how to do that.
-
-I am not a master at this kind of thing. I wrote a small script, with much 
-help from DarkGod, and he subsequently asked me to write these help files. I 
-was looking forward to when the lua help files came out so that I could look 
-at them myself. Little did I know I'd be asked to write them. Therefore I 
-apologise for any inaccuracies or errors that you find, and if you care to let 
-me know of any improvements which could be made (especially if you're an 
-experienced programmer/scripter), I'd love to know. Email me at
-[[[[[gfearoffours@moppy.co.uk].
-
-#####R=== The example scripts ===
-
-These help files take the form of a tutorial, adding a line at a time to a 
-script, and explaining important concepts along the way. To see it all in 
-action, I strongly suggest that you download my example script pack from
-[[[[[Ghttp://www.moppy.co.uk/angband.htm]. As well as including all the 
-scripts covered in these help files, they also include the addition of my
-"hina" race which has a Lua scripted racial power which you might like to look 
-at. There's also a quest which I will be including documentation for as a 
-tutorial soon. Plus there's all the other lua scripts in the lib\scpt 
-directory to look at. Most of what you see in these files has been learned from 
-those files anyway!
-
-The source code is invaluable as well. There's a searchable and browsable 
-version of the latest ToME source code available online at 
-[[[[[Ghttp://www.t-o-m-e.net/cvs.php]. Use it!
-
-If you don't want to download and install the example scripts, then just 
-follow the tutorials with a text editor open! But I'll say it again, it's a lot 
-easier if you download and install the example scripts.
-
-This file goes on to explain the concepts of scripting, programming, 
-variables and functions. If you're familiar with these concepts, you might 
-as well take a look at how to add a power to the U menu in the 
-*****lua_pow.txt*0[Scripting a racial power] file.
-
-
-#####R=== Defining some basic stuff ===
-
-Computers don't do anything that they're not told to do. When we script, or 
-program, we must assume they know nothing. We have to tell them each little 
-bit of information from the ground up.
-
-A program, or a script (we'll talk about exact differences later) is like a 
-set of instructions. Let's imagine that people responded to programs, and 
-that we had a program called "Housework". Its series of instructions might 
-look something like this:
-
-#####BDo the Washing up.
-#####BClean the kitchen.
-#####BDust the shelves.
-#####BHoover the lounge.
-
-Each step above could be called a function, as they are all actions that 
-need to be carried out. Now to you and me, we'd understand that program just 
-fine, but if someone didn't know HOW to wash, or what hoovering was, they'd 
-soon run into problems. For those people we'd need to define each function 
-clearly. Thus "do the washing up" might be - 
-
-#####BRun hot water into bowl.
-#####BAdd washing up liquid.
-#####BPut dirty plates into bowl
-#####BScrub plates till clean
-#####BPlace clean plates on rack to dry,
-
-There's still plenty of problems here though. We've not said to turn the tap
-off, or what the bowl is, or to wash any dirty cutlery, mugs, saucepans, etc.,
-etc. Whilst this might seem fairly obvious to a person, this is how we need
-to think when writing programs for computers.
-
-Lets look now at some of the terms we're going to be using, in the rest of 
-these help files, and what they mean...
-
-#####R=== Variables and Constants ===
-A variable is a way to store information in a computer.  Just as you store 
-things in your own memory, you can store things in the computer's memory. And 
-just as things change in your memory, so things can change in the computer's 
-memory. This factor of change is why they're called "variables" and not 
-"statics".
-
-For instance, you may have a friend's email address committed to memory, but 
-things change over time, they get a new ISP or domain, and so their email 
-address changes. You commit this new address to memory, and eventually 
-forget the old one. The thing you have stored in your memory is the same 
-(your friend's address) but the value (property) of what you have stored has 
-changed (from friend@old-address.com to friend@new-address.com). 
-
-Variables are the building blocks out of which you will create your patch.
-
-A variable which will *never* change its value is called a constant.
-
-#####R===Functions===
-
-A function is a series of steps or statements, grouped together and given 
-one name. When you want to carry out those steps, you simply ask the 
-computer to carry out that function. To go back to our original example, 
-rather than saying, "I'd like you to run some hot water into a bowl, add the 
-washing up liquid, put the dirty plates into it, and then scrub them till 
-they're clean", we just say "do the washing up".
-
-This is where we come to the difference between scripting and programming. 
-With scripting we can use the functions and variables that exist in the 
-ToME code. Maintainers like DarkGod have already made sure that the 
-computer knows how to "do the washing up", including turning the tap off and 
-what the bowl is. All we need to do in our script is say "do the washing 
-up". Or to look at it in a more relevant way, the game has been coded so 
-that when a magic missile is fired, a bolt or beam spell with a black line 
-of asterisks will be drawn in the direction indicated by the player, the 
-mana of that spell will be used up, the monster will take the appropriate 
-amount of damage, and so on. All we need to do in our script is say "fire a 
-magic missile".
-
-As you script, you will still be designing your own functions, and 
-variables, but the hardest parts have been done for you!
-
-Not every function and global variable in the source-code has been exported to 
-use in your scripting. But the ones that have are easily identifiable by 
-looking in any source files with the extension .pkg . Chris Hadgis has written 
-some excellent documentation which outline the use of the most important 
-functions in some of these files. They outline the functions from the 
-
-OK, the first tutorial proper is on *****lua_pow.txt*0[adding a racial power] .
-
-                             [[[[[gThis file by fearoffours (fearoffours@moppy.co.uk)]
diff --git a/lib/help/lua_mon.txt b/lib/help/lua_mon.txt
deleted file mode 100644
index 9bb363c0..00000000
--- a/lib/help/lua_mon.txt
+++ /dev/null
@@ -1,535 +0,0 @@
-|||||oy
-
-#####R             /----------------------------------------\
-#####R            <    monster.pkg functions helper file     >
-#####R             \----------------------------------------/
-
-
-----------------------------------------------------------------------
-
-#####R=== race_info_idx ===
-
-#####GDeclaration
-    extern monster_race* race_info_idx(int r_idx, int ego);
-
-#####GFile
-    monster2.c
-
-#####GComment
-/*
- * Return a (monster_race*) with the combinations of the monster
- * properties and the ego type
- */
-
-#####GDescription
-Get monster info and ego info for monster with monster index "r_idx"
-and monster ego "ego". The ego information is applied to the monster
-information and the new monster information is returned.
-
-For example, race_info_idx(141,7) will create a brown yeek (monster)
-shaman (ego).
-
-#####GParameters
-> "r_idx" is an entry from the "r_info.txt" file. Beware: there is no
-  range checking.
-> "ego" is an entry from the "re_info.txt". Beware: there is no range
-  checking.
-
-----------------------------------------------------------------------
-
-#####R=== delete_monster_idx ===
-
-#####GDeclaration
-    extern void delete_monster_idx(int i);
-
-#####GFile
-    monster2.c
-
-#####GComment
-/*
- * Delete a monster by index.
- *
- * When a monster is deleted, all of its objects are deleted.
- */
-
-#####GDescription
-Delete monster "i" from the monster array.
-
-#####GParameters
-> "i" is the index for the monster list (m_list[]). Beware: there is
-  no range checking.
-
-----------------------------------------------------------------------
-
-#####R=== m_pop ===
-
-#####GDeclaration
-    extern s16b m_pop(void);
-
-#####GFile
-    monsters2.c
-
-#####GComment
-/*
- * Acquires and returns the index of a "free" monster.
- *
- * This routine should almost never fail, but it *can* happen.
- */
-
-#####GDescription
-Get an empty slot in the monster list (m_list[]). If there are no
-empty slots, a slot will be reclaimed from a "dead" monster. If all
-slots are full, 0 is returned, which means the function has failed
-("Too many monsters!").
-
-----------------------------------------------------------------------
-
-#####R=== get_mon_num_prep ===
-
-#####GDeclaration
-    extern errr get_mon_num_prep(void);
-
-#####GFile
-    monster2.c
-
-#####GComment
-/*
- * Apply a "monster restriction function" to the "monster allocation table"
- */
-
-#####GDescription
-There are no parameters, but there are some other variables which will
-need to be set. They are get_mon_num_hook and get_mon_num2_hook. They
-are pointers to functions.
-
-For example, get_mon_num_hook = monster_volcano means when
-get_mon_num_hook is called (*get_mon_num_hook)(index), the actual
-function called is monster_volcano(index). This particular function
-returns TRUE if the monster indicated by "index" has the
-RF8_WILD_VOLCANO flag set.
-
-It is a good idea to store the old value of get_mon_num_hook before
-setting a new one, and restoring it when your function is finished.
-
-Following is a list of functions which can be assigned to
-get_mon_num_hook:
-
-create_molds_hook
-create_townpeople_hook
-mon_hook_bounty
-monster_dungeon
-monster_grass
-monster_mountain
-monster_ocean
-monster_quest
-monster_shore
-monster_town
-monster_volcano
-monster_waste
-monster_wood
-mutate_monster_okay
-place_monster_okay
-summon_specific_okay
-vault_aux_animal
-vault_aux_chapel
-vault_aux_clone
-vault_aux_demon
-vault_aux_dragon
-vault_aux_giant
-vault_aux_jelly
-vault_aux_kennel
-vault_aux_orc
-vault_aux_symbol
-vault_aux_treasure
-vault_aux_troll
-vault_aux_undead
-
-Or you can write your own. The function must take an integer (index)
-as a parameter and return boolean (TRUE if the monster is selected,
-or FALSE if it is not).
-
-----------------------------------------------------------------------
-
-#####R=== get_mon_num ===
-
-#####GDeclaration
-    extern s16b get_mon_num(int level);
-
-#####GFile
-    monster2.c
-
-#####GComment
-/*
- * Choose a monster race that seems "appropriate" to the given level
- *
- * This function uses the "prob2" field of the "monster allocation table",
- * and various local information, to calculate the "prob3" field of the
- * same table, which is then used to choose an "appropriate" monster, in
- * a relatively efficient manner.
- *
- * Note that "town" monsters will *only* be created in the town, and
- * "normal" monsters will *never* be created in the town, unless the
- * "level" is "modified", for example, by polymorph or summoning.
- *
- * There is a small chance (1/50) of "boosting" the given depth by
- * a small amount (up to four levels), except in the town.
- *
- * It is (slightly) more likely to acquire a monster of the given level
- * than one of a lower level.  This is done by choosing several monsters
- * appropriate to the given level and keeping the "hardest" one.
- *
- * Note that if no monsters are "appropriate", then this function will
- * fail, and return zero, but this should *almost* never happen.
- */
-
-Description:
-For the given level "level", return the index of an appropriate
-monster race.
-
-#####GParameters
-> "level" is a dungeon level
-
-----------------------------------------------------------------------
-
-#####R=== monster_desc ===
-
-#####GDeclaration
-    extern void monster_desc(char *desc, monster_type *m_ptr,
-    int mode);
-
-#####GFile
-    monster2.c
-
-#####GComment
-/*
- * Build a string describing a monster in some way.
- *
- * We can correctly describe monsters based on their visibility.
- * We can force all monsters to be treated as visible or invisible.
- * We can build nominatives, objectives, possessives, or reflexives.
- * We can selectively pronominalize hidden, visible, or all monsters.
- * We can use definite or indefinite descriptions for hidden monsters.
- * We can use definite or indefinite descriptions for visible monsters.
- *
- * Pronominalization involves the gender whenever possible and allowed,
- * so that by cleverly requesting pronominalization / visibility, you
- * can get messages like "You hit someone.  She screams in agony!".
- *
- * Reflexives are acquired by requesting Objective plus Possessive.
- *
- * If no m_ptr arg is given (?), the monster is assumed to be hidden,
- * unless the "Assume Visible" mode is requested.
- *
- * If no r_ptr arg is given, it is extracted from m_ptr and r_info
- * If neither m_ptr nor r_ptr is given, the monster is assumed to
- * be neuter, singular, and hidden (unless "Assume Visible" is set),
- * in which case you may be in trouble... :-)
- *
- * I am assuming that no monster name is more than 70 characters long,
- * so that "char desc[80];" is sufficiently large for any result.
- *
- * Mode Flags:
- *   0x01 --> Objective (or Reflexive)
- *   0x02 --> Possessive (or Reflexive)
- *   0x04 --> Use indefinites for hidden monsters ("something")
- *   0x08 --> Use indefinites for visible monsters ("a kobold")
- *   0x10 --> Pronominalize hidden monsters
- *   0x20 --> Pronominalize visible monsters
- *   0x40 --> Assume the monster is hidden
- *   0x80 --> Assume the monster is visible
- *
- * Useful Modes:
- *   0x00 --> Full nominative name ("the kobold") or "it"
- *   0x04 --> Full nominative name ("the kobold") or "something"
- *   0x80 --> Genocide resistance name ("the kobold")
- *   0x88 --> Killing name ("a kobold")
- *   0x22 --> Possessive, genderized if visible ("his") or "its"
- *   0x23 --> Reflexive, genderized if visible ("himself") or "itself"
- */
-
-#####GDescription
-Return a monster description "desc" for monster "monster_type" using
-flag "mode". The modes are described above.
-
-#####GParameters
-> "desc" is the returned description.
-> "monster type" is the monster (monster pointer).
-> "mode" is one of the modes described in the comments.
-
-----------------------------------------------------------------------
-
-#####R=== monster_race_desc ===
-
-#####GDeclaration
-    extern void monster_race_desc(char *desc, int r_idx,
-    int ego);
-
-#####GFile
-    monster2.c
-
-#####GComment
-(none)
-
-#####GDescription
-Return the monster description "desc" for monster with monster index
-"r_idx" and monster ego "ego". The monster description is made up of
-the ego name (if any) and monster name, or the unique name.
-
-#####GParameters
-> "desc" is the returned description.
-> "r_idx" is an entry from the "r_info.txt" file. Beware: there is no
-  range checking.
-> "ego" is an entry from the "re_info.txt". Beware: there is no range
-  checking.
-
-----------------------------------------------------------------------
-
-#####R=== place_monster_aux ===
-
-#####GDeclaration
-    extern bool place_monster_aux(int y, int x, int r_idx,
-    bool slp, bool grp, int status);
-
-#####GFile
-    monster2.c
-
-#####GComment
-/*
- * Attempt to place a monster of the given race at the given location
- *
- * Note that certain monsters are now marked as requiring "friends".
- * These monsters, if successfully placed, and if the "grp" parameter
- * is TRUE, will be surrounded by a "group" of identical monsters.
- *
- * Note that certain monsters are now marked as requiring an "escort",
- * which is a collection of monsters with similar "race" but lower
- * level.
- *
- * Some monsters induce a fake "group" flag on their escorts.
- *
- * Note the "bizarre" use of non-recursion to prevent annoying output
- * when running a code profiler.
- *
- * Note the use of the new "monster allocation table" code to restrict
- * the "get_mon_num()" function to "legal" escort types.
- */
-
-#####GDescription
-Attempt to place a monster at grid "y", "x". The monster has monster
-index "m_idx". The monster may be asleep ("slp"). The monster may be
-surrounded by a group of identical monsters ("grp"). The monster has
-a status of "status" (see below). The function returns TRUE if the
-monster is placed successfully, otherwise FALSE.
-
-#####GParameters
-> "y" is the y co-ordinate of the target grid.
-> "x" is the x co-ordinate of the target grid.
-> "r_idx" is an entry from the "r_info.txt" file. Beware: there is no
-  range checking.
-> "slp" is TRUE if the monster is asleep, otherwise FALSE.
-> "grp" is TRUE if the monster is surrounded by a group, otherwise
-  FALSE.
-> "status" is the status of the monster
-  *****fields.txt*0[status]
-
-----------------------------------------------------------------------
-
-#####R=== place_monster ===
-
-#####GDeclaration
-    extern bool place_monster(int y, int x, bool slp,
-    bool grp);
-
-#####GFile
-    monster2.c
-
-#####GComment
-/*
- * Hack -- attempt to place a monster at the given location
- *
- * Attempt to find a monster appropriate to the "monster_level"
- */
-
-#####GDescription
-Attempt to place a monster at grid "y", "x". The monster may be asleep
-("slp"). The monster may be surrounded by a group of identical
-monsters ("grp"). The monster is of the appropriate monster level. The
-function returns TRUE if the monster is placed successfully, otherwise
-FALSE.
-
-#####GParameters
-> "y" is the y co-ordinate of the target grid.
-> "x" is the x co-ordinate of the target grid.
-> "slp" is TRUE if the monster is asleep, otherwise FALSE.
-> "grp" is TRUE if the monster is surrounded by a group, otherwise
-  FALSE.
-
-----------------------------------------------------------------------
-
-#####R=== place_monster_one ===
-
-#####GDeclaration
-    extern s16b place_monster_one(int y, int x, int r_idx,
-    int ego, bool slp, int status);
-
-#####GFile
-    monster2.c
-
-#####GComment
-/*
- * Attempt to place a monster of the given race at the given location.
- *
- * To give the player a sporting chance, any monster that appears in
- * line-of-sight and is extremely dangerous can be marked as
- * "FORCE_SLEEP", which will cause them to be placed with low energy,
- * which often (but not always) lets the player move before they do.
- *
- * This routine refuses to place out-of-depth "FORCE_DEPTH" monsters.
- *
- * XXX XXX XXX Use special "here" and "dead" flags for unique monsters,
- * remove old "cur_num" and "max_num" fields.
- *
- * XXX XXX XXX Actually, do something similar for artifacts, to simplify
- * the "preserve" mode, and to make the "what artifacts" flag more useful.
- *
- * This is the only function which may place a monster in the dungeon,
- * except for the savefile loading code.
- */
-
-#####GDescription
-Attempt to place a monster at grid "y", "x". The monster has monster
-index "m_idx". The monster may be asleep ("slp"). The monster may have
-an ego type ("ego"). The monster has a status of "status" (see below).
-The function returns TRUE if the monster is placed successfully,
-otherwise FALSE.
-
-#####GParameters
-> "y" is the y co-ordinate of the target grid.
-> "x" is the x co-ordinate of the target grid.
-> "r_idx" is an entry from the "r_info.txt" file. Beware: there is no
-  range checking.
-> "slp" is TRUE if the monster is asleep, otherwise FALSE.
-> "ego" is an entry from the "re_info.txt". Beware: there is no range
-  checking.
-> "status" is the status of the monster
-  *****fields.txt*0[status]
-
-----------------------------------------------------------------------
-
-#####R=== is_friend ===
-
-#####GDeclaration
-    extern int is_friend(monster_type *m_ptr);
-
-#####GFile
-    monster3.c
-
-#####GComment
-/*
- * Is the monster in friendly state(pet, friend, ..)
- * -1 = enemy, 0 = neutral, 1 = friend
- */
-
-#####GDescription
-Return a value to indicate the status of monster "m_ptr".
-  *****fields.txt*0[status]
-
-#####GParameters
-> "m_ptr" is a pointer to a monster.
-
-----------------------------------------------------------------------
-
-#####R=== is_enemy ===
-
-#####GDeclaration
-    extern bool is_enemy(monster_type *m_ptr,
-    monster_type *t_ptr);
-
-#####GFile
-    monster3.c
-
-#####GComment
-/* Should they attack each others */
-
-#####GDescription
-Return TRUE if monster "m_ptr" should attack monster "t_ptr". If
-"m_ptr" is stupid and "r_ptr" is a different type of monster then the
-function will return TRUE. If "m_ptr" is not neutral and "r_ptr" is a
-breeder, and "r_ptr" is a different type of monster then the function
-will return TRUE (and vice versa). If both monsters are not neutral
-and one is friendly and the other isn't then the function will return
-TRUE. Otherwise the function returns FALSE.
-
-#####GParameters
-> "m_ptr" is a pointer to a monster.
-> "t_ptr" is a pointer to a monster (target).
-
-----------------------------------------------------------------------
-
-#####R=== change_side ===
-
-#####GDeclaration
-    extern bool change_side(monster_type *m_ptr);
-
-#####GFile
-    monster3.c
-
-#####GComment
-(none)
-
-#####GDescription
-Change the status of monster "m_ptr" from friendly to unfriendly and
-vice versa. Friends and pets become enemies. Neutral Ms become
-neutral Ps and vice versa. Companions are unaffected. The
-function returns TRUE if the status changed, otherwise FALSE.
-
-#####GParameters
-> "m_ptr" is a pointer to a monster.
-
-----------------------------------------------------------------------
-
-#####R=== find_position ===
-
-#####GDeclaration
-    extern void find_position(int y, int x, int *yy = 0,
-    int *xx = 0);
-
-#####GFile
-    lua_bind.c
-
-#####GComment
-(none)
-
-#####GDescription
-Find a new grid "yy", "xx" within 6 grids of target grid "y", "x".
-The new grid must be within line-of-sight of the target grid. A
-maximum of 5000 attempts is made.
-
-#####GParameters
-> "y" is the y co-ordinate of the target grid.
-> "x" is the x co-ordinate of the target grid.
-> "yy" is the y co-ordinate of the new grid.
-> "xx" is the x co-ordinate of the new grid.
-
-----------------------------------------------------------------------
-
-#####R=== can_create_companion ===
-
-#####GDeclaration
-    extern bool can_create_companion();
-
-#####GFile
-    monster3.c
-
-#####GComment
-/* Returns if a new companion is allowed */
-
-#####GDescription
-Return TRUE if a companion can be created, otherwise FALSE.
-
-----------------------------------------------------------------------
-
-Back to the *****lua.hlp*0[lua help index] .
-
-
-                                                     [[[[[gThis file by Chris Hadgis]
diff --git a/lib/help/lua_play.txt b/lib/help/lua_play.txt
deleted file mode 100644
index 6ab64ddb..00000000
--- a/lib/help/lua_play.txt
+++ /dev/null
@@ -1,1225 +0,0 @@
-|||||oy
-
-#####R             /----------------------------------------\
-#####R            <     player.pkg functions helper file     >
-#####R             \----------------------------------------/
-
-----------------------------------------------------------------------
-
-#####RFunction: set_parasite
-
-#####GDeclaration: bool set_parasite(int v, int r);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->parasite" and "p_ptr->parasite_r_idx"
-* notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until parasite with monster index "r" is created. The
-player gets the message "You feel something growing in you" if "v"
-is > 0. Otherwise the player gets the message "Your body convulse
-and spawn <monster name>" if the monster is created (80% chance) or
-"The hideous thing growing in you seems to die" if the monster dies.
-
-#####GParameters:
->v is the time until the parasite gestates (must be between 0 and
-  10000).
->r is the monster index of parasite to be created.
-
-----------------------------------------------------------------------
-
-#####RFunction: set_disrupt_shield
-
-#####GDeclaration: bool set_disrupt_shield(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->disrupt_shield"
-* notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until shield of invulnerability expires. The player gets
-the message "You feel invulnerable" if "v" is > 0. Otherwise the
-player gets the message "You are more vulnerable".
-
-#####GParameters:
->v is the time until the shield expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_prob_travel
-
-#####GDeclaration: bool set_prob_travel(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->prob_travel"
-* notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until random teleportation expires. The player gets
-the message "You feel instable" if "v" is > 0. Otherwise the
-player gets the message "You are more stable".
-
-#####GParameters:
->v is the time until random teleportation expires (must be between 0
-  and 10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_tim_deadly
-
-#####GDeclaration: bool set_tim_deadly(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->tim_deadly"
-*/
-
-#####GDescription:
-Set time "v" until deadly accuracy expires. The player gets the
-message "You feel extremely accurate" if "v" is > 0. Otherwise the
-player gets the message "You are suddenly much less accurate".
-
-#####GParameters:
->v is the time until deadly accuracy expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_tim_res_time
-
-#####GDeclaration: bool set_tim_res_time(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->tim_res_time"
-*/
-
-#####GDescription:
-Set time "v" until space-time distortions expire. The player gets the
-message "You are now protected against the space-time distortions" if
-"v" is > 0. Otherwise the player gets the message "You are no longer
-protected against the space-time distortions".
-
-#####GParameters:
->v is the time until space-time distortions expire (must be between
-  0 and 10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_tim_reflect
-
-#####GDeclaration: bool set_tim_reflect(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->tim_reflect"
-*/
-
-#####GDescription:
-Set time "v" until reflection expire. The player gets the message
-"You start reflecting the world around you" if "v" is > 0. Otherwise
-the player gets the message "You stop reflecting".
-
-#####GParameters:
->v is the time until reflection expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_meditation
-
-#####GDeclaration: bool set_meditation(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->meditation"
-*/
-
-#####GDescription:
-Set time "v" until meditation expire. The player gets the message
-"You start meditating on yourself" if "v" is > 0. Otherwise the
-player gets the message "You stop your self meditation".
-
-#####GParameters:
->v is the time until meditation expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_strike
-
-#####GDeclaration: bool set_strike(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->strike"
-*/
-
-#####GDescription:
-Set time "v" until accurate strikes expire. The player gets the
-message "You feel very accurate" if "v" is > 0. Otherwise the player
-gets the message "You are no longer very accurate".
-
-#####GParameters:
->v is the time until accurate strikes expire (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_walk_water
-
-#####GDeclaration: bool set_walk_water(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->walk_water", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until walking on water expires. The player gets the
-message "You feel strangely insubmersible" if "v" is > 0. Otherwise
-the player gets the message "You are no longer insubmersible".
-
-#####GParameters:
->v is the time until walking on water expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_tim_ffall
-
-#####GDeclaration: bool set_tim_ffall(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->tim_ffall"
-*/
-
-#####GDescription:
-Set time "v" until feather-fall expires. The player gets the message
-"You feel very light" if "v" is > 0. Otherwise the player gets the
-message "You are suddenly heavier".
-
-#####GParameters:
->v is the time until feather-fall expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_tim_fire_aura
-
-#####GDeclaration: bool set_tim_fire_aura(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->tim_fire_aura"
-*/
-
-#####GDescription:
-Set time "v" until fiery aura expires. The player gets the message
-"You are enveloped in flames" if "v" is > 0. Otherwise the player
-gets the message "You are no longer enveloped in flames".
-
-#####GParameters:
->v is the time until fiery aura expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_holy
-
-#####GDeclaration: bool set_holy(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->holy", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until holiness expires. The player gets the message
-"You feel a holy aura around you" if "v" is > 0. Otherwise the
-player gets the message "The holy aura vanishes".
-
-#####GParameters:
->v is the time until holiness expires (must be between 0 and 10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_grace
-
-#####GDeclaration: void set_grace(s32b v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->grace", notice observable changes
-*/
-
-#####GDescription:
-Set grace to value "v". Don't allow grace to fall below -30000 or
-rise above 30000.
-
-#####GParameters:
->v is the value of grace.
-
-----------------------------------------------------------------------
-
-#####RFunction: set_mimic
-
-#####GDeclaration: bool set_mimic(int v, int p);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->tim_mimic", and "p_ptr->mimic_form",
-* notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until morph into monster with monster index "p" expires.
-The player gets the message "You feel your body change" if "v" is > 0.
-Otherwise the player gets the message "You are no longer transformed".
-
-#####GParameters:
->v is the time until transformation expires (must be between 0 and
-  10000).
->p is the monster index of the monster the player wants to mimic.
-
-----------------------------------------------------------------------
-
-#####RFunction: set_no_breeders
-
-#####GDeclaration: bool set_no_breeders(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "no_breeds"
-*/
-
-#####GDescription:
-Set time "v" until breeders can breed again. The player gets the
-message "You feel an anti-sexual aura" if "v" is > 0. Otherwise the
-player gets the message "You no longer feel an anti-sexual aura".
-Okay...
-
-#####GParameters:
->v is the time until breeders can breed again (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_invis
-
-#####GDeclaration: bool set_invis(int v,int p);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->tim_invis", and "p_ptr->tim_inv_pow",
-* notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until invisibility expires. The player gets the message
-"You feel your body fade away" if "v" is > 0. Otherwise the player
-gets the message "You are no longer invisible".
-
-#####GParameters:
->v is the time until invisibility expires (must be between 0 and
-  10000).
->p is the power of timed invisibility.
-
-----------------------------------------------------------------------
-
-#####RFunction: set_lite
-
-#####GDeclaration: bool set_lite(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->tim_lite", notice observable changes
-*
-* Note the use of "PU_VIEW", which is needed to
-* memorise any terrain features which suddenly become "visible".
-* Note that blindness is currently the only thing which can affect
-* "player_can_see_bold()".
-*/
-
-#####GDescription:
-Set time "v" until brightness expires. The player gets the message
-"You suddenly seem brighter" if "v" is > 0. Otherwise the player
-gets the message "You are no longer bright".
-
-#####GParameters:
->v is the time until brightness expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_blind
-
-#####GDeclaration: bool set_blind(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->blind", notice observable changes
-*
-* Note the use of "PU_UN_VIEW", which is needed to memorise any terrain
-* features which suddenly become "visible".
-* Note that blindness is currently the only thing which can affect
-* "player_can_see_bold()".
-*/
-
-#####GDescription:
-Set time "v" until blindness expires. The player gets the message "You
-are blind" if "v" is > 0. Otherwise the player gets the message "You
-can see again".
-
-#####GParameters:
->v is the time until blindness expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_confused
-
-#####GDeclaration: bool set_confused(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->confused", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until confusion expires. The player gets the message "You
-are confused" if "v" is > 0. Otherwise the player gets the message
-"You feel less confused now".
-
-#####GParameters:
->v is the time until confusion expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_poisoned
-
-#####GDeclaration: bool set_poisoned(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->poisoned", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until poison expires. The player gets the message "You
-are poisoned" if "v" is > 0. Otherwise the player gets the message
-"You are no longer poisoned".
-
-#####GParameters:
->v is the time until poison expires (must be between 0 and 10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_afraid
-
-#####GDeclaration: bool set_afraid(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->afraid", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until fear expires. The player gets the message "You are
-terrified" if "v" is > 0. Otherwise the player gets the message "You
-feel bolder now".
-
-#####GParameters:
->v is the time until fear expires (must be between 0 and 10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_paralyzed
-
-#####GDeclaration: bool set_paralyzed(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->paralyzed", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until paralysis expires. The player gets the message "You
-are paralyzed" if "v" is > 0. Otherwise the player gets the message
-"You can move again".
-
-#####GParameters:
->v is the time until paralysis expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_image
-
-#####GDeclaration: bool set_image(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->image", notice observable changes
-*
-* Note that we must redraw the map when hallucination changes.
-*/
-
-#####GDescription:
-Set time "v" until hallucination expires. The player gets the message
-"Oh, wow! Everything looks so cosmic now" if "v" is > 0. Otherwise
-the player gets the message "You can see clearly again".
-
-#####GParameters:
->v is the time until hallucination expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_fast
-
-#####GDeclaration: bool set_fast(int v, int p);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-(none)
-
-#####GDescription:
-Set time "v" until speed of speed factor "p" expires. The player gets
-the message "You feel yourself moving faster" if "v" is > 0. Otherwise
-the player gets the message "You feel yourself slow down".
-
-#####GParameters:
->v is the time until speed expires (must be between 0 and 10000).
->p is the speed factor.
-
-----------------------------------------------------------------------
-
-#####RFunction: set_light_speed
-
-#####GDeclaration: bool set_light_speed(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->lightspeed", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until light-speed expires. The player gets the message
-"You feel as if time has stopped" if "v" is > 0. Otherwise the player
-gets the message "You feel time returning to its normal rate".
-
-#####GParameters:
->v is the time until light-speed expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_slow
-
-#####GDeclaration: bool set_slow(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->slow", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until slowness expires. The player gets the message "You
-feel yourself moving slower" if "v" is > 0. Otherwise the player gets
-the message "You feel yourself speed up".
-
-#####GParameters:
->v is the time until slowness expires (must be between 0 and 10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_shield
-
-#####GDeclaration: bool set_shield(int v, int p, s16b o, s16b d1, s16b d2);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->shield", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until stone-shield expires. The player gets the message
-"Your skin turns to stone" if "v" is > 0. Otherwise the player gets
-the message "Your skin returns to normal". Stone-shield has spell
-power "p", spell option "o", and power options "d1" and "d2".
-
-#####GParameters:
->v is the time until stone-shield expires (must be between 0 and
-  10000).
->p is the power of the stone-shield spell.
->o is the option of the stone-shield spell.
->d1 is the power for option 1 of the stone-shield spell.
->d2 is the power for option 2 of the stone-shield spell.
-
-----------------------------------------------------------------------
-
-#####RFunction: set_blessed
-
-#####GDeclaration: bool set_blessed(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->blessed", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until blessing expires. The player gets the message "You
-feel righteous" if "v" is > 0. Otherwise the player gets the message
-"The prayer has expired".
-
-#####GParameters:
->v is the time until blessing expires (must be between 0 and 10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_hero
-
-#####GDeclaration: bool set_hero(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->hero", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until heroism expires. The player gets the message "You
-feel like a hero" if "v" is > 0. Otherwise the player gets the
-message "The heroism wears off".
-
-#####GParameters:
->v is the time until heroism expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_shero
-
-#####GDeclaration: bool set_shero(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->shero", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until berserk expires. The player gets the message "You
-feel like a killing machine" if "v" is > 0. Otherwise the player gets
-the message "You feel less Berserk".
-
-#####GParameters:
->v is the time until berserk expires (must be between 0 and 10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_protevil
-
-#####GDeclaration: bool set_protevil(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->protevil", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until protection from evil expires. The player gets the
-message "You feel safe from evil" if "v" is > 0. Otherwise the player
-gets the message "You no longer feel safe from evil".
-
-#####GParameters:
->v is the time until protection from evil expires (must be between 0
-  and 10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_protgood
-
-#####GDeclaration: bool set_protgood(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->protgood", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until protection from good expires. The player gets the
-message "You feel safe from good" if "v" is > 0. Otherwise the player
-gets the message "You no longer feel safe from good".
-
-#####GParameters:
->v is the time until protection from evil expires (must be between 0
-  and 10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_protundead
-
-#####GDeclaration: bool set_protundead(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->protundead", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until protection from undead expires. The player gets the
-message "You feel safe from undead" if "v" is > 0. Otherwise the
-player gets the message "You no longer feel safe from undead".
-
-#####GParameters:
->v is the time until protection from undead expires (must be between
-  0 and 10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_invuln
-
-#####GDeclaration: bool set_invuln(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->invuln", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until invulnerability expires. The player gets the
-message "Invulnerability" if "v" is > 0. Otherwise the player gets
-the message "The invulnerability wears off".
-
-#####GParameters:
->v is the time until invulnerability expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_tim_invis
-
-#####GDeclaration: bool set_tim_invis(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->tim_invis", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until see invisible expires. The player gets the message
-"Your eyes feel very sensitive" if "v" is > 0. Otherwise the player
-gets the message "Your eyes feel less sensitive".
-
-#####GParameters:
->v is the time until see invisible expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_tim_infra
-
-#####GDeclaration: bool set_tim_infra(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->tim_infra", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until infravision expires. The player gets the message
-"Your eyes begin to tingle" if "v" is > 0. Otherwise the player gets
-the message "Your eyes stop tingling".
-
-#####GParameters:
->v is the time until infravision expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_mental_barrier
-
-#####GDeclaration: bool set_mental_barrier(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->tim_mental_barrier", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until mental barrier expires. The player gets the message
-"Your mind grows stronger" if "v" is > 0. Otherwise the player gets
-the message "Your mind is no longer especially strong".
-
-#####GParameters:
->v is the time until mental barrier expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_oppose_acid
-
-#####GDeclaration: bool set_oppose_acid(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-
-#####GDescription:
-Set time "v" until feather-fall expires. The player gets the message
-"You feel very light" if "v" is > 0. Otherwise the player gets the
-message "You are suddenly heavier".
-
-#####GParameters:
->v is the time until feather-fall expires (must be between 0 and
-  10000).
->v is the time until feather-fall expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_oppose_elec
-
-#####GDeclaration: bool set_oppose_elec(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->oppose_elec", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until electricity resistance expires. The player gets
-the message "You feel resistant to electricity" if "v" is > 0.
-Otherwise the player gets the message "You feel less resistant to
-electricity".
-
-#####GParameters:
->v is the time until electricity resistance expires (must be between
-  0 and 10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_oppose_fire
-
-#####GDeclaration: bool set_oppose_fire(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->oppose_fire", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until fire resistance expires. The player gets the
-message "You feel resistant to fire" if "v" is > 0. Otherwise the
-player gets the message "You feel less resistant to fire".
-
-#####GParameters:
->v is the time until fire resistance expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_oppose_cold
-
-#####GDeclaration: bool set_oppose_cold(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->oppose_cold", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until cold resistance expires. The player gets the
-message "You feel resistant to cold" if "v" is > 0. Otherwise the
-player gets the message "You feel less resistant to cold".
-
-#####GParameters:
->v is the time until cold resistance expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_oppose_pois
-
-#####GDeclaration: bool set_oppose_pois(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->oppose_pois", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until poison resistance expires. The player gets the
-message "You feel resistant to poison" if "v" is > 0. Otherwise the
-player gets the message "You feel less resistant to poison".
-
-#####GParameters:
->v is the time until poison resistance expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_oppose_ld
-
-#####GDeclaration: bool set_oppose_ld(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->oppose_ld"
-*/
-
-#####GDescription:
-Set time "v" until light and dark resistance expires. The player gets
-the message "You feel protected against the light's fluctuation" if
-"v" is > 0. Otherwise the player gets the message "You are no longer
-protected against the light's fluctuation".
-
-#####GParameters:
->v is the time until light and dark resistance expires (must be
-  between 0 and 10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_oppose_cc
-
-#####GDeclaration: bool set_oppose_cc(int v);
-
-#####GFile: xtra2.c
-/*
-* Set "p_ptr->oppose_cc"
-*/
-
-#####GComment: 
-
-#####GDescription:
-Set time "v" until chaos resistance expires. The player gets the
-message "You feel protected against raw chaos" if "v" is > 0.
-Otherwise the player gets the message "You are no longer protected
-against chaos".
-
-#####GParameters:
->v is the time until chaos resistance expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_oppose_ss
-
-#####GDeclaration: bool set_oppose_ss(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->oppose_ss"
-*/
-
-#####GDescription:
-Set time "v" until sound and shard resistance expires. The player gets
-the message "You feel protected against the ravages of sound and
-shards" if "v" is > 0. Otherwise the player gets the message "You are
-no longer protected against the ravages of sound and shards".
-
-#####GParameters:
->v is the time until sound and shard resistance expires (must be
-  between 0 and 10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_oppose_nex
-
-#####GDeclaration: bool set_oppose_nex(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->oppose_nex"
-*/
-
-#####GDescription:
-Set time "v" until nexus resistance expires. The player gets the
-message "You feel protected against the strange forces of nexus" if
-"v" is > 0. Otherwise the player gets the message "You are no longer
-protected against the strange forces of nexus".
-
-#####GParameters:
->v is the time until nexus resistance expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_stun
-
-#####GDeclaration: bool set_stun(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->stun", notice observable changes
-*
-* Note the special code to only notice "range" changes.
-*/
-
-#####GDescription:
-Set stun level "v". If the player race can't be stunned then the level
-is forced to 0. A value > 100 means the player is knocked out. A value
->50 is a heavy stun. A value > 0 is a stun. If the stun level has
-increased, a message is printed. There is a small chance of stun level
-in 1000, or a 1 in 16 chance of a vicious blow which decreases
-intelligence and/or wisdom for a while.
-
-#####GParameters:
->v is the stun level.
-
-----------------------------------------------------------------------
-
-#####RFunction: set_cut
-
-#####GDeclaration: bool set_cut(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->cut", notice observable changes
-*
-* Note the special code to only notice "range" changes.
-*/
-
-#####GDescription:
-Set cut level "v". If the player race can't be cut then the time is
-forced to 0. A value > 1000 is a mortal wound. A value > 200 is a deep
-gash. A value > 100 is a severe cut. A value > 50 is a nasty cut. A
-value > 25 is a bad cut. A value > 10 is a light cut. A value > 0 is a
-graze. If the cut level has increased, a message is printed. There is
-a small chance of stun level in 1000, or a 1 in 16 chance of scarring
-which decreases charisma for a while.
-
-#####GParameters:
->v is the cut level.
-
-----------------------------------------------------------------------
-
-#####RFunction: set_food
-
-#####GDeclaration: bool set_food(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->food", notice observable changes
-*
-* The "p_ptr->food" variable can get as large as 20000, allowing the
-* addition of the most "filling" item, Elvish Waybread, which adds
-* 7500 food units, without overflowing the 32767 maximum limit.
-*
-* Perhaps we should disturb the player with various messages,
-* especially messages about hunger status changes.  XXX XXX XXX
-*
-* Digestion of food is handled in "dungeon.c", in which, normally,
-* the player digests about 20 food units per 100 game turns, more
-* when "fast", more when "regenerating", less with "slow digestion",
-* but when the player is "gorged", he digests 100 food units per 10
-* game turns, or a full 1000 food units per 100 game turns.
-*
-* Note that the player's speed is reduced by 10 units while gorged,
-* so if the player eats a single food ration (5000 food units) when
-* full (15000 food units), he will be gorged for (5000/100)*10 = 500
-* game turns, or 500/(100/5) = 25 player turns (if nothing else is
-* affecting the player speed).
-*/
-
-#####GDescription:
-Set hunger level "v". A value < 500 is fainting. A value < 1000 is
-weak. A value < 2000 is weak. A value < 10000 is full. A value
-< 15000 is bloated. A value < 20000 is gorged. If one of these
-levels is crossed a message is printed.
-
-#####GParameters:
->v is the hunger level (must be between 0 and 20000).
-
-----------------------------------------------------------------------
-
-#####RFunction: check_experience
-
-#####GDeclaration: void check_experience(void);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Advance experience levels and print experience
-*/
-
-#####GDescription:
-Check if player experience level has changed. If a player has achieved
-a level for the first time, give reward or corruption (1 chance in 3)
-if they apply, and increase skill points.
-
-----------------------------------------------------------------------
-
-#####RFunction: check_experience_obj
-
-#####GDeclaration: void check_experience_obj(object_type *o_ptr);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Advance experience levels and print experience
-*/
-
-#####GDescription:
-Check if object "o_ptr" experience level has changed. If an object has
-achieved a level for the first time, apply gains.
-
-#####GParameters:
->o_ptr is the pointer to the object gaining experience.
-
-----------------------------------------------------------------------
-
-#####RFunction: gain_exp
-
-#####GDeclaration: void gain_exp(s32b amount);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Gain experience (share it to objects if needed)
-*/
-
-#####GDescription:
-Gain "amount" of experience. Count the number of objects which will
-gain experience. The objects share equally 2/3 of "amount". Give
-corruption if it applies. Gain experience. If experience is less
-than maximum, then increase maximum experience by 20% of "amount".
-Check for level change and print experience (check_experience).
-
-#####GParameters:
->amount is the amount of experience to share.
-
-----------------------------------------------------------------------
-
-#####RFunction: lose_exp
-
-#####GDeclaration: void lose_exp(s32b amount);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Lose experience
-*/
-
-#####GDescription:
-Decrease experience by "amount". Experience can not fall below zero.
-Check for level change and print experience (check_experience).
-
-#####GParameters:
->amount is the amount of experience to lose.
-
-----------------------------------------------------------------------
-
-
-Back to the *****lua.hlp*0[lua help index] .
-
-
-                                                     [[[[[gThis file by Chris Hadgis]
-
-
diff --git a/lib/help/lua_pow.txt b/lib/help/lua_pow.txt
deleted file mode 100644
index c221a664..00000000
--- a/lib/help/lua_pow.txt
+++ /dev/null
@@ -1,266 +0,0 @@
-|||||oy
-#####R             /----------------------------------------\
-#####R            <         Adding new racial powers         >
-#####R             \----------------------------------------/
-
-#####R=== Introduction ===
-
-You *must* download and install my lua example files from 
-[[[[[Ghttp://www.moppy.co.uk/angband.htm]. And also you should read the 
-*****lua_intr.txt*0[scripting introduction] file if you haven't already done 
-so.
-
-The (commented) accompanying script file for this tutorial is 
-lib\scpt\pheonix.lua. Open it in your text editor!
-
-#####R=== The Racial Power ===
-
-Let's start with something simple. Let's say you wanted your new race (let's 
-call it "Pheonix") to be able to cast fire balls as their racial power. 
-
-#####R=== Starting off ===
-
-If you have a look at pheonix.lua you'll note the first lines are comments.
-I'll talk a bit more about comments later, but it's worth pointing out that any
-lines of text preceded by a double hyphen ([[[[[B--]) will be ignored by the 
-scripting engine, and are therefore comments. 
-After the comments, the first 10 lines of code are as follows:
-
-#####BPHEONIX_POWER = add_power
-#####B{
-#####B        ["name"] =      "Fire Breath",
-#####B        ["desc"] =      "You are able to cast fireballs",
-#####B        ["desc_get"] =  "Your beak glows red",
-#####B        ["desc_lose"] = "Your beak goes cold again",
-#####B        ["level"] =     10,
-#####B        ["cost"] =      11,
-#####B        ["stat"] =      A_INT,
-#####B        ["fail"] =      14,
-
-So, [[[[[BPHEONIX_POWER = add_power] is registering our power. We're giving it 
-a name (PHEONIX_POWER) and saying that it is defined by calling the special 
-function [[[[[Badd_power]. This special function is only used to define lua-
-scripted 
-powers, and has attributes which are identified by their inclusion in square 
-brackets.
-Note the following:
-- Lua is case sensitive. The name of our power is a constant, will never change 
-so that's been named with capitals. variables and functions are named all in 
-lower case. Technically speaking, Lua does not support constants, but we can 
-emulate them by variables in this way. They don't have to be capitalised, but 
-if you capitalise all your constants, it makes things easier to read, and 
-you'll be following normal programming protocol. 
-- There are no spaces in the name of the power. Use an underscore for spaces 
-if you need to improve legibility. 
-
-[[[[[B"name" =      "Fire Breath",] This is the name of the power as it is 
-displayed in the 
-U menu, and as you will define it in p_info.txt (more about that later). 
-
-[[[[[B"desc" =      "You are able to cast fireballs",] This is what would 
-appear in the 
-information display list if you drank  a potion of self knowledge or 
-similar. 
-
-[[[[[B"desc_get" =  "Your beak glows red",] This is the information displayed 
-when you 
-gain this power. 
-
-[[[[[B"desc_lose" = "Your beak goes cold again",] This is the information 
-displayed when 
-you lose this power. Eg After a mutation/corruption.
-
-[[[[[B"level" =     10,] Character level which must be gained in order to use 
-power,
-
-[[[[[B"cost" =      11,] Amount of mana to cast this power.
-
-[[[[[B"stat" =      A_INT,] stat which will define whether it works or not, 
-
-[[[[[B"fail" =      14,] how high that stat must be. 
-
-So our Pheonix will be able to cast PHEONIX_POWER  from clvl 10, at a cost of 
-11 mana, providing that the player's intelligence is 14 and upwards. 
-
-#####R=== The function ===
-
-The next section is a lot longer, so we'll look at it line by line. I'll 
-strip the comments for the purpose of this helpfile.
-
-#####B["power"] =     function()
-#####B		local ret, dir, damage
-#####B		ret, dir = get_aim_dir();
-#####B		if (ret == FALSE) then 
-#####B			return 
-#####B		end
-#####B		damage = player.lev*3
-#####B		msg_print("You breathe fire.")
-#####B		fire_ball(GF_FIRE, dir, damage, 3)
-#####Bend,
-
-The [[[[[B"power"] bit is what actually happens when the player accesses this 
-power 
-from their 'U' menu. Every function must start with the word [[[[[Bfunction]. 
-Normally, we'd also declare its name at this point, but as this is contained 
-within the [[[[[Badd_power] function, we just use the word [[[[[Bfunction] The 
-empty 
-brackets after this denote that no arguments are passed to the function. 
-Lets look at the next line.
-
-#####B		local ret, dir, damage
-
-The [[[[[Blocal] bit is saying that  we're going to declare some local 
-variables. That 
-is, that there will be three variables used in this function , that apply 
-exclusively to this function, and to no others. Global variables are 
-variables that apply to the whole script, in multiple functions. The three 
-variables will be called [[[[[Bret] (return), [[[[[Bdir] (direction), and
-[[[[[Bdamage]. They will be used to determine the direction the ball 
-will fire in, and how much damage it will do. We'll see them in use when we add
-the third line:
-
-#####B		ret, dir = get_aim_dir();
-
-here we're saying that the variables will take their value from the result 
-of a function. The program performs the function [[[[[Bget_aim_dir] which 
-essentially asks the player to choose a direction or pick a target. 
-[[[[[Bget_aim_dir] 
-assigns the value [[[[[Bret] to either TRUE (if the player correctly selected a 
-direction) or FALSE (if the player failed to do so (maybe they changed their 
-mind, or hit the wrong key!)). The value [[[[[Bdir] is the direction which was 
-selected (or the path to the target if a target was selected). OK so let's add 
-the next line:
-
-#####B		if (ret == FALSE) then return end
-
-This introduces another fundamental scripting concept - [[[[[Bif] statements.
-They work just as you would expect them too. You say "if a certain condition is
-met, then do the following things."
-So in this function we're saying, "if the value of [[[[[Bret] is FALSE then 
-[[[[[Breturn]."
-As I mentioned above, [[[[[Bret] is false if the player aborted (either 
-deliberately or accidentally) the spell casting whilst choosing a direction 
-for the spell. The double equals sign are used to mean "is equal to" as a 
-single equals sign is used for defining variables remember? A single equals 
-sign is more of a "let x be equal to y" thing.
-[[[[[Breturn] means stop the current function. And [[[[[Bend] signifies the 
-close of the [[[[[Bif]
-statement. Every [[[[[Bif] statement must begin with an [[[[[Bif] and finish 
-with an [[[[[Bend].
-So, what our [[[[[Bif] statement is saying is; "if the player failed to specify 
-a direction or target for the spell, stop the function here."
-If the player has correctly specified a direction/target, the function 
-continues to the next line:
-
-#####B		damage = player.lev*3
-
-Here we're saying that the variable [[[[[Bdamage] has a value equal to the 
-players current character level, multiplied by 3.
-
-#####B		msg_print("You breathe fire.")
-
-Fairly easy to see what this does - displays the message "You breathe fire."
-I could have put anything there obviously, like [[[[[Bmsg_print("You open]
-[[[[[Byour mouth and everyone falls over with the smell of hot curry")] or
-some other such rubbish. But note that the message is enclosed within double 
-quotes. The quotes aren't displayed in the message on screen, but signify the 
-start and end of the message. 
-
-#####B		fire_ball(GF_FIRE, dir, damage, 3)
-
-This is the line that casts the spell. it says execute the function 
-[[[[[Bfire_ball]. Now, this doesn't mean a fireball, it means fire a ball. 
-There's an important distinction there! All it knows it is doing is firing a 
-ball, it doesn't know what kind of ball, or where, or how big, or how much 
-damage.
-The [[[[[BGF_FIRE,] bit is what tell us it is a fire ball. If it was 
-[[[[[BGF_COLD,]
- we'd have a cold ball, or [[[[[BGF_CHAOS,] it would be a chaos ball and 
-so on and so on. A full list of those types can be found in *****lua_gf.txt*0[lua_gf.txt].
-[[[[[B dir,] is the direction, from the [[[[[Bget_aim_dir()] bit.
-[[[[[B damage,] is the damage. As we've already said, this will be clvl*3.
-[[[[[B 3)] is the radius.
-and finally...
-
-#####B	end,
-#####B}
-
-[[[[[Bend,] tells it the function has ended. Every function must finish with 
-[[[[[Bend].
-You should have spotted that after the end of each attribute is a comma. Make 
-sure you include this, and don't forget the braces at the very very end to 
-close the [[[[[Badd_power] function.
-
-#####R=== Finishing the LUA file ===
-
-Save this as a text file 'pheonix.lua' Put it into the lib\scrpt directory 
-of ToME, and open the init.lua file which you'll find in the same 
-directory. 
-
-Add the following line and resave the init.lua file.
-
-#####Btome_dofile("pheonix.lua")
-
-This ensures that ToME loads your file on start-up. Because you've installed 
-the example scripts, this has all been done for you.
-
-#####R=== A quick word about comments ===
-
-One of the reasons Angband has so many variants is because the source code is 
-clearly commented. Almost every line of code has an accompanying comment, 
-explaining what that line does. It's good practice to add comments to any code 
-or script you write. It's helpful to others who are learning, anyone who takes 
-over your project, and also to yourself when you come back in a month's time 
-and can't remember what you did! So comment your code clearly, and well!
-
-You can also add multi line comments which should be enclosed by [[[[[B--[[] 
-and 
-#####B]]
-
-#####R=== Tying it all together ===
-
-You'll now need to link this 'U' power to the pheonix race via the 
-p_info.txt file. Simply add a line within the class definition file that has 
-the format [[[[[BR:Z:<name>]the name of the power as it appears in the 
-[[[[[B"name"] 
-section we did right at the beginning, remember? Seeing as there is no pheonix 
-race, I've gone ahead and made one up as a demonstration. If you've downloaded 
-and installed the example files from [[[[[Ghttp://www.moppy.co.uk/angband.htm/] 
-then 
-you'll notice you already have the pheonix race available. Printed below is 
-the p_info.txt entry for it.
-
-
-#####BR:N:23:Pheonix
-#####BR:D:Born from flame, these powerful bird like creatures gain fire related
-#####BR:D:abilities as they grow. 
-#####BR:S:1:0:2:1:-3:2:-5
-#####BR:K:-8:15:20:-10:5:-1:-5:-5
-#####BR:P:8:130:5:210
-#####BR:M:255:70:2:1:20:5:2:1:18:3
-#####BR:E:1:1:1:2:1:1
-#####BR:C:Warrior | Mage | Priest | Rogue | Ranger | Paladin | Blade | 
-#####BR:C:Warlock | Chaos-Warrior | Monk | Mindcrafter | High-Mage |
-#####BR:C:BeastMaster | Alchemist |  Power-Mage | Runecrafter | 
-#####BR:C:Sorceror | Archer | Illusionist | Druid | Necromancer | Black-Knight 
-| 
-#####BR:C:Daemonologist | Weaponmaster | Summoner | 
-#####BR:Z:Fire Ball
-#####BR:R:1:0
-#####BR:F:RES_FIRE | FEATHER |
-
-Note the [[[[[BR:Z:] line. 
-
-If all is well, you should be able to start ToME now and breathe fire! Once 
-you get to lvl 10 anyhow. Don't forget, this is the kind of thing wizard mode 
-was invented for! Ctrl-A and confirm at the prompt, and then 'e' will allow 
-you to alter stats, including experience. Approx 1000 exp should do to get you 
-to clvl 10.
-
-Ready for more? How about adding a new *****lua_skil.txt*0[skill] ?
-
-                             [[[[[gThis file by fearoffours (fearoffours@moppy.co.uk)]
-
-
-
-
diff --git a/lib/help/lua_ques.txt b/lib/help/lua_ques.txt
deleted file mode 100644
index 1d4b9c65..00000000
--- a/lib/help/lua_ques.txt
+++ /dev/null
@@ -1,299 +0,0 @@
-|||||oy
-#####R             /----------------------------------------\
-#####R            <            Adding a new quest            >
-#####R             \----------------------------------------/
-
-#####R=== Introduction ===
-
-Adding a quest involves a bit more work, and there is, in some ways, rather 
-more potential for things to go wrong! But it's a great way of showing just 
-WHAT can be done with lua scripting. It proves just how much a lua patch can 
-change the overall feel of the game. And it will give you a much better idea of 
-how lua interfaces with the game source. You should have read the 
-*****lua_intr.txt*0[scripting introduction], *****lua_pow.txt*0[racial power tutorial]
-and *****lua_skil.txt*0[adding new skills tutorial] before going much 
-further. All of the above files contain some fairly fundamental information 
-which you will find necessary for full understanding of this file.
-
-The script we're looking at is going to create a quest entrance in the middle 
-of Bree. Entering the quest you see a little girl who has had her necklace 
-stolen. Your job is to travel down a corridor, killing some monsters on the 
-way, pick up the amulet and return it to the girl. Once done, she'll reveal the 
-stairs back to Bree, and give you a (randomly generated) ring. If you feel the 
-monsters are too hard, the only thing to do is talk to the little girl who will 
-reveal the stairs again, failing the quest for you, and also block off the 
-entrance to the amulet so that you can't cheat and make off with the amulet!
-
-#####R=== Getting started ===
-
-Open amulet.lua (you have downloaded the example scripts from 
-[[[[[Ghttp://www.moppy.co.uk/angband.htm], haven't you?). The first thing you 
-should see is that yet again we're calling a function that takes its arguments 
-from a table, making it easy to read what's going on in the script.
-
-This time our function is add_quest and we have the following keys and values:
-
-#####B["global"] =    "AMULET_QUEST",
-#####B["name"] =      "Hannahs lost amulet",
-#####B["desc"] =      {
-#####B			"Retrieve an amulet for Hannah Cooke. It's guarded!"
-#####B 		     },
-#####B["level"] =     5,
-#####B["hooks"] =     {
-
-[[[[[B"global" = ]	is a constant that we set when we refer to this quest in 
-various places...
-[[[[[B"name" = ]	Obviously a long name for the quest. This will appear in the 
-quest screen (Ctrl-Q) and we may use in some map files too.
-[[[[[B"desc" = ]	This is a long description for the quest. Again this is what 
-will appear in the quest screen, and each line should be not more than 80 
-characters.
-[[[[[B"level" = ]	This is a rough indicator of how hard the quest is, and again, 
-appears in the quest screen
-[[[[[B"hooks" = ]	This is the real 'meat' of the quest. Like the [[[[[B"spell_list"] key 
-in the [[[[[Badd_magic] function, this is another sub-table.
-
-To understand fully the structure of the "hooks" key it's worth taking a bit of 
-a detour at this point and discussing how the scripting interface works in 
-general.
-
-#####R=== How the scripts work (ish) ===
-
-Essentially there's a list of events that happen in the game. As each of these 
-events happen they run a check to see if there's any functions that they need 
-to run at that event. When we ran the add_mkey part of adding a new skill 
-power, we essentially said "when the 'm' key is pressed in the game, perform 
-the [[[[[Bexecute_magic(constructor_powers)] function". Likewise we did a similar 
-thing with adding the racial power, only we hooked onto the pressing of the 
-'U' key.
-
-All of this was partly hidden because of the way that the [[[[[Badd_magic] and 
-[[[[[Badd_power] functions work. But here in the [[[[[Badd_quest] function it's a bit more 
-specific. We are going to specify what events we're going to hook onto, and 
-what functions we want to trigger at that event.
-
-A full list of hooks can be found in the source-file util.pkg.
-
-#####R=== The hooks ===
-
-#####B[HOOK_BIRTH_OBJECTS] = function()
-#####B	quest(AMULET_QUEST).status = QUEST_STATUS_TAKEN
-#####Bend,
-
-So here we are with our first hook. We've declared that we're adding it to the 
-birth of your character. That is, the function will be called when you create 
-your character. And what we're doing here is automatically declaring the quest 
-as being taken, like the Dol Guldur quest is. Each quest has 7 different 
-statuses:
-
-[[[[[BQUEST_STATUS_IGNORED         -1	]	This is unused, but the quest is 
-ignored (will not be taken and has not been taken).
-[[[[[BQUEST_STATUS_UNTAKEN         0	]	The quest has not been accepted yet
-[[[[[BQUEST_STATUS_TAKEN           1	]	You have accepted the quest
-[[[[[BQUEST_STATUS_COMPLETED       2	]	You have completed the quest 
-successfully but not been rewarded for it
-[[[[[BQUEST_STATUS_REWARDED        3	]	You've completed and rewarded the quest
-[[[[[BQUEST_STATUS_FAILED          4	]	You've failed the quest
-[[[[[BQUEST_STATUS_FINISHED        5	]	The quest is completely finished 
-successfully.
-[[[[[BQUEST_STATUS_FAILED_DONE     6	]	The quest is completely finished 
-unsuccessfully.
-
-You see that we've used the constant we defined in the "global" section is 
-passed as an argument to [[[[[Bquest.status].
-
-Next hook then:
-
-#####B[HOOK_GEN_QUEST] = function()
-#####B	if (player.inside_quest ~= AMULET_QUEST) then
-#####B		return FALSE
-#####B	else
-#####B		load_map("amulet.map", 2, 2)
-#####B		return TRUE
-#####B	end
-#####Bend,
-
-Ok, we're hooking onto the generation of the quest here. This is specifically 
-triggered in this instance by going down the quest entrance stairs in Bree.
-Once you've gone down the stairs, you are technically inside the quest, which 
-means we can say if the person is not inside the amulet quest, then ignore this 
-function, otherwise load the file 'amulet.map' at co-ordinates x=2 y=2. You'll 
-find the amulet.map file in the edit directory, make sure you check it out. The 
-syntax for map files is fairly simple, though I might get round to writing a 
-tutorial on them some day! In the mean time holler for me at the usual email 
-address if you're unsure.
-
-#####B[HOOK_FEELING] = function()
-#####B	if (player.inside_quest ~= AMULET_QUEST) then
-#####B		return FALSE
-#####B	else
-#####B		cmsg_print(TERM_L_BLUE, "Hannah speaks to you:")
-#####B		cmsg_print(TERM_YELLOW, "'Some nasty monsters stole my 
-#####B							favourite necklace.'")
-#####B		cmsg_print(TERM_YELLOW, "'It's hidden at the back of that 
-#####B						corridor! Please fetch it for me'")
-#####B		return TRUE
-#####B	end
-#####Bend,
-
-We're moving into some rather more obvious territory here, and getting into the 
-meat of the quest. The [[[[[BHOOK_FEELING] is triggered at the point when the level 
-feeling appears. It's important that this is run only if the player is inside 
-the amulet quest, as otherwise it will trigger EVERY time a level feeling 
-occurs, when you go down a level in the barrow-downs, whenever! Returning TRUE 
-will replace the level feeling with what's above, returning FALSE will still 
-perform the function but will amend the normal level feeling - so here if we'd 
-returned false we'd still get our custom messages, but they'd follow with 
-'looks like a typical quest level'. Of course returning false may cause you 
-other problems (see end of this file!) depending on what else you have in your 
-function.
-
-#####B[HOOK_GIVE] = function(m_idx, item)
-
-#####B	m_ptr = monster(m_idx)
-#####B	o_ptr = get_object(item)
-
-#####B	if (m_ptr.r_idx == test_monster_name("Hannah Cooke, a little girl")) 
-#####B			and (o_ptr.tval == TV_AMULET) and (o_ptr.sval == 2) then
-
-#####B		cmsg_print(TERM_YELLOW, "'Thank-you!'")
-
-#####B		inven_item_increase(item, -1)
-#####B		inven_item_optimize(item)
-
-#####B		quest(AMULET_QUEST).status = QUEST_STATUS_COMPLETED
-
-#####B		cave_set_feat(7, 6, 6)
-
-#####B		cmsg_print(TERM_YELLOW, "'Here, take this pretty ring I found 
-#####B							as a token of gratitude!'")
-#####B		random_type = randint(57)
-#####B		reward = create_object(TV_RING, random_type)
-#####B		drop_near(reward, -1, py, px)
-#####B		quest(AMULET_QUEST).status = QUEST_STATUS_REWARDED
-#####B		return TRUE
-#####B	else
-#####B		return FALSE
-#####B	end
-#####Bend,
-
-This is a fairly long function, but don't be intimidated. It's not really 
-difficult to understand. As you can see we're hooking into the giving of an 
-object to a monster (the 'y' key). Because of this, the function takes two 
-arguments - [[[[[Bm_idx] (the monster that you're giving to) and [[[[[Bitem] (the item that 
-you're giving).
-
-We then make it possible to work with the monster and item variables by 
-referencing them to two functions which identify them from the edit files: 
-[[[[[Bmonster()] and [[[[[Bget_object()]. This enables us to now say, 'if the name of the 
-monster is "Hannah Cooke, a little girl" and the type of item is an amulet and 
-that amulet is an amulet of adornment, then carry out the following commands'.
-
-We then say call the function [[[[[Binven_item_increase()] which places an object in 
-the inventory. It takes two arguments, the first being what object to put in 
-the inventory and the second being how many of that type of objects to put in 
-the inventory. You can see that by placing -1 as the second argument it fairly 
-obviously subtracts that item from the inventory. The [[[[[Binven_item_optimize()] 
-function checks that there are no empty inventory slots, and if there are, 
-erases them. 
-
-The quest is then completed, and the stairs are revealed using the 
-[[[[[Bcave_set_feat()] function. This function takes three arguments, the first is the 
-x co-ordinate of the cave square you wish to change (counted from top left) the 
-second is the y co-ordinate, and the third is the index number of the feature 
-you wish the square to become as defined in f_info.txt. 
-
-We then set about rewarding the player. As you can see we call [[[[[Bcreate_object()] 
-which takes two variables: the first is the type of object (these are all 
-listed in object.pkg) and the second is the sub-type of that object. I searched 
-k_info.txt to see how many different types of ring there were (57) and used a 
-randomly selected number with a maximum value of 57 as that specific sub-type.
-
-We then drop the object (although it's been created, it has only been created 
-in the game's memory, it's nowhere that the player can interact with it until 
-we drop it). The [[[[[Bdrop_near()] function takes 3 variables, the first being the 
-object that you wish to drop, the second being the chance that it disappears 
-(like an arrow, or mimicked creature) on drop. If you set it to -1, it won't
-ever disappear. The last two are the co-ordinates at which the object will be 
-dropped. py and px are the global variables defined by where the player is 
-standing, so in this case it will drop under the player. You could do 
-[[[[[Binven_item_increase(reward, 1)] if you wanted, but I wanted to show a variety of 
-ways of handling objects.
-
-OK, let's take a look at the next hook:
-
-#####B[HOOK_CHAT] = function(m_idx)
-#####B	m_ptr = monster(m_idx)
-#####B	if (m_ptr.r_idx == test_monster_name("Hannah Cooke, a little girl")) then 
-#####B		if (quest(AMULET_QUEST).status == QUEST_STATUS_REWARDED) then
-#####B			cmsg_print(TERM_YELLOW, "'Bye!'")
-#####B		else
-#####B			cmsg_print(TERM_YELLOW, "'Are the monsters too tough? 
-#####B							Do you want to leave?'")
-#####B			if (get_check("Really leave and fail the quest?") == 
-#####B									FALSE) 
-#####B				then 
-#####B					cmsg_print(TERM_YELLOW, "'Go and get my 
-#####B								amulet then!'")
-#####B				else
-#####B					cmsg_print(TERM_YELLOW, "'Awww. Never 
-#####B					mind. It was only a bit of rabbits foot'")
-#####B					quest(AMULET_QUEST).status = 
-#####B								QUEST_STATUS_FAILED
-#####B					cave_set_feat(7, 6, 6)
-#####B					cave_set_feat(12, 5, 60)
-#####B			end
-#####B		end
-#####B		return TRUE
-#####B	end
-#####B	return FALSE
-#####Bend,		
-
-This only looks complicated because of the nested 'if' statements. It's easy to 
-lose your way when doing this kind of thing, always make sure you close all the 
-statements and put the returns in the right place. [[[[[BHOOK_CHAT] functions have one 
-argument - the monster you are chatting to. As you can see, we perform a check 
-to make sure it's the right monster and then away we go.... If the player wants 
-to leave the quest without completion they talk to Hannah, who gives them a 
-chance to change their mind! If the player asks to leave the entrance to the 
-corridor is blocked off (the second cave_set_feat()) so that the user can't 
-then go and get the amulet. Gumband or Zangband players may at this point think 
-they've lost out on the rabbits foot of burglary! (they haven't though as it 
-doesn't exist in ToME).
-
-#####B[HOOK_CHAR_DUMP] = function()
-#####B	if (quest(AMULET_QUEST).status == QUEST_STATUS_FAILED) then
-#####B		print_hook("\n You chickened out of rescuing a necklace and 
-#####B							made a little girl sad. ")
-#####B	elseif (quest(AMULET_QUEST).status == QUEST_STATUS_COMPLETED) or 
-#####B		(quest(AMULET_QUEST).status == QUEST_STATUS_REWARDED) or 
-#####B		(quest(AMULET_QUEST).status == QUEST_STATUS_FINISHED) then
-#####B			print_hook("\n You rescued little Hannah Cooke's necklace from 
-#####B							the nasty monsters ")			
-#####B	end
-#####B	return FALSE
-#####Bend,
-
-This quite simply and obviously prints an appropriate line in the character 
-dump based on the status of the quest. The [[[[[B\n] bit ensures the text goes on a 
-new line, so make sure you include it! Also you should return FALSE as 
-returning TRUE will stop executing all the other character dump lines (and you 
-may get other quests not having their lines printed).
-
-=== A word about returning TRUE and FALSE ===
-
-As I mentioned above, you need to be careful what you return when dealing with 
-HOOKS as you can mess up the game a bit. Bear in mind that if you add a 
-function to [[[[[BHOOK_GEN_QUEST], every time a quest is generated, that function will 
-run. If you return TRUE, then no further functions attached to that hook will 
-run. If you return FALSE, it continues processing functions on that hook.
-
-That is pretty much it. Do take a look at the other included scripts that I 
-haven't gone into any detail about in the files, as you'll pick up some useful 
-techniques there too. Especially worthy of note is the hina.lua file which uses 
-hooks outside of the quest structure and also global variables and variables in 
-a table. If you have any questions, let me know at the email addy below.
-
-Back to the *****lua.hlp*0[lua help index] .
-
-                             [[[[[gThis file by fearoffours (fearoffours@moppy.co.uk)]
diff --git a/lib/help/lua_skil.txt b/lib/help/lua_skil.txt
deleted file mode 100644
index 87385e5d..00000000
--- a/lib/help/lua_skil.txt
+++ /dev/null
@@ -1,342 +0,0 @@
-|||||oy
-#####R             /----------------------------------------\
-#####R            <       Adding new skill-based powers      >
-#####R             \----------------------------------------/
-
-#####R=== Introduction ===
-
-This is very much in the same vein as adding a racial/extra power, but has to 
-be tied into skills, and we're defining more than one spell at once. You should 
-have read the *****lua_intr.txt*0[scripting introduction] and 
-*****lua_pow.txt*0[racial power tutorial] before going much further. Both of the above files 
-contain some fairly fundamental information which you will find necessary for 
-full understanding of this file.
-
-#####R=== Getting started ===
-
-Open construc.lua (you have downloaded the example scripts from 
-[[[[[Ghttp://www.moppy.co.uk/angband.htm], haven't you?). The idea behind this 
-script is that it adds a skill which affects you ability to build/knock down 
-stuff. It treats the equivalent of stone-to-mud and trap-door destruction 
-spells as if they were "building skills". It also adds quite a few high-level 
-'spells' which do funky things like carving out corridors and chambers in a 
-single turn, and building doors and stuff. Just think of it as if the person 
-who has plenty of skills in this area would be a builder-type with lots of 
-strength and constitution... 
-
-In order to add these powers we're going to edit the s_info.txt file which 
-lives in the edit folder, and add a new skill, underneath the 'misc' tree, 
-called construction.  The powers will then be accessed through the 'm' menu, in 
-a similar way to mindcraft or alchemy skills or such. (That is, no books are 
-needed to cast them, as we're treating them as a craft that has been learnt, 
-rather than spells.) Our fist line of the script file reads:
-
-#####BSKILL_CONSTRUCT = 57
-
-This merely links the skill index that we'll be defining in s_info.txt to this 
-file. We'll come back to this at the end of the tutorial.
-
-#####Bconstructor_powers = add_magic
-
-In a similar way to the [[[[[Badd_power] function we called when we added the 
-Phoenix racial ability, this line calls a special function which we use to 
-define new skills. It follows a very specific, but easy to understand form. It 
-starts with a brace, which indicates the add_magic function will be storing 
-these values in a table. Don't worry about this too much, but understand that a 
-table starts and ends with braces [[[[[B{] and [[[[[B}] respectively. Each key 
-(or field name) takes the format [[[[[B"key" = value,] (the comma is 
-important!). 
-
-#####B	["fail"] = 	function()
-#####B			msg_print("You decide now is a good time for a cuppa")
-#####B	end,
-#####B	["stat"] = 	A_STR,
-#####B	["get_level"] = 	function()
-#####B			return get_skill_scale(SKILL_CONSTRUCT, 50)
-#####B	end,
-#####B	["spell_list"] = 
-
-[[[[[B"fail"] is a function that is called whenever you ##fail to cast the 
-spells##. Here it does nothing spectacular.
-[[[[[B"stat"] defines the stat used to cast the spells. Here it is strength. 
-Any other stat can be used, prefix it with [[[[[BA_].
-[[[[[B"get_level"] is used to determine the level of the spell. It's associated 
-with spells that increase in power the more points that are invested in the 
-associated skill. I know that's not terribly clear, I'll come back to it in a 
-moment.
-[[[[[B"spell_list"] is just that, a list of all the spells. 
-Each of these four properties within the table must end with a comma. If a 
-function is defined in the property itself then we add the comma after the 
-closing [[[[[Bend]. Again compare with construct.lua to see it. Any line NOT 
-ending with a comma will cause a lua error on startup, probably of the type 
-[[[[[V'}' expected to close '{' at line <whatever>.] 
-
-#####R=== The spell list ===
-
-Each spell, within the [[[[[B"spell_list"] key has its own set of properties 
-that we need to define from a sub-table so we open another set of braces to 
-start the spell list, and then a third set of braces to start the first spell. 
-So with all this, our first spell looks like:
-
-#####B	["spell_list"] = 
-#####B	{
-#####B		{
-#####B			["name"] = 
-#####B			["desc"] = 
-#####B			["mana"] = 
-#####B			["level"] = 
-#####B			["fail"] = 
-#####B			["spell"] = 
-#####B			["info"] = 
-#####B		},
-
-[[[[[B"name"] is, as you would expect, the name of the spell, as you want it to 
-appear in the spell list when choosing a spell. The maximum number of 
-characters for this is 29.
-[[[[[B"desc"] is the description received when you hit the capital letter of 
-that spell in the menu. (i.e., press 'a' to cast the first spell, but press 'A' 
-to receive info about the first spell. 
-[[[[[B"mana"] is the amount of mana required to cast the spell.
-[[[[[B"level"] is the level required to use that spell (that's level of the (in 
-this case construction) skill, not character level!).
-[[[[[B"fail"] is base fail rate.
-[[[[[B"spell"] is the function that is executed when the spell is cast. Note 
-that it MUST take the form [[[[[Bfunction() blah end] even if you're calling
-a C function directly. If you have a look at the end of the file, you'll see
-the "rebuild dungeon" spell which is identical to the "alter_reality" spell. 
-However, rather than reading [[[[[B"spell" = alter_reality()], it reads:
-
-#####B["spell"] = function()
-#####B		alter_reality()
-#####Bend,
-
-which appears to be a long way round to do the same thing, but this is how it 
-must be done.
-
-In a similar way, the [[[[[B"info"] key must begin with a [[[[[Bfunction()] 
-and return the value of what is to be displayed alongside the spell name, 
-level and mana in the spell list. The maximum number of characters that can be 
-displayed here is dependent on the width of the user's screen, but try to keep 
-it under 12 if you can, as this will fit in a standard 80x24 terminal screen. 
-The first character will need to be a space otherwise you'll have the info line 
-squashed right up against the fail rate and it will look odd. If you wish to 
-have this part blank in the spell list, you still need to return a value, so 
-just a single space will do : [[[[[Breturn " "]
-
-All of these keys are repeated for each spell, with each spell in its own 
-table (therefore, it's own set of braces). Again, check the lua file for 
-clarification.
-
-When entering the spells in the "spell_list", you must take care to specify 
-them in the order which they are gained, otherwise they display incorrectly in 
-the spell list.
-
-You should by now be experienced enough to understand most of what's going on 
-in the actual spell functions (especially if you dig around in the source a 
-bit, and check out Chris Hadgis' excellent *****lua_spel.txt*0[spell.pkg] helper 
-files. I'm not going to go through the whole file line by line, as this is 
-something you should do yourself, figuring out what's going on. I'm going to 
-examine a few of the things we haven't covered before though, so pay attention.
-
-#####R=== The get_level() function ===
-
-Probably one of the most important functions that you see reappearing in the 
-file is the [[[[[Bget_level()] function. All this does is return the numerical 
-value of the power that is given as the first argument. So [[[[[Bget_level]
-[[[[[B(constructor_power)] will return the current level of the constructor power. 
-Given that the level of this is taken directly from the construction skill, (we 
-defined that in the [[[[[B"get_level"] key, by saying [[[[[Bget_skill_scale]
-[[[[[B(SKILL_CONSTRUCT, 50)] ) it will return the value of your construction skill. 
-[[[[[Bconstructor_power] is the name of the whole power, we named it thus on 
-the second line of the script!
-
-[[[[[Bget_level] takes the following arguments: [[[[[Bget_level(power, max, ]
-[[[[[Bmin)]. The power is obviously which power we're taking the value from, and the 
-max and min allow you to define boundaries for the spell. For instance the 
-current maximum value that [[[[[Bget_level(constructor_power)] can return is 
-50, as that is the maximum number of skill points you can have in that skill. 
-If you were using this as the basis for the damage of a low-level bolt spell, 
-you might decide that having a damage of 50 would be too much (unlikely, but 
-still possible). You could therefore define a maximum value of 20 so that when 
-the value of the construction skill was over 50, the maximum value for 
-damage of that spell would be 20. To achieve this you'd have: 
-[[[[[Bget_level(constructor_power, 20)]. In a similar way, you can force the 
-minimum value of the spell to be higher than the actual construction skill 
-level, with a [[[[[Bget_level(constructor_power, 50, 15)]. This would be useful 
-say for spells that you wanted to be available when the construction skill 
-level reaches 10, but for whom you wanted a (for example) base damage of 15 
-right from the word go. These re-scale values rather than capping them!
-
-You can leave out the minimum value as I have done above. You can also leave 
-the maximum value out (it will default to 50). If you want to specify a minimum 
-value though, you MUST specify a maximum value as well.
-
-As you have hopefully been able to tell, the [[[[[Bget_level()] function 
-enables us to have spells that increase in usefulness as you gain levels. Let's 
-take the "Dismantle" spell. The function in the [[[[[B"spell"] key is as 
-follows:
-
-#####Bfunction()
-#####B	local ret, dir, dam
-
-#####B	if (get_level(constructor_powers, 50) >= 11) then
-#####B		ret, dir = get_aim_dir();
-#####B		if (ret == FALSE) then return end
-#####B		fire_beam(GF_KILL_TRAP, dir, 1)
-#####B	else
-#####B		fire_ball(GF_KILL_TRAP, 0, 1, 1)
-#####B	end
-#####Bend,
-
-The [[[[[Bif] statement is obviously what really interests us here. You'll 
-notice that this has the amendment of an [[[[[Belse] clause, which the [[[[[Bif] 
-statement we used in the previous tutorial did not. As you would expect, if the 
-condition on the first line of this statement is met, then the instructions 
-immediately below it are carried out. If the condition is not met, then the 
-statements that follow the [[[[[Belse] are executed.
-
-Coming back to the [[[[[Bget_level] function, we learnt from above, that the 
-[[[[[Bget_level] part of this function translates as, "if the value of the 
-construction_power level (which happens to be identical to the construction 
-skill level) is greater than or equal to 11, cast a beam of trap disarming in 
-the specified direction. (The first part of this is all straightforward, 
-getting a direction, and cancelling correctly if the player presses 'ESC'.) 
-Otherwise, cast a ball of trap disarming with a radius of one, centred on the 
-player."
-
-In the same way, as you look at the construc.lua file, you will see that 
-[[[[[Bget_level()] is used many times in this way, to increase the power of 
-detection spells, to change bolt spells to ball spells, to keep a constantly 
-increasing damage going, and so on.
-
-#####R=== Elseif's and things ===
-
-If you want to provide more than one alternative condition, in an 
-[[[[[Bif-then-else] statement, you can use [[[[[Belseif]s which do what you 
-might expect. Take a look at the first spell, "Survey area", for an example of 
-this: 
-
-#####Bif (get_level(constructor_powers, 50) >= 28) then
-#####B	wiz_lite()
-#####Belseif (get_level(constructor_powers, 50) >= 15) then
-#####B	map_area()
-#####B	detect_traps(DEFAULT_RADIUS)
-#####Belseif (get_level(constructor_powers, 50) >= 5) then
-#####B	detect_traps(DEFAULT_RADIUS)
-#####B	detect_stairs(DEFAULT_RADIUS)
-#####B	detect_doors(DEFAULT_RADIUS)
-#####Belse 
-#####B	detect_stairs(DEFAULT_RADIUS)
-#####B	detect_doors(DEFAULT_RADIUS)
-#####Bend
-
-If the level of constructor powers is greater or equal to 28, then the function 
-[[[[[Bwiz_lite()] is performed, and no other part of the if statement is 
-executed. [[[[[Bwiz_lite()] is just the enlightenment spell. If it is less than 
-28, the next condition is examined: that if the level of constructor powers is 
-greater than or equal to 15, then [[[[[Bmap_area()](Magic mapping) and detect 
-traps are called. If the level of constructor power is less than 15, it moves 
-onto the next condition, which says that if the level of constructor power is 
-greater than 5, then detect stairs, traps and doors. If none of these 
-conditions are met,(that is, if the level of construction skill is less than 5) 
-then we just detect doors and stairs.
-
-You'll note that each of the detection spells includes a DEFAULT_RADIUS 
-constant. You could change this to a numerical value, or a variable defined 
-somewhere else in your script. eg [[[[[Bdetect_traps(2)] would detect traps 
-with a radius of 2 centred on the player. 
-
-#####R=== Registering the skill type ===
-
-This is what we do at the end of the file, and is what ties the powers we've 
-defined to the action of pressing the 'm' key in game. Once more we're calling 
-a special function [[[[[Badd_mkey()] which takes its arguments for a table. 
-There are only two keys in this table though which keeps things simple.
-
-#####Badd_mkey
-#####B{
-#####B        ["mkey"] =      MKEY_CONSTRUCT_POWERS,
-#####B        ["fct"] =       function()
-#####B         		execute_magic(constructor_powers)
-#####B                	energy_use = energy_use + 100;
-#####B        end
-#####B}
-
-[[[[[B"mkey"] must be a UNIQUE value > 1000 . Here I've defined it as a 
-constant, [[[[[BMKEY_CONSTRUCT_POWERS], which has the value 1004. This value 
-we'll call again in the s_info.txt file.
-[[[[[B"fct"] is the function that's called when the user presses the key in the 
-'m' menu. So here, it calls the [[[[[Bexecute_magic] function which actually 
-displays a list of powers for the user to choose from. The argument it takes is 
-the powers it will use (alchemy, mindcraft, etc., or in this case constructor), 
-and then the [[[[[Benergy_use] line tells the game to take one game turn to do 
-the action.
-
-#####R=== Adding the skill in s_info.txt ===
-
-Take a look in the s_info.txt file, under the Misc section. You'll see,
-
-#####BN:57:Construction
-#####BD:Ability to use constructor powers
-#####BD:Construction powers use strength
-#####BA:1004:Build or knock down stuff
-#####BI:1000
-
-The first line is the index of the skill; again this must be unique. The second 
-property is the name of the skill. The [[[[[BD] lines are the lines displayed 
-when the skill is highlighted in the skill screen.
-The first entry on the [[[[[BA] line  is the value of the [[[[[B"mkey"] we 
-defined in the [[[[[Badd_mkey] function in our script. The second entry is the 
-display for selecting the construction power in the 'm' menu.
-The [[[[[BI] line is currently unused, but add a 1000 there anyway. That's what 
-all the others have so when it's introduced, at least it will affect your 
-powers identically to how it affects all the other powers.
-
-If you scroll to the very bottom of the file now, you'll see I've placed the 
-skill at the bottom of the Misc branch of the skills tree. I then made a new 
-class, constructor, which you can see in p_info.txt. 
-
-That is all that is NEEDED when writing a script to add a skill - defining an 
-mkey using add_mkey, and defining any powers that are called in the 
-[[[[[B"fct"] (generally using [[[[[Badd_magic] ).
-
-And I've added the line
-
-#####Btome_dofile("construc.lua")
-
-in init.lua so the script is loaded on start-up!
-
-Below I'm going to talk in depth about a few other functions that you may find 
-useful in your scripting.
-
-#####R=== fire_bolt() and fire_beam() ===
-
-In the last help file we looked at the routine for firing a ball - 
-[[[[[Bfire_ball()]. Here's a quick note about beams and bolts...  
-[[[[[Bfire_beam()] and [[[[[Bfire_bolt()] take 2 arguments: 
-[[[[[B(type, direction, damage)]. So in the dismantle spell we have the 
-direction passed from [[[[[Bget_aim_dir()] (the function that asks the player 
-for a direction), the type of damage is [[[[[BGF_KILL_TRAP], which as you might 
-expect disarms traps. And the damage is only 1 because it's not going to hurt 
-monsters, just dismantle traps.
-
-#####R=== set_oppose_elec() ===
-
-OK here's another thing. Wander on down to the sparky_skills spell.  After the 
-appropriate bolt/ball is fired, we have the line:
-
-#####Bif player.oppose_elec == 0 then 
-#####B	set_oppose_elec(randint(10) + 20 + get_level(constructor_powers, 20)*3)
-#####Bend
-
-This is the bit that grants temporary resist electricity. We've called the 
-function [[[[[Bset_oppose_elec(turns)], which sets the player's resist
-electricity to "on" for the time specified in the argument "turns". We're only 
-calling this if the player is not already granted temporary resist electricity, 
-and we've linked the number of turns it is active to the level of the 
-construction skill. I've limited the maximum value of get_level to 20 in this 
-instance. A similar idea can be used for temporarily granting levitation, 
-extended infravision, protection against evil, resist fire, stuns, cuts and so 
-on and so on. Have a look in player.pkg in the source for a full list....
-
-                             [[[[[gThis file by fearoffours (fearoffours@moppy.co.uk)]
diff --git a/lib/help/lua_spel.txt b/lib/help/lua_spel.txt
deleted file mode 100644
index aa4a532b..00000000
--- a/lib/help/lua_spel.txt
+++ /dev/null
@@ -1,2150 +0,0 @@
-|||||oy
-
-#####R             /----------------------------------------\
-#####R            <      spell.pkg functions helper file     >
-#####R             \----------------------------------------/
-
-----------------------------------------------------------------------
-
-#####R=== teleport_player_directed ===
-
-#####GDeclaration
-    extern void teleport_player_directed(int rad, int dir);
-
-#####GFile
-    spells1.c
-
-#####GComment
-/*
- * Teleport player, using a distance and a direction as a rough guide.
- *
- * This function is not at all obsessive about correctness.
- * This function allows teleporting into vaults (!)
- */
-
-#####GDescription
-Teleport a player up to "rad" grids away roughly in "dir" direction.
-
-#####GParameters
-> "rad" must not exceed 200. The distance teleported is a minimum of a
-  quarter of "rad".
-> "dir" must be from 0 to 9.
-  *****fields.txt*0[direction]
-
-----------------------------------------------------------------------
-
-#####R=== teleport_away ===
-
-#####GDeclaration
-    extern void teleport_away(int m_idx, int dis);
-
-#####GFile
-    spells1.c
-
-#####GComment
-/*
- * Teleport a monster, normally up to "dis" grids away.
- *
- * Attempt to move the monster at least "dis/2" grids away.
- *
- * But allow variation to prevent infinite loops.
- */
-
-#####GDescription
-Teleport monster indicated by "m_idx" up to "dis" grids away.
-
-#####GParameters
-> "m_idx" is the index of the monster in m_list[].
-> "dis" must not exceed 200. The distance teleported is a minimum of a
-  quarter of "dis".
-
-----------------------------------------------------------------------
-
-#####R=== teleport_player ===
-
-#####GDeclaration
-    extern void teleport_player(int dis);
-
-#####GFile
-    spells1.c
-
-#####GComment
-/*
- * Teleport the player to a location up to "dis" grids away.
- *
- * If no such spaces are readily available, the distance may increase.
- * Try very hard to move the player at least a quarter that distance.
- */
-
-#####GDescription
-Teleport player up to "dis" grids away.
-
-#####GParameters
-> "dis" must not exceed 200. The distance teleported is a minimum of a
-  quarter of "dis".
-
-----------------------------------------------------------------------
-
-#####R=== teleport_player_to ===
-
-#####GDeclaration
-    extern void teleport_player_to(int ny, int nx);
-
-#####GFile
-    spells1.c
-
-#####GComment
-/*
- * Teleport player to a grid near the given location
- *
- * This function is slightly obsessive about correctness.
- * This function allows teleporting into vaults (!)
- */
-
-#####GDescription
-Teleport player to a grid near the given location ("ny", "nx"). If
-the location is empty, the player goes there, otherwise they go to
-a grid as close as possible to the location.
-
-#####GParameters
-> "ny" is the y co-ordinate of the location.
-> "nx" is the x co-ordinate of the location.
-
-----------------------------------------------------------------------
-
-#####R=== teleport_monster_to ===
-
-#####GDeclaration
-    extern void teleport_monster_to(int m_idx, int ny,
-        int nx);
-
-#####GFile
-    spells1.c
-
-#####GComment
-/*
- * Teleport a monster to a grid near the given location
- *
- * This function is slightly obsessive about correctness.
- */
-
-#####GDescription
-Teleport monster indicated by "m_idx" to a grid near the given
-location ("ny", "nx"). If the location is empty, the monster goes
-there, otherwise they go to a grid as close as possible to the
-location.
-
-#####GParameters
-> "m_idx" is the index of the monster in m_list[].
-> "ny" is the y co-ordinate of the location.
-> "nx" is the x co-ordinate of the location.
-
-----------------------------------------------------------------------
-
-#####R=== teleport_player_level ===
-
-#####GDeclaration
-    extern void teleport_player_level(void);
-
-#####GFile
-    spells1.c
-
-#####GComment
-/*
- * Teleport the player one level up or down (random when legal)
- */
-
-#####GDescription
-Teleport the player one level up or down at random.
-
-----------------------------------------------------------------------
-
-#####R=== recall_player ===
-
-#####GDeclaration
-    extern void recall_player(void);
-
-#####GFile
-    spells1.c
-
-#####GComment
-/*
- * Recall the player to town or dungeon
- */
-
-#####GDescription
-Recall the player to town (if in dungeon) or dungeon (if in town).
-
-----------------------------------------------------------------------
-
-#####R=== take_hit ===
-
-#####GDeclaration
-    extern void take_hit(int damage, cptr kb_str);
-
-#####GFile
-    spells1.c
-
-#####GComment
-/*
- * Decreases players hit points and sets death flag if necessary
- *
- * XXX XXX XXX Invulnerability needs to be changed into a "shield"
- *
- * XXX XXX XXX Hack -- this function allows the user to save (or quit)
- * the game when he dies, since the "You die." message is shown before
- * setting the player to "dead".
- */
-
-#####GDescription
-Reduce the player's current hit points by "damage" points. If the
-player dies, "kb_str" is used to record what the player was killed by
-(see high-score table).
-
-#####GParameters
-> "damage" is the amount of damage.
-> "kb_str" is a string describing what killed the player.
-
-----------------------------------------------------------------------
-
-#####R=== take_sanity_hit ===
-
-#####GDeclaration
-    extern void take_sanity_hit(int damage, cptr hit_from);
-
-#####GFile
-    spells1.c
-
-#####GComment
-/* Decrease player's sanity. This is a copy of the function above. */
-
-#####GDescription
-Reduce the player's current sanity points by "damage" points. If the
-player dies, "hit_from" is used to record what the player was killed
-by (see high-score table).
-
-#####GParameters
-> "damage" is the amount of damage.
-> "hit_from" is a string describing what killed the player.
-
-----------------------------------------------------------------------
-
-#####R=== project ===
-
-#####GDeclaration
-    extern bool project(int who, int rad, int y, int x,
-        int dam, int typ, int flg);
-
-#####GFile
-    spells1.c
-
-#####GComment
-/*
- * Generic "beam"/"bolt"/"ball" projection routine.
- *
- * Input:
- *   who: Index of "source" monster (negative for "player")
- *        jk -- -2 for traps, only used with project_jump
- *   rad: Radius of explosion (0 = beam/bolt, 1 to 9 = ball)
- *   y,x: Target location (or location to travel "towards")
- *   dam: Base damage roll to apply to affected monsters (or player)
- *   typ: Type of damage to apply to monsters (and objects)
- *   flg: Extra bit flags (see PROJECT_xxxx in "defines.h")
- *
- * Return:
- *   TRUE if any "effects" of the projection were observed, else FALSE
- *
- * Allows a monster (or player) to project a beam/bolt/ball of a given kind
- * towards a given location (optionally passing over the heads of interposing
- * monsters), and have it do a given amount of damage to the monsters (and
- * optionally objects) within the given radius of the final location.
- *
- * A "bolt" travels from source to target and affects only the target grid.
- * A "beam" travels from source to target, affecting all grids passed through.
- * A "ball" travels from source to the target, exploding at the target, and
- *   affecting everything within the given radius of the target location.
- *
- * Traditionally, a "bolt" does not affect anything on the ground, and does
- * not pass over the heads of interposing monsters, much like a traditional
- * missile, and will "stop" abruptly at the "target" even if no monster is
- * positioned there, while a "ball", on the other hand, passes over the heads
- * of monsters between the source and target, and affects everything except
- * the source monster which lies within the final radius, while a "beam"
- * affects every monster between the source and target, except for the casting
- * monster (or player), and rarely affects things on the ground.
- *
- * Two special flags allow us to use this function in special ways, the
- * "PROJECT_HIDE" flag allows us to perform "invisible" projections, while
- * the "PROJECT_JUMP" flag allows us to affect a specific grid, without
- * actually projecting from the source monster (or player).
- *
- * The player will only get "experience" for monsters killed by himself
- * Unique monsters can only be destroyed by attacks from the player
- *
- * Only 256 grids can be affected per projection, limiting the effective
- * "radius" of standard ball attacks to nine units (diameter nineteen).
- *
- * One can project in a given "direction" by combining PROJECT_THRU with small
- * offsets to the initial location (see "line_spell()"), or by calculating
- * "virtual targets" far away from the player.
- *
- * One can also use PROJECT_THRU to send a beam/bolt along an angled path,
- * continuing until it actually hits something (useful for "stone to mud").
- *
- * Bolts and Beams explode INSIDE walls, so that they can destroy doors.
- *
- * Balls must explode BEFORE hitting walls, or they would affect monsters
- * on both sides of a wall.  Some bug reports indicate that this is still
- * happening in 2.7.8 for Windows, though it appears to be impossible.
- *
- * We "pre-calculate" the blast area only in part for efficiency.
- * More importantly, this lets us do "explosions" from the "inside" out.
- * This results in a more logical distribution of "blast" treasure.
- * It also produces a better (in my opinion) animation of the explosion.
- * It could be (but is not) used to have the treasure dropped by monsters
- * in the middle of the explosion fall "outwards", and then be damaged by
- * the blast as it spreads outwards towards the treasure drop location.
- *
- * Walls and doors are included in the blast area, so that they can be
- * "burned" or "melted" in later versions.
- *
- * This algorithm is intended to maximise simplicity, not necessarily
- * efficiency, since this function is not a bottleneck in the code.
- *
- * We apply the blast effect from ground zero outwards, in several passes,
- * first affecting features, then objects, then monsters, then the player.
- * This allows walls to be removed before checking the object or monster
- * in the wall, and protects objects which are dropped by monsters killed
- * in the blast, and allows the player to see all affects before he is
- * killed or teleported away.  The semantics of this method are open to
- * various interpretations, but they seem to work well in practice.
- *
- * We process the blast area from ground-zero outwards to allow for better
- * distribution of treasure dropped by monsters, and because it provides a
- * pleasing visual effect at low cost.
- *
- * Note that the damage done by "ball" explosions decreases with distance.
- * This decrease is rapid, grids at radius "dist" take "1/dist" damage.
- *
- * Notice the "napalm" effect of "beam" weapons.  First they "project" to
- * the target, and then the damage "flows" along this beam of destruction.
- * The damage at every grid is the same as at the "centre" of a "ball"
- * explosion, since the "beam" grids are treated as if they ARE at the
- * centre of a "ball" explosion.
- *
- * Currently, specifying "beam" plus "ball" means that locations which are
- * covered by the initial "beam", and also covered by the final "ball", except
- * for the final grid (the epicentre of the ball), will be "hit twice", once
- * by the initial beam, and once by the exploding ball.  For the grid right
- * next to the epicentre, this results in 150% damage being done.  The centre
- * does not have this problem, for the same reason the final grid in a "beam"
- * plus "bolt" does not -- it is explicitly removed.  Simply removing "beam"
- * grids which are covered by the "ball" will NOT work, as then they will
- * receive LESS damage than they should.  Do not combine "beam" with "ball".
- *
- * The array "gy[],gx[]" with current size "grids" is used to hold the
- * collected locations of all grids in the "blast area" plus "beam path".
- *
- * Note the rather complex usage of the "gm[]" array.  First, gm[0] is always
- * zero.  Second, for N>1, gm[N] is always the index (in gy[],gx[]) of the
- * first blast grid (see above) with radius "N" from the blast centre.  Note
- * that only the first gm[1] grids in the blast area thus take full damage.
- * Also, note that gm[rad+1] is always equal to "grids", which is the total
- * number of blast grids.
- *
- * Note that once the projection is complete, (y2,x2) holds the final location
- * of bolts/beams, and the "epicentre" of balls.
- *
- * Note also that "rad" specifies the "inclusive" radius of projection blast,
- * so that a "rad" of "one" actually covers 5 or 9 grids, depending on the
- * implementation of the "distance" function.  Also, a bolt can be properly
- * viewed as a "ball" with a "rad" of "zero".
- *
- * Note that if no "target" is reached before the beam/bolt/ball travels the
- * maximum distance allowed (MAX_RANGE), no "blast" will be induced.  This
- * may be relevant even for bolts, since they have a "1x1" mini-blast.
- *
- * Note that for consistency, we "pretend" that the bolt actually takes "time"
- * to move from point A to point B, even if the player cannot see part of the
- * projection path.  Note that in general, the player will *always* see part
- * of the path, since it either starts at the player or ends on the player.
- *
- * Hack -- we assume that every "projection" is "self-illuminating".
- *
- * Hack -- when only a single monster is affected, we automatically track
- * (and recall) that monster, unless "PROJECT_JUMP" is used.
- *
- * Note that all projections now "explode" at their final destination, even
- * if they were being projected at a more distant destination.  This means
- * that "ball" spells will *always* explode.
- *
- * Note that we must call "handle_stuff()" after affecting terrain features
- * in the blast radius, in case the "illumination" of the grid was changed,
- * and "update_view()" and "update_monsters()" need to be called.
- */
-
-#####GDescription
-Generate a beam/bolt/ball starting from "who" with a radius of "rad"
-at target grid "y,x" for "damage" points of "typ" damage. The beam/
-bolt/ball can have various properties as denoted by "flg".
-
-#####GParameters
-> "who" is > 0 (index of monster in m_list[]), < 0 and
-  not -100 or -101 (player), -100 or -101 (trap).
-> "rad" is 0 for a beam/bolt and 1-9 for a ball.
-> "y" is the y co-ordinate of the target grid.
-> "x" is the x co-ordinate of the target grid.
-> "dam" is the number of points of damage.
-> "typ" is the type of damage
-  *****fields.txt*0[GF_fields]
-> "flg" is the projection effect
-  *****fields.txt*0[PROJECT_fields]
-
-----------------------------------------------------------------------
-
-#####R=== corrupt_player ===
-
-#####GDeclaration
-    extern void corrupt_player(void);
-
-#####GFile
-    spells1.c
-
-#####GComment
-(none)
-
-#####GDescription
-Swap two of the players stats at random.
-
-----------------------------------------------------------------------
-
-#####R=== grow_trees ===
-
-#####GDeclaration
-    extern void grow_trees(int rad);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Grow trees
- */
-
-#####GDescription
-Grow up to (("rad" x "rad") + 11) trees around the player.
-
-#####GParameters
-> "rad" is the radius of the area where trees may grow.
-
-----------------------------------------------------------------------
-
-#####R=== hp_player ===
-
-#####GDeclaration
-    extern bool hp_player(int num);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Increase players hit points, notice effects
- */
-
-#####GDescription
-Add "num" points to the player's current hit points. The total can
-not exceed the maximum.
-
-#####GParameters
-> "num" is the number of points to add.
-
-----------------------------------------------------------------------
-
-#####R=== heal_insanity ===
-
-#####GDeclaration
-    extern bool heal_insanity(int val);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/* Heal insanity. */
-
-#####GDescription
-Add "val" points to the player's current sanity points. The total can
-not exceed the maximum.
-
-#####GParameters
-> "val" is the number of points to add.
-
-----------------------------------------------------------------------
-
-#####R=== warding_glyph ===
-
-#####GDeclaration
-    extern void warding_glyph(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Leave a "glyph of warding" which prevents monster movement
- */
-
-#####GDescription
-Place a glyph at the player's location. The location must be bare.
-
-----------------------------------------------------------------------
-
-#####R=== explosive_rune ===
-
-#####GDeclaration
-    extern void explosive_rune(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-(none)
-
-#####GDescription
-Place a minor glyph (explosive rune) at the player's location. The
-location must be bare.
-
-----------------------------------------------------------------------
-
-#####R=== do_dec_stat ===
-
-#####GDeclaration
-    extern bool do_dec_stat(int stat, int mode);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Lose a "point"
- */
-
-#####GDescription
-Attempt to reduce the player's "stat" statistic by a point.
-
-#####GParameters
-> "stat" is the statistic
-  *****fields.txt*0[A_fields]
-> "mode" is the type of decrease: temporary, normal, or permanent
-  *****fields.txt*0[STAT_DEC_fields]
-
-----------------------------------------------------------------------
-
-#####R=== do_res_stat ===
-
-#####GDeclaration
-    extern bool do_res_stat(int stat);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Restore lost "points" in a stat
- */
-
-#####GDescription
-Restore the player's "stat" statistic.
-
-#####GParameters
-> "stat" is the statistic
-  *****fields.txt*0[A_fields]
-
-----------------------------------------------------------------------
-
-#####R=== do_inc_stat ===
-
-#####GDeclaration
-    extern bool do_inc_stat(int stat);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Gain a "point" in a stat
- */
-
-#####GDescription
-Increase the player's "stat" statistic by a point.
-
-#####GParameters
-> "stat" is the statistic
-  *****fields.txt*0[A_fields]
-
-----------------------------------------------------------------------
-
-#####R=== identify_pack ===
-
-#####GDeclaration
-    extern void identify_pack(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Identify everything being carried.
- * Done by a potion of "self knowledge".
- */
-
-#####GDescription
-Identify all items in the inventory.
-
-----------------------------------------------------------------------
-
-#####R=== remove_curse ===
-
-#####GDeclaration
-    extern bool remove_curse(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Remove most curses
- */
-
-#####GDescription
-Remove all curses except for heavy curses.
-
-----------------------------------------------------------------------
-
-#####R=== remove_all_curse ===
-
-#####GDeclaration
-    extern bool remove_all_curse(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Remove all curses
- */
-
-#####GDescription
-Remove all curses including heavy curses.
-
-----------------------------------------------------------------------
-
-#####R=== restore_level ===
-
-#####GDeclaration
-    extern bool restore_level(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Restores any drained experience
- */
-
-#####GDescription
-Restore all drained experience points (if any).
-
-----------------------------------------------------------------------
-
-#####R=== self_knowledge ===
-
-#####GDeclaration
-    extern void self_knowledge(FILE *fff);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * self-knowledge... idea from nethack.  Useful for determining powers and
- * resistances of items.  It saves the screen, clears it, then starts listing
- * attributes, a screenful at a time.  (There are a LOT of attributes to
- * list.  It will probably take 2 or 3 screens for a powerful character whose
- * using several artifacts...) -CFT
- *
- * It is now a lot more efficient. -BEN-
- *
- * See also "identify_fully()".
- *
- * XXX XXX XXX Use the "show_file()" method, perhaps.
- */
-
-#####GDescription
-Show all attributes including racial powers, mutations, and equipment
-effects.
-
-#####GParameters
-> "*ffff" points to a file (write info to file) or is NULL (write info
-  to screen).
-
-----------------------------------------------------------------------
-
-#####R=== lose_all_info ===
-
-#####GDeclaration
-    extern bool lose_all_info(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Forget everything
- */
-
-#####GDescription
-Forget about objects and the map.
-
-----------------------------------------------------------------------
-
-#####R=== detect_traps ===
-
-#####GDeclaration
-    extern bool detect_traps(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Detect all traps on current panel
- */
-
-#####GDescription
-Detect all traps on current panel.
-
-----------------------------------------------------------------------
-
-#####R=== detect_doors ===
-
-#####GDeclaration
-    extern bool detect_doors(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Detect all doors on current panel
- */
-
-#####GDescription
-Detect all doors on current panel.
-
-----------------------------------------------------------------------
-
-#####R=== detect_stairs ===
-
-#####GDeclaration
-    extern bool detect_stairs(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Detect all stairs on current panel
- */
-
-#####GDescription
-Detect all stairs on current panel.
-
-----------------------------------------------------------------------
-
-#####R=== detect_treasure ===
-
-#####GDeclaration
-    extern bool detect_treasure(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Detect any treasure on the current panel
- */
-
-#####GDescription
-Detect any treasure on the current panel.
-
-----------------------------------------------------------------------
-
-Field: hack_no_detect_message
-Value: FALSE
-
-----------------------------------------------------------------------
-
-#####R=== detect_objects_gold ===
-
-#####GDeclaration
-    extern bool detect_objects_gold(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Detect all "gold" objects on the current panel
- */
-
-#####GDescription
-Detect all objects with the TV_GOLD flag.
-
-----------------------------------------------------------------------
-
-#####R=== detect_objects_normal ===
-
-#####GDeclaration
-    extern bool detect_objects_normal(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Detect all "normal" objects on the current panel
- */
-
-#####GDescription
-Detect all objects without the TV_GOLD flag.
-
-----------------------------------------------------------------------
-
-#####R=== detect_objects_magic ===
-
-#####GDeclaration
-    extern bool detect_objects_magic(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Detect all "magic" objects on the current panel.
- *
- * This will light up all spaces with "magic" items, including artifacts,
- * ego-items, potions, scrolls, books, rods, wands, staves, amulets, rings,
- * and "enchanted" items of the "good" variety.
- *
- * It can probably be argued that this function is now too powerful.
- */
-
-#####GDescription
-Detect all "magic" objects which are artefacts, ego items, or have one
-of the following flags - TV_AMULET, TV_RING, TV_BATERIE, TV_STAFF,
-TV_WAND, TV_ROD, TV_ROD_MAIN, TV_SCROLL, TV_POTION, TV_POTION2,
-TV_VALARIN_BOOK, TV_MAGERY_BOOK, TV_SHADOW_BOOK, TV_CHAOS_BOOK,
-TV_SPIRIT_BOOK, TV_NETHER_BOOK, TV_DAEMON_BOOK, TV_CRUSADE_BOOK,
-TV_SIGALDRY_BOOK, TV_SYMBIOTIC_BOOK, TV_MUSIC_BOOK.
-
-----------------------------------------------------------------------
-
-#####R=== detect_monsters_normal ===
-
-#####GDeclaration
-    extern bool detect_monsters_normal(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Detect all "normal" monsters on the current panel
- */
-
-#####GDescription
-Detect all non-invisible monsters (without RF2_INVISIBLE).
-
-----------------------------------------------------------------------
-
-#####R=== detect_monsters_invis ===
-
-#####GDeclaration
-    extern bool detect_monsters_invis(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Detect all "invisible" monsters on current panel
- */
-
-#####GDescription
-Detect all invisible monsters (with RF2_INVISIBLE).
-
-----------------------------------------------------------------------
-
-#####R=== detect_monsters_evil ===
-
-#####GDeclaration
-    extern bool detect_monsters_evil(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Detect all "evil" monsters on current panel
- */
-
-#####GDescription
-Detect all evil monsters (with RF3_EVIL).
-
-----------------------------------------------------------------------
-
-#####R=== detect_monsters_good ===
-
-#####GDeclaration
-    extern bool detect_monsters_good(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/* Detect good monsters */
-
-#####GDescription
-Detect all good monsters (with RF3_GOOD).
-
-----------------------------------------------------------------------
-
-#####R=== detect_monsters_xxx ===
-
-#####GDeclaration
-    extern bool detect_monsters_xxx(u32b match_flag);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * A "generic" detect monsters routine, tagged to flags3
- */
-
-#####GDescription
-Detect all monsters with "match_flag" flag.
-
-#####GParameters
-> "match_flag" can be any RF3_ flag (see defines.h) but only
-  RF3_DEMON, RF3_UNDEAD, RF3_GOOD work.
-
-----------------------------------------------------------------------
-
-#####R=== detect_monsters_string ===
-
-#####GDeclaration
-    extern bool detect_monsters_string(cptr);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Detect all (string) monsters on current panel
- */
-
-#####GDescription
-Detect all monsters whose default monster character matches a
-character pointed to by "cptr".
-
-#####GParameters
-> "cptr" is a pointer to a single character, eg 'Z' for hounds. For
-  available characters, see the "symbol" field of the graphics (G)
-  line of r_info.txt.
-
-----------------------------------------------------------------------
-
-#####R=== detect_monsters_nonliving ===
-
-#####GDeclaration
-    extern bool detect_monsters_nonliving(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Detect all "nonliving", "undead" or "demonic" monsters on current panel
- */
-
-#####GDescription
-Detect all non-living monsters (with RF3_NONLIVING, RF3_UNDEAD, or
-RF3_DEMON).
-
-----------------------------------------------------------------------
-
-#####R=== detect_all ===
-
-#####GDeclaration
-    extern bool detect_all(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Detect everything
- */
-
-#####GDescription
-Detects traps, doors, stairs, treasure, gold objects, normal objects,
-invisible monsters, normal (visible) monsters.
-
-----------------------------------------------------------------------
-
-#####R=== stair_creation ===
-
-#####GDeclaration
-    extern void stair_creation(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Create stairs at the player location
- */
-
-#####GDescription
-Create stairs at the player location. This is not allowed if the grid
-is not empty, the player is not in a dungeon, the player is on a
-special level, the player is in an arena or quest. If the player is
-in the town or wilderness the stairs will go down. If the player is
-on a quest level or at the bottom of a dungeon, the stairs will go up.
-Otherwise there is an even chance the stairs will go up or down.
-
-----------------------------------------------------------------------
-
-#####R=== wall_stone ===
-
-#####GDeclaration
-    extern bool wall_stone(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-(none)
-
-#####GDescription
-Create a stone wall on the player's grid. This function uses the
-project() function to create the stone wall. Apparently zero can be
-used as the "who" parameter for the player. See details for the
-project() function elsewhere in this document.
-
-----------------------------------------------------------------------
-
-#####R=== create_artifact ===
-
-#####GDeclaration
-    extern bool create_artifact(object_type *o_ptr,
-        bool a_scroll, bool get_name);
-
-#####GFile
-    randart.c
-
-#####GComment
-(none)
-
-#####GDescription
-Create an artifact from object "*optr".
-
-#####GParameters
-> "*optr* is a pointer to an object
-> "a_scroll" is true if the artifact is created by reading a scroll
-> "get_name" is true if the artifact is to be named by the player (if
-  a_scroll is true) or created randomly (a_scroll is false), or false
-  if an inscription is used.
-
-----------------------------------------------------------------------
-
-#####R=== ident_spell ===
-
-#####GDeclaration
-    extern bool ident_spell(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Identify an object in the inventory (or on the floor)
- * This routine does *not* automatically combine objects.
- * Returns TRUE if something was identified, else FALSE.
- */
-
-#####GDescription
-Identify an object in the inventory (or on the floor).
-
-----------------------------------------------------------------------
-
-#####R=== identify_fully ===
-
-#####GDeclaration
-    extern bool identify_fully(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Fully "identify" an object in the inventory  -BEN-
- * This routine returns TRUE if an item was identified.
- */
-
-#####GDescription
-Fully "identify" an object in the inventory (or on the floor).
-
-----------------------------------------------------------------------
-
-#####R=== recharge ===
-
-#####GDeclaration
-    extern bool recharge(int num);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Recharge a wand/staff/rod from the pack or on the floor.
- * This function has been rewritten in Oangband. -LM-
- *
- * Mage -- Recharge I --> recharge(90)
- * Mage -- Recharge II --> recharge(150)
- * Mage -- Recharge III --> recharge(220)
- *
- * Priest or Necromancer -- Recharge --> recharge(140)
- *
- * Scroll of recharging --> recharge(130)
- * Scroll of *recharging* --> recharge(200)
- *
- * It is harder to recharge high level, and highly charged wands,
- * staffs, and rods.  The more wands in a stack, the more easily and
- * strongly they recharge.  Staffs, however, each get fewer charges if
- * stacked.
- *
- * XXX XXX XXX Beware of "sliding index errors".
- */
-
-#####GDescription
-Recharge an object in the inventory (or on the floor) with "num"
-power.
-
-#####GParameters
-> "num" is the power used in recharging. It is compared to the
-  object's level to determine whether the item is recharged
-  successfully or destroyed. If it is recharged, it also determines
-  how many charges are added, or how much recharge time is reduced.
-
-----------------------------------------------------------------------
-
-#####R=== aggravate_monsters ===
-
-#####GDeclaration
-    extern void aggravate_monsters(int who);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Wake up all monsters, and speed up "los" monsters.
- */
-
-#####GDescription
-Aggravate monsters, originating from "who".
-
-#####GParameters
-> "who" is the index of monster in m_list[] (1 if it is the player)
-  which triggers the aggravation;
-
-----------------------------------------------------------------------
-
-#####R=== genocide ===
-
-#####GDeclaration
-    extern bool genocide(bool player_cast);
-
-#####GFile
-    spells2.c
-
-#####GComment
-(none)
-
-#####GDescription
-Genocide a monster race.
-
-#####GParameters
-> "player_cast" is true if the player cast the spell so the player can
-  take damage.
-
-----------------------------------------------------------------------
-
-#####R=== mass_genocide ===
-
-#####GDeclaration
-    extern bool mass_genocide(bool player_cast);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Delete all nearby (non-unique) monsters
- */
-
-#####GDescription
-Delete all nearby (non-unique) monsters.
-
-#####GParameters
-> "player_cast" is true if the player cast the spell so the player can
-  take damage.
-
-----------------------------------------------------------------------
-
-#####R=== probing ===
-
-#####GDeclaration
-    extern bool probing(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Probe nearby monsters
- */
-
-#####GDescription
-Probe all nearby monsters.
-
-----------------------------------------------------------------------
-
-#####R=== banish_evil ===
-
-#####GDeclaration
-    extern bool banish_evil(int dist);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Banish evil monsters
- */
-
-#####GDescription
-Banish nearby evil monsters doing "dist" points of GF_AWAY_EVIL
-damage.
-
-#####GParameters
-> "dist" is the amount of damage done to each monster.
-
-----------------------------------------------------------------------
-
-#####R=== dispel_evil ===
-
-#####GDeclaration
-    extern bool dispel_evil(int dam);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Dispel evil monsters
- */
-
-#####GDescription
-Dispel nearby evil monsters doing "dam" points of GF_DISP_EVIL
-damage.
-
-#####GParameters
-> "dam" is the number of points of damage.
-
-----------------------------------------------------------------------
-
-#####R=== dispel_good ===
-
-#####GDeclaration
-    extern bool dispel_good(int dam);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Dispel good monsters
- */
-
-#####GDescription
-Dispel nearby good monsters doing "dam" points of GF_DISP_GOOD
-damage.
-
-#####GParameters
-> "dam" is the number of points of damage.
-
-----------------------------------------------------------------------
-
-#####R=== dispel_undead ===
-
-#####GDeclaration
-    extern bool dispel_undead(int dam);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Dispel undead monsters
- */
-
-#####GDescription
-Dispel nearby undead monsters doing "dam" points of GF_DISP_UNDEAD
-damage.
-
-#####GParameters
-> "dam" is the number of points of damage.
-
-----------------------------------------------------------------------
-
-#####R=== dispel_monsters ===
-
-#####GDeclaration
-    extern bool dispel_monsters(int dam);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Dispel all monsters
- */
-
-#####GDescription
-Dispel all nearby monsters doing "dam" points of GF_DISP_ALL
-damage.
-
-#####GParameters
-> "dam" is the number of points of damage.
-
-----------------------------------------------------------------------
-
-#####R=== dispel_living ===
-
-#####GDeclaration
-    extern bool dispel_living(int dam);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Dispel 'living' monsters
- */
-
-#####GDescription
-Dispel nearby living monsters doing "dam" points of GF_DISP_LIVING
-damage.
-
-#####GParameters
-> "dam" is the number of points of damage.
-
-----------------------------------------------------------------------
-
-#####R=== dispel_demons ===
-
-#####GDeclaration
-    extern bool dispel_demons(int dam);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Dispel demons
- */
-
-#####GDescription
-Dispel nearby demon monsters doing "dam" points of GF_DISP_DEMON
-damage.
-
-#####GParameters
-> "dam" is the number of points of damage.
-
-----------------------------------------------------------------------
-
-#####R=== turn_undead ===
-
-#####GDeclaration
-    extern bool turn_undead(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Turn undead
- */
-
-#####GDescription
-Turn nearby undead monsters doing a point of GF_TURN_UNDEAD damage for
-each player level.
-
-----------------------------------------------------------------------
-
-#####R=== wipe ===
-
-#####GDeclaration
-    extern void wipe(int y1, int x1, int r);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Wipe -- Empties a part of the dungeon
- */
-
-#####GDescription
-Delete monsters and objects from an area of the dungeon centred at
-grid "y1,x1" for a radius "r". This does not work on special levels or
-quests. The player may be blinded. The player forgets the affected
-area and it becomes dark. All grids become floor.
-
-#####GParameters
-> "y1" is the y-coordinate of the wipe's origin.
-> "x1" is the x-coordinate of the wipe's origin.
-> "r" is the radius of the wipe.
-
-----------------------------------------------------------------------
-
-#####R=== destroy_area ===
-
-#####GDeclaration
-    extern void destroy_area(int y1, int x1, int r,
-        bool full);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * The spell of destruction
- *
- * This spell "deletes" monsters (instead of "killing" them).
- *
- * Later we may use one function for both "destruction" and
- * "earthquake" by using the "full" to select "destruction".
- */
-
-#####GDescription
-Delete monsters and objects from an area of the dungeon centred at
-grid "y1,x1" for a radius "r". This does not work on special levels or
-quests. The epicentre is NOT affected. The player may be blinded. The
-player forgets the affected area and it becomes dark. The grids can
-become granite, quartz, magma, or floor.
-
-#####GParameters
-> "y1" is the y-coordinate of the destruction's origin.
-> "x1" is the x-coordinate of the destruction's origin.
-> "r" is the radius of the destruction.
-> "full" is currently unused.
-
-----------------------------------------------------------------------
-
-#####R=== earthquake ===
-
-#####GDeclaration
-    extern void earthquake(int cy, int cx, int r);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Induce an "earthquake" of the given radius at the given location.
- *
- * This will turn some walls into floors and some floors into walls.
- *
- * The player will take damage and "jump" into a safe grid if possible,
- * otherwise, he will "tunnel" through the rubble instantaneously.
- *
- * Monsters will take damage, and "jump" into a safe grid if possible,
- * otherwise they will be "buried" in the rubble, disappearing from
- * the level in the same way that they do when genocided.
- *
- * Note that thus the player and monsters (except eaters of walls and
- * passers through walls) will never occupy the same grid as a wall.
- * Note that as of now (2.7.8) no monster may occupy a "wall" grid, even
- * for a single turn, unless that monster can pass_walls or kill_walls.
- * This has allowed massive simplification of the "monster" code.
- */
-
-#####GDescription
-Create an earthquake centred on grid "cy,cx" with a radius of "r".
-This does not work on quest levels. The epicentre is NOT affected.
-Only about 15% of the grids are affected. The player takes 300 points
-of damage if they can't be moved to a safe grid, otherwise damage is
-from 10 to 40 points. The player forgets the affected area and it
-becomes dark. The grids can become granite, quartz, magma, or floor.
-
-#####GParameters
-Parameters:
-> "cy" is the y-coordinate of the earthquake origin.
-> "cx" is the x-coordinate of the earthquake origin.
-> "r" is the radius of the earthquake.
-
-----------------------------------------------------------------------
-
-#####R=== map_area ===
-
-#####GDeclaration
-    extern void map_area(void);
-
-#####GFile
-    cave.c
-
-#####GComment
-/*
- * Hack -- map the current panel (plus some) ala "magic mapping"
- */
-
-#####GDescription
-Map the current panel plus up to 10 grids up and down, and up to 20
-grids left and right.
-
-----------------------------------------------------------------------
-
-#####R=== wiz_lite ===
-
-#####GDeclaration
-    extern void wiz_lite(void);
-
-#####GFile
-    cave.c
-
-#####GComment
-/*
- * Light up the dungeon using "clairvoyance"
- *
- * This function "illuminates" every grid in the dungeon, memorises all
- * "objects", memorises all grids as with magic mapping, and, under the
- * standard option settings (view_perma_grids but not view_torch_grids)
- * memorises all floor grids too.
- *
- * Note that if "view_perma_grids" is not set, we do not memorise floor
- * grids, since this would defeat the purpose of "view_perma_grids", not
- * that anyone seems to play without this option.
- *
- * Note that if "view_torch_grids" is set, we do not memorise floor grids,
- * since this would prevent the use of "view_torch_grids" as a method to
- * keep track of what grids have been observed directly.
- */
-
-#####GDescription
-Light up the entire dungeon and show all monsters and objects.
-
-----------------------------------------------------------------------
-
-#####R=== wiz_lite_extra ===
-
-#####GDeclaration
-    extern void wiz_lite_extra(void);
-
-#####GFile
-    cave.c
-
-#####GComment
-(none)
-
-#####GDescription
-Light up the entire dungeon and show all monsters and objects. All
-squares are lit and remembered.
-
-----------------------------------------------------------------------
-
-#####R=== wiz_dark ===
-
-#####GDeclaration
-    extern void wiz_dark(void);
-
-#####GFile
-    cave.c
-
-#####GComment
-/*
- * Forget the dungeon map (ala "Thinking of Maud...").
- */
-
-#####GDescription
-Forget all grids and objects. All grids become dark.
-
-----------------------------------------------------------------------
-
-#####R=== lite_room ===
-
-#####GDeclaration
-    extern void lite_room(int y1, int x1);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Illuminate any room containing the given location.
- */
-
-#####GDescription
-Light up the room (if any) of grid "y1,x1".
-
-#####GParameters
-> "y1" is the y-coordinate of the grid.
-> "x1" is the x-coordinate of the grid.
-
-----------------------------------------------------------------------
-
-#####R=== unlite_room ===
-
-#####GDeclaration
-    extern void unlite_room(int y1, int x1);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Darken all rooms containing the given location
- */
-
-#####GDescription
-Darken all rooms (if any) of grid "y1,x1".
-
-#####GParameters
-> "y1" is the y-coordinate of the grid.
-> "x1" is the x-coordinate of the grid.
-
-----------------------------------------------------------------------
-
-#####R=== lite_area ===
-
-#####GDeclaration
-    extern bool lite_area(int dam, int rad);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Hack -- call light around the player
- * Affect all monsters in the projection radius
- */
-
-#####GDescription
-Light up the room (if any) of the player's grid. Monsters take "dam"
-points of GF_LITE_WEAK damage if they are within "r" grids of the
-player.
-
-#####GParameters
-> "dam" is the number of points of damage.
-> "rad" is the radius of the effect of the damage.
-
-----------------------------------------------------------------------
-
-#####R=== unlite_area ===
-
-#####GDeclaration
-    extern bool unlite_area(int dam, int rad);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Hack -- call darkness around the player
- * Affect all monsters in the projection radius
- */
-
-#####GDescription
-Darken the room (if any) of the player's grid. Monsters take "dam"
-points of GF_DARK_WEAK damage if they are within "r" grids of the
-player.
-
-#####GParameters
-> "dam" is the number of points of damage.
-> "rad" is the radius of the effect of the damage.
-
-----------------------------------------------------------------------
-
-#####R=== fire_ball_beam ===
-
-#####GDeclaration
-    extern bool fire_ball_beam(int typ, int dir, int dam,
-        int rad);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Cast a ball-beamed spell
- * Stop if we hit a monster, act as a "ball"
- * Allow "target" mode to pass over monsters
- * Affect grids, objects, and monsters
- */
-
-#####GDescription
-Cast a ball-beamed spell of type "typ" in direction "dir" for damage
-"dam" points with a radius of "rad" grids.
-
-#####GParameters
-> "typ" is the type of damage
-  *****fields.txt*0[GF_fields]
-> "dir" must be from 0 to 9.
-  *****fields.txt*0[direction]
-> "dam" is the number of points of damage.
-> "rad" is the radius of the effect of the damage (must be <= 16).
-
-----------------------------------------------------------------------
-
-#####R=== fire_ball ===
-
-#####GDeclaration
-    extern bool fire_ball(int typ, int dir, int dam, int rad);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Cast a ball spell
- * Stop if we hit a monster, act as a "ball"
- * Allow "target" mode to pass over monsters
- * Affect grids, objects, and monsters
- */
-
-#####GDescription
-Cast a ball spell of type "typ" in direction "dir" for "dam" points of
-damage. The ball has a radius of "rad" grids.
-
-#####GParameters
-> "typ" is the type of damage
-  *****fields.txt*0[GF_fields]
-> "dir" must be from 0 to 9.
-  *****fields.txt*0[direction]
-> "dam" is the number of points of damage.
-> "rad" is the radius of the effect of the damage (must be <= 16).
-
-----------------------------------------------------------------------
-
-#####R=== fire_bolt ===
-
-#####GDeclaration
-    extern bool fire_bolt(int typ, int dir, int dam);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Cast a bolt spell
- * Stop if we hit a monster, as a "bolt"
- * Affect monsters (not grids or objects)
- */
-
-#####GDescription
-Cast a bolt spell of type "typ" in direction "dir" for "dam" points of
-damage.
-
-#####GParameters
-> "typ" is the type of damage
-  *****fields.txt*0[GF_fields]
-> "dir" must be from 0 to 9
-  *****fields.txt*0[direction]
-> "dam" is the number of points of damage.
-
-----------------------------------------------------------------------
-
-#####R=== fire_beam ===
-
-#####GDeclaration
-    extern bool fire_beam(int typ, int dir, int dam);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Cast a beam spell
- * Pass through monsters, as a "beam"
- * Affect monsters (not grids or objects)
- */
-
-#####GDescription
-Cast a beam spell of type "typ" in direction "dir" for "dam" points of
-damage.
-
-#####GParameters
-> "typ" is the type of damage
-  *****fields.txt*0[GF_fields]
-> "dir" must be from 0 to 9.
-  *****fields.txt*0[direction]
-> "dam" is the number of points of damage.
-
-----------------------------------------------------------------------
-
-#####R=== fire_druid_ball ===
-
-#####GDeclaration
-    extern bool fire_druid_ball(int typ, int dir, int dam,
-        int rad);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Cast a druidic ball spell
- * Stop if we hit a monster, act as a "ball"
- * Allow "target" mode to pass over monsters
- * Affect grids, objects, and monsters
- */
-
-#####GDescription
-Cast a ball spell of type "typ" in direction "dir" for "dam" points of
-damage. The ball has a radius of "rad" grids. The spell follows a mana
-path.
-
-#####GParameters
-> "typ" is the type of damage
-  *****fields.txt*0[GF_fields]
-> "dir" must be from 0 to 9.
-  *****fields.txt*0[direction]
-> "dam" is the number of points of damage.
-> "rad" is the radius of the effect of the damage (must be <= 16).
-
-----------------------------------------------------------------------
-
-#####R=== fire_druid_bolt ===
-
-#####GDeclaration
-    extern bool fire_druid_bolt(int typ, int dir, int dam);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Cast a druidic bolt spell
- * Stop if we hit a monster, as a "bolt"
- * Affect monsters (not grids or objects)
- */
-
-#####GDescription
-Cast a bolt spell of type "typ" in direction "dir" for "dam" points of
-damage. The spell follows a mana path.
-
-#####GParameters
-> "typ" is the type of damage
-  *****fields.txt*0[GF_fields]
-> "dir" must be from 0 to 9.
-  *****fields.txt*0[direction]
-> "dam" is the number of points of damage.
-
-----------------------------------------------------------------------
-
-#####R=== fire_druid_beam ===
-
-#####GDeclaration
-    extern bool fire_druid_beam(int typ, int dir, int dam);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Cast a druidistic beam spell
- * Pass through monsters, as a "beam"
- * Affect monsters (not grids or objects)
- */
-
-#####GDescription
-Cast a beam spell of type "typ" in direction "dir" for "dam" points of
-damage. The spell follows a mana path.
-
-#####GParameters
-> "typ" is the type of damage
-  *****fields.txt*0[GF_fields]
-> "dir" must be from 0 to 9.
-  *****fields.txt*0[direction]
-> "dam" is the number of points of damage.
-
-----------------------------------------------------------------------
-
-#####R=== fire_bolt_or_beam ===
-
-#####GDeclaration
-    extern bool fire_bolt_or_beam(int prob, int typ, int dir,
-        int dam);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Cast a bolt spell, or rarely, a beam spell
- */
-
-#####GDescription
-Cast a beam (chance of "prob" in 100) or bolt spell of type "typ" in
-direction "dir" for "dam" points of damage.
-
-#####GParameters
-> "prob" is the number of times out of 100 that the bolt will actually
-  be a beam. Obviously this value should range from 1 to 99 (0 will
-  always give a beam, 100 or higher will always give a beam. There are
-  separate functions for these cases).
-> "typ" is the type of damage
-  *****fields.txt*0[GF_fields]
-> "dir" must be from 0 to 9.
-  *****fields.txt*0[direction]
-> "dam" is the number of points of damage.
-
-----------------------------------------------------------------------
-
-#####R=== alchemy ===
-
-#####GDeclaration
-    extern bool alchemy(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/* Turns an object into gold, gain some of its value in a shop */
-
-#####GDescription
-The player selects an object (and quantity if it applies) from the
-inventory or the floor and attempts to turn it into gold. If the
-price of the item is < 0 then the player gains nothing (fool's gold),
-otherwise the player gets a third of the price in gold. Artifacts are
-not affected.
-
-----------------------------------------------------------------------
-
-#####R=== alter_reality ===
-
-#####GDeclaration
-    extern void alter_reality(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-(none)
-
-#####GDescription
-The player leaves the level immediately.
-
-----------------------------------------------------------------------
-
-#####R=== teleport_swap ===
-
-#####GDeclaration
-    extern void teleport_swap(int dir);
-
-#####GFile
-    spells2.c
-
-#####GComment
-(none)
-
-#####GDescription
-Player swaps places with target in direction "dir". The target must be
-a monster. It will not work if the space-time continuum can not be
-disrupted or if the monster resists teleportation.
-
-----------------------------------------------------------------------
-
-#####R=== project_meteor ===
-
-#####GDeclaration
-    extern void project_meteor(int radius, int typ, int dam,
-        u32b flg);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Apply a "project()" a la meteor shower
- */
-
-#####GDescription
-Generate between "rad" and "rad" x 2 ball spells of type "typ" for
-"dam" points of damage. The ball can have various properties as
-denoted by "flg".
-
-#####GParameters
-> "rad" is the minimum number of balls created. "rad" + randint("rad")
-  balls are created. Each ball has a radius of 2 grids. Each target
-  grid is within 5 grids of the player.
-> "typ" is the type of damage
-  *****fields.txt*0[GF_fields]
-> "dam" is the number of points of damage.
-> "flg" is the projection effect
-  *****fields.txt*0[PROJECT_fields]
-
-----------------------------------------------------------------------
-
-#####R=== passwall ===
-
-#####GDeclaration
-    extern bool passwall(int dir, bool safe);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Send the player shooting through walls in the given direction until
- * they reach a non-wall space, or a monster, or a permanent wall.
- */
-
-#####GDescription
-Move the player through walls in direction "dir". if "safe" then the
-player can not end up in a wall - if they do, the wall is replaced by
-a floor. This does not work in the wilderness, on quest levels, or if
-teleport is not allowed. Stopping on monsters or inside vaults is not
-allowed.
-
-#####GParameters
-> "dir" must be from 0 to 9. It can not be 5.
-  *****fields.txt*0[direction]
-> "safe" must be true if the player is not to be trapped in a wall
-  when the movement is finished.
-
-----------------------------------------------------------------------
-
-#####R=== project_hook ===
-
-#####GDeclaration
-    extern bool project_hook(int typ, int dir, int dam,
-        int flg);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Hack -- apply a "projection()" in a direction (or at the target)
- */
-
-#####GDescription
-Generate a beam/bolt of type "typ" in direction "dir" (or at a target)
-for "dam" points of damage. The beam/bolt can have various properties
-as denoted by "flg".
-
-#####GParameters
-> "typ" is the type of damage
-  *****fields.txt*0[GF_fields]
-> "dir" must be from 0 to 9. 5 means use the current target.
-  *****fields.txt*0[direction]
-> "dam" is the number of points of damage.
-> "flg" is the projection effect
-  *****fields.txt*0[PROJECT_fields]
-
-----------------------------------------------------------------------
-
-#####R=== reset_recall ===
-
-#####GDeclaration
-    extern bool reset_recall(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-(none)
-
-#####GDescription
-Ask the player for a dungeon and appropriate level within the dungeon.
-The player can not specify a dungeon they have not gone to yet. If the
-player chooses levels 99 or 100, the level is set to 98.
-
-----------------------------------------------------------------------
-
-#####R=== get_aim_dir ===
-
-#####GDeclaration
-    extern bool get_aim_dir(int *dp = 0);
-
-#####GFile
-    xtra2.c
-
-#####GComment
-/*
- * Get an "aiming direction" from the user.
- *
- * The "dir" is loaded with 1,2,3,4,6,7,8,9 for "actual direction", and
- * "0" for "current target", and "-1" for "entry aborted".
- *
- * Note that "Force Target", if set, will pre-empt user interaction,
- * if there is a usable target already set.
- *
- * Note that confusion over-rides any (explicit?) user choice.
- */
-
-#####GDescription
-Get an aiming direction from the user and store it in "dp". A target
-can be selected. If the player is confused, the direction will be
-random.
-
-#####GParameters
-> "dp" = player direction.
-
-----------------------------------------------------------------------
-
-#####R=== project_hack ===
-
-#####GDeclaration
-    extern bool project_hack(int typ, int dam);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Apply a "project()" directly to all viewable monsters
- *
- * Note that affected monsters are NOT auto-tracked by this usage.
- */
-
-#####GDescription
-Generate beam/bolt spells of type "typ" for "dam" points of damage to
-all viewable monsters in line of site.
-
-#####GParameters
-> "typ" is the type of damage
-  *****fields.txt*0[GF_fields]
-> "dam" is the number of points of damage.
-
-----------------------------------------------------------------------
-
-
-Back to the *****lua.hlp*0[lua help index] .
-
-                                                     [[[[[gThis file by Chris Hadgis]
diff --git a/lib/help/lua_util.txt b/lib/help/lua_util.txt
deleted file mode 100644
index 8886a2b4..00000000
--- a/lib/help/lua_util.txt
+++ /dev/null
@@ -1,898 +0,0 @@
-|||||oy
-
-#####R             /----------------------------------------\
-#####R            <      util.pkg functions helper file      >
-#####R             \----------------------------------------/
-
-----------------------------------------------------------------------
-
-#####R=== bst ===
-
-#####GDeclaration
-    s32b bst(s32b what, s32b t);
-
-#####GFile
-    util.c
-
-#####GComment
-/*
- * Break scalar time
- */
-
-#####GDescription
-Return the minute, hour, day, or year for turn "t". One turn takes 7.5
-seconds.
-
-#####GParameters
-> "what" is the unit to be returned and must be one of
-  MINUTE (number of turns per minute, which is 8)
-  HOUR   (number of turns per hour, which is 480)
-  DAY    (number of turns per day, which is 11,520)
-  YEAR   (number of turns per year, which is 4,204,800)
-> "t" is the number of turns.
-
-----------------------------------------------------------------------
-
-#####R=== path_build ===
-
-#####GDeclaration
-    errr path_build(char *buf, int max, cptr path, cptr file);
-
-#####GFile
-    util.c
-
-#####GComment
-/*
-* Create a new path by appending a file (or directory) to a path
-*
-* This requires no special processing on simple machines, except
-* for verifying the size of the filename, but note the ability to
-* bypass the given "path" with certain special file-names.
-*
-* Note that the "file" may actually be a "sub-path", including
-* a path and a file.
-*
-* Note that this function yields a path which must be "parsed"
-* using the "parse" function above.
-*/
-
-#####GDescription
-Append file "file" to path "path" and return the result in "buf". The
-length of "buf" is a maximum of "max" characters. If "file" starts
-with '~' then return "file". If "file" starts with the path separator
-and the path separator is not blank then return "file". If there is no
-path then return "file". Otherwise return "path" + path separator +
-"file". The path separator is defined in "H-config.h".
-
-#####GParameters
-> "buf" contains the new path.
-> "max" is the maximum number of characters allowed in "buf".
-> "path" is the original path.
-> "file" is the original file.
-
-----------------------------------------------------------------------
-
-#####R=== move_cursor ===
-
-#####GDeclaration
-    void move_cursor(int row, int col);
-
-#####GFile
-    util.c
-
-#####GComment
-/*
-* Move the cursor
-*/
-
-#####GDescription
-Move the cursor to row "row" and column "col".
-
-#####GParameters
-> "row" is the row the cursor is to be moved to.
-> "col" is the column the cursor is to be moved to.
-
-----------------------------------------------------------------------
-
-#####R=== inkey ===
-
-#####GDeclaration
-    char inkey(void);
-
-#####GFile
-    util.c
-
-#####GComment
-/*
-* Get a keypress from the user.
-*
-* This function recognises a few "global parameters".  These are variables
-* which, if set to TRUE before calling this function, will have an effect
-* on this function, and which are always reset to FALSE by this function
-* before this function returns.  Thus they function just like normal
-* parameters, except that most calls to this function can ignore them.
-*
-* If "inkey_xtra" is TRUE, then all pending keypresses will be flushed,
-* and any macro processing in progress will be aborted.  This flag is
-* set by the "flush()" function, which does not actually flush anything
-* itself, but rather, triggers delayed input flushing via "inkey_xtra".
-*
-* If "inkey_scan" is TRUE, then we will immediately return "zero" if no
-* keypress is available, instead of waiting for a keypress.
-*
-* If "inkey_base" is TRUE, then all macro processing will be bypassed.
-* If "inkey_base" and "inkey_scan" are both TRUE, then this function will
-* not return immediately, but will wait for a keypress for as long as the
-* normal macro matching code would, allowing the direct entry of macro
-* triggers.  The "inkey_base" flag is extremely dangerous!
-*
-* If "inkey_flag" is TRUE, then we will assume that we are waiting for a
-* normal command, and we will only show the cursor if "hilite_player" is
-* TRUE (or if the player is in a store), instead of always showing the
-* cursor.  The various "main-xxx.c" files should avoid saving the game
-* in response to a "menu item" request unless "inkey_flag" is TRUE, to
-* prevent savefile corruption.
-*
-* If we are waiting for a keypress, and no keypress is ready, then we will
-* refresh (once) the window which was active when this function was called.
-*
-* Note that "back-quote" is automatically converted into "escape" for
-* convenience on machines with no "escape" key.  This is done after the
-* macro matching, so the user can still make a macro for "backquote".
-*
-* Note the special handling of "ascii 30" (ctrl-caret, aka ctrl-shift-six)
-* and "ascii 31" (ctrl-underscore, aka ctrl-shift-minus), which are used to
-* provide support for simple keyboard "macros".  These keys are so strange
-* that their loss as normal keys will probably be noticed by nobody.  The
-* "ascii 30" key is used to indicate the "end" of a macro action, which
-* allows recursive macros to be avoided.  The "ascii 31" key is used by
-* some of the "main-xxx.c" files to introduce macro trigger sequences.
-*
-* Hack -- we use "ascii 29" (ctrl-right-bracket) as a special "magic" key,
-* which can be used to give a variety of "sub-commands" which can be used
-* any time.  These sub-commands could include commands to take a picture of
-* the current screen, to start/stop recording a macro action, etc.
-*
-* If "angband_term[0]" is not active, we will make it active during this
-* function, so that the various "main-xxx.c" files can assume that input
-* is only requested (via "Term_inkey()") when "angband_term[0]" is active.
-*
-* Mega-Hack -- This function is used as the entry point for clearing the
-* "signal_count" variable, and of the "character_saved" variable.
-*
-* Hack -- Note the use of "inkey_next" to allow "keymaps" to be processed.
-*
-* Mega-Hack -- Note the use of "inkey_hack" to allow the "Borg" to steal
-* control of the keyboard from the user.
-*/
-
-#####GDescription
-Get a keypress from the user.
-
-----------------------------------------------------------------------
-
-#####R=== cmsg_print ===
-
-#####GDeclaration
-    void cmsg_print(byte color, cptr msg);
-
-#####GFile
-    util.c
-
-#####GComment
-/*
-* Output a message to the top line of the screen.
-*
-* Break long messages into multiple pieces (40-72 chars).
-*
-* Allow multiple short messages to "share" the top line.
-*
-* Prompt the user to make sure he has a chance to read them.
-*
-* These messages are memorised for later reference (see above).
-*
-* We could do "Term_fresh()" to provide "flicker" if needed.
-*
-* The global "msg_flag" variable can be cleared to tell us to
-* "erase" any "pending" messages still on the screen.
-*
-* XXX XXX XXX Note that we must be very careful about using the
-* "msg_print()" functions without explicitly calling the special
-* "msg_print(NULL)" function, since this may result in the loss
-* of information if the screen is cleared, or if anything is
-* displayed on the top line.
-*
-* XXX XXX XXX Note that "msg_print(NULL)" will clear the top line
-* even if no messages are pending.  This is probably a hack.
-*/
-
-#####GDescription
-In color "color", output message "msg" to the top line of the screen.
-If the message is blank or has more than 1000 characters, nothing is
-printed. Long messages are split after the 40th character and before
-the 72nd character.
-
-#####GParameters
-> "color" is the color of the message.
-  *****fields.txt*0[colors]
-> "msg" is the message.
-
-----------------------------------------------------------------------
-
-#####R=== msg_print ===
-
-#####GDeclaration
-    void msg_print(cptr msg);
-
-#####GFile
-    util.c
-
-#####GComment
-/* Hack -- for compatibility and easy sake */
-
-#####GDescription
-Print message "msg" in white (see cmsg_print() above).
-
-#####GParameters
-> "msg" is the message.
-
-----------------------------------------------------------------------
-
-#####R=== screen_save ===
-
-#####GDeclaration
-    void screen_save(void);
-
-#####GFile
-    util.c
-
-#####GComment
-/*
- * Save the screen, and increase the "icky" depth.
- *
- * This function must match exactly one call to "screen_load()".
- */
-
-#####GDescription
-Save a screen shot.
-
-----------------------------------------------------------------------
-
-#####R=== screen_load ===
-
-#####GDeclaration
-    void screen_load(void);
-
-#####GFile
-    util.c
-
-#####GComment
-/*
- * Load the screen, and decrease the "icky" depth.
- *
- * This function must match exactly one call to "screen_save()".
- */
-
-#####GDescription
-Load a previously saved screen shot.
-
-----------------------------------------------------------------------
-
-#####R=== c_put_str ===
-
-#####GDeclaration
-    void c_put_str(byte attr, cptr str, int row, int col);
-
-#####GFile
-    util.c
-
-#####GComment
-/*
-* Display a string on the screen using an attribute.
-*
-* At the given location, using the given attribute, if allowed,
-* add the given string.  Do not clear the line.
-*/
-
-#####GDescription
-Put string "str" at row "row" and column "col" with attribute "attr".
-
-#####GParameters
-> "attr" is the color of the message.
-  *****fields.txt*0[colors]
-> "msg" is the message.
-> "row" is the row the message is to be printed at.
-> "col" is the column the message is to be printed at.
-
-----------------------------------------------------------------------
-
-#####R=== c_prt ===
-
-#####GDeclaration
-    void c_prt(byte attr, cptr str, int row, int col);
-
-#####GFile
-    util.c
-
-#####GComment
-/*
-* Display a string on the screen using an attribute, and clear
-* to the end of the line.
-*/
-
-#####GDescription
-Clear row "row" from column "col". Put string "str" at "row", "col"
-with attribute "attr".
-
-#####GParameters
-> "attr" is the color of the message.
-  *****fields.txt*0[colors]
-> "msg" is the message.
-> "row" is the row the message is to be printed at.
-> "col" is the column the message is to be printed at.
-
-----------------------------------------------------------------------
-
-#####R=== clear_from ===
-
-#####GDeclaration
-    void clear_from(int row);
-
-#####GFile
-    util.c
-
-#####GComment
-/*
-* Clear part of the screen
-*/
-
-#####GDescription
-Clear the screen from row "row" onwards.
-
-#####GParameters
-> "row" is the first row of the screen to be cleared.
-
-----------------------------------------------------------------------
-
-#####R=== askfor_aux ===
-
-#####GDeclaration
-    bool askfor_aux(char *buf, int len);
-
-#####GFile
-    util.c
-
-#####GComment
-/*
-* Get some input at the cursor location.
-* Assume the buffer is initialized to a default string.
-* Note that this string is often "empty" (see below).
-* The default buffer is displayed in yellow until cleared.
-* Pressing RETURN right away accepts the default entry.
-* Normal chars clear the default and append the char.
-* Backspace clears the default or deletes the final char.
-* ESCAPE clears the buffer and the window and returns FALSE.
-* RETURN accepts the current buffer contents and returns TRUE.
-*/
-
-#####GDescription
-Get string "buf" from the screen. "buf" is to be no more than "len"
-bytes. The string starts at the current cursor position. The length
-can not exceed the number of bytes from the cursor to the end of the
-line. Accept user input until the escape or return key is pressed.
-
-#####GParameters
-> "buf" is the string returned from the screen.
-> "len" is the length of the string. If it is <1 it is forced to 1.
-
-----------------------------------------------------------------------
-
-#####R=== get_string ===
-
-#####GDeclaration
-    bool get_string(cptr prompt, char *buf, int len);
-
-#####GFile
-    util.c
-
-#####GComment
-/*
-* Get a string from the user
-*
-* The "prompt" should take the form "Prompt: "
-*
-* Note that the initial contents of the string is used as
-* the default response, so be sure to "clear" it if needed.
-*
-* We clear the input, and return FALSE, on "ESCAPE".
-*/
-
-#####GDescription
-Print prompt "prompt" at the top-left corner of the screen and return
-response "buf" which will have a maximum length "length". If ESCAPE
-is entered, the function returns FALSE, otherwise it returns TRUE.
-
-#####GParameters
-> "prompt" is the prompt for input.
-> "buf" is the returned response.
-> "len" is the maximum length of the string.
-
-----------------------------------------------------------------------
-
-#####R=== get_check ===
-
-#####GDeclaration
-    bool get_check(cptr prompt);
-
-#####GFile
-    util.c
-
-#####GComment
-/*
-* Verify something with the user
-*
-* The "prompt" should take the form "Query? "
-*
-* Note that "[y/n]" is appended to the prompt.
-*/
-
-#####GDescription
-Ask the user question "prompt" which requires a yes/no answer. The
-prompt appears in the top-left corner of the screen. A response of
-'Y' (either case) returns TRUE. A response of 'N' (either case) or
-ESCAPE returns FALSE.
-
-#####GParameters
-> "prompt" is the question asked. It has a maximum length of 70
-  characters.
-
-----------------------------------------------------------------------
-
-#####R=== get_com_lua ===
-
-#####GDeclaration
-    bool get_com_lua @ get_com(cptr promtp, int *com);
-
-#####GFile
-    util.c
-
-#####GComment
-/*
-* Prompts for a keypress
-*
-* The "prompt" should take the form "Command: "
-*
-* Returns TRUE unless the character is "Escape"
-*/
-
-#####GDescription
-Ask the user for command "prompt" and return the key press "com". A
-response of ESCAPE returns FALSE. All other responses return TRUE.
-
-#####GParameters
-> "prompt" is the prompt for the key press.
-> "com" is the returned key press.
-
-----------------------------------------------------------------------
-
-#####R=== get_quantity ===
-
-#####GDeclaration
-    s32b get_quantity(cptr prompt, s32b max);
-
-#####GFile
-    util.c
-
-#####GComment
-/*
-* Request a "quantity" from the user
-*
-* Hack -- allow "command_arg" to specify a quantity
-*/
-
-#####GDescription
-Ask the user for quantity "prompt" of maximum value "max" and return
-a quantity. If the user quantity is higher than the maximum then the
-maximum is returned. If the response is a letter then the maximum is
-returned. If the user quantity is negative then zero is returned.
-
-#####GParameters
-> "prompt" is the prompt for a quantity.
-> "max" is the maximum value allowed.
-
-----------------------------------------------------------------------
-
-#####R=== test_monster_name ===
-
-#####GDeclaration
-    int test_monster_name(cptr name);
-
-#####GFile
-    util.c
-
-#####GComment
-/*
- * Given monster name as string, return the index in r_info array. Name
- * must exactly match (look out for commas and the like!), or else 0 is 
- * returned. Case doesn't matter. -GSN-
- */
-
-#####GDescription
-Return the monster index for monster with name "name". If no match is
-found then zero is returned.
-
-#####GParameters
-> "name" is the monster name.
-
-----------------------------------------------------------------------
-
-#####R=== test_item_name ===
-
-#####GDeclaration
-    int test_item_name(cptr name);
-
-#####GFile
-    util.c
-
-#####GComment
-/*
- * Given item name as string, return the index in k_info array. Name
- * must exactly match (look out for commas and the like!), or else 0 is 
- * returned. Case doesn't matter. -DG-
- */
-
-#####GDescription
-Return the item index for item with name "name". If no match is found
-then zero is returned.
-
-#####GParameters
-> "name" is the item name.
-
-----------------------------------------------------------------------
-
-#####R=== luck ===
-
-#####GDeclaration
-    int luck(int min, int max);
-
-#####GFile
-    xtra1.c
-
-#####GComment
-/*
- * Return a luck number between a certain range
- */
-
-#####GDescription
-Return a number for luck between minimum "min" and maximum "max". The
-value begins with the player's current luck. The value is forced to
-be between -30 and +30. 30 is added to give a value between 0 and 60.
-The value is multiplied by the range (maximum - minimum) and divided
-by 60. The value is increased by the minimum. The value is returned.
-
-For example, if the player's current luck is 15, the minimum is -10,
-and the maximum is 10 (range 20), then the value returned is
-(45 * 20) / 60 which is 900 / 60 which is 15 + the minimum -10 gives
-a returned value of 5.
-
-#####GParameters
-> "min" is the minimum luck.
-> "max" is the maximum luck. Beware: this should be greater than the
-  minimum but it is not checked!
-
-----------------------------------------------------------------------
-
-#####R=== get_player_race_name ===
-
-#####GDeclaration
-    cptr get_player_race_name(int pr, int ps);
-
-#####GFile
-    util.c
-
-#####GComment
-(none)
-
-#####GDescription
-Return the name for player race "pr" and player sub-race "ps".
-
-#####GParameters
-> "pr" is the index for player race.
-> "ps" is the index for player sub-race.
-
-----------------------------------------------------------------------
-
-#####R=== quit ===
-
-#####GDeclaration
-    void quit(cptr str);
-
-#####GFile
-    z-util.c
-
-#####GComment
-/*
- * Exit (ala "exit()").  If 'str' is NULL, do "exit(0)".
- * If 'str' begins with "+" or "-", do "exit(atoi(str))".
- * Otherwise, plog() 'str' and exit with an error code of -1.
- * But always use 'quit_aux', if set, before anything else.
- */
-
-#####GDescription
-Quit the game. If "str" is a string then write the string to the
-error file or screen. If "str" is a number then exit with the
-number as the exit code.
-
-#####GParameters
-> "str" is an error message or exit code.
-
-----------------------------------------------------------------------
-
-#####R=== dump_hooks ===
-
-#####GDeclaration
-    void dump_hooks();
-
-#####GFile
-    plots.c
-
-#####GComment
-(none)
-
-#####GDescription
-Print the name and type (C or Lua) of hooks in the hook list.
-
-----------------------------------------------------------------------
-
-#####R=== add_hook_script ===
-
-#####GDeclaration
-    void add_hook_script(int h_idx, char *script, cptr name);
-
-#####GFile
-    plots.c
-
-#####GComment
-(none)
-
-#####GDescription
-To hook list with index "h_idx", add a script with script file
-"script" and name "name" as a Lua hook if a hook with that name
-does not already exist.
-
-#####GParameters
-> "h_idx" is the index of the hook list in the array of hook lists.
-> "script" is the name of the script file.
-> "name" is the name of the hook to be added.
-
-----------------------------------------------------------------------
-
-#####R=== del_hook_name ===
-
-#####GDeclaration
-    void del_hook_name(int h_idx, cptr name);
-
-#####GFile
-    plots.c
-
-#####GComment
-(none)
-
-#####GDescription
-Search hook list with index "h_idx" and remove the hook with name
-"name".
-
-#####GParameters
-> "h_idx" is the index of the hook list in the array of hook lists.
-> "name" is the name of the hook to be removed.
-
-----------------------------------------------------------------------
-
-#####R=== pern_dofile ===
-
-#####GDeclaration
-    bool pern_dofile(char *file);
-
-#####GFile
-    script.c
-
-#####GComment
-(none)
-
-#####GDescription
-Parse the Lua script file "file".
-
-#####GParameters
-> "file" is the Lua script file to be parsed.
-
-----------------------------------------------------------------------
-
-#####R=== intMod ===
-
-#####GDeclaration
-    s32b intMod(s32b a, s32b b);
-
-#####GFile
-    script.c
-
-#####GComment
-(none)
-
-#####GDescription
-Return the result of operation "a" mod  "b" (a % b).
-
-#####GParameters
-> "a" is a number.
-> "b" is a number.
-
-----------------------------------------------------------------------
-
-#####R=== intAnd ===
-
-#####GDeclaration
-    s32b intAnd(s32b a, s32b b);
-
-#####GFile
-    script.c
-
-#####GComment
-(none)
-
-#####GDescription
-Return the result of bitwise operation "a" AND "b" (a & b).
-
-#####GParameters
-> "a" is a number.
-> "b" is a number.
-
-----------------------------------------------------------------------
-
-#####R=== intOr ===
-
-#####GDeclaration
-    s32b intOr(s32b a, s32b b);
-
-#####GFile
-    script.c
-
-#####GComment
-(none)
-
-#####GDescription
-Return the result of bitwise operation "a" OR "b" (a | b).
-
-#####GParameters
-> "a" is a number.
-> "b" is a number.
-
-----------------------------------------------------------------------
-
-#####R=== intXor ===
-
-#####GDeclaration
-    s32b intXor(s32b a, s32b b);
-
-#####GFile
-    script.c
-
-#####GComment
-(none)
-
-#####GDescription
-Return the result of bitwise operation "a" XOR "b" (a ^ b).
-
-#####GParameters
-> "a" is a number.
-> "b" is a number.
-
-----------------------------------------------------------------------
-
-#####R=== intShiftl ===
-
-#####GDeclaration
-    s32b intShiftl(s32b a, s32b b);
-
-#####GFile
-    script.c
-
-#####GComment
-(none)
-
-#####GDescription
-Return the result of bitwise operation "a" << "b".
-
-#####GParameters
-> "a" is a number.
-> "b" is a number.
-
-----------------------------------------------------------------------
-
-#####R=== intShiftr ===
-
-#####GDeclaration
-    s32b intShiftr(s32b a, s32b b);
-
-#####GFile
-    script.c
-
-#####GComment
-(none)
-
-#####GDescription
-Return the result of bitwise operation "a" >> "b".
-
-#####GParameters
-> "a" is a number.
-> "b" is a number.
-
-----------------------------------------------------------------------
-
-#####R=== intBitNot ===
-
-#####GDeclaration
-    s32b intBitNot(s32b b);
-
-#####GFile
-    script.c
-
-#####GComment
-(none)
-
-#####GDescription
-Return the result of bitwise operation NOT "b" (~ b).
-
-#####GParameters
-> "b" is a number.
-
-----------------------------------------------------------------------
-
-#####R=== register_savefile ===
-
-#####GDeclaration
-    void register_savefile(int num);
-
-#####GFile
-    loadsave.c
-
-#####GComment
-/*
- * Add num slots to the savefile
- */
-
-#####GDescription
-Add "num" slots to the save file.
-
-#####GParameters
-> "num" is the number of slots to add to the savefile. If num is <0
-  then "num" is forced to zero.
-
-----------------------------------------------------------------------
-
-#####R=== save_number_key ===
-
-#####GDeclaration
-    void save_number_key(char *key, s32b val);
-
-#####GFile
-    util.c
-
-#####GComment
-(none)
-
-#####GDescription
-Save the length of key "key", the key itself, and the value "val" as
-bytes in the savefile.
-
-#####GParameters
-> "key" is the key string for the value.
-> "val" is the value to be saved.
-
-----------------------------------------------------------------------
-
-
-
-Back to the *****lua.hlp*0[lua help index] .
-
-
-                                                     [[[[[gThis file by Chris Hadgis]
-
diff --git a/lib/help/m_divin.txt b/lib/help/m_divin.txt
index 9d3455fc..e6490df8 100644
--- a/lib/help/m_divin.txt
+++ b/lib/help/m_divin.txt
@@ -25,7 +25,7 @@ There are six spells available for the divination school. These Spells are:
    Asks for an object and identifies it.
    At spell level 17 it identifies all objects in the inventory.
    At spell level 27 it identifies all objects in the inventory and in a 
-   radius on the floor, as well as probing monsters in that radius.
+   radius on the floor.
 4. [[[[[sReveal Ways] (school level 9)
    Detects the doors/stairs/ways in a certain radius around you.
 5. [[[[[sVision] (school level 15)
diff --git a/lib/help/m_music.txt b/lib/help/m_music.txt
index 0f84f08f..40116252 100644
--- a/lib/help/m_music.txt
+++ b/lib/help/m_music.txt
@@ -61,8 +61,7 @@ of instrument contains a different family of musical songs:
    Consumes mana each turn.
 5. [[[[[vClairaudience(IV)] (School level 25)
    Allows you to sense monster minds as long as you sing.
-   At level 10 it identifies all objects in a radius on the floor,
-   as well as probing monsters in that radius.
+   At level 10 it identifies all objects in a radius on the floor.
    Consumes mana each turn.
 
 #####GHorns
diff --git a/lib/help/macrofaq.txt b/lib/help/macrofaq.txt
index 03a00eaa..a82074c1 100644
--- a/lib/help/macrofaq.txt
+++ b/lib/help/macrofaq.txt
@@ -975,10 +975,6 @@ These are accessible through the (=) Set options command.
 *****option.txt*2[(hilite_player)] -- causes the player's symbol to be drawn with the
 "cursor" on it. It will be drawn with the same color as the character.
 
-*****option.txt*3[(player_symbols)] -- for graphics mode only, and only works when option
-(use_graphics) is also on. This apparently varies the player graphic
-and its color based on class, race, and sex.
-
 #####G----------------------------------------------------------------------
 #####G4.18 Recharging a rod using a Recharge Item spell
 #####G----------------------------------------------------------------------
@@ -1070,15 +1066,7 @@ create a macro for a function key.
 #####G5.2 How can I automatically inscribe items when I pick them up?
 #####G----------------------------------------------------------------------
 
-You need to turn on the "Merge inscriptions when stacking" option.
-If you are already carrying the same item with an inscription, a new
-one will be added to the stack. Note that this WON'T merge discounts.
-Although discounts display like inscriptions, they are different.
-
-1) =   Options
-2) 1   User interface options
-3)     "Merge inscriptions when stacking" (stack_force_notes)
-       move down to this line and change to "yes".
+(Content removed because it was obsolete. Inscribe-on-pickup is now the default.)
 
 #####G----------------------------------------------------------------------
 #####G5.3 Can I use macros inside other macros?
@@ -1784,9 +1772,6 @@ options screen.
 rogue_like_commands
 use_old_target
 always_pickup
-depth_in_feet
-alert_hitpoint
-auto_haggle
 auto_scum
 
 #####G----------------------------------------------------------------------
diff --git a/lib/help/magic.txt b/lib/help/magic.txt
index 93486f0b..1811be84 100644
--- a/lib/help/magic.txt
+++ b/lib/help/magic.txt
@@ -23,17 +23,15 @@ schools:
 
 Other magical skills, generally being used primarily by characters of a
 specific class, are:
-     *****m_demono.txt*0[Demonology]     *****m_necrom.txt*0[Necromancy]      *****skills.txt*36[Runecraft]
-     *****m_thaum.txt*0[Thaumaturgy]    *****skills.txt*49[Alchemy]         *****m_geoman.txt*0[Geomancy]
+     *****m_demono.txt*0[Demonology]     *****m_necrom.txt*0[Necromancy]
+     *****m_thaum.txt*0[Thaumaturgy]     *****m_geoman.txt*0[Geomancy]
 
 The *****m_demono.txt*0[Demonology] skill is primarily used by *****c_demono.txt*0[Demonologists] for their special
 spells, whereas the *****m_necrom.txt*0[Necromancy] skill is used by *****c_necro.txt*0[Necromancers] for their own set
 of special spells.
-The same goes for *****skills.txt*36[Runecraft], which is used by *****c_runecr.txt*0[Runecrafters] to allow use of more
-difficult runes or rune-combinations. *****m_thaum.txt*0[Thaumaturgy] gives you randomly chosen
+*****m_thaum.txt*0[Thaumaturgy] gives you randomly chosen
 attack spells, and as such each game with it will be different. *****c_geoman.txt*0[Geomancers]
-harness the powers of the elements using *****m_geoman.txt*0[Geomancy]. Lastly we have
-*****skills.txt*49[Alchemy], which is used by *****c_alchem.txt*0[Alchemists].
+harness the powers of the elements using *****m_geoman.txt*0[Geomancy].
 
 In addition to the schools of magic, you can get access to special sets of
 spells if you worship a God. There are currently four good Gods,
diff --git a/lib/help/option.txt b/lib/help/option.txt
index 6fd3b413..f1d485db 100644
--- a/lib/help/option.txt
+++ b/lib/help/option.txt
@@ -56,20 +56,6 @@ can also be viewed from the option menu while playing, but not changed then.
     but extremely deadly - imagine that Greater Checkerboard Vault with Lokkak
     on dungeon level 1!
 
-#####GAllow notes to be written to a file    [take_notes]
-    Allows any player-written notes (with the "|" command) to be written to
-    a file and kept (instead of being put in the message list).
-
-#####GAutomatically note important events    [auto_notes]
-    Used in conjunction with the take_notes option, this option makes a note
-    each time you gain a level, kill a unique, find an artifact, etc.
-
-#####GFast autoroller (NOT on multiuser systems)    [fast_autoroller]
-    The normal autoroller has a built-in delay that helps prevent it from
-    overloading a system. This option reduces that delay, allowing characters
-    to be rolled in a much shorter time, but should not be used on multiuser
-    systems.
-
 #####GAllow use of some 'joke' monsters    [joke_monsters]
     Allows monsters flagged as being some of DarkGod's jokes to be generated.
 
@@ -80,6 +66,10 @@ can also be viewed from the option menu while playing, but not changed then.
 #####GYou can receive fates, good or bad    [fate_option]
     Allows the player to turn off ToME's *****fatespoi.txt*0[fates] for that character.
 
+#####GItems always sell for 0 gold    [no_selling]
+    Disables selling items back to shops for money. The value of gold found in the
+    dungeon is increased to compensate.
+
 ~~~~~07|Options|Ingame
 #####RIN GAME OPTIONS
 #####R===============
@@ -98,9 +88,6 @@ off at will during the course of the game.
     (useful for monster farming).  Allows most keys to mean "no" to any
     "[y/n]" prompt.
 
-#####GPrompt for various information    [other_query_flag]
-    No longer used.
-
 #####GPrompt before picking things up    [carry_query_flag]
     Forces the game to ask you for confirmation when you do something that
     would normally cause an item to be picked up.
@@ -123,56 +110,8 @@ off at will during the course of the game.
 
 #####GRepeat obvious commands    [always_repeat]
     Tells the game that when you attempt to open a door or chest, bash
-    a door, tunnel through walls, or disarm traps or chests, that you
-    wish to repeat the command 99 times (see *****command.txt*0["command.txt"]).
-
-#####GShow dungeon level in feet    [depth_in_feet]
-    Display the dungeon depth in "feet" instead of as a level number (one
-    level is equivalent to 50'). This also affects the monster memory display.
-
-#####GMerge inscriptions when stacking    [stack_force_notes]
-    Force otherwise identical objects to merge, even if one has an empty
-    inscription and the other does not.  The resulting stack keeps the
-    non-empty inscription.
-
-#####GMerge discounts when stacking    [stack_force_costs]
-    Force otherwise identical objects to merge, even if they have different
-    discounts.  The resulting stack keeps the largest discount.  This option
-    may cause you to lose "value", but will give you optimal pack usage.
-
-#####GShow labels in object lists    [show_labels]
-    Display the "labels" for objects in the equipment list, and in any
-    special window which is displaying the equipment.  These labels
-    indicate what the player is using the object for, such as "wielding"
-    or "wearing" (in a given location).  After you have played for a while,
-    this information is no longer useful, and can be annoying.
-    Note that in ToME this option no longer controls the "plain
-    flavoured object descriptions": a separate option for them has been added
-    under "ToME Options".
-
-#####GShow weights in object lists    [show_weights]
-    Display the weight of objects in the inventory and equipment lists,
-    and in stores, and in any special window which is displaying any of
-    these lists.
-
-#####GShow graphics in inventory list   [show_inven_graph]
-    Display the graphics of objects in the inventory list, and in any special
-    window which is displaying the inventory list.
-
-#####GShow graphics in equipment list   [show_equip_graph]
-    Display the graphics of objects in the equipment list, and in any special
-    window which is displaying the equipment list.
-
-#####GShow graphics in stores   [show_store_graph]
-    Display the graphics of objects in the store list.
-
-#####GShow choices in certain sub-windows    [show_choices]
-    Indicate legal choices in special windows which display lists.
-
-#####GShow details in certain sub-windows    [show_details]
-    Indicate extra details in special windows, currently used to activate
-    the display of death counts and monster descriptions when recalling
-    details about a monster.
+    a door, or tunnel through walls, that you wish to repeat the command
+    99 times (see *****command.txt*0["command.txt"]).
 
 #####GAudible bell (on errors, etc)    [ring_bell]
     Attempt to make a "bell" noise when various errors occur.
@@ -205,16 +144,12 @@ off at will during the course of the game.
     monster becomes viewable for the first time, and also whenever any
     viewable monster becomes no longer viewable.  This option ignores
     the existence of telepathy for the purpose of determining whether
-    a monster is viewable.  See also the "view_reduce_view" option.
+    a monster is viewable.
 
 #####GDisturb whenever map panel changes    [disturb_panel]
     This option causes you to be disturbed (stop running) when the screen
     scrolls, as it does when you get close to the edge of the visible screen.
 
-#####GDisturb whenever leaving trap-detected area    [disturb_detect]
-    This option causes you to be disturbed whenever you are leaving
-    a trap-detected area.  This option is strongly recommended.
-
 #####GDisturb whenever player state changes    [disturb_state]
     This option causes you to be disturbed whenever the player state
     changes, including changes in hunger, resistance, confusion, etc.
@@ -232,10 +167,6 @@ off at will during the course of the game.
     even if this option is unset.  (You may also inscribe an item with {.}
     to suppress its random-teleportation power, unless it is cursed.)
 
-#####GAlert user to critical hitpoints    [alert_hitpoint]
-    Produce a "bell" noise, and flushes all pending input, when your hitpoints
-    reach the warning point chosen elsewhere, preventing stupid deaths.
-
 #####GAlert user to various failures    [alert_failure]
     Produce a "bell" noise, and flushes all pending input, when various
     failures occur, as described above.
@@ -245,18 +176,6 @@ off at will during the course of the game.
     dies. If this option is not selected, the "You die." message is displayed
     instead.
 
-#####GAllow shopkeepers and uniques to speak    [speak_unique]
-    If this option is in use, shopkeepers may sometimes whisper rumours to
-    you. Also certain monsters start boasting as they attack you, and when
-    they die, they say their "last words".
-
-#####GNo query to destroy known worthless items    [auto_destroy]
-    It can sometimes be annoying that the Destroy command asks for confirmation
-    when you are attempting to destroy a Broken sword {cursed}. If this option
-    is set, no confirmation will be asked if you attempt to destroy an object
-    which you know to be worthless. Of course, cursed artifacts cannot be
-    destroyed even if this option is set.
-
 #####GConfirm to wear/wield known cursed items    [confirm_wear]
     Some players may occasionally, due to a typing mistake, find themselves
     wearing an item which they knew was cursed. If this option is set, you
@@ -281,13 +200,6 @@ off at will during the course of the game.
     to only one known door, using the "o"pen command will not prompt you for
     a direction.
 
-#####GAutomatically disarm traps    [easy_disarm]
-    Attempts to disarm traps by walking into/over them.  Also, if you are
-    adjacent to only one known trap, using the "D"isarm command will not
-    prompt you for a direction.  If your disarming ability is particularly
-    low, you should probably not enable this option, because you will often
-    fail to disarm the traps, and sometimes trigger them.
-
 #####GAutomatically tunnel walls    [easy_tunnel]
     Automatically tunnels into walls by walking into them.
 
@@ -308,18 +220,6 @@ off at will during the course of the game.
     is based on the dungeon level, so the deeper you go, the better the
     level will be.
 
-#####GAllow weapons and armor to stack    [stack_allow_items]
-    Allow identical weapons and armor to be combined into a stack.  This
-    also allows unidentified, but identical, ammo to be combined, which
-    may result in the auto-identification of some of the ammo, but which
-    makes it a lot easier to actually use unidentified ammo.
-
-#####GAllow wands/staffs/rods to stack    [stack_allow_wands]
-    Allow identical wands/staffs/rods to be combined into a stack.  This
-    may force the items to be unstacked to use them, which may result
-    in overflow of the pack.  Also, the entire stack can be recharged
-    (and possibly destroyed) at the same time.
-
 #####GExpand the power of the look command    [expand_look]
     Expand the "l"ook command to allow the user to look at grids which
     are not actually in view of the player, allowing the examination of
@@ -374,38 +274,10 @@ off at will during the course of the game.
     Allow monsters to make paths to the player when they are nearby.  This
     option is extremely slow, but can produce viciously smart monsters.
 ~~~~~3
-#####GUse special symbols for the player char   [player_symbols]
-    If this option has been compiled in, it allows you to display your
-    character using race / class / sex dependent colours and graphical
-    symbols. Note that the support for this option may not have been
-    compiled in on all platforms.
-
-#####GPlain object descriptions    [plain_descriptions]
-    In ToME, this option disables "full" names for identified flavoured
-    objects; in other words, if this option is not in use, an identified
-    Potion of Speed could be listed (for example) as a Blue Potion of Speed.
-    If you prefer simpler, less verbose descriptions, set this option.
-
 #####GMonsters learn from their mistakes    [smart_learn]
     Allow monsters to learn what spell attacks you are resistant to,
     and to use this information to choose the best attacks.
 
-#####GMonsters exploit players weaknesses    [smart_cheat]
-    Allow monsters to know what spell attacks you are resistant to, without
-    first having to observe such an attack upon you, and to use this
-    information to choose the best attacks.
-
-#####GMonsters behave stupidly    [stupid_monsters]
-    ToME incorporates Keldon Jones' improved monster Artificial
-    Intelligence patch. While this patch most certainly makes monsters
-    behave more realistically, they will also be more deadly with the
-    improved AI. If you are a sissy, set this option to get the old,
-    really stupid monster AI.
-    Note that the new AI is a bit processing power expensive. If you have
-    an old computer (386sx) and ToME is running too slowly, you could
-    try turning stupid_monsters on. Or dumpster-dive for a Pentium so you can
-    run ToME. :-)
-
 #####GAllow unusually small dungeon levels    [small_levels]
     This option enables the creation of levels of varying sizes. Levels
     that are as small as one "screen" (80x24) are possible, and they can be
@@ -432,9 +304,6 @@ off at will during the course of the game.
     but is extremely annoying.  Certain older versions of Angband used
     this behavior always, so "purists" should turn it on.
 
-#####GReduce view-radius in town    [view_reduce_view]
-    No longer in use.
-
 #####GAvoid checking for user abort    [avoid_abort]
     Avoid checking to see if the user has pressed a key during resting
     or running or repeated commands.  This not only makes the game much
@@ -552,11 +421,6 @@ Features which are unique to ToME are collected in this menu.
     for new players.  More experienced players may wish to switch this option
     off.
 
-#####GShow the experience needed for the next level    [exp_need]
-    Setting this option alters the display of experience on the left of
-    the main screen to the experience needed to reach the next character level,
-    instead of the character's current total experience.
-
 #####GUse the old(Z) coloring scheme(reload the game)    [old_colors]
     Setting this option toggles the ASCII game colour display from the
     standard Angband monster colours to the Zangband-based monster colours.
diff --git a/lib/help/skills.txt b/lib/help/skills.txt
index c4a02c06..a7d1ed36 100644
--- a/lib/help/skills.txt
+++ b/lib/help/skills.txt
@@ -63,8 +63,7 @@ gets the free points).  For example, a skill point put into Weaponmastery
 raises Combat by 0.5 skill points. This is actually multiplied by the skill
 modifier that your character has in the Combat skill.  For example, a
 Swordmaster investing a skill point into Weaponmastery would have his Combat
-skill raised by 0.5 * [0.900] while a Runecrafter would have his Combat
-skill raised by 0.5 * [0.200].
+skill raised by 0.5 * [0.900].
 
 As well as this, skills are grouped together in similar types. Looking under
 the Combat skill, there are subtypes of Weaponmastery, Archery and Antimagic.
@@ -108,7 +107,7 @@ on what each skill does, try [[[[[ghttp://www.killerbunnies.org/angband/skill-22
 for some third party help!
 The skills are:
 
-  *****skills.txt*27[Air]                 *****skills.txt*49[Alchemy]            *****skills.txt*50[Antimagic]          *****skills.txt*08[Archery]
+  *****skills.txt*27[Air]                 *****skills.txt*50[Antimagic]          *****skills.txt*08[Archery]
   *****skills.txt*05[Axe-mastery]         *****skills.txt*18[Backstab]           *****skills.txt*13[Barehand-combat]    *****skills.txt*61[Bearform-combat]
   *****skills.txt*12[Boomerang-mastery]   *****skills.txt*58[Boulder-throwing]   *****skills.txt*10[Bow-mastery]        *****skills.txt*01[Combat]             
   *****skills.txt*30[Conveyance]          *****skills.txt*44[Corpse-preservation]*****skills.txt*04[Critical-hits]      *****skills.txt*11[Crossbow-mastery]   
@@ -117,11 +116,11 @@ The skills are:
   *****skills.txt*21[Magic]               *****skills.txt*54[Magic-device]       *****skills.txt*24[Mana]               *****skills.txt*29[Meta]               
   *****skills.txt*47[Mimicry]             *****skills.txt*33[Mind]               *****skills.txt*41[Mindcraft]          *****skills.txt*42[Monster-lore]       
   *****skills.txt*59[Music]               *****skills.txt*34[Nature]             *****skills.txt*35[Necromancy]         *****skills.txt*07[Polearm-mastery]    
-  *****skills.txt*45[Possession]          *****skills.txt*39[Prayer]             *****skills.txt*36[Runecraft]          *****skills.txt*09[Sling-mastery]      
-  *****skills.txt*14[Sneakiness]          *****skills.txt*22[Spell-power]        *****skills.txt*38[Spirituality]       *****skills.txt*23[Sorcery]            
-  *****skills.txt*19[Stealing]            *****skills.txt*15[Stealth]            *****skills.txt*53[Stunning-blows]     *****skills.txt*43[Summoning]          
-  *****skills.txt*03[Sword-mastery]       *****skills.txt*46[Symbiosis]          *****skills.txt*32[Temporal]           *****skills.txt*37[Thaumaturgy]        
-  *****skills.txt*48[Udun]                *****skills.txt*26[Water]              *****skills.txt*02[Weaponmastery]
+  *****skills.txt*45[Possession]          *****skills.txt*39[Prayer]             *****skills.txt*09[Sling-mastery]      
+  *****skills.txt*22[Spell-power]         *****skills.txt*38[Spirituality]       *****skills.txt*23[Sorcery]            *****skills.txt*19[Stealing]
+  *****skills.txt*15[Stealth]             *****skills.txt*53[Stunning-blows]     *****skills.txt*43[Summoning]          *****skills.txt*03[Sword-mastery]
+  *****skills.txt*46[Symbiosis]           *****skills.txt*32[Temporal]           *****skills.txt*37[Thaumaturgy]        *****skills.txt*48[Udun]
+  *****skills.txt*26[Water]               *****skills.txt*02[Weaponmastery]
 
 
 ~~~~~01|Skills|Combat
@@ -257,12 +256,6 @@ spirituality sub-skills.
 This skill does not affect your ability to use scrolls and potions, but other 
 items that require [Self]Magic-Device are affected. At higher levels you gain 
 the ability to detect traps and disrupt all teleportation.
-~~~~~14|Skills|Sneakiness
-[[[[[BSneakiness]
-The sneakiness skill affects your searching and perception abilities.
-
-Sub-skills of Sneakiness include Stealth, Disarming, Trapping, Backstab,
-Stealing and Dodging.
 ~~~~~15|Skills|Stealth
 [[[[[BStealth]
 This skill is a sub-skill of the Sneakiness skill. It affects your ability
@@ -311,7 +304,7 @@ ability.
 
 Sub-skills include: Magic-device, Spell-power, Sorcery, Mana, Fire, Water, Air,
 Earth, Meta, Conveyance, Divination, Temporal, Mind, Nature, Udun, Demonology,
-Necromancy, Runecraft, Thaumaturgy, and Alchemy.
+Necromancy, and Thaumaturgy.
 ~~~~~54|Skills|Magic-device
 [[[[[BMagic-device]
 This skill is a sub-skill of the Magic skill. It eases the use of magical
@@ -452,11 +445,6 @@ point on your Necromancy skill adds 0.04 bonus skill points to your Magic skill.
 
 Investing in the Necromancy skill? You might be interested in the 
 *****ability.txt*08[Touch of Death] and *****ability.txt*12[Undead Form] abilities.
-~~~~~36|Skills|Runecraft
-[[[[[BRunecraft]
-This skill is a sub-skill of the Magic skill. This is the base skill of the
-Runecrafter class. Spending 1 skill point on your Runecraft skill adds 0.12
-bonus skill points to your Magic skill.
 ~~~~~37|Skills|Thaumaturgy
 [[[[[BThaumaturgy]
 This skill is a sub-skill of the Magic skill. Each level of *****m_thaum.txt*0[thaumaturgy] gives
@@ -465,13 +453,6 @@ any sort. However, once learned these spells do not gain in levels as the
 thaumaturgy skill or the spell-power skills are increased. Spending 1 skill
 point on your Thaumaturgy skill adds 0.06 bonus skill points to your Magic
 skill.
-~~~~~49|Skills|Alchemy
-[[[[[BAlchemy]
-The Alchemy skill affects your ability to extract and use essences to create
-magical items. 
-
-Investing in the Alchemy skill? You might be interested in the *****ability.txt*09[Artifact Creation] 
-ability.
 ~~~~~38|Skills|Spirituality
 [[[[[BSpirituality]
 The spirituality skill influences things which have a "helping hand" from the
diff --git a/lib/help/spoiler.hlp b/lib/help/spoiler.hlp
index bc229852..996c0d32 100644
--- a/lib/help/spoiler.hlp
+++ b/lib/help/spoiler.hlp
@@ -7,7 +7,6 @@ Please choose one of the following online spoiler files:
 
      *****/acorspoil.txt*0[(a) Corruptions]
      *****/bdunspoil.txt*0[(b) Dungeons]
-     *****/cessences.txt*0[(c) Essence Spoiler]
      *****/dinscrip.txt*0[(d) Floor Inscriptions]
      *****/eluckspoi.txt*0[(e) Luck]
      *****/ffatespoi.txt*0[(f) Fates]
diff --git a/lib/help/tome_faq.txt b/lib/help/tome_faq.txt
index 7ad7a421..f8f03c36 100644
--- a/lib/help/tome_faq.txt
+++ b/lib/help/tome_faq.txt
@@ -81,8 +81,7 @@ You can also fill empty bottles at a fountain (enabling you to identify the
 potion and hence the type of fountain) by using the 'H' command and answering
 'F' at the prompt.  The game will then ask you to choose bottles and how many
 bottles you want to fill.  You can find empty bottles on the dungeon and
-drinking pints of fine ale/wine will give you emtpy bottles; if you are 
-trained in Alchemy, you can reuse bottles after quaffing potions as well.
+drinking pints of fine ale/wine will give you emtpy bottles.
 
 #####G------------------------------------------------------------------------------
 #####GQ: I got killed by a Great Wyrm of Power at 50'!!! What happened?
@@ -102,16 +101,6 @@ activation can be something very nasty....
 
 To activate it, use the normal Activation command, but when prompted for which 
 item to activate change to the backpack instead of wielded equipment.
-~~~~~10|Essences
-~~~~~11|Runes
-#####G------------------------------------------------------------------------------
-#####GQ: I keep coming across "essences" and "runes". What are they? 
-
-Essences are the *****c_alchem.txt*0[Alchemist's] friend, and you can only use them if you
-have access to the *****skills.txt*49[Alchemy] skill. 
-Runes are used to cast and store spells of varying types. *****c_runecr.txt*0[Runecrafters] are the
-class who are most proficient at using these. You can only use them if you 
-have access to the *****skills.txt*36[Runecrafting] skill.
 ~~~~~12|Homes
 #####G------------------------------------------------------------------------------
 #####GQ: Where can I store all my equipment? Theere's not enough room in my
diff --git a/lib/mods/.cvsignore b/lib/mods/.cvsignore
deleted file mode 100644
index 61a33fff..00000000
--- a/lib/mods/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-tomk
diff --git a/lib/mods/CMakeLists.txt b/lib/mods/CMakeLists.txt
new file mode 100644
index 00000000..5cce23ea
--- /dev/null
+++ b/lib/mods/CMakeLists.txt
@@ -0,0 +1 @@
+ADD_SUBDIRECTORY(theme)
diff --git a/lib/mods/mods_aux.lua b/lib/mods/mods_aux.lua
deleted file mode 100644
index 1562a566..00000000
--- a/lib/mods/mods_aux.lua
+++ /dev/null
@@ -1,185 +0,0 @@
--- Ok some functions that we dont need are dangerous
---[[
-execute = nil
-getenv = nil
-setlocale = nil
-exit = nil
-openfile = nil
-writeto = nil
-readfrom = nil
-appendto = nil
-remove = nil
-rename = nil
-tmpname = nil
-]]
-modules = {}
-
-current_module = nil
-
-function setup_module(mod)
-	-- For standart game, nothing needs to be done
-	if not mod.layout then return end
-
-	for k, e in mod.layout do
-		module_reset_dir(k, e)
-	end
-end
-
-function init_module(i)
-	setup_module(get_module(i))
-end
-
-function max_modules()
-	local i = 0
-	for k, e in modules do
-		if type(k) == "number" and type(e) == "table" then
-			i = i + 1
-		end
-	end
-	return i
-end
-
-function get_module_name(j)
-	local i = 0
-	for k, e in modules do
-		if type(k) == "number" and type(e) == "table" then
-			if i == j then return e.name end
-			i = i + 1
-		end
-	end
-end
-
-function get_module_desc(j)
-	local i = 0
-	for k, e in modules do
-		if type(k) == "number" and type(e) == "table" then
-			if i == j then return e.desc end
-			i = i + 1
-		end
-	end
-end
-
-function get_module(j)
-	local i = 0
-	for k, e in modules do
-		if type(k) == "number" and type(e) == "table" then
-			if i == j then return e end
-			i = i + 1
-		end
-	end
-end
-
-function find_module(name)
-	local i = 0
-	for k, e in modules do
-		if type(k) == "number" and type(e) == "table" then
-			if name == e.name then return i end
-			i = i + 1
-		end
-	end
-end
-
-function assign_current_module(name)
-	current_module = get_module(find_module(name))
-end
-
-function get_module_info(type, subtype)
-	if subtype then
-		return current_module[type][subtype]
-	else
-		return current_module[type]
-	end
-end
-
-function exec_module_info(type, ...)
-	return call(current_module[type], arg)
-end
-
-function module_savefile_loadable(savefile_mod, savefile_death)
-	for _, e in current_module.mod_savefiles do
-		if e[1] == savefile_mod then
-			if e[2] == "all" then
-				return TRUE
-			elseif e[2] == "alive" and savefile_death == FALSE then
-				return TRUE
-			elseif e[2] == "dead" and savefile_death == TRUE then
-				return TRUE
-			end
-		end
-	end
-	return FALSE
-end
-
-function scan_extra_modules()
-	scansubdir(ANGBAND_DIR_MODULES)
-	for i = 0, scansubdir_max - 1 do
-		if (scansubdir_result[i + 1] ~= ".") and (scansubdir_result[i + 1] ~= "..") then
-			local dir = path_build(ANGBAND_DIR_MODULES, scansubdir_result[i + 1])
-			local file = path_build(dir, "module.lua")
-			if file_exist(file) == TRUE then
-				tome_dofile_anywhere(dir, "module.lua")
-			end
-		end
-	end
-end
-
-function add_module(t)
-	assert(t.name, "No module name")
-	assert(type(t.version) == "table", "No module version")
-	assert(t.desc, "No module desc")
-	assert(t.author, "No module author")
-	assert(t.mod_savefiles, "No loadable savefiles module mark")
-
-	for _, e in modules do
-		if type(e) == "table" and e.name == t.name then
-			error("Module name already defined: "..t.name)
-		end
-	end
-
-	if type(t.author) == "string" then
-		t.author = { t.author, "unknown@unknown.net" }
-	end
-
-	for k, e in t.mod_savefiles do
-		if type(e) == "string" then t.mod_savefiles[k] = { e, "all" } end
-	end
-
-	if type(t.desc) == "table" then
-		local d = ""
-		for k, e in t.desc do
-			d = d .. e
-			if k < getn(t.desc) then
-				d = d .. "\n"
-			end
-		end
-		t.desc = d
-	end
-
-	if not t.rand_quest then t.rand_quest = FALSE end
-	if not t.C_quest then t.C_quest = FALSE end
-
-	if not t.base_dungeon then t.base_dungeon = 4 end
-	if not t.death_dungeon then t.death_dungeon = 28 end
-
-	if not t.astral_dungeon then t.astral_dungeon = 8 end
-	if not t.astral_wild_x then t.astral_wild_x = 45 end
-	if not t.astral_wild_y then t.astral_wild_y = 19 end
-
-	if not t.random_artifact_weapon_chance then
-		t.random_artifact_weapon_chance = 30
-	end
-	if not t.random_artifact_armor_chance then
-		t.random_artifact_armor_chance = 20
-	end
-	if not t.random_artifact_jewelry_chance then
-		t.random_artifact_jewelry_chance = 20
-	end
-
-	if not t.max_plev then t.max_plev = 50 end
-	if not t.max_skill_overage then t.max_skill_overage = 4 end
-	if not t.skill_per_level then t.skill_per_level = function() return 6 end end
-
-	if not t.allow_birth then t.allow_birth = TRUE end
-
-	tinsert(modules, t)
-end
diff --git a/lib/mods/modules.lua b/lib/mods/modules.lua
deleted file mode 100644
index 5deddef7..00000000
--- a/lib/mods/modules.lua
+++ /dev/null
@@ -1,5 +0,0 @@
--- Load ToME
-tome_dofile_anywhere(ANGBAND_DIR, "module.lua")
-
--- Look for more modules
-scan_extra_modules()
diff --git a/lib/mods/theme/CMakeLists.txt b/lib/mods/theme/CMakeLists.txt
new file mode 100644
index 00000000..f1160786
--- /dev/null
+++ b/lib/mods/theme/CMakeLists.txt
@@ -0,0 +1,14 @@
+INSTALL(DIRECTORY
+  apex
+  data
+  dngn
+  edit
+  file
+  help
+  note
+  pref
+  save
+  user
+  DESTINATION ${DEFAULT_PATH}/mods/theme
+  PATTERN "delete.me" EXCLUDE
+  )
diff --git a/lib/mods/theme/core/auto.lua b/lib/mods/theme/core/auto.lua
deleted file mode 100644
index b758db52..00000000
--- a/lib/mods/theme/core/auto.lua
+++ /dev/null
@@ -1,859 +0,0 @@
--- This file is the core of the Automatizer
--- Please do not touch unless you know what you are doing
-
-__rules = {}
-__rules_max = 0
-
-rule_aux = {}
-
--- Rule apply function, does .. nothing
-function auto_nothing(obj, item)
-	return
-end
-
-function auto_inscribe(obj, item, note)
-	if obj.note ~= 0 then return end
-	msg_print("<Auto-Inscribe {"..note.."}>")
-	obj.note = quark_add(note)
-	return TRUE
-end
-
--- Rule apply function, pickup object
-function auto_pickup(obj, item)
-	if item >= 0 then return end
-	if inven_carry_okay(obj) == FALSE then return end
-	msg_print("<Auto-pickup>")
-	object_pickup(-item)
-	return TRUE
-end
-
--- Rule apply function, destroy item
-function auto_destroy(obj, item)
-	-- be carefull to what we can destroy
-	-- Unaware things won't be destroyed.
-	if is_aware(obj) == FALSE then return end
-
-	-- Inscribed things won't be destroyed!
-	if obj.note ~= 0 then return end
-
-	-- Keep Artifacts -- they cannot be destroyed anyway
-	if is_artifact(obj) == TRUE then return end
-
-	-- Cannot destroy CURSE_NO_DROP objects
-	local f1, f2, f3, f4, f5, esp = object_flags(obj);
-	if band(f4, TR4_CURSE_NO_DROP) ~= 0 and band(obj.ident, IDENT_CURSED) then return end
-
-	msg_print("<Auto-destroy>")
-
-	-- Eliminate the item (from the pack)
-	if item >= 0 then
-		inven_item_increase(item, -obj.number)
-		inven_item_describe(item)
-		inven_item_optimize(item)
-	-- Eliminate the item (from the floor)
-	else
-		floor_item_increase(0 - item, -obj.number)
-		floor_item_describe(0 - item)
-		floor_item_optimize(0 - item)
-	end
-	return TRUE
-end
-
--- Report the status of an object
-function object_status(obj)
-	local sense =
-	{
-		[SENSE_CURSED] = "bad",
-		[SENSE_WORTHLESS] = "very bad",
-		[SENSE_AVERAGE] = "average",
-		[SENSE_GOOD_LIGHT] = "good",
-		[SENSE_GOOD_HEAVY] = "good",
-		[SENSE_EXCELLENT] = "very good",
-		[SENSE_SPECIAL] = "special",
-		[SENSE_TERRIBLE] = "terrible",
-	}
-
-	if is_known(obj) == FALSE then
-		if sense[obj.sense] then
-			return sense[obj.sense]
-		else
-			return ""
-		end
-	else
-if nil then -- test
-		local osense = -1
-		local type = select_sense(obj, TRUE, TRUE)
-		if type == 1 then
-			osense = value_check_aux1(obj)
-		elseif type == 2 then
-			osense = value_check_aux1_magic(obj)
-		end
-print("type : "..type)
-		if sense[osense] then
-		print("sense: "..sense[osense])
-			return sense[osense]
-		else
-		print("sense: ")
-			return ""
-		end
-
-else -- the real one
-
-		local slot = wield_slot_ideal(obj, TRUE)
-
-		-- Arts items
-		if is_artifact(obj) == TRUE then
-			if band(obj.ident, IDENT_CURSED) == 0 then return "special"
-			else return "terrible" end
-		-- Ego items
-		elseif (obj.name2 > 0 or obj.name2b > 0) then
-			if band(obj.ident, IDENT_CURSED) == 0 then return "very good"
-			else return "very bad" end
-		-- weapon
-		elseif (slot == INVEN_WIELD) or (slot == INVEN_BOW) or (slot == INVEN_AMMO) or (slot == INVEN_TOOL) then
-		    if obj.to_h + obj.to_d < 0 then
-			 return "bad"
-		    elseif obj.to_h + obj.to_d > 0 then
-			 return "good"
-		    else
-			 return "average"
-		    end
-		-- armor
-		elseif (slot >= INVEN_BODY) and (slot <= INVEN_FEET) then
-		    if obj.to_a < 0 then
-			 return "bad"
-		    elseif obj.to_a > 0 then
-			 return "good"
-		    else
-			 return "average"
-		    end
-		-- ring
-		elseif slot == INVEN_RING then
-		    if (obj.to_d + obj.to_h < 0) or (obj.to_a < 0) or (obj.pval < 0) then
-			 return "bad"
-		    else
-			 return "average"
-		    end
-		-- amulet
-		elseif slot == INVEN_NECK then
-		    if (obj.pval < 0) then
-			 return "bad"
-		    else
-			 return "average"
-		    end
-		-- chests
-			 elseif obj.tval == TV_CHEST then
-			 	if obj.pval == 0 then
-					return "empty"
-				elseif obj.pval < 0 then
-					return "disarmed"
-				else
-					return "average"
-				end
-		else
-		    return "average"
-		end
-end
-	end
-end
-
--- Recursive function to generate a rule function tree
-function gen_rule_fct(r)
-	-- It is a test rule (or, and, ...)
-	if r.label == "and" or r.label == "or" then
-		local i
-		local fct_tbl = {}
-		for i = 1, getn(r) do
-			if r[i].label ~= "comment" then
-				tinsert(fct_tbl, gen_rule_fct(r[i]))
-			end
-		end
-		if r.label == "and" then
-			return function(object)
-				local fcts = %fct_tbl
-				local i
-				for i = 1, getn(fcts) do
-					if not fcts[i](object) then return end
-				end
-				return TRUE
-			end
-		elseif r.label == "or" then
-			return function(object)
-				local fcts = %fct_tbl
-				local i
-				for i = 1, getn(fcts) do
-					if fcts[i](object) then return TRUE end
-				end
-			end
-		end
-	-- It is a condition rule (name, type, level, ...)
-	else
-		if r.label == "not" then
-			local f
-			if not r[1] then
-				f = function (object) return TRUE end
-			else
-				f = gen_rule_fct(r[1])
-			end
-			return function(object) return not %f(object) end
-		elseif r.label == "inventory" then
-			local f
-			if not r[1] then
-				f = function(object) return end
-			else
-				f = gen_rule_fct(r[1])
-			end
-			return function(object)
-				local i = 0
-				while i < INVEN_WIELD do
-					if %f(player.inventory(i)) then
-						return TRUE
-					end
-					i = i + 1
-				end
-			end
-		elseif r.label == "equipment" then
-			local f
-			if not r[1] then
-				f = function(object) return end
-			else
-				f = gen_rule_fct(r[1])
-			end
-			return function(object)
-				local i = INVEN_WIELD
-				while i < INVEN_TOTAL do
-					if %f(player.inventory(i)) then
-						return TRUE
-					end
-					i = i + 1
-				end
-			end
-		elseif r.label == "name" then
-			return function(object) if strlower(object_desc(object, -1, 0)) == strlower(%r[1]) then return TRUE end end
-		elseif r.label == "contain" then
-			return function(object) if strfind(strlower(object_desc(object, -1, 0)), strlower(%r[1])) then return TRUE end end
-		elseif r.label == "symbol" then
-			return function(object) if strchar(get_kind(object).d_char) == %r[1] then return TRUE end end
-		elseif r.label == "inscribed" then
-			return function(object) if object.note ~= 0 and strfind(strlower(quark_str(object.note)), strlower(%r[1])) then return TRUE end end
-		elseif r.label == "discount" then
-			local d1 = r.args.min
-			local d2 = r.args.max
-			if tonumber(d1) == nil then d1 = getglobal(d1) else d1 = tonumber(d1) end
-			if tonumber(d2) == nil then d2 = getglobal(d2) else d2 = tonumber(d2) end
-			return function(object) if is_aware(object) == TRUE and object.discount >= %d1 and object.discount <= %d2 then return TRUE end end
-		elseif r.label == "tval" then
-			local tv = r[1]
-			if tonumber(tv) == nil then tv = getglobal(tv) else tv = tonumber(tv) end
-			return function(object) if object.tval == %tv then return TRUE end end
-		elseif r.label == "sval" then
-			assert(r.args.min and r.args.max, "sval rule lacks min or max")
-			local sv1 = r.args.min
-			local sv2 = r.args.max
-			if tonumber(sv1) == nil then sv1 = getglobal(sv1) else sv1 = tonumber(sv1) end
-			if tonumber(sv2) == nil then sv2 = getglobal(sv2) else sv2 = tonumber(sv2) end
-			return function(object) if is_aware(object) == TRUE and object.sval >= %sv1 and object.sval <= %sv2 then return TRUE end end
-		elseif r.label == "status" then
-			return function(object) if object_status(object) == strlower(%r[1]) then return TRUE end end
-		elseif r.label == "state" then
-			if r[1] == "identified" then
-				return function(object) if is_known(object) == TRUE then return TRUE end end
-			else
-				return function(object) if is_known(object) == FALSE then return TRUE end end
-			end
-		elseif r.label == "race" then
-			return function(object) if strlower(get_race_name()) == strlower(%r[1]) then return TRUE end end
-		elseif r.label == "subrace" then
-			return function(object) if strlower(get_subrace_name()) == strlower(%r[1]) then return TRUE end end
-		elseif r.label == "class" then
-			return function(object) if strlower(get_class_name()) == strlower(%r[1]) then return TRUE end end
-		elseif r.label == "level" then
-			assert(r.args.min and r.args.max, "level rule lacks min or max")
-			return function(object) if player.lev >= tonumber(%r.args.min) and player.lev <= tonumber(%r.args.max) then return TRUE end end
-		elseif r.label == "skill" then
-			assert(r.args.min and r.args.max, "skill rule lacks min or max")
-			local s = find_skill_i(r[1])
-			assert(s ~= -1, "no skill "..r[1])
-			return function(object) if get_skill(%s) >= tonumber(%r.args.min) and get_skill(%s) <= tonumber(%r.args.max) then return TRUE end end
-		elseif r.label == "ability" then
-			local s = find_ability(r[1])
-			assert(s ~= -1, "no ability "..r[1])
-			return function(object) if has_ability(%s) == TRUE then return TRUE end end
-		end
-	end
-end
-
-function auto_inscribe_maker(inscription)
-    return function(...)
-	arg.n = arg.n + 1
-	arg[getn(arg)] = %inscription
-	return call(auto_inscribe, arg)
-    end
-end
-
--- Generate a rule from a table
-function gen_full_rule(t)
-	-- only honor rules for this module
-	if not t.args.module then
-		t.args.module = "ToME"
-	end
-
-	if not ((t.args.module == "all") or (t.args.module == game_module)) then
-		return function() end
-	end
-
-	-- Check for which action to do
-	local apply_fct = auto_nothing
-	if t.args.type == "destroy" then apply_fct = auto_destroy
-	elseif t.args.type == "pickup" then apply_fct = auto_pickup
-	elseif t.args.type == "inscribe" then apply_fct = auto_inscribe_maker(t.args.inscription)
-	end
-
-	-- create the function tree
-	local rf
-	if t[1] then
-		rf = gen_rule_fct(t[1])
-	else
-		rf = function (object) end
-	end
-
-	-- create the final function
-	return function(...)
-		local rf = %rf
-		if rf(arg[1]) then
-			if call(%apply_fct, arg) == TRUE then return TRUE end
-		end
-	end
-end
-
--- Create a function that checks for the rules(passed in xml form)
-function add_ruleset(s)
-	local tbl = xml:collect(s)
-	local i
-
-	-- Add all rules
-	for i = 1, getn(tbl) do
-		local t = tbl[i]
-
-		if t.label == "rule" then
-			-- Create the function tree
-			local fct = gen_full_rule(t)
-
-			-- Create the test function
-			__rules[__rules_max] =
-			{
-				["table"] =	t,
-				["fct"] =	fct
-			}
-			__rules_max = __rules_max + 1
-		end
-	end
-end
-
--- Apply the current rules to an object
--- call with at least (object, idx)
-function apply_rules(...)
-	local i
-	for i = 0, __rules_max - 1 do
-		if call(__rules[i].fct, arg) then return TRUE end
-	end
-	return FALSE
-end
-
--- Clear the current rules
-function clean_ruleset()
-	__rules_max = 0
-	__rules = {}
-end
-
------- helper fonctions for the GUI
-
-auto_aux = {}
-auto_aux.stack = { n = 0 }
-auto_aux.idx = 1
-auto_aux.rule = 1
-function auto_aux:go_right()
-	if auto_aux.rule[1] and type(auto_aux.rule[1]) == "table" then
-		tinsert(auto_aux.stack, auto_aux.idx)
-		tinsert(auto_aux.stack, auto_aux.rule)
-		auto_aux.rule = auto_aux.rule[1]
-		auto_aux.idx = 1
-	end
-end
-
-function auto_aux:go_left(sel)
-	local n = getn(auto_aux.stack)
-
-	if n > 0 then
-		auto_aux.idx = auto_aux.stack[n - 1]
-		auto_aux.rule = auto_aux.stack[n]
-		tremove(auto_aux.stack)
-		tremove(auto_aux.stack)
-	end
-end
-
-function auto_aux:go_down()
-	if getn(auto_aux.stack) > 1 then
-		if auto_aux.stack[getn(auto_aux.stack)][auto_aux.idx + 1] then
-			auto_aux.idx = auto_aux.idx + 1
-			auto_aux.rule = auto_aux.stack[getn(auto_aux.stack)][auto_aux.idx]
-		end
-	end
-end
-
-function auto_aux:go_up()
-	if getn(auto_aux.stack) > 1 then
-		if auto_aux.stack[getn(auto_aux.stack)][auto_aux.idx - 1] then
-			auto_aux.idx = auto_aux.idx - 1
-			auto_aux.rule = auto_aux.stack[getn(auto_aux.stack)][auto_aux.idx]
-		end
-	end
-end
-
-function auto_aux:scroll_up()
-	xml.write_off_y = xml.write_off_y - 1
-end
-
-function auto_aux:scroll_down()
-	xml.write_off_y = xml.write_off_y + 1
-end
-
-function auto_aux:scroll_left()
-	xml.write_off_x = xml.write_off_x + 1
-end
-
-function auto_aux:scroll_right()
-	xml.write_off_x = xml.write_off_x - 1
-end
-
-function auto_aux:adjust_current(sel)
-	if __rules_max == 0 then return end
-
-	xml.write_off_y = 0
-	xml.write_off_x = 0
-	auto_aux.idx = 1
-	auto_aux.stack = { n = 0 }
-	auto_aux.rule = __rules[sel].table
-end
-
-function auto_aux:move_up(sel)
-	if sel > 0 then
-		local u = __rules[sel - 1]
-		local d = __rules[sel]
-		__rules[sel - 1] = d
-		__rules[sel] = u
-		return sel - 1
-	end
-	return sel
-end
-
-function auto_aux:move_down(sel)
-	if sel < __rules_max - 1 then
-		local u = __rules[sel]
-		local d = __rules[sel + 1]
-		__rules[sel + 1] = u
-		__rules[sel] = d
-		return sel + 1
-	end
-	return sel
-end
-
-function auto_aux:new_rule(sel, nam, typ, arg)
-	local r
-
-
-	-- nam can also directly be the table itself
-	if type(nam) == "table" then
-		r =
-		{
-			["table"] = nam,
-			["fct"] = function (object) end
-		}
-	elseif typ == "inscribe" then
-		if arg == "" then
-		    arg = input_box("Inscription?", 79)
-		end
-		r =
-		{
-			["table"] =
-			{
-				label = "rule",
-				args = { name = nam, type = typ, inscription = arg, module = game_module },
-			},
-			["fct"] = function (object) end
-		}
-	else
-		r =
-		{
-			["table"] =
-			{
-				label = "rule",
-				args = { name = nam, type = typ, module = game_module },
-			},
-			["fct"] = function (object) end
-		}
-	end
-	tinsert(__rules, sel, r)
-	__rules_max = __rules_max + 1
-end
-
-function auto_aux:rename_rule(sel, nam)
-	if sel >= 0 and sel < __rules_max then
-		__rules[sel].table.args.name = nam
-	end
-end
-
-function auto_aux:save_ruleset()
-	xml.write = xml.write_file
-
-	print_hook("clean_ruleset()\nadd_ruleset\n[[\n")
-	local i
-	for i = 0, __rules_max - 1 do
-		xml:print_xml(__rules[i].table, '')
-	end
-	print_hook("]]\n")
-
-	xml.write = xml.write_screen
-end
-
-function auto_aux:del_self(sel)
-	if auto_aux.rule.label == "rule" then
-		tremove(__rules, sel)
-		__rules_max = __rules_max - 1
-		return sel - 1
-	else
-		local idx = auto_aux.idx
-		auto_aux:go_left(sel)
-		tremove(auto_aux.rule, idx)
-		return sel
-	end
-end
-
-auto_aux.types_desc =
-{
-	["and"] =
-	{
-		"Check is true if all rules within it are true",
-		xml:collect([[<and><foo1>...</foo1><foo2>...</foo2><foo3>...</foo3></and>]]),
-		function ()
-			return xml:collect("<and></and>")
-		end,
-	},
-	["or"] =
-	{
-		"Check is true if at least one rule within it is true",
-		xml:collect([[<or><foo1>...</foo1><foo2>...</foo2><foo3>...</foo3></or>]]),
-		function ()
-			return xml:collect("<or></or>")
-		end,
-	},
-	["not"] =
-	{
-		"Invert the result of its child rule",
-		xml:collect([[<not><foo1>...</foo1></not>]]),
-		function ()
-			return xml:collect("<not></not>")
-		end,
-	},
-	["comment"] =
-	{
-		"Comments are meaningless",
-		xml:collect([[<comment>Comment explaining something</comment>]]),
-		function ()
-			local n = input_box("Comment?", 79)
-			if n == "" then return end
-			return xml:collect("<comment>"..n.."</comment>")
-	       	end,
-	},
-	["name"] =
-	{
-		"Check is true if object name matches name",
-		xml:collect([[<name>potion of healing</name>]]),
-		function ()
-			local n = input_box("Object name to match?", 79)
-			if n == "" then return end
-			return xml:collect("<name>"..n.."</name>")
-	       	end,
-	},
-	["contain"] =
-	{
-		"Check is true if object name contains word",
-		xml:collect([[<contain>healing</contain>]]),
-		function ()
-			local n = input_box("Word to find in object name?", 79)
-			if n == "" then return end
-			return xml:collect("<contain>"..n.."</contain>")
-	       	end,
-	},
-	["inscribed"] =
-	{
-		"Check is true if object inscription contains word",
-		xml:collect([[<inscribed>=g</inscribed>]]),
-		function ()
-			local n = input_box("Word to find in object inscription?", 79)
-			if n == "" then return end
-			return xml:collect("<inscribed>"..n.."</inscribed>")
-	       	end,
-	},
-	["discount"] =
-	{
-		"Check is true if object discount is between 2 values",
-		xml:collect([[<sval min='50' max='100'></sval>]]),
-		function ()
-			local s = "<discount "
-
-			local n = input_box("Min discount?", 79)
-			if n == "" then return end
-			s = s.."min='"..n.."' "
-
-			n = input_box("Max discount?", 79)
-			if n == "" then return end
-			s = s.."max='"..n.."'></discount>"
-			return xml:collect(s)
-	       	end,
-	},
-	["symbol"] =
-	{
-		"Check is true if object symbol is ok",
-		xml:collect([[<symbol>!</symbol>]]),
-		function ()
-			local n = input_box("Symbol to match?", 1)
-			if n == "" then return end
-			return xml:collect("<symbol>"..n.."</symbol>")
-	       	end,
-	},
-	["status"] =
-	{
-		"Check is true if object status is ok",
-		xml:collect([[<status>good</status>]]),
-		function ()
-			local n = msg_box("[t]errible, [v]ery bad, [b]ad, [a]verage, [G]ood, [V]ery good, [S]pecial?")
-			local t =
-			{
-				["t"] = "terrible",
-				["v"] = "very bad",
-				["b"] = "bad",
-				["a"] = "average",
-				["G"] = "good",
-				["V"] = "very good",
-				["S"] = "special",
-			}
-			if not t[strchar(n)] then return end
-			return xml:collect("<status>"..t[strchar(n)].."</status>")
-	       	end,
-	},
-	["state"] =
-	{
-		"Check is true if object is identified/unidentified",
-		xml:collect([[<state>identified</state>]]),
-		function ()
-			local n = msg_box("[i]dentified, [n]on identified?")
-			local t =
-			{
-				["i"] = "identified",
-				["n"] = "not identified",
-			}
-			if not t[strchar(n)] then return end
-			return xml:collect("<state>"..t[strchar(n)].."</state>")
-	       	end,
-	},
-	["tval"] =
-	{
-		"Check is true if object tval(from k_info.txt) is ok",
-		xml:collect([[<tval>55</tval>]]),
-		function ()
-			local n = input_box("Tval to match?", 79)
-			if n == "" then return end
-			return xml:collect("<tval>"..n.."</tval>")
-	       	end,
-	},
-	["sval"] =
-	{
-		{
-			"Check is true if object sval(from k_info.txt) is between",
-			"2 values",
-		},
-		xml:collect([[<sval min='0' max='100'></sval>]]),
-		function ()
-			local s = "<sval "
-
-			local n = input_box("Min sval?", 79)
-			if n == "" then return end
-			s = s.."min='"..n.."' "
-
-			n = input_box("Max sval?", 79)
-			if n == "" then return end
-			s = s.."max='"..n.."'></sval>"
-			return xml:collect(s)
-	       	end,
-	},
-	["race"] =
-	{
-		"Check is true if player race is ok",
-		xml:collect([[<race>dunadan</race>]]),
-		function ()
-			local n = input_box("Player race to match?", 79)
-			if n == "" then return end
-			return xml:collect("<race>"..n.."</race>")
-	       	end,
-	},
-	["subrace"] =
-	{
-		"Check is true if player subrace is ok",
-		xml:collect([[<subrace>vampire</subrace>]]),
-		function ()
-			local n = input_box("Player subrace to match?", 79)
-			if n == "" then return end
-			return xml:collect("<subrace>"..n.."</subrace>")
-	       	end,
-	},
-	["class"] =
-	{
-		"Check is true if player class is ok",
-		xml:collect([[<class>sorceror</class>]]),
-		function ()
-			local n = input_box("Player class to match?", 79)
-			if n == "" then return end
-			return xml:collect("<class>"..n.."</class>")
-	       	end,
-	},
-	["level"] =
-	{
-		"Check is true if player level is between 2 values",
-		xml:collect([[<level min='20' max='50'></level>]]),
-		function ()
-			local s = "<level "
-
-			local n = input_box("Min player level?", 79)
-			if n == "" then return end
-			s = s.."min='"..n.."' "
-
-			n = input_box("Max player level?", 79)
-			if n == "" then return end
-			s = s.."max='"..n.."'></level>"
-
-			return xml:collect(s)
-	       	end,
-	},
-	["skill"] =
-	{
-		"Check is true if player skill level is between 2 values",
-		xml:collect([[<skill min='10' max='20'>Divination</skill>]]),
-		function ()
-			local s = "<skill "
-
-			local n = input_box("Min skill level?", 79)
-			if n == "" then return end
-			s = s.."min='"..n.."' "
-
-			n = input_box("Max skill level?", 79)
-			if n == "" then return end
-			s = s.."max='"..n.."'>"
-
-			n = input_box("Skill name?", 79)
-			if n == "" then return end
-			if find_skill_i(n) == -1 then return end
-			s = s..n.."</skill>"
-
-			return xml:collect(s)
-	       	end,
-	},
-	["ability"] =
-	{
-		"Check is true if player has the ability",
-		xml:collect([[<ability>Ammo creation</ability>]]),
-		function()
-			local n = input_box("Ability name?", 79)
-			if n == "" then return end
-			if find_ability(n) == -1 then return end
-			return xml:collect("<ability>"..n.."</ability>")
-		end,
-	},
-	["inventory"] =
-	{
-		{
-			"Check is true if something in player's inventory matches",
-			"the contained rule",
-		},
-		xml:collect([[<inventory><foo1>...</foo1></inventory>]]),
-		function ()
-			return xml:collect("<inventory></inventory>")
-		end,
-	},
-	["equipment"] =
-	{
-		{
-			"Check is true if something in player's equipment matches",
-			"the contained rule",
-		},
-		xml:collect([[<equipment><foo1>...</foo1></equipment>]]),
-		function ()
-			return xml:collect("<equipment></equipment>")
-		end,
-	},
-}
-
-function auto_aux:display_desc(sel)
-	local d = auto_aux.types_desc[sel][1]
-	if type(d) == "string" then
-		c_prt(TERM_WHITE, d, 1, 17)
-	else
-		local k, e, i
-		i = 0
-		for k, e in d do
-			c_prt(TERM_WHITE, e, 1 + i, 17)
-			i = i + 1
-		end
-	end
-end
-
-function auto_aux:add_child(sel)
-	-- <rule> and <not> contain only one match
-	if (auto_aux.rule.label == "rule" or auto_aux.rule.label == "not") and auto_aux.rule[1] then return end
-	if (auto_aux.rule.label == "rule" or auto_aux.rule.label == "equipment") and auto_aux.rule[1] then return end
-	if (auto_aux.rule.label == "rule" or auto_aux.rule.label == "inventory") and auto_aux.rule[1] then return end
-
-	-- Only <and> and <or> can contain
-	if auto_aux.rule.label ~= "rule" and auto_aux.rule.label ~= "and" and auto_aux.rule.label ~= "or"  and auto_aux.rule.label ~= "not" and  auto_aux.rule.label ~= "equipment" and auto_aux.rule.label ~= "inventory" then return end
-
-	-- get it
-	local r = auto_aux.types_desc[sel][3]()
-	if not r then return end
-
-	-- Ok add it
-	tinsert(auto_aux.rule, r[1])
-end
-
-function auto_aux.regen_ruleset()
-	local i
-	for i = 0, __rules_max - 1 do
-		__rules[i].fct = gen_full_rule(__rules[i].table)
-	end
-end
-
-
--- Easily add new rules
-function easy_add_rule(typ, mode, do_status, obj)
-	local detect_rule
-
-	if mode == "tval" then
-		detect_rule = "<tval>"..obj.tval.."</tval>"
-	elseif mode == "tsval" then
-		detect_rule = "<and><tval>"..obj.tval.."</tval><sval min='"..obj.sval.."' max='"..obj.sval.."'></sval></and>"
-	elseif mode == "name" then
-		detect_rule = "<name>"..strlower(object_desc(obj, -1, 0)).."</name>"
-	end
-
-	if do_status == TRUE then
-		local status = object_status(obj)
-		if status and not (status == "") then
-			detect_rule = "<and>"..detect_rule.."<status>"..status.."</status></and>"
-		end
-	end
-
-	local rule = "<rule module='"..game_module.."' name='"..typ.."' type='"..typ.."'>"..detect_rule.."</rule>"
-	auto_aux:new_rule(0, xml:collect(rule)[1], '')
-	auto_aux.regen_ruleset()
-	msg_print("Rule added. Please go to the Automatizer screen (press = then T)")
-	msg_print("to save the modified ruleset.")
-end
diff --git a/lib/mods/theme/core/building.lua b/lib/mods/theme/core/building.lua
deleted file mode 100644
index 8e88888a..00000000
--- a/lib/mods/theme/core/building.lua
+++ /dev/null
@@ -1,15 +0,0 @@
-__building_actions = {}
-
-function add_building_action(a)
-	assert(a.index, "No building action index")
-	assert(a.action, "No building action action")
-	__building_actions[a.index] = a.action
-end
-
-function __bact_activate(bact)
-	if __building_actions[bact] then
-		return __building_actions[bact]()
-	end
-end
-
-add_hook_script(HOOK_BUILDING_ACTION, "__bact_activate", "__bact_activate")
diff --git a/lib/mods/theme/core/crpt_aux.lua b/lib/mods/theme/core/crpt_aux.lua
deleted file mode 100644
index 97f8d4b6..00000000
--- a/lib/mods/theme/core/crpt_aux.lua
+++ /dev/null
@@ -1,182 +0,0 @@
--- Core functions for corruptions
-
-__corruptions = {}
-__corruptions_max = 0
-__corruptions_callbacks_max = 0
-
--- Get the corruption
-function player.corruption(c, set)
-	if set then
-		player.corruptions_aux[c + 1] = set
-		player.redraw = bor(player.redraw, PR_BASIC)
-		player.update = bor(player.update, PU_BONUS, PU_TORCH, PU_BODY, PU_POWERS)
-		if (set == TRUE) and (__corruptions[c].gain) then
-			__corruptions[c].gain()
-		end
-		if (set == FALSE) and (__corruptions[c].lose) then
-			__corruptions[c].lose()
-		end
-	else
-		return player.corruptions_aux[c + 1]
-	end
-end
-
--- Test if we have that corruption
--- We must:
--- 1) have it or be willing to get it
--- 2) have all its dependancies
--- 3) have none of its opposing corruptions
--- 4) pass the possible tests
-function test_depend_corrupt(corrupt, can_gain)
-	local i, c
-
-	if not can_gain then can_gain = FALSE end
-
-	if can_gain == TRUE then
-		if (player.corruption(corrupt) ~= FALSE) then
-			return FALSE
-		end
-	else
-		if (player.corruption(corrupt) ~= TRUE) then
-			return FALSE
-		end
-	end
-
-	for c, i in __corruptions[corrupt].depends do
-		if test_depend_corrupt(c) ~= TRUE then
-			return FALSE
-		end
-	end
-
-	for c, i in __corruptions[corrupt].oppose do
-		if test_depend_corrupt(c) ~= FALSE then
-			return FALSE
-		end
-	end
-
-	-- are we even allowed to get it?
-	if __corruptions[corrupt].can_gain and (not __corruptions[corrupt].can_gain()) then
-		return FALSE
-	end
-
-	return TRUE
-end
-
--- Gain a new corruption
-function gain_corruption(group)
-	local i, max
-	local pos = {}
-
-	-- Get the list of all possible ones
-	max = 0
-	for i = 0, __corruptions_max - 1 do
-		if __corruptions[i].group == group and test_depend_corrupt(i, TRUE) == TRUE and __corruptions[i].random == TRUE and __corruptions[i].allow() then
-			pos[max] = i
-			max = max + 1
-		end
-	end
-
-	-- Ok now get one of them
-	if (max > 0) then
-		local ret = rand_int(max)
-
-		player.corruption(pos[ret], TRUE)
-		cmsg_print(TERM_L_RED, __corruptions[pos[ret]].get_text)
-
-		return pos[ret]
-	else
-		return -1
-	end
-end
-
--- Lose an existing corruption
-function lose_corruption()
-	local i, max
-	local pos = {}
-
-	-- Get the list of all possible ones
-	max = 0
-	for i = 0, __corruptions_max - 1 do
-		if test_depend_corrupt(i) == TRUE and __corruptions[i].removable == TRUE then
-			pos[max] = i
-			max = max + 1
-		end
-	end
-
-	-- Ok now get one of them
-	if (max > 0) then
-		local ret = rand_int(max)
-
-		player.corruption(pos[ret], FALSE)
-		cmsg_print(TERM_L_RED, __corruptions[pos[ret]].lose_text)
-
-		-- Ok now lets see if it broke some dependancies
-		for i = 0, max - 1 do
-			if player.corruption(pos[i]) ~= test_depend_corrupt(pos[i]) then
-				player.corruption(pos[i], FALSE)
-				cmsg_print(TERM_L_RED, __corruptions[pos[i]].lose_text)
-			end
-		end
-
-		return pos[ret]
-	else
-		return -1
-	end
-end
-
--- Lose all corruptions (for e.g. Potion of New Life)
-function lose_all_corruptions()
-	local i;
-	for i = 0, __corruptions_max - 1 do
-		lose_corruption()
-	end
-	return -1
-end
-
--- Creates a new corruption
-function add_corruption(c)
-	assert(c.color, "No corruption color")
-	assert(c.name, "No corruption name")
-	assert(c.get_text, "No corruption get_text")
-	assert(c.lose_text, "No corruption lose_text")
-	assert(c.desc, "No corruption desc")
-	assert(c.hooks, "Nothing to do for corruption")
-	if not c.random then c.random = TRUE end
-	if not c.removable then c.removable = TRUE end
-	if not c.allow then c.allow = function() return not nil end end
-
-	if c.depends == nil then c.depends = {} end
-	if c.oppose == nil then c.oppose = {} end
-
-	-- We must make sure the other ones opposes too
-	local o, i
-	for o, i in c.oppose do
-		__corruptions[o].oppose[__corruptions_max] = TRUE
-	end
-
-	local index, h
-	for index, h in c.hooks do
-		add_hook_script(index, "__lua__corrupt_callback"..__corruptions_callbacks_max, "__lua__corrupt_callback"..__corruptions_callbacks_max)
-		setglobal("__lua__corrupt_callback"..__corruptions_callbacks_max,
-			function (...)
-				if test_depend_corrupt(%__corruptions_max) == TRUE then
-					return call(%h, arg)
-				end
-			end
-		)
-		__corruptions_callbacks_max = __corruptions_callbacks_max + 1
-	end
-
-	if type(c.desc) == "table" then
-		local new_desc = ""
-		for index, h in c.desc do
-			new_desc = new_desc..h.."\n"
-		end
-		c.desc = new_desc
-	end
-
-	__corruptions[__corruptions_max] = c
-	__corruptions_max = __corruptions_max + 1
-	return (__corruptions_max - 1)
-end
-
diff --git a/lib/mods/theme/core/dungeon.lua b/lib/mods/theme/core/dungeon.lua
deleted file mode 100644
index d91d785b..00000000
--- a/lib/mods/theme/core/dungeon.lua
+++ /dev/null
@@ -1,55 +0,0 @@
--- Internal lua file in charge of dungeon stuff
-
-function place_dungeon(y, x, d_idx)
-	if d_idx then
-		wild_map(y, x).entrance = 1000 + d_idx
-       	else
-		wild_map(y, x).entrance = 0
-	end
-end
-
-function dungeon(d_idx)
-	return d_info[1 + d_idx]
-end
-
-function wild_feat(wild)
-	return wf_info[1 + wild.feat]
-end
-
-function explode_dir(dir)
-	return ddy[dir + 1], ddx[dir + 1]
-end
-
-function rotate_dir(dir, mov)
-	if mov > 0 then
-		if dir == 7 then dir = 8
-		elseif dir == 8 then dir = 9
-		elseif dir == 9 then dir = 6
-		elseif dir == 6 then dir = 3
-		elseif dir == 3 then dir = 2
-		elseif dir == 2 then dir = 1
-		elseif dir == 1 then dir = 4
-		elseif dir == 4 then dir = 7
-		end
-	elseif mov < 0 then
-		if dir == 7 then dir = 4
-		elseif dir == 4 then dir = 1
-		elseif dir == 1 then dir = 2
-		elseif dir == 2 then dir = 3
-		elseif dir == 3 then dir = 6
-		elseif dir == 6 then dir = 9
-		elseif dir == 9 then dir = 8
-		elseif dir == 8 then dir = 7
-		end
-	end
-
-	return dir
-end
-
--- Place a trap for a specific level
-function place_trap(y, x, level)
-	local old_dun = dun_level
-	dun_level = level
-	%place_trap(y, x)
-	dun_level = old_dun
-end
diff --git a/lib/mods/theme/core/gen_idx.lua b/lib/mods/theme/core/gen_idx.lua
deleted file mode 100644
index 5f3af435..00000000
--- a/lib/mods/theme/core/gen_idx.lua
+++ /dev/null
@@ -1,261 +0,0 @@
--- Place here the list of files to parse
-files =
-{
-	"birth.txt",
-	"experien.hlp",
-	"gods.txt",
-	"explore.hlp",
-	"newbie.hlp",
-	"advanced.hlp",
-	"help.hlp",
-	"general.txt",
-	"whattome.txt",
-	"dungeon.txt",
-	"spoiler.hlp",
-	"g_melkor.txt",
-	"skills.txt",
-	"c_bard.txt",
-	"c_druid.txt",
-	"c_lorema.txt",
-	"c_mage.txt",
-	"c_mimic.txt",
-	"c_mindcr.txt",
-	"c_monk.txt",
-	"c_palad.txt",
-	"c_posses.txt",
-	"c_pr_drk.txt",
-	"c_pr_eru.txt",
-	"c_pr_man.txt",
-	"c_symbia.txt",
-	"c_alchem.txt",
-	"c_archer.txt",
-	"c_assass.txt",
-	"c_axemas.txt",
-	"c_demono.txt",
-	"c_geoman.txt",
-	"c_hafted.txt",
-	"c_necro.txt",
-	"c_polear.txt",
-	"c_ranger.txt",
-	"c_rogue.txt",
-	"c_runecr.txt",
-	"c_sorcer.txt",
-	"c_swordm.txt",
-	"c_thaum.txt",
-	"c_unbel.txt",
-	"c_warper.txt",
-	"c_warrio.txt",
-	"m_meta.txt",
-	"rm_skel.txt",
-	"rm_zomb.txt",
-	"luckspoi.txt",
-	"m_air.txt",
-	"dunspoil.txt",
-	"g_eru.txt",
-	"g_manwe.txt",
-	"g_tulkas.txt",
-	"m_divin.txt",
-	"m_mimic.txt",
-	"m_water.txt",
-	"magic.txt",
-	"r_drkelf.txt",
-	"r_dwarf.txt",
-	"r_elf.txt",
-	"r_hielf.txt",
-	"r_hobbit.txt",
-	"r_pettyd.txt",
-	"r_wodelf.txt",
-	"rm_spec.txt",
-	"tome_faq.txt",
-	"ability.txt",
-	"automat.txt",
-	"c_summon.txt",
-	"command.txt",
-	"corspoil.txt",
-	"debug.txt",
-	"m_music.txt",
-	"rm_barb.txt",
-	"macrofaq.txt",
-	"m_necrom.txt",
-	"m_mindcr.txt",
-	"m_symbio.txt",
-	"m_thaum.txt",
-	"magic.hlp",
-	"m_convey.txt",
-	"m_fire.txt",
-	"m_mana.txt",
-	"m_mind.txt",
-	"m_nature.txt",
-	"m_tempo.txt",
-	"m_udun.txt",
-	"m_geoman.txt",
-	"essences.txt",
-	"r_ent.txt",
-	"g_yavann.txt",
-	"defines.txt",
-	"rm_vamp.txt",
-	"inscrip.txt",
-	"m_earth.txt",
-	"option.txt",
-	"attack.txt",
-	"version.txt",
-	"m_demono.txt",
-	"r_beorn.txt",
-	"r_deathm.txt",
-	"r_rohank.txt",
-	"r_hafogr.txt",
-	"r_human.txt",
-	"r_kobold.txt",
-	"r_maia.txt",
-	"r_orc.txt",
-	"r_thlord.txt",
-	"r_troll.txt",
-	"r_yeek.txt",
-	"rm_class.txt",
-	"rm_herm.txt",
-	"rm_lsoul.txt",
-	"wishing.txt",
-	"c_priest.txt",
-	"fatespoi.txt",
-	"gambling.txt",
-	"r_dunad.txt",
-	"r_gnome.txt",
-	"r_hafelf.txt",
-	"c_merch.txt",	
-        "spoil_faq.txt",
-}
-
-out_file = "index.txt"
-
-index = {}
-
-function parse_file(file)
-	local fff = openfile(path_build(ANGBAND_DIR_HELP, file), "r")
-	local line
-
-	line = read(fff, "*l")
-	while line do
-		local i, j, anchor, name, subname = strfind(line, "~~~~~(%d+)|([%d%a -]+)|([%d%a -]+)")
-		if not i then
-			i, j, anchor, name = strfind(line, "~~~~~(%d+)|([%d%a -]+)")
-
-			subname = nil
-		end
-
-		if i then
-			if not index[name] then
-				index[name] = {}
-			end
-			if subname then
-				tinsert(index[name], { __name__ = subname, __file__ = file, __anchor__ = anchor})
-			else
-				tinsert(index[name], { __name__ = "__primary__", __file__ = file, __anchor__ = anchor})
-			end
-		end
-
-		line = read(fff, "*l")
-	end
-
-	closefile(fff)
-end
-
-function sort_fct(a, b)
-	local i, len
-
-	a = a.__name__
-	b = b.__name__
-
-	if strlen(a) > strlen(b) then len = strlen(b) else len = strlen(a) end
-
-	for i = 1, len do
-		local ac = strbyte(a, i)
-		local bc = strbyte(b, i)
-
-		if ac < bc then
-			return not nil
-		elseif ac > bc then
-			return nil
-		end
-	end
-	if strlen(a) > strlen(b) then return nil else return not nil end
-end
-
-function generate_index()
-	local k, e, index_list
-	for _, e in files do
-		parse_file(e)
-	end
-
-	index_list = {}
-	for k, e in index do
-		-- Ok either my sort function or lua sort function sucks ass ..
-		sort(e, sort_fct)
-		sort(e, sort_fct)
-		sort(e, sort_fct)
-		sort(e, sort_fct)
-		sort(e, sort_fct)
-		tinsert(index_list, {__name__= k, __table__ = e})
-	end
-
-	-- Ok either my sort function or lua sort function sucks ass ..
-	sort(index_list, sort_fct)
-	sort(index_list, sort_fct)
-	sort(index_list, sort_fct)
-	sort(index_list, sort_fct)
-	sort(index_list, sort_fct)
-	index = index_list
-end
-
-function out_link(fff, space, name, file, anchor)
-	write(fff, space.."*****"..file.."*"..anchor.."["..name.."]\n")
-end
-
-function print_index()
-	local i, j, c, new_c
-	local fff = openfile(path_build(ANGBAND_DIR_HELP, out_file), "w")
-
-	write(fff,
-[[|||||oy
-#####R	     /----------------------------------------\
-#####R	    <                Help Index                >
-#####R	     \----------------------------------------/
-
-This is the index of everything in the T.o.M.E. documentation.
-
-#####BHit a letter key to jump to the entries for that letter.
-
-Some entries in the index link to the same place as other entries. This is 
-intentional, so that the information you want is easy to find.
-
-Don't forget you can browse the help from the *****help.hlp*02[Main menu].
-
-#####sSpotted a problem with the help files, or some content thats missing? 
-#####sContact fearoffours@t-o-m-e.net .
-
-]])
-
-	c = ' '
-	for i = 1, getn(index) do
-		new_c = strbyte(index[i].__name__, 1)
-		if c ~= new_c then
-			c = new_c
-			write(fff, "~~~~~"..c.."\n")
-			write(fff, "*****/"..strchar(c)..out_file.."*"..c.."["..strchar(c).."]\n")
-		end
-		for j = 1, getn(index[i].__table__) do
-			if index[i].__table__[j].__name__ == "__primary__" then
-				out_link(fff, "  ", index[i].__name__, index[i].__table__[j].__file__, index[i].__table__[j].__anchor__)
-			end
-		end
-		for j = 1, getn(index[i].__table__) do
-			if index[i].__table__[j].__name__ ~= "__primary__" then
-				out_link(fff, "    ", index[i].__table__[j].__name__, index[i].__table__[j].__file__, index[i].__table__[j].__anchor__)
-			end
-		end
-	end
-	closefile(fff)
-end
-
-generate_index()
-
-print_index()
diff --git a/lib/mods/theme/core/gods.lua b/lib/mods/theme/core/gods.lua
deleted file mode 100644
index 77e0aad5..00000000
--- a/lib/mods/theme/core/gods.lua
+++ /dev/null
@@ -1,40 +0,0 @@
--- Gods helper files
-
--- Gods structs
-
-__gods_hook = {}
-__gods_callbacks = {}
-__gods_callbacks_max = 0
-
-function add_god(q)
-	local i, index, d, z, qq
-	
-	assert(q.name, "No god name")
-	assert(q.desc, "No god desc")
-	assert(q.hooks, "No god hooks")
-	
-	i = add_new_gods(q.name);
-
-	z = 0
-	for index, d in q.desc do
-		desc_god(i, z, d);
-		z = z + 1
-	end
-
-	__gods_hook[i] = q.hooks
-	for index, d in q.hooks do
-		add_hook_script(index, "__lua__gods_callback"..__gods_callbacks_max, "__lua__gods_callback"..__gods_callbacks_max)
-		setglobal("__lua__gods_callback"..__gods_callbacks_max, d)
-		__gods_callbacks_max = __gods_callbacks_max + 1
-	end
-	if q.data then
-		for index, d in q.data do
-			-- Besure it exists
-			setglobal(index, d)
-
-			-- Make it save & load
-	     		add_loadsave(index, d)
-		end
-	end
-	return i
-end
diff --git a/lib/mods/theme/core/help.lua b/lib/mods/theme/core/help.lua
deleted file mode 100644
index a581fe63..00000000
--- a/lib/mods/theme/core/help.lua
+++ /dev/null
@@ -1,141 +0,0 @@
--- Ingame contextual help
-
--- We use our own hook list as to not overburn the hook proccessor
--- with many hooks that would slow down things
--- It would be very meaningless if the option is not even on
-__ingame_hooks = {}
-
-__ingame_help_max = 0
-
-function ingame_help(t, ...)
-	-- This function can also be used to call the callbacks
-	if type(t) == "string" then
-		local f = getglobal("__ingame_help_fct_"..t)
-		call(f, arg)
-		return
-	end
-
-	assert(t.desc or t.fct, "no ingame help desc/fct")
-	assert(t.hook or t.callback, "no ingame help hook/callback")
-	if t.hook then assert(t.event, "no ingame hepl event needed by hook") end
-
-	-- Set it to only trigger once
-	setglobal("__ingame_help_activated_"..__ingame_help_max, FALSE)
-	-- Save/load it
-	add_loadsave("__ingame_help_activated_"..__ingame_help_max, FALSE)
-
-	if t.hook then
-		-- If the hok list didnt exist yet, add it
-		if not __ingame_hooks[t.hook] then
-			-- Set it to empty, we'll fill it later
-			__ingame_hooks[t.hook] = {}
-			-- Add the global hook
-			add_hooks
-			{
-				[t.hook] = function (...)
-					if option_ingame_help ~= TRUE then return end
-					local k, e
-					for k, e in __ingame_hooks[%t.hook] do
-						if k ~= "n" then
-							call(e, arg)
-						end
-					end
-				end
-			}
-		end
-		if t.desc then
-			tinsert(__ingame_hooks[t.hook],
-				function (...)
-					local tbl = %t
-					if getglobal("__ingame_help_activated_"..%__ingame_help_max) == FALSE then
-						if call(tbl.event, arg) == TRUE then
-							local k, e
-							for k, e in tbl.desc do
-								msg_print(TERM_YELLOW, e)
-							end
-							setglobal("__ingame_help_activated_"..%__ingame_help_max, TRUE)
-						end
-					end
-				end
-			)
-		elseif t.fct then
-			tinsert(__ingame_hooks[t.hook],
-				function (...)
-					local tbl = %t
-					if getglobal("__ingame_help_activated_"..%__ingame_help_max) == FALSE then
-						if call(tbl.event, arg) == TRUE then
-							if tbl.fct() == TRUE then
-								setglobal("__ingame_help_activated_"..%__ingame_help_max, TRUE)
-							end
-						end
-					end
-				end
-			)
-		end
-	else
-		local no_test = FALSE
-		if t.no_test == TRUE then no_test = TRUE end
-		if t.desc then
-			setglobal
-			(
-				"__ingame_help_fct_"..(t.callback),
-				function (...)
-					local tbl = %t
-					if ((option_ingame_help == TRUE) or (%no_test == TRUE)) and (getglobal("__ingame_help_activated_"..%__ingame_help_max) == FALSE) then
-						local k, e
-						for k, e in tbl.desc do
-							msg_print(TERM_YELLOW, e)
-						end
-						setglobal("__ingame_help_activated_"..%__ingame_help_max, TRUE)
-					end
-				end
-			)
-		elseif t.fct then
-			setglobal
-			(
-				"__ingame_help_fct_"..(t.callback),
-				function (...)
-					local tbl = %t
-					if ((option_ingame_help == TRUE) or (%no_test == TRUE)) and (getglobal("__ingame_help_activated_"..%__ingame_help_max) == FALSE) then
-						if call(tbl.fct, arg) == TRUE then
-							setglobal("__ingame_help_activated_"..%__ingame_help_max, TRUE)
-						end
-					end
-				end
-			)
-		end
-	end
-
-	__ingame_help_max = __ingame_help_max + 1
-end
-
--- Clean up the ingame help seen at birth
-add_hooks
-{
-	[HOOK_BIRTH_OBJECTS] = function()
-		local i
-		for i = 0, __ingame_help_max - 1 do
-			setglobal("__ingame_help_activated_"..i, FALSE)
-		end
-	end
-}
-
-function ingame_clean()
-	local i
-	for i = 0, __ingame_help_max - 1 do
-		setglobal("__ingame_help_activated_"..i, FALSE)
-	end
-end
-
--- helper function, brings up a doc
-function ingame_help_doc(name, anchor)
-	-- Save screen
-	screen_save();
-
-	-- Peruse the help file
-	if not anchor then anchor = 0 end
-	show_file(name, 0, -anchor, 0)
-
-	-- Load screen
-	screen_load()
-end
diff --git a/lib/mods/theme/core/init.lua b/lib/mods/theme/core/init.lua
deleted file mode 100644
index 11b812d5..00000000
--- a/lib/mods/theme/core/init.lua
+++ /dev/null
@@ -1,83 +0,0 @@
---
--- This file is loaded at the initialisation of ToME
--- Load the system functions
---
-
--- Name of globals to save
-tome_dofile_anywhere(ANGBAND_DIR_CORE, "load.lua")
-
--- Very thin xml parser(49 lines ;)
-tome_dofile_anywhere(ANGBAND_DIR_CORE, "xml.lua")
-
--- various vital helper code
-tome_dofile_anywhere(ANGBAND_DIR_CORE, "util.lua")
-tome_dofile_anywhere(ANGBAND_DIR_CORE, "player.lua")
-tome_dofile_anywhere(ANGBAND_DIR_CORE, "objects.lua")
-tome_dofile_anywhere(ANGBAND_DIR_CORE, "monsters.lua")
-tome_dofile_anywhere(ANGBAND_DIR_CORE, "building.lua")
-tome_dofile_anywhere(ANGBAND_DIR_CORE, "dungeon.lua")
-tome_dofile_anywhere(ANGBAND_DIR_CORE, "s_aux.lua")
-tome_dofile_anywhere(ANGBAND_DIR_CORE, "crpt_aux.lua")
-tome_dofile_anywhere(ANGBAND_DIR_CORE, "mimc_aux.lua")
-tome_dofile_anywhere(ANGBAND_DIR_CORE, "quests.lua")
-tome_dofile_anywhere(ANGBAND_DIR_CORE, "gods.lua")
-
--- Load the ingame contextual help
-tome_dofile_anywhere(ANGBAND_DIR_CORE, "help.lua")
-
--- let the store specific stuff happen!
-tome_dofile_anywhere(ANGBAND_DIR_CORE, "stores.lua")
-
---------------------------------------------------------------
---------------------------------------------------------------
---------------------------------------------------------------
--------------Here we load the non vital scripts---------------
------------------------from lib/scpt--------------------------
---------------------------------------------------------------
---------------------------------------------------------------
-tome_dofile("init.lua")
-
--- The dofile functions for each patch
-patch_dofile = {}
-
--- Now load patches
-function load_patches()
-	scansubdir(ANGBAND_DIR_PATCH)
-	for i = 0, scansubdir_max - 1 do
-		if (scansubdir_result[i + 1] ~= ".") and (scansubdir_result[i + 1] ~= "..") then
-			local dir = path_build(ANGBAND_DIR_PATCH, scansubdir_result[i + 1])
-			local file = path_build(dir, "patch.lua")
-			if file_exist(file) == TRUE then
-				patch_init = nil
-				tome_dofile_anywhere(dir, "patch.lua", TRUE)
-				unset_safe_globals()
-				if patch_init == nil then
-					set_safe_globals()
-					quit("Patch in "..file.." did not include a patch_init() function")
-				else
-					set_safe_globals()
-
-					-- create the dofile function
-					patch_dofile[scansubdir_result[i + 1]] = function(f)
-						tome_dofile_anywhere(%dir, f, TRUE)
-					end
-
-					local name, version = patch_init()
-					if name == nil or version == nil then
-						quit("Patch in "..file.." did not return valid name or version.\nIt must return name, version")
-					end
-					patch_version(name, version)
-				end
-			end
-		end
-	end
-end
-load_patches()
-
---------------------------------------------------------------
---------------------------------------------------------------
---------------------------------------------------------------
---
--- Do not thouch after this line
---
-tome_dofile_anywhere(ANGBAND_DIR_CORE, "load2.lua")
diff --git a/lib/mods/theme/core/load.lua b/lib/mods/theme/core/load.lua
deleted file mode 100644
index 9522ec91..00000000
--- a/lib/mods/theme/core/load.lua
+++ /dev/null
@@ -1,37 +0,0 @@
--- Savefile stuff
--- Do not meddle in the affairs of savefiles for they are subtle and quick to be become incompatible
-
-__loadsave_name = {}
-__loadsave_max = 0
-__loadsave_tmp = 0
-
-function add_loadsave(name, default)
-	assert(name, "No variable name to save")
-	assert(default, "No default value")
-
-	-- if it is a table we must create many entries
-	if type(default) == "table" then
-		for k, e in default do
-			add_loadsave(name.."."..k, e)
-		end
-	else
-		__loadsave_name[__loadsave_max] = { name = name, default = default }
-		__loadsave_max = __loadsave_max + 1
-	end
-end
-
--- Example of how to save a table
--- NOTE: { 1, 2, 3 } will NOT work, the key MUST be a string
---[[
-add_loadsave("t",
-{
-	foo = 7,
-	tab = {
-		a = 1,
-		b = 2,
-		tab = {
-			a=1, b=2, c=3,
-		},
-	},
-})
-]]
diff --git a/lib/mods/theme/core/load2.lua b/lib/mods/theme/core/load2.lua
deleted file mode 100644
index 7e151d91..00000000
--- a/lib/mods/theme/core/load2.lua
+++ /dev/null
@@ -1,56 +0,0 @@
--- Savefile helpers
-
--- function called when a key in the variable part ofthe savefile is read
--- if the key matches what we need, we use it, otehrwise just ignore it
-function __savefile_load(key, val)
-	local index, elem
-	
-	for index, elem in __loadsave_name do
-		if (key == elem.name) then
-			dostring(elem.name.." = "..val)
-	       	end
-	end
-end
-
--- called when the game is saved, can only save numbers
--- assosiate a key with them to allow the loading code to recognize them
-function __savefile_save()
-	local index, elem
-	for index, elem in __loadsave_name do
-		dostring("__loadsave_tmp = "..elem.name)
-		save_number_key(elem.name, __loadsave_tmp);
-	end
-end
-
-register_savefile(__loadsave_max)
-add_hook_script(HOOK_LOAD_GAME, "__savefile_load", "__hook_load")
-add_hook_script(HOOK_SAVE_GAME, "__savefile_save", "__hook_save")
-
--- Parse a flattened(i.e: foo.bar.zog) table path and recrate tables
-function reconstruct_table(name)
-	for i = 1, strlen(name) - 1 do
-		if strsub(name, i, i) == "." then
-			local tbl = strsub(name, 1, i - 1)
-
-			if dostring("return "..tbl) == nil then
-				dostring(tbl.."={}")
-			end
-		end
-	end
-end
-
--- Automagically set unkown variables, otherwise the savefile code
--- might get VERY upset
-do
-	local k, e
-	-- We need to be able to check for unknown globals
-	unset_safe_globals()
-	for k, e in __loadsave_name do
-		reconstruct_table(e.name)
-		if dostring("return "..(e.name)) == nil then
-			dostring((e.name).." = "..(e.default))
-		end
-	end
-	-- Now taht we did, we set it back, for it is usefull ;)
-	set_safe_globals()
-end
diff --git a/lib/mods/theme/core/mimc_aux.lua b/lib/mods/theme/core/mimc_aux.lua
deleted file mode 100644
index cea1f4dc..00000000
--- a/lib/mods/theme/core/mimc_aux.lua
+++ /dev/null
@@ -1,96 +0,0 @@
--- Mimic shapes helper file
-
-__mimics = {}
-__mimics_max = 1
-__mimics_names = {}
-
-function add_mimic_shape(t)
-	assert(t.name, "no mimic name")
-	assert(t.desc, "no mimic desc")
-	assert(t.calc, "no mimic calc")
-	assert(t.level, "no mimic level")
-	assert(t.duration, "no mimic duration")
-
-	if not t.limit then t.limit = 0 end
-
-	if not t.obj_name then
-		t.obj_name = t.name
-	end
-
-	t.show_name = '['..t.name..']'
-
-	-- if it needs hooks, add them
-	if t.hooks then
-		add_hooks(t.hooks)
-	end
-
-	-- Add it in a name to index hash table
-	__mimics_names[t.name] = __mimics_max
-
-	__mimics[__mimics_max] = t
-	__mimics_max = __mimics_max + 1
-end
-
-function resolve_mimic_name(name)
-	if __mimics_names[name] then
-		return __mimics_names[name]
-	else
-		return -1
-	end
-end
-
-function find_random_mimic_shape(level, limit, realm)
-	local mimic, tries
-
-	tries = 1000
-	while tries > 0 do
-		tries = tries - 1
-		mimic = rand_range(1, __mimics_max - 1)
-		if (not realm) or (__mimics[mimic].realm == realm) then
-			if limit >= __mimics[mimic].limit then
-				if (rand_int(__mimics[mimic].level * 3) < level) and (__mimics[mimic].rarity < 100)  and (magik(100 - __mimics[mimic].rarity) == TRUE) then
-					break
-				end
-			end
-		end
-	end
-	if tries > 0 then
-		return mimic
-	else
-		return resolve_mimic_name("Abomination")
-	end
-end
-
-function get_mimic_info(mimic, info)
-	if not __mimics[mimic] then return 0 end
-	return __mimics[mimic][info]
-end
-
-function get_mimic_rand_dur(mimic)
-	return rand_range(__mimics[mimic].duration[1], __mimics[mimic].duration[2])
-end
-
-function calc_mimic(mimic)
-	return __mimics[mimic].calc()
-end
-
-function calc_mimic_power(mimic)
-	if __mimics[mimic].power then __mimics[mimic].power() end
-end
-
---- Here comes the only vital shape
-
-add_mimic_shape
-{
-	["name"] =      "Abomination",
-	["obj_name"] =  "Abominable Cloak",
-	["desc"] = 	"Abominations are failed experiments of powerful wizards.",
-	["realm"] =     nil,
-	["level"] =     1,
-	["rarity"] =    101,
-	["duration"] =  {20, 100},
-	["calc"] =      function ()
-			apply_flags(TR1_SPEED + TR1_STR + TR1_INT + TR1_WIS + TR1_DEX + TR1_CON + TR1_CHR, 0, 0, 0, 0, 0, -10)
-			player.xtra_f3 = bor(player.xtra_f3, TR3_AGGRAVATE)
-       	end,
-}
diff --git a/lib/mods/theme/core/monsters.lua b/lib/mods/theme/core/monsters.lua
deleted file mode 100644
index ca2851a0..00000000
--- a/lib/mods/theme/core/monsters.lua
+++ /dev/null
@@ -1,16 +0,0 @@
--- SYSTEM FILE
---
--- Monster stuff, do not touch
---
-
-function summon_monster(y, x, lev, friend, typ)
-	if type(typ) == "number" then
-		if friend == TRUE then
-			return summon_specific_friendly(y, x, lev, typ, FALSE)
-		else
-			return summon_specific(y, x, lev, typ)
-		end
-	else
-		return summon_monster_aux(y, x, lev, friend, typ)
-	end
-end
diff --git a/lib/mods/theme/core/objects.lua b/lib/mods/theme/core/objects.lua
deleted file mode 100644
index 97320b82..00000000
--- a/lib/mods/theme/core/objects.lua
+++ /dev/null
@@ -1,45 +0,0 @@
--- SYSTEM FILE
---
--- Lua object funtions
---
-
-function create_object(tval, sval)
-	local obj = new_object()
-	object_prep(obj, lookup_kind(tval, sval))
-	return (obj)
-end
-
-function set_item_tester(tester)
-	if tolua.type(tester) == "number" then
-		lua_set_item_tester(tester, "")
-	end
-	if tolua.type(tester) == "string" then
-		lua_set_item_tester(0, tester)
-	end
-	if tolua.type(tester) == "function" then
-		__get_item_hook_default = tester
-		lua_set_item_tester(0, "__get_item_hook_default")
-	end
-end
-
-function create_artifact(a_idx)
-	local obj
-	local tval, sval
-
-	tval = a_info[a_idx + 1].tval
-	sval = a_info[a_idx + 1].sval
-	obj = create_object(tval, sval)
-	obj.name1 = a_idx
-	apply_magic(obj, -1, TRUE, TRUE, TRUE)
-
-	return (obj)
-end
-
-function get_kind(obj)
-	return k_info[obj.k_idx + 1]
-end
-
-function get_item(ask, deny, flags, mask)
-	set_item_tester(mask)
-	return get_item_aux(0, ask, deny, flags)
-end
diff --git a/lib/mods/theme/core/player.lua b/lib/mods/theme/core/player.lua
deleted file mode 100644
index 16878228..00000000
--- a/lib/mods/theme/core/player.lua
+++ /dev/null
@@ -1,135 +0,0 @@
--- SYSTEM FILE
---
--- Lua player funtions
---
-
--- Gods
-function deity(i)
-	return deity_info[1 + i]
-end
-
--------- skill stuff ---------
-
--- Easy skill access
-function skill(i)
-	return s_info[i + 1]
-end
-
--- Sart a lasting spell
-function player.start_lasting_spell(spl)
-	player.music_extra = -spl
-end
-
--- stat mods
-function player.modify_stat(stat, inc)
-	player.stat_add[1 + stat] = player.stat_add[1 + stat] + inc
-end
-
--- powers mods
-function player.add_power(pow)
-	player.powers[1 + pow] = TRUE
-end
-
--- easier inventory access
-function player.inventory(i)
-	return player.inventory_real[i + 1]
-end
-
--- modify mana
--- returns TRUE if there is a pb
-function increase_mana(amt)
-	player.csp = player.csp + amt
-	player.redraw = bor(player.redraw, PR_MANA)
-	if (player.csp < 0) then
-		player.csp = 0
-		return TRUE
-	end
-	if (player.csp > player.msp) then
-		player.csp = player.msp
-	end
-	return FALSE
-end
-
-
--- Return the coordinates of the player whether in wild or not
-function player.get_wild_coord()
-	if player.wild_mode == TRUE then
-		return player.py, player.px
-	else
-		return player.wilderness_y, player.wilderness_x
-	end
-end
-
--- Create a new power
-__power_fct = {}
-function add_power(p)
-	local i
-
-	assert(p.name, "No power name!")
-	assert(p.desc, "No power desc!")
-	assert(p.desc_get, "No power desc get!")
-	assert(p.desc_lose, "No power desc lose!")
-	assert(p.stat, "No power stat!")
-	assert(p.level, "No power level!")
-	assert(p.cost, "No power cost!")
-	assert(p.fail, "No power fail!")
-	assert(p.power, "No power power!")
-
-	i = add_new_power(p.name, p.desc, p.desc_get, p.desc_lose, p.level, p.cost, p.stat, p.fail)
-	__power_fct[i] = p.power
-	return i
-end
-
-function __power_fct_activate(power)
-	if __power_fct[power] then
-		__power_fct[power]()
-		return TRUE
-	else
-		return FALSE
-	end
-end
-
--- Register in the hook list
-add_hook_script(HOOK_ACTIVATE_POWER, "__power_fct_activate", "__power_fct_activate")
-
-
---- Mkeys
-
--- Create a new power
-__mkey_fct = {}
-function add_mkey(p)
-	local i
-
-	assert(p.mkey, "No mkey mkey!")
-	assert(p.fct, "No mkeey fct!")
-
-	__mkey_fct[p.mkey] = p.fct
-end
-
-function __mkey_fct_activate(power)
-	if __mkey_fct[power] then
-		__mkey_fct[power]()
-		return TRUE
-	else
-		return FALSE
-	end
-end
-
--- Register in the hook list
-add_hook_script(HOOK_MKEY, "__mkey_fct_activate", "__mkey_fct_activate")
-
-
--- Subraces
-function subrace(racem)
-	return race_mod_info[racem + 1]
-end
-
-function subrace_add_power(subrace, power)
-	for i = 1, 4 do
-		if subrace.powers[i] == -1 then
-			subrace.powers[i] = power
-			return not nil
-		end
-	end
-	return nil
-end
diff --git a/lib/mods/theme/core/quests.lua b/lib/mods/theme/core/quests.lua
deleted file mode 100644
index dfe9db51..00000000
--- a/lib/mods/theme/core/quests.lua
+++ /dev/null
@@ -1,57 +0,0 @@
--- Quest helper files
-
--- Quest structs
-
-__quest_hook = {}
-__quest_callbacks = {}
-__quest_callbacks_max = 0
-__quest_dynamic_desc = {}
-
-function add_quest(q)
-	local i, index, d, z, qq
-	
-	assert(q.global, "No quest global name")
-	assert(q.name, "No quest name")
-	assert(q.desc, "No quest desc")
-	assert(q.level, "No quest level")
-	assert(q.hooks, "No quest hooks")
-	
-	i = new_quest(q.name);
-	setglobal(q.global, i)
-
-	-- Make it save & load
-	add_loadsave("quest("..q.global..").status", QUEST_STATUS_UNTAKEN)
-
-	if type(q.desc) == "table" then
-		z = 0
-		for index, d in q.desc do
-			quest_desc(i, z, d);
-			z = z + 1
-		end
-	else
-		__quest_dynamic_desc[i] = q.desc
-		quest(i).dynamic_desc = TRUE
-	end
-	quest(i).level = q.level
-	if not q.silent then
-		quest(i).silent = FALSE
-	else
-		quest(i).silent = q.silent
-	end
-	__quest_hook[i] = q.hooks
-	for index, d in q.hooks do
-		add_hook_script(index, "__lua__quest_callback"..__quest_callbacks_max, "__lua__quest_callback"..__quest_callbacks_max)
-		setglobal("__lua__quest_callback"..__quest_callbacks_max, d)
-		__quest_callbacks_max = __quest_callbacks_max + 1
-	end
-	if q.data then
-		for index, d in q.data do
-			-- Besure it exists
-			setglobal(index, d)
-
-			-- Make it save & load
-	     		add_loadsave(index, d)
-		end
-	end
-	return i
-end
diff --git a/lib/mods/theme/core/s_aux.lua b/lib/mods/theme/core/s_aux.lua
deleted file mode 100644
index ec609b04..00000000
--- a/lib/mods/theme/core/s_aux.lua
+++ /dev/null
@@ -1,716 +0,0 @@
--- Functions to help with spells, do not touch
-
-__schools = {}
-__schools_num = 0
-
-__tmp_spells = {}
-__tmp_spells_num = 0
-
-function add_school(s)
-	__schools[__schools_num] = s
-	
-	__schools_num = __schools_num + 1
-	return (__schools_num - 1)
-end
-
-function finish_school(i)
-	local s
-	
-	s = __schools[i]
-	assert(s.name, "No school name!")
-	assert(s.skill, "No school skill!")
-
-	-- Need hooks?
-	if s.hooks then
-		add_hooks(s.hooks)
-	end
-
-	new_school(i, s.name, s.skill)
-end
-
-function add_spell(s)
-	__tmp_spells[__tmp_spells_num] = s
-	
-	__tmp_spells_num = __tmp_spells_num + 1
-	return (__tmp_spells_num - 1)
-end
-
-function finish_spell(must_i)
-	local i, s
-	
-	s = __tmp_spells[must_i]
-	assert(s.name, "No spell name!")
-	assert(s.school, "No spell school!")
-	assert(s.level, "No spell level!")
-	assert(s.mana, "No spell mana!")
-	if not s.mana_max then s.mana_max = s.mana end
-	assert(s.fail, "No spell failure rate!")
-	assert(s.spell, "No spell function!")
-	if not s.info then s.info = function() return "" end end
-	assert(s.desc, "No spell desc!")
-	if not s.random then s.random = SKILL_MAGIC end
-	if s.lasting then
-		assert(type(s.lasting) == "function", "Spell lasting is not function")
-	end
-	if s.stick then
-		local k, e
-		for k, e in s.stick do
-			if type(k) == "table" then
-				assert(e.base_level, "Arg no stick base level")
-				assert(e.max_level, "Arg no stick max level")
-			end
-		end
-	end
-
-	i = new_spell(must_i, s.name)
-	assert(i == must_i, "ACK ! i != must_i ! please contact the maintainer")
-	if type(s.school) == "number" then __spell_school[i] = {s.school}
-	else __spell_school[i] = s.school end
-	spell(i).mana = s.mana
-	spell(i).mana_max = s.mana_max
-	spell(i).fail = s.fail
-	spell(i).skill_level = s.level
-	__spell_spell[i] = s.spell
-	__spell_info[i] = s.info
-	__spell_desc[i] = s.desc
-	return i
-end
-
--- Creates the school books array
-__spell_spell = {}
-__spell_info = {}
-__spell_desc = {}
-__spell_school = {}
-school_book = {}
-
--- Find a spell by name
-function find_spell(name)
-	local i
-
-	i = 0
-	while (i < __tmp_spells_num) do
-		if __tmp_spells[i].name == name then return i end
-		i = i + 1
-	end
-	return -1
-end
-
--- Find if the school is under the influence of a god, returns nil or the level
-function get_god_level(sch)
-	if __schools[sch].gods[player.pgod] then
-		return (s_info[__schools[sch].gods[player.pgod].skill + 1].value * __schools[sch].gods[player.pgod].mul) / __schools[sch].gods[player.pgod].div
-	else
-		return nil
-	end
-end
-
--- Change this fct if I want to switch to learnable spells
-function get_level_school(s, max, min)
-	local lvl, sch, index, num, bonus
-	local allow_spell_power = TRUE
-
-	lvl = 0
-	num = 0
-	bonus = 0
-
-	-- No max specified ? assume 50
-	if not max then
-		max = 50
-	end
-	if not min then
-		min = 1
-	end
-
-	-- Do we pass tests?
-	if __tmp_spells[s].depend then
-		if __tmp_spells[s].depend() ~= TRUE then
-			return min, "n/a"
-		end
-	end
-
-	for index, sch in __spell_school[s] do
-		local r, s, p, ok = 0, 0, 0, 0
-
-		-- Does it require we worship a specific god?
-		if __schools[sch].god then
-			if __schools[sch].god ~= player.pgod then
-				if min then return min, "n/a"
-				else return 1, "n/a" end
-			end
-		end
-
-		-- Take the basic skill value
-		r = s_info[(school(sch).skill) + 1].value
-
-		-- Do we pass tests?
-		if __schools[sch].depend then
-			if __schools[sch].depend() ~= TRUE then
-				return min, "n/a"
-			end
-		end
-
-		-- Are we under sorcery effect ?
-		if __schools[sch].sorcery then
-			s = s_info[SKILL_SORCERY + 1].value
-		end
-
-		-- Are we affected by spell power ?
-		-- All teh schools must allow it for it to work
-		if not __schools[sch].spell_power then
-			allow_spell_power = nil
-		end
-
-		-- Are we under a god effect ?
-		if __schools[sch].gods then
-			p = get_god_level(sch)
-			if not p then p = 0 end
-		end
-		
-		-- Find the higher
-		ok = r
-		if ok < s then ok = s end
-		if ok < p then ok = p end
-
-		-- Do we need to add a special bonus ?
-		if __schools[sch].bonus_level then
-			bonus = bonus + (__schools[sch].bonus_level() * (SKILL_STEP / 10))
-		end
-
-		-- All schools must be non zero to be able to use it
-		if ok == 0 then return min, "n/a" end
-
-		-- Apply it
-		lvl = lvl + ok
-		num = num + 1
-	end
-
-	-- Add the Spellpower skill as a bonus
-	if allow_spell_power then
-		bonus = bonus + (get_skill_scale(SKILL_SPELL, 20) * (SKILL_STEP / 10))
-	end
-
-	-- Add bonus from objects
-	bonus = bonus + (player.to_s * (SKILL_STEP / 10))
-
-	-- / 10 because otherwise we can overflow a s32b and we can use a u32b because the value can be negative
-	-- The loss of information should be negligible since 1 skill = 1000 internally
-	lvl = (lvl / num) / 10
-	lvl = lua_get_level(s, lvl, max, min, bonus)
-
-	return lvl, nil
-end
-
--- This is the function to use when casting through a stick
-function get_level_device(s, max, min)
-	local lvl
-
-	-- No max specified ? assume 50
-	if not max then
-		max = 50
-	end
-
-	lvl = s_info[SKILL_DEVICE + 1].value
-	lvl = lvl + (get_level_use_stick * SKILL_STEP)
-
-	-- Sticks are limited
-	if lvl - ((spell(s).skill_level + 1) * SKILL_STEP) >= get_level_max_stick * SKILL_STEP then
-		lvl = (get_level_max_stick + spell(s).skill_level - 1) * SKILL_STEP
-	end
-
-	-- / 10 because otherwise we can overflow a s32b and we can use a u32b because the value can be negative
-	-- The loss of information should be negligible since 1 skill = 1000 internally
-	lvl = lvl / 10
-	if not min then
-		lvl = lua_get_level(s, lvl, max, 1, 0)
-	else
-		lvl = lua_get_level(s, lvl, max, min, 0)
-	end
-
-	return lvl
-end
-
--- The real get_level, works for schooled magic and for innate powers
-get_level_use_stick = -1
-get_level_max_stick = -1
-function get_level(s, max, min)
-	if type(s) == "number" then
-		-- Ahah shall we use Magic device instead ?
-		if get_level_use_stick > -1 then
-			return get_level_device(s, max, min)
-		else
-			local lvl, na = get_level_school(s, max, min)
-			return lvl
-		end
-	else
-		return get_level_power(s, max, min)
-	end
-end
-
--- Can we cast the spell ?
-function is_ok_spell(s, obj)
-	if get_level(s, 50, 0) == 0 then return nil end
-	if __tmp_spells[s].pval and obj.pval < __tmp_spells[s].pval then return nil end
-	return 1
-end
-
--- Get the amount of mana(or power) needed
-function get_mana(s)
-	return spell(s).mana + get_level(s, spell(s).mana_max - spell(s).mana, 0)
-end
-
--- Return the amount of power(mana, piety, whatever) for the spell
-function get_power(s)
-	if check_affect(s, "piety", FALSE) then
-		return player.grace
-	else
-		return player.csp
-	end
-end
-
--- Return the amount of power(mana, piety, whatever) for the spell
-function get_power_name(s)
-	if check_affect(s, "piety", FALSE) then
-		return "piety"
-	else
-		return "mana"
-	end
-end
-
--- Get the level of a power
-function get_level_power(s, max, min)
-	if not max then max = 50 end
-	if not min then min = 1 end
-
-	return value_scale(s.get_current_level(), 50, max, min)
-end
-
--- Changes the amount of power(mana, piety, whatever) for the spell
-function adjust_power(s, x)
-	if check_affect(s, "piety", FALSE) then
-		inc_piety(GOD_ALL, x)
-	else
-		increase_mana(x)
-	end
-end
-
--- Get spell school name(s) as a /-separated string.
-function spell_school_name(s)
-	local xx, sch_str
-	xx = nil
-	sch_str = ""
-	for index, sch in __spell_school[s] do
-		if xx then
-			sch_str = sch_str.."/"..school(sch).name
-		else
-			xx = 1
-			sch_str = sch_str..school(sch).name
-		end
-	end
-	return sch_str
-end
-
--- Print the book and the spells
-function print_book(book, spl, obj)
-	local x, y, index, sch, size, s
-
-	x = 0
-	y = 2
-	size = 0
-
-	-- Hack if the book is 255 it is a random book
-	if book == 255 then
-		school_book[book] = {spl}
-	end
-
-	-- Parse all spells
-	for index, s in school_book[book] do
-		local color = TERM_L_DARK
-		local lvl, na = get_level_school(s, 50, -50)
-		local xx, sch_str
-
-		if is_ok_spell(s, obj) then
-			if get_mana(s) > get_power(s) then color = TERM_ORANGE
-			else color = TERM_L_GREEN end
-		end
-		
-		sch_str = spell_school_name(s)
-
-		if na then
-			c_prt(color, format("%c) %-20s%-16s   %3s %4s %3d%s %s", size + strbyte("a"), spell(s).name, sch_str, na, get_mana(s), spell_chance(s), "%", __spell_info[s]()), y, x)
-		else
-			c_prt(color, format("%c) %-20s%-16s   %3d %4s %3d%s %s", size + strbyte("a"), spell(s).name, sch_str, lvl, get_mana(s), spell_chance(s), "%", __spell_info[s]()), y, x)
-		end
-		y = y + 1
-		size = size + 1
-	end
-	prt(format("   %-20s%-16s Level Cost Fail Info", "Name", "School"), 1, x)
-	return y
-end
-
--- Output the describtion when it is used as a spell
-function print_spell_desc(s, y)
-	local index, desc, x
-	
-	x = 0
-
-	if type(__spell_desc[s]) == "string" then c_prt(TERM_L_BLUE, __spell_desc[s], y, x)
-	else
-		for index, desc in __spell_desc[s] do
-			c_prt(TERM_L_BLUE, desc, y, x)
-			y = y + 1
-		end
-	end
-	if check_affect(s, "piety", FALSE) then
-		c_prt(TERM_L_WHITE, "It uses piety to cast.", y, x)
-		y = y + 1
-	end
-	if not check_affect(s, "blind") then
-		c_prt(TERM_ORANGE, "It is castable even while blinded.", y, x)
-		y = y + 1
-	end
-	if not check_affect(s, "confusion") then
-		c_prt(TERM_ORANGE, "It is castable even while confused.", y, x)
-		y = y + 1
-	end
-end
-
--- Output the desc when sued as a device
-function print_device_desc(s)
-	local index, desc
-
-	if type(__spell_desc[s]) == "string" then text_out(__spell_desc[s])
-	else
-		for index, desc in __spell_desc[s] do
-			text_out("\n" .. desc)
-		end
-	end
-end
-
-function book_spells_num(book)
-	local size, index, sch
-
-	size = 0
-
-	-- Hack if the book is 255 it is a random book
-	if book == 255 then
-		return 1
-	end
-
-	-- Parse all spells
-	for index, s in school_book[book] do
-		size = size + 1
-	end
-	return size
-end
-
-function spell_x(book, spl, s)
-	if book == 255 then
-		return spl
-	else
-		local i, x, val
-
-		i, val = next(school_book[book], nil)
-		x = 0
-		while x < s do
-			i, val = next(school_book[book], i)
-			x = x + 1
-		end
-		return val
-	end
-end
-
-function spell_in_book(book, spell)
-	local i, s
-
-	for i, s in school_book[book] do
-		if s == spell then return TRUE end
-	end
-	return FALSE
-end
-
--- Returns spell chance of failure for spell
-function spell_chance(s)
-	local chance, s_ptr
-
-	s_ptr = spell(s)
-
-	-- Extract the base spell failure rate
-	if get_level_use_stick > -1 then
-		chance = lua_spell_device_chance(s_ptr.fail, get_level(s, 50), s_ptr.skill_level)
-	else
-		chance = lua_spell_chance(s_ptr.fail, get_level(s, 50), s_ptr.skill_level, get_mana(s), get_power(s), get_spell_stat(s))
-	end
-
-	-- Return the chance
-	return chance
-end
-
-function check_affect(s, name, default)
-	local s_ptr = __tmp_spells[s]
-	local a
-
-	if type(s_ptr[name]) == "number" then
-		a = s_ptr[name]
-	else
-		a = default
-	end
-	if a == FALSE then
-		return nil
-	else
-		return TRUE
-	end
-end
-
--- Returns the stat to use for the spell, INT by default
-function get_spell_stat(s)
-	if not __tmp_spells[s].stat then return A_INT
-	else return __tmp_spells[s].stat end
-end
-
-function cast_school_spell(s, s_ptr, no_cost)
-	local use = FALSE
-
-	-- No magic
-	if (player.antimagic > 0) then
-		msg_print("Your anti-magic field disrupts any magic attempts.")
-		return
-	end
-
-	-- No magic
-	if (player.anti_magic == TRUE) then
-		msg_print("Your anti-magic shell disrupts any magic attempts.")
-		return
-	end
-
-	-- if it costs something then some condition must be met
-	if not no_cost then
-	 	-- Require lite
-		if (check_affect(s, "blind")) and ((player.blind > 0) or (no_lite() == TRUE)) then
-			msg_print("You cannot see!")
-			return
-		end
-
-		-- Not when confused
-		if (check_affect(s, "confusion")) and (player.confused > 0) then
-			msg_print("You are too confused!")
-			return
-		end
-
-		-- Enough mana
-		if (get_mana(s) > get_power(s)) then
-			if (get_check("You do not have enough "..get_power_name(s)..", do you want to try anyway?") == FALSE) then return end
-		end
-	
-		-- Invoke the spell effect
-		if (magik(spell_chance(s)) == FALSE) then
-			if (__spell_spell[s]() ~= nil) then
-				use  = TRUE
-			end
-		else
-			local index, sch
-
-			-- added because this is *extremely* important --pelpel
-			if (flush_failure) then flush() end
-
-			msg_print("You failed to get the spell off!")
-			for index, sch in __spell_school[s] do
-				if __schools[sch].fail then
-					__schools[sch].fail(spell_chance(s))
-				end
-			end
-			use  = TRUE
-		end
-	else
-		__spell_spell[s]()
-	end
-
-	if use == TRUE then
-		-- Reduce mana
-		adjust_power(s, -get_mana(s))
-
-		-- Take a turn
-		if is_magestaff() == TRUE then energy_use = 80
-		else energy_use = 100 end
-	end
-
-	player.redraw = bor(player.redraw, PR_MANA)
-	player.window = bor(player.window, PW_PLAYER)
-end
-
-
--- Can the spell be randomly found(in random books)
-function can_spell_random(i)
-	return __tmp_spells[i].random
-end
-
--- Find a random spell
-function get_random_spell(typ, level)
-	local spl, tries
-
-	tries = 1000
-	while tries > 0 do
-		tries = tries - 1
-		spl = rand_int(__tmp_spells_num)
-		if (can_spell_random(spl) == typ) and (rand_int(spell(spl).skill_level * 3) < level) then
-			break
-		end
-	end
-	if tries > 0 then
-		return spl
-	else
-		return -1
-	end
-end
-
--- Execute a lasting spell
-function exec_lasting_spell(spl)
-	assert(__tmp_spells[spl].lasting, "No lasting effect for spell "..__tmp_spells[spl].name.." but called as such")
-	return __tmp_spells[spl].lasting()
-end
-
--- Helper function for spell effect to know if they are or not obvious
-function is_obvious(effect, old)
-	if old then
-		if old == TRUE or effect == TRUE then
-			return TRUE
-		else
-			return FALSE
-		end
-	else
-		return effect
-	end
-end
-
--------------------------Sticks-------------------------
-
--- Fire off the spell
-function activate_stick(spl)
-	local ret = __spell_spell[spl]()
-	local charge, obvious
-	if not ret then
-		charge = FALSE
-		obvious = FALSE
-	else
-		charge = TRUE
-		obvious = ret
-	end
-	return obvious, charge
-end
-
------------------------------------ Wand, Staves, Rods specific functions ----------------------------
-
--- Get a spell for a given stick(wand, staff, rod)
-function get_random_stick(stick, level)
-	local spl, tries
-
-	tries = 1000
-	while tries > 0 do
-		tries = tries - 1
-		spl = rand_int(__tmp_spells_num)
-		if __tmp_spells[spl].stick and (type(__tmp_spells[spl].stick[stick]) == "table") then
-			if (rand_int(spell(spl).skill_level * 3) < level) and (magik(100 - __tmp_spells[spl].stick[stick].rarity) == TRUE) then
-				break
-			end
-		end
-	end
-	if tries > 0 then
-		return spl
-	else
-		return -1
-	end
-end
-
--- Get a random base level
-function get_stick_base_level(stick, level, spl)
-	-- Paranoia
-	if spl < 0 or spl >= __tmp_spells_num or not __tmp_spells[spl].stick[stick] then return 0 end
-
-	local min, max = __tmp_spells[spl].stick[stick].base_level[1], __tmp_spells[spl].stick[stick].base_level[2]
-	local range = max - min;
-
-	-- Ok the basic idea is to have a max possible level of half the dungeon level
-	if range * 2 > level then range = level / 2 end
-
-	-- Randomize a bit
-	range = m_bonus(range, dun_level)
-
-	-- And get the result
-	return min + range
-end
-
--- Get a random max level
-function get_stick_max_level(stick, level, spl)
-	-- Paranoia
-	if spl < 0 or spl >= __tmp_spells_num or not __tmp_spells[spl].stick[stick] then return 0 end
-
-	local min, max = __tmp_spells[spl].stick[stick].max_level[1], __tmp_spells[spl].stick[stick].max_level[2]
-	local range = max - min;
-
-	-- Ok the basic idea is to have a max possible level of half the dungeon level
-	if range * 2 > level then range = level / 2 end
-
-	-- Randomize a bit
-	range = m_bonus(range, dun_level)
-
-	-- And get the result
-	return min + range
-end
-
--- Get the number of desired charges
-function get_stick_charges(spl)
-	return __tmp_spells[spl].stick.charge[1] + randint(__tmp_spells[spl].stick.charge[2]);
-end
-
--- Get activation desc
-function get_activation_desc(spl)
-	local turns
-	if type(__tmp_spells[spl].activate) == 'number' then
-		turns = __tmp_spells[spl].activate
-	else
-		turns = __tmp_spells[spl].activate[1] .. '+d' .. __tmp_spells[spl].activate[2]
-	end
-	return __tmp_spells[spl].desc[1] .. ' every ' .. turns .. ' turns'
-end
-
--- Compute the timeout of an activation
-function get_activation_timeout(spl)
-	if type(__tmp_spells[spl].activate) == 'number' then
-		return __tmp_spells[spl].activate
-	else
-		return __tmp_spells[spl].activate[1] + randint(__tmp_spells[spl].activate[2])
-	end
-end
-
--- Fire off the spell
-function activate_activation(spl, item)
-	__spell_spell[spl](item)
-end
-
-
-------- Add new GF type ----------
-max_gf = MAX_GF
-function add_spell_type(t)
-	t.index = max_gf
-	max_gf = max_gf + 1
-	assert(t.color, "No GF color")
-	if not t.monster then t.monster = function() end end
-	if not t.angry then t.angry = function() end end
-	if not t.object then t.object = function() end end
-	if not t.player then t.player = function() end end
-	if not t.grid then t.grid = function() end end
-
-	add_hooks
-	{
-		[HOOK_GF_COLOR] = function (gf, new_gfx)
-			local t = %t
-			if gf == t.index then return TRUE, t.color[new_gfx + 1] end
-		end,
-		[HOOK_GF_EXEC] = function (action, who, gf, dam, rad, y, x, extra)
-			local t = %t
-			if t.index == gf then
-				return t[action](who, dam, rad, y, x, extra)
-			end
-		end,
-	}
-	return t.index
-end
diff --git a/lib/mods/theme/core/stores.lua b/lib/mods/theme/core/stores.lua
deleted file mode 100644
index d4a63168..00000000
--- a/lib/mods/theme/core/stores.lua
+++ /dev/null
@@ -1,32 +0,0 @@
--- Take care of all concerning stores
-function store_buy_list(t)
-	assert(type(t) == "table", "store_buy_list got no table")
-	add_hooks
-	{
-		[HOOK_STORE_BUY] = function (index, name, obj)
-			local tbl = %t
-			local elt = tbl[index]
-			if not elt then
-				elt = tbl[name]
-			end
-			if elt then
-				if elt then
-					if type(elt) == "function" then
-						return TRUE, elt(obj)
-					elseif type(elt) == "table" then
-						local k, e
-						for k, e in elt do
-							if type(e) == "number" then
-								if obj.tval == e then return TRUE, TRUE end
-							else
-								if (obj.tval == e[1]) and (obj.sval >= e[2])  and (obj.sval <= e[3]) then return TRUE, TRUE end
-							end
-						end
-					elseif elt == -1 then
-						return TRUE, FALSE
-					end
-				end
-			end
-		end,
-	}
-end
diff --git a/lib/mods/theme/core/util.lua b/lib/mods/theme/core/util.lua
deleted file mode 100644
index eea13014..00000000
--- a/lib/mods/theme/core/util.lua
+++ /dev/null
@@ -1,158 +0,0 @@
--- various stuff to make scripters life easier
-
--- Beware of the scary undefined globals
-function safe_getglobal(x)
-	local v = rawget(globals(), x)
-
-	if v then
-		return v
-	else
-		error("undefined global variable '"..x.."'")
-	end
-end
-
-function set_safe_globals()
-	settagmethod(tag(nil), "getglobal", safe_getglobal)
-end
-function unset_safe_globals()
-	settagmethod(tag(nil), "getglobal", nil)
-end
-
-set_safe_globals()
-
--- Patch modules
-__patch_modules = {}
-
-function patch_version(name, version)
-	assert(not __patch_modules[name], "Patch " .. name .. " already loaded!!!")
-	__patch_modules[name] = version
-end
-
-function patchs_list()
-	local k, e, first
-	first = FALSE
-	for k, e in __patch_modules do
-		if first == FALSE then print_hook("\n\n  [Patch modules]\n") first = TRUE end
-		print_hook("\n "..k.." version "..e)
-	end
-	if first == TRUE then print_hook("\n") end
-end
-
-function patchs_display()
-	local k, e
-	for k, e in __patch_modules do
-		msg_print("Patch: "..k.." version "..e)
-	end
-end
-
-
--- Better hook interface
-__hooks_list_callback = {}
-__hooks_list_callback_max = 0
-
-function add_hooks(h_table, name_prefix)
-	local k, e
-
-	if not name_prefix then name_prefix = "" end
-	for k, e in h_table do
-		add_hook_script(k, "__"..name_prefix.."__hooks_list_callback"..__hooks_list_callback_max, "__"..name_prefix.."__hooks_list_callback"..__hooks_list_callback_max)
-		setglobal("__"..name_prefix.."__hooks_list_callback"..__hooks_list_callback_max, e)
-		__hooks_list_callback_max = __hooks_list_callback_max + 1
-	end
-end
-
--- Wrapper for the real msg_print and cmsg_print
--- it understands if we want color or not
-function msg_print(c, m)
-	if type(c) == "number" then
-		cmsg_print(c, m)
-	else
-		call(%msg_print, { c })
-	end
-end
-
--- better timer add function
-__timers_callback_max = 0
-
-function new_timer(t)
-	assert(t.delay > 0, "no timer delay")
-	assert(t.enabled, "no timer enabled state")
-	assert(t.callback, "no timer callback")
-
-	local timer
-	if type(t.callback) == "function" then
-		setglobal("__timers_callback_"..__timers_callback_max, t.callback)
-		timer = %new_timer("__timers_callback_"..__timers_callback_max, t.delay)
-		__timers_callback_max = __timers_callback_max + 1
-	else
-		timer = %new_timer(t.callback, t.delay)
-	end
-
-	timer.enabled = t.enabled
-
-	return timer
-end
-
--- saves all timer values
-function save_timer(name)
-	add_loadsave(name..".enabled", FALSE)
-	add_loadsave(name..".delay", 1)
-	add_loadsave(name..".countdown", 1)
-end
-
-
--- displays a scrolling list
-function display_list(y, x, h, w, title, list, begin, sel, sel_color)
-	local l = create_list(getn(list))
-
-	for i = 1, getn(list) do
-		add_to_list(l, i - 1, list[i])
-	end
-
-	%display_list(y, x, h, w, title, l, getn(list), begin - 1, sel - 1, sel_color)
-
-	delete_list(l, getn(list))
-end
-
--- Easier access to special gene stuff
-function set_monster_generation(monster, state)
-	if type(monster) == "string" then
-		m_allow_special[test_monster_name(monster) + 1] = state
-	else
-		m_allow_special[monster + 1] = state
-	end
-end
-function set_object_generation(obj, state)
-	if type(obj) == "string" then
-		m_allow_special[test_item_name(obj) + 1] = state
-	else
-		m_allow_special[obj + 1] = state
-	end
-end
-function set_artifact_generation(obj, state)
-	m_allow_special[obj + 1] = state
-end
-
--- Strings
-function strcap(str)
-	if strlen(str) > 1 then
-		return strupper(strsub(str, 1, 1))..strsub(str, 2)
-	elseif strlen(str) == 1 then
-		return strupper(str)
-	else
-		return str
-	end
-end
-
-function msg_format(...)
-	msg_print(call(format, arg))
-end
-
--- A way to  check if the game is now running(as opposed to initialization/character gen)
-game = {}
-add_hooks
-{
-	[HOOK_GAME_START] = function ()
-		game.started = TRUE
-	end
-}
diff --git a/lib/mods/theme/core/xml.lua b/lib/mods/theme/core/xml.lua
deleted file mode 100644
index 14f0511f..00000000
--- a/lib/mods/theme/core/xml.lua
+++ /dev/null
@@ -1,375 +0,0 @@
--- The xml module
-xml = {}
-
-function xml:parseargs (s)
-  local arg = {}
-  gsub(s, "(%w+)=([\"'])(.-)%2", function (w, _, a)
-    %arg[w] = a
-  end)
-  return arg
-end
-
--- s is a xml stream, returns a table
-function xml:collect (s)
-  local stack = {n=0}
-  local top = {n=0}
-  tinsert(stack, top)
-  local ni,c,label,args, empty
-  local i, j = 1, 1
-  while 1 do
-    ni,j,c,label,args, empty = strfind(s, "<(%/?)(%w+)(.-)(%/?)>", j)
-    if not ni then break end
-    local text = strsub(s, i, ni-1)
-    if not strfind(text, "^%s*$") then
-      tinsert(top, text)
-    end
-    if empty == "/" then  -- empty element tag
-      tinsert(top, {n=0, label=label, args=xml:parseargs(args), empty=1})
-    elseif c == "" then   -- start tag
-      top = {n=0, label=label, args=xml:parseargs(args)}
-      tinsert(stack, top)   -- new level
-    else  -- end tag
-      local toclose = tremove(stack)  -- remove top
-      top = stack[stack.n]
-      if stack.n < 1 then
-	error("nothing to close with "..label)
-      end
-      if toclose.label ~= label then
-	error("trying to close "..toclose.label.." with "..label)
-      end
-      tinsert(top, toclose)
-    end 
-    i = j+1
-  end
-  local text = strsub(s, i)
-  if not strfind(text, "^%s*$") then
-    tinsert(stack[stack.n], text)
-  end
-  if stack.n > 1 then
-    error("unclosed "..stack[stack.n].label)
-  end
-  return stack[1]
-end
-
--- Viewport coordinates
-xml.write_out_y = 0
-xml.write_out_x = 0
-xml.write_out_h = 24
-xml.write_out_w = 80
-
--- Offsets
-xml.write_off_y = 0
-xml.write_off_x = 0
-
--- Current position
-xml.write_y = 0
-xml.write_x = 0
-
-xml.write_screen = function(color, s)
-	local i
-	for i = 1, strlen(s) do
-		local c = strsub(s, i, i + 1)
-		if c ~= "\n" then
-			if xml.write_y - xml.write_off_y >= 0 and xml.write_y - xml.write_off_y < xml.write_out_h and xml.write_x - xml.write_off_x >= 0 and xml.write_x - xml.write_off_x < xml.write_out_w then
-				Term_putch(xml.write_x - xml.write_off_x + xml.write_out_x, xml.write_y - xml.write_off_y + xml.write_out_y, color, strbyte(c))
-			end
-			xml.write_x = xml.write_x + 1
-		else
-			xml.write_x = 0
-			xml.write_y = xml.write_y + 1
-		end
-	end
-end
-
-xml.write_file = function (color, s)
-	print_hook(s)
-end
-
-xml.write = xml.write_screen
-
-xml.rule2string = {
-    ['name'] = {"Its ", "name", " is"},
-    ['contain'] = {"Its ", "name", " contains"},
-    ['symbol'] = {"Its ", "symbol", " is"},
-    ['inscribed'] = {"Its ", "inscription", " contains"},
-    ['state'] = {"Its ", "state", " is"},
-    ['status'] = {"Its ", "status", " is"},
-    ['tval'] = {"Its ", "tval", " is"},
-    ['race'] = {"Your ", "race", " is"},
-    ['subrace'] = {"Your ", "subrace", " is"},
-    ['class'] = {"Your ", "class", " is"},
-    ['foo1'] = {"The result of ", "test 1 ", "is"},
-    ['foo2'] = {"The result of ", "test 2 ", "is"},
-    ['foo3'] = {"The result of ", "test 3 ", "is"},
-}
-
-xml.display_english = 1
-function xml:display_xml(t, tab)
-    if xml.display_english then
-	xml:english_xml(t, tab)
-    else
-	xml:print_xml(t, tab)
-    end
-end
-
-function xml:english_xml(t, tab, not_flag)
-	local i, k, e
-	local pre, post, recurse
-	local children_not_flag
-	local nextlevel
-	local bcol, ecol = TERM_L_GREEN, TERM_GREEN
-
-	if xml.write_active and t == auto_aux.rule then bcol, ecol = TERM_VIOLET, TERM_VIOLET end
-
-	nextlevel = tab .. "    "
-
-	recurse = 1
-
-	if t.label == "rule" then
-	    if t.args.type == "inscribe" then
-		xml.write(TERM_WHITE, tab)
-		xml.write(ecol, "A rule named \"")
-		xml.write(TERM_WHITE, tostring(t.args.name))
-		xml.write(ecol, "\" to ")
-		xml.write(bcol, "inscribe")
-		xml.write(ecol, " an item with \"")
-		xml.write(TERM_WHITE, t.args.inscription)
-		xml.write(ecol, "\" when")
-		xml.write(TERM_WHITE, "\n")
-	    else	
-		xml.write(TERM_WHITE, tab)
-		xml.write(ecol, "A rule named \"")
-		xml.write(TERM_WHITE, tostring(t.args.name))
-		xml.write(ecol, "\" to ")
-		xml.write(bcol, t.args.type)
-		xml.write(ecol, " when")
-		xml.write(TERM_WHITE, "\n")
-	    end
-	elseif t.label == "and" then
-	    if not_flag then
-		xml.write(TERM_WHITE, tab)
-		xml.write(ecol, "At least one of the following is false:")
-		xml.write(TERM_WHITE, "\n")
-	    else
-		xml.write(TERM_WHITE, tab)
-		xml.write(ecol, "All of the following are true:")
-		xml.write(TERM_WHITE, "\n")
-	    end
-	elseif t.label == "or" then
-	    if not_flag then
-		xml.write(TERM_WHITE, tab)
-		xml.write(ecol, "All of the following are false:")
-		xml.write(TERM_WHITE, "\n")
-	    else
-		xml.write(TERM_WHITE, tab)
-		xml.write(ecol, "At least one of the following are true:")
-		xml.write(TERM_WHITE, "\n")
-	    end
-	elseif t.label == "not" then
-	    if bcol == TERM_VIOLET or getn(t) == 0 then
-		xml.write(ecol, "(a negating rule)")
-		xml.write(TERM_WHITE, "\n")
-	    else
-		nextlevel = tab
-	    end
-	    children_not_flag = not nil
-	elseif t.label == "inventory" then
-	    if not_flag then
-		xml.write(TERM_WHITE, tab)
-		xml.write(ecol, "Nothing in your ")
-		xml.write(bcol, "inventory")
-		xml.write(ecol, " matches the following:")
-		xml.write(TERM_WHITE, "\n")
-	    else
-		xml.write(TERM_WHITE, tab)
-		xml.write(ecol, "Something in your ")
-		xml.write(bcol, "inventory")
-		xml.write(ecol, " matches the following:")
-		xml.write(TERM_WHITE, "\n")
-	    end
-	elseif t.label == "equipment" then
-	    if not_flag then
-		xml.write(TERM_WHITE, tab)
-		xml.write(ecol, "Nothing in your ")
-		xml.write(bcol, "equipment")
-		xml.write(ecol, " matches the following:")
-		xml.write(TERM_WHITE, "\n")
-	    else
-		xml.write(TERM_WHITE, tab)
-		xml.write(ecol, "Something in your ")
-		xml.write(bcol, "equipment")
-		xml.write(ecol, " matches the following:")
-		xml.write(TERM_WHITE, "\n")
-	    end
-	elseif t.label == "comment" then
-		xml.write(TERM_WHITE, tab)
-		xml.write(TERM_WHITE, "(" .. t[1] .. ")")
-		xml.write(TERM_WHITE, "\n")
-	elseif t.label == "skill" then
-	    local s = t[1]
-	    if not_flag then
-		xml.write(TERM_WHITE, tab)
-		xml.write(ecol, "Your skill in ")
-		xml.write(bcol, s)
-		xml.write(ecol, " is not from ")
-		xml.write(TERM_WHITE, tostring(t.args.min))
-		xml.write(ecol, " to ")
-		xml.write(TERM_WHITE, tostring(t.args.max))
-		xml.write(TERM_WHITE, "\n")
-	    else
-		xml.write(TERM_WHITE, tab)
-		xml.write(ecol, "Your skill in ")
-		xml.write(bcol, s)
-		xml.write(ecol, " is from ")
-		xml.write(TERM_WHITE, tostring(t.args.min))
-		xml.write(ecol, " to ")
-		xml.write(TERM_WHITE, tostring(t.args.max))
-		xml.write(TERM_WHITE, "\n")
-	    end
-	elseif t.label == "ability" then
-	    local s = t[1]
-	    if not_flag then
-		xml.write(TERM_WHITE, tab)
-		xml.write(ecol, "You do not have the ")
-		xml.write(bcol, s)
-		xml.write(ecol, " ability")
-		xml.write(TERM_WHITE, "\n")
-	    else
-		xml.write(TERM_WHITE, tab)
-		xml.write(ecol, "You have the ")
-		xml.write(bcol, s)
-		xml.write(ecol, " ability")
-		xml.write(TERM_WHITE, "\n")
-	    end
-	elseif t.label == "level" then
-	    if not_flag then
-		xml.write(TERM_WHITE, tab)
-		xml.write(ecol, "Your ")
-		xml.write(bcol, "level")
-		xml.write(ecol, " is not from ")
-		xml.write(TERM_WHITE, tostring(t.args.min))
-		xml.write(ecol, " to ")
-		xml.write(TERM_WHITE, tostring(t.args.max))
-		xml.write(TERM_WHITE, "\n")
-	    else
-		xml.write(TERM_WHITE, tab)
-		xml.write(ecol, "Your ")
-		xml.write(bcol, "level")
-		xml.write(ecol, " is from ")
-		xml.write(TERM_WHITE, tostring(t.args.min))
-		xml.write(ecol, " to ")
-		xml.write(TERM_WHITE, tostring(t.args.max))
-		xml.write(TERM_WHITE, "\n")
-	    end
-	elseif t.label == "sval" then
-	    if not_flag then
-		xml.write(TERM_WHITE, tab)
-		xml.write(ecol, "Its ")
-		xml.write(bcol, "sval")
-		xml.write(ecol, " is not from ")
-		xml.write(TERM_WHITE, tostring(t.args.min))
-		xml.write(ecol, " to ")
-		xml.write(TERM_WHITE, tostring(t.args.max))
-		xml.write(TERM_WHITE, "\n")
-	    else
-		xml.write(TERM_WHITE, tab)
-		xml.write(ecol, "Its ")
-		xml.write(bcol, "sval")
-		xml.write(ecol, " is from ")
-		xml.write(TERM_WHITE, tostring(t.args.min))
-		xml.write(ecol, " to ")
-		xml.write(TERM_WHITE, tostring(t.args.max))
-		xml.write(TERM_WHITE, "\n")
-	    end
-	elseif t.label == "discount" then
-	    if not_flag then
-		xml.write(TERM_WHITE, tab)
-		xml.write(ecol, "Its ")
-		xml.write(bcol, "discount")
-		xml.write(ecol, " is not from ")
-		xml.write(TERM_WHITE, tostring(t.args.min))
-		xml.write(ecol, " to ")
-		xml.write(TERM_WHITE, tostring(t.args.max))
-		xml.write(TERM_WHITE, "\n")
-	    else
-		xml.write(TERM_WHITE, tab)
-		xml.write(ecol, "Its ")
-		xml.write(bcol, "discount")
-		xml.write(ecol, " is from ")
-		xml.write(TERM_WHITE, tostring(t.args.min))
-		xml.write(ecol, " to ")
-		xml.write(TERM_WHITE, tostring(t.args.max))
-		xml.write(TERM_WHITE, "\n")
-	    end
-	else 
-	    if xml.rule2string[t.label] then
-		local rule = xml.rule2string[t.label]
-		a, b, c = rule[1], rule[2], rule[3]
-		if not_flag then c = c .. " not" end
-		xml.write(TERM_WHITE, tab)
-		xml.write(ecol, a) 
-		xml.write(bcol, b) 
-		xml.write(ecol, c) 
-		xml.write(ecol, " \"") 
-		xml.write(TERM_WHITE, t[1])
-		xml.write(ecol, "\"") 
-		xml.write(TERM_WHITE, "\n")
-	    else
-		if not_flag then
-		    xml.write(bcol, "Not:\n")
-		    tab = tab .. "    "
-		xml:print_xml(t, tab)
-		return
-		end
-	    end
-	end
-
-	for i = 1, getn(t) do
-		if type(t[i]) == "string" then
-			-- xml.write(TERM_WHITE, t[i].."\n")
-		else
-			xml:english_xml(t[i], nextlevel, children_not_flag)
-		end
-	end
-end
-
-function xml:print_xml(t, tab)
-	local i, k, e
-	local inside = nil
-	local bcol, ecol = TERM_L_GREEN, TERM_GREEN
-
-	if xml.write_active and t == auto_aux.rule then bcol, ecol = TERM_VIOLET, TERM_VIOLET end
-
-	xml.write(bcol, tab.."<"..t.label)
-	for k, e in t.args do
-		xml.write(TERM_L_BLUE, " "..k)
-		xml.write(TERM_WHITE, "=\"")
-		xml.write(TERM_YELLOW, e)
-		xml.write(TERM_WHITE, "\"")
-	end
-	xml.write(bcol, ">")
-
-	for i = 1, getn(t) do
-		if type(t[i]) == "string" then
-			xml.write(TERM_WHITE, t[i])
-		else
-			if not inside then xml.write(TERM_WHITE, "\n") end
-			inside = not nil
-			xml:print_xml(t[i], tab.."    ")
-		end
-	end
-
-	if not inside then
-		xml.write(ecol, "</"..t.label..">\n")
-	else
-		xml.write(ecol, tab.."</"..t.label..">\n")
-	end
-end
-
--- t is a table representing xml, outputs the xml code via xml.write()
-function xml:output(t)
-	local i
-	for i = 1, getn(t) do
-		xml:print_xml(t[i], "")
-	end
-end
diff --git a/lib/mods/theme/edit/a_info.txt b/lib/mods/theme/edit/a_info.txt
index e2a312c5..5d2e4bdf 100644
--- a/lib/mods/theme/edit/a_info.txt
+++ b/lib/mods/theme/edit/a_info.txt
@@ -26,11 +26,6 @@
 # The 'Theme' module for ToME introduces many changes into this file; please 
 # refer to changes.txt in the module root folder for details.
 
-# Version stamp (required)
-
-V:2.0.0
-
-
 
 # The Phial of Galadriel
 
@@ -38,9 +33,12 @@ N:1:of Galadriel
 I:39:100:4
 W:20:10:10:10000
 P:0:1d1:0:0:0
-F:ACTIVATE | SEARCH | LITE3 | LUCK
-F:INSTA_ART | HIDE_TYPE
-a:HARDCORE=LIGHT
+F:ACTIVATE
+F:HIDE_TYPE
+F:INSTA_ART
+F:LITE3
+F:LUCK
+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.
 
@@ -51,9 +49,15 @@ N:2:of Elendil
 I:39:101:1
 W:30:25:5:32500
 P:0:1d1:0:0:0
-F:ACTIVATE | SEE_INVIS | HOLD_LIFE |
-F:INSTA_ART | SPEED | LITE3 | LITE1 | HIDE_TYPE
-a:HARDCORE=MAP_LIGHT
+F:ACTIVATE
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:INSTA_ART
+F:LITE1
+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 
@@ -66,9 +70,20 @@ N:3:of Thrain
 I:39:102:3
 W:50:50:5:50000
 P:0:1d1:0:0:0
-F:ACTIVATE | SEE_INVIS | HOLD_LIFE | RES_CHAOS | HIDE_TYPE | LUCK
-F:INSTA_ART | SPEED | RES_LITE | RES_DARK | ESP_ORC | LITE3 | SPECIAL_GENE
-a:HARDCORE=THRAIN
+F:ACTIVATE
+F:ESP_ORC
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:INSTA_ART
+F:LITE3
+F:LUCK
+F:RES_CHAOS
+F:RES_DARK
+F:RES_LITE
+F:SEE_INVIS
+F:SPECIAL_GENE
+F:SPEED
+a:THRAIN
 D:A great globe seemingly filled with moonlight, the famed Heart of the 
 D:Mountain, which splinters the light that falls upon it into a thousand 
 D:glowing shards.
@@ -78,8 +93,13 @@ D:glowing shards.
 N:4:of Annatar
 I:40:10:10
 W:70:30:3:90000
-F:HIDE_TYPE | MANA | LIFE | SPELL | DRAIN_EXP | AGGRAVATE
+F:AGGRAVATE
+F:DRAIN_EXP
+F:HIDE_TYPE
 F:INSTA_ART
+F:LIFE
+F:MANA
+F:SPELL
 D:This fiery golden circle once belonged to one who was known to the elves 
 D:of Eregion as 'The Lord of Gifts'. Treacherous were his gifts, as was his 
 D:teaching. Sauron the Sorcerer lurked behind the guise and his gifts, like 
@@ -90,11 +110,19 @@ D:this necklace, were not without cost.
 N:5:of Ingwe
 I:40:11:3
 W:65:30:3:90000
-F:INT | WIS | CHR | SEARCH | INFRA | HIDE_TYPE | 
-F:SEE_INVIS | FREE_ACT | ACTIVATE | 
-F:RES_ACID | RES_COLD | RES_ELEC | 
+F:ACTIVATE
+F:CHR
+F:FREE_ACT
+F:HIDE_TYPE
+F:INFRA
 F:INSTA_ART
-a:HARDCORE=DISP_EVIL
+F:INT
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:SEE_INVIS
+F:WIS
+a:DISP_EVIL
 D:The ancient heirloom of Ingwe, high lord of the Vanyar, against whom nothing 
 D:of evil could stand.
 
@@ -105,10 +133,20 @@ D:of evil could stand.
 N:6:'Nauglamir'
 I:40:12:3
 W:70:50:3:75000
-F:STR | CON | DEX | INFRA | HIDE_TYPE | RES_FEAR | 
-F:SEE_INVIS | FREE_ACT | REGEN | LITE3 | SPEED | 
-F:INSTA_ART | SPECIAL_GENE
-a:HARDCORE=DIM_DOOR
+F:CON
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:INFRA
+F:INSTA_ART
+F:LITE3
+F:REGEN
+F:RES_FEAR
+F:SEE_INVIS
+F:SPECIAL_GENE
+F:SPEED
+F:STR
+a:DIM_DOOR
 D:A carencet of gold, set with a multitude of shining gems of 
 D:Valinor.  Despite its size, its weight seems as that of gossamer.
 
@@ -119,7 +157,31 @@ N:7:'Ancanaur'
 I:23:32:3
 W:80:120:45:5000000
 P:0:12d12:10:10:0
-F:CHR | CON | DEX | DRAIN_EXP | FREE_ACT | HEAVY_CURSE | HIDE_TYPE | HOLD_LIFE | IM_FIRE | INT | KILL_DEMON | LEVELS | LITE1 | REGEN | RES_DARK | RES_FEAR | RES_NETHER | RES_NEXUS | SEE_INVIS | SHOW_MODS | SLAY_EVIL | SLAY_UNDEAD | SPEED | STR | WIS
+F:CHR
+F:CON
+F:DEX
+F:DRAIN_EXP
+F:FREE_ACT
+F:HEAVY_CURSE
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:IM_FIRE
+F:INT
+F:KILL_DEMON
+F:LEVELS
+F:LITE1
+F:REGEN
+F:RES_DARK
+F:RES_FEAR
+F:RES_NETHER
+F:RES_NEXUS
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_EVIL
+F:SLAY_UNDEAD
+F:SPEED
+F:STR
+F:WIS
 Z:mind blast
 D:"The Jaws of Fire", this is the sword that Feanor forged in secret 
 D:to do battle against his enemies. The sword which threatened Fingolfin, 
@@ -130,10 +192,20 @@ D:the sword which in the end did not prevent its owner's untimely death.
 N:8:of Barahir
 I:45:32:1
 W:50:25:2:75000
-F:STR | INT | WIS | DEX | CON | CHR | STEALTH | HIDE_TYPE | 
-F:RES_POIS | RES_DARK | ACTIVATE | SEE_INVIS | SEARCH |
+F:ACTIVATE
+F:CHR
+F:CON
+F:DEX
+F:HIDE_TYPE
 F:INSTA_ART
-a:HARDCORE=BARAHIR
+F:INT
+F:RES_DARK
+F:RES_POIS
+F:SEE_INVIS
+F:STEALTH
+F:STR
+F:WIS
+a:BARAHIR
 D:A ring shaped into twinned serpents with eyes of emerald meeting beneath 
 D:a crown of flowers, an ancient treasure of Isildur's house.
 
@@ -145,8 +217,14 @@ N:9:'Dramborleg'
 I:24:30:5
 W:90:60:300:500000
 P:0:5d7:18:25:0
-F:CRIT | HIDE_TYPE | KILL_DEMON | SHOW_MODS | VORPAL | WOUNDING | ACTIVATE
-a:HARDCORE=TULKAS
+F:ACTIVATE
+F:CRIT
+F:HIDE_TYPE
+F:KILL_DEMON
+F:SHOW_MODS
+F:VORPAL
+F:WOUNDING
+a:TULKAS
 D:The great axe of Tuor, Thudder-Sharp is its name. The axe that smote 
 D:both a heavy dint as of a club and cleft as a sword. When it was swung 
 D:by the hands of Tuor, it sang like the rush of eagle's wings in the 
@@ -159,12 +237,29 @@ N:10:of Power 'Narya'
 I:45:34:1
 W:70:30:2:100000
 P:0:1d1:6:6:0
-F:STR | INT | WIS | DEX | CON | CHR | SPEED | HIDE_TYPE | LUCK
-F:ACTIVATE | FREE_ACT | SEE_INVIS | 
-F:SUST_STR | SUST_CON | SUST_WIS | SUST_CHR | SPECIAL_GENE |
-F:IM_FIRE | RES_NETHER | RES_FEAR | REGEN | 
+F:ACTIVATE
+F:CHR
+F:CON
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:IM_FIRE
 F:INSTA_ART
-a:HARDCORE=NARYA
+F:INT
+F:LUCK
+F:REGEN
+F:RES_FEAR
+F:RES_NETHER
+F:SEE_INVIS
+F:SPECIAL_GENE
+F:SPEED
+F:STR
+F:SUST_CHR
+F:SUST_CON
+F:SUST_STR
+F:SUST_WIS
+F:WIS
+a:NARYA
 D:The Ring of Fire, set with a ruby that glows like flame.  Narya is one 
 D:of the three Rings of Power created by the Elves and hidden by them from 
 D:Sauron.
@@ -176,12 +271,29 @@ N:11:of Power 'Nenya'
 I:45:35:2
 W:80:40:2:200000
 P:0:1d1:9:9:0
-F:STR | INT | WIS | DEX | CON | CHR | SPEED | HIDE_TYPE | LUCK 
-F:ACTIVATE | HOLD_LIFE | FREE_ACT | SEE_INVIS | 
-F:SUST_INT | SUST_WIS | SUST_CHR |
-F:IM_COLD | RES_BLIND | STEALTH | ESP_ALL | 
+F:ACTIVATE
+F:CHR
+F:CON
+F:DEX
+F:ESP_ALL
+F:FREE_ACT
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:IM_COLD
 F:INSTA_ART
-a:HARDCORE=NENYA
+F:INT
+F:LUCK
+F:RANDOM_POWER
+F:RES_BLIND
+F:SEE_INVIS
+F:SPEED
+F:STEALTH
+F:STR
+F:SUST_CHR
+F:SUST_INT
+F:SUST_WIS
+F:WIS
+a:NENYA
 D:The Ring of Adamant, with a pure white stone as centrepiece.  Nenya is one 
 D:of the three Rings of Power created by the Elves and hidden by them from 
 D:Sauron.
@@ -193,13 +305,31 @@ N:12:of Power 'Vilya'
 I:45:36:3
 W:90:50:2:300000
 P:0:1d1:12:12:0
-F:STR | INT | WIS | DEX | CON | CHR | SPEED | HIDE_TYPE | LUCK 
-F:ACTIVATE | HOLD_LIFE | FREE_ACT | SEE_INVIS | 
-F:FEATHER | SLOW_DIGEST | REGEN | 
-F:SUST_STR | SUST_DEX | SUST_CON | 
-F:IM_ELEC | RES_POIS | RES_DISEN | 
+F:ACTIVATE
+F:CHR
+F:CON
+F:DEX
+F:FEATHER
+F:FREE_ACT
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:IM_ELEC
 F:INSTA_ART
-a:HARDCORE=VILYA
+F:INT
+F:LUCK
+F:RANDOM_POWER
+F:REGEN
+F:RES_DISEN
+F:RES_POIS
+F:SEE_INVIS
+F:SLOW_DIGEST
+F:SPEED
+F:STR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_STR
+F:WIS
+a:VILYA
 D:The Ring of Sapphire, with clear blue gems that shine like stars, 
 D:glittering untouchable despite all that Sauron ever wrought.  Vilya is 
 D:one of the three Rings of Power created by the Elves and hidden by them 
@@ -212,16 +342,48 @@ N:13:of Power 'The One Ring'
 I:45:37:5
 W:100:100:2:5000000
 P:0:1d1:15:15:0
-F:STR | INT | WIS | DEX | CON | CHR | SPEED | HIDE_TYPE | 
-F:ACTIVATE | AUTO_CURSE | HEAVY_CURSE | INVIS | SPELL | MANA |
-F:SEE_INVIS | REGEN | FREE_ACT | CURSED | CURSE_NO_DROP | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_ACID | PERMA_CURSE |
-F:SUST_STR | SUST_DEX | SUST_CON | 
-F:SUST_INT | SUST_WIS | SUST_CHR | 
-F:RES_BLIND | RES_POIS | RES_DISEN | RES_NETHER | ESP_ALL | 
-F:DRAIN_MANA | DRAIN_HP | DRAIN_EXP | 
+F:ACTIVATE
+F:AUTO_CURSE
+F:CHR
+F:CON
+F:CURSED
+F:CURSE_NO_DROP
+F:DEX
+F:DRAIN_EXP
+F:DRAIN_HP
+F:DRAIN_MANA
+F:ESP_ALL
+F:FREE_ACT
+F:HEAVY_CURSE
+F:HIDE_TYPE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
 F:INSTA_ART
-a:HARDCORE=POWER
+F:INT
+F:INVIS
+F:MANA
+F:PERMA_CURSE
+F:RANDOM_POWER
+F:RANDOM_RESIST
+F:REGEN
+F:RES_BLIND
+F:RES_DISEN
+F:RES_NETHER
+F:RES_POIS
+F:SEE_INVIS
+F:SPEED
+F:SPELL
+F:STR
+F:SUST_CHR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_INT
+F:SUST_STR
+F:SUST_WIS
+F:WIS
+a:POWER
 Z:change the world
 D:"Ash nazg durbatuluk, ash nazg gimbatul, ash nazg thrakatuluk agh 
 D:burzum-ishi krimpatul". Unadorned, made of massive gold, 
@@ -235,7 +397,8 @@ N:14:of Space-Time
 I:39:105:0
 W:30:12:15:50000
 P:0:1d1:0:0:0
-F:INSTA_ART | LITE1
+F:INSTA_ART
+F:LITE1
 D:A powerful stone that provides a strong light for any who 
 D:wields it. It is rumoured that it may even protect the wearer from 
 D:the passing of time.
@@ -249,9 +412,12 @@ N:15:of Orthanc
 I:39:106:0
 W:15:12:15:20000
 P:0:1d1:0:0:0
-F:ACTIVATE | SPECIAL_GENE | EASY_USE | LITE1 | 
+F:ACTIVATE
+F:EASY_USE
 F:INSTA_ART
-a:HARDCORE=STONE_LORE
+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 
@@ -264,11 +430,20 @@ N:16:'Lothronfaun'
 I:38:6:0
 W:90:9:500:400000
 P:30:2d4:-4:0:25
-F:FREE_ACT | IM_ELEC | SPECIAL_GENE |
-F:RES_FIRE | RES_COLD | RES_POIS | RES_LITE | RES_DARK | 
-F:LITE1 | SEE_INVIS | AGGRAVATE | ESP_DRAGON
 F:ACTIVATE
-a:HARDCORE=RAZORBACK
+F:AGGRAVATE
+F:ESP_DRAGON
+F:FREE_ACT
+F:IM_ELEC
+F:LITE1
+F:RES_COLD
+F:RES_DARK
+F:RES_FIRE
+F:RES_LITE
+F:RES_POIS
+F:SEE_INVIS
+F:SPECIAL_GENE
+a:RAZORBACK
 D:A massive suit of heavy dragon scales deeply saturated with many colours.  
 D:It throbs with angry energies. May-cloud it is called, after the 
 D:element lightning which courses through it with unusual vigour.
@@ -279,13 +454,34 @@ N:17:of the Sun
 I:38:30:0
 W:100:16:600:500000
 P:50:2d4:-8:0:35
-F:HOLD_LIFE | REGEN | ESP_DRAGON | 
-F:RES_ACID | RES_FIRE | RES_COLD | RES_ELEC | RES_POIS | FEATHER | FLY |
-F:RES_NETHER | RES_NEXUS | RES_CHAOS | RES_LITE | RES_DARK | ULTIMATE | 
-F:RES_SHARDS | RES_SOUND | RES_DISEN | RES_BLIND | RES_CONF |
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | SPECIAL_GENE
 F:ACTIVATE
-a:HARDCORE=BLADETURNER
+F:ESP_DRAGON
+F:FEATHER
+F:FLY
+F:HOLD_LIFE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:REGEN
+F:RES_ACID
+F:RES_BLIND
+F:RES_CHAOS
+F:RES_COLD
+F:RES_CONF
+F:RES_DARK
+F:RES_DISEN
+F:RES_ELEC
+F:RES_FIRE
+F:RES_LITE
+F:RES_NETHER
+F:RES_NEXUS
+F:RES_POIS
+F:RES_SHARDS
+F:RES_SOUND
+F:SPECIAL_GENE
+F:ULTIMATE
+a:BLADETURNER
 D:A suit of tilkal, set with scales of every colour, surrounded in a nimbus 
 D:of perfectly untramelled yet inextricably intermingled and utterly mastered 
 D:powers elemental and ethereal.
@@ -297,9 +493,20 @@ N:18:of Melkor
 I:22:2:-4
 W:65:45:200:100000
 P:0:4d6:12:24:0
-F:STEALTH | WIS | CURSED | HEAVY_CURSE | TY_CURSE | ESP_GOOD | 
-F:DRAIN_MANA | DRAIN_HP | 
-F:RES_DARK | RES_BLIND | RES_LITE | RES_NETHER | BRAND_POIS | RES_CONF
+F:BRAND_POIS
+F:CURSED
+F:DRAIN_HP
+F:DRAIN_MANA
+F:ESP_GOOD
+F:HEAVY_CURSE
+F:RES_BLIND
+F:RES_CONF
+F:RES_DARK
+F:RES_LITE
+F:RES_NETHER
+F:STEALTH
+F:TY_CURSE
+F:WIS
 D:The mighty spear used once by Melkor to slay the trees of Valinor.
 
 # The Galvorn Plate Mail of Eol
@@ -308,11 +515,20 @@ N:19:of Eol
 I:37:30:2
 W:75:9:420:300000
 P:40:2d4:-4:0:20
-F:CON | 
-F:HOLD_LIFE | SUST_CON | ESP_UNDEAD | RES_CONF | RES_FEAR | 
-F:RES_ACID | RES_COLD | RES_DARK | RES_NETHER | RES_NEXUS | RES_CHAOS | 
 F:ACTIVATE
-a:HARDCORE=CURE_1000
+F:CON
+F:ESP_UNDEAD
+F:HOLD_LIFE
+F:RES_ACID
+F:RES_CHAOS
+F:RES_COLD
+F:RES_CONF
+F:RES_DARK
+F:RES_FEAR
+F:RES_NETHER
+F:RES_NEXUS
+F:SUST_CON
+a:CURE_1000
 D:A suit of imperishable galvorn, with unconquerable strength to endure evil 
 D:and disruptive magics. It protects the life force of its wearer like 
 D:nothing else can. Eol the Dark Elf made it in secret for his son, but 
@@ -324,9 +540,14 @@ N:20:of Isildur
 I:37:15:1
 W:30:3:300:50000
 P:25:2d4:0:0:25
-F:CON | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
-F:RES_SOUND | RES_CONF | RES_NEXUS
+F:CON
+F:RES_ACID
+F:RES_COLD
+F:RES_CONF
+F:RES_ELEC
+F:RES_FIRE
+F:RES_NEXUS
+F:RES_SOUND
 D:A gleaming steel suit covering the wearer from neck to foot, with runes of 
 D:warding and stability deeply engraved into its surface.
 
@@ -337,8 +558,18 @@ N:21:of the Rohirrim
 I:37:9:2
 W:30:3:200:30000
 P:19:1d4:0:0:15
-F:STR | DEX | SPEED | HIDE_TYPE | RES_FEAR | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_CONF | RES_SOUND
+F:DEX
+F:HIDE_TYPE
+F:RANDOM_RESIST
+F:RES_ACID
+F:RES_COLD
+F:RES_CONF
+F:RES_ELEC
+F:RES_FEAR
+F:RES_FIRE
+F:RES_SOUND
+F:SPEED
+F:STR
 D:A stiff suit of armour composed of small metal plates sewn to an 
 D:inner layer of heavy canvas, and covered with a second layer of 
 D:cloth.  Within it is the spirit of Eorl the Young, matchless in combat.
@@ -350,12 +581,20 @@ N:22:'Belegennon'
 I:37:20:4
 W:40:10:150:135000
 P:28:1d4:-1:0:20
-F:STEALTH | WIS | INT |
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_POIS |
-F:HOLD_LIFE | RES_DARK | RES_FEAR |
-F:SEE_INVIS |
 F:ACTIVATE
-a:HARDCORE=BELEGENNON
+F:HOLD_LIFE
+F:INT
+F:RES_ACID
+F:RES_COLD
+F:RES_DARK
+F:RES_ELEC
+F:RES_FEAR
+F:RES_FIRE
+F:RES_POIS
+F:SEE_INVIS
+F:STEALTH
+F:WIS
+a:BELEGENNON
 D:This wondrous suit of fine-linked chain shimmers as though of pure silver.  
 D:It stands untouched amidst the fury of the elements, and a power of 
 D:concealment rests within.
@@ -367,10 +606,19 @@ N:23:of Celeborn
 I:37:25:4
 W:40:3:250:150000
 P:35:2d4:-3:0:25
-F:STR | CHR | HIDE_TYPE | ESP_ORC
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_DARK | 
-F:RES_DISEN | ACTIVATE
-a:HARDCORE=GENOCIDE
+F:ACTIVATE
+F:CHR
+F:ESP_ORC
+F:HIDE_TYPE
+F:RANDOM_RESIST
+F:RES_ACID
+F:RES_COLD
+F:RES_DARK
+F:RES_DISEN
+F:RES_ELEC
+F:RES_FIRE
+F:STR
+a:GENOCIDE
 D:A shimmering suit of true-silver, forged long ago by dwarven smiths of 
 D:legend.  It gleams with purest white as you gaze upon it, and mighty are 
 D:its powers to protect and banish.
@@ -382,8 +630,16 @@ N:24:of Arvedui
 I:37:4:2
 W:20:3:220:32000
 P:14:1d4:-2:0:15
-F:STR | CHR | HIDE_TYPE | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_SHARDS | RES_NEXUS
+F:CHR
+F:HIDE_TYPE
+F:RANDOM_RESIST
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_NEXUS
+F:RES_SHARDS
+F:STR
 D:A hauberk, leggings, and sleeves of interlocking steel rings, well padded 
 D:with leather. You feel strong and tall as Arvedui, last king of Arnor, 
 D:as you put it on.
@@ -395,9 +651,16 @@ N:25:of Caspanion
 I:37:6:3
 W:25:9:270:40000
 P:16:1d4:-2:0:20
-F:INT | WIS | CON | HIDE_TYPE | 
-F:RES_ACID | RES_POIS | RES_CONF | ACTIVATE
-a:HARDCORE=DEST_DOOR
+F:ACTIVATE
+F:CON
+F:HIDE_TYPE
+F:INT
+F:RANDOM_RESIST
+F:RES_ACID
+F:RES_CONF
+F:RES_POIS
+F:WIS
+a:DEST_DOOR
 D:A hauberk, leggings, and sleeves of interlocking steel rings, strategically 
 D:reinforced at vital locations with a second layer of chain.  Magics to 
 D:enhance body and mind lie within, and no door can hope to resist the wearer.
@@ -411,8 +674,12 @@ N:26:of Gil-galad
 I:32:8:10
 W:50:80:50:20000
 P:6:1d3:0:0:10
-F:ACTIVATE | HIDE_TYPE | INFRA | LITE2 | LITE3 | SEARCH
-a:HARDCORE=SUNLIGHT
+F:ACTIVATE
+F:HIDE_TYPE
+F:INFRA
+F:LITE2
+F:LITE3
+a:SUNLIGHT
 D:The shining helm that Gil-galad, legendary Elven-king, wore in battle.
 
 # The Leather Jerkin of Tom Bombadil
@@ -424,7 +691,14 @@ N:27:of Tom Bombadil
 I:36:12:1
 W:10:10:70:30000
 P:40:2d4:0:0:0
-F:CHR | CON | DEX | HIDE_TYPE | INT | STR | WIS
+F:CHR
+F:CON
+F:DEX
+F:HIDE_TYPE
+F:INT
+F:RANDOM_RESIST
+F:STR
+F:WIS
 Z:teleport
 D:This garment was once the property of Tom Bombadil - 
 D:a strange being rumoured to be older than Arda itself. It 
@@ -437,8 +711,13 @@ N:28:'Thalkettoth'
 I:36:11:3
 W:20:3:60:25000
 P:11:1d1:-1:0:25
-F:DEX | SPEED | HIDE_TYPE | SPECIAL_GENE |
-F:RES_ACID | RES_SHARDS
+F:DEX
+F:HIDE_TYPE
+F:RANDOM_RESIST
+F:RES_ACID
+F:RES_SHARDS
+F:SPECIAL_GENE
+F:SPEED
 D:A tunic and skirt sewn with thick, overlapping scales of hardened 
 D:leather whose wearer moves with agility and assurance.
 
@@ -449,8 +728,18 @@ N:29:of Wormtongue
 I:30:2:3
 W:40:20:20:50000
 P:2:1d1:-10:-10:10
-F:INT | DEX | CHR | STEALTH | SEARCH | SPEED | HIDE_TYPE | 
-F:FREE_ACT | FEATHER | RES_DARK | RES_LITE | ESP_GOOD | ESP_UNIQUE
+F:CHR
+F:DEX
+F:ESP_GOOD
+F:ESP_UNIQUE
+F:FEATHER
+F:FREE_ACT
+F:HIDE_TYPE
+F:INT
+F:RES_DARK
+F:RES_LITE
+F:SPEED
+F:STEALTH
 Z:panic hit
 D:The pair of boots used by Grima son of Galmod, also named the Wormtongue:  
 D:a treacherous but persuasive counsellor, ever ready to betray, sneak, 
@@ -463,9 +752,15 @@ N:30:of Thorin
 I:34:7:4
 W:30:6:65:60000
 P:5:1d2:0:0:25
-F:STR | CON | HIDE_TYPE | 
-F:FREE_ACT | IM_ACID | RES_SOUND | 
-F:RES_CHAOS | ESP_ORC
+F:CON
+F:ESP_ORC
+F:FREE_ACT
+F:HIDE_TYPE
+F:IM_ACID
+F:RANDOM_RESIST
+F:RES_CHAOS
+F:RES_SOUND
+F:STR
 D:Invoking the strength and endurance of Thorin, King under the Mountain, 
 D:this little shield forged of true-silver is proof against the Element 
 D:of Earth.
@@ -476,7 +771,13 @@ N:31:of Celegorm
 I:34:4:0
 W:30:3:60:12000
 P:4:1d2:0:0:20
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_LITE | RES_DARK
+F:RANDOM_RESIST
+F:RES_ACID
+F:RES_COLD
+F:RES_DARK
+F:RES_ELEC
+F:RES_FIRE
+F:RES_LITE
 D:This shield emblazoned with a multitude of creatures not seen for ages 
 D:once protected Celegorm, lord of Himlad; around it lies a mystic balance 
 D:that contains the conflicts of the elements.
@@ -488,8 +789,18 @@ N:32:of Anarion
 I:34:5:0
 W:40:9:120:160000
 P:5:1d3:0:0:20
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | SUST_STR | SUST_INT | 
-F:SUST_WIS | SUST_DEX | SUST_CON | SUST_CHR | ESP_EVIL
+F:ESP_EVIL
+F:RANDOM_RESIST
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:SUST_CHR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_INT
+F:SUST_STR
+F:SUST_WIS
 D:The great metal-bound shield of Anarion, son of Elendil, who Sauron found 
 D:himself powerless to wither or diminish.
 
@@ -500,11 +811,21 @@ N:33:of Hurin
 I:22:10:3
 W:20:15:180:90000
 P:0:2d6:12:20:0
-F:STR | CON | HIDE_TYPE | BRAND_ACID | RES_ACID | LITE1 | DRAIN_MANA | 
-F:SLAY_ORC | KILL_DEMON | SLAY_TROLL | ACTIVATE | SHOW_MODS
+F:ACTIVATE
+F:BRAND_ACID
+F:CON
+F:DRAIN_MANA
+F:HIDE_TYPE
+F:KILL_DEMON
+F:LITE1
 F:MUST2H
+F:RES_ACID
+F:SHOW_MODS
+F:SLAY_ORC
+F:SLAY_TROLL
+F:STR
 f:MUST2H
-a:HARDCORE=HURIN
+a:HURIN
 D:Wielded by Hurin Thalion in the Fifth Battle of Beleriand, this 
 D:troll-bane smoked in the black blood of Gothmog's guards.
 
@@ -515,12 +836,32 @@ N:34:of Morgoth
 I:33:50:125
 W:100:1:20:10000000
 P:0:1d1:0:0:0
-F:STR | INT | WIS | DEX | CON | CHR | INFRA | HIDE_TYPE | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_POIS | 
-F:RES_LITE | RES_DARK | RES_CONF | RES_NEXUS | RES_NETHER | 
-F:LITE1 | SEE_INVIS | ESP_ALL |
-F:CURSED | HEAVY_CURSE | PERMA_CURSE |
-F:INSTA_ART | SPECIAL_GENE
+F:CHR
+F:CON
+F:CURSED
+F:DEX
+F:ESP_ALL
+F:HEAVY_CURSE
+F:HIDE_TYPE
+F:INFRA
+F:INSTA_ART
+F:INT
+F:LITE1
+F:PERMA_CURSE
+F:RES_ACID
+F:RES_COLD
+F:RES_CONF
+F:RES_DARK
+F:RES_ELEC
+F:RES_FIRE
+F:RES_LITE
+F:RES_NETHER
+F:RES_NEXUS
+F:RES_POIS
+F:SEE_INVIS
+F:SPECIAL_GENE
+F:STR
+F:WIS
 D:Two Silmarils of Feanor blaze from the thunderous crown of twisted 
 D:iron. The corrupted metal feels at once as infernal as hellfire 
 D:and as chilling as the Outer Darkness. One protrusion from the 
@@ -533,9 +874,19 @@ N:35:of Beruthiel
 I:33:10:-5
 W:40:12:20:0
 P:0:1d1:0:0:20
-F:STR | DEX | CON | HIDE_TYPE | 
-F:FREE_ACT | SEE_INVIS | ESP_ANIMAL | ESP_EVIL | ESP_NONLIVING | ESP_ALL | 
-F:CURSED | AUTO_CURSE
+F:AUTO_CURSE
+F:CON
+F:CURSED
+F:DEX
+F:ESP_ALL
+F:ESP_ANIMAL
+F:ESP_EVIL
+F:ESP_NONLIVING
+F:FREE_ACT
+F:HIDE_TYPE
+F:RANDOM_POWER
+F:SEE_INVIS
+F:STR
 D:The midnight-hued steel circlet of the sorceress-queen Beruthiel, which 
 D:grants extraordinary powers of sight and awareness at a terrible physical 
 D:cost.
@@ -547,8 +898,14 @@ N:36:of Thranduil
 I:32:2:2
 W:20:2:15:50000
 P:2:0d0:0:0:10
-F:INT | WIS | HIDE_TYPE | 
-F:RES_BLIND | ESP_ORC | ESP_EVIL | ESP_TROLL
+F:ESP_EVIL
+F:ESP_ORC
+F:ESP_TROLL
+F:HIDE_TYPE
+F:INT
+F:RANDOM_RESIST
+F:RES_BLIND
+F:WIS
 D:The hunting cap of King Thranduil, to whose ears come all the secrets of 
 D:his forest domain.
 
@@ -559,7 +916,11 @@ N:37:of Thengel
 I:32:3:3
 W:10:2:20:22000
 P:3:1d1:0:0:12
-F:WIS | CHR | RES_CONF | HIDE_TYPE | LUCK
+F:CHR
+F:HIDE_TYPE
+F:LUCK
+F:RES_CONF
+F:WIS
 D:A ridged helmet made of steel, and embossed with scenes of valour in fine-
 D:engraved silver.  It grants the wearer nobility, clarity of thought and 
 D:understanding.
@@ -571,9 +932,20 @@ N:38:of Hammerhand
 I:32:6:3
 W:20:2:60:45000
 P:6:1d3:0:0:20
-F:STR | DEX | CON | HIDE_TYPE | SPECIAL_GENE | RES_FEAR | 
-F:SUST_STR | SUST_DEX | SUST_CON | 
-F:RES_ACID | RES_NEXUS | RES_COLD | RES_DARK | SLOW_DIGEST | 
+F:CON
+F:DEX
+F:HIDE_TYPE
+F:RES_ACID
+F:RES_COLD
+F:RES_DARK
+F:RES_FEAR
+F:RES_NEXUS
+F:SLOW_DIGEST
+F:SPECIAL_GENE
+F:STR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_STR
 Z:berserk
 D:A great helm as steady as the heroes of the Westdike. Mighty were the 
 D:blows of Helm, the Hammerhand!
@@ -585,10 +957,22 @@ N:39:of Dor-Lomin
 I:32:7:4
 W:40:12:75:300000
 P:8:1d3:0:0:20
-F:STR | DEX | CON | HIDE_TYPE | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_LITE | RES_BLIND | 
-F:LITE1 | SEE_INVIS | ESP_DRAGON | ESP_THUNDERLORD | ACTIVATE
-a:HARDCORE=GORLIM
+F:ACTIVATE
+F:CON
+F:DEX
+F:ESP_DRAGON
+F:ESP_THUNDERLORD
+F:HIDE_TYPE
+F:LITE1
+F:RES_ACID
+F:RES_BLIND
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_LITE
+F:SEE_INVIS
+F:STR
+a:GORLIM
 D:The legendary dragon helm of Turin Turambar, an object of dread to the 
 D:servants of Morgoth.
 
@@ -598,9 +982,13 @@ N:40:'Holhenneth'
 I:32:5:2
 W:20:5:75:100000
 P:5:1d3:0:0:10
-F:INT | WIS | SEARCH | HIDE_TYPE | 
-F:RES_BLIND | SEE_INVIS | ACTIVATE
-a:HARDCORE=DETECT_ALL
+F:ACTIVATE
+F:HIDE_TYPE
+F:INT
+F:RES_BLIND
+F:SEE_INVIS
+F:WIS
+a:DETECT_ALL
 D:A famous helm of forged iron granting extraordinary powers of mind and 
 D:awareness.
 
@@ -611,12 +999,26 @@ N:41:of Gorlim
 I:32:5:-5
 W:20:5:75:0
 P:5:1d3:25:25:10
-F:INT | WIS | SEARCH | HIDE_TYPE | SHOW_MODS |
-F:SEE_INVIS | NO_MAGIC | HEAVY_CURSE | TY_CURSE
-F:RES_DISEN | RES_FEAR | FREE_ACT | RES_ACID | RES_FIRE | RES_POIS |
-F:IM_COLD | ACTIVATE | DRAIN_HP | 
-F:TELEPORT | CURSED
-a:HARDCORE=GORLIM
+F:ACTIVATE
+F:CURSED
+F:DRAIN_HP
+F:FREE_ACT
+F:HEAVY_CURSE
+F:HIDE_TYPE
+F:IM_COLD
+F:INT
+F:NO_MAGIC
+F:RES_ACID
+F:RES_DISEN
+F:RES_FEAR
+F:RES_FIRE
+F:RES_POIS
+F:SEE_INVIS
+F:SHOW_MODS
+F:TELEPORT
+F:TY_CURSE
+F:WIS
+a:GORLIM
 D:A headpiece, gaudy and barbaric, that betrayed a warrior when he most 
 D:needed succor.
 
@@ -627,10 +1029,26 @@ N:42:of Gondor
 I:33:11:3
 W:40:40:30:125000
 P:0:1d1:0:0:15
-F:STR | WIS | CON | HIDE_TYPE | SPEED | RES_CONF | RES_SOUND | 
-F:RES_COLD | RES_FIRE | RES_LITE | RES_BLIND | RES_ELEC | RES_CHAOS |
-F:LITE1 | SEE_INVIS | REGEN | ACTIVATE
-a:HARDCORE=CURE_700
+F:ACTIVATE
+F:CON
+F:HIDE_TYPE
+F:LITE1
+F:RANDOM_POWER
+F:RANDOM_RESIST
+F:REGEN
+F:RES_BLIND
+F:RES_CHAOS
+F:RES_COLD
+F:RES_CONF
+F:RES_ELEC
+F:RES_FIRE
+F:RES_LITE
+F:RES_SOUND
+F:SEE_INVIS
+F:SPEED
+F:STR
+F:WIS
+a:CURE_700
 D:The shining winged circlet brought by Elendil from dying Numenor, emblem of 
 D:Gondor through an age of the world.
 
@@ -642,11 +1060,21 @@ N:43:of Numenor
 I:33:12:3
 W:60:30:40:50000
 P:0:1d1:0:0:18
-F:INT | DEX | CHR | SEARCH | SPEED | HIDE_TYPE | 
-F:SEE_INVIS | FREE_ACT | RES_DARK | RES_BLIND | 
-F:RES_SHARDS | RES_SOUND | RES_LITE | RES_COLD | 
-F:LITE1 | ACTIVATE | DRAIN_MANA
-a:HARDCORE=NUMENOR
+F:CHR
+F:DEX
+F:DRAIN_MANA
+F:FREE_ACT
+F:HIDE_TYPE
+F:INT
+F:LITE1
+F:RES_BLIND
+F:RES_COLD
+F:RES_DARK
+F:RES_LITE
+F:RES_SHARDS
+F:RES_SOUND
+F:SEE_INVIS
+F:SPEED
 D:A crown of massive gold, set with wondrous jewels of thought and warding, 
 D:worn by the kings of ancient Numenor.  Its wearer may go into battle 
 D:always knowing what he faces - unless his own folly blinds him to the 
@@ -660,8 +1088,13 @@ N:44:of Valinor
 I:35:1:0
 W:60:90:10:40000
 P:1:0d0:0:0:20
-F:ACTIVATE | IM_ACID | IM_COLD | IM_ELEC | IM_FIRE | RES_POIS
-a:HARDCORE=COLLUIN
+F:ACTIVATE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:RES_POIS
+a:COLLUIN
 D:A cape worn by a hero from Valinor, a land utterly beyond the strife 
 D:of the elements.
 
@@ -671,9 +1104,14 @@ N:45:'Holcolleth'
 I:35:1:2
 W:5:25:10:13000
 P:1:0d0:0:0:4
-F:INT | WIS | SPEED | STEALTH | HIDE_TYPE | 
-F:RES_ACID | ACTIVATE
-a:HARDCORE=SLEEP
+F:ACTIVATE
+F:HIDE_TYPE
+F:INT
+F:RES_ACID
+F:SPEED
+F:STEALTH
+F:WIS
+a:SLEEP
 D:This elven-grey mantle possesses great powers of tranquility and of 
 D:concealment, and grants the wearer the knowledge and understanding of 
 D:the Sindar.
@@ -685,9 +1123,16 @@ N:46:of Thingol
 I:35:1:3
 W:10:50:10:35000
 P:1:0d0:0:0:18
-F:DEX | CHR | HIDE_TYPE | 
-F:FREE_ACT | RES_ACID | RES_FIRE | RES_COLD | ACTIVATE
-a:HARDCORE=RECHARGE
+F:ACTIVATE
+F:CHR
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:RANDOM_POWER
+F:RES_ACID
+F:RES_COLD
+F:RES_FIRE
+a:RECHARGE
 D:A sable-hued cloak, with glowing elven-runes to restore magic showing calm 
 D:and clear as moonlight on still water.
 
@@ -698,7 +1143,10 @@ N:47:of Thorongil
 I:35:1:0
 W:5:10:10:8000
 P:1:0d0:0:0:10
-F:FREE_ACT | RES_ACID | SEE_INVIS | RES_FEAR
+F:FREE_ACT
+F:RES_ACID
+F:RES_FEAR
+F:SEE_INVIS
 D:A cloak of shimmering green and brown that grants sight beyond sight and 
 D:shakes off holding magics, worn by Aragorn son of Arathorn in his youth 
 D:as he adventured under the name of Thorongil.
@@ -710,9 +1158,12 @@ N:48:'Colannon'
 I:35:1:3
 W:5:20:10:11000
 P:1:0d0:0:0:15
-F:STEALTH | SPEED | RES_NEXUS | 
-F:RES_ACID | ACTIVATE
-a:HARDCORE=TELEPORT
+F:ACTIVATE
+F:RES_ACID
+F:RES_NEXUS
+F:SPEED
+F:STEALTH
+a:TELEPORT
 D:A crystal-blue cape of fine silk worn by a silent messenger of 
 D:the forces of Law. Somehow, its wearer is always able to escape 
 D:trouble.
@@ -724,9 +1175,23 @@ N:49:of Luthien
 I:35:6:2
 W:40:40:5:55000
 P:6:0d0:0:0:20
-F:INT | WIS | CHR | HIDE_TYPE | SPEED | STEALTH | INVIS | LUCK
-F:RES_ACID | RES_FIRE | RES_COLD | SPECIAL_GENE | ACTIVATE | SPELL_CONTAIN | WIELD_CAST
-a:HARDCORE=REST_LIFE
+F:ACTIVATE
+F:CHR
+F:HIDE_TYPE
+F:INT
+F:INVIS
+F:LUCK
+F:RANDOM_RESIST
+F:RES_ACID
+F:RES_COLD
+F:RES_FIRE
+F:SPECIAL_GENE
+F:SPEED
+F:SPELL_CONTAIN
+F:STEALTH
+F:WIELD_CAST
+F:WIS
+a:REST_LIFE
 D:The opaque midnight folds, inset with a multitude of tiny diamonds, of 
 D:this cloak swirl around you and you feel a hint, a fragment of the 
 D:knowledge and power to restore that lay in Luthien, the most beautiful 
@@ -739,8 +1204,15 @@ N:50:of Tuor
 I:35:6:4
 W:40:40:5:35000
 P:6:0d0:0:0:12
-F:STEALTH | DEX | HIDE_TYPE | INVIS | WATER_BREATH
-F:FREE_ACT | IM_ACID | SEE_INVIS | CLIMB
+F:CLIMB
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:IM_ACID
+F:INVIS
+F:SEE_INVIS
+F:STEALTH
+F:WATER_BREATH
 D:From the ruin of Gondolin did Tuor escape, through secret ways and travail, 
 D:shielded by his cloak from a multitude of hostile eyes.
 
@@ -750,7 +1222,10 @@ N:51:of Azaghal
 I:23:5:0
 W:15:30:30:40000
 P:0:2d5:12:14:0
-F:KILL_DRAGON | IM_FIRE | ESP_DRAGON | RES_FEAR
+F:ESP_DRAGON
+F:IM_FIRE
+F:KILL_DRAGON
+F:RES_FEAR
 D:The weapon of Azaghal when he wounded Glaurung.  It is deadly 
 D:when fighting dragons and is said to make the breaths of fire 
 D:completely harmless.
@@ -762,8 +1237,11 @@ N:52:'Cambeleg'
 I:31:1:2
 W:10:6:5:36000
 P:1:0d0:8:8:15
-F:STR | CON | HIDE_TYPE | 
-F:FREE_ACT | SHOW_MODS
+F:CON
+F:FREE_ACT
+F:HIDE_TYPE
+F:SHOW_MODS
+F:STR
 D:A hero's handgear that lends great prowess in battle.
 
 
@@ -773,9 +1251,13 @@ N:53:'Cammithrim'
 I:31:1:0
 W:10:3:5:30000
 P:1:0d0:0:0:10
-F:FREE_ACT | RES_LITE | SUST_CON | LITE1 | ACTIVATE
+F:ACTIVATE
+F:FREE_ACT
+F:LITE1
+F:RES_LITE
 F:SPECIAL_GENE
-a:HARDCORE=BO_MISS_1
+F:SUST_CON
+a:BO_MISS_1
 D:These gloves glow so brightly as to light the way for their owner and cast 
 D:magical bolts with great frequency.
 
@@ -785,9 +1267,14 @@ N:54:of Eregion
 I:31:2:4
 W:10:5:25:33000
 P:2:1d1:0:0:15
-F:RES_FIRE | ACTIVATE |
-F:SUST_STR | STR | REGEN | SPELL_CONTAIN | WIELD_CAST
-a:HARDCORE=BO_FIRE_1
+F:ACTIVATE
+F:REGEN
+F:RES_FIRE
+F:SPELL_CONTAIN
+F:STR
+F:SUST_STR
+F:WIELD_CAST
+a:BO_FIRE_1
 D:A fiery set of gauntlets that can even shoot fire from the user's 
 D:hands. Wrought by Curufin's people, they guard the wearer's 
 D:strength and enhance it.
@@ -798,9 +1285,14 @@ N:55:of Nargothrond
 I:31:2:4
 W:10:5:25:33000
 P:2:1d1:0:0:15
-F:RES_COLD | ACTIVATE |
-F:SUST_CON | CON | REGEN | SPELL_CONTAIN | WIELD_CAST
-a:HARDCORE=BO_COLD_1
+F:ACTIVATE
+F:CON
+F:REGEN
+F:RES_COLD
+F:SPELL_CONTAIN
+F:SUST_CON
+F:WIELD_CAST
+a:BO_COLD_1
 D:A set of handgear so icy as to be able to fire frost bolts. Wrought by 
 D:Finrod Felagund himself, it is inscribed with runes that guard and 
 D:boost health.
@@ -811,9 +1303,14 @@ N:56:of Lorien
 I:31:2:4
 W:10:5:25:33000
 P:2:1d1:0:0:15
-F:RES_ELEC | ACTIVATE | FREE_ACT |
-F:SUST_DEX | DEX | SPELL_CONTAIN | WIELD_CAST
-a:HARDCORE=BO_ELEC_1
+F:ACTIVATE
+F:DEX
+F:FREE_ACT
+F:RES_ELEC
+F:SPELL_CONTAIN
+F:SUST_DEX
+F:WIELD_CAST
+a:BO_ELEC_1
 D:A set of handgear wrought by the Galadhrim. Sparks surround it, enabling 
 D:the wearer to fire bolts of electricity. Ever has lightning improved and 
 D:protected agility, and these gauntlets are no exception.
@@ -824,9 +1321,13 @@ N:57:of Ossiriand
 I:31:2:4
 W:10:5:25:33000
 P:2:1d1:0:0:15
-F:RES_ACID | ACTIVATE | 
-F:SUST_CHR | CHR | SPELL_CONTAIN | WIELD_CAST
-a:HARDCORE=BO_ACID_1
+F:ACTIVATE
+F:CHR
+F:RES_ACID
+F:SPELL_CONTAIN
+F:SUST_CHR
+F:WIELD_CAST
+a:BO_ACID_1
 D:Mighty was the woodcraft of the Laiquendi, for they learned to control the 
 D:element of acid to a level theretofore unknown. This set of handgear is so 
 D:corrosive that it may fire bolts of acid.
@@ -837,9 +1338,22 @@ N:58:'Camlost'
 I:31:2:-3
 W:10:20:25:0
 P:2:1d1:-11:-12:0
-F:STR | DEX | HIDE_TYPE | DRAIN_MANA | 
-F:RES_POIS | IM_FIRE | IM_COLD | RES_DISEN | RES_NETHER | FREE_ACT | 
-F:AGGRAVATE | SHOW_MODS | HEAVY_CURSE | TY_CURSE | TELEPORT | CURSED
+F:AGGRAVATE
+F:CURSED
+F:DEX
+F:DRAIN_MANA
+F:FREE_ACT
+F:HEAVY_CURSE
+F:HIDE_TYPE
+F:IM_COLD
+F:IM_FIRE
+F:RES_DISEN
+F:RES_NETHER
+F:RES_POIS
+F:SHOW_MODS
+F:STR
+F:TELEPORT
+F:TY_CURSE
 D:A pair of gauntlets that sap combat ability, named after the empty hand 
 D:of Beren that once clasped a Silmaril.
 
@@ -850,9 +1364,15 @@ N:59:of Fingolfin
 I:31:5:4
 W:40:15:40:110000
 P:5:1d1:10:10:20
-F:DEX | HIDE_TYPE | LUCK
-F:FREE_ACT | RES_ACID | ACTIVATE | SHOW_MODS
-a:HARDCORE=BO_MISS_2
+F:ACTIVATE
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:LUCK
+F:RANDOM_POWER
+F:RES_ACID
+F:SHOW_MODS
+a:BO_MISS_2
 Z:magic missile
 D:The hand-sheathing of Fingolfin, warrior-king of Elves and Men, who gave 
 D:Morgoth seven mighty wounds and pain that will last forever.
@@ -864,9 +1384,11 @@ N:60:of Feanor
 I:30:3:15
 W:40:120:40:300000
 P:3:1d1:0:0:20
-F:SPEED | HIDE_TYPE | 
-F:RES_NEXUS | ACTIVATE
-a:HARDCORE=SPEED
+F:ACTIVATE
+F:HIDE_TYPE
+F:RES_NEXUS
+F:SPEED
+a:SPEED
 D:This wondrous pair of leather boots once sped Feanor, creator of the 
 D:Silmarils and the mightiest of the Eldar, along the Grinding Ice and to 
 D:Middle-earth at last.
@@ -878,10 +1400,17 @@ N:61:'Dal-i-thalion'
 I:30:2:5
 W:10:25:20:40000
 P:2:1d1:0:0:15
-F:DEX | HIDE_TYPE | CHR | SUST_CHR |
-F:ACTIVATE | FREE_ACT |
-F:RES_NETHER | RES_CHAOS | RES_CONF | SUST_CON
-a:HARDCORE=CURE_POISON
+F:ACTIVATE
+F:CHR
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:RES_CHAOS
+F:RES_CONF
+F:RES_NETHER
+F:SUST_CHR
+F:SUST_CON
+a:CURE_POISON
 D:A pair of high-laced shoes, strong against the powers of corruption and 
 D:withering, that grant the wearer extraordinary agility.
 
@@ -892,7 +1421,13 @@ N:62:of Thror
 I:30:6:3
 W:30:25:80:15000
 P:6:1d1:0:0:20
-F:STR | CON | HIDE_TYPE | SPEED | RES_FEAR | CLIMB
+F:CLIMB
+F:CON
+F:HIDE_TYPE
+F:RANDOM_RESIST
+F:RES_FEAR
+F:SPEED
+F:STR
 D:Sturdy footwear of leather and steel as enduring as the long-suffering 
 D:Dwarven King-in-exile who wore them.  Of dwarven make, these boots will 
 D:make their wearer completely at home in the mountains.
@@ -910,9 +1445,20 @@ N:63:of Bard
 I:17:2:0
 W:55:30:2:50000
 P:0:8d4:20:15:0
-F:SLAY_ANIMAL | SLAY_EVIL | SLAY_UNDEAD | SLAY_DEMON | 
-F:SLAY_ORC | SLAY_TROLL | SLAY_GIANT | SLAY_DRAGON | KILL_DRAGON | 
-F:BRAND_ACID | BRAND_ELEC | BRAND_FIRE | BRAND_COLD | BRAND_POIS
+F:BRAND_ACID
+F:BRAND_COLD
+F:BRAND_ELEC
+F:BRAND_FIRE
+F:BRAND_POIS
+F:KILL_DRAGON
+F:SLAY_ANIMAL
+F:SLAY_DEMON
+F:SLAY_DRAGON
+F:SLAY_EVIL
+F:SLAY_GIANT
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SLAY_UNDEAD
 D:Deadliest of arrows, imbued with elemental strength, this shaft is 
 D:feared especially by the wyrmkin.
 
@@ -923,8 +1469,17 @@ N:64:of Maedhros
 I:23:5:3
 W:15:30:30:22500
 P:0:2d5:12:15:0
-F:INT | DEX | HIDE_TYPE | SPEED | SPECIAL_GENE
-F:SLAY_TROLL | SLAY_GIANT | FREE_ACT | SEE_INVIS | SHOW_MODS
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:INT
+F:RANDOM_RES_OR_POWER
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_GIANT
+F:SLAY_TROLL
+F:SPECIAL_GENE
+F:SPEED
 D:A short thrusting blade with a large guard worn by Maedhros the Tall, 
 D:eldest son of Feanor, and wielded with his left hand after the loss of 
 D:his right hand in the pits of Thangorodrim.
@@ -935,7 +1490,20 @@ N:65:'Angrist'
 I:23:1:4
 W:25:80:12:150000
 P:0:2d4:10:15:5
-F:BRAND_ACID | BRAND_POIS | DEX | FREE_ACT | HIDE_TYPE | LUCK | RES_DARK | SEARCH | SEE_INVIS | SHOW_MODS | SLAY_EVIL | SLAY_ORC | SLAY_TROLL | STEALTH | SUST_DEX
+F:BRAND_ACID
+F:BRAND_POIS
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:LUCK
+F:RES_DARK
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_EVIL
+F:SLAY_ORC
+F:SLAY_TROLL
+F:STEALTH
+F:SUST_DEX
 D:The knife Beren Barahir`s son took from Curufin and with which he cut 
 D:out a Silmaril from the crown of Morgoth, The blade snapped and broke 
 D:when he tried to gain one more and the splint hit Morgoth at his chin.  
@@ -948,8 +1516,14 @@ N:66:of Samwise
 I:23:4:0
 W:4:100:12:12000
 P:0:1d4:4:6:0
-F:ACTIVATE | BRAND_FIRE | LEVELS | LITE1 | RES_FIRE | SHOW_MODS
-a:HARDCORE=BO_FIRE_1
+F:ACTIVATE
+F:BRAND_FIRE
+F:LEVELS
+F:LITE1
+F:RANDOM_RESIST
+F:RES_FIRE
+F:SHOW_MODS
+a:BO_FIRE_1
 D:The blade of Samwise Gamgee, chosen by him from the hoard of the 
 D:Barrow-wights. A fiery dagger finely balanced for deadly throws.
 
@@ -959,8 +1533,13 @@ N:67:of Peregrin
 I:23:4:0
 W:3:100:12:11000
 P:0:1d4:4:6:0
-F:ACTIVATE | BRAND_COLD | LEVELS | RES_COLD | SHOW_MODS
-a:HARDCORE=BO_COLD_1
+F:ACTIVATE
+F:BRAND_COLD
+F:LEVELS
+F:RANDOM_RESIST
+F:RES_COLD
+F:SHOW_MODS
+a:BO_COLD_1
 D:The blade of Peregrin Took, chosen by him from the hoard of the 
 D:Barrow-wights. A frosty dagger finely balanced for deadly throws.
 
@@ -970,8 +1549,13 @@ N:68:of Meriadoc
 I:23:4:0
 W:5:100:12:13000
 P:0:1d4:4:6:0
-F:BRAND_ELEC | RES_ELEC | ACTIVATE | SHOW_MODS | LEVELS
-a:HARDCORE=BO_ELEC_1
+F:ACTIVATE
+F:BRAND_ELEC
+F:LEVELS
+F:RANDOM_RESIST
+F:RES_ELEC
+F:SHOW_MODS
+a:BO_ELEC_1
 D:The blade of Meriadoc Brandybuck, chosen by him from the hoard of 
 D:the Barrow-wights. A dagger covered in sparks and finely balanced 
 D:for deadly throws.
@@ -982,8 +1566,13 @@ N:69:of Rilia
 I:23:4:0
 W:5:40:12:35000
 P:0:2d4:4:3:0
-F:SLAY_ORC | RES_POIS | RES_DISEN | ACTIVATE | SHOW_MODS | BRAND_POIS
-a:HARDCORE=BA_POIS_1
+F:ACTIVATE
+F:BRAND_POIS
+F:RES_DISEN
+F:RES_POIS
+F:SHOW_MODS
+F:SLAY_ORC
+a:BA_POIS_1
 D:A large stiletto dagger that glistens with odourless poison, to which the 
 D:wearer seems oddly immune.
 
@@ -994,11 +1583,19 @@ N:70:'Belangil'
 I:23:4:2
 W:10:40:12:50000
 P:0:2d4:6:9:0
-F:DEX | HIDE_TYPE | SPEED | BLOWS |
-F:BRAND_COLD | RES_COLD |
-F:SEE_INVIS | SLOW_DIGEST | REGEN |
-F:ACTIVATE | SHOW_MODS | BRAND_POIS
-a:HARDCORE=BELANGIL
+F:ACTIVATE
+F:BLOWS
+F:BRAND_COLD
+F:BRAND_POIS
+F:DEX
+F:HIDE_TYPE
+F:REGEN
+F:RES_COLD
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLOW_DIGEST
+F:SPEED
+a:BELANGIL
 D:A frosty dagger surrounded in a nimbus of ice with a hilt of elk horn and 
 D:an edge to wound the wind.
 
@@ -1009,11 +1606,22 @@ N:71:'Calris'
 I:23:21:5
 W:30:15:140:100000
 P:0:5d4:-20:20:0
-F:CON | HIDE_TYPE | DRAIN_HP | 
-F:KILL_DRAGON | SLAY_EVIL | SLAY_DEMON | SLAY_TROLL | RES_DISEN | 
-F:AGGRAVATE | CURSED | HEAVY_CURSE | SHOW_MODS | ESP_DRAGON | ESP_DEMON |
-F:AUTO_CURSE |
+F:AGGRAVATE
+F:AUTO_CURSE
+F:CON
 F:COULD2H
+F:CURSED
+F:DRAIN_HP
+F:ESP_DEMON
+F:ESP_DRAGON
+F:HEAVY_CURSE
+F:HIDE_TYPE
+F:KILL_DRAGON
+F:RES_DISEN
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_EVIL
+F:SLAY_TROLL
 f:COULD2H
 D:This sword has runes of power incised on its ornate hilt and a single 
 D:blood channel that gleams coldly blue as you grasp this mighty weapon of 
@@ -1026,13 +1634,28 @@ N:72:'Aranruth'
 I:23:16:4
 W:20:45:150:125000
 P:0:3d5:20:12:0
-F:STR | DEX | CON | SUST_CON | SUST_STR
-F:REGEN | FREE_ACT | SEE_INVIS |
-F:RES_CHAOS | RES_NETHER | HOLD_LIFE | RES_FEAR |
-F:RES_COLD |
-F:SLAY_DEMON | SLAY_EVIL | SLAY_DRAGON | SLAY_UNDEAD |
-F:BRAND_COLD |
-F:SLOW_DIGEST | SHOW_MODS | HIDE_TYPE | BLESSED
+F:BLESSED
+F:BRAND_COLD
+F:CON
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:REGEN
+F:RES_CHAOS
+F:RES_COLD
+F:RES_FEAR
+F:RES_NETHER
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_DRAGON
+F:SLAY_EVIL
+F:SLAY_UNDEAD
+F:SLOW_DIGEST
+F:STR
+F:SUST_CON
+F:SUST_STR
 D:The beautiful sword of Thingol with a hilt of gold and silver inlay, 
 D:glistening icily enough to freeze the hearts of demons.  You feel supple 
 D:and lightfooted as you hold it.
@@ -1044,9 +1667,20 @@ N:73:'Glamdring'
 I:23:16:1
 W:20:20:150:40000
 P:0:2d5:10:15:0
-F:SEARCH | HIDE_TYPE | BLESSED | SLAY_DEMON | 
-F:SLAY_EVIL | BRAND_FIRE | SLAY_ORC | RES_FIRE | RES_LITE | LITE1 | 
-F:SLOW_DIGEST | SHOW_MODS | ESP_ORC | SPECIAL_GENE
+F:BLESSED
+F:BRAND_FIRE
+F:ESP_ORC
+F:HIDE_TYPE
+F:LITE1
+F:RANDOM_RES_OR_POWER
+F:RES_FIRE
+F:RES_LITE
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_EVIL
+F:SLAY_ORC
+F:SLOW_DIGEST
+F:SPECIAL_GENE
 D:This fiery, shining blade earned its sobriquet "Foe-Hammer" from dying orcs 
 D:who dared to come near hidden Gondolin. Inscribed upon the guard in Cirth 
 D:is the following -- 
@@ -1059,7 +1693,13 @@ N:74:of Thranduil
 I:21:3:0
 W:20:18:150:50000
 P:0:1d9:10:20:0
-F:BRAND_POIS | COULD2H | RES_POIS | SLAY_ANIMAL | HIDE_TYPE | SHOW_MODS | ESP_ANIMAL
+F:BRAND_POIS
+F:COULD2H
+F:ESP_ANIMAL
+F:HIDE_TYPE
+F:RES_POIS
+F:SHOW_MODS
+F:SLAY_ANIMAL
 f:COULD2H
 D:The carven oak staff of the King of the Woodland Realm, 
 D:this weapon is a fighter's best friend in a forest.
@@ -1070,9 +1710,20 @@ N:75:'Orcrist'
 I:23:16:3
 W:20:20:150:40000
 P:0:2d5:10:15:0
-F:SEARCH | ESP_ORC | SLAY_DRAGON | ESP_DRAGON | RES_COLD | HIDE_TYPE | 
-F:SLAY_EVIL | BRAND_COLD | SLAY_ORC | RES_COLD | LITE1 | RES_DARK | 
-F:SLOW_DIGEST | SHOW_MODS
+F:BRAND_COLD
+F:ESP_DRAGON
+F:ESP_ORC
+F:HIDE_TYPE
+F:LITE1
+F:RANDOM_RES_OR_POWER
+F:RES_COLD
+F:RES_COLD
+F:RES_DARK
+F:SHOW_MODS
+F:SLAY_DRAGON
+F:SLAY_EVIL
+F:SLAY_ORC
+F:SLOW_DIGEST
 D:This coldly gleaming blade is called simply "Biter", by orcs who came to 
 D:know its power all too well.
 
@@ -1082,10 +1733,23 @@ N:76:'Anglachel'
 I:23:25:2
 W:30:30:200:100000
 P:0:3d6:13:17:0
-F:STR | HIDE_TYPE | VORPAL | ESP_DRAGON | DRAIN_HP | 
-F:RES_FIRE | RES_POIS | BRAND_FIRE | BRAND_POIS | 
-F:KILL_DRAGON | SLAY_TROLL | FREE_ACT | SLOW_DIGEST | REGEN | SHOW_MODS | 
+F:BRAND_FIRE
+F:BRAND_POIS
+F:DRAIN_HP
+F:ESP_DRAGON
+F:FREE_ACT
+F:HIDE_TYPE
+F:KILL_DRAGON
 F:MUST2H
+F:RANDOM_RES_OR_POWER
+F:REGEN
+F:RES_FIRE
+F:RES_POIS
+F:SHOW_MODS
+F:SLAY_TROLL
+F:SLOW_DIGEST
+F:STR
+F:VORPAL
 f:MUST2H
 D:A giant sword once wielded by mighty Turin, and a great dragonbane which 
 D:bathed in Glaurung's blood. Its blade once shone brightly, it can cleave 
@@ -1099,11 +1763,29 @@ N:77:'Zarcuthra'
 I:23:25:4
 W:30:180:250:205000
 P:0:4d6:19:21:0
-F:STR | CHR | INFRA | HIDE_TYPE | VORPAL | DRAIN_MANA | 
-F:KILL_DRAGON | SLAY_ANIMAL | SLAY_EVIL | BRAND_FIRE |
-F:SLAY_UNDEAD | SLAY_DEMON | SLAY_TROLL | SLAY_GIANT | SLAY_ORC | 
-F:RES_FIRE | RES_CHAOS | FREE_ACT | SEE_INVIS | AGGRAVATE | SHOW_MODS |
+F:AGGRAVATE
+F:BRAND_FIRE
+F:CHR
+F:DRAIN_MANA
+F:FREE_ACT
+F:HIDE_TYPE
+F:INFRA
+F:KILL_DRAGON
 F:MUST2H
+F:RANDOM_RES_OR_POWER
+F:RES_CHAOS
+F:RES_FIRE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_DEMON
+F:SLAY_EVIL
+F:SLAY_GIANT
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SLAY_UNDEAD
+F:STR
+F:VORPAL
 f:MUST2H
 D:Dark and deadly runes stand stark against the naked steel of this awesome 
 D:weapon, and you feel a stunning power of slaying and rending as you 
@@ -1116,10 +1798,25 @@ N:78:'Mormegil'
 I:23:33:2
 W:30:15:250:0
 P:0:6d7:0:0:-20
-F:SPEED | IM_FIRE | RES_FIRE | BRAND_FIRE | RES_DISEN | RES_FEAR |
-F:AGGRAVATE | CURSED | HEAVY_CURSE | SHOW_MODS | LEVELS | TY_CURSE | 
-F:BLOWS | SLAY_DRAGON | RES_CHAOS | ANTIMAGIC_50 | 
-F:DRAIN_MANA | DRAIN_HP | DRAIN_EXP
+F:AGGRAVATE
+F:ANTIMAGIC_50
+F:BLOWS
+F:BRAND_FIRE
+F:CURSED
+F:DRAIN_EXP
+F:DRAIN_HP
+F:DRAIN_MANA
+F:HEAVY_CURSE
+F:IM_FIRE
+F:LEVELS
+F:RES_CHAOS
+F:RES_DISEN
+F:RES_FEAR
+F:RES_FIRE
+F:SHOW_MODS
+F:SLAY_DRAGON
+F:SPEED
+F:TY_CURSE
 D:A foul, twisted sword with blackened spines and knobs, whose very name is a 
 D:curse upon the lips of Elves and Men.
 
@@ -1130,9 +1827,17 @@ N:79:'Gondricam'
 I:23:12:3
 W:20:8:110:28000
 P:0:1d7:10:11:0
-F:DEX | STEALTH | HIDE_TYPE | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | FEATHER | 
-F:SEE_INVIS | REGEN | SHOW_MODS
+F:DEX
+F:FEATHER
+F:HIDE_TYPE
+F:REGEN
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:SEE_INVIS
+F:SHOW_MODS
+F:STEALTH
 D:Famed sea-defender of Lebennin.  A short, slightly curved chopping blade  
 D:with a perfect edge shining cleanly in the sun, an object of hate to the 
 D:men of Umbar who met it in combat.
@@ -1144,9 +1849,18 @@ N:80:'Crisdurian'
 I:23:28:0
 W:40:15:260:111000
 P:0:4d5:18:19:0
-F:SLAY_DRAGON | SLAY_EVIL | SLAY_UNDEAD | SLAY_TROLL | SLAY_GIANT | 
-F:SLAY_ORC | SEE_INVIS | SHOW_MODS | VORPAL | BRAND_POIS | WOUNDING |
+F:BRAND_POIS
 F:MUST2H
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_DRAGON
+F:SLAY_EVIL
+F:SLAY_GIANT
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SLAY_UNDEAD
+F:VORPAL
+F:WOUNDING
 f:MUST2H
 D:A giant's weapon, with a long blade tall and straight thrusting out from a 
 D:massive double-pronged hilt.  On its blade are written doomspells against 
@@ -1159,8 +1873,16 @@ N:81:'Herugrim'
 I:23:17:2
 W:60:40:130:300000
 P:0:3d5:8:9:0
-F:ACTIVATE | ESP_EVIL | FREE_ACT | HIDE_TYPE | INT | RES_CONF | RES_DARK | SHOW_MODS | VORPAL
-a:HARDCORE=CURE_INSANITY
+F:ACTIVATE
+F:ESP_EVIL
+F:FREE_ACT
+F:HIDE_TYPE
+F:INT
+F:RES_CONF
+F:RES_DARK
+F:SHOW_MODS
+F:VORPAL
+a:CURE_INSANITY
 D:The ancient blade of Theoden, King of the Mark. It was taken from 
 D:the king by Grima the Wormtongue, and hidden from him in a dusty 
 D:chest. It was once instrumental in restoring the King's wits from 
@@ -1172,11 +1894,25 @@ N:82:'Ringil'
 I:23:17:10
 W:20:120:130:300000
 P:0:4d5:22:25:0
-F:SPEED | HIDE_TYPE | RES_FEAR | BLESSED | 
-F:SLAY_EVIL | BRAND_COLD | SLAY_UNDEAD | KILL_DEMON | SLAY_TROLL | 
-F:FREE_ACT | RES_COLD | RES_LITE | LITE1 | SEE_INVIS | SLOW_DIGEST | REGEN | 
-F:ACTIVATE | SHOW_MODS
-a:HARDCORE=BA_COLD_2
+F:ACTIVATE
+F:BLESSED
+F:BRAND_COLD
+F:FREE_ACT
+F:HIDE_TYPE
+F:KILL_DEMON
+F:LITE1
+F:REGEN
+F:RES_COLD
+F:RES_FEAR
+F:RES_LITE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_EVIL
+F:SLAY_TROLL
+F:SLAY_UNDEAD
+F:SLOW_DIGEST
+F:SPEED
+a:BA_COLD_2
 D:The weapon of Fingolfin, High King of the Noldor; it shines like a column 
 D:of ice lit by light unquenchable.  Morgoth came but unwillingly to meet it 
 D:of old; his lame foot will remind him of its might should he meet it again.
@@ -1188,11 +1924,28 @@ N:83:'Anduril'
 I:23:17:4
 W:20:40:130:100000
 P:0:3d5:10:15:5
-F:STR | DEX | HIDE_TYPE | RES_FEAR | FREE_ACT | BLESSED | LUCK
-F:SLAY_EVIL | BRAND_FIRE | SLAY_TROLL | SLAY_ORC | FREE_ACT | 
-F:RES_FIRE | SUST_DEX | SEE_INVIS | ACTIVATE | SHOW_MODS | LITE1 |
-F:RES_DISEN | SPECIAL_GENE
-a:HARDCORE=BA_FIRE_1
+F:ACTIVATE
+F:BLESSED
+F:BRAND_FIRE
+F:DEX
+F:FREE_ACT
+F:FREE_ACT
+F:HIDE_TYPE
+F:LITE1
+F:LUCK
+F:RANDOM_RES_OR_POWER
+F:RES_DISEN
+F:RES_FEAR
+F:RES_FIRE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_EVIL
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SPECIAL_GENE
+F:STR
+F:SUST_DEX
+a:BA_FIRE_1
 D:The famed "Flame of the West", the sword that was broken and is forged 
 D:again.  It glows with the essence of fire, its wearer is mighty in combat, 
 D:and no creature of Sauron can withstand it.  It will never be stained or 
@@ -1207,10 +1960,23 @@ N:84:'Anguirel'
 I:23:17:2
 W:20:30:130:40000
 P:0:2d5:8:12:0
-F:STR | CON | SPEED | HIDE_TYPE | 
-F:SLAY_EVIL | BRAND_ELEC | SLAY_DEMON | FREE_ACT | RES_ELEC | 
-F:RES_LITE | RES_DARK | SEE_INVIS | SHOW_MODS | VORPAL | WOUNDING | 
-F:AGGRAVATE | CURSED
+F:AGGRAVATE
+F:BRAND_ELEC
+F:CON
+F:CURSED
+F:FREE_ACT
+F:HIDE_TYPE
+F:RES_DARK
+F:RES_ELEC
+F:RES_LITE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_EVIL
+F:SPEED
+F:STR
+F:VORPAL
+F:WOUNDING
 D:Forged of black galvorn by the Dark-Elven smith Eol, this blade has the 
 D:living lightning trapped inside.
 
@@ -1221,8 +1987,17 @@ N:85:'Elvagil'
 I:23:17:2
 W:20:8:130:20000
 P:0:2d5:5:7:0
-F:DEX | CHR | STEALTH | HIDE_TYPE | ESP_ORC | ESP_TROLL
-F:SLAY_TROLL | SLAY_ORC | FEATHER | SEE_INVIS | SHOW_MODS
+F:CHR
+F:DEX
+F:ESP_ORC
+F:ESP_TROLL
+F:FEATHER
+F:HIDE_TYPE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_ORC
+F:SLAY_TROLL
+F:STEALTH
 D:The "Singing Blade", whose wearer can slay Orcs and Trolls in the hidden 
 D:and secret places of the earth.
 
@@ -1233,7 +2008,11 @@ N:86:'Forasgil'
 I:23:7:0
 W:15:8:40:15000
 P:0:1d6:12:19:0
-F:SLAY_ANIMAL | BRAND_COLD | RES_COLD | RES_LITE | SHOW_MODS
+F:BRAND_COLD
+F:RES_COLD
+F:RES_LITE
+F:SHOW_MODS
+F:SLAY_ANIMAL
 D:A slender, tapered blade whose wielder strikes icy blows with deadly 
 D:accuracy.
 
@@ -1244,9 +2023,17 @@ N:87:'Careth Asdriag'
 I:23:11:2
 W:15:8:50:25000
 P:0:2d7:6:8:0
-F:DEX | BLOWS | SPEED | CON | 
-F:SLAY_DRAGON | SLAY_ANIMAL | SLAY_TROLL | SLAY_GIANT | 
-F:SLAY_ORC | SHOW_MODS | ESP_ANIMAL
+F:BLOWS
+F:CON
+F:DEX
+F:ESP_ANIMAL
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_DRAGON
+F:SLAY_GIANT
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SPEED
 D:An heirloom of the Lords of Rhun far to the east, and a name of 
 D:dismay to creatures natural and unnatural.
 
@@ -1256,9 +2043,25 @@ N:88:'Sting'
 I:23:10:2
 W:20:205:75:100000
 P:0:1d7:7:8:0
-F:BLOWS | CON | DEX | ESP_ORC | ESP_SPIDER | ESP_UNDEAD | FREE_ACT | 
-F:LEVELS | LITE1 | RES_LITE | SEE_INVIS | SHOW_MODS | SLAY_ANIMAL |
-F:SLAY_EVIL | SLAY_ORC | SLAY_UNDEAD | SPEED | STR
+F:BLOWS
+F:CON
+F:DEX
+F:ESP_ORC
+F:ESP_SPIDER
+F:ESP_UNDEAD
+F:FREE_ACT
+F:LEVELS
+F:LITE1
+F:RANDOM_RESIST
+F:RES_LITE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_EVIL
+F:SLAY_ORC
+F:SLAY_UNDEAD
+F:SPEED
+F:STR
 D:The perfect size for Bilbo, and stamped forever by the courage he found 
 D:in Mirkwood, this sturdy little blade grants the wearer combat prowess 
 D:and survival abilities they did not know they had. The blade is inscribed 
@@ -1270,11 +2073,21 @@ N:89:'Haradekket'
 I:23:18:2
 W:20:8:130:111111
 P:0:2d5:9:11:0
-F:INT | WIS | BLOWS |
-F:SLAY_ANIMAL | SLAY_EVIL | SLAY_UNDEAD | SLAY_DRAGON | SLAY_DEMON |
-F:RES_CHAOS | RES_DISEN | RES_NEXUS | 
-F:SEE_INVIS | BLESSED |
+F:BLESSED
+F:BLOWS
+F:INT
+F:RANDOM_RES_OR_POWER
+F:RES_CHAOS
+F:RES_DISEN
+F:RES_NEXUS
+F:SEE_INVIS
 F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_DEMON
+F:SLAY_DRAGON
+F:SLAY_EVIL
+F:SLAY_UNDEAD
+F:WIS
 D:A damascened scimitar that seems wondrously easy to hold.  Famed in song as 
 D:the "Sickle of Harad", and a deadly foe to the undead.
 
@@ -1285,8 +2098,14 @@ N:90:'Gilettar'
 I:23:10:2
 W:20:8:80:35000
 P:0:1d7:3:7:0
-F:BLOWS | HIDE_TYPE | 
-F:SLAY_ANIMAL | SLOW_DIGEST | REGEN | SHOW_MODS | SEE_INVIS | RES_DISEN
+F:BLOWS
+F:HIDE_TYPE
+F:REGEN
+F:RES_DISEN
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLOW_DIGEST
 D:A stubby blade worn by Beren, whose horn sounded of old in the glades of 
 D:Brethil.
 
@@ -1296,10 +2115,27 @@ N:91:'Daedheloth'
 I:23:30:0
 W:70:25:180:250000
 P:0:6d5:18:28:-50
-F:KILL_DRAGON | SLAY_ANIMAL | SLAY_EVIL | BRAND_COLD | SLAY_TROLL | 
-F:SLAY_ORC | FREE_ACT | RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
-F:RES_CHAOS | SEE_INVIS | ESP_EVIL | AGGRAVATE | SHOW_MODS | 
-F:CHAOTIC | VORPAL | BRAND_FIRE | BRAND_POIS | SPECIAL_GENE
+F:AGGRAVATE
+F:BRAND_COLD
+F:BRAND_FIRE
+F:BRAND_POIS
+F:CHAOTIC
+F:ESP_EVIL
+F:FREE_ACT
+F:KILL_DRAGON
+F:RES_ACID
+F:RES_CHAOS
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_EVIL
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SPECIAL_GENE
+F:VORPAL
 D:This weapon of wrath, cursed with a violent anger, dives hungrily 
 D:into the flesh of its enemies. It gathers shadows of death into its 
 D:owner as they inflict wounds that will never heal.
@@ -1310,7 +2146,17 @@ N:92:'Sereghathol'
 I:23:17:2
 W:50:30:150:250000
 P:0:5d5:32:32:0
-F:DEX | FREE_ACT | LEVELS | REGEN | SEE_INVIS | SLAY_EVIL | SLOW_DIGEST | SPEED | STR | VORPAL | WOUNDING
+F:DEX
+F:FREE_ACT
+F:LEVELS
+F:REGEN
+F:SEE_INVIS
+F:SLAY_EVIL
+F:SLOW_DIGEST
+F:SPEED
+F:STR
+F:VORPAL
+F:WOUNDING
 D:Blood-Sword it is called, after its thirst for the blood of foes. 
 
 # The Beaked Axe of Dain Ironfoot
@@ -1319,9 +2165,16 @@ N:93:of Dain Ironfoot
 I:22:10:3
 W:20:15:180:40000
 P:0:2d6:8:10:0
-F:WIS | CON | HIDE_TYPE | 
-F:SLAY_DRAGON | ESP_EVIL | ESP_UNDEAD | SLOW_DIGEST | ACTIVATE | SHOW_MODS
-a:HARDCORE=DRAIN_2
+F:ACTIVATE
+F:CON
+F:ESP_EVIL
+F:ESP_UNDEAD
+F:HIDE_TYPE
+F:SHOW_MODS
+F:SLAY_DRAGON
+F:SLOW_DIGEST
+F:WIS
+a:DRAIN_2
 D:The narrow axe head of this weapon, finely balanced by a crow's beak, 
 D:would pierce even the armour of Smaug, and its wielder becomes aware of 
 D:the minds of their enemies.
@@ -1333,8 +2186,10 @@ N:94:of Pain
 I:22:13:0
 W:30:155:190:50000
 P:0:9d6:0:30:0
-F:SHOW_MODS | LEVELS | DRAIN_MANA | 
 F:COULD2H
+F:DRAIN_MANA
+F:LEVELS
+F:SHOW_MODS
 f:COULD2H
 D:The massive chopper that crowns this glaive glows blood-red and black; 
 D:fell spells of annihilation swirl and dance as you swing death's myrmidon 
@@ -1347,10 +2202,18 @@ N:95:'Osondir'
 I:22:15:3
 W:20:8:190:22000
 P:0:3d5:6:9:0
-F:CHR | HIDE_TYPE | 
-F:BRAND_FIRE | SLAY_UNDEAD | SLAY_GIANT | RES_FIRE | RES_SOUND | 
-F:FEATHER | SEE_INVIS | SHOW_MODS | ESP_GIANT | 
+F:BRAND_FIRE
+F:CHR
 F:COULD2H
+F:ESP_GIANT
+F:FEATHER
+F:HIDE_TYPE
+F:RES_FIRE
+F:RES_SOUND
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_GIANT
+F:SLAY_UNDEAD
 f:COULD2H
 D:Lordly and tall did Osondir stand against the wrath of giants, and 
 D:clear-eyed in barrows fell, wielding a halberd glowing ruby red.
@@ -1362,10 +2225,20 @@ N:96:'Til-i-arc'
 I:22:8:2
 W:20:15:160:32000
 P:0:2d5:10:12:10
-F:INT | HIDE_TYPE | 
-F:BRAND_COLD | BRAND_FIRE | SLAY_DEMON | SLAY_TROLL | SLAY_GIANT | ESP_GIANT
-F:RES_FIRE | RES_COLD | SUST_INT | SLOW_DIGEST | SHOW_MODS |
+F:BRAND_COLD
+F:BRAND_FIRE
 F:COULD2H
+F:ESP_GIANT
+F:HIDE_TYPE
+F:INT
+F:RES_COLD
+F:RES_FIRE
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_GIANT
+F:SLAY_TROLL
+F:SLOW_DIGEST
+F:SUST_INT
 f:COULD2H
 D:Within this long thrusting spear lie the spirits of frost giants and fire 
 D:demons, who war forever, trapped by magely spells.
@@ -1376,12 +2249,25 @@ N:97:'Aiglos'
 I:22:2:4
 W:15:45:50:180000
 P:0:3d6:15:25:5
-F:DEX | WIS | HIDE_TYPE |
-F:BRAND_COLD | BRAND_ELEC | LITE1 | 
-F:SLAY_TROLL | SLAY_ORC | SLAY_GIANT | KILL_UNDEAD | 
-F:FREE_ACT | RES_COLD | RES_ELEC | RES_LITE |
-F:SLOW_DIGEST | ACTIVATE | BLESSED | SHOW_MODS
-a:HARDCORE=BA_ELEC_2
+F:ACTIVATE
+F:BLESSED
+F:BRAND_COLD
+F:BRAND_ELEC
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:KILL_UNDEAD
+F:LITE1
+F:RES_COLD
+F:RES_ELEC
+F:RES_LITE
+F:SHOW_MODS
+F:SLAY_GIANT
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SLOW_DIGEST
+F:WIS
+a:BA_ELEC_2
 D:The mighty spear of Gil-galad, famed as "Snow-point" in the songs of 
 D:Elves, against which all the foul corruptions of Sauron dashed in vain.
 D:The spear is inscribed with Tengwar runes, reading "Gil-galad ech vae 
@@ -1396,12 +2282,29 @@ N:98:of Caradhras
 I:22:2:4
 W:15:45:50:77777
 P:0:4d6:15:15:0
-F:INT | WIS | SPEED | TUNNEL | INFRA | HIDE_TYPE | SEARCH |
-F:BRAND_FIRE |
-F:SLAY_GIANT | SLAY_EVIL | SLAY_DEMON | SLAY_UNDEAD | SLAY_DRAGON |
-F:RES_FIRE | RES_LITE | HOLD_LIFE | RES_FEAR | FEATHER | ESP_GIANT |
-F:SEE_INVIS | ACTIVATE | BLESSED | SHOW_MODS
-a:HARDCORE=STONE_MUD
+F:ACTIVATE
+F:BLESSED
+F:BRAND_FIRE
+F:ESP_GIANT
+F:FEATHER
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:INFRA
+F:INT
+F:RES_FEAR
+F:RES_FIRE
+F:RES_LITE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_DRAGON
+F:SLAY_EVIL
+F:SLAY_GIANT
+F:SLAY_UNDEAD
+F:SPEED
+F:TUNNEL
+F:WIS
+a:STONE_MUD
 D:A magical spear, rumoured to have been forged by Orome himself 
 D:in the coldest reach of the cruel Redhorn.
 
@@ -1411,8 +2314,16 @@ N:99:'Nimloth'
 I:22:2:3
 W:15:12:50:30000
 P:0:1d6:11:13:0
-F:STEALTH | RES_DARK | INFRA | SPEED | BLESSED | 
-F:BRAND_COLD | SLAY_UNDEAD | RES_COLD | SEE_INVIS | SHOW_MODS
+F:BLESSED
+F:BRAND_COLD
+F:INFRA
+F:RES_COLD
+F:RES_DARK
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_UNDEAD
+F:SPEED
+F:STEALTH
 D:A thin spike of thrice-forged steel caps a straight sylvan shaft cut from 
 D:a legendary tree; spells to break the will of the undead and strike cold 
 D:fear into the hearts of foes lie on this perfectly balanced spear.
@@ -1424,9 +2335,17 @@ N:100:of Eorlingas
 I:22:20:2
 W:20:23:360:55000
 P:0:3d8:3:21:0
-F:STR | DEX | SPEED | HIDE_TYPE | RES_FEAR | 
-F:SLAY_EVIL | SLAY_TROLL | SLAY_ORC | SEE_INVIS | SHOW_MODS | 
+F:DEX
+F:HIDE_TYPE
 F:MUST2H
+F:RES_FEAR
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_EVIL
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SPEED
+F:STR
 f:MUST2H
 D:"Forth Eorlingas!".  To the field of Cormallen came Eorl the Young 
 D:to save beleaguered Gondor, and from his lance fled massive trolls 
@@ -1439,11 +2358,26 @@ N:101:of Durin
 I:24:25:3
 W:30:90:230:150000
 P:0:4d4:10:20:15
-F:STR | CON | TUNNEL | HIDE_TYPE | ESP_EVIL | RES_FEAR | 
-F:SLAY_DRAGON | KILL_DEMON | SLAY_TROLL | SLAY_ORC | FREE_ACT | 
-F:RES_ACID | RES_FIRE | RES_LITE | RES_DARK | RES_CHAOS | SHOW_MODS | 
-F:BRAND_ACID | BRAND_FIRE | 
+F:BRAND_ACID
+F:BRAND_FIRE
+F:CON
+F:ESP_EVIL
+F:FREE_ACT
+F:HIDE_TYPE
+F:KILL_DEMON
 F:MUST2H
+F:RES_ACID
+F:RES_CHAOS
+F:RES_DARK
+F:RES_FEAR
+F:RES_FIRE
+F:RES_LITE
+F:SHOW_MODS
+F:SLAY_DRAGON
+F:SLAY_ORC
+F:SLAY_TROLL
+F:STR
+F:TUNNEL
 f:MUST2H
 D:The twin massive axe heads of this ancient demon's dread gleam with 
 D:mithril inlay, which tell sagas of endurance, invoking the powers of 
@@ -1456,11 +2390,26 @@ N:102:of Eonwe
 I:24:25:2
 W:30:120:230:200000
 P:0:4d4:15:18:8
-F:STR | INT | WIS | DEX | CON | CHR | HIDE_TYPE | 
-F:SLAY_EVIL | BRAND_COLD | KILL_DEMON | SLAY_UNDEAD | ESP_NONLIVING
-F:SLAY_ORC | FREE_ACT | IM_COLD | SEE_INVIS | ACTIVATE | 
-F:BLESSED | SHOW_MODS
-a:HARDCORE=MASS_GENO
+F:ACTIVATE
+F:BLESSED
+F:BRAND_COLD
+F:CHR
+F:CON
+F:DEX
+F:ESP_NONLIVING
+F:FREE_ACT
+F:HIDE_TYPE
+F:IM_COLD
+F:INT
+F:KILL_DEMON
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_EVIL
+F:SLAY_ORC
+F:SLAY_UNDEAD
+F:STR
+F:WIS
+a:MASS_GENO
 D:The axe of Eonwe, leader of the Hosts of the West before the gates of 
 D:Thangorodrim, strikes with icy wrath at the undead, disperses hosts of 
 D:evil at a word, and grants Maia-like powers of body and mind.
@@ -1472,11 +2421,25 @@ N:103:of Balli Stonehand
 I:22:22:3
 W:30:15:170:90000
 P:0:3d8:8:11:5
-F:STR | CON | STEALTH | HIDE_TYPE | ESP_NONLIVING
-F:SLAY_DEMON | SLAY_TROLL | SLAY_ORC | FREE_ACT | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_BLIND | FEATHER | 
-F:SEE_INVIS | REGEN | SHOW_MODS | 
+F:CON
 F:COULD2H
+F:ESP_NONLIVING
+F:FEATHER
+F:FREE_ACT
+F:HIDE_TYPE
+F:REGEN
+F:RES_ACID
+F:RES_BLIND
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_ORC
+F:SLAY_TROLL
+F:STEALTH
+F:STR
 f:COULD2H
 D:The twin blades of this weapon were forged in Belegost, and powerful forces 
 D:to resist and endure lie ready for he who shall wield it once more.
@@ -1488,9 +2451,14 @@ N:104:'Lotharang'
 I:22:22:1
 W:30:15:170:21000
 P:0:2d8:4:3:0
-F:STR | DEX | HIDE_TYPE | 
-F:SLAY_TROLL | SLAY_ORC | ACTIVATE | SHOW_MODS
-a:HARDCORE=CURE_MW
+F:ACTIVATE
+F:DEX
+F:HIDE_TYPE
+F:SHOW_MODS
+F:SLAY_ORC
+F:SLAY_TROLL
+F:STR
+a:CURE_MW
 D:A superbly crafted double-bladed axe that slays the creatures of earth and 
 D:allows rapid recovery from their blows.
 
@@ -1501,10 +2469,17 @@ N:105:of the Dwarves
 I:22:28:10
 W:30:8:250:80000
 P:0:3d8:12:17:0
-F:SLAY_EVIL | TUNNEL | INFRA | SEARCH | SLAY_GIANT |
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_FEAR |
-F:SHOW_MODS | 
 F:COULD2H
+F:INFRA
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FEAR
+F:RES_FIRE
+F:SHOW_MODS
+F:SLAY_EVIL
+F:SLAY_GIANT
+F:TUNNEL
 f:COULD2H
 D:A massive axe with twin razor-sharp heads, so large that it usually 
 D:requires two hands to wield, intricately engraved in gold with spells 
@@ -1516,10 +2491,15 @@ N:106:'Barukkheled'
 I:24:11:3
 W:20:8:160:50000
 P:0:2d6:13:19:0
-F:CON | HIDE_TYPE | 
-F:SLAY_EVIL | SLAY_TROLL | SLAY_GIANT | SLAY_ORC | 
-F:SEE_INVIS | SHOW_MODS | 
+F:CON
 F:COULD2H
+F:HIDE_TYPE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_EVIL
+F:SLAY_GIANT
+F:SLAY_ORC
+F:SLAY_TROLL
 f:COULD2H
 D:A royal heirloom of the southern coast, strong in combat against evil 
 D:creatures of the earth.
@@ -1531,8 +2511,15 @@ N:107:'Guthwine'
 I:23:16:1
 W:30:10:150:45000
 P:0:2d6:6:7:0
-F:CRIT | ESP_ORC | HIDE_TYPE | LITE1 | RES_BLIND | RES_FEAR | 
-F:SHOW_MODS | SLAY_ORC | WOUNDING
+F:CRIT
+F:ESP_ORC
+F:HIDE_TYPE
+F:LITE1
+F:RES_BLIND
+F:RES_FEAR
+F:SHOW_MODS
+F:SLAY_ORC
+F:WOUNDING
 D:The sword of Eomer, son of Eomund, leader of the Riders of the Mark. 
 D:As one flashed this sword with Anduril during a battle long ago. 
 D:Legendary are its powers in the rallying of desperate troops.
@@ -1543,11 +2530,23 @@ N:108:of Osse
 I:22:5:4
 W:30:90:70:120000
 P:0:4d8:15:19:0
-F:DEX | HIDE_TYPE | 
-F:SLAY_DRAGON | SLAY_ANIMAL | FREE_ACT | HOLD_LIFE | IM_ACID | 
-F:RES_NETHER | SEE_INVIS | SLOW_DIGEST | REGEN | ACTIVATE | 
-F:BLESSED | SHOW_MODS | WATER_BREATH
-a:HARDCORE=TELE_AWAY
+F:ACTIVATE
+F:BLESSED
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:IM_ACID
+F:RANDOM_POWER
+F:REGEN
+F:RES_NETHER
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_DRAGON
+F:SLOW_DIGEST
+F:WATER_BREATH
+a:TELE_AWAY
 D:The awesome weapon imbued with some of the power of the Vala Ulmo, 
 D:Lord of Waters. It allows the wearer to laugh in scorn at the dread 
 D:powers of the undead, and be utterly in command of the element of water.
@@ -1558,12 +2557,21 @@ N:109:'Avavir'
 I:22:17:3
 W:40:8:250:18000
 P:0:5d3:8:8:10
-F:DEX | CHR | HIDE_TYPE | 
-F:BRAND_COLD | BRAND_FIRE | FREE_ACT | RES_FIRE | RES_COLD | 
-F:RES_LITE | SEE_INVIS | ACTIVATE | SHOW_MODS | 
+F:ACTIVATE
+F:BRAND_COLD
+F:BRAND_FIRE
+F:CHR
 F:COULD2H
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:RES_COLD
+F:RES_FIRE
+F:RES_LITE
+F:SEE_INVIS
+F:SHOW_MODS
 f:COULD2H
-a:HARDCORE=RECALL
+a:RECALL
 D:With elemental powers whose struggles turn this weapon red and purest 
 D:white, this shining reaper bears within it a power of going forth and 
 D:returning.
@@ -1575,9 +2583,26 @@ N:110:of Dernhelm
 I:23:17:5
 W:70:50:150:250000
 P:0:3d5:20:25:0
-F:BLESSED | ESP_UNIQUE | FREE_ACT | HIDE_TYPE | HOLD_LIFE | KILL_UNDEAD | 
-F:LITE1 | LUCK | RES_DISEN | RES_FEAR | RES_MORGUL | SEE_INVIS | 
-F:SHOW_MODS | SLAY_EVIL | SPEED | STEALTH | VORPAL | WOUNDING | SPECIAL_GENE
+F:BLESSED
+F:ESP_UNIQUE
+F:FREE_ACT
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:KILL_UNDEAD
+F:LITE1
+F:LUCK
+F:RANDOM_RES_OR_POWER
+F:RES_DISEN
+F:RES_FEAR
+F:RES_MORGUL
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_EVIL
+F:SPECIAL_GENE
+F:SPEED
+F:STEALTH
+F:VORPAL
+F:WOUNDING
 D:Eomer's sister Eowyn once wielded this shining sword when she 
 D:battled the Witch-King of Angmar, hiding her true identity to 
 D:join the battle.  Others are less likely to notice the wielder 
@@ -1591,13 +2616,30 @@ N:111:'Grond'
 I:21:50:2
 W:100:1:1000:500000
 P:0:9d9:25:25:10
-F:KILL_DRAGON | SLAY_ANIMAL | SLAY_EVIL | IMPACT | KILL_UNDEAD | NO_MAGIC |
-F:KILL_DEMON | SLAY_TROLL | SLAY_ORC | RES_ACID | RES_ELEC | RES_FIRE | 
-F:RES_COLD | SEE_INVIS | ESP_ALL | AGGRAVATE | SHOW_MODS | INSTA_ART |
-F:LEVELS | ACTIVATE | SPECIAL_GENE | 
+F:ACTIVATE
+F:AGGRAVATE
+F:ESP_ALL
+F:IMPACT
+F:INSTA_ART
+F:KILL_DEMON
+F:KILL_DRAGON
+F:KILL_UNDEAD
+F:LEVELS
 F:MUST2H
+F:NO_MAGIC
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_EVIL
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SPECIAL_GENE
 f:MUST2H
-a:HARDCORE=GROND
+a:GROND
 D:The mighty Hammer of the Underworld, blackened by doomspells of shattering, 
 D:whose wielder holds the lives of all Morgoth's servants in his hand.
 
@@ -1607,12 +2649,17 @@ N:112:'Totila'
 I:21:13:2
 W:20:8:150:55000
 P:0:3d6:6:8:0
-F:STEALTH | 
-F:SLAY_EVIL | BRAND_FIRE | RES_FIRE | RES_CONF | ACTIVATE | 
-F:SHOW_MODS | LITE1 | 
+F:ACTIVATE
+F:BRAND_FIRE
 F:COULD2H
+F:LITE1
+F:RES_CONF
+F:RES_FIRE
+F:SHOW_MODS
+F:SLAY_EVIL
+F:STEALTH
 f:COULD2H
-a:HARDCORE=CONFUSE
+a:CONFUSE
 D:A flail whose head befuddles those who stare as you whirl it around, and 
 D:becomes a fiery comet as you bring it down.
 
@@ -1623,10 +2670,20 @@ N:113:'Thunderfist'
 I:21:18:4
 W:45:38:300:160000
 P:0:3d6:5:18:0
-F:STR | CON | HIDE_TYPE | RES_FEAR | 
-F:SLAY_ANIMAL | BRAND_FIRE | BRAND_ELEC | SLAY_TROLL | SLAY_ORC | 
-F:RES_ELEC | RES_FIRE | RES_DARK | SHOW_MODS |
+F:BRAND_ELEC
+F:BRAND_FIRE
+F:CON
+F:HIDE_TYPE
 F:MUST2H
+F:RES_DARK
+F:RES_ELEC
+F:RES_FEAR
+F:RES_FIRE
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_ORC
+F:SLAY_TROLL
+F:STR
 f:MUST2H
 D:The long-lost weapon of Kzurin, Dwarven champion of ancient Belegost, 
 D:with runes of strength in its handle, and flames and sparks that roar and 
@@ -1638,9 +2695,15 @@ N:114:'Maegnas-in-sereg'
 I:21:12:4
 W:20:30:150:30000
 P:0:2d6:8:22:0
-F:STR | HIDE_TYPE | BRAND_POIS | 
-F:SLAY_ANIMAL | SLAY_TROLL | SLAY_ORC | RES_NEXUS | SEE_INVIS | 
+F:BRAND_POIS
+F:HIDE_TYPE
+F:RES_NEXUS
+F:SEE_INVIS
 F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_ORC
+F:SLAY_TROLL
+F:STR
 D:You feel strong and firm of foot as you whip the chain-suspended spiked orb 
 D:around - and bathe it in the blood of your foes.
 
@@ -1650,8 +2713,12 @@ N:115:'Naurgil'
 I:21:12:0
 W:20:100:150:35000
 P:0:2d6:5:7:2
-F:BRAND_FIRE | IM_FIRE | ACTIVATE | SHOW_MODS | LITE1
-a:HARDCORE=FIRESTAR
+F:ACTIVATE
+F:BRAND_FIRE
+F:IM_FIRE
+F:LITE1
+F:SHOW_MODS
+a:FIRESTAR
 D:A famed battle-lord of old, with a ruddy head, coloured as embers are that 
 D:can yet rise up in wrath.
 
@@ -1662,10 +2729,14 @@ N:116:'Taratol'
 I:21:5:0
 W:20:15:200:50000
 P:0:3d4:12:12:0
-F:KILL_DRAGON | BRAND_ELEC | IM_ELEC | ACTIVATE | SHOW_MODS | 
+F:ACTIVATE
+F:BRAND_ELEC
 F:COULD2H
+F:IM_ELEC
+F:KILL_DRAGON
+F:SHOW_MODS
 f:COULD2H
-a:HARDCORE=SPEED
+a:SPEED
 D:A great ridged mace that calls around you a nimbus of living lightning; 
 D:you remain utterly untouched even as fat sparks arc around your 
 D:fingers and eyebrows.
@@ -1676,11 +2747,26 @@ N:117:of Gamil Zirak
 I:21:8:4
 W:40:75:120:250000
 P:0:9d3:19:21:5
-F:WIS | TUNNEL | HIDE_TYPE | RES_FEAR | 
-F:KILL_DRAGON | SLAY_EVIL | BRAND_ELEC | SLAY_UNDEAD | SLAY_DEMON | 
-F:FREE_ACT | RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_NEXUS | 
-F:SEE_INVIS | SHOW_MODS | 
+F:BRAND_ELEC
 F:COULD2H
+F:FREE_ACT
+F:HIDE_TYPE
+F:KILL_DRAGON
+F:RANDOM_POWER
+F:RANDOM_RESIST
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FEAR
+F:RES_FIRE
+F:RES_NEXUS
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_EVIL
+F:SLAY_UNDEAD
+F:TUNNEL
+F:WIS
 f:COULD2H
 D:Gamil Zirak was a great craftsman, the master of Telchar of Nogrod. 
 D:This weapon was rescued from Thingol's treasury, and it is rumoured 
@@ -1693,9 +2779,13 @@ N:118:'Nar-i-vagil'
 I:21:3:3
 W:20:18:150:70000
 P:0:1d9:10:20:0
-F:INT | HIDE_TYPE | 
-F:SLAY_ANIMAL | BRAND_FIRE | RES_FIRE | SHOW_MODS | 
+F:BRAND_FIRE
 F:COULD2H
+F:HIDE_TYPE
+F:INT
+F:RES_FIRE
+F:SHOW_MODS
+F:SLAY_ANIMAL
 f:COULD2H
 D:Named for a fiery star and set with gems of great worth binding mystic 
 D:virtues of protection and thought.
@@ -1707,9 +2797,18 @@ N:119:'Eriril'
 I:21:3:4
 W:20:18:150:20000
 P:0:1d9:3:5:0
-F:INT | WIS | HIDE_TYPE | ESP_EVIL | SPELL_CONTAIN | WIELD_CAST
-F:SLAY_EVIL | RES_LITE | SEE_INVIS | ACTIVATE | SHOW_MODS
-a:HARDCORE=ID_PLAIN
+F:ACTIVATE
+F:ESP_EVIL
+F:HIDE_TYPE
+F:INT
+F:RES_LITE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_EVIL
+F:SPELL_CONTAIN
+F:WIELD_CAST
+F:WIS
+a:ID_PLAIN
 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.
 
@@ -1720,10 +2819,25 @@ N:120:of Olorin
 I:21:3:4
 W:30:105:150:140000
 P:0:2d9:10:13:0
-F:INT | WIS | CHR | HIDE_TYPE | SEARCH | BRAND_FIRE | 
-F:SLAY_EVIL | BRAND_FIRE | SLAY_TROLL | SLAY_ORC | SPELL_CONTAIN | WIELD_CAST
-F:HOLD_LIFE | RES_FIRE | RES_NETHER | SEE_INVIS | ACTIVATE | SHOW_MODS
-a:HARDCORE=DETECT_XTRA
+F:ACTIVATE
+F:BRAND_FIRE
+F:BRAND_FIRE
+F:CHR
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:INT
+F:RANDOM_POWER
+F:RES_FIRE
+F:RES_NETHER
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_EVIL
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SPELL_CONTAIN
+F:WIELD_CAST
+F:WIS
+a:DETECT_XTRA
 D:A staff tall and sturdy, with rough-hewn runes that invoke the element of 
 D:Earth, and which strikes down all creatures who live in the shadow of 
 D:mountains.
@@ -1734,11 +2848,25 @@ N:121:'Nguruthos'
 I:21:20:6
 W:80:38:400:444444
 P:0:7d8:18:18:0
-F:STR | TUNNEL | HIDE_TYPE | NO_TELE | DRAIN_MANA | 
-F:SLAY_DRAGON | SLAY_ANIMAL | SLAY_EVIL | KILL_UNDEAD | BRAND_FIRE | 
-F:IM_FIRE | RES_DARK | RES_CHAOS | RES_DISEN | AGGRAVATE |
-F:SHOW_MODS | BRAND_POIS | VAMPIRIC | 
+F:AGGRAVATE
+F:BRAND_FIRE
+F:BRAND_POIS
+F:DRAIN_MANA
+F:HIDE_TYPE
+F:IM_FIRE
+F:KILL_UNDEAD
 F:MUST2H
+F:NO_TELE
+F:RES_CHAOS
+F:RES_DARK
+F:RES_DISEN
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_DRAGON
+F:SLAY_EVIL
+F:STR
+F:TUNNEL
+F:VAMPIRIC
 f:MUST2H
 D:A weapon so massive it seems beyond the strength of mortals, yet you feel 
 D:the might of giants within you as you heft it.  As you grip the handle 
@@ -1752,12 +2880,23 @@ N:122:'Turmil'
 I:21:10:4
 W:20:15:120:30000
 P:0:2d5:10:6:8
-F:WIS | INFRA | HIDE_TYPE | 
-F:BRAND_COLD | SLAY_ORC | RES_COLD | RES_LITE | REGEN | 
-F:ACTIVATE | SHOW_MODS | ESP_ORC | ESP_TROLL | ESP_GIANT | 
+F:ACTIVATE
+F:BRAND_COLD
 F:COULD2H
+F:ESP_GIANT
+F:ESP_ORC
+F:ESP_TROLL
+F:HIDE_TYPE
+F:INFRA
+F:RANDOM_RESIST
+F:REGEN
+F:RES_COLD
+F:RES_LITE
+F:SHOW_MODS
+F:SLAY_ORC
+F:WIS
 f:COULD2H
-a:HARDCORE=TURMIL
+a:TURMIL
 D:Wielded by the High Priest of Meneltarma, this great mace gleams coldly as 
 D:though moonlit, and it can strike as mighty a blow spiritually as 
 D:physically.
@@ -1769,10 +2908,26 @@ N:123:of Gothmog
 I:21:2:-2
 W:20:15:120:100000
 P:0:3d6:15:16:0
-F:INT | DEX | INFRA | HIDE_TYPE | DRAIN_HP | HEAVY_CURSE | 
-F:CURSED | AGGRAVATE | BRAND_FIRE | SLAY_ANIMAL | SLAY_DEMON | 
-F:RES_FIRE | ESP_SPIDER | VORPAL | RES_LITE | LITE1 | REGEN | 
-F:ESP_DEMON | WOUNDING | SHOW_MODS
+F:AGGRAVATE
+F:BRAND_FIRE
+F:CURSED
+F:DEX
+F:DRAIN_HP
+F:ESP_DEMON
+F:ESP_SPIDER
+F:HEAVY_CURSE
+F:HIDE_TYPE
+F:INFRA
+F:INT
+F:LITE1
+F:REGEN
+F:RES_FIRE
+F:RES_LITE
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_DEMON
+F:VORPAL
+F:WOUNDING
 D:With this unbearably bright whip of flame, the Balrog Gothmog has become 
 D:known for never having lost in combat.
 
@@ -1783,8 +2938,12 @@ N:124:'Belthronding'
 I:19:13:3
 W:40:20:40:35000
 P:0:0d0:20:22:0
-F:DEX | STEALTH | HIDE_TYPE | 
-F:RES_DISEN | XTRA_SHOTS | SHOW_MODS
+F:DEX
+F:HIDE_TYPE
+F:RES_DISEN
+F:SHOW_MODS
+F:STEALTH
+F:XTRA_SHOTS
 D:The great bow of Beleg, made of black yew and strung with elven hair that 
 D:faintly shines a pale clear gold.
 
@@ -1795,8 +2954,13 @@ N:125:of Bard
 I:19:13:2
 W:30:20:40:20000
 P:0:0d0:17:19:0
-F:DEX | HIDE_TYPE | ESP_DRAGON | LUCK
-F:FREE_ACT | XTRA_MIGHT | SHOW_MODS
+F:DEX
+F:ESP_DRAGON
+F:FREE_ACT
+F:HIDE_TYPE
+F:LUCK
+F:SHOW_MODS
+F:XTRA_MIGHT
 D:The great yew bow of grim-faced Bard, who shot the mightiest arrow that 
 D:songs record.
 
@@ -1807,9 +2971,13 @@ N:126:'Cubragol'
 I:19:23:10
 W:50:25:110:50000
 P:0:0d0:10:14:0
-F:SPEED | HIDE_TYPE | 
-F:RES_FIRE | ACTIVATE | SHOW_MODS
-a:HARDCORE=CUBRAGOL
+F:ACTIVATE
+F:HIDE_TYPE
+F:RANDOM_RES_OR_POWER
+F:RES_FIRE
+F:SHOW_MODS
+F:SPEED
+a:CUBRAGOL
 D:A crossbow that grants fiery speed to he who finds it, and from which 
 D:shoot bolts that blaze with flame unquenchable.
 
@@ -1820,13 +2988,31 @@ N:127:of Manwe
 I:6:1:12
 W:127:220:20:9000000
 P:0:1d4:-19:-19:0
-F:INT | CHR | WIS | MANA | SPELL | ACTIVATE | LUCK | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | SPECIAL_GENE | 
-F:SEE_INVIS | ESP_EVIL | ESP_DEMON | NEVER_BLOW | INFRA | 
-F:PRECOGNITION | IM_FIRE | ULTIMATE | SPELL_CONTAIN | WIELD_CAST | 
+F:ACTIVATE
+F:CHR
 F:COULD2H
+F:ESP_DEMON
+F:ESP_EVIL
+F:IM_FIRE
+F:INFRA
+F:INT
+F:LUCK
+F:MANA
+F:NEVER_BLOW
+F:PRECOGNITION
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:SEE_INVIS
+F:SPECIAL_GENE
+F:SPELL
+F:SPELL_CONTAIN
+F:ULTIMATE
+F:WIELD_CAST
+F:WIS
 f:COULD2H
-a:HARDCORE=GANDALF
+a:GANDALF
 D:A simple, wooden wizard's staff.  Unremarkable in all aspects... 
 D:except that it pulses with overwhelming power.
 
@@ -1838,8 +3024,12 @@ N:128:of Beor
 I:15:4:4
 W:20:10:20:40000
 P:0:4d5:8:12:0
-F:DEX | SPEED | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD
+F:DEX
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:SPEED
 D:Beor's boomerang makes its wielder as agile as the winds, 
 D:and as hard to harm.
 
@@ -1850,8 +3040,20 @@ N:129:'Glimdrir'
 I:15:4:3
 W:40:20:20:60000
 P:0:5d5:15:16:0
-F:DEX | SPEED | FREE_ACT | BRAND_POIS | SLAY_EVIL | SLAY_UNDEAD | REGEN
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_SOUND | NO_TELE | CURSED
+F:BRAND_POIS
+F:CURSED
+F:DEX
+F:FREE_ACT
+F:NO_TELE
+F:REGEN
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_SOUND
+F:SLAY_EVIL
+F:SLAY_UNDEAD
+F:SPEED
 D:A powerful boomerang that makes one agile and fast, with a thirst for 
 D:evil and undead creatures, but demands its wielder not teleport, for fear 
 D:of desertion.
@@ -1863,9 +3065,19 @@ N:130:of Incanus
 I:36:2:3
 W:30:20:20:60000
 P:2:0d0:0:0:20
-F:INT | WIS | SEARCH | HIDE_TYPE | SPELL_CONTAIN | WIELD_CAST
-F:SUST_INT | SUST_WIS | FREE_ACT | SEE_INVIS | 
-F:RES_ACID | RES_ELEC | IM_FIRE | RES_COLD
+F:FREE_ACT
+F:HIDE_TYPE
+F:IM_FIRE
+F:INT
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:SEE_INVIS
+F:SPELL_CONTAIN
+F:SUST_INT
+F:SUST_WIS
+F:WIELD_CAST
+F:WIS
 Z:weigh magic
 D:Gandalf's long, flowing robe.  It provides insight and allows the 
 D:wearer to see things not seen by all.
@@ -1877,8 +3089,13 @@ N:131:of the Thain
 I:19:2:4
 W:40:20:40:35000
 P:0:0d0:15:15:0
-F:HIDE_TYPE | DEX | CON
-F:RES_NETHER | XTRA_SHOTS | XTRA_MIGHT | SHOW_MODS
+F:CON
+F:DEX
+F:HIDE_TYPE
+F:RES_NETHER
+F:SHOW_MODS
+F:XTRA_MIGHT
+F:XTRA_SHOTS
 D:This sling was crafted by Faramir I, Thain of the Shire, just in case 
 D:the nasties of his father's stories ever dare to enter the Shire again.
 
@@ -1888,7 +3105,12 @@ N:132:of Gimli
 I:34:3:3
 W:40:3:65:80000
 P:3:0d0:9:10:40
-F:INT | CON | RES_FEAR | HIDE_TYPE | IM_FIRE | RES_SHARDS
+F:CON
+F:HIDE_TYPE
+F:IM_FIRE
+F:INT
+F:RES_FEAR
+F:RES_SHARDS
 Z:find secret passages
 D:A gift from the King of Rohan to Gimli the Dwarf, this shield 
 D:combines the cunning and stamina of Gimli Elf-friend, Gimli the 
@@ -1900,8 +3122,15 @@ N:133:of Gimli
 I:24:3:2
 W:35:60:35:65000
 P:0:1d6:5:15:0
-F:STR | BLOWS | LEVELS | SLAY_ORC | FREE_ACT | VORPAL | 
-F:ESP_UNDEAD | ESP_NONLIVING | COULD2H
+F:BLOWS
+F:COULD2H
+F:ESP_NONLIVING
+F:ESP_UNDEAD
+F:FREE_ACT
+F:LEVELS
+F:SLAY_ORC
+F:STR
+F:VORPAL
 f:COULD2H
 D:"Gimli sensed the Dead behind following, but he continued on 
 D:after Aragorn." The trusty axe of Gimli son of Gloin, one of 
@@ -1913,9 +3142,16 @@ N:134:'Lasher'
 I:21:2:3
 W:20:5:30:50000
 P:0:1d6:12:15:0
-F:DEX | BLOWS | HIDE_TYPE | 
-F:SLAY_ANIMAL | SLAY_ORC | BRAND_POIS | VORPAL | 
-F:RES_POIS | FREE_ACT | ESP_ORC
+F:BLOWS
+F:BRAND_POIS
+F:DEX
+F:ESP_ORC
+F:FREE_ACT
+F:HIDE_TYPE
+F:RES_POIS
+F:SLAY_ANIMAL
+F:SLAY_ORC
+F:VORPAL
 D:A powerful whip that is deadly against orcs.  It poisons your foes 
 D:and is said to go "snicker snack".
 
@@ -1925,8 +3161,15 @@ N:135:of Thorin
 I:14:59:2
 W:50:10:30:40000
 P:0:1d1:0:0:0
-F:ACTIVATE | CHR | INFRA | INSTA_ART | LUCK | STEALTH | SUST_CHR | TUNNEL
-a:HARDCORE=CHARM_OTHERS
+F:ACTIVATE
+F:CHR
+F:INFRA
+F:INSTA_ART
+F:LUCK
+F:STEALTH
+F:SUST_CHR
+F:TUNNEL
+a:CHARM_OTHERS
 Z:remove fear
 D:This magical instrument once belonged to Thorin Oakenshield, 
 D:a mighty dwarf warrior of old. The sounds emanating from it 
@@ -1940,8 +3183,16 @@ N:136:of Thorin
 I:32:8:3
 W:40:5:20:55000
 P:10:2d4:0:0:0
-F:ACTIVATE | DEX | HIDE_TYPE | HOLD_LIFE | REGEN | RES_FEAR | SUST_CON | SUST_DEX | SUST_STR
-a:HARDCORE=TERROR
+F:ACTIVATE
+F:DEX
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:REGEN
+F:RES_FEAR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_STR
+a:TERROR
 D:Mighty was Thorin Oakenshield as he emerged from the Gate of the 
 D:Lonely Mountain on the day of the Battle of the Five Armies, clad 
 D:in shining armour, part of which was this helm. He gleamed like 
@@ -1954,8 +3205,18 @@ N:137:of Maglor
 I:14:59:3
 W:60:10:20:100000
 P:0:3d4:0:0:0
-F:CHR | SPEED | WIS | SEE_INVIS | RES_SOUND | STEALTH | LUCK
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | ESP_UNIQUE
+F:CHR
+F:ESP_UNIQUE
+F:LUCK
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_SOUND
+F:SEE_INVIS
+F:SPEED
+F:STEALTH
+F:WIS
 D:This harp that once belonged to Maglor makes those who use it seem 
 D:more forceful and convincing.  It is also said that those who have 
 D:used it found themselves walking faster, as if to an unheard beat.
@@ -1967,8 +3228,17 @@ N:138:of the Sky
 I:14:58:2
 W:40:10:15:80000
 P:0:3d4:0:0:0
-F:CHR | SPEED | WIS | SEE_INVIS | RES_SOUND | STEALTH | LUCK
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD
+F:CHR
+F:LUCK
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_SOUND
+F:SEE_INVIS
+F:SPEED
+F:STEALTH
+F:WIS
 D:The drum is decorated with the images of the stars, the clouds, the 
 D:Sun guided by Arien and the Moon with Tilion.  It imparts to the 
 D:wearer an echo of the beauty of the sky, and protects him from the 
@@ -1982,8 +3252,16 @@ N:139:of Daeron
 I:14:59:1
 W:20:10:10:50000
 P:0:3d4:0:0:0
-F:CHR | SPEED | WIS | RES_SOUND | STEALTH | LUCK
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD
+F:CHR
+F:LUCK
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_SOUND
+F:SPEED
+F:STEALTH
+F:WIS
 D:A pretty harp that makes those who play it beautiful, wise and 
 D:fast.
 
@@ -1994,9 +3272,17 @@ N:140:of Erebor
 I:20:6:5
 W:50:15:200:55000
 P:0:3d4:5:0:0
-F:STR | TUNNEL | SUST_STR | HIDE_TYPE | LITE1 | ACTIVATE | CLIMB
-F:RES_CHAOS | RES_LITE | RES_DARK
-a:HARDCORE=EREBOR
+F:ACTIVATE
+F:CLIMB
+F:HIDE_TYPE
+F:LITE1
+F:RES_CHAOS
+F:RES_DARK
+F:RES_LITE
+F:STR
+F:SUST_STR
+F:TUNNEL
+a:EREBOR
 D:A pick that provides a magical light by which to see while tunnelling.
 
 
@@ -2006,8 +3292,12 @@ N:141:of the Druedain
 I:14:58:4
 W:19:10:15:10000
 P:0:3d4:0:0:0
-F:ACTIVATE | STEALTH | SEARCH | INFRA | RES_POIS | RES_DARK
-a:HARDCORE=DRUEDAIN
+F:ACTIVATE
+F:INFRA
+F:RES_DARK
+F:RES_POIS
+F:STEALTH
+a:DRUEDAIN
 D:The fabled Drum of the Druedain that will protect those who play it 
 D:from darkness and poison attacks.  It also aids in the seeing of 
 D:warm-blooded creatures.
@@ -2019,8 +3309,11 @@ N:142:of Rohan
 I:14:60:2
 W:14:10:15:80000
 P:0:3d4:0:0:0
-F:ACTIVATE | CHR | WIS | ESP_DRAGON
-a:HARDCORE=ROHAN
+F:ACTIVATE
+F:CHR
+F:ESP_DRAGON
+F:WIS
+a:ROHAN
 D:A horn carved from the bones of the Dragon of Ered-Mithrin, this 
 D:heirloom of the House of Eorl bestows to its user the gifts of 
 D:courage and command.
@@ -2032,8 +3325,13 @@ N:143:of Helm
 I:14:60:2
 W:16:10:15:15000
 P:0:3d4:0:0:0
-F:ACTIVATE | STR | CON | IM_COLD | RES_NETHER | RES_FEAR
-a:HARDCORE=HELM
+F:ACTIVATE
+F:CON
+F:IM_COLD
+F:RES_FEAR
+F:RES_NETHER
+F:STR
+a:HELM
 D:Heedless of cold, fearless of darkness -- besiegers fled at the wind 
 D:of the solitary coming of King Helm Hammerhand, proclaimed by a single 
 D:horn-blast in the dead of winter.
@@ -2045,8 +3343,13 @@ N:144:of Boromir
 I:14:60:3
 W:18:10:15:18000
 P:0:3d4:0:0:0
-F:ACTIVATE | STR | CON | RES_FEAR | RES_FIRE | AGGRAVATE
-a:HARDCORE=BOROMIR
+F:ACTIVATE
+F:AGGRAVATE
+F:CON
+F:RES_FEAR
+F:RES_FIRE
+F:STR
+a:BOROMIR
 D:The great horn made of the horns of kine of Araw. It is inlaid with silver 
 D:and gold signs; when blown, it can be heard for miles over. The horn gives 
 D:courage and endurance to its wearer, provided that secrecy is not desired. 
@@ -2059,8 +3362,14 @@ N:145:of Gothmog
 I:22:28:-4
 W:30:8:250:30000
 P:0:3d8:14:19:0
-F:BRAND_FIRE | IM_FIRE | CHR | ACTIVATE | SHOW_MODS | CURSED | TY_CURSE
-a:HARDCORE=AXE_GOTHMOG
+F:ACTIVATE
+F:BRAND_FIRE
+F:CHR
+F:CURSED
+F:IM_FIRE
+F:SHOW_MODS
+F:TY_CURSE
+a:AXE_GOTHMOG
 D:The black axe of Gothmog, which struck Fingon at Nirnaeth.  Mighty 
 D:spells of evil make it unsafe in any hands but those of its original wielder.
 
@@ -2071,7 +3380,8 @@ N:146:of Gondor
 I:17:2:0
 W:20:5:3:25000
 P:0:10d8:10:20:0
-F:SLAY_EVIL | SLAY_DEMON
+F:SLAY_DEMON
+F:SLAY_EVIL
 D:An arrow that was created to rid the world of demons.
 
 # The Long Sword of Tulkas
@@ -2081,14 +3391,41 @@ N:147:of Tulkas
 I:23:17:10
 W:127:220:130:9000000
 P:0:5d6:21:26:50
-F:LIFE | CON | CHR | LUCK
-F:SUST_STR | SUST_INT | SUST_WIS | SUST_DEX | SUST_CON | SUST_CHR |
-F:BRAND_FIRE | BRAND_COLD | BRAND_ELEC | VORPAL | IM_COLD |
-F:SLAY_EVIL | SLAY_UNDEAD | SLAY_DEMON | SLAY_TROLL | SLAY_DEMON |
-F:FREE_ACT | RES_FIRE | RES_DARK | LITE1 | SEE_INVIS | SLOW_DIGEST | REGEN | 
-F:ACTIVATE | SHOW_MODS | BLESSED |
-F:PRECOGNITION | NO_MAGIC | ULTIMATE | SPECIAL_GENE
-a:HARDCORE=ERU
+F:ACTIVATE
+F:BLESSED
+F:BRAND_COLD
+F:BRAND_ELEC
+F:BRAND_FIRE
+F:CHR
+F:CON
+F:FREE_ACT
+F:IM_COLD
+F:LIFE
+F:LITE1
+F:LUCK
+F:NO_MAGIC
+F:PRECOGNITION
+F:REGEN
+F:RES_DARK
+F:RES_FIRE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_DEMON
+F:SLAY_EVIL
+F:SLAY_TROLL
+F:SLAY_UNDEAD
+F:SLOW_DIGEST
+F:SPECIAL_GENE
+F:SUST_CHR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_INT
+F:SUST_STR
+F:SUST_WIS
+F:ULTIMATE
+F:VORPAL
+a:ERU
 D:A warm light bathes this translucent blade.  The power of the fates are 
 D:at the command of its wielder as the weapon passes Supreme Judgment on 
 D:the inhabitants of Angband.
@@ -2100,8 +3437,11 @@ N:148:of Great Luck
 I:36:2:60
 W:50:120:20:60000
 P:2:0d0:0:0:0
-F:LUCK | HIDE_TYPE |
-F:FREE_ACT | DRAIN_HP | DRAIN_MANA
+F:DRAIN_HP
+F:DRAIN_MANA
+F:FREE_ACT
+F:HIDE_TYPE
+F:LUCK
 D:A powerful wizard once created this robe to grant him incredible luck.... 
 D:It seems he forgot to wear it.
 
@@ -2112,9 +3452,13 @@ N:149:of Farmer Maggot
 I:19:2:2
 W:10:10:5:20000
 P:0:0d0:20:0:0
-F:INFRA | SEARCH | HIDE_TYPE | 
-F:XTRA_SHOTS | SHOW_MODS | ACTIVATE | SPECIAL_GENE
-a:SPELL=Artifact Maggot
+F:ACTIVATE
+F:HIDE_TYPE
+F:INFRA
+F:SHOW_MODS
+F:SPECIAL_GENE
+F:XTRA_SHOTS
+a:MAGGOT
 D:This ordinary seeming leather sling has been raised to legendary 
 D:status amongst generations of hobbit children.  Farmer Maggot's 
 D:ability to notice and strike any mushroom thief anywhere within 
@@ -2130,10 +3474,25 @@ N:150:of Angmar
 I:23:17:-10
 W:20:40:130:30000
 P:0:4d5:-22:-25:0
-F:SPEED | STR | WIS | CHR | ESP_UNDEAD
-F:BRAND_FIRE | SEE_INVIS | SLOW_DIGEST | FREE_ACT |
-F:VAMPIRIC | NO_TELE | AGGRAVATE | WRAITH | INVIS |
-F:CURSED | HEAVY_CURSE | DG_CURSE | SHOW_MODS | CLONE
+F:AGGRAVATE
+F:BRAND_FIRE
+F:CHR
+F:CLONE
+F:CURSED
+F:DG_CURSE
+F:ESP_UNDEAD
+F:FREE_ACT
+F:HEAVY_CURSE
+F:INVIS
+F:NO_TELE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLOW_DIGEST
+F:SPEED
+F:STR
+F:VAMPIRIC
+F:WIS
+F:WRAITH
 D:Dark flames wreath the naked steel of the Witch-King of Angmar.  
 D:A mighty curse to all those who wield it apart from its master, 
 D:the torture of the wraithworld awaits those who dare.
@@ -2145,9 +3504,19 @@ N:151:of Feanor
 I:18:2:0
 W:127:220:130:100000
 P:0:5d5:5:6:0
-F:BRAND_COLD | BRAND_FIRE | BRAND_ELEC | BRAND_ACID | BRAND_POIS |
-F:SLAY_DRAGON | SLAY_GIANT | SLAY_TROLL | KILL_UNDEAD | SLAY_ORC |
-F:SLAY_DEMON | SLAY_EVIL | SPECIAL_GENE
+F:BRAND_ACID
+F:BRAND_COLD
+F:BRAND_ELEC
+F:BRAND_FIRE
+F:BRAND_POIS
+F:KILL_UNDEAD
+F:SLAY_DEMON
+F:SLAY_DRAGON
+F:SLAY_EVIL
+F:SLAY_GIANT
+F:SLAY_ORC
+F:SLAY_TROLL
+F:SPECIAL_GENE
 D:Made during the war against Morgoth by Feanor, this powerful 
 D:bolt is the bane of Morgoth's power, and has especial strength 
 D:against those foes who are already dead.
@@ -2159,7 +3528,38 @@ N:152:of Orome
 I:19:24:5
 W:127:220:130:8000000
 P:0:0d0:36:28:0
-F:CON | DEX | ESP_EVIL | ESP_ORC | ESP_TROLL | FLY | FREE_ACT | IM_ELEC | INFRA | INVIS | LUCK | NO_MAGIC | PRECOGNITION | REFLECT | RES_BLIND | RES_CHAOS | RES_CONF | RES_DISEN | SEE_INVIS | SLOW_DIGEST | SPECIAL_GENE | SPEED | STEALTH | SUST_CHR | SUST_CON | SUST_DEX | SUST_INT | SUST_STR | SUST_WIS | ULTIMATE | XTRA_MIGHT | XTRA_SHOTS
+F:CON
+F:DEX
+F:ESP_EVIL
+F:ESP_ORC
+F:ESP_TROLL
+F:FLY
+F:FREE_ACT
+F:IM_ELEC
+F:INFRA
+F:INVIS
+F:LUCK
+F:NO_MAGIC
+F:PRECOGNITION
+F:REFLECT
+F:RES_BLIND
+F:RES_CHAOS
+F:RES_CONF
+F:RES_DISEN
+F:SEE_INVIS
+F:SLOW_DIGEST
+F:SPECIAL_GENE
+F:SPEED
+F:STEALTH
+F:SUST_CHR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_INT
+F:SUST_STR
+F:SUST_WIS
+F:ULTIMATE
+F:XTRA_MIGHT
+F:XTRA_SHOTS
 D:A crossbow handcrafted by Aule for the Huntsman of the Valar during 
 D:the first pursuit of Melkor Bauglir.
 
@@ -2169,8 +3569,16 @@ N:153:of the Sandworm
 I:36:4:5
 W:30:3:80:65000
 P:30:0d0:0:0:0
-F:RES_POIS | RES_ELEC | RES_FIRE | RES_ACID | SPECIAL_GENE
-F:TUNNEL | STR | STEALTH | INFRA | ESP_ANIMAL
+F:ESP_ANIMAL
+F:INFRA
+F:RES_ACID
+F:RES_ELEC
+F:RES_FIRE
+F:RES_POIS
+F:SPECIAL_GENE
+F:STEALTH
+F:STR
+F:TUNNEL
 D:This powerful piece of armour was made using the remains of 
 D:the Sandworm Queen.
 
@@ -2180,8 +3588,14 @@ N:154:'Lhugdagnir'
 I:22:28:2
 W:70:20:260:33000
 P:0:3d8:20:20:0
-F:BLOWS | KILL_DRAGON | RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
-F:RES_POIS | SHOW_MODS
+F:BLOWS
+F:KILL_DRAGON
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_POIS
+F:SHOW_MODS
 D:Forged by the Dwarves to defend their home of Khazad-dum from dragons, 
 D:this axe has been lost to time... until now.
 
@@ -2191,7 +3605,11 @@ N:155:'Cam-tal-crist'
 I:24:8:4
 W:15:3:140:12000
 P:0:2d5:12:15:0
-F:DEX | VORPAL | HIDE_TYPE | SHOW_MODS | WOUNDING
+F:DEX
+F:HIDE_TYPE
+F:SHOW_MODS
+F:VORPAL
+F:WOUNDING
 D:The Petty-dwarves of Bathak forged this blade, and it shares their thirst 
 D:for blood.
 
@@ -2202,10 +3620,14 @@ N:156:'Orchast'
 I:24:11:4
 W:15:2:170:12000
 P:0:2d7:20:14:0
-F:DEX | SEARCH | SLAY_ORC | ACTIVATE | HIDE_TYPE | SHOW_MODS | 
+F:ACTIVATE
 F:COULD2H
+F:DEX
+F:HIDE_TYPE
+F:SHOW_MODS
+F:SLAY_ORC
 f:COULD2H
-a:HARDCORE=ORCHAST
+a:ORCHAST
 D:Forged by the dwarves of Khazad-dum in a time of desperation, 
 D:this axe turned many a battle against the invading orcs.
 
@@ -2216,9 +3638,17 @@ N:157:of the Night
 I:24:1:4
 W:45:20:45:34000
 P:0:2d6:34:22:0
-F:DEX | STEALTH | VAMPIRIC | KILL_UNDEAD | RES_DARK | HIDE_TYPE | 
-F:SHOW_MODS | SEE_INVIS | ACTIVATE | DRAIN_EXP
-a:HARDCORE=NIGHT
+F:ACTIVATE
+F:DEX
+F:DRAIN_EXP
+F:HIDE_TYPE
+F:KILL_UNDEAD
+F:RES_DARK
+F:SEE_INVIS
+F:SHOW_MODS
+F:STEALTH
+F:VAMPIRIC
+a:NIGHT
 D:Found on an unmarked grave after a violent storm, this hatchet 
 D:has a sinister aura of darkness and decay.
 
@@ -2228,9 +3658,17 @@ N:158:'Lavandagnir'
 I:24:30:3
 W:70:20:300:28400
 P:0:5d7:31:27:0
-F:STR | SLAY_ANIMAL | SUST_STR | RES_SHARDS | RES_NEXUS | FEATHER | 
-F:HIDE_TYPE | SHOW_MODS | ACTIVATE | DRAIN_HP
-a:HARDCORE=NATUREBANE
+F:ACTIVATE
+F:DRAIN_HP
+F:FEATHER
+F:HIDE_TYPE
+F:RES_NEXUS
+F:RES_SHARDS
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:STR
+F:SUST_STR
+a:NATUREBANE
 D:Used by the orcs in their battle at Dagor Bragollach against the elves, this 
 D:axe has a bloodthirst for nature.
 
@@ -2240,8 +3678,14 @@ N:159:of Helcar
 I:24:8:3
 W:30:25:140:26550
 P:0:2d5:3:15:0
-F:INT | CHR | SUST_DEX | BRAND_COLD | IM_COLD | RES_NEXUS | HIDE_TYPE | 
+F:BRAND_COLD
+F:CHR
+F:HIDE_TYPE
+F:IM_COLD
+F:INT
+F:RES_NEXUS
 F:SHOW_MODS
+F:SUST_DEX
 D:Crafted of purest ice and held solid by powerful spells, this icy axe 
 D:delivers a chill of death to its victims.
 
@@ -2252,56 +3696,30 @@ N:160:of Knowledge
 I:32:5:-6
 W:20:5:75:100000
 P:6:1d3:0:0:20
-F:LITE1 | HIDE_TYPE | SPECIAL_GENE | LUCK | 
-F:AUTO_ID | ACTIVATE
-a:HARDCORE=KNOWLEDGE
+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.
 
-
-### Trapping Kits ###
-
-# The Catapult Trap Set of the Edain 
-
-N:161:of the Edain
-I:46:3:3
-W:20:10:40:20000
-P:0:0d0:25:15:30
-F:STEALTH | AUTOMATIC_99 | XTRA_MIGHT | HIDE_TYPE
-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 of the Noegyth Nibin
-
-N:162:of the Noegyth Nibin
-I:46:6:3
-W:20:20:40:20000
-P:0:0d0:0:0:25
-F:STEALTH | XTRA_SHOTS | TELEPORT_TO | HIDE_TYPE | AUTOMATIC_99
-D:A magical trap, armed with a wand.  Unaccountably, its victims keep 
-D:on coming back for more...
-
-# The Bolt Trap Set of the Naugrim
-
-N:163:of the Naugrim
-I:46:2:2
-W:20:20:200:20000
-P:0:0d0:17:27:37
-F:STEALTH | XTRA_SHOTS | XTRA_MIGHT | HIDE_TYPE | ONLY_DEMON
-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'
 I:23:2:2
 W:20:5:30:15000
 P:0:3d2:6:10:0
-F:BLESSED | DEX | HIDE_TYPE | RES_FIRE | SLAY_ORC | SLAY_TROLL | STR
+F:BLESSED
+F:DEX
+F:HIDE_TYPE
+F:RES_FIRE
+F:SLAY_ORC
+F:SLAY_TROLL
+F:STR
 D:These are the shards of the mighty blade of Isildur, which deprived 
 D:the dark lord Sauron of The One Ring of Power. Legend has it that 
 D:the sword that was broken shall be reforged. You can barely make out 
@@ -2316,8 +3734,16 @@ N:165:of Peregrin Took
 I:37:4:2
 W:20:3:220:32000
 P:14:1d4:3:5:11
-F:ACTIVATE | ESP_TROLL | HIDE_TYPE | LITE1 | REGEN | RES_FEAR | SHOW_MODS | STR | SUST_STR
-a:HARDCORE=GORLIM
+F:ACTIVATE
+F:ESP_TROLL
+F:HIDE_TYPE
+F:LITE1
+F:REGEN
+F:RES_FEAR
+F:SHOW_MODS
+F:STR
+F:SUST_STR
+a:GORLIM
 D:This sturdy mail shirt was a gift from the nobility of Gondor to the halfling 
 D:Peregrin Took.  It enables a warrior to fight more capably and cling to life when 
 D:others would be killed. It also reveals enemies (especially trolls) hiding in the 
@@ -2329,12 +3755,23 @@ N:166:'Loknare'
 I:38:20:0
 W:95:12:500:400000
 P:50:2d4:-8:0:35
-F:FEATHER | FLY | ESP_DRAGON |
-F:RES_NEXUS | RES_CHAOS | AGGRAVATE | REGEN | 
-F:RES_SHARDS | RES_SOUND | RES_DISEN | RES_CONF |
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD |
 F:ACTIVATE
-a:HARDCORE=MEDIATOR
+F:AGGRAVATE
+F:ESP_DRAGON
+F:FEATHER
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:REGEN
+F:RES_CHAOS
+F:RES_CONF
+F:RES_DISEN
+F:RES_NEXUS
+F:RES_SHARDS
+F:RES_SOUND
+a:MEDIATOR
 D:A mighty suit of dragon armour, set with the scales of dragons of both 
 D:Law and Chaos, and with power over both. Loknare means Dragonblaze.
 
@@ -2344,8 +3781,11 @@ N:167:of Himring
 I:36:6:0
 W:50:20:100:35000
 P:6:0d0:0:0:15
-F:RES_CHAOS | RES_NETHER | RES_POIS | ACTIVATE
-a:HARDCORE=PROT_EVIL
+F:ACTIVATE
+F:RES_CHAOS
+F:RES_NETHER
+F:RES_POIS
+a:PROT_EVIL
 D:Contained within this studded cuirass of pliable leather is the memory of 
 D:unvanquished Himring, defiant fortress surrounded by the legions of Morgoth.
 
@@ -2356,8 +3796,13 @@ N:168:'Hithlomir'
 I:36:4:4
 W:20:3:80:45000
 P:4:0d0:0:0:20
-F:STEALTH | HIDE_TYPE | SEARCH | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_DARK
+F:HIDE_TYPE
+F:RES_ACID
+F:RES_COLD
+F:RES_DARK
+F:RES_ELEC
+F:RES_FIRE
+F:STEALTH
 D:Familiar with the secret ways hidden in darkness, this leather cuirass is 
 D:truly more than it appears.
 
@@ -2369,11 +3814,20 @@ N:169:of Gil-galad
 I:34:10:5
 W:70:4:80:65000
 P:10:1d3:0:0:20
-F:ACTIVATE | 
-F:LITE1 | WIS | CHR | SEARCH | LUCK
-F:RES_ELEC | RES_ACID | RES_DISEN | RES_DARK | HIDE_TYPE | 
-F:SUST_WIS | SUST_DEX | SUST_CHR
-a:HARDCORE=GILGALAD
+F:ACTIVATE
+F:CHR
+F:HIDE_TYPE
+F:LITE1
+F:LUCK
+F:RES_ACID
+F:RES_DARK
+F:RES_DISEN
+F:RES_ELEC
+F:SUST_CHR
+F:SUST_DEX
+F:SUST_WIS
+F:WIS
+a:GILGALAD
 D:The legendary shield of Gil-Galad, who fought his way to the gates of 
 D:the Dark Tower, and with whom came light even to Gorgoroth.
 
@@ -2384,10 +3838,16 @@ N:170:of Celebrimbor
 I:32:3:3
 W:55:12:20:45000
 P:3:1d1:0:0:18
-F:INT | DEX | CHR | SPELL | SEARCH | 
-F:RES_FIRE | RES_ACID | RES_DISEN | RES_SHARDS | 
 F:ACTIVATE
-a:HARDCORE=CELEBRIMBOR
+F:CHR
+F:DEX
+F:INT
+F:RES_ACID
+F:RES_DISEN
+F:RES_FIRE
+F:RES_SHARDS
+F:SPELL
+a:CELEBRIMBOR
 D:This once belonged to Celebrimbor, maker of the Rings of Power.  One who 
 D:knows both fire and acid, from the business of forging and engraving, will 
 D:fear neither: nor have his enchantments ever faded.  Celebrimbor was even 
@@ -2401,10 +3861,18 @@ N:171:of Umbar
 I:19:24:2
 W:60:20:200:35000
 P:0:4d1:18:18:0
-F:STR | CON | XTRA_MIGHT | AGGRAVATE | 
-F:RES_LITE | RES_DARK | RES_BLIND | RES_ELEC | 
-F:HIDE_TYPE | ACTIVATE | SHOW_MODS
-a:HARDCORE=UMBAR
+F:ACTIVATE
+F:AGGRAVATE
+F:CON
+F:HIDE_TYPE
+F:RES_BLIND
+F:RES_DARK
+F:RES_ELEC
+F:RES_LITE
+F:SHOW_MODS
+F:STR
+F:XTRA_MIGHT
+a:UMBAR
 D:A great brazen arbalest with arms of gleaming steel, shooting quarrels with 
 D:speed and power for those brave enough to risk betrayal.
 
@@ -2416,8 +3884,13 @@ N:172:of Amrod
 I:19:12:2
 W:25:10:30:9000
 P:0:0d0:12:15:0
-F:STR | CON | XTRA_MIGHT | 
-F:RES_FIRE | RES_ELEC | RES_COLD | REGEN
+F:CON
+F:REGEN
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:STR
+F:XTRA_MIGHT
 D:This bow, and its twin, belonged to Feanor's last two twin sons, Amrod 
 D:and Amras, who both hunted with the Green-elves for a time.  Like the 
 D:twins, the bows are similar, for both protect their wielders from the 
@@ -2431,8 +3904,16 @@ N:173:of Amras
 I:19:12:1
 W:25:10:30:9000
 P:0:0d0:12:15:0
-F:INT | WIS | DEX | XTRA_SHOTS | XTRA_MIGHT | SPEED | 
-F:RES_FIRE | RES_ELEC | RES_COLD | SLOW_DIGEST
+F:DEX
+F:INT
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:SLOW_DIGEST
+F:SPEED
+F:WIS
+F:XTRA_MIGHT
+F:XTRA_SHOTS
 D:This bow, and its twin, belonged to Feanor's last two twin sons, Amrod 
 D:and Amras, who both hunted with the Green-elves for a time.  Like the 
 D:twins, the bows are similar, for both protect their wielders from the 
@@ -2446,11 +3927,21 @@ N:174:of Nain
 I:20:7:6
 W:60:5:250:30000
 P:0:3d8:12:18:0
-F:TUNNEL | INFRA | SEARCH | STR | ESP_ORC | CLIMB | 
-F:SLAY_ORC | SLAY_TROLL | SLAY_GIANT | SLAY_DRAGON | 
-F:BRAND_ACID | RES_ACID | RES_DARK | RES_DISEN | 
 F:ACTIVATE
-a:HARDCORE=STONE_MUD
+F:BRAND_ACID
+F:CLIMB
+F:ESP_ORC
+F:INFRA
+F:RES_ACID
+F:RES_DARK
+F:RES_DISEN
+F:SLAY_DRAGON
+F:SLAY_GIANT
+F:SLAY_ORC
+F:SLAY_TROLL
+F:STR
+F:TUNNEL
+a:STONE_MUD
 D:Wielded by Nain of the Iron Hills at the Battle of Azanulbizar, this great 
 D:mattock brought victory to the Dwarves over Azog's Orcs - though Nain 
 D:himself fell at the last, even with victory already assured.
@@ -2462,12 +3953,22 @@ N:175:of Fundin Bluecloak
 I:21:6:4
 W:25:100:130:60000
 P:0:5d4:13:17:10
-F:STR | WIS | SPEED | LITE1 | HIDE_TYPE | 
-F:SLAY_EVIL | SLAY_UNDEAD | ACTIVATE | 
-F:RES_FIRE | RES_ELEC | RES_NETHER | RES_DISEN | HOLD_LIFE | 
+F:ACTIVATE
 F:COULD2H
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:LITE1
+F:RES_DISEN
+F:RES_ELEC
+F:RES_FIRE
+F:RES_NETHER
+F:SLAY_EVIL
+F:SLAY_UNDEAD
+F:SPEED
+F:STR
+F:WIS
 f:COULD2H
-a:HARDCORE=FUNDIN
+a:FUNDIN
 D:The weapon of one of the great dwarven priests, with powers 
 D:to preserve body, soul and enchantments, and the bane of those 
 D:who seek life beyond death.
@@ -2479,10 +3980,17 @@ N:176:of the Haradrim
 I:34:4:2
 W:35:12:120:25000
 P:4:1d2:0:0:15
-F:ACTIVATE | 
-F:STR | CON | SUST_STR | SUST_CON | HIDE_TYPE | 
-F:RES_FEAR | RES_BLIND | RES_POIS | AGGRAVATE
-a:HARDCORE=HARADRIM
+F:ACTIVATE
+F:AGGRAVATE
+F:CON
+F:HIDE_TYPE
+F:RES_BLIND
+F:RES_FEAR
+F:RES_POIS
+F:STR
+F:SUST_CON
+F:SUST_STR
+a:HARADRIM
 D:A great shield from the far lands of the South, whose wielder 
 D:will go charging into battle heedless of danger, with the 
 D:strength and endurance of a madman.  Nor will he fear poison, for 
@@ -2494,13 +4002,24 @@ N:177:'Dolcrist'
 I:21:15:5
 W:30:15:500:60000
 P:0:5d4:11:23:20
-F:STR | TUNNEL | INFRA | HIDE_TYPE | 
-F:CURSED | AGGRAVATE | NO_MAGIC | ACTIVATE | 
-F:RES_NEXUS | RES_BLIND | RES_SOUND | 
-F:KILL_DRAGON | SLAY_ANIMAL | BRAND_POIS | BRAND_ELEC | 
+F:ACTIVATE
+F:AGGRAVATE
+F:BRAND_ELEC
+F:BRAND_POIS
 F:COULD2H
+F:CURSED
+F:HIDE_TYPE
+F:INFRA
+F:KILL_DRAGON
+F:NO_MAGIC
+F:RES_BLIND
+F:RES_NEXUS
+F:RES_SOUND
+F:SLAY_ANIMAL
+F:STR
+F:TUNNEL
 f:COULD2H
-a:HARDCORE=SKULLCLEAVER
+a:SKULLCLEAVER
 D:This mighty bludgeon brings destruction to all around it, and is the 
 D:bane of dragons and magic. Skull-cleaver (or head-cleaver) it is called.
 
@@ -2510,9 +4029,18 @@ N:178:of Eol
 I:31:2:3
 W:55:35:25:40000
 P:3:1d1:0:0:15
-F:INT | MANA | FREE_ACT | FEATHER | RES_ELEC | RES_DARK | RES_POIS | 
-F:ACTIVATE | LUCK | SPELL_CONTAIN | WIELD_CAST
-a:HARDCORE=EOL
+F:ACTIVATE
+F:FEATHER
+F:FREE_ACT
+F:INT
+F:LUCK
+F:MANA
+F:RES_DARK
+F:RES_ELEC
+F:RES_POIS
+F:SPELL_CONTAIN
+F:WIELD_CAST
+a:EOL
 D:The iron-shod gauntlets of the Dark Elven smith Eol, tingling with magics 
 D:that he could channel in battle.
 
@@ -2523,7 +4051,10 @@ N:179:of Nevrast
 I:30:3:3
 W:20:8:40:35000
 P:3:1d1:0:0:13
-F:STEALTH | CON | SPEED | HIDE_TYPE
+F:CON
+F:HIDE_TYPE
+F:SPEED
+F:STEALTH
 D:Footgear made of bear leather and set with opals, which grant the wearer 
 D:silent, hasted movement.
 
@@ -2534,7 +4065,10 @@ N:180:of Gimli
 I:30:6:4
 W:40:8:60:22500
 P:4:1d1:5:5:10
-F:INFRA | SEARCH | TUNNEL | CLIMB | HIDE_TYPE
+F:CLIMB
+F:HIDE_TYPE
+F:INFRA
+F:TUNNEL
 Z:magic map
 D:A set of iron-shod boots stamped by Gimli's combat prowess, a peerless 
 D:ally to those journeying through halls of stone under mountains.
@@ -2547,9 +4081,19 @@ N:181:of Gothmog
 I:115:55:-20
 W:10:0:150:500
 P:0:7d6:13:13:0
-F:SHOW_MODS | SLAY_DEMON | SLAY_EVIL | BRAND_FIRE | BRAND_POIS
-F:LUCK | CHAOTIC | LITE1 | WOUNDING | RES_MORGUL | WIELD_CAST
-F:HEAVY_CURSE | AUTO_CURSE
+F:AUTO_CURSE
+F:BRAND_FIRE
+F:BRAND_POIS
+F:CHAOTIC
+F:HEAVY_CURSE
+F:LITE1
+F:LUCK
+F:RES_MORGUL
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_EVIL
+F:WIELD_CAST
+F:WOUNDING
 
 
 # The Demonshield of Gothmog
@@ -2558,9 +4102,18 @@ N:182:of Gothmog
 I:115:56:4
 W:15:0:70:500
 P:13:1d1:0:0:13
-F:DEX | INVIS | SUST_STR | SUST_CON | SUST_DEX
-F:FEATHER | SH_FIRE | FREE_ACT | HOLD_LIFE
-F:HEAVY_CURSE | AUTO_CURSE | WIELD_CAST
+F:AUTO_CURSE
+F:DEX
+F:FEATHER
+F:FREE_ACT
+F:HEAVY_CURSE
+F:HOLD_LIFE
+F:INVIS
+F:SH_FIRE
+F:SUST_CON
+F:SUST_DEX
+F:SUST_STR
+F:WIELD_CAST
 
 
 # The Demonhorn of Gothmog
@@ -2569,9 +4122,15 @@ N:183:of Gothmog
 I:115:57:-5
 W:20:0:30:500
 P:2:1d1:0:0:13
-F:LITE2 | REGEN | ESP_DEMON
-F:CHR | SLOW_DIGEST | SEE_INVIS
-F:HEAVY_CURSE | AUTO_CURSE | WIELD_CAST
+F:AUTO_CURSE
+F:CHR
+F:ESP_DEMON
+F:HEAVY_CURSE
+F:LITE2
+F:REGEN
+F:SEE_INVIS
+F:SLOW_DIGEST
+F:WIELD_CAST
 
 # The Elven cloak of Peregrin Took
 # From T-Plus by Ingeborg S. Norden
@@ -2580,8 +4139,14 @@ N:184:of Peregrin Took
 I:35:2:3
 W:10:10:10:12500
 P:4:0d0:0:0:16
-F:ACTIVATE | CHR | DEX | HIDE_TYPE | INVIS | LUCK | SEARCH | STEALTH
-a:HARDCORE=CURE_HUNGER
+F:ACTIVATE
+F:CHR
+F:DEX
+F:HIDE_TYPE
+F:INVIS
+F:LUCK
+F:STEALTH
+a:CURE_HUNGER
 D:This simple-looking cloak, dyed in hues that blend into the woodlands, was a gift 
 D:from the elves of Lothlorien to the halfling Peregrin Took.  Its wearer has an 
 D:uncanny knack for making friends, escaping bonds, moving among enemies completely 
@@ -2594,10 +4159,21 @@ N:185:of Tom Bombadil
 I:14:59:4
 W:80:60:20:150000
 P:0:3d4:0:0:0
-F:ACTIVATE | BLESSED | CHR | ESP_UNDEAD | FREE_ACT | 
-F:HIDE_TYPE | HOLD_LIFE | LIFE | LUCK | RES_FEAR | 
-F:RES_SOUND | SEARCH | SEE_INVIS | STEALTH | SUST_CHR
-a:HARDCORE=PROT_EVIL
+F:ACTIVATE
+F:BLESSED
+F:CHR
+F:ESP_UNDEAD
+F:FREE_ACT
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:LIFE
+F:LUCK
+F:RES_FEAR
+F:RES_SOUND
+F:SEE_INVIS
+F:STEALTH
+F:SUST_CHR
+a:PROT_EVIL
 D:This small, serviceable wooden harp once belonged to Tom Bombadil-- 
 D:a mysterious figure whose song prevented the Wight-King from 
 D:attacking Frodo and his companions.  Its music still inspires 
@@ -2610,12 +4186,30 @@ N:186:of Radagast
 I:21:3:2
 W:100:120:150:180000
 P:0:2d9:10:13:0
-F:ACTIVATE | BLESSED | CHR | ESP_ANIMAL | ESP_EVIL | 
-F:HIDE_TYPE | INFRA | INT | MANA | RES_COLD | RES_ELEC | 
-F:RES_FIRE | RES_MORGUL | SEARCH | SEE_INVIS | SHOW_MODS | 
-F:SLAY_ANIMAL | SLAY_EVIL | SPELL | SPELL_CONTAIN | 
-F:STEALTH | WATER_BREATH | WIELD_CAST | WIS
-a:SPELL=Artifact Radagast
+F:ACTIVATE
+F:BLESSED
+F:CHR
+F:ESP_ANIMAL
+F:ESP_EVIL
+F:HIDE_TYPE
+F:INFRA
+F:INT
+F:MANA
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_MORGUL
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SLAY_EVIL
+F:SPELL
+F:SPELL_CONTAIN
+F:STEALTH
+F:WATER_BREATH
+F:WIELD_CAST
+F:WIS
+a:RADAGAST
 Z:grow trees
 D:Rumoured to be a gift from Yavanna to Radagast the Brown, this 
 D:plain-seeming oak staff shields its bearer against the elements 
@@ -2631,10 +4225,20 @@ N:187:'Valaroma'
 I:14:60:4
 W:80:60:15:90000
 P:0:3d4:0:0:0
-F:ACTIVATE | BLESSED | CON | ESP_ANIMAL | ESP_EVIL | 
-F:FREE_ACT | HIDE_TYPE | LUCK | RES_CONF | RES_FEAR | 
-F:RES_SOUND | SEARCH | SEE_INVIS | STEALTH
-a:SPELL=Artifact Valaroma
+F:ACTIVATE
+F:BLESSED
+F:CON
+F:ESP_ANIMAL
+F:ESP_EVIL
+F:FREE_ACT
+F:HIDE_TYPE
+F:LUCK
+F:RES_CONF
+F:RES_FEAR
+F:RES_SOUND
+F:SEE_INVIS
+F:STEALTH
+a:VALAROMA
 D:This heavenly instrument, wrought from gleaming silver, most 
 D:often appears in the hands of the Valarin huntsman Orome; yet 
 D:he may lend mortal champions the horn from time to time.  Its 
@@ -2648,10 +4252,20 @@ N:188:'Menelcol'
 I:35:1:5
 W:70:70:10:27500
 P:1:0d0:0:0:25
-F:ACTIVATE | CHR | FLY | HIDE_TYPE | IM_ELEC | INFRA | 
-F:LITE1 | MAGIC_BREATH | RES_COLD | RES_DARK | RES_LITE | 
-F:SEARCH | SEE_INVIS | SUST_CHR
-a:HARDCORE=GILGALAD
+F:ACTIVATE
+F:CHR
+F:FLY
+F:HIDE_TYPE
+F:IM_ELEC
+F:INFRA
+F:LITE1
+F:MAGIC_BREATH
+F:RES_COLD
+F:RES_DARK
+F:RES_LITE
+F:SEE_INVIS
+F:SUST_CHR
+a:GILGALAD
 D:This deep-blue velvet cloak, embroidered with silvery stars, sheds a 
 D:celestial light that reveals hidden things and bestows unearthly 
 D:beauty.  It also wards off damage from elements of the skies, and 
@@ -2664,9 +4278,18 @@ N:189:of Ghan-buri-Ghan
 I:36:1:2
 W:25:10:20:30000
 P:2:0d0:0:0:32
-F:CON | HIDE_TYPE | LIFE | RES_COLD | RES_FIRE | 
-F:RES_POIS | RES_SOUND | STR | SUST_CON | 
-F:SUST_STR | SUST_WIS | WIS
+F:CON
+F:HIDE_TYPE
+F:LIFE
+F:RES_COLD
+F:RES_FIRE
+F:RES_POIS
+F:RES_SOUND
+F:STR
+F:SUST_CON
+F:SUST_STR
+F:SUST_WIS
+F:WIS
 Z:poison dart
 D:The wrappings of a leader among the wild Men of Druadan 
 D:forest. It contains a multitude of tiny pockets filled 
@@ -2679,7 +4302,12 @@ N:190:of Ghan-buri-Ghan
 I:35:1:5
 W:30:15:10:25000
 P:1:0d0:5:5:13
-F:DEX | HIDE_TYPE | INVIS | SPEED | STEALTH | SUST_DEX
+F:DEX
+F:HIDE_TYPE
+F:INVIS
+F:SPEED
+F:STEALTH
+F:SUST_DEX
 Z:berserk
 D:This dark-coloured cloak once belonged to the leader of the 
 D:Druedain. As you put it on, you feel safer from attempts to 
@@ -2692,9 +4320,17 @@ N:191:of Gondor
 I:39:108:-3
 W:60:30:50:50000
 P:0:0d0:0:0:0
-F:ACTIVATE | ESP_UNDEAD | HIDE_TYPE | INSTA_ART | INVIS | 
-F:LITE1 | RES_CHAOS | RES_DARK | RES_NETHER | STEALTH
-a:HARDCORE=SUMMON_UNDEAD
+F:ACTIVATE
+F:ESP_UNDEAD
+F:HIDE_TYPE
+F:INSTA_ART
+F:INVIS
+F:LITE1
+F:RES_CHAOS
+F:RES_DARK
+F:RES_NETHER
+F:STEALTH
+a:SUMMON_UNDEAD
 D:A large banner of pure black, strangely gleaming with a dark light 
 D:that is faint and at the same time so bright it attracts attention. 
 
@@ -2705,9 +4341,16 @@ N:192:of Saruman
 I:6:1:4
 W:60:80:12:60000
 P:0:1d4:5:5:0
-F:ACTIVATE | HIDE_TYPE | INT | MANA | SHOW_MODS | SPEED | 
-F:SPELL | SPELL_CONTAIN | WIELD_CAST
-a:HARDCORE=BA_COLD_1
+F:ACTIVATE
+F:HIDE_TYPE
+F:INT
+F:MANA
+F:SHOW_MODS
+F:SPEED
+F:SPELL
+F:SPELL_CONTAIN
+F:WIELD_CAST
+a:BA_COLD_1
 Z:weigh magic
 D:A white quarterstaff that faintly gleams a pale white, it once belonged 
 D:to one of the most powerful beings on Middle-Earth, Saruman the White. 
@@ -2721,9 +4364,19 @@ N:193:of Curunir
 I:36:2:10
 W:60:80:20:2000000
 P:2:0d0:-40:-40:36
-F:ACTIVATE | HIDE_TYPE | IM_COLD | IM_ELEC | SPEED | SPELL_CONTAIN |
-F:SUST_CHR | SUST_CON | SUST_DEX | SUST_INT | SUST_STR | WIELD_CAST
-a:HARDCORE=BA_ELEC_2
+F:ACTIVATE
+F:HIDE_TYPE
+F:IM_COLD
+F:IM_ELEC
+F:SPEED
+F:SPELL_CONTAIN
+F:SUST_CHR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_INT
+F:SUST_STR
+F:WIELD_CAST
+a:BA_ELEC_2
 D:The white robe of the Istari wizard Curunir, known on Middle-earth as 
 D:Saruman the White and Saruman of Many Colours. Imbued with cold and 
 D:lightning used in the creation of the Fire of Orthanc, it grants the 
@@ -2736,8 +4389,12 @@ N:194:of Brand
 I:19:23:10
 W:30:10:110:40000
 P:0:0d0:5:7:0
-F:ACTIVATE | HIDE_TYPE | RES_COLD | SHOW_MODS | STEALTH
-a:HARDCORE=RUNE_EXPLO
+F:ACTIVATE
+F:HIDE_TYPE
+F:RES_COLD
+F:SHOW_MODS
+F:STEALTH
+a:RUNE_EXPLO
 D:The bow of Brand, last King of Dale. It was given to him 
 D:as a gift by the King under the Mountain of Erebor, and 
 D:has access to an especially secret realm of Dwarven lore. 
@@ -2749,7 +4406,10 @@ N:195:'Nimphelos'
 I:39:109:1
 W:20:10:10:40000
 P:0:1d1:0:0:0
-F:HIDE_TYPE | INFRA | INSTA_ART | LITE3 | SEARCH
+F:HIDE_TYPE
+F:INFRA
+F:INSTA_ART
+F:LITE3
 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 
@@ -2762,11 +4422,27 @@ N:196:of Flames
 I:39:110:2
 W:75:90:200:100000
 P:0:10d10:0:0:0
-F:ACTIVATE | AUTO_CURSE | CURSED | DRAIN_EXP | DRAIN_MANA |
-F:ESP_EVIL | HEAVY_CURSE | HIDE_TYPE | INSTA_ART | LITE2 |
-F:LITE3 | RES_CHAOS | RES_DARK | RES_FIRE | RES_LITE |
-F:RES_NETHER | RES_NEXUS | RES_SHARDS | SEE_INVIS | STR
-a:HARDCORE=INVULN
+F:ACTIVATE
+F:AUTO_CURSE
+F:CURSED
+F:DRAIN_EXP
+F:DRAIN_MANA
+F:ESP_EVIL
+F:HEAVY_CURSE
+F:HIDE_TYPE
+F:INSTA_ART
+F:LITE2
+F:LITE3
+F:RES_CHAOS
+F:RES_DARK
+F:RES_FIRE
+F:RES_LITE
+F:RES_NETHER
+F:RES_NEXUS
+F:RES_SHARDS
+F:SEE_INVIS
+F:STR
+a:INVULN
 Z:banish evil
 D:A Silmaril of Feanor. It shines with the unquenchable light of the 
 D:White Trees of Valinor. It was stolen from the camp of Eonwe by 
@@ -2783,10 +4459,25 @@ N:197:of the Seas
 I:39:111:2
 W:75:90:200:100000
 P:0:10d10:0:0:0
-F:ACTIVATE | AUTO_CURSE | CURSED | DRAIN_EXP | DRAIN_HP | ESP_EVIL |
-F:HEAVY_CURSE | HIDE_TYPE | INSTA_ART | INT | LITE2 | LITE3 |
-F:RES_CHAOS | RES_DARK | RES_LITE | RES_NETHER | RES_NEXUS | SEE_INVIS
-a:HARDCORE=RECALL
+F:ACTIVATE
+F:AUTO_CURSE
+F:CURSED
+F:DRAIN_EXP
+F:DRAIN_HP
+F:ESP_EVIL
+F:HEAVY_CURSE
+F:HIDE_TYPE
+F:INSTA_ART
+F:INT
+F:LITE2
+F:LITE3
+F:RES_CHAOS
+F:RES_DARK
+F:RES_LITE
+F:RES_NETHER
+F:RES_NEXUS
+F:SEE_INVIS
+a:RECALL
 Z:banish evil
 D:A Silmaril of Feanor. It shines with the unquenchable light of the 
 D:White Trees of Valinor. It was stolen from the camp of Eonwe by 
@@ -2802,9 +4493,20 @@ N:198:of Numenor
 I:12:2:-3
 W:50:40:24:80000
 P:0:0d0:0:0:0
-F:ACTIVATE | AUTO_CURSE | CHR | CON | CURSED | HEAVY_CURSE |
-F:INSTA_ART | LUCK | SPEED | SPELL_CONTAIN | STR | WIELD_CAST | WRAITH
-a:HARDCORE=DISP_GOOD
+F:ACTIVATE
+F:AUTO_CURSE
+F:CHR
+F:CON
+F:CURSED
+F:HEAVY_CURSE
+F:INSTA_ART
+F:LUCK
+F:SPEED
+F:SPELL_CONTAIN
+F:STR
+F:WIELD_CAST
+F:WRAITH
+a:DISP_GOOD
 D:The chief mark of royalty in Westernesse, it is said to have perished 
 D:in the fall of Numenor. It once belonged to Ar-Pharazon the Golden and 
 D:the evilness of that fallen King still courses through it.
@@ -2815,9 +4517,16 @@ N:199:of Annuminas
 I:12:3:4
 W:60:50:24:80000
 P:0:0d0:0:0:0
-F:ACTIVATE | BLESSED | CHR | FREE_ACT | INSTA_ART | LUCK |
-F:RES_CONF | SPELL_CONTAIN | WIELD_CAST
-a:HARDCORE=RUNE_PROT
+F:ACTIVATE
+F:BLESSED
+F:CHR
+F:FREE_ACT
+F:INSTA_ART
+F:LUCK
+F:RES_CONF
+F:SPELL_CONTAIN
+F:WIELD_CAST
+a:RUNE_PROT
 D:The chief mark of royalty in Arnor, possibly the oldest remaining work 
 D:of Men. It came from Numenor, but it belonged to the Lords of Andunie 
 D:of whom the first was Valandil son of Silmarien. It was passed down to 
@@ -2829,10 +4538,21 @@ N:200:of Taniquetil
 I:39:4:2
 W:75:60:200:100000
 P:0:1d1:0:0:0
-F:ACTIVATE | BLESSED | ESP_ALL | HIDE_TYPE | INFRA | INT |
-F:LITE1 | LITE2 | LITE3 | RES_BLIND | RES_LITE | SEARCH |
-F:SEE_INVIS | WATER_BREATH | WIS
-a:HARDCORE=PALANTIR
+F:ACTIVATE
+F:BLESSED
+F:ESP_ALL
+F:HIDE_TYPE
+F:INFRA
+F:INT
+F:LITE1
+F:LITE2
+F:LITE3
+F:RES_BLIND
+F:RES_LITE
+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 
@@ -2847,7 +4567,8 @@ N:201:
 I:9:1:0
 W:200:1:10:0
 P:0:1d1:0:0:0
-F:INSTA_ART | SPECIAL_GENE
+F:INSTA_ART
+F:SPECIAL_GENE
 
 
 # The Palantir of Orthanc
@@ -2856,10 +4577,19 @@ N:202:of Orthanc
 I:39:104:2
 W:75:60:200:100000
 P:0:10d10:0:0:0
-F:WIS | INT | SEARCH | INFRA | HIDE_TYPE | ACTIVATE | ESP_ALL | 
-F:SEE_INVIS | RES_BLIND | AGGRAVATE | DRAIN_MANA | LITE2
+F:ACTIVATE
+F:AGGRAVATE
+F:DRAIN_MANA
+F:ESP_ALL
+F:HIDE_TYPE
+F:INFRA
 F:INSTA_ART
-a:HARDCORE=PALANTIR
+F:INT
+F:LITE2
+F:RES_BLIND
+F:SEE_INVIS
+F:WIS
+a:PALANTIR
 D:A shining white ball of unbreakable crystal, the ancient Palantiri 
 D:were used by kings of Numenor and later by the Exiles for rapid 
 D:communication between distant lands.  Nothing is hidden from one who 
@@ -2873,10 +4603,19 @@ N:203:'Fuin'
 I:45:55:15
 W:110:0:2:3000000
 P:0:1d1:0:0:0
-F:SPEED | SEE_INVIS | LUCK | MAGIC_BREATH
-F:CURSED | HEAVY_CURSE | REGEN
-F:WRAITH | IM_NETHER | DRAIN_EXP | HOLD_LIFE | SPECIAL_GENE |
+F:CURSED
+F:DRAIN_EXP
+F:HEAVY_CURSE
+F:HOLD_LIFE
+F:IM_NETHER
 F:INSTA_ART
+F:LUCK
+F:MAGIC_BREATH
+F:REGEN
+F:SEE_INVIS
+F:SPECIAL_GENE
+F:SPEED
+F:WRAITH
 Z:teleport
 D:Imbued with the screams of the victims of undead everywhere, this 
 D:ring is more a hole in reality than anything else.  Strange forces ripple over 
@@ -2891,7 +4630,23 @@ N:204:'Coimir'
 I:40:18:2
 W:80:120:3:120000
 P:0:0d0:0:0:0
-F:FREE_ACT | HIDE_TYPE | HOLD_LIFE | INSTA_ART | LIFE | LITE1 | LUCK | REGEN | RES_NETHER | SLOW_DIGEST | SPECIAL_GENE | SPELL_CONTAIN | SUST_CON | SUST_DEX | SUST_STR | WATER_BREATH | WIELD_CAST
+F:FREE_ACT
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:INSTA_ART
+F:LIFE
+F:LITE1
+F:LUCK
+F:REGEN
+F:RES_NETHER
+F:SLOW_DIGEST
+F:SPECIAL_GENE
+F:SPELL_CONTAIN
+F:SUST_CON
+F:SUST_DEX
+F:SUST_STR
+F:WATER_BREATH
+F:WIELD_CAST
 Z:restore life
 D:Called 'Life-jewel' by the Vanyar of old, this flawless sapphire 
 D:pendant bears potent runes that preserve body and soul.
@@ -2901,10 +4656,26 @@ D:pendant bears potent runes that preserve body and soul.
 N:205:of Durin
 I:45:57:2
 W:70:70:2:65000
-F:CON | CHR | STR | SUST_CHR | SUST_CON | SUST_STR | HIDE_TYPE | 
-F:ESP_EVIL | AGGRAVATE | HEAVY_CURSE | HOLD_LIFE | DRAIN_EXP | 
-F:RES_DARK | RES_CHAOS | RES_NETHER | RES_COLD | RES_ACID | 
-F:INSTA_ART | SPECIAL_GENE | CURSED
+F:AGGRAVATE
+F:CHR
+F:CON
+F:CURSED
+F:DRAIN_EXP
+F:ESP_EVIL
+F:HEAVY_CURSE
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:INSTA_ART
+F:RES_ACID
+F:RES_CHAOS
+F:RES_COLD
+F:RES_DARK
+F:RES_NETHER
+F:SPECIAL_GENE
+F:STR
+F:SUST_CHR
+F:SUST_CON
+F:SUST_STR
 Z:Midas touch
 D:The greatest of the Seven Rings of the Dwarf-lords, and the last to be 
 D:lost.  Alone among the Seven, it was not taken by Sauron when he made 
@@ -2919,10 +4690,19 @@ N:206:'Elessar'
 I:40:19:4
 W:60:60:3:40000
 P:0:0d0:7:7:10
-F:STR | WIS | CHR | SPEED | LITE3 | INSTA_ART | 
-F:RES_FEAR | RES_FIRE | RES_POIS | RES_DISEN | HIDE_TYPE | 
 F:ACTIVATE
-a:HARDCORE=ELESSAR
+F:CHR
+F:HIDE_TYPE
+F:INSTA_ART
+F:LITE3
+F:RES_DISEN
+F:RES_FEAR
+F:RES_FIRE
+F:RES_POIS
+F:SPEED
+F:STR
+F:WIS
+a:ELESSAR
 D:This green gem glows with inner light.  Aragorn son of Arathorn wore 
 D:it at the Battle of the Pelennor Fields, and he was himself given the 
 D:name of 'Elessar' by the people of Gondor because of this.
@@ -2933,10 +4713,19 @@ D:name of 'Elessar' by the people of Gondor because of this.
 N:207:'Evenstar'
 I:40:20:3
 W:50:50:3:35000
-F:HOLD_LIFE | SUST_CON | SUST_WIS | SUST_INT | LITE1 | CON | 
-F:RES_DARK | RES_COLD | RES_NETHER | REGEN | INSTA_ART | 
 F:ACTIVATE
-a:HARDCORE=REST_ALL
+F:CON
+F:HOLD_LIFE
+F:INSTA_ART
+F:LITE1
+F:REGEN
+F:RES_COLD
+F:RES_DARK
+F:RES_NETHER
+F:SUST_CON
+F:SUST_INT
+F:SUST_WIS
+a:REST_ALL
 D:A pure white jewel, the last gift of Queen Arwen Undomiel to Frodo 
 D:Baggins, intended to be worn around his neck on the chain that had 
 D:once borne the One Ring.
@@ -2947,10 +4736,21 @@ N:208:of Minas Ithil
 I:39:107:-3
 W:75:60:200:0
 P:0:10d10:0:0:-30
-F:LIFE | CON | INT | WIS | ESP_ALL | LITE3 | LITE1
-F:CURSED | HEAVY_CURSE | TY_CURSE | DRAIN_EXP | 
-F:RES_BLIND | SEE_INVIS | ACTIVATE
-a:HARDCORE=PALANTIR
+F:ACTIVATE
+F:CON
+F:CURSED
+F:DRAIN_EXP
+F:ESP_ALL
+F:HEAVY_CURSE
+F:INT
+F:LIFE
+F:LITE1
+F:LITE3
+F:RES_BLIND
+F:SEE_INVIS
+F:TY_CURSE
+F:WIS
+a:PALANTIR
 D:A shining white ball of unbreakable crystal, the ancient Palantiri 
 D:were used by kings of Numenor and later by the Exiles for rapid 
 D:communication between distant lands.  This Palantir, however, was 
@@ -2965,7 +4765,8 @@ N:209:of Thror
 I:8:33:0
 W:70:100:30:1
 P:0:0d0:0:0:0
-F:INSTA_ART | SPECIAL_GENE
+F:INSTA_ART
+F:SPECIAL_GENE
 D:A map made by Thror, the King under the Mountain. It shows the Lonely 
 D:Mountain of Erebor, the Running River, and the lands about devastated by 
 D:Smaug. It also contains mention of a secret entrance to the Mountain. 
@@ -2977,7 +4778,8 @@ N:210:of Thorin
 I:11:13:0
 W:70:100:5:1
 P:0:0d0:0:0:0
-F:INSTA_ART | SPECIAL_GENE
+F:INSTA_ART
+F:SPECIAL_GENE
 D:A small silver key, given to Thorin Oakenshield by Gandalf the Grey, 
 D:who got it from Thrain, Thorin's father, in Dol Guldur. It opens a 
 D:magical gate to a special cavern in the Lonely Mountain - you will 
@@ -2989,8 +4791,12 @@ N:211:of Thror
 I:11:14:0
 W:70:100:50:100000
 P:0:0d0:0:0:0
-F:ACTIVATE | ACTIVATE_NO_WIELD | HIDE_TYPE | INSTA_ART | SPECIAL_GENE
-a:HARDCORE=ALCHEMY
+F:ACTIVATE
+F:ACTIVATE_NO_WIELD
+F:HIDE_TYPE
+F:INSTA_ART
+F:SPECIAL_GENE
+a:ALCHEMY
 D:It was made for Thror, King under the Mountain. It is a huge golden bowl 
 D:with two handles, hammered and carved, with birds and flowers whose eyes 
 D:and leaves are made in jewels. 
@@ -3001,8 +4807,11 @@ N:212:of Gondor
 I:11:15:0
 W:40:70:2:70000
 P:0:0d0:0:0:0
-F:ACTIVATE | ACTIVATE_NO_WIELD | HIDE_TYPE | INSTA_ART
-a:HARDCORE=BOROMIR
+F:ACTIVATE
+F:ACTIVATE_NO_WIELD
+F:HIDE_TYPE
+F:INSTA_ART
+a:BOROMIR
 D:The summons of Gondor, an arrow sent as a symbol of desperate need from 
 D:Gondor to its northern allies, the Rohirrim. The tradition dates back to 
 D:the time of Borondir, who rode north from Gondor to summon aid from the 
@@ -3017,10 +4826,20 @@ N:213:of Forochel
 I:6:1:3
 W:65:70:60:60000
 P:0:3d4:-12:-8:0
-F:INT | WIS | MANA | SPELL | INFRA | SEE_INVIS | 
-F:SUST_INT | SUST_WIS | RES_BLIND | IM_COLD | SENS_FIRE | 
-F:SPECIAL_GENE | WIELD_CAST | 
 F:COULD2H
+F:IM_COLD
+F:INFRA
+F:INT
+F:MANA
+F:RES_BLIND
+F:SEE_INVIS
+F:SENS_FIRE
+F:SPECIAL_GENE
+F:SPELL
+F:SUST_INT
+F:SUST_WIS
+F:WIELD_CAST
+F:WIS
 f:COULD2H
 D:A shaft of pure, invincible crystal cut from the heart of one 
 D:of the great glaciers ringing the Ice-Bay of Forochel. 
@@ -3033,8 +4852,15 @@ N:214:of Mellyrn
 I:35:2:4
 W:40:40:5:65000
 P:4:0d0:0:0:20
-F:HIDE_TYPE | INVIS | DEX |  SPEED | STEALTH | LUCK | 
-F:SUST_DEX | RES_LITE | RES_DARK
+F:DEX
+F:HIDE_TYPE
+F:INVIS
+F:LUCK
+F:RES_DARK
+F:RES_LITE
+F:SPEED
+F:STEALTH
+F:SUST_DEX
 D:Bearing the same lyrical name as the great trees of Lothlorien 
 D:and containing in its close-woven folds the speed and skill of 
 D:the Galadrim, this grey cloak is ideal for those who travel in 
@@ -3047,8 +4873,17 @@ N:215:of Ephel Duath
 I:23:31:-3
 W:60:60:50:30000
 P:0:2d6:-20:-18:0
-F:STR | WIS | CHR | BRAND_POIS | VAMPIRIC | VORPAL | 
-F:INVIS | AGGRAVATE | CURSED | HEAVY_CURSE | SHOW_MODS | 
+F:AGGRAVATE
+F:BRAND_POIS
+F:CHR
+F:CURSED
+F:HEAVY_CURSE
+F:INVIS
+F:SHOW_MODS
+F:STR
+F:VAMPIRIC
+F:VORPAL
+F:WIS
 D:This filthy orc-blade is famed for vile deeds of torture and blood, 
 D:and its wielder will never cease to fear treachery.
 
@@ -3059,10 +4894,21 @@ N:216:'Garachoth'
 I:24:30:2
 W:70:50:400:0
 P:0:7d5:18:18:-20
-F:STR | CON | SPEED | LEVELS | BLACK_BREATH | 
-F:KILL_DEMON | SLAY_ANIMAL | BRAND_FIRE | VORPAL | 
-F:RES_FEAR | RES_FIRE | RES_CHAOS | RES_NETHER | 
-F:HIDE_TYPE | SHOW_MODS
+F:BLACK_BREATH
+F:BRAND_FIRE
+F:CON
+F:HIDE_TYPE
+F:KILL_DEMON
+F:LEVELS
+F:RES_CHAOS
+F:RES_FEAR
+F:RES_FIRE
+F:RES_NETHER
+F:SHOW_MODS
+F:SLAY_ANIMAL
+F:SPEED
+F:STR
+F:VORPAL
 D:A ghastly axe with the soul of a demon lord trapped inside, this horrifying 
 D:creation reverberates with the screams of the damned.  As you gaze into its 
 D:glassy, translucent blade, it seems that endless sulphrous wastelands 
@@ -3075,9 +4921,19 @@ N:217:'Skycleaver'
 I:31:5:1
 W:40:45:40:100000
 P:5:1d1:16:7:16
-F:STR | CON | DEX | CHR | LUCK | FLY | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_POIS | 
-F:HIDE_TYPE | SHOW_MODS
+F:CHR
+F:CON
+F:DEX
+F:FLY
+F:HIDE_TYPE
+F:LUCK
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_POIS
+F:SHOW_MODS
+F:STR
 D:The handgear of a legendary dragonslaying hero.  The wearer of these 
 D:wyrmskin gauntlets will be versed in all aerial ways, and will fear no 
 D:dragon that walks or flies.
@@ -3090,9 +4946,16 @@ N:218:of the Machine
 I:30:6:3
 W:30:100:170:19000
 P:6:1d1:0:0:24
-F:INT | SPEED | TUNNEL | AGGRAVATE | 
-F:RES_CHAOS | RES_SHARDS | RES_CONF | 
-F:ESP_NONLIVING | HIDE_TYPE | SPECIAL_GENE
+F:AGGRAVATE
+F:ESP_NONLIVING
+F:HIDE_TYPE
+F:INT
+F:RES_CHAOS
+F:RES_CONF
+F:RES_SHARDS
+F:SPECIAL_GENE
+F:SPEED
+F:TUNNEL
 D:A massive pair of adamantine boots studded with gold, the final and 
 D:greatest product of the petty-dwarven magical forge.  Despite 
 D:the great powers they contain, they are heavy and awkward enough to 
@@ -3107,7 +4970,17 @@ N:219:of Belegaer
 I:36:2:5
 W:100:200:20:1500000
 P:2:0d0:0:0:20
-F:FREE_ACT | HIDE_TYPE | IM_ACID | IM_COLD | IM_ELEC | LITE1 | LUCK | RES_BLIND | RES_DARK | SEARCH | STEALTH | WATER_BREATH
+F:FREE_ACT
+F:HIDE_TYPE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:LITE1
+F:LUCK
+F:RES_BLIND
+F:RES_DARK
+F:STEALTH
+F:WATER_BREATH
 D:This pearl-trimmed blue robe was created by a Maia loremaster in 
 D:Ulmo's service.  No ocean storm can harm its wearer or anything 
 D:he carries; the pressure and darkness of deep water cannot hinder 
@@ -3119,8 +4992,14 @@ N:220:of Girion
 I:40:4:5
 W:20:5:2:15000
 P:0:1d1:0:0:10
-F:ACTIVATE | CHR | INSTA_ART | RES_NEXUS | RES_POIS | SEE_INVIS | SUST_CHR
-a:HARDCORE=GROW_MOLD
+F:ACTIVATE
+F:CHR
+F:INSTA_ART
+F:RES_NEXUS
+F:RES_POIS
+F:SEE_INVIS
+F:SUST_CHR
+a:GROW_MOLD
 D:A necklace of emeralds, green as the grass. It once belonged to Girion, 
 D:King of Dale, and was given to the Dwarves of the Lonely Mountain as 
 D:payment for a mithril mail shirt for Girion's son. It seems to have 
@@ -3132,7 +5011,11 @@ N:221:'Dailir'
 I:18:3:5
 W:85:40:3:35000
 P:0:8d5:15:20:0
-F:CRIT | HIDE_TYPE | SHOW_MODS | VORPAL | WOUNDING
+F:CRIT
+F:HIDE_TYPE
+F:SHOW_MODS
+F:VORPAL
+F:WOUNDING
 D:The beloved dart of Beleg Cuthalion. It never failed to be found 
 D:unharmed, until it broke when Beleg fell upon it while he was 
 D:carrying Turin Turambar away from an Orc-camp, the night Beleg 
@@ -3146,7 +5029,12 @@ N:222:of Faramir
 I:40:29:5
 W:10:2:2:10000
 P:0:0d0:18:0:8
-F:HIDE_TYPE | INSTA_ART | RES_CONF | SHOW_MODS | STEALTH | SUST_DEX
+F:HIDE_TYPE
+F:INSTA_ART
+F:RES_CONF
+F:SHOW_MODS
+F:STEALTH
+F:SUST_DEX
 D:A slim neckpiece of True-silver, with quiet spells of Ithilien to aid and 
 D:protect the wearer.
 
@@ -3157,8 +5045,13 @@ N:223:of Earendil
 I:34:8:0
 W:95:80:100:90000
 P:20:1d1:0:0:80
-F:ACTIVATE | RES_BLIND | RES_DARK | RES_ELEC | RES_FIRE | RES_NETHER
-a:HARDCORE=BLADETURNER
+F:ACTIVATE
+F:RES_BLIND
+F:RES_DARK
+F:RES_ELEC
+F:RES_FIRE
+F:RES_NETHER
+a:BLADETURNER
 D:A shining shield, once borne by the great mariner Earendil, "scored with 
 D:runes to keep all wounds and harm from him".
 
@@ -3168,8 +5061,14 @@ N:224:of Legolas
 I:19:13:3
 W:40:20:40:30000
 P:0:0d0:17:19:0
-F:XTRA_MIGHT | XTRA_SHOTS | FREE_ACT | HIDE_TYPE | ESP_ORC |
-F:STEALTH | INFRA | DEX
+F:DEX
+F:ESP_ORC
+F:FREE_ACT
+F:HIDE_TYPE
+F:INFRA
+F:STEALTH
+F:XTRA_MIGHT
+F:XTRA_SHOTS
 D:The great bow of Legolas, one of the Nine Walkers of old. 
 D:Handcrafted specially for Thranduil's son in Lothlorien, 
 D:this bow gives clarity of sight and agility to the wielder. 
@@ -3180,8 +5079,14 @@ N:225:of Erkenbrand
 I:34:5:3
 W:40:9:120:200000
 P:0:0d0:0:0:30
-F:REFLECT | STR | CHR | SUST_DEX | HIDE_TYPE | ESP_ORC | 
-F:FREE_ACT | REGEN
+F:CHR
+F:ESP_ORC
+F:FREE_ACT
+F:HIDE_TYPE
+F:REFLECT
+F:REGEN
+F:STR
+F:SUST_DEX
 D:Tall and strong stood Erkenbrand, Lord of the Westfold, as he rode 
 D:to combat the forces of Isengard. The valour of Helm Hammerhand lived 
 D:again in him. This shield is painted red according to Rohan custom 
@@ -3212,13 +5117,40 @@ N:241:of the Eruchin
 I:21:10:10
 W:127:220:130:9000000
 P:0:5d6:21:26:50
-F:ACTIVATE | BLESSED | BRAND_COLD | BRAND_ELEC | BRAND_FIRE |
-F:CHR | CON | FREE_ACT | IM_COLD | LIFE | LITE1 | LUCK |
-F:NO_MAGIC | PRECOGNITION | REGEN | RES_DARK | RES_FIRE |
-F:SEE_INVIS | SHOW_MODS | SLAY_DEMON | SLAY_EVIL | SLAY_TROLL | 
-F:SLAY_UNDEAD | SLOW_DIGEST | SPECIAL_GENE | SUST_CHR | SUST_CON | 
-F:SUST_DEX | SUST_INT | SUST_STR | SUST_WIS | ULTIMATE | VORPAL
-a:HARDCORE=ERU
+F:ACTIVATE
+F:BLESSED
+F:BRAND_COLD
+F:BRAND_ELEC
+F:BRAND_FIRE
+F:CHR
+F:CON
+F:FREE_ACT
+F:IM_COLD
+F:LIFE
+F:LITE1
+F:LUCK
+F:NO_MAGIC
+F:PRECOGNITION
+F:REGEN
+F:RES_DARK
+F:RES_FIRE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_EVIL
+F:SLAY_TROLL
+F:SLAY_UNDEAD
+F:SLOW_DIGEST
+F:SPECIAL_GENE
+F:SUST_CHR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_INT
+F:SUST_STR
+F:SUST_WIS
+F:ULTIMATE
+F:VORPAL
+a:ERU
 D:A weapon forged by Aule himself and blessed by Eru Iluvatar, 
 D:calling upon the strength of all his children (hence the name, 
 D:which means Children of Eru). It is Eru Iluvatar's gift to you, 
@@ -3230,13 +5162,40 @@ N:242:of Ulmo
 I:22:5:10
 W:127:220:130:9000000
 P:0:5d6:21:26:50
-F:ACTIVATE | BLESSED | BRAND_COLD | BRAND_ELEC | BRAND_FIRE |
-F:CHR | CON | FREE_ACT | IM_COLD | LIFE | LITE1 | LUCK |
-F:NO_MAGIC | PRECOGNITION | REGEN | RES_DARK | RES_FIRE |
-F:SEE_INVIS | SHOW_MODS | SLAY_DEMON | SLAY_EVIL | SLAY_TROLL |
-F:SLAY_UNDEAD | SLOW_DIGEST | SPECIAL_GENE | SUST_CHR | SUST_CON |
-F:SUST_DEX | SUST_INT | SUST_STR | SUST_WIS | ULTIMATE | VORPAL
-a:HARDCORE=ERU
+F:ACTIVATE
+F:BLESSED
+F:BRAND_COLD
+F:BRAND_ELEC
+F:BRAND_FIRE
+F:CHR
+F:CON
+F:FREE_ACT
+F:IM_COLD
+F:LIFE
+F:LITE1
+F:LUCK
+F:NO_MAGIC
+F:PRECOGNITION
+F:REGEN
+F:RES_DARK
+F:RES_FIRE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_EVIL
+F:SLAY_TROLL
+F:SLAY_UNDEAD
+F:SLOW_DIGEST
+F:SPECIAL_GENE
+F:SUST_CHR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_INT
+F:SUST_STR
+F:SUST_WIS
+F:ULTIMATE
+F:VORPAL
+a:ERU
 D:The awesome weapon of the Vala Ulmo, Lord of Waters.  Mightiest of all the 
 D:powers of good save Manwe himself, Ulmo laughs in scorn at the dread powers 
 D:of the undead, and is utterly in command of the element of water.
@@ -3247,13 +5206,40 @@ N:243:of Aule
 I:24:11:10
 W:127:220:130:9000000
 P:0:5d6:21:26:50
-F:ACTIVATE | BLESSED | BRAND_COLD | BRAND_ELEC | BRAND_FIRE |
-F:CHR | CON | FREE_ACT | IM_COLD | LIFE | LITE1 | LUCK |
-F:NO_MAGIC | PRECOGNITION | REGEN | RES_DARK | RES_FIRE |
-F:SEE_INVIS | SHOW_MODS | SLAY_DEMON | SLAY_EVIL | SLAY_TROLL |
-F:SLAY_UNDEAD | SLOW_DIGEST | SPECIAL_GENE | SUST_CHR | SUST_CON |
-F:SUST_DEX | SUST_INT | SUST_STR | SUST_WIS | ULTIMATE | VORPAL
-a:HARDCORE=ERU
+F:ACTIVATE
+F:BLESSED
+F:BRAND_COLD
+F:BRAND_ELEC
+F:BRAND_FIRE
+F:CHR
+F:CON
+F:FREE_ACT
+F:IM_COLD
+F:LIFE
+F:LITE1
+F:LUCK
+F:NO_MAGIC
+F:PRECOGNITION
+F:REGEN
+F:RES_DARK
+F:RES_FIRE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_EVIL
+F:SLAY_TROLL
+F:SLAY_UNDEAD
+F:SLOW_DIGEST
+F:SPECIAL_GENE
+F:SUST_CHR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_INT
+F:SUST_STR
+F:SUST_WIS
+F:ULTIMATE
+F:VORPAL
+a:ERU
 D:Aule's mighty weapon, granted to you to aid the defeat of Melkor. 
 
 # The Rapier of Vaire (Rogues, whose Critical-hits skill is only useful with lighter swords)
@@ -3262,13 +5248,40 @@ N:244:of Vaire
 I:23:7:10
 W:127:220:130:9000000
 P:0:5d6:21:26:50
-F:ACTIVATE | BLESSED | BRAND_COLD | BRAND_ELEC | BRAND_FIRE | CHR |
-F:CON | FREE_ACT | IM_COLD | LIFE | LITE1 | LUCK | NO_MAGIC |
-F:PRECOGNITION | REGEN | RES_DARK | RES_FIRE | SEE_INVIS | SHOW_MODS |
-F:SLAY_DEMON | SLAY_EVIL | SLAY_TROLL | SLAY_UNDEAD | SLOW_DIGEST |
-F:SPECIAL_GENE | SUST_CHR | SUST_CON | SUST_DEX | SUST_INT | SUST_STR |
-F:SUST_WIS | ULTIMATE | VORPAL
-a:HARDCORE=ERU
+F:ACTIVATE
+F:BLESSED
+F:BRAND_COLD
+F:BRAND_ELEC
+F:BRAND_FIRE
+F:CHR
+F:CON
+F:FREE_ACT
+F:IM_COLD
+F:LIFE
+F:LITE1
+F:LUCK
+F:NO_MAGIC
+F:PRECOGNITION
+F:REGEN
+F:RES_DARK
+F:RES_FIRE
+F:SEE_INVIS
+F:SHOW_MODS
+F:SLAY_DEMON
+F:SLAY_EVIL
+F:SLAY_TROLL
+F:SLAY_UNDEAD
+F:SLOW_DIGEST
+F:SPECIAL_GENE
+F:SUST_CHR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_INT
+F:SUST_STR
+F:SUST_WIS
+F:ULTIMATE
+F:VORPAL
+a:ERU
 D:A shining rapier used by Vaire to cut the strings of time when 
 D:dire need arises. Its power with that of the Flame Imperishable 
 D:will let you destroy Melkor forever. 
@@ -3279,12 +5292,38 @@ N:245:of Irmo
 I:19:13:5
 W:127:220:130:8000000
 P:0:0d0:36:28:0
-F:CON | DEX | ESP_EVIL | ESP_ORC | ESP_TROLL | FLY | FREE_ACT |
-F:IM_ELEC | INFRA | INVIS | LUCK | NO_MAGIC | PRECOGNITION |
-F:REFLECT | RES_BLIND | RES_CHAOS | RES_CONF | RES_DISEN |
-F:SEE_INVIS | SLOW_DIGEST | SPECIAL_GENE | SPEED | STEALTH |
-F:SUST_CHR | SUST_CON | SUST_DEX | SUST_INT | SUST_STR |
-F:SUST_WIS | ULTIMATE | XTRA_MIGHT | XTRA_SHOTS
+F:CON
+F:DEX
+F:ESP_EVIL
+F:ESP_ORC
+F:ESP_TROLL
+F:FLY
+F:FREE_ACT
+F:IM_ELEC
+F:INFRA
+F:INVIS
+F:LUCK
+F:NO_MAGIC
+F:PRECOGNITION
+F:REFLECT
+F:RES_BLIND
+F:RES_CHAOS
+F:RES_CONF
+F:RES_DISEN
+F:SEE_INVIS
+F:SLOW_DIGEST
+F:SPECIAL_GENE
+F:SPEED
+F:STEALTH
+F:SUST_CHR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_INT
+F:SUST_STR
+F:SUST_WIS
+F:ULTIMATE
+F:XTRA_MIGHT
+F:XTRA_SHOTS
 D:A gift from Orome to Irmo, a mighty bow that sings the songs of the 
 D:garden of Lorien. It will guide your hand and steady your grip in 
 D:your encounter with Melkor. 
@@ -3295,12 +5334,38 @@ N:246:of Nessa
 I:19:2:5
 W:127:220:130:8000000
 P:0:0d0:36:28:0
-F:CON | DEX | ESP_EVIL | ESP_ORC | ESP_TROLL | FLY | FREE_ACT |
-F:IM_ELEC | INFRA | INVIS | LUCK | NO_MAGIC | PRECOGNITION |
-F:REFLECT | RES_BLIND | RES_CHAOS | RES_CONF | RES_DISEN |
-F:SEE_INVIS | SLOW_DIGEST | SPECIAL_GENE | SPEED | STEALTH |
-F:SUST_CHR | SUST_CON | SUST_DEX | SUST_INT | SUST_STR | SUST_WIS |
-F:ULTIMATE | XTRA_MIGHT | XTRA_SHOTS
+F:CON
+F:DEX
+F:ESP_EVIL
+F:ESP_ORC
+F:ESP_TROLL
+F:FLY
+F:FREE_ACT
+F:IM_ELEC
+F:INFRA
+F:INVIS
+F:LUCK
+F:NO_MAGIC
+F:PRECOGNITION
+F:REFLECT
+F:RES_BLIND
+F:RES_CHAOS
+F:RES_CONF
+F:RES_DISEN
+F:SEE_INVIS
+F:SLOW_DIGEST
+F:SPECIAL_GENE
+F:SPEED
+F:STEALTH
+F:SUST_CHR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_INT
+F:SUST_STR
+F:SUST_WIS
+F:ULTIMATE
+F:XTRA_MIGHT
+F:XTRA_SHOTS
 D:This sling was made for the most lithe of the Valier to provide 
 D:her with amusement as she used it to shoot magical pebbles of 
 D:cheer and charm while dancing in the lush green fields of Valinor. 
@@ -3312,12 +5377,38 @@ N:247:of Varda
 I:15:4:5
 W:127:220:130:8000000
 P:0:0d0:36:28:0
-F:CON | DEX | ESP_EVIL | ESP_ORC | ESP_TROLL | FLY | FREE_ACT |
-F:IM_ELEC | INFRA | INVIS | LUCK | NO_MAGIC | PRECOGNITION |
-F:REFLECT | RES_BLIND | RES_CHAOS | RES_CONF | RES_DISEN |
-F:SEE_INVIS | SLOW_DIGEST | SPECIAL_GENE | SPEED | STEALTH |
-F:SUST_CHR | SUST_CON | SUST_DEX | SUST_INT | SUST_STR | SUST_WIS |
-F:ULTIMATE | XTRA_MIGHT | XTRA_SHOTS
+F:CON
+F:DEX
+F:ESP_EVIL
+F:ESP_ORC
+F:ESP_TROLL
+F:FLY
+F:FREE_ACT
+F:IM_ELEC
+F:INFRA
+F:INVIS
+F:LUCK
+F:NO_MAGIC
+F:PRECOGNITION
+F:REFLECT
+F:RES_BLIND
+F:RES_CHAOS
+F:RES_CONF
+F:RES_DISEN
+F:SEE_INVIS
+F:SLOW_DIGEST
+F:SPECIAL_GENE
+F:SPEED
+F:STEALTH
+F:SUST_CHR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_INT
+F:SUST_STR
+F:SUST_WIS
+F:ULTIMATE
+F:XTRA_MIGHT
+F:XTRA_SHOTS
 D:Made from living starlight, this boomerang will dispel the darkest 
 D:of darkness. It is a gift from Varda Elentari, to aid you in your 
 D:task. 
@@ -3328,12 +5419,34 @@ N:248:of Mandos
 I:40:27:0
 W:100:16:60:500000
 P:0:2d4:0:0:85
-F:ACTIVATE | ESP_DRAGON | FEATHER | FLY | HOLD_LIFE | IGNORE_ACID |
-F:IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE | REGEN | RES_ACID |
-F:RES_BLIND | RES_CHAOS | RES_COLD | RES_CONF | RES_DARK | RES_DISEN |
-F:RES_ELEC | RES_FIRE | RES_LITE | RES_NETHER | RES_NEXUS | RES_POIS |
-F:RES_SHARDS | RES_SOUND | SPECIAL_GENE | ULTIMATE
-a:HARDCORE=BLADETURNER
+F:ACTIVATE
+F:ESP_DRAGON
+F:FEATHER
+F:FLY
+F:HOLD_LIFE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:REGEN
+F:RES_ACID
+F:RES_BLIND
+F:RES_CHAOS
+F:RES_COLD
+F:RES_CONF
+F:RES_DARK
+F:RES_DISEN
+F:RES_ELEC
+F:RES_FIRE
+F:RES_LITE
+F:RES_NETHER
+F:RES_NEXUS
+F:RES_POIS
+F:RES_SHARDS
+F:RES_SOUND
+F:SPECIAL_GENE
+F:ULTIMATE
+a:BLADETURNER
 D:This amulet contains the power of Mandos, the Doomsman of the 
 D:Valar. It will grant you protection against the foul dark magic 
 D:of Melkor, though you will still need your wits and strength 
diff --git a/lib/mods/theme/edit/ab_info.txt b/lib/mods/theme/edit/ab_info.txt
index 4272776a..579368f4 100644
--- a/lib/mods/theme/edit/ab_info.txt
+++ b/lib/mods/theme/edit/ab_info.txt
@@ -20,25 +20,17 @@
 # S:level(linear mode):stats
 # a:needed ability
 
-# E:excluding ability:excluding ability
-
-# If you need more sophisticated prereqs use the HOOK_LEARN_ABILITY
-
-# Version stamp (required)
-
 # Do not forget to update misc.txt with an entry like the following :
 # Maximum number of traits in ab_info.txt
 # M:b:50
 
-V:2.2.0
-
 N:0:Spread blows
 D:If a monster dies to your attack but you still have blows left
 D:you won't lose the full turn, allowing you to attack some other
 D:monster in the same turn
-D:Prereq: Weaponmastery skill@30, Dex@17
+D:Prereq: Combat@30, Dex@17
 I:5
-k:30:Weaponmastery
+k:30:Combat
 S:17:DEX
 
 N:1:Tree walking
@@ -92,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/mods/theme/edit/al_info.txt b/lib/mods/theme/edit/al_info.txt
deleted file mode 100644
index c5e7c55d..00000000
--- a/lib/mods/theme/edit/al_info.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-# File: al_info.txt
-
-
-# This file is used to initialize the "lib/raw/al_info.raw" file, which is
-# used as the alchemist recipes in ToME
-
-# This file is intentionally blank in Theme
-# because the Alchemist class has been removed.
-
-# Version stamp (required)
-
-V:2.0.0
\ No newline at end of file
diff --git a/lib/mods/theme/edit/ba_info.txt b/lib/mods/theme/edit/ba_info.txt
index b76f79dd..c8c7f9c5 100644
--- a/lib/mods/theme/edit/ba_info.txt
+++ b/lib/mods/theme/edit/ba_info.txt
@@ -17,10 +17,6 @@
 # 1 = Restrict to normal & liked
 # 2 = Restrict to liked
 
-# Version stamp (required)
-
-V:2.0.0
-
 N:0:Nothing
 C:0:0:0
 I:0:0:.
@@ -65,10 +61,6 @@ N:10:Play craps
 C:0:0:0
 I:14:0:c
 
-N:11:Spin the wheel
-C:0:0:0
-I:15:0:s
-
 N:12:Play dice slots
 C:0:0:0
 I:16:0:d
@@ -93,18 +85,6 @@ N:17:Look at busts of Kings
 C:0:0:0
 I:5:0:l
 
-N:18:Research monster
-C:1600:1500:1400
-I:20:0:r
-
-N:19:View bounties
-C:0:0:0
-I:38:0:v
-
-N:20:Receive bounty money
-C:0:0:0
-I:39:0:b
-
 N:21:Get quest monster
 C:0:0:0
 I:54:0:q
@@ -165,19 +145,6 @@ N:35:Get a quest
 C:0:0:0
 I:6:0:q
 
-# Restrict to liked/normal
-N:36:Get a quest
-C:0:0:0
-I:46:1:q
-
-N:37:Get a quest
-C:0:0:0
-I:47:0:q
-
-N:38:Get a quest
-C:0:0:0
-I:49:0:q
-
 N:39:Herbal Healing
 C:32000:10000:0
 I:50:0:h
@@ -190,10 +157,6 @@ N:41:Distribute earnings
 C:0:0:0
 I:7:2:d
 
-N:42:Morph restoration
-C:3000:1500:750
-I:37:0:r
-
 #for The Mirror
 N:43:View fate
 C:500:500:500
@@ -204,11 +167,6 @@ N:44:Research item
 C:1500:1500:1500
 I:1:0:a
 
-#for library in gondol
-N:45:Research item
-C:2000:2000:2000
-I:1:0:a
-
 #for Star-Dome
 N:46:Identify possessions
 C:1200:1000:250
@@ -257,18 +215,6 @@ N:55:Get an item
 C:0:0:0
 I:44:0:g:p
 
-N:56:Request an item
-C:0:0:0
-I:51:2:r
-
-N:57:Ask for loan
-C:0:0:0
-I:52:2:a
-
-N:58:Pay back loan
-C:0:0:0
-I:53:2:p
-
 N:59:Donate an item
 C:0:0:0
 I:43:0:d
@@ -307,4 +253,4 @@ I:18:2:f
 # Ask Bard for directions to Erebor
 N:66:Ask about Erebor
 C:0:0:0
-I:66:0:a
\ No newline at end of file
+I:66:0:a
diff --git a/lib/mods/theme/edit/between.map b/lib/mods/theme/edit/between.map
index 4fed5c95..375d1ef2 100644
--- a/lib/mods/theme/edit/between.map
+++ b/lib/mods/theme/edit/between.map
@@ -23,16 +23,16 @@ F:G:89:5:955
 F:L:89:5:956
 
 # Floor with grass with a brown thunderlord
-F:B:89:5:957:0:0:0:0:0:0:2
+F:B:89:5:957:0:0:0:0:0:2
 
 # Floor with grass with a bronze thunderlord
-F:z:89:5:958:0:0:0:0:0:0:2
+F:z:89:5:958:0:0:0:0:0:2
 
 # Floor with dirt with a bronze thunderlord
-F:Z:88:5:958:0:0:0:0:0:0:2
+F:Z:88:5:958:0:0:0:0:0:2
 
 # Floor with grass with a gold thunderlord
-F:D:88:5:959:0:0:0:0:0:0:2
+F:D:88:5:959:0:0:0:0:0:2
 
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 D:X..T.TT..T...T...T...T.....T....T......T...T.,,.....T......T....T...T.T..T..TT...T..T.TT.T.TT.TX
diff --git a/lib/mods/theme/edit/d_info.txt b/lib/mods/theme/edit/d_info.txt
index 91cf3d20..0f8680af 100644
--- a/lib/mods/theme/edit/d_info.txt
+++ b/lib/mods/theme/edit/d_info.txt
@@ -12,7 +12,7 @@
 
 # N:<index>:<name>
 # D:<3 letter short name>:<long name>
-# W:<min depth>:<max depth>:<min player level>:<next dungeon>:<min alloc>:<max alloc chance>
+# W:<min depth>:<max depth>:<min player level>:<min alloc>:<max alloc chance>
 # L:<floor1>:<%1>:<floor2>:<%2>:<floor3>:<%3>
 # A:<wall1>:<%1>:<wall2>:<%2>:<wall3>:<%3>:<outer wall>:<inner wall>
 # O:<%treasure>:<%combat>:<%magic>:<%tools>
@@ -29,66 +29,77 @@
 # 3 = OR
 # 4 = NOR
 
-# Version stamp (required)
-
-V:2.0.0
-
 ### Wilderness(purely cosmetic, never used) ###
 
 N:0:Wilderness
 D:Wil:a way to the Wilderness
-W:0:0:0:0:14:500
+W:0:0:0:14:500
 L:89:80:199:20:1:0
 A:96:100:56:0:56:0:57:58
 O:20:20:20:20
-F:PRINCIPAL | FLAT | NO_RECALL
+F:FLAT
+F:NO_RECALL
+F:PRINCIPAL
 R:100:0
 
 ### The principal dungeons, they were created by spliting the vanilla dungeon ###
 
 N:1:Mirkwood
 D:Mkw:a way to the Mirkwood Forest.
-W:11:33:5:0:14:160
+W:11:33:5:14:160
 L:89:95:199:5:88:0
 A:96:100:97:0:56:0:202:96
 O:20:20:20:20
-F:PRINCIPAL | NO_DOORS | NO_DESTROY | FLAT
 F:FILL_METHOD_0
+F:FLAT
+F:NO_DESTROY
+F:NO_DOORS
+F:PRINCIPAL
 R:100:0
 
 N:2:Barad-Dur
 D:BDr:a door to the tower of Barad-Dur.
-W:34:66:15:0:14:160
+W:34:66:15:14:160
 L:88:67:93:33:1:0
 L:0:100:0
 A:97:50:56:50:56:0:57:97
 A:0:100:0
 O:20:20:20:20
-F:PRINCIPAL | LAVA_RIVER | CAVERN | NO_STREAMERS
-F:FILL_METHOD_2 | NO_RECALL
+F:CAVERN
+F:FILL_METHOD_2
+F:LAVA_RIVER
+F:NO_RECALL
+F:NO_STREAMERS
+F:PRINCIPAL
 R:100:0
 
 N:3:Angband
 D:Ang:an entrance to the Pits of Angband.
-W:67:100:30:0:14:160
+W:67:100:30:14:160
 L:1:100:1:0:1:0
 A:56:100:56:0:56:0:57:58
 O:20:20:20:20
-F:PRINCIPAL | CAVERN | NO_EASY_MOVE | NO_RECALL
-F:ADJUST_LEVEL_1_2 | ADJUST_LEVEL_1
+F:ADJUST_LEVEL_1
+F:ADJUST_LEVEL_1_2
+F:CAVERN
 F:FILL_METHOD_0
+F:NO_EASY_MOVE
+F:NO_RECALL
+F:PRINCIPAL
 R:100:0
 
 N:4:Barrow-Downs
 D:BDw:a way to the Barrow-Downs.
-W:1:10:1:0:14:160
+W:1:10:1:14:160
 # Theme adds *fog* (dense mist) on the Barrow-Downs :)
-L:88:94:210:2:199:4
+#L:88:94:210:2:199:4
+L:88:78:89:18:199:4
 A:96:80:97:19:57:1:57:97
 A:100:0:0
 O:20:20:20:20
-F:PRINCIPAL | FLAT
 F:FILL_METHOD_3
+F:FLAT
+F:PRINCIPAL
 R:25:1
 M:UNDEAD
 R:75:0
@@ -99,13 +110,17 @@ R:75:0
 # Levels 85-99
 N:5:Orodruin
 D:MDm:a way to the top of the Mount Doom.
-W:85:99:18:0:14:160
+W:85:99:18:14:160
 L:86:90:205:10:1:0
 A:177:100:0:0:0:0:85:87
 O:10:10:30:30
 E:2d10:10:FIRE
-F:CAVE | LAVA_RIVER | NO_RECALL | NO_STREAMERS
-F:FILL_METHOD_0 | NO_EASY_MOVE
+F:CAVE
+F:FILL_METHOD_0
+F:LAVA_RIVER
+F:NO_EASY_MOVE
+F:NO_RECALL
+F:NO_STREAMERS
 R:100:1
 M:IM_FIRE
 
@@ -114,47 +129,65 @@ M:IM_FIRE
 # guarded by Tik'srvzllat, who has the Ring 'Fuin'
 N:6:Nether Realm
 D:Nth:a magical portal to the Nether Realm.
-W:666:696:40:0:14:160
+W:666:696:40:14:160
 L:102:80:86:15:85:5
 A:85:80:87:20:87:0:57:85
 A:50:50:0
 O:25:25:25:25
 E:10d10:3:NETHER
-F:EMPTY | FORGET | NO_BREATH | NO_EASY_MOVE | NO_SHAFT
-F:ADJUST_LEVEL_2 | NO_RECALL | NO_STREAMERS
-F:LAVA_RIVER | FINAL_GUARDIAN_1032 | FINAL_ARTIFACT_203
-F:FILL_METHOD_2 | NO_RECALL_OUT
+F:ADJUST_LEVEL_2
+F:EMPTY
+F:FILL_METHOD_2
+F:FINAL_ARTIFACT_203
+F:FINAL_GUARDIAN_1032
+F:FORGET
+F:LAVA_RIVER
+F:NO_BREATH
+F:NO_EASY_MOVE
+F:NO_RECALL
+F:NO_RECALL_OUT
+F:NO_SHAFT
+F:NO_STREAMERS
 R:5:0
 R:95:3
-M:RES_NETH | R_CHAR_G | R_CHAR_W | R_CHAR_U
+M:RES_NETH
+M:R_CHAR_G
+M:R_CHAR_U
+M:R_CHAR_W
 
 # The Lost Land of Numenor
 # levels 35-50
 # guarded by Ar-Pharazon the Golden, who has the stone "Coimir".
 N:7:Submerged Ruins
 D:Num:a submerged way to the lost land of Numenor.
-W:35:50:25:0:14:160
+W:35:50:25:14:160
 L:84:95:187:5:1:0
 A:187:80:84:10:56:10:57:187
 A:60:0:40
 O:30:30:10:10
 E:1d1:1:ACID
+F:FILL_METHOD_3
+F:FINAL_ARTIFACT_204
+F:FINAL_GUARDIAN_980
 F:NO_STREAMERS
-F:FINAL_GUARDIAN_980 | FINAL_ARTIFACT_204
-F:FILL_METHOD_3 | WATER_BREATH
+F:WATER_BREATH
 R:20:0
 R:80:3
-M:AQUATIC | CAN_SWIM | CAN_FLY
+M:AQUATIC
+M:CAN_FLY
+M:CAN_SWIM
 
 # Used for astral mode
 N:8:Halls of Waiting
 D:HWa:*A BUG*YOU should see this message!*
-W:1:98:1:0:14:160
+W:1:98:1:14:160
 L:1:100:1:0:1:0
 O:20:20:20:20
 A:56:100:56:0:56:0:57:58
-F:RANDOM_TOWNS | NO_RECALL | NO_SHAFT
 F:FILL_METHOD_0
+F:NO_RECALL
+F:NO_SHAFT
+F:RANDOM_TOWNS
 R:100:2
 M:UNIQUE
 
@@ -164,37 +197,51 @@ M:UNIQUE
 # Updated for Theme to lead out into Gorgoroth a la Moria
 N:9:Cirith Ungol
 D:CUg:an entrance to Cirith Ungol.
-W:25:50:10:0:14:160
+W:25:50:10:14:160
 L:87:5:88:65:16:30
 A:97:90:16:10:56:0:16:58
 O:30:30:30:10
 E:4d4:20:POISON
-F:FINAL_GUARDIAN_481
-F:RANDOM_TOWNS | CIRCULAR_ROOMS
+F:CIRCULAR_ROOMS
 F:FILL_METHOD_2
+F:FINAL_GUARDIAN_481
 F:FORCE_DOWN
+F:RANDOM_TOWNS
 F:WILD_65_56__67_53
 R:2:0
 R:49:3
-M:SPIDER | R_CHAR_a | R_CHAR_I | 
+M:R_CHAR_I
+M:R_CHAR_a
+M:SPIDER
 R:49:3
-M:ORC | R_CHAR_w | R_CHAR_m | R_CHAR_j
+M:ORC
+M:R_CHAR_j
+M:R_CHAR_m
+M:R_CHAR_w
 
 # The Heart of the Earth
 # levels 25-36
 # guarded by Golgarach, the Living Rock
 N:10:Heart of the Earth
 D:HoE:a passage leading into the very heart of the world.
-W:25:36:10:0:14:160
+W:25:36:10:14:160
 L:1:100:1:0:1:0
 A:56:100:56:0:56:0:57:58
 O:40:10:10:20
 G:life
-F:EVOLVE | FINAL_GUARDIAN_1035 | NO_RECALL | NO_SHAFT
+F:EVOLVE
+F:FINAL_GUARDIAN_1035
+F:NO_RECALL
+F:NO_SHAFT
 R:40:3
-M:R_CHAR_# | R_CHAR_X | R_CHAR_g | R_CHAR_E | 
+M:R_CHAR_#
+M:R_CHAR_E
+M:R_CHAR_X
+M:R_CHAR_g
 R:30:3
-M:PASS_WALL | KILL_WALL | HURT_ROCK
+M:HURT_ROCK
+M:KILL_WALL
+M:PASS_WALL
 R:30:0
 
 # The Void
@@ -202,30 +249,43 @@ R:30:0
 # Where Melkor lurks for the final battle!
 N:11:The Void
 D:Vod:a jumpgate to the Void
-W:128:150:40:0:20:160
+W:128:150:40:20:160
 L:183:97:102:3:0:0
 A:183:90:102:10:0:0:102:102
 A:40:60:0
 O:25:25:25:25
 E:20d6:100:DARK
-F:EMPTY | FORGET | NO_BREATH | NO_EASY_MOVE | NO_RECALL_OUT | NO_RECALL |
-F:ADJUST_LEVEL_1_2 | ADJUST_LEVEL_1 | NO_STREAMERS | NO_SHAFT
+F:ADJUST_LEVEL_1
+F:ADJUST_LEVEL_1_2
+F:EMPTY
 F:FILL_METHOD_2
-F:FINAL_GUARDIAN_1044 |
+F:FINAL_GUARDIAN_1044
+F:FORGET
+F:NO_BREATH
+F:NO_EASY_MOVE
+F:NO_RECALL
+F:NO_RECALL_OUT
+F:NO_SHAFT
+F:NO_STREAMERS
 R:1:0
 R:99:3
-M:UNDEAD | DEMON | DRAGON | NONLIVING | SPIRIT
+M:DEMON
+M:DRAGON
+M:NONLIVING
+M:SPIRIT
+M:UNDEAD
 
 # TEST dungeon
 N:12:Test
 D:Tst:a way to test dungeon gen
-W:1:10:1:0:14:160
+W:1:10:1:14:160
 L:88:78:89:18:199:4
 L:0:95:5
 A:177:100:0:0:0:0:85:87
 A:100:0:0
 O:20:20:20:20
-F:FILL_METHOD_3 | SMALL
+F:FILL_METHOD_3
+F:SMALL
 R:100:0
 G:dungeon2
 
@@ -235,50 +295,70 @@ G:dungeon2
 # Feagwath is there, guarding Doomcaller
 N:16:Paths of the Dead
 D:PoD:the entrance to the Paths of the Dead.
-W:40:70:18:0:24:100
+W:40:70:18:24:100
 L:88:85:84:15:1:0
 A:56:75:87:25:56:0:57:58
 O:30:30:30:2
 E:1d1:20:RAISE
-F:FINAL_GUARDIAN_804 | FINAL_ARTIFACT_91
 F:FILL_METHOD_3
+F:FINAL_ARTIFACT_91
+F:FINAL_GUARDIAN_804
 R:5:0
 R:10:3
 M:R_CHAR_p
 R:85:3
-M:UNDEAD | NONLIVING
+M:NONLIVING
+M:UNDEAD
 
 # The Illusory Castle
 # levels 35-52
 # Guarded by The Glass Golem guarding The Helm of Knowledge
 N:17:Illusory Castle
 D:Ill:an entrance to the Illusory Castle.
-W:35:52:10:0:24:100
+W:35:52:10:24:100
 L:1:98:188:2:1:0
 A:56:50:189:50:56:0:57:58
 O:50:10:20:20
 E:6d2:6:CONFUSION
-F:RANDOM_TOWNS | NO_STREAMERS
-F:FINAL_GUARDIAN_1033 | FINAL_ARTIFACT_160
 F:FILL_METHOD_1
+F:FINAL_ARTIFACT_160
+F:FINAL_GUARDIAN_1033
+F:NO_STREAMERS
+F:RANDOM_TOWNS
 R:30:0
 R:70:3
-M:STUPID | WEIRD_MIND | SHAPECHANGER | ATTR_MULTI | CHAR_MULTI | RAND_25 |
-M:RAND_50 | EMPTY_MIND | INVISIBLE | PASS_WALL | KILL_WALL
-S:BR_CONF | BR_CHAO | BA_CHAO | CONF | FORGET | TRAPS | MULTIPLY
+M:ATTR_MULTI
+M:CHAR_MULTI
+M:EMPTY_MIND
+M:INVISIBLE
+M:KILL_WALL
+M:PASS_WALL
+M:RAND_25
+M:RAND_50
+M:SHAPECHANGER
+M:STUPID
+M:WEIRD_MIND
+S:BA_CHAO
+S:BR_CHAO
+S:BR_CONF
+S:CONF
+S:FORGET
+S:MULTIPLY
 
 # The Maze
 # Levels 25-37
 # Guarded by The Minotaur of the Labyrinth with the Steel Helm of Hammerhand
 N:18:Maze
 D:Maz:a small tunnel leading to a maze of twisty little passages, all alike.
-W:25:37:15:0:20:160
+W:25:37:15:20:160
 L:1:100:1:0:1:0
 A:56:98:48:2:56:0:57:58
 O:2:40:10:40
 G:maze
-F:SMALLEST | FORGET
-F:FINAL_GUARDIAN_1029 | FINAL_ARTIFACT_38
+F:FINAL_ARTIFACT_38
+F:FINAL_GUARDIAN_1029
+F:FORGET
+F:SMALLEST
 R:80:0
 R:20:3
 M:R_CHAR_p
@@ -288,76 +368,98 @@ M:R_CHAR_p
 # There is Azog with the Wand of Thrain at the bottom
 N:19:Orc Cave
 D:Orc:a dark tunnel leading to an Orc Cave.
-W:10:22:8:0:35:200
+W:10:22:8:35:200
 L:88:100:1:0:1:0
 A:97:100:56:0:56:0:57:97
 O:5:50:10:25
-F:RANDOM_TOWNS | 
-F:FINAL_OBJECT_810 | FINAL_GUARDIAN_373 | CAVE |
+F:CAVE
 F:FILL_METHOD_0
+F:FINAL_GUARDIAN_373
+F:FINAL_OBJECT_810
 F:FORCE_DOWN
+F:RANDOM_TOWNS
 F:WILD_49_21__51_19
 R:30:3
 M:TROLL
 R:20:0
 R:50:3
-M:ORC | R_CHAR_o | R_CHAR_O
+M:ORC
+M:R_CHAR_O
+M:R_CHAR_o
 
 # Erebor
 # levels 60-72
 # There is Glaurung
 N:20:Erebor
 D:Ere:a tunnel leading into depths of the Lonely Mountain.
-W:60:72:35:0:20:140
+W:60:72:30:20:140
 L:88:100:1:0:1:0
 A:97:90:87:10:56:0:57:97
 O:40:40:40:40
-F:BIG | LAVA_RIVER | CAVERN | NO_RECALL | NO_STREAMERS
-F:CAVE | DOUBLE | FINAL_GUARDIAN_715 | 
+F:BIG
+F:CAVE
+F:CAVERN
+F:DOUBLE
 F:FILL_METHOD_2
+F:FINAL_GUARDIAN_715
+F:LAVA_RIVER
+F:NO_RECALL
+F:NO_STREAMERS
 R:10:0
 R:60:1
-M:DRAGON | R_CHAR_D
+M:DRAGON
+M:R_CHAR_D
 R:30:1
-M:DRAGON | R_CHAR_d
+M:DRAGON
+M:R_CHAR_d
 
 # The Old Forest
 # levels 13-25
 # Old Man Willow protects it
 N:21:The Old Forest
 D:OFr:a path into the Old Forest.
-W:13:25:5:0:15:100
+W:13:25:5:15:100
 L:88:76:84:16:199:8
 L:68:16:16
 A:96:100:56:0:56:0:202:96
 O:20:5:15:30
-F:WATER_RIVERS | NO_DOORS | NO_DESTROY | FLAT | NO_STREAMERS
-F:RANDOM_TOWNS | FINAL_GUARDIAN_206
 F:FILL_METHOD_3
+F:FINAL_GUARDIAN_206
+F:FLAT
+F:NO_DESTROY
+F:NO_DOORS
+F:NO_STREAMERS
+F:RANDOM_TOWNS
+F:WATER_RIVERS
 R:30:0
 R:40:3
-M:ANIMAL 
+M:ANIMAL
 R:30:3
-M:UNDEAD | R_CHAR_h | R_CHAR_l
+M:R_CHAR_h
+M:R_CHAR_l
+M:UNDEAD
 
 # The Mines of Moria
 # levels 30-50
 # There is Durin's Bane
 N:22:Moria
 D:MoM:a stone door leading to the Mines of Moria.
-W:30:50:20:0:40:40
+W:30:50:20:40:40
 L:88:100:1:0:1:0
 A:97:100:56:0:56:0:57:97
 O:30:50:10:5
-F:FINAL_GUARDIAN_872 | WATER_RIVER | NO_STREAMERS
+F:FILL_METHOD_0
+F:FINAL_GUARDIAN_872
 F:FORCE_DOWN
+F:NO_STREAMERS
 F:RANDOM_TOWNS
+F:WATER_RIVER
 F:WILD_45_30__44_37
-F:FILL_METHOD_0
 R:40:3
 M:ORC
 R:30:3
-M:TROLL | GIANT
+M:GIANT
+M:TROLL
 R:20:3
 M:DEMON
 R:10:0
@@ -367,20 +469,25 @@ R:10:0
 # The Necromancer (weak Sauron) at the bottom, with the Ring of Durin
 N:23:Dol Guldur
 D:TDG:a gate leading to the tower of Dol Guldur.
-W:57:70:34:0:24:160
+W:57:70:34:24:160
 L:1:80:174:20:1:0
 A:56:100:56:0:56:0:57:58
 O:20:1:70:9
-F:SMALL | FINAL_GUARDIAN_819 | FINAL_ARTIFACT_205
 F:FILL_METHOD_3
+F:FINAL_ARTIFACT_205
+F:FINAL_GUARDIAN_819
+F:SMALL
 R:30:3
-M:R_CHAR_p | R_CHAR_P
+M:R_CHAR_P
+M:R_CHAR_p
 R:10:3
-M:ORC | TROLL
+M:ORC
+M:TROLL
 R:20:3
 M:UNDEAD
 R:30:3
-M:DEMON | DRAGON
+M:DEMON
+M:DRAGON
 R:10:0
 
 # Dungeons from Variaz
@@ -390,13 +497,14 @@ R:10:0
 # The Watcher in the Water is at the bottom
 N:24:The Small Water Cave
 D:SWC:the entrance to a small water cave.
-W:32:34:20:0:14:160
+W:32:34:20:14:160
 L:84:100:84:0:84:0
 A:97:100:56:0:56:0:57:58
 O:10:10:30:30
 E:1d1:20:ACID
-F:FINAL_GUARDIAN_517 | NO_RECALL
 F:FILL_METHOD_0
+F:FINAL_GUARDIAN_517
+F:NO_RECALL
 R:10:0
 R:10:3
 M:AQUATIC
@@ -412,13 +520,16 @@ M:IM_COLD
 # Levels 45-70
 N:25:The Sacred Land Of Mountains
 D:LoM:the way to the Sacred Land of Mountains.
-W:45:70:20:0:14:160
+W:45:70:20:14:160
 L:89:100:89:0:89:0
 A:97:100:56:0:56:0:97:97
 O:20:20:20:20
-F:RANDOM_TOWNS | FLAT | NO_STREAMERS
-F:FINAL_GUARDIAN_789 | FINAL_ARTIFACT_228
 F:FILL_METHOD_0
+F:FINAL_ARTIFACT_193
+F:FINAL_GUARDIAN_789
+F:FLAT
+F:NO_STREAMERS
+F:RANDOM_TOWNS
 R:60:3
 M:CAN_FLY
 R:40:0
@@ -428,14 +539,19 @@ R:40:0
 # Guarded by Ulfang the Black, Morgoth's first Easterling follower.
 N:26:The Land Of Rhun
 D:LoR:a way to the Land of Rhun.
-W:26:40:15:0:14:160
+W:26:40:15:14:160
 L:89:100:1:0:1:0
 A:89:50:96:25:84:25:57:58
 O:20:20:20:20
-F:RANDOM_TOWNS | FLAT | NO_STREAMERS | FINAL_GUARDIAN_990
 F:FILL_METHOD_1
+F:FINAL_GUARDIAN_990
+F:FLAT
+F:NO_STREAMERS
+F:RANDOM_TOWNS
 R:30:3
-M:R_CHAR_p | R_CHAR_h | R_CHAR_l 
+M:R_CHAR_h
+M:R_CHAR_l
+M:R_CHAR_p
 R:30:3
 M:ANIMAL
 R:40:0
@@ -445,13 +561,15 @@ R:40:0
 # guarded by the Sandworm Queen (and her children), who will drop her armour
 N:27:The Withered Heath
 D:SwL:the Withered Heath, from whence came the Great Worms.
-W:22:30:12:0:5:200
+W:22:30:12:5:200
 L:91:85:94:10:93:5
 A:98:100:96:0:84:0:94:94
 O:15:5:60:20
-F:NO_DOORS | SAND_VEIN |
-F:FINAL_GUARDIAN_1030 | FINAL_ARTIFACT_153
 F:FILL_METHOD_0
+F:FINAL_ARTIFACT_153
+F:FINAL_GUARDIAN_1030
+F:NO_DOORS
+F:SAND_VEIN
 R:100:1
 M:R_CHAR_w
 R:10:3
@@ -460,12 +578,15 @@ S:MULTIPLY
 # Used by the death fate
 N:28:Death fate
 D:Dth:a fated death.
-W:1:1:1:0:30:255
+W:1:1:1:30:255
 L:1:100:1:0:1:0
 A:1:100:1:0:1:0:1:1
 O:1:1:1:1
-F:EMPTY | SMALLEST | NO_RECALL | NO_STREAMERS
+F:EMPTY
 F:FILL_METHOD_0
+F:NO_RECALL
+F:NO_STREAMERS
+F:SMALLEST
 R:100:0
 
 # The Grinding Ice
@@ -473,16 +594,19 @@ R:100:0
 # Guarded by Elenwe the Lost
 N:29:The Helcaraxe
 D:Ice:the entrance to the Grinding Ice of the Helcaraxe.
-W:20:40:10:0:14:160
+W:20:40:10:14:160
 L:90:0:88:70:84:30
 L:90:0:10
 A:95:0:56:100:56:0:57:58
 A:100:0:0
 O:20:20:20:20
 E:1d4:15:COLD
-F:DOUBLE | WATER_RIVER | CAVERN | NO_STREAMERS
-F:FINAL_GUARDIAN_1034 | 
+F:CAVERN
+F:DOUBLE
 F:FILL_METHOD_2
+F:FINAL_GUARDIAN_1034
+F:NO_STREAMERS
+F:WATER_RIVER
 R:100:1
 M:IM_COLD
 
@@ -492,11 +616,12 @@ M:IM_COLD
 # See god.lua for details
 N:30:a Lost Temple
 D:LTm:the entrance to a lost temple.
-W:1:50:1:0:14:160
+W:1:50:1:14:160
 L:1:100:1:0:1:0
 A:56:100:56:0:56:0:57:58
 O:20:20:20:20
-F:FILL_METHOD_4 | NO_RECALL
+F:FILL_METHOD_4
+F:NO_RECALL
 R:100:0
 
 ### New dungeons added for Theme module ###
@@ -507,7 +632,7 @@ R:100:0
 # Guarded by The Hunter
 N:31:Forodwaith
 D:NWa:a path leading through the wastelands of the North
-W:75:80:40:0:14:160
+W:75:80:40:14:160
 # ice, ash, and dirt
 L:90:20:93:40:88:40
 #Ugly - using floor tiles for walls, only rooms have real walls
@@ -515,58 +640,84 @@ A:90:20:93:40:88:40:88:211
 O:20:20:20:20
 # it is always dark here in the northern wastelands
 E:2d4:1:DARK
-F:NO_DOORS | CAVERN | COLD | NO_DESTROY | EMPTY | FLAT | 
-F:NO_RECALL | LIFE_LEVEL | NO_STREAMERS | NO_SHAFT | 
-F:FINAL_GUARDIAN_389 | 
+F:CAVERN
+F:COLD
+F:EMPTY
 F:FILL_METHOD_4
+F:FINAL_GUARDIAN_389
+F:FLAT
+F:LIFE_LEVEL
+F:NO_DESTROY
+F:NO_DOORS
+F:NO_RECALL
+F:NO_SHAFT
+F:NO_STREAMERS
 R:100:3
-M:COLD_BLOOD | HURT_LITE | IM_COLD
+M:COLD_BLOOD
+M:HURT_LITE
+M:IM_COLD
 
 # Emyn Luin
 # levels 60-70
 # Guarded by Naugladur, who has Nauglamir
 N:32:Emyn Luin
 D:ELu:a path into the depths of the Blue Mountains
-W:60:70:30:0:14:160
+W:60:70:30:14:160
 # grass, flowers, and dirt
 L:89:45:81:5:88:50
 # blue mountains, granite, hailstones
 A:215:100:215:0:215:0:56:211
 # lots of treasure, not much magic
 O:50:20:10:30
-F:CAVE | CAVERN | CIRCULAR_ROOMS | RANDOM_TOWNS | 
-F:NO_STREAMERS | NO_RECALL | NO_DESTROY 
+F:CAVE
+F:CAVERN
+F:CIRCULAR_ROOMS
+F:NO_DESTROY
+F:NO_RECALL
+F:NO_STREAMERS
+F:RANDOM_TOWNS
 # no_recall because it should not be so easy to get Nauglamir. :P
-F:FINAL_GUARDIAN_457 | FINAL_ARTIFACT_6 
 F:FILL_METHOD_3
+F:FINAL_ARTIFACT_6
+F:FINAL_GUARDIAN_457
 R:100:0
-M:R_CHAR_k | R_CHAR_o
+M:R_CHAR_k
+M:R_CHAR_o
 
 #Dol Amroth - Castle of Prince Imrahil
 #levels 25-35
 #Guarded by Prince Imrahil (yes, he's evil in this game)
 N:33:Dol Amroth
 D:DAm:a way to the top of the castle of Dol Amroth
-W:25:35:15:0:14:160
+W:25:35:15:14:160
 # Vanilla-style
 L:1:100:1:0:1:0
 A:56:100:56:0:56:0:57:58
 O:20:20:20:20
-F:SMALLEST | NO_DESTROY | TOWER | RANDOM_TOWNS | 
-F:ADJUST_LEVEL_1 | NO_STREAMERS | NO_SHAFT | NO_STAIR | 
-F:NO_EASY_MOVE | FILL_METHOD_2 
-F:FINAL_GUARDIAN_402 | 
+F:ADJUST_LEVEL_1
+F:FILL_METHOD_2
+F:FINAL_GUARDIAN_402
+F:NO_DESTROY
+F:NO_EASY_MOVE
+F:NO_SHAFT
+F:NO_STAIR
+F:NO_STREAMERS
+F:RANDOM_TOWNS
+F:SMALLEST
+F:TOWER
 R:80:3
-M:R_CHAR_p | R_CHAR_P 
+M:R_CHAR_P
+M:R_CHAR_p
 R:20:3
-M:SMART | TAKE_ITEM
+M:SMART
+M:TAKE_ITEM
 
 #Angmar
 #levels 80-90
 #Guarded by Fuinur, who has Eowyn's sword
 N:34:Angmar
 D:WRA:a dark path through the Witch Realm of Angmar
-W:80:90:49:0:14:160
+W:80:90:49:14:160
 # Tainted, dark, evil
 L:93:70:174:20:226:10
 # Dark mountain chains only
@@ -574,20 +725,30 @@ A:214:100:214:0:214:0:214:214
 O:20:20:20:20
 # In addition to swamp water poison, we have disenchantment
 E:1d1:1:DISENCHANT
-F:ADJUST_LEVEL_1_2 | NO_DOORS | NO_STREAMERS | 
-F:HOT | FLAT | NO_SHAFT | NO_NEW_MONSTER | CIRCULAR_ROOMS | 
-F:FINAL_GUARDIAN_242 | FINAL_ARTIFACT_110
+F:ADJUST_LEVEL_1_2
+F:CIRCULAR_ROOMS
 F:FILL_METHOD_2
+F:FINAL_ARTIFACT_110
+F:FINAL_GUARDIAN_242
+F:FLAT
+F:HOT
+F:NO_DOORS
+F:NO_NEW_MONSTER
+F:NO_SHAFT
+F:NO_STREAMERS
 R:50:0
 R:50:3
-M:RES_DISE | UNDEAD | DEMON | NONLIVING 
+M:DEMON
+M:NONLIVING
+M:RES_DISE
+M:UNDEAD
 
 #Near Harad
 #levels 20-25
 #Guarded by Herumor, who has the heavy crossbow of Umbar
 N:35:Near Harad
 D:NHa:a desert path into Near Harad
-W:20:25:15:0:14:160
+W:20:25:15:14:160
 #It's a desert, so sand and only sand
 L:91:100:91:0:91:0
 #Ugly - using floor tiles for walls, only rooms have real walls
@@ -595,49 +756,72 @@ A:91:100:91:0:91:0:98:91
 O:20:20:20:20
 #Living is slow in the desert, heh :)
 E:1d1:1:INERTIA
-F:NO_DOORS | CAVE | CAVERN | HOT | NO_DESTROY | EMPTY | FLAT
-F:RANDOM_TOWNS | NO_STREAMERS | NO_SHAFT | 
-F:FINAL_GUARDIAN_395 | FINAL_ARTIFACT_171
-F:FILL_METHOD_4 
+F:CAVE
+F:CAVERN
+F:EMPTY
+F:FILL_METHOD_4
+F:FINAL_ARTIFACT_171
+F:FINAL_GUARDIAN_395
+F:FLAT
+F:HOT
+F:NO_DESTROY
+F:NO_DOORS
+F:NO_SHAFT
+F:NO_STREAMERS
+F:RANDOM_TOWNS
 #It's a desert (sort of wilderness) so WILD_TOO monsters, plus the 'p's for the Haradrim
 R:30:0
 R:70:3
-M:WILD_TOO | R_CHAR_p
+M:R_CHAR_p
+M:WILD_TOO
 
 #Isengard - Orc Cave on steroids.
 #levels 35-40 
 #It ends in a special level with the Palantir of Orthanc and Sharkey
 N:36:Isengard
 D:Isg:a passage to the caves beneath Isengard
-W:35:40:20:0:14:160
+W:35:40:20:14:160
 # Like the Orc caves
 L:88:100:1:0:1:0
 A:97:100:56:0:56:0:57:97
 O:20:20:20:20
-F:CAVE | ADJUST_LEVEL_2 | NO_STREAMERS | 
+F:ADJUST_LEVEL_2
+F:CAVE
 F:FILL_METHOD_0
+F:NO_STREAMERS
 R:20:0
 R:30:3
-M:TROLL | R_CHAR_T | 
+M:R_CHAR_T
+M:TROLL
 R:50:3
-M:ORC | R_CHAR_o | R_CHAR_O
+M:ORC
+M:R_CHAR_O
+M:R_CHAR_o
 
 # Tol Eressea - of course you never actually set foot on Tol Eressea ;)
 # levels 40-45
 # Guarded by Marda and the Robe of Belegaer
 N:37:Tol Eressea
 D:TEr:a way to the Lonely Isle
-W:40:45:40:0:14:160
+W:40:45:40:14:160
 # shallow water, lilies
 L:84:60:222:40:222:0
 # Going to have to add walls here to avoid being overly nasty
 A:211:100:211:0:211:0:211:211
 # As little loot as possible, this is open water, after all
 O:1:1:1:1
-F:SMALLEST | NO_DOORS | NO_DESTROY | EMPTY | FLAT | 
-F:ADJUST_LEVEL_1 | NO_STREAMERS | NO_SHAFT | NO_NEW_MONSTER | 
-F:FINAL_GUARDIAN_791 | FINAL_ARTIFACT_219 | 
+F:ADJUST_LEVEL_1
+F:EMPTY
 F:FILL_METHOD_0
+F:FINAL_ARTIFACT_219
+F:FINAL_GUARDIAN_791
+F:FLAT
+F:NO_DESTROY
+F:NO_DOORS
+F:NO_NEW_MONSTER
+F:NO_SHAFT
+F:NO_STREAMERS
+F:SMALLEST
 R:1:0
 R:99:1
 M:R_CHAR_B
@@ -647,26 +831,29 @@ M:R_CHAR_B
 #Guarded by no one (yet!)
 N:38:Utumno
 D:Utu:an entrance to the depths of Utumno
-W:101:127:30:0:14:160
+W:101:127:30:14:160
 L:1:100:1:0:1:0
 A:56:100:56:0:56:0:57:58
 O:20:20:20:20
-F:CAVERN | NO_EASY_MOVE | NO_RECALL 
-F:ADJUST_LEVEL_1_2 | ADJUST_LEVEL_1 
-F:FILL_METHOD_0 
+F:ADJUST_LEVEL_1
+F:ADJUST_LEVEL_1_2
+F:CAVERN
+F:FILL_METHOD_0
+F:NO_EASY_MOVE
+F:NO_RECALL
 R:100:0
 
 # Bilbo's trail in the Barrow-downs
 # just one special level that later becomes a different one, sans princess.
 N:39:Bilbo's trail
 D:Btr:a trail left by a fleeing hobbit
-W:10:10:1:0:14:160
+W:10:10:1:14:160
 L:88:94:210:2:199:4
 A:96:80:97:19:57:1:57:97
 A:100:0:0
 O:20:20:20:20
-F:FLAT
 F:FILL_METHOD_3
+F:FLAT
 R:25:1
 M:UNDEAD
 R:75:0
@@ -675,12 +862,14 @@ R:75:0
 # just one special level that later becomes a different one, sans princess.
 N:40:Thorin's trail
 D:Ttr:a trail left by a purposeful dwarf
-W:33:33:15:0:14:160
+W:33:33:15:14:160
 L:89:95:199:5:88:0
 A:96:100:97:0:56:0:202:96
 O:20:20:20:20
-F:NO_DOORS | NO_DESTROY | FLAT
 F:FILL_METHOD_0
+F:FLAT
+F:NO_DESTROY
+F:NO_DOORS
 R:100:0
 
 # N:<index>:<name>
diff --git a/lib/mods/theme/edit/e_info.txt b/lib/mods/theme/edit/e_info.txt
index 72b8348e..03671cf8 100644
--- a/lib/mods/theme/edit/e_info.txt
+++ b/lib/mods/theme/edit/e_info.txt
@@ -63,10 +63,6 @@
 
 
 
-# Version stamp (required)
-
-V:2.0.0
-
 ### Mage Staff ###
 
 N:1:of Mana
@@ -97,19 +93,11 @@ T:6:0:99
 W:10:1:8:50000
 C:-40:-40:0:3
 R:100
-F:MANA | SPELL
+F:MANA
+F:SPELL
 R:50
 F:PVAL_M2
 
-N:4:of Spell
-T:6:0:99
-X:A:24:60
-W:0:2:8:40000
-C:0:0:0:0
-R:100
-F:ACTIVATE
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
-
 ### Body Armor ###
 
 N:5:of Resist Acid
@@ -118,8 +106,10 @@ T:37:0:99
 X:A:30:16
 W:0:4:20:1000
 R:100
-F:RES_ACID | IGNORE_ACID
-f:RES_ACID | IGNORE_ACID
+F:IGNORE_ACID
+F:RES_ACID
+f:IGNORE_ACID
+f:RES_ACID
 
 N:6:of Resist Lightning
 T:36:0:99
@@ -127,8 +117,10 @@ T:37:0:99
 X:A:30:10
 W:0:4:20:400
 R:100
-F:RES_ELEC | IGNORE_ELEC
-f:RES_ELEC | IGNORE_ELEC
+F:IGNORE_ELEC
+F:RES_ELEC
+f:IGNORE_ELEC
+f:RES_ELEC
 
 N:7:of Resist Fire
 T:36:0:15
@@ -137,8 +129,10 @@ T:37:0:99
 X:A:30:14
 W:0:4:20:800
 R:100
-F:RES_FIRE | IGNORE_FIRE
-f:RES_FIRE | IGNORE_FIRE
+F:IGNORE_FIRE
+F:RES_FIRE
+f:IGNORE_FIRE
+f:RES_FIRE
 
 N:8:of Resist Cold
 T:36:0:15
@@ -147,8 +141,10 @@ T:37:0:99
 X:A:30:12
 W:0:4:20:600
 R:100
-F:RES_COLD | IGNORE_COLD
-f:RES_COLD | IGNORE_COLD
+F:IGNORE_COLD
+F:RES_COLD
+f:IGNORE_COLD
+f:RES_COLD
 
 N:9:of Resistance
 T:36:0:99
@@ -157,9 +153,18 @@ X:A:30:20
 W:0:2:20:12500
 C:0:0:10:0
 R:100
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
-f:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+f:RES_ACID
+f:RES_COLD
+f:RES_ELEC
+f:RES_FIRE
 R:25
 F:R_HIGH
 
@@ -170,11 +175,18 @@ X:B:30:25
 W:0:2:20:15000
 C:0:0:10:3
 R:100
-F:STEALTH | ESP_ORC
-f:STEALTH
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:ESP_ORC
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 F:OLD_RESIST
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:STEALTH
+f:STEALTH
 R:25
 F:RES_POIS
 
@@ -185,10 +197,22 @@ X:A:30:30
 W:0:1:10:30000
 C:0:0:10:0
 R:100
-F:SUST_STR | SUST_DEX | SUST_CON | SUST_INT | SUST_WIS | SUST_CHR | 
-F:HOLD_LIFE | RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:HOLD_LIFE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 F:OLD_RESIST
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:SUST_CHR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_INT
+F:SUST_STR
+F:SUST_WIS
 R:2
 F:R_IMMUNITY
 
@@ -201,7 +225,12 @@ X:A:30:0
 W:0:1:10:0
 C:0:0:0:-6
 R:100
-F:CON | STR | R_STAT | CURSED | HEAVY_CURSE | AGGRAVATE
+F:AGGRAVATE
+F:CON
+F:CURSED
+F:HEAVY_CURSE
+F:R_STAT
+F:STR
 # No CURSE_NO_DROP here, players seems to unlike surprises
 
 # Mithirl & Galvorn mails & PDSM
@@ -233,7 +262,7 @@ C:0:0:0:3
 Z:blink
 R:100
 F:ACTIVATE
-a:HARDCORE=JUMP
+a:JUMP
 
 ### Shields ###
 
@@ -244,8 +273,10 @@ T:34:7:99
 X:A:32:16
 W:0:6:22:1000
 R:100
-F:RES_ACID | IGNORE_ACID
-f:RES_ACID | IGNORE_ACID
+F:IGNORE_ACID
+F:RES_ACID
+f:IGNORE_ACID
+f:RES_ACID
 
 N:17:of Resist Lightning
 T:34:0:5
@@ -254,8 +285,10 @@ T:115:56:56
 X:A:32:10
 W:0:6:22:400
 R:100
-F:RES_ELEC | IGNORE_ELEC
-f:RES_ELEC | IGNORE_ELEC
+F:IGNORE_ELEC
+F:RES_ELEC
+f:IGNORE_ELEC
+f:RES_ELEC
 
 N:18:of Resist Fire
 T:34:0:5
@@ -264,8 +297,10 @@ T:115:56:56
 X:A:32:14
 W:0:6:22:800
 R:100
-F:RES_FIRE | IGNORE_FIRE
-f:RES_FIRE | IGNORE_FIRE
+F:IGNORE_FIRE
+F:RES_FIRE
+f:IGNORE_FIRE
+f:RES_FIRE
 
 N:19:of Resist Cold
 T:115:56:56
@@ -274,8 +309,10 @@ T:34:7:99
 X:A:32:12
 W:0:6:22:600
 R:100
-F:RES_COLD | IGNORE_COLD
-f:RES_COLD | IGNORE_COLD
+F:IGNORE_COLD
+F:RES_COLD
+f:IGNORE_COLD
+f:RES_COLD
 
 N:20:of Resistance
 T:115:56:56
@@ -285,9 +322,18 @@ X:A:32:20
 W:0:2:22:12500
 C:0:0:10:0
 R:100
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
-f:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+f:RES_ACID
+f:RES_COLD
+f:RES_ELEC
+f:RES_FIRE
 
 N:21:of Reflection
 T:115:56:56
@@ -297,9 +343,12 @@ X:A:32:20
 W:0:2:22:15000
 C:0:0:5:0
 R:100
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 F:REFLECT
 f:REFLECT
-F:IGNORE_ELEC | IGNORE_ACID | IGNORE_COLD | IGNORE_FIRE
 
 # Metal shields only
 N:22:of Electricity
@@ -309,7 +358,9 @@ T:34:10:10
 X:A:32:10
 W:0:2:22:400
 R:100
-F:RES_ELEC | IGNORE_ELEC | SH_ELEC
+F:IGNORE_ELEC
+F:RES_ELEC
+F:SH_ELEC
 f:SH_ELEC
 
 ### Crowns and Helms ###
@@ -322,8 +373,11 @@ X:A:33:13
 C:0:0:0:2
 W:0:1:8:500
 R:100
-F:DEX | SUST_DEX | ACTIVATE | ESP_ORC
-a:HARDCORE=NOLDOR
+F:ACTIVATE
+F:DEX
+F:ESP_ORC
+F:SUST_DEX
+a:NOLDOR
 
 N:24:of Intelligence
 X:A:33:13
@@ -333,7 +387,8 @@ T:32:0:6
 T:32:8:99
 T:115:57:57
 R:100
-F:INT | SUST_INT
+F:INT
+F:SUST_INT
 f:INT
 
 N:25:of Wisdom
@@ -344,7 +399,8 @@ T:32:0:6
 T:32:8:99
 T:115:57:57
 R:100
-F:WIS | SUST_WIS
+F:SUST_WIS
+F:WIS
 f:WIS
 
 N:26:of Beauty
@@ -355,7 +411,8 @@ T:32:0:6
 T:32:8:99
 T:115:57:57
 R:100
-F:CHR | SUST_CHR
+F:CHR
+F:SUST_CHR
 f:CHR
 
 # 40% chance of increase spell power
@@ -365,14 +422,23 @@ W:0:1:8:7500
 C:0:0:0:3
 T:33:0:99
 R:100
-F:INT | SUST_INT | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
-F:ABILITY | R_HIGH
+F:ABILITY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:INT
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:R_HIGH
+F:SUST_INT
 R:40
 F:SPELL
 R:50
-F:SPELL_CONTAIN | WIELD_CAST
+F:SPELL_CONTAIN
+F:WIELD_CAST
 
 N:28:of Gondor
 X:A:33:19
@@ -381,8 +447,14 @@ C:0:0:0:3
 T:32:0:99
 T:33:0:99
 R:100
-F:STR | DEX | CON | SUST_STR | SUST_DEX | SUST_CON | FREE_ACT
+F:CON
+F:DEX
+F:FREE_ACT
 F:R_HIGH
+F:STR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_STR
 
 N:29:of Arnor
 X:A:33:17
@@ -391,8 +463,11 @@ C:0:0:0:3
 T:32:0:99
 T:33:0:99
 R:100
-F:WIS | CHR | SUST_WIS | SUST_CHR
+F:CHR
 F:R_HIGH
+F:SUST_CHR
+F:SUST_WIS
+F:WIS
 
 N:30:of Seeing
 X:A:33:8
@@ -403,8 +478,8 @@ T:32:8:99
 T:33:0:99
 T:115:57:57
 R:100
-F:SEARCH | RES_BLIND | SEE_INVIS
-f:SEARCH
+F:RES_BLIND
+F:SEE_INVIS
 R:20
 F:ESP_ALL
 
@@ -416,7 +491,8 @@ T:32:0:6
 T:32:8:99
 T:115:57:57
 R:100
-F:INFRA | HIDE_TYPE
+F:HIDE_TYPE
+F:INFRA
 f:INFRA
 
 N:32:of Light
@@ -426,7 +502,8 @@ T:32:0:6
 T:32:8:99
 T:115:57:57
 R:100
-F:LITE1 | RES_LITE
+F:LITE1
+F:RES_LITE
 f:LITE1
 
 N:33:of Telepathy
@@ -468,7 +545,8 @@ T:32:0:6
 T:32:8:99
 T:115:57:57
 R:100
-F:INT | CURSED
+F:CURSED
+F:INT
 f:INT
 # No CURSE_NO_DROP here, players seems to unlike surprises
 
@@ -500,7 +578,9 @@ C:0:0:0:-5
 W:0:1:7:0
 T:33:0:99
 R:100
-F:STR | DEX | CON
+F:CON
+F:DEX
+F:STR
 
 N:40:Dwarven
 T:32:0:6
@@ -509,7 +589,11 @@ X:B:33:13
 C:0:0:0:2
 W:0:1:8:500
 R:100
-F:INFRA | CON | RES_FIRE | ESP_TROLL | ESP_DRAGON
+F:CON
+F:ESP_DRAGON
+F:ESP_TROLL
+F:INFRA
+F:RES_FIRE
 
 
 ### Cloaks ###
@@ -520,7 +604,11 @@ W:0:4:19:1500
 C:0:0:10:0
 T:35:0:99
 R:100
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | RES_SHARDS
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_SHARDS
 
 N:42:of Eriador
 X:A:31:10
@@ -540,10 +628,13 @@ W:0:1:28:4000
 C:0:0:20:3
 T:35:0:99
 R:100
-F:STEALTH | 
-f:STEALTH | 
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 F:OLD_RESIST
+F:STEALTH
+f:STEALTH
 
 # Aura, Fire
 N:44:of Immolation
@@ -552,7 +643,10 @@ W:0:1:18:4000
 C:0:0:4:0
 T:35:0:99
 R:100
-F:IGNORE_ACID | IGNORE_FIRE | SH_FIRE | RES_FIRE
+F:IGNORE_ACID
+F:IGNORE_FIRE
+F:RES_FIRE
+F:SH_FIRE
 f:SH_FIRE
 
 N:45:of Enveloping
@@ -577,7 +671,8 @@ W:0:1:3:0
 C:-15:-15:0:0
 T:35:0:99
 R:100
-F:AGGRAVATE | SHOW_MODS
+F:AGGRAVATE
+F:SHOW_MODS
 
 # Aura, Electricity
 N:48:of Electricity
@@ -586,7 +681,10 @@ W:0:1:18:4000
 C:0:0:4:0
 T:35:0:99
 R:100
-F:IGNORE_ACID | IGNORE_ELEC | SH_ELEC | RES_ELEC
+F:IGNORE_ACID
+F:IGNORE_ELEC
+F:RES_ELEC
+F:SH_ELEC
 
 ### Gloves ###
 
@@ -612,7 +710,8 @@ W:0:2:10:1000
 C:0:0:0:5
 T:31:0:99
 R:100
-F:DEX | HIDE_TYPE
+F:DEX
+F:HIDE_TYPE
 f:DEX
 
 N:52:of Power
@@ -621,9 +720,11 @@ X:A:34:22
 W:0:1:10:2500
 C:5:5:0:5
 R:100
-F:STR | SHOW_MODS | HIDE_TYPE
-f:STR
+F:HIDE_TYPE
 F:R_HIGH
+F:SHOW_MODS
+F:STR
+f:STR
 
 # 53 Gauntlets only
 N:53:of Peace
@@ -632,7 +733,8 @@ W:0:1:3:0
 C:-10:-10:0:0
 T:31:2:2
 R:100
-F:HEAVY_CURSE | CURSED
+F:CURSED
+F:HEAVY_CURSE
 
 # 54 Gloves only
 N:54:of Charming
@@ -701,7 +803,8 @@ W:0:1:27:200000
 C:0:0:0:10
 T:30:0:99
 R:100
-F:SPEED | HIDE_TYPE
+F:HIDE_TYPE
+F:SPEED
 f:SPEED
 R:10
 F:PVAL_M3
@@ -714,7 +817,9 @@ W:0:1:20:5000
 C:0:0:0:6
 T:30:6:6
 R:100
-F:CON | INFRA | RES_DARK
+F:CON
+F:INFRA
+F:RES_DARK
 R:33
 F:STR
 
@@ -741,7 +846,8 @@ W:0:1:3:0
 C:0:0:0:-10
 T:30:0:99
 R:100
-F:SPEED | AGGRAVATE
+F:AGGRAVATE
+F:SPEED
 
 
 ### Weapons ###
@@ -755,10 +861,16 @@ X:A:24:30
 W:0:2:44:20000
 C:6:6:4:3
 R:100
-F:WIS |
-F:SLAY_EVIL | SLAY_UNDEAD | SLAY_DEMON | 
-F:SEE_INVIS | BLESSED | RES_FEAR | ESP_EVIL
-F:SUSTAIN | LIMIT_BLOWS
+F:BLESSED
+F:ESP_EVIL
+F:LIMIT_BLOWS
+F:RES_FEAR
+F:SEE_INVIS
+F:SLAY_DEMON
+F:SLAY_EVIL
+F:SLAY_UNDEAD
+F:SUSTAIN
+F:WIS
 R:10
 F:BLOWS
 R:1
@@ -775,12 +887,22 @@ X:A:24:25
 W:0:2:44:15000
 C:4:4:8:4
 R:100
-F:STEALTH |
-f:STEALTH |
-F:FREE_ACT | SEE_INVIS | FEATHER | REGEN | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
-F:SUSTAIN | R_HIGH
+F:FEATHER
+F:FREE_ACT
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:REGEN
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:R_HIGH
+F:SEE_INVIS
+F:STEALTH
+F:SUSTAIN
+f:STEALTH
 R:33
 F:RES_POIS
 
@@ -793,8 +915,10 @@ X:B:24:20
 W:0:1:44:5000
 C:0:0:0:3
 R:100
-F:WIS | ESP_GOOD
-F:BLESSED | ABILITY
+F:ABILITY
+F:BLESSED
+F:ESP_GOOD
+F:WIS
 f:BLESSED
 
 N:68:of Greater Life
@@ -808,7 +932,8 @@ W:0:1:50:30000
 C:5:5:0:3
 r:N:MUST2H
 R:100
-F:LIFE | HOLD_LIFE
+F:HOLD_LIFE
+F:LIFE
 f:LIFE
 
 N:69:of Westernesse
@@ -821,9 +946,17 @@ X:A:24:20
 W:0:2:44:20000
 C:5:5:0:2
 R:100
-F:STR | DEX | CON |
-F:SLAY_ORC | SLAY_TROLL | SLAY_GIANT | 
-F:FREE_ACT | SEE_INVIS | ESP_ORC | ESP_TROLL | ESP_GIANT
+F:CON
+F:DEX
+F:ESP_GIANT
+F:ESP_ORC
+F:ESP_TROLL
+F:FREE_ACT
+F:SEE_INVIS
+F:SLAY_GIANT
+F:SLAY_ORC
+F:SLAY_TROLL
+F:STR
 R:33
 F:RES_FEAR
 R:50
@@ -855,7 +988,8 @@ X:A:24:15
 W:0:2:44:2500
 C:0:0:0:0
 R:100
-F:SLAY_WEAP | WOUNDING
+F:SLAY_WEAP
+F:WOUNDING
 
 N:72:of Spinning
 T:125:0:99
@@ -868,8 +1002,11 @@ X:A:24:18
 W:0:1:44:9000
 C:8:8:0:2
 R:100
-F:DEX | STR | VORPAL | ACTIVATE
-a:HARDCORE=SPIN
+F:ACTIVATE
+F:DEX
+F:STR
+F:VORPAL
+a:SPIN
 
 # The "Elemental" brands (4) (6)
 
@@ -884,7 +1021,9 @@ T:115:55:55
 X:B:24:15
 W:0:4:44:5000
 R:100
-F:BRAND_ACID | RES_ACID | IGNORE_ACID
+F:BRAND_ACID
+F:IGNORE_ACID
+F:RES_ACID
 f:BRAND_ACID
 
 N:74:Shocking
@@ -898,7 +1037,9 @@ T:115:55:55
 X:B:24:20
 W:0:4:44:4500
 R:100
-F:BRAND_ELEC | RES_ELEC | IGNORE_ELEC
+F:BRAND_ELEC
+F:IGNORE_ELEC
+F:RES_ELEC
 f:BRAND_ELEC
 
 N:75:Fiery
@@ -912,8 +1053,11 @@ T:115:55:55
 X:B:24:20
 W:0:4:44:3500
 R:100
-F:BRAND_FIRE | RES_FIRE | IGNORE_FIRE | LITE1
-f:BRAND_FIRE | 
+F:BRAND_FIRE
+F:IGNORE_FIRE
+F:LITE1
+F:RES_FIRE
+f:BRAND_FIRE
 
 N:76:Frozen
 T:125:0:99
@@ -926,8 +1070,10 @@ T:115:55:55
 X:B:24:15
 W:0:4:44:3000
 R:100
-F:BRAND_COLD | RES_COLD | IGNORE_COLD
-f:BRAND_COLD | 
+F:BRAND_COLD
+F:IGNORE_COLD
+F:RES_COLD
+f:BRAND_COLD
 
 N:77:Venomous
 T:125:0:99
@@ -940,8 +1086,9 @@ T:115:55:55
 X:B:24:20
 W:0:4:44:4000
 R:100
-F:BRAND_POIS | RES_POIS
-f:BRAND_POIS | 
+F:BRAND_POIS
+F:RES_POIS
+f:BRAND_POIS
 
 N:78:Chaotic
 T:125:0:99
@@ -954,9 +1101,13 @@ T:115:55:55
 X:B:24:28
 W:0:1:44:10000
 R:100
-F:CHAOTIC | RES_CHAOS | IGNORE_ELEC | IGNORE_ACID | IGNORE_FIRE
-f:CHAOTIC
+F:CHAOTIC
+F:IGNORE_ACID
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_CHAOS
 F:R_ANY
+f:CHAOTIC
 
 N:79:Sharp
 T:125:0:99
@@ -977,7 +1128,10 @@ X:A:24:20
 W:0:1:44:4000
 C:10:10:0:6
 R:100
-F:IMPACT | STR | TUNNEL | HIDE_TYPE
+F:HIDE_TYPE
+F:IMPACT
+F:STR
+F:TUNNEL
 f:IMPACT
 
 # The "Slay" brands (8)
@@ -1102,8 +1256,13 @@ X:A:24:20
 W:0:2:44:6000
 C:0:0:0:2
 R:100
-F:INT | SLAY_ANIMAL | SLOW_DIGEST | STEALTH | ESP_ANIMAL
-f:SLAY_ANIMAL | STEALTH
+F:ESP_ANIMAL
+F:INT
+F:SLAY_ANIMAL
+F:SLOW_DIGEST
+F:STEALTH
+f:SLAY_ANIMAL
+f:STEALTH
 
 N:90:of *Slay Evil*
 T:125:0:99
@@ -1116,8 +1275,13 @@ X:A:24:20
 W:0:2:44:6000
 C:0:0:0:2
 R:100
-F:WIS | SLAY_EVIL | BLESSED | ESP_EVIL | RES_FEAR | ABILITY
-f:SLAY_EVIL | 
+F:ABILITY
+F:BLESSED
+F:ESP_EVIL
+F:RES_FEAR
+F:SLAY_EVIL
+F:WIS
+f:SLAY_EVIL
 
 N:91:of *Slay Undead*
 T:125:0:99
@@ -1131,8 +1295,12 @@ X:A:24:24
 W:0:2:44:8000
 C:0:0:0:2
 R:100
-F:WIS | KILL_UNDEAD | SEE_INVIS | ESP_UNDEAD | RES_NETHER
-f:KILL_UNDEAD | 
+F:ESP_UNDEAD
+F:KILL_UNDEAD
+F:RES_NETHER
+F:SEE_INVIS
+F:WIS
+f:KILL_UNDEAD
 
 N:92:of *Slay Demon*
 T:125:0:99
@@ -1146,8 +1314,12 @@ X:A:24:16
 W:0:2:44:8000
 C:0:0:0:2
 R:100
-F:INT | KILL_DEMON | ESP_DEMON | RES_FIRE | RES_CHAOS
-f:KILL_DEMON | 
+F:ESP_DEMON
+F:INT
+F:KILL_DEMON
+F:RES_CHAOS
+F:RES_FIRE
+f:KILL_DEMON
 
 N:93:of *Slay Orc*
 T:15:0:99
@@ -1160,8 +1332,11 @@ X:A:24:14
 W:0:2:44:4000
 C:0:0:0:2
 R:100
-F:DEX | SLAY_ORC | ESP_ORC | SUST_DEX | 
-f:SLAY_ORC | 
+F:DEX
+F:ESP_ORC
+F:SLAY_ORC
+F:SUST_DEX
+f:SLAY_ORC
 
 N:94:of *Slay Troll*
 T:15:0:99
@@ -1174,8 +1349,12 @@ X:A:24:14
 W:0:2:44:4000
 C:0:0:0:2
 R:100
-F:STR | SLAY_TROLL | ESP_TROLL | REGEN | SUST_STR
-f:SLAY_TROLL | 
+F:ESP_TROLL
+F:REGEN
+F:SLAY_TROLL
+F:STR
+F:SUST_STR
+f:SLAY_TROLL
 
 N:95:of *Slay Giant*
 T:15:0:99
@@ -1188,8 +1367,12 @@ X:A:24:16
 W:0:2:44:4000
 C:0:0:0:2
 R:100
-F:STR | SLAY_GIANT | ESP_GIANT | RES_SHARDS | SUST_STR
-f:SLAY_GIANT | 
+F:ESP_GIANT
+F:RES_SHARDS
+F:SLAY_GIANT
+F:STR
+F:SUST_STR
+f:SLAY_GIANT
 
 N:96:of *Slay Dragon*
 T:15:0:99
@@ -1202,9 +1385,13 @@ X:A:24:24
 W:0:2:44:8000
 C:0:0:0:2
 R:100
-F:CON | KILL_DRAGON | ESP_DRAGON | RES_FEAR | 
+F:CON
+F:ESP_DRAGON
+F:KILL_DRAGON
+F:RES_FEAR
+F:R_ELEM
+F:R_LOW
 f:KILL_DRAGON
-F:R_LOW | R_ELEM
 R:20
 F:RES_POIS
 
@@ -1216,8 +1403,11 @@ X:B:24:25
 W:0:2:44:10000
 C:0:0:0:-2
 R:100
-F:LIFE | VAMPIRIC | HOLD_LIFE
-f:LIFE | VAMPIRIC
+F:HOLD_LIFE
+F:LIFE
+F:VAMPIRIC
+f:LIFE
+f:VAMPIRIC
 
 N:98:(*Defender*)
 T:21:0:99
@@ -1228,18 +1418,40 @@ X:A:24:35
 W:0:1:100:50000
 C:-15:-15:20:4
 R:100
-F:STEALTH | RES_POIS | DEX | CON | WIS | HOLD_LIFE |
+F:CON
+F:DEX
+F:FEATHER
+F:FREE_ACT
+F:HOLD_LIFE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:REGEN
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_POIS
+F:R_ANY
+F:R_LOW
+F:SEE_INVIS
+F:STEALTH
+F:SUSTAIN
+F:WIS
 f:STEALTH
-F:FREE_ACT | SEE_INVIS | FEATHER | REGEN | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD |
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
-F:R_ANY | R_LOW | SUSTAIN
 R:30
-F:R_ANY | R_LOW | SUSTAIN
+F:R_ANY
+F:R_LOW
+F:SUSTAIN
 R:20
-F:R_ANY | R_LOW | SUSTAIN | R_HIGH
+F:R_ANY
+F:R_HIGH
+F:R_LOW
+F:SUSTAIN
 R:10
-F:R_IMMUNITY | R_ANY
+F:R_ANY
+F:R_IMMUNITY
 
 # 'of the Thunderlords' renamed to 'of Tulkas' and picked up some new flags:) --furiosity
 N:99:of Tulkas
@@ -1251,18 +1463,31 @@ T:24:0:99
 X:A:24:22
 W:10:6:90:45000
 C:4:4:0:2
-a:HARDCORE=TELEPORT
+a:TELEPORT
 R:100
-F:SLAY_EVIL | KILL_DRAGON | TELEPORT | FREE_ACT | SEARCH | BRAND_ELEC
-F:REGEN | SLOW_DIGEST | RES_MORGUL | ACTIVATE | ESP_DRAGON
+F:ACTIVATE
+F:BRAND_ELEC
+F:ESP_DRAGON
+F:FREE_ACT
+F:KILL_DRAGON
+F:REGEN
+F:RES_MORGUL
+F:SLAY_EVIL
+F:SLOW_DIGEST
+F:TELEPORT
 R:50
-F:RES_NEXUS | HOLD_LIFE
+F:HOLD_LIFE
+F:RES_NEXUS
 R:30
-F:R_HIGH | KILL_UNDEAD
+F:KILL_UNDEAD
+F:R_HIGH
 R:12
-F:ABILITY | KILL_DEMON
+F:ABILITY
+F:KILL_DEMON
 R:2
-F:R_P_ABILITY | PVAL_M3 | LIMIT_BLOWS
+F:LIMIT_BLOWS
+F:PVAL_M3
+F:R_P_ABILITY
 
 N:100:of Gondolin
 T:21:0:99
@@ -1273,10 +1498,21 @@ X:A:24:26
 W:0:1:44:25000
 C:7:7:0:3
 R:100
-F:STR | CON | ESP_EVIL | RES_FEAR | 
-F:SLAY_EVIL | SLAY_TROLL | SLAY_DRAGON | SLAY_DEMON |
-F:FREE_ACT | SEE_INVIS | LITE1 | RES_DARK | ABILITY | 
-F:IGNORE_ACID | IGNORE_FIRE
+F:ABILITY
+F:CON
+F:ESP_EVIL
+F:FREE_ACT
+F:IGNORE_ACID
+F:IGNORE_FIRE
+F:LITE1
+F:RES_DARK
+F:RES_FEAR
+F:SEE_INVIS
+F:SLAY_DEMON
+F:SLAY_DRAGON
+F:SLAY_EVIL
+F:SLAY_TROLL
+F:STR
 R:33
 F:R_HIGH
 R:33
@@ -1292,9 +1528,12 @@ X:A:24:4
 W:0:1:2:500
 C:0:0:0:5
 R:100
-F:TUNNEL |
-f:TUNNEL |
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:TUNNEL
+f:TUNNEL
 
 # More weapons
 
@@ -1308,9 +1547,12 @@ T:115:55:55
 X:B:24:30
 W:0:1:5:5000
 R:100
-F:SLAY_UNDEAD | SEE_INVIS | HOLD_LIFE | DRAIN_HP
 F:ACTIVATE
-a:HARDCORE=SPECTRAL
+F:DRAIN_HP
+F:HOLD_LIFE
+F:SEE_INVIS
+F:SLAY_UNDEAD
+a:SPECTRAL
 
 N:103:of Morgul
 T:125:0:99
@@ -1323,9 +1565,15 @@ X:A:24:0
 W:0:1:1:0
 C:-20:-20:-10:-10
 R:100
+F:AGGRAVATE
+F:AUTO_CURSE
+F:BLACK_BREATH
+F:CURSED
+F:DRAIN_EXP
+F:HEAVY_CURSE
 F:LUCK
-F:SEE_INVIS | AGGRAVATE | HEAVY_CURSE | CURSED | BLACK_BREATH | DRAIN_EXP | 
-F:AUTO_CURSE | WOUNDING
+F:SEE_INVIS
+F:WOUNDING
 # No CURSE_NO_DROP here, players seems to unlike surprises
 
 N:104:of Angmar
@@ -1339,7 +1587,10 @@ X:A:24:0
 W:0:1:2:0
 C:-100:-100:0:0
 R:100
-F:NEVER_BLOW | HEAVY_CURSE | CURSED | AUTO_CURSE
+F:AUTO_CURSE
+F:CURSED
+F:HEAVY_CURSE
+F:NEVER_BLOW
 
 
 ### Missile Launchers ###
@@ -1364,8 +1615,10 @@ X:A:25:20
 W:0:4:21:10000
 C:5:10:0:1
 R:100
-F:XTRA_MIGHT | PVAL_M3 | R_ANY
-f:XTRA_MIGHT | 
+F:PVAL_M3
+F:R_ANY
+F:XTRA_MIGHT
+f:XTRA_MIGHT
 
 N:108:of Extra Shots
 T:19:0:99
@@ -1373,8 +1626,9 @@ X:A:25:20
 C:10:5:0:1
 W:0:4:21:10000
 R:100
-F:XTRA_SHOTS | PVAL_M2
-f:XTRA_SHOTS | 
+F:PVAL_M2
+F:XTRA_SHOTS
+f:XTRA_SHOTS
 
 # Bows only
 N:109:of Lothlorien
@@ -1383,8 +1637,14 @@ X:A:25:20
 W:50:2:21:30000
 C:10:10:0:2
 R:100
-F:DEX | XTRA_MIGHT | FREE_ACT | IGNORE_ACID | IGNORE_FIRE | HIDE_TYPE | 
-F:BLESSED | ABILITY
+F:ABILITY
+F:BLESSED
+F:DEX
+F:FREE_ACT
+F:HIDE_TYPE
+F:IGNORE_ACID
+F:IGNORE_FIRE
+F:XTRA_MIGHT
 
 # Crossbows only
 N:110:of the Haradrim
@@ -1393,7 +1653,11 @@ X:A:25:30
 W:50:2:21:20000
 C:5:15:0:1
 R:100
-F:XTRA_MIGHT | XTRA_SHOTS | IGNORE_ACID | IGNORE_FIRE | HIDE_TYPE
+F:HIDE_TYPE
+F:IGNORE_ACID
+F:IGNORE_FIRE
+F:XTRA_MIGHT
+F:XTRA_SHOTS
 
 # Slings only
 N:111:of Buckland
@@ -1402,7 +1666,12 @@ W:40:2:21:20000
 C:8:8:0:2
 T:19:1:1
 R:100
-F:DEX | XTRA_SHOTS | XTRA_MIGHT | IGNORE_ACID | IGNORE_FIRE | HIDE_TYPE
+F:DEX
+F:HIDE_TYPE
+F:IGNORE_ACID
+F:IGNORE_FIRE
+F:XTRA_MIGHT
+F:XTRA_SHOTS
 
 
 ### Ammo ###
@@ -1453,8 +1722,9 @@ T:17:0:99
 T:18:0:99
 X:A:23:10
 R:100
-F:BRAND_ACID | IGNORE_ACID
-f:BRAND_ACID | 
+F:BRAND_ACID
+F:IGNORE_ACID
+f:BRAND_ACID
 W:0:1:12:30
 
 # 117 All Elements at once - melee weapon
@@ -1466,16 +1736,26 @@ T:22:0:99
 T:23:0:99
 T:24:0:99
 R:100
-F:BRAND_ACID | RES_ACID | IGNORE_ACID
-F:BRAND_ELEC | RES_ELEC | IGNORE_ELEC
-F:BRAND_FIRE | RES_FIRE | IGNORE_FIRE
-F:BRAND_COLD | RES_COLD | IGNORE_COLD
-F:BRAND_POIS | RES_POIS | DRAIN_MANA
-f:BRAND_ACID | 
-f:BRAND_ELEC | 
-f:BRAND_FIRE | 
-f:BRAND_COLD | 
-f:BRAND_POIS | 
+F:BRAND_ACID
+F:BRAND_COLD
+F:BRAND_ELEC
+F:BRAND_FIRE
+F:BRAND_POIS
+F:DRAIN_MANA
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_POIS
+f:BRAND_ACID
+f:BRAND_COLD
+f:BRAND_ELEC
+f:BRAND_FIRE
+f:BRAND_POIS
 
 N:118:of Slay Demon
 T:16:0:99
@@ -1510,8 +1790,9 @@ T:17:0:99
 T:18:0:99
 X:A:23:10
 R:100
-F:BRAND_ELEC | IGNORE_ELEC
-f:BRAND_ELEC | 
+F:BRAND_ELEC
+F:IGNORE_ELEC
+f:BRAND_ELEC
 W:0:1:12:30
 
 N:122:of Flame
@@ -1520,8 +1801,9 @@ T:17:0:99
 T:18:0:99
 X:A:23:10
 R:100
-F:BRAND_FIRE | IGNORE_FIRE
-f:BRAND_FIRE | 
+F:BRAND_FIRE
+F:IGNORE_FIRE
+f:BRAND_FIRE
 W:0:2:12:25
 
 N:123:of Frost
@@ -1530,8 +1812,9 @@ T:17:0:99
 T:18:0:99
 X:A:23:10
 R:100
-F:BRAND_COLD | IGNORE_COLD
-f:BRAND_COLD | 
+F:BRAND_COLD
+F:IGNORE_COLD
+f:BRAND_COLD
 W:0:2:12:25
 
 N:124:of Wounding
@@ -1582,9 +1865,15 @@ X:A:25:20
 W:0:2:3:1000
 C:0:0:0:0
 R:100
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD |
-F:RES_ACID | CHR | SEE_INVIS
-F:R_ANY | PVAL_M2
+F:CHR
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:PVAL_M2
+F:RES_ACID
+F:R_ANY
+F:SEE_INVIS
 R:25
 F:PVAL_M1
 
@@ -1595,9 +1884,19 @@ X:A:25:20
 W:0:1:3:2000
 C:0:0:0:0
 R:100
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | SUST_CHR |
-F:RES_FIRE | RES_COLD | RES_ELEC | RES_ACID | CHR | SEE_INVIS
-F:R_ANY | PVAL_M3
+F:CHR
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:PVAL_M3
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:R_ANY
+F:SEE_INVIS
+F:SUST_CHR
 R:50
 F:PVAL_M1
 R:35
@@ -1611,13 +1910,18 @@ X:B:25:20
 W:0:1:2:2000
 C:0:0:0:0
 R:100
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | ACTIVATE
-F:R_ANY | PVAL_M2
+F:ACTIVATE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:PVAL_M2
+F:R_ANY
 R:50
 F:PVAL_M1
 R:25
 F:PVAL_M1
-a:HARDCORE=BA_ACID_H
+a:BA_ACID_H
 
 # Rods ego
 N:131:Capacity of 
@@ -1662,7 +1966,10 @@ X:A:51:10
 W:0:1:10:10000
 C:0:0:0:0
 R:100
-F:CAPACITY | CHARGING | CHEAPNESS | FAST_CAST |
+F:CAPACITY
+F:CHARGING
+F:CHEAPNESS
+F:FAST_CAST
 
 ### Lights ###
 
@@ -1713,10 +2020,10 @@ R:100
 F:LITE1
 F:LITE2
 F:LITE3
+F:RES_DARK
 f:LITE1
 f:LITE2
 f:LITE3
-F:RES_DARK
 
 N:141:of the Shadows
 X:A:0:6
@@ -1745,7 +2052,8 @@ T:39:0:99
 W:0:3:40:4000
 C:0:0:0:0
 R:100
-F:RES_BLIND | SEE_INVIS
+F:RES_BLIND
+F:SEE_INVIS
 
 N:144:of the Ethereal Eye
 X:A:0:7
@@ -1770,9 +2078,19 @@ X:B:30:18
 W:0:2:20:5000
 C:0:0:15:2
 R:100
-F:STR | CON | INFRA | FREE_ACT | HIDE_TYPE | 
-F:RES_FEAR | RES_DARK | SUST_STR | SUST_CON | 
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:CON
+F:FREE_ACT
+F:HIDE_TYPE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:INFRA
+F:RES_DARK
+F:RES_FEAR
+F:STR
+F:SUST_CON
+F:SUST_STR
 
 # Magical: affects soft armour, gloves, cloaks
 
@@ -1786,11 +2104,19 @@ T:45:0:99
 W:5:1:10:2000
 C:0:0:0:0
 R:100
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
-f:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+f:IGNORE_ACID
+f:IGNORE_COLD
+f:IGNORE_ELEC
+f:IGNORE_FIRE
 R:50
-F:SPELL_CONTAIN | WIELD_CAST
-f:SPELL_CONTAIN | WIELD_CAST
+F:SPELL_CONTAIN
+F:WIELD_CAST
+f:SPELL_CONTAIN
+f:WIELD_CAST
 
 # Ring and Amulet egos
 
@@ -1826,123 +2152,17 @@ T:65:31:99
 W:0:1:20:1000
 C:0:0:0:3
 R:100
-F:PVAL_M5 | PVAL_M3
+F:PVAL_M3
+F:PVAL_M5
 R:50
-F:PVAL_M5 | PVAL_M3
+F:PVAL_M3
+F:PVAL_M5
 R:10
-F:PVAL_M5 | PVAL_M3
+F:PVAL_M3
+F:PVAL_M5
 R:1
-F:PVAL_M5 | PVAL_M3
-
-
-### 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:IGNORE_ACID | IGNORE_ELEC | IGNORE_COLD | IGNORE_FIRE | 
-F:AUTOMATIC_5
-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:IGNORE_ACID | IGNORE_ELEC | IGNORE_COLD | IGNORE_FIRE | 
-F:AUTOMATIC_99
-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:IGNORE_ACID | IGNORE_ELEC | IGNORE_COLD | IGNORE_FIRE | 
-F:STEALTH | HIDE_TYPE
-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 | IGNORE_ELEC | IGNORE_COLD | 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:STEALTH | CURSED | HIDE_TYPE
-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:STEALTH | ONLY_DRAGON | HIDE_TYPE | XTRA_SHOTS |
-F:IGNORE_ACID | IGNORE_FIRE
-
-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:STEALTH | ONLY_DEMON | HIDE_TYPE | XTRA_SHOTS
-F:IGNORE_ACID | IGNORE_FIRE
-
-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:STEALTH | ONLY_ANIMAL | HIDE_TYPE | 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:STEALTH | ONLY_UNDEAD | HIDE_TYPE | XTRA_SHOTS | KILL_GHOST
-
-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:STEALTH | ONLY_EVIL | HIDE_TYPE | XTRA_SHOTS | KILL_GHOST
+F:PVAL_M3
+F:PVAL_M5
 
 # Lite ego
 N:163:of the Magi
@@ -1952,15 +2172,19 @@ W:0:1:150:2000
 C:0:0:0:3
 Z:magic map
 R:100
-F:INT | WIS | CHR
+F:CHR
+F:INT
+F:WIS
 R:60
-F:INVIS | RES_BLIND
+F:INVIS
+F:RES_BLIND
 R:30
 F:R_HIGH
 R:30
 F:PVAL_M2
 R:50:
-F:SPELL_CONTAIN | WIELD_CAST
+F:SPELL_CONTAIN
+F:WIELD_CAST
 
 ### New ego-items added by JLE
 
@@ -1972,7 +2196,8 @@ C:0:0:-50:0
 T:36:0:99
 T:37:0:99
 R:100
-F:AGGRAVATE | CURSED
+F:AGGRAVATE
+F:CURSED
 
 # Shield of Vulnerability (the only cursed shield) [not in Theme, it isn't!]
 N:165:of Vulnerability
@@ -1982,7 +2207,8 @@ C:0:0:-50:0
 T:115:56:56
 T:34:0:99
 R:100
-F:AGGRAVATE | CURSED
+F:AGGRAVATE
+F:CURSED
 
 # Shield of Preservation -  
 N:166:of Preservation
@@ -1992,8 +2218,16 @@ C:-10:-10:20:0
 T:115:56:56
 T:34:0:99
 R:100
-F:RES_DISEN | SUST_STR | SUST_CON | SUST_DEX | HOLD_LIFE | R_HIGH | 
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:HOLD_LIFE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_DISEN
+F:R_HIGH
+F:SUST_CON
+F:SUST_DEX
+F:SUST_STR
 R:33
 F:R_LOW
 R:33
@@ -2007,7 +2241,9 @@ T:32:0:6
 T:32:8:99
 T:33:0:99
 R:100
-F:RES_SOUND | RES_CONF | RES_FEAR
+F:RES_CONF
+F:RES_FEAR
+F:RES_SOUND
 
 # Crown of Night and Day
 N:168:of Night and Day
@@ -2015,7 +2251,12 @@ X:A:33:18
 W:35:1:15:4000
 T:33:0:99
 R:100
-F:RES_LITE | RES_DARK | LITE1 | SEE_INVIS  | RES_BLIND | IGNORE_ACID
+F:IGNORE_ACID
+F:LITE1
+F:RES_BLIND
+F:RES_DARK
+F:RES_LITE
+F:SEE_INVIS
 
 # Cloak of the Magi
 N:169:of the Magi
@@ -2024,9 +2265,16 @@ W:30:1:18:2000
 C:-5:-5:5:3
 T:35:0:99
 R:100
-F:INT | SPEED | SUST_INT | FREE_ACT | STEALTH | HIDE_TYPE | IGNORE_ACID
+F:FREE_ACT
+F:HIDE_TYPE
+F:IGNORE_ACID
+F:INT
+F:SPEED
+F:STEALTH
+F:SUST_INT
 R:30
-F:SPELL_CONTAIN | WIELD_CAST
+F:SPELL_CONTAIN
+F:WIELD_CAST
 
 # Cloak of Invisibility
 N:170:of Invisibility
@@ -2035,7 +2283,9 @@ W:40:1:18:3000
 C:0:0:10:5
 T:35:0:99
 R:100
-F:STEALTH | HIDE_TYPE | INVIS
+F:HIDE_TYPE
+F:INVIS
+F:STEALTH
 f:INVIS
 
 # Cloak of the Bat
@@ -2045,7 +2295,13 @@ W:50:1:35:3000
 C:-10:-10:10:3
 T:35:0:99
 R:100
-F:SPEED | FLY | RES_DARK | SEE_INVIS | INFRA | HIDE_TYPE | STEALTH
+F:FLY
+F:HIDE_TYPE
+F:INFRA
+F:RES_DARK
+F:SEE_INVIS
+F:SPEED
+F:STEALTH
 
 # Leather Gloves of Thievery
 N:172:of Thievery
@@ -2054,7 +2310,12 @@ W:40:1:15:5000
 C:8:3:0:5
 T:31:1:1
 R:100
-F:DEX | SEARCH | SHOW_MODS | FEATHER | FREE_ACT | HIDE_TYPE | IGNORE_ACID
+F:DEX
+F:FEATHER
+F:FREE_ACT
+F:HIDE_TYPE
+F:IGNORE_ACID
+F:SHOW_MODS
 R:10
 F:SPEED
 
@@ -2065,8 +2326,14 @@ W:50:1:15:7000
 C:6:8:-20:2
 T:31:2:99
 R:100
-F:STR | CON | SHOW_MODS | AGGRAVATE | HIDE_TYPE | IGNORE_ACID | RES_FEAR | 
+F:AGGRAVATE
+F:CON
 F:DRAIN_HP
+F:HIDE_TYPE
+F:IGNORE_ACID
+F:RES_FEAR
+F:SHOW_MODS
+F:STR
 R:25
 F:BLOWS
 
@@ -2076,7 +2343,8 @@ X:A:35:20
 W:0:3:27:5000
 T:30:0:99
 R:100
-F:RES_NEXUS | FEATHER
+F:FEATHER
+F:RES_NEXUS
 
 # Boots of Elvenkind (leather boots only)
 N:175:of Elvenkind
@@ -2085,7 +2353,12 @@ W:60:1:36:200000
 C:0:0:0:4
 T:30:2:3
 R:100
-F:STEALTH | HIDE_TYPE | FEATHER | IGNORE_ACID | IGNORE_FIRE | ABILITY
+F:ABILITY
+F:FEATHER
+F:HIDE_TYPE
+F:IGNORE_ACID
+F:IGNORE_FIRE
+F:STEALTH
 R:50
 F:SPEED
 
@@ -2100,8 +2373,14 @@ T:24:8:99
 T:125:0:99
 C:10:10:-20:2
 R:100
-F:STR | BLOWS | AGGRAVATE | RES_FEAR | HIDE_TYPE | 
-F:IGNORE_ACID | IGNORE_FIRE | DRAIN_MANA
+F:AGGRAVATE
+F:BLOWS
+F:DRAIN_MANA
+F:HIDE_TYPE
+F:IGNORE_ACID
+F:IGNORE_FIRE
+F:RES_FEAR
+F:STR
 
 # Staffs of wishing
 N:177:of Plenty
@@ -2148,27 +2427,36 @@ T:14:7:7
 X:B:25:20
 W:0:1:2:2000
 C:0:0:0:0
-a:HARDCORE=BA_COLD_3
+a:BA_COLD_3
 R:100
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD |
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 
 N:182:Dragon
 T:14:7:7
 X:B:25:20
 W:0:1:2:2000
 C:0:0:0:0
-a:HARDCORE=BA_ELEC_3
+a:BA_ELEC_3
 R:100
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD |
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 
 N:183:Dragon
 T:14:7:7
 X:B:25:20
 W:0:1:2:2000
 C:0:0:0:0
-a:HARDCORE=BA_FIRE_H
+a:BA_FIRE_H
 R:100
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD |
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 
 # Helm of water breathing
 N:184:of Water Breathing
@@ -2177,7 +2465,8 @@ C:0:0:0:2
 W:15:1:25:1000
 T:32:5:10
 R:100
-F:WATER_BREATH | IGNORE_ACID
+F:IGNORE_ACID
+F:WATER_BREATH
 f:WATER_BREATH
 
 # A second of life for non MUST2H weapons, much lower value tho
@@ -2192,7 +2481,8 @@ W:0:1:50:30000
 C:5:5:0:1
 r:F:MUST2H
 R:100
-F:LIFE | HOLD_LIFE
+F:HOLD_LIFE
+F:LIFE
 f:LIFE
 
 # Cloak of Air
@@ -2220,7 +2510,10 @@ X:A:25:30
 W:60:5:30:30000
 C:10:15:20:2
 R:120
-F:XTRA_MIGHT | XTRA_SHOTS | REFLECT | IMMOVABLE
+F:IMMOVABLE
+F:REFLECT
+F:XTRA_MIGHT
+F:XTRA_SHOTS
 
 ### New ego-items from T-Plus by Ingeborg S. Norden ###
 
@@ -2230,12 +2523,12 @@ N:189:Rogue's
 X:B:35:15
 W:15:10:25:2500
 C:-5:-5:0:2
-r:F:CURSED | HEAVY_CURSE | AUTO_CURSE |
+r:F:AUTO_CURSE
+r:F:CURSED
+r:F:HEAVY_CURSE
 T:30:2:3
 Z:panic hit
 R:100
-F:SEARCH
-f:SEARCH
 R:50
 F:STEALTH
 f:STEALTH
@@ -2243,7 +2536,7 @@ R:25
 F:LUCK
 f:LUCK
 R:10
-F:R_HIGH |
+F:R_HIGH
 
 ###	Egos for rings, amulets and crowns (partly inspired by Multiband)
 
@@ -2259,8 +2552,8 @@ T:45:0:38
 W:5:1:10:1250
 C:0:0:0:0
 R:100
-F:LITE1 |
-f:LITE1 |
+F:LITE1
+f:LITE1
 
 # Dazzling (as above, with more light plus resistance/granted ability)
 
@@ -2274,14 +2567,15 @@ W:10:3:12:2500
 C:0:0:0:0
 Z:illuminate
 R:100
-F:LITE2 | RES_LITE |
-f:LITE2 |
+F:LITE2
+F:RES_LITE
+f:LITE2
 R:50
-F:LITE1 |
-f:LITE1 |
+F:LITE1
+f:LITE1
 R:25
-F:LITE3 |
-f:LITE3 |
+F:LITE3
+f:LITE3
 
 # Radiant (Dazzling with some extras;
 # no cursed jewelry)
@@ -2296,20 +2590,23 @@ T:45:51:99
 W:15:5:15:3500
 C:0:0:0:0
 Z:illuminate
-r:F:CURSED | HEAVY_CURSE | AUTO_CURSE |
+r:F:AUTO_CURSE
+r:F:CURSED
+r:F:HEAVY_CURSE
 R:100
-F:LITE3 | RES_LITE |
-f:LITE3 | 
+F:LITE3
+F:RES_LITE
+f:LITE3
 R:50
-F:LITE2 |
-f:LITE2 |
+F:LITE2
+f:LITE2
 R:25
-F:LITE1 |
-f:LITE1 |
+F:LITE1
+f:LITE1
 R:20
-F:RES_BLIND |
+F:RES_BLIND
 R:2
-F:REFLECT |
+F:REFLECT
 
 # Blazing (Glowing plus fiery sheath, resistance, undamaged by 
 # fire; restrictions as per Glowing, but no Cold Resistance/Ice 
@@ -2325,16 +2622,20 @@ T:45:51:99
 W:15:5:15:3000
 C:0:0:0:0
 R:100
-F:LITE1 | RES_FIRE | SH_FIRE | 
-f:LITE1 | SH_FIRE | IGNORE_FIRE
+F:LITE1
+F:RES_FIRE
+F:SH_FIRE
+f:IGNORE_FIRE
+f:LITE1
+f:SH_FIRE
 R:25
-F:LITE2 |
-f:LITE2 |
+F:LITE2
+f:LITE2
 R:10
-F:LITE3 |
-f:LITE3 |
+F:LITE3
+f:LITE3
 R:2
-F:IM_FIRE |
+F:IM_FIRE
 
 # Lucky (amulets only--resists cursing, undamaged by elements, luck 
 # bonus added; no inherently cursed types or Nothing amulets)
@@ -2345,9 +2646,12 @@ T:40:2:15
 T:40:17:99
 W:15:5:15:2750
 C:0:0:0:5
-r:F:CURSED | HEAVY_CURSE | AUTO_CURSE |
+r:F:AUTO_CURSE
+r:F:CURSED
+r:F:HEAVY_CURSE
 R:100
-F:BLESSED | LUCK |
+F:BLESSED
+F:LUCK
 
 # Unlucky (amulets only; no Prot/Evil, Doom, or Nothing amulets)
 N:195:Unlucky
@@ -2357,9 +2661,12 @@ T:40:17:99
 W:0:3:10:0
 C:-5:-5:-5:-5
 R:100
-F:CURSED | AUTO_CURSE | LUCK | AGGRAVATE
+F:AGGRAVATE
+F:AUTO_CURSE
+F:CURSED
+F:LUCK
 R:20
-F:HEAVY_CURSE |
+F:HEAVY_CURSE
 
 # Armour of the Maiar (of the Chosen in T-Plus)
 
@@ -2370,15 +2677,30 @@ X:A:30:30
 W:10:3:45:15000
 C:0:0:15:0
 R:100
-F:BLESSED | ESP_EVIL | ESP_GIANT | ESP_TROLL |
-F:FREE_ACT | RES_FEAR |
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD |
-F:OLD_RESIST |
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE |
-f:FREE_ACT | IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE |
+F:BLESSED
+F:ESP_EVIL
+F:ESP_GIANT
+F:ESP_TROLL
+F:FREE_ACT
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:OLD_RESIST
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FEAR
+F:RES_FIRE
+f:FREE_ACT
+f:IGNORE_ACID
+f:IGNORE_COLD
+f:IGNORE_ELEC
+f:IGNORE_FIRE
 Z:berserk
 R:25
-F:R_HIGH | SUSTAIN |
+F:R_HIGH
+F:SUSTAIN
 
 ###	Weapons of the Maiar (of the Chosen in T-Plus)
 N:197:of the Maiar
@@ -2391,19 +2713,37 @@ X:A:24:35
 W:10:5:45:30000
 C:6:6:4:3
 R:100
-F:SLAY_GIANT | SLAY_TROLL | 
-F:SEE_INVIS | FREE_ACT | BLESSED | RES_FEAR | 
-F:ESP_GIANT | ESP_TROLL |
-F:LIMIT_BLOWS |
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE |
-f:FREE_ACT | IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE |
+F:BLESSED
+F:ESP_GIANT
+F:ESP_TROLL
+F:FREE_ACT
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:LIMIT_BLOWS
+F:RES_FEAR
+F:SEE_INVIS
+F:SLAY_GIANT
+F:SLAY_TROLL
+f:FREE_ACT
+f:IGNORE_ACID
+f:IGNORE_COLD
+f:IGNORE_ELEC
+f:IGNORE_FIRE
 R:33
-F:ESP_EVIL | SLAY_EVIL | R_ANY |
+F:ESP_EVIL
+F:R_ANY
+F:SLAY_EVIL
 R:10
 F:BLOWS
 R:1
 F:PVAL_M1
-r:F:CHAOTIC | DRAIN_HP | VAMPIRIC | CURSED | HEAVY_CURSE |
+r:F:CHAOTIC
+r:F:CURSED
+r:F:DRAIN_HP
+r:F:HEAVY_CURSE
+r:F:VAMPIRIC
 
 # Robe of Ithryn (of the Archmagi in T-Plus)
 N:198:of the Ithryn
@@ -2412,15 +2752,30 @@ X:A:30:30
 W:15:3:45:15000
 C:-5:-5:15:2
 R:100
-F:FREE_ACT | RES_BLIND | RES_CONF | R_HIGH | SUST_INT |
-F:SPELL_CONTAIN | WIELD_CAST |
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE |
-f:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE | SUST_INT |
-r:F:CURSED | HEAVY_CURSE | AUTO_CURSE |
+F:FREE_ACT
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_BLIND
+F:RES_CONF
+F:R_HIGH
+F:SPELL_CONTAIN
+F:SUST_INT
+F:WIELD_CAST
+f:IGNORE_ACID
+f:IGNORE_COLD
+f:IGNORE_ELEC
+f:IGNORE_FIRE
+f:SUST_INT
+r:F:AUTO_CURSE
+r:F:CURSED
+r:F:HEAVY_CURSE
 R:33
-F:RES_DISEN | SPELL |
+F:RES_DISEN
+F:SPELL
 R:10
-F:MANA |
+F:MANA
 
 # Robe of Sanctity
 
@@ -2430,16 +2785,30 @@ X:A:30:30
 W:15:3:45:15000
 C:0:0:15:2
 R:100
-F:FREE_ACT | RES_BLIND | RES_CONF | R_HIGH | SUST_WIS |
-F:BLESSED | ACTIVATE |
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE |
-f:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE | SUST_WIS |
-a:HARDCORE=PROT_EVIL
-r:F:CURSED | HEAVY_CURSE | AUTO_CURSE |
+F:ACTIVATE
+F:BLESSED
+F:FREE_ACT
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_BLIND
+F:RES_CONF
+F:R_HIGH
+F:SUST_WIS
+f:IGNORE_ACID
+f:IGNORE_COLD
+f:IGNORE_ELEC
+f:IGNORE_FIRE
+f:SUST_WIS
+a:PROT_EVIL
+r:F:AUTO_CURSE
+r:F:CURSED
+r:F:HEAVY_CURSE
 R:33
-F:ESP_EVIL |
+F:ESP_EVIL
 R:10
-F:SPELL |
+F:SPELL
 
 N:200:Ethereal
 T:35:0:99
@@ -2448,17 +2817,28 @@ X:B:25:25
 W:15:2:20:27500
 C:0:0:20:0
 R:100
-F:FREE_ACT | SEE_INVIS | HOLD_LIFE |
-F:ACTIVATE |
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE |
-f:FREE_ACT | IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE |
-r:F:CURSED | HEAVY_CURSE | AUTO_CURSE |
-a:HARDCORE=SPECTRAL
+F:ACTIVATE
+F:FREE_ACT
+F:HOLD_LIFE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:SEE_INVIS
+f:FREE_ACT
+f:IGNORE_ACID
+f:IGNORE_COLD
+f:IGNORE_ELEC
+f:IGNORE_FIRE
+r:F:AUTO_CURSE
+r:F:CURSED
+r:F:HEAVY_CURSE
+a:SPECTRAL
 R:33
-F:RES_NETHER |
+F:RES_NETHER
 R:5
-F:MAGIC_BREATH |
-f:MAGIC_BREATH |
+F:MAGIC_BREATH
+f:MAGIC_BREATH
 
 ### More new ego-items from Annals of Ea by Feanor:
 
@@ -2469,8 +2849,13 @@ X:A:24:80
 W:40:25:100:25000
 C:0:0:0:5
 R:100
-F:ESP_EVIL | SPELL | MANA
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:ESP_EVIL
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:MANA
+F:SPELL
 
 # Swords of the Noldor
 N:202:of the Noldor
@@ -2479,19 +2864,43 @@ X:A:24:35
 W:40:25:100:50000
 C:15:15:20:4
 R:100
-F:STEALTH | RES_POIS | DEX | CON | WIS | HOLD_LIFE |
+F:BLESSED
+F:CON
+F:DEX
+F:FEATHER
+F:FREE_ACT
+F:HOLD_LIFE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:REGEN
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_POIS
+F:R_ANY
+F:R_LOW
+F:SEE_INVIS
+F:SLAY_EVIL
+F:STEALTH
+F:SUSTAIN
+F:WIS
+F:WOUNDING
 f:STEALTH
-F:FREE_ACT | SEE_INVIS | FEATHER | REGEN |
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD |
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
-F:R_ANY | R_LOW | SUSTAIN
-F:SLAY_EVIL | BLESSED | WOUNDING
 R:30
-F:R_ANY | R_LOW | SUSTAIN
+F:R_ANY
+F:R_LOW
+F:SUSTAIN
 R:20
-F:R_ANY | R_LOW | SUSTAIN | R_HIGH
+F:R_ANY
+F:R_HIGH
+F:R_LOW
+F:SUSTAIN
 R:10
-F:R_IMMUNITY | R_ANY
+F:R_ANY
+F:R_IMMUNITY
 
 # Spear of Vanyar
 N:203:of the Vanyar
@@ -2500,17 +2909,38 @@ R:100
 X:A:24:35
 W:40:25:100:50000
 C:15:15:20:4
-F:STEALTH | HOLD_LIFE | SEE_INVIS | WIS | INT |
-F:REGEN | RES_FEAR | RES_DARK | RES_LITE | RES_BLIND |
-F:IGNORE_ACID | IGNORE_FIRE | IGNORE_ELEC | IGNORE_COLD |
-F:SLAY_DEMON | SLAY_UNDEAD | BLESSED |
-F:R_ANY | R_LOW | SUSTAIN
+F:BLESSED
+F:HOLD_LIFE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:INT
+F:REGEN
+F:RES_BLIND
+F:RES_DARK
+F:RES_FEAR
+F:RES_LITE
+F:R_ANY
+F:R_LOW
+F:SEE_INVIS
+F:SLAY_DEMON
+F:SLAY_UNDEAD
+F:STEALTH
+F:SUSTAIN
+F:WIS
 R:30
-F:R_ANY | R_LOW | SUSTAIN
+F:R_ANY
+F:R_LOW
+F:SUSTAIN
 R:20
-F:R_ANY | R_LOW | SUSTAIN | R_HIGH
+F:R_ANY
+F:R_HIGH
+F:R_LOW
+F:SUSTAIN
 R:10
-F:R_IMMUNITY | R_ANY
+F:R_ANY
+F:R_IMMUNITY
 
 # Axe of the Nandor
 N:204:of the Nandor
@@ -2519,16 +2949,33 @@ R:100
 X:A:24:35
 W:40:25:100:50000
 C:15:15:20:5
-F:STEALTH | SPEED | SEE_INVIS | RES_COLD | RES_ELEC |
-F:IGNORE_ACID | IGNORE_FIRE | IGNORE_COLD | IGNORE_ELEC |
-F:SLAY_ORC | SLAY_ANIMAL | RES_POIS |
-F:R_ANY | R_LOW | SUSTAIN
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_COLD
+F:RES_ELEC
+F:RES_POIS
+F:R_ANY
+F:R_LOW
+F:SEE_INVIS
+F:SLAY_ANIMAL
+F:SLAY_ORC
+F:SPEED
+F:STEALTH
+F:SUSTAIN
 R:30
-F:R_ANY | R_LOW | SUSTAIN
+F:R_ANY
+F:R_LOW
+F:SUSTAIN
 R:20
-F:R_ANY | R_LOW | SUSTAIN | R_HIGH
+F:R_ANY
+F:R_HIGH
+F:R_LOW
+F:SUSTAIN
 R:10
-F:R_IMMUNITY | R_ANY
+F:R_ANY
+F:R_IMMUNITY
 
 # Arrow of Teleri
 N:205:of the Teleri
@@ -2536,7 +2983,9 @@ T:17:0:99
 X:A:23:10
 W:40:25:100:5000
 R:100
-F:R_ANY | WOUNDING | BLESSED
+F:BLESSED
+F:R_ANY
+F:WOUNDING
 
 # Hafted of Avari
 N:206:of the Avari
@@ -2545,15 +2994,28 @@ R:100
 X:A:24:35
 W:40:25:100:50000
 C:15:15:20:5
-F:STEALTH | INVIS | SEE_INVIS | INFRA | RES_DARK |
-F:RES_BLIND | SLAY_UNDEAD |
-F:R_ANY | R_LOW | SUSTAIN
+F:INFRA
+F:INVIS
+F:RES_BLIND
+F:RES_DARK
+F:R_ANY
+F:R_LOW
+F:SEE_INVIS
+F:SLAY_UNDEAD
+F:STEALTH
+F:SUSTAIN
 R:30
-F:R_ANY | R_LOW | SUSTAIN
+F:R_ANY
+F:R_LOW
+F:SUSTAIN
 R:20
-F:R_ANY | R_LOW | SUSTAIN | R_HIGH
+F:R_ANY
+F:R_HIGH
+F:R_LOW
+F:SUSTAIN
 R:10
-F:R_IMMUNITY | R_ANY
+F:R_ANY
+F:R_IMMUNITY
 
 ### Ravenred's Weapons of Unmagic
 
@@ -2568,7 +3030,7 @@ W:0:2:44:8000
 C:-10:-10:0:0
 R:100
 F:ANTIMAGIC_50
-f:ANTIMAGIC_50 
+f:ANTIMAGIC_50
 
 ### Amulet and ring egos suggested by power
 
@@ -2579,10 +3041,18 @@ T:45:1:99
 X:B:0:10
 W:0:5:100:2000
 C:0:0:10:2
-r:F:CURSED | HEAVY_CURSE | AUTO_CURSE |
+r:F:AUTO_CURSE
+r:F:CURSED
+r:F:HEAVY_CURSE
 R:100
-F:WIS | SEE_INVIS | HOLD_LIFE | BLESSED
-f:WIS | SEE_INVIS | HOLD_LIFE | BLESSED
+F:BLESSED
+F:HOLD_LIFE
+F:SEE_INVIS
+F:WIS
+f:BLESSED
+f:HOLD_LIFE
+f:SEE_INVIS
+f:WIS
 
 #Demonic - anything but Devotion and Protection from Evil
 N:209:Demonic
@@ -2595,8 +3065,10 @@ W:0:5:100:2000
 C:0:0:0:2
 r:F:BLESSED
 R:100
-F:ESP_DEMON | RES_FIRE
-f:ESP_DEMON | RES_FIRE
+F:ESP_DEMON
+F:RES_FIRE
+f:ESP_DEMON
+f:RES_FIRE
 
 # Jewellery of the Rohirrim - no speed rings
 N:210:Rohirric
@@ -2606,10 +3078,14 @@ T:45:32:99
 X:B:0:10
 W:0:5:100:20000
 C:0:0:0:3
-r:F:CURSED | HEAVY_CURSE | AUTO_CURSE | 
+r:F:AUTO_CURSE
+r:F:CURSED
+r:F:HEAVY_CURSE
 R:100
-F:RES_FEAR | SPEED
-f:RES_FEAR | SPEED
+F:RES_FEAR
+F:SPEED
+f:RES_FEAR
+f:SPEED
 
 # Draconic - anything but Devotion and Protection from Evil
 N:211:Draconic
@@ -2635,16 +3111,27 @@ X:B:0:30
 W:25:5:50:1000
 C:0:0:0:0
 R:100
-F:IGNORE_ACID | IGNORE_FIRE | IGNORE_COLD | IGNORE_ELEC |
-F:RES_ACID | RES_FIRE | RES_COLD | RES_ELEC | R_ANY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:R_ANY
 R:20
-F:IM_FIRE | R_HIGH
+F:IM_FIRE
+F:R_HIGH
 R:15
-F:IM_COLD | R_HIGH
+F:IM_COLD
+F:R_HIGH
 R:10
-F:IM_ELEC | R_HIGH
+F:IM_ELEC
+F:R_HIGH
 R:5
-F:IM_ACID | R_HIGH
+F:IM_ACID
+F:R_HIGH
 R:1
 F:IM_NETHER
 
@@ -2659,10 +3146,19 @@ X:A:0:30
 W:0:5:30:0
 C:0:0:0:-10
 R:100
-F:IGNORE_ACID | IGNORE_FIRE | IGNORE_COLD | IGNORE_ELEC |
-F:CURSED | HEAVY_CURSE | AUTO_CURSE | AGGRAVATE
+F:AGGRAVATE
+F:AUTO_CURSE
+F:CURSED
+F:HEAVY_CURSE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 R:50
-F:R_STAT | CURSED | HEAVY_CURSE | AUTO_CURSE
+F:AUTO_CURSE
+F:CURSED
+F:HEAVY_CURSE
+F:R_STAT
 
 #Horns of Ulmo (Ulumuri)
 
@@ -2672,8 +3168,12 @@ X:A:0:80
 W:0:5:80:5000
 C:0:0:0:0
 R:100
-F:IGNORE_ACID | IGNORE_FIRE | IGNORE_COLD | IGNORE_ELEC |
-F:PVAL_M5 | R_IMMUNITY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:PVAL_M5
+F:R_IMMUNITY
 
 # Reverse Armour of the Maiar (of the Chosen in T-Plus)
 N:215:of the Fallen
@@ -2683,14 +3183,30 @@ X:A:30:30
 W:0:3:45:0
 C:0:0:-15:0
 R:25
-F:CURSED | AUTO_CURSE | ESP_GOOD | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD |
+F:AUTO_CURSE
+F:CURSED
+F:ESP_GOOD
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
 R:50
-F:CURSED | AUTO_CURSE | R_LOW | SUSTAIN | AGGRAVATE
+F:AGGRAVATE
+F:AUTO_CURSE
+F:CURSED
+F:R_LOW
+F:SUSTAIN
 R:75
-F:CURSED | AUTO_CURSE | WRAITH | DRAIN_EXP | 
+F:AUTO_CURSE
+F:CURSED
+F:DRAIN_EXP
+F:WRAITH
 R:100
-F:CURSED | AUTO_CURSE | DRAIN_MANA | DRAIN_HP | BLACK_BREATH
+F:AUTO_CURSE
+F:BLACK_BREATH
+F:CURSED
+F:DRAIN_HP
+F:DRAIN_MANA
 
 ###Reverse Weapons of the Maiar (of the Chosen in T-Plus)
 N:216:of the Fallen
@@ -2703,16 +3219,36 @@ X:A:24:35
 W:0:5:45:0
 C:+6:+6:-5:-3
 R:100
-F:NEVER_BLOW | IM_NETHER | PERMA_CURSE
+F:IM_NETHER
+F:NEVER_BLOW
+F:PERMA_CURSE
 R:50
-F:CURSED | HEAVY_CURSE | AUTO_CURSE | NO_MAGIC | CLONE
+F:AUTO_CURSE
+F:CLONE
+F:CURSED
+F:HEAVY_CURSE
+F:NO_MAGIC
 R:33
-F:CURSED | HEAVY_CURSE | AUTO_CURSE | DRAIN_EXP | DRAIN_MANA
+F:AUTO_CURSE
+F:CURSED
+F:DRAIN_EXP
+F:DRAIN_MANA
+F:HEAVY_CURSE
 R:10
-F:CURSED | HEAVY_CURSE | AUTO_CURSE | CHAOTIC | DRAIN_HP
+F:AUTO_CURSE
+F:CHAOTIC
+F:CURSED
+F:DRAIN_HP
+F:HEAVY_CURSE
 R:1
-F:R_STAT | CURSED | AUTO_CURSE | ESP_GOOD | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD |
+F:AUTO_CURSE
+F:CURSED
+F:ESP_GOOD
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:R_STAT
 
 # Robe of Fools (reverse of Ithryn/Archmagi in T-Plus)
 N:217:of the Fools
@@ -2721,11 +3257,22 @@ X:A:30:30
 W:0:3:45:0
 C:-5:-5:-15:-2
 R:100
-F:CURSED | HEAVY_CURSE | AUTO_CURSE | LIFE
+F:AUTO_CURSE
+F:CURSED
+F:HEAVY_CURSE
+F:LIFE
 R:33
-F:CURSED | HEAVY_CURSE | AUTO_CURSE | RES_DISEN | SPELL | NO_MAGIC | 
+F:AUTO_CURSE
+F:CURSED
+F:HEAVY_CURSE
+F:NO_MAGIC
+F:RES_DISEN
+F:SPELL
 R:10
-F:CURSED | HEAVY_CURSE | AUTO_CURSE | MANA | 
+F:AUTO_CURSE
+F:CURSED
+F:HEAVY_CURSE
+F:MANA
 
 # Robe of Vice (reverse of Sanctity in T-Plus)
 N:218:of Vice
@@ -2734,9 +3281,14 @@ X:A:30:30
 W:0:3:45:0
 C:0:0:-15:-2
 R:100
-F:CURSED | HEAVY_CURSE | AUTO_CURSE | LIFE | AGGRAVATE
+F:AGGRAVATE
+F:AUTO_CURSE
+F:CURSED
+F:HEAVY_CURSE
+F:LIFE
 R:33
-F:ESP_GOOD | ANTIMAGIC_50
+F:ANTIMAGIC_50
+F:ESP_GOOD
 
 # Soft and Hard Armour of Sensitivity, no paper armour
 N:219:of Sensitivity
@@ -2749,7 +3301,9 @@ X:A:30:30
 W:0:3:45:0
 C:0:0:-5:-2
 R:100
-F:CURSED | SENS_FIRE | R_STAT | 
+F:CURSED
+F:R_STAT
+F:SENS_FIRE
 
 # Elemental ammo
 N:220:Elemental
@@ -2760,16 +3314,20 @@ X:B:30:30
 W:0:1:50:1000
 C:5:5:0:0
 R:100
-F:BRAND_ACID | IGNORE_ACID
-F:BRAND_ELEC | IGNORE_ELEC
-F:BRAND_FIRE | IGNORE_FIRE
-F:BRAND_COLD | IGNORE_COLD
-F:BRAND_POIS |  
-f:BRAND_ACID | 
-f:BRAND_ELEC | 
-f:BRAND_FIRE | 
-f:BRAND_COLD | 
-f:BRAND_POIS | 
+F:BRAND_ACID
+F:BRAND_COLD
+F:BRAND_ELEC
+F:BRAND_FIRE
+F:BRAND_POIS
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+f:BRAND_ACID
+f:BRAND_COLD
+f:BRAND_ELEC
+f:BRAND_FIRE
+f:BRAND_POIS
 
 # Cursed ammo
 
@@ -2781,7 +3339,8 @@ X:A:30:30
 W:0:1:50:0
 C:-10:-10:0:0
 R:100
-F:CURSED | IMMOVABLE
+F:CURSED
+F:IMMOVABLE
 
 # Bows of Numenor
 
@@ -2791,8 +3350,13 @@ X:A:50:50
 W:0:1:50:0
 C:10:10:0:3
 R:100
-F:DEX | XTRA_MIGHT | XTRA_SHOTS | 
-F:RES_FEAR | RES_POIS | RES_DARK | FREE_ACT
+F:DEX
+F:FREE_ACT
+F:RES_DARK
+F:RES_FEAR
+F:RES_POIS
+F:XTRA_MIGHT
+F:XTRA_SHOTS
 
 # Lights of Valinor (no refillable lights)
 
@@ -2802,9 +3366,20 @@ X:A:60:60
 W:0:2:60:45000
 C:0:0:0:2
 R:100
-F:STR | INT | WIS | DEX | CON | CHR
+F:CHR
+F:CON
+F:DEX
 F:ESP_ALL
-f:STR | INT | WIS| DEX | CON | CHR | ESP_ALL
+F:INT
+F:STR
+F:WIS
+f:CHR
+f:CON
+f:DEX
+f:ESP_ALL
+f:INT
+f:STR
+f:WIS
 
 # Lucky weapons - named after smith of legend
 N:224:of Telchar
@@ -2815,7 +3390,9 @@ T:24:0:99
 X:A:70:70
 W:10:2:70:3000
 C:10:10:0:2
-r:F:CURSED | HEAVY_CURSE | AUTO_CURSE
+r:F:AUTO_CURSE
+r:F:CURSED
+r:F:HEAVY_CURSE
 R:100
 F:LUCK
 f:LUCK
@@ -2830,8 +3407,16 @@ X:A:50:50
 W:0:2:50:0
 C:5:5:0:-2
 R:100
-F:LUCK | CURSED | HEAVY_CURSE | AUTO_CURSE | AGGRAVATE
-f:LUCK | CURSED | HEAVY_CURSE | AUTO_CURSE | AGGRAVATE
+F:AGGRAVATE
+F:AUTO_CURSE
+F:CURSED
+F:HEAVY_CURSE
+F:LUCK
+f:AGGRAVATE
+f:AUTO_CURSE
+f:CURSED
+f:HEAVY_CURSE
+f:LUCK
 
 # Holy ammo - based on 'Of Holy Might' from Hengband
 N:226:Blessed
@@ -2842,8 +3427,13 @@ X:B:30:30
 W:0:5:60:600
 C:5:10:0:0
 R:100
-F:SLAY_EVIL | SLAY_DEMON | SLAY_UNDEAD | BRAND_FIRE | BLESSED
-F:IGNORE_FIRE | IGNORE_ACID
+F:BLESSED
+F:BRAND_FIRE
+F:IGNORE_ACID
+F:IGNORE_FIRE
+F:SLAY_DEMON
+F:SLAY_EVIL
+F:SLAY_UNDEAD
 
 # Holy Avenger weapons brought back, modified
 N:227:(Holy Avenger)
@@ -2855,9 +3445,13 @@ X:A:50:50
 W:0:2:60:20000
 C:5:5:0:3
 R:100
-F:WIS | SUSTAIN | 
-F:SLAY_EVIL | SLAY_UNDEAD | SLAY_DEMON | 
-F:SEE_INVIS | BLESSED
+F:BLESSED
+F:SEE_INVIS
+F:SLAY_DEMON
+F:SLAY_EVIL
+F:SLAY_UNDEAD
+F:SUSTAIN
+F:WIS
 
 # A Whip of the Balroeg, adapted from Oangband
 N:228:of the Balroeg
@@ -2866,8 +3460,12 @@ X:A:50:50
 W:0:3:50:12000
 C:-10:10:0:-3
 R:100
-F:STEALTH | BRAND_FIRE | RES_FIRE | LITE2 | 
-F:IGNORE_FIRE | ESP_GOOD | 
+F:BRAND_FIRE
+F:ESP_GOOD
+F:IGNORE_FIRE
+F:LITE2
+F:RES_FIRE
+F:STEALTH
 R:5
 F:IM_FIRE
 
@@ -2880,7 +3478,9 @@ X:A:25:10
 W:0:3:50:0
 C:0:0:0:-1
 r:F:BLESSED
-F:DRAIN_EXP | SEE_INVIS | CHR
+F:CHR
+F:DRAIN_EXP
+F:SEE_INVIS
 
 # Magical missile launchers
 # Tiny mana boost for magic-using archers or warrior-types
@@ -2904,13 +3504,23 @@ T:45:0:56
 T:45:59:99
 W:5:1:10:2000
 C:0:0:0:0
-r:F:CURSED | HEAVY_CURSE | AUTO_CURSE
+r:F:AUTO_CURSE
+r:F:CURSED
+r:F:HEAVY_CURSE
 R:100
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
-f:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+f:IGNORE_ACID
+f:IGNORE_COLD
+f:IGNORE_ELEC
+f:IGNORE_FIRE
 R:50
-F:SPELL_CONTAIN | WIELD_CAST
-f:SPELL_CONTAIN | WIELD_CAST
+F:SPELL_CONTAIN
+F:WIELD_CAST
+f:SPELL_CONTAIN
+f:WIELD_CAST
 
 # Magestaves of Sorcery, added in Theme 1.0.1
 N:232:of Sorcery
@@ -2918,9 +3528,13 @@ X:A:24:60
 T:6:0:99
 W:30:1:8:100000
 C:-80:-80:0:3
-r:F:CURSED | HEAVY_CURSE | PERMA_CURSE
+r:F:CURSED
+r:F:HEAVY_CURSE
+r:F:PERMA_CURSE
 R:100
-F:MANA | SPELL | LIFE
+F:LIFE
+F:MANA
+F:SPELL
 R:50
 F:PVAL_M2
 
@@ -2933,7 +3547,9 @@ T:24:0:99
 X:A:70:70
 W:0:2:70:50000
 C:1:1:0:0
-r:F:CURSED | HEAVY_CURSE | AUTO_CURSE
+r:F:AUTO_CURSE
+r:F:CURSED
+r:F:HEAVY_CURSE
 R:100
 F:LEVELS
 f:LEVELS
@@ -2945,8 +3561,15 @@ X:A:25:20
 W:50:2:21:50000
 C:10:10:0:2
 R:100
-F:CON | XTRA_MIGHT | XTRA_SHOTS | RES_POIS | STEALTH
-F:IGNORE_ACID | IGNORE_FIRE | HIDE_TYPE | SEE_INVIS
+F:CON
+F:HIDE_TYPE
+F:IGNORE_ACID
+F:IGNORE_FIRE
+F:RES_POIS
+F:SEE_INVIS
+F:STEALTH
+F:XTRA_MIGHT
+F:XTRA_SHOTS
 
 # Spear of Mirkwood, added in Theme 1.0.2
 N:235:of Mirkwood
@@ -2954,16 +3577,32 @@ T:22:2:2
 X:A:24:35
 W:40:25:100:50000
 C:15:15:20:3
-r:F:CURSED | HEAVY_CURSE | AUTO_CURSE
+r:F:AUTO_CURSE
+r:F:CURSED
+r:F:HEAVY_CURSE
 R:100
-F:STEALTH | HOLD_LIFE | SEE_INVIS | CON |
-F:RES_FEAR | RES_DARK | RES_LITE | RES_BLIND |
-F:IGNORE_ACID | IGNORE_FIRE |
-F:R_ANY | R_LOW | SUSTAIN
+F:CON
+F:HOLD_LIFE
+F:IGNORE_ACID
+F:IGNORE_FIRE
+F:RES_BLIND
+F:RES_DARK
+F:RES_FEAR
+F:RES_LITE
+F:R_ANY
+F:R_LOW
+F:SEE_INVIS
+F:STEALTH
+F:SUSTAIN
 R:30
-F:R_ANY | R_LOW | SUSTAIN
+F:R_ANY
+F:R_LOW
+F:SUSTAIN
 R:20
-F:R_ANY | R_LOW | SUSTAIN | R_HIGH
+F:R_ANY
+F:R_HIGH
+F:R_LOW
+F:SUSTAIN
 
 # Dwarven jewelry - no speed rings; added in Theme 1.1.4
 N:236:Dwarven
@@ -2979,7 +3618,8 @@ Z:stone to mud
 R:50
 F:SUSTAIN
 R:25
-F:R_ANY | SUSTAIN
+F:R_ANY
+F:SUSTAIN
 R:5
 F:CON
 
diff --git a/lib/mods/theme/edit/evil.map b/lib/mods/theme/edit/evil.map
index a2f00914..aff2de9b 100644
--- a/lib/mods/theme/edit/evil.map
+++ b/lib/mods/theme/edit/evil.map
@@ -14,13 +14,13 @@ F:<:6:0
 F:.:88:0
 
 # Lesser Balrog
-F:b:88:0:996:0:0:0:0:0:0:2
+F:b:88:0:996:0:0:0:0:0:2
 
 # Greater Balrog
-F:B:88:0:807:0:0:0:0:0:0:2
+F:B:88:0:807:0:0:0:0:0:2
 
 # Pit Fiend
-F:P:88:0:812:0:0:0:0:0:0:2
+F:P:88:0:812:0:0:0:0:0:2
 
 # Dungeon layout
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
diff --git a/lib/mods/theme/edit/f_info.txt b/lib/mods/theme/edit/f_info.txt
index dbfec51a..c4d2f149 100644
--- a/lib/mods/theme/edit/f_info.txt
+++ b/lib/mods/theme/edit/f_info.txt
@@ -15,11 +15,6 @@
 # Note that terrain feature zero contains the "darkness" picture.
 
 
-# Version stamp (required)
-
-V:2.0.0
-
-
 # 0x00 --> nothing
 
 N:0:nothing
@@ -30,39 +25,62 @@ F:FLOOR
 
 N:1:open floor
 G:.:w
-F:FLOOR | DONT_NOTICE_RUNNING | SUPPORT_LIGHT | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
+F:SUPPORT_LIGHT
 
 # 0x02 -> fountain
 N:2:fountain
 G:_:w
-F:FLOOR | NOTICE | REMEMBER | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 D:0:The liquid here seems magical.
 
 # 0x03 --> glyph of warding
 
 N:3:glyph of warding
 G:;:y
-F:FLOOR | NOTICE | SUPPORT_LIGHT | CAN_RUN | REMEMBER
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:REMEMBER
+F:SUPPORT_LIGHT
 D:0:There is a mighty spell of protection here.
 
 # 0x04 --> open door
 
 N:4:open door
 G:':U
-F:FLOOR | NOTICE | REMEMBER | CAN_RUN | DOOR
+F:CAN_RUN
+F:DOOR
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 # 0x05 --> broken door
 
 N:5:broken door
 G:':U
-F:FLOOR | NOTICE | REMEMBER | CAN_RUN | DOOR
+F:CAN_RUN
+F:DOOR
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 # 0x06 --> up stairs (perm)
 
 N:6:up staircase
 G:<:w
-F:FLOOR | PERMANENT | NOTICE | SUPPORT_LIGHT | REMEMBER | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
+F:SUPPORT_LIGHT
 D:0:There is an up staircase here.
 D:1:You cannot tunnel a stair.
 
@@ -70,60 +88,102 @@ D:1:You cannot tunnel a stair.
 
 N:7:down staircase
 G:>:w
-F:FLOOR | PERMANENT | NOTICE | SUPPORT_LIGHT | REMEMBER | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
+F:SUPPORT_LIGHT
 D:0:There is a down staircase here.
 D:1:You cannot tunnel a stair.
 
 N:8:quest entrance
 G:>:y
-F:FLOOR | PERMANENT | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 D:1:You cannot tunnel a quest entrance.
 
 N:9:quest exit
 G:<:y
-F:FLOOR | PERMANENT | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 D:1:You cannot tunnel a quest exit.
 
 N:10:quest down level
 G:>:r
-F:FLOOR | PERMANENT | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 
 N:11:quest up level
 G:<:r
-F:FLOOR | PERMANENT | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 
 N:12:town exit
 G:>:g
-F:FLOOR | PERMANENT | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 
 N:13:shaft down
 G:>:U
-F:FLOOR | PERMANENT | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 D:0:There is a shaft down here.
 D:1:You cannot tunnel a shaft.
 
 N:14:shaft up
 G:<:U
-F:FLOOR | PERMANENT | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 D:0:There is a shaft up here.
 D:1:You cannot tunnel a shaft.
 
 # 0x0F -> empty fountain
 N:15:fountain
 G:_:D
-F:FLOOR | NOTICE | REMEMBER | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 D:0:The fountain seems empty.
 
 N:16:web
 G:+:y
-F:CAN_PASS | NOTICE | WEB | NOTICE | TUNNELABLE
+F:CAN_PASS
+F:NOTICE
+F:NOTICE
+F:TUNNELABLE
+F:WEB
 D:1:You tunnel through the web.
 D:2:a web blocking your way
 
 # Trap -- the flags are not used by the program
 N:17:trap
 G:^:w
-F:FLOOR | NOTICE | REMEMBER
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 # 0x12 --> 0x1F -- UNUSED
 
@@ -132,8 +192,14 @@ F:FLOOR | NOTICE | REMEMBER
 N:32:door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | REMEMBER | DOOR
+F:CAN_PASS
+F:DOOR
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> locked door (power 1)
@@ -141,8 +207,14 @@ D:1:You bash the boor.
 N:33:locked door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | REMEMBER | DOOR
+F:CAN_PASS
+F:DOOR
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> locked door (power 2)
@@ -150,8 +222,14 @@ D:1:You bash the boor.
 N:34:locked door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | REMEMBER | DOOR
+F:CAN_PASS
+F:DOOR
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> locked door (power 3)
@@ -159,8 +237,14 @@ D:1:You bash the boor.
 N:35:locked door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | REMEMBER | DOOR
+F:CAN_PASS
+F:DOOR
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> locked door (power 4)
@@ -168,8 +252,14 @@ D:1:You bash the boor.
 N:36:locked door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | REMEMBER | DOOR
+F:CAN_PASS
+F:DOOR
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> locked door (power 5)
@@ -177,8 +267,14 @@ D:1:You bash the boor.
 N:37:locked door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | REMEMBER | DOOR
+F:CAN_PASS
+F:DOOR
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> locked door (power 6)
@@ -186,8 +282,14 @@ D:1:You bash the boor.
 N:38:locked door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | REMEMBER | DOOR
+F:CAN_PASS
+F:DOOR
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> locked door (power 7)
@@ -195,8 +297,14 @@ D:1:You bash the boor.
 N:39:locked door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | REMEMBER | DOOR
+F:CAN_PASS
+F:DOOR
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> jammed door (power 0)
@@ -204,8 +312,13 @@ D:1:You bash the boor.
 N:40:jammed door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | REMEMBER | NOTICE
+F:CAN_PASS
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> jammed door (power 1)
@@ -213,8 +326,13 @@ D:1:You bash the boor.
 N:41:jammed door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | REMEMBER | NOTICE
+F:CAN_PASS
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> jammed door (power 2)
@@ -222,8 +340,13 @@ D:1:You bash the boor.
 N:42:jammed door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | REMEMBER | NOTICE
+F:CAN_PASS
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> jammed door (power 3)
@@ -231,8 +354,13 @@ D:1:You bash the boor.
 N:43:jammed door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | REMEMBER | NOTICE
+F:CAN_PASS
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> jammed door (power 4)
@@ -240,8 +368,13 @@ D:1:You bash the boor.
 N:44:jammed door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | REMEMBER | NOTICE
+F:CAN_PASS
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> jammed door (power 5)
@@ -249,8 +382,13 @@ D:1:You bash the boor.
 N:45:jammed door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | REMEMBER | NOTICE
+F:CAN_PASS
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> jammed door (power 6)
@@ -258,8 +396,13 @@ D:1:You bash the boor.
 N:46:jammed door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | REMEMBER | NOTICE
+F:CAN_PASS
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x2x --> jammed door (power 7)
@@ -267,8 +410,13 @@ D:1:You bash the boor.
 N:47:jammed door
 G:+:U
 M:32
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | REMEMBER | NOTICE
+F:CAN_PASS
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:REMEMBER
 F:TUNNELABLE
+F:WALL
 D:1:You bash the boor.
 
 # 0x30 --> secret door
@@ -276,36 +424,55 @@ D:1:You bash the boor.
 N:48:secret door
 G:#:w
 M:56
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | DOOR
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:DOOR
+F:NO_VISION
+F:NO_WALK
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel.
 
 # 0x31 --> rubble
 
 N:49:pile of rubble
 G:::w
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE
-F:CAN_FLY | SUPPORT_LIGHT
+F:CAN_FLY
+F:CAN_PASS
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You dig in the rubble.
 
 # 0x32 --> magma vein
 
 N:50:magma vein
 G:%:s
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the magma vein.
 
 # 0x33 --> quartz vein
 
 N:51:quartz vein
 G:%:w
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the quartz vein.
 
 # 0x34 --> magma vein + treasure
@@ -313,9 +480,14 @@ D:1:You tunnel into the quartz vein.
 N:52:magma vein
 G:%:s
 M:50
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the magma vein.
 
 # 0x35 --> quartz vein + treasure
@@ -323,36 +495,55 @@ D:1:You tunnel into the magma vein.
 N:53:quartz vein
 G:%:w
 M:51
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the quartz vein.
 
 # 0x36 --> magma vein + known treasure
 
 N:54:magma vein with treasure
 G:*:o
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the magma vein.
 
 # 0x37 --> quartz vein + known treasure
 
 N:55:quartz vein with treasure
 G:*:o
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the quartz vein.
 
 # 0x38 --> granite wall -- basic
 
 N:56:granite wall
 G:#:w
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the granite wall.
 
 # 0x39 --> granite wall -- inner
@@ -360,9 +551,13 @@ D:1:You tunnel into the granite wall.
 N:57:granite wall
 G:#:w
 M:56
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the granite wall.
 
 # 0x3A --> granite wall -- outer
@@ -370,9 +565,13 @@ D:1:You tunnel into the granite wall.
 N:58:granite wall
 G:#:w
 M:56
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the granite wall.
 
 # 0x3B --> granite wall -- solid
@@ -380,233 +579,347 @@ D:1:You tunnel into the granite wall.
 N:59:granite wall
 G:#:w
 M:56
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the granite wall.
 
 # 0x3C --> permanent wall -- basic (perm)
 
 N:60:permanent wall
 G:#:w
-F:WALL | NO_WALK | NO_VISION | PERMANENT | SUPPORT_LIGHT
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 
 # 0x3D --> permanent wall -- inner (perm)
 
 N:61:permanent wall
 G:#:w
 M:60
-F:WALL | NO_WALK | NO_VISION | PERMANENT | SUPPORT_LIGHT
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 
 # 0x3E --> permanent wall -- outer (perm)
 
 N:62:permanent wall
 G:#:w
 M:60
-F:WALL | NO_WALK | NO_VISION | PERMANENT | SUPPORT_LIGHT
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 
 # 0x3F --> permanent wall -- solid (perm)
 
 N:63:permanent wall
 G:#:w
 M:60
-F:WALL | NO_WALK | NO_VISION | PERMANENT | SUPPORT_LIGHT
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 
 N:64:explosive rune
 G:*:R
-F:FLOOR | CAN_LEVITATE | CAN_FLY | NOTICE | SUPPORT_LIGHT
+F:CAN_FLY
+F:CAN_LEVITATE
+F:FLOOR
+F:NOTICE
+F:SUPPORT_LIGHT
 D:0:This rune seems unstable.
 
 N:65:Straight Road startpoint
 G:*:w
-F:FLOOR | REMEMBER | NOTICE
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 N:66:section of the Straight Road
 G:*:B
-F:FLOOR | REMEMBER | NOTICE
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 N:67:section of the Straight Road
 G:*:b
-F:FLOOR | REMEMBER | NOTICE
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 N:68:section of the Straight Road
 G:*:B
-F:FLOOR | REMEMBER | NOTICE
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 N:69:section of the Straight Road
 G:*:b
-F:FLOOR | REMEMBER | NOTICE
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 N:70:section of the Straight Road
 G:*:W
-F:FLOOR | REMEMBER | NOTICE
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 N:71:section of the Straight Road (discharged)
 G:*:W
-F:FLOOR | REMEMBER | NOTICE
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 N:72:Straight Road exit
 G:*:w
-F:FLOOR | REMEMBER | NOTICE
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 N:73:corrupted section of the Straight Road
 G:*:D
-F:FLOOR | REMEMBER | NOTICE
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 
 # 74 --> shop
 
 N:74:Building
 G:1:U
-F:FLOOR | PERMANENT | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 
 # 75 --> 78 Quests index
 
 N:75:permanent wall
 G:#:w
-F:WALL | NO_WALK | NO_VISION | PERMANENT | SUPPORT_LIGHT
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 
 N:76:permanent wall
 G:#:w
-F:WALL | NO_WALK | NO_VISION | PERMANENT | SUPPORT_LIGHT
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 
 N:77:permanent wall
 G:#:w
-F:WALL | NO_WALK | NO_VISION | PERMANENT | SUPPORT_LIGHT
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 
 N:78:permanent wall
 G:#:w
-F:WALL | NO_WALK | NO_VISION | PERMANENT | SUPPORT_LIGHT
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 
 #Elanor
 N:79:grass with Elanor flowers
 G:&:y
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
 
 #Fumellar
 N:80:grass with Fumella flowers
 G:;:r
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
 
 #Anemones
 N:81:grass with anemones
 G:;:v
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
 
 #Niphredil
 N:82:grass with Niphredil flowers
 G:;:w
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
 
 #Iris
 N:83:grass with irises
 G:;:b
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
 
 N:84:stream of shallow water
 G:~:B
 S:B:B:B:B:B:B:b
 F:ATTR_MULTI
-F:FLOOR | CAN_LEVITATE | CAN_FLY | REMEMBER | SUPPORT_LIGHT | CAN_RUN
+F:CAN_FLY
+F:CAN_LEVITATE
+F:CAN_RUN
 F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:REMEMBER
 F:SUPPORT_GROWTH
+F:SUPPORT_LIGHT
 
 # -1 = player level
 N:85:pool of deep lava
 G:.:R
 E:-1d2:1:FIRE
-F:FLOOR | CAN_LEVITATE | CAN_FLY | REMEMBER | SUPPORT_LIGHT
+F:CAN_FLY
+F:CAN_LEVITATE
+F:FLOOR
+F:REMEMBER
+F:SUPPORT_LIGHT
 D:0:You move across the deep lava.
 
 N:86:stream of shallow lava
 G:.:r
 E:-1d1:1:FIRE
-F:FLOOR | CAN_LEVITATE | CAN_FLY | REMEMBER | SUPPORT_LIGHT
+F:CAN_FLY
+F:CAN_LEVITATE
+F:FLOOR
+F:REMEMBER
+F:SUPPORT_LIGHT
 D:0:You move across the shallow lava.
 
 N:87:dark pit
 G:#:D
-F:CAN_LEVITATE | CAN_FLY
-F:NO_WALK | SUPPORT_LIGHT
+F:CAN_FLY
+F:CAN_LEVITATE
 F:DONT_NOTICE_RUNNING
+F:NO_WALK
+F:SUPPORT_LIGHT
 D:0:Ohhh, it is dark and deep.
 
 N:88:dirt
 G:.:U
-F:FLOOR | SUPPORT_LIGHT | CAN_RUN
+F:CAN_RUN
 F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
+F:SUPPORT_LIGHT
 
 N:89:patch of grass
 G:.:G
-F:FLOOR | SUPPORT_LIGHT | CAN_RUN
+F:CAN_RUN
 F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
+F:SUPPORT_LIGHT
 
 N:90:ice
 G:.:W
 E:1d1:50:ICE
-F:FLOOR | NOTICE
+F:FLOOR
+F:NOTICE
 
 N:91:sand
 G:.:y
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
 
 N:92:dead tree
 G:#:D
-F:CAN_FLY | CAN_PASS
-F:WALL | NO_WALK | NO_VISION | NOTICE
+F:CAN_FLY
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
 F:TUNNELABLE
+F:WALL
 D:1:You chop away at the dead tree.
 D:2:a tree blocking your way
 
 N:93:ash
 G:.:s
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
 
 N:94:puddle of mud
 G:.:u
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
 
 N:95:ice wall
 G:#:W
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the ice wall... #BOh, chilly#w.
 D:2:an ice wall blocking your way
 
 N:96:tree
 G:#:G
-F:CAN_FLY | CAN_PASS | SUPPORT_LIGHT
-F:WALL | NO_WALK | NO_VISION
+F:CAN_FLY
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You chop away at the tree.
 D:2:a tree blocking your way
 
 N:97:mountain chain
 G:^:U
-F:CAN_CLIMB | CAN_PASS | SUPPORT_LIGHT
-F:WALL | NO_WALK | NO_VISION
+F:CAN_CLIMB
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
 F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 D:1:You cannot tunnel into such a hard stone.
 D:2:a hard stone block blocking your way
 
@@ -614,9 +927,12 @@ D:2:a hard stone block blocking your way
 
 N:98:sandwall
 G:#:y
-F:WALL | NO_WALK | CAN_PASS | NO_VISION
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
 F:TUNNELABLE
+F:WALL
 D:1:You easily dig into the sandwall.
 D:2:a sandwall blocking your way
 
@@ -625,9 +941,12 @@ D:2:a sandwall blocking your way
 N:99:sandwall
 G:%:y
 M:98
-F:WALL | NO_WALK | CAN_PASS | NO_VISION
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
 F:TUNNELABLE
+F:WALL
 D:1:You easily dig into the sandwall.
 D:2:a sandwall blocking your way
 
@@ -635,16 +954,23 @@ D:2:a sandwall blocking your way
 
 N:100:sandwall with treasure
 G:*:o
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
 F:TUNNELABLE
+F:WALL
 D:1:You easily tunnel into the sandwall.
 D:2:a sandwall blocking your way
 
 N:101:high mountain chain
 G:^:W
-F:WALL | NO_WALK | NO_VISION | PERMANENT
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 D:1:This rock is far too hard.
 D:2:a very hard stone block blocking your way
 
@@ -653,71 +979,112 @@ G:.:v
 S:v:R:r:v:R:r:D
 E:1d1:40:NETHER
 F:ATTR_MULTI
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 
 # A diggable glass wall.
 N:103:molten glass wall
 G:.:B
-F:NO_WALK | WALL | CAN_PASS | TUNNELABLE | NOTICE
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_WALK
+F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the molten glass wall...
 D:2:a molten glass wall blocking your way
 
 N:159:Void Jumpgate
 G:+:v
-F:FLOOR | REMEMBER | NOTICE | PERMANENT | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 D:0:A dark rift opens to the void here.
 
 N:160:Void Jumpgate
 G:+:v
-F:FLOOR | REMEMBER | NOTICE | PERMANENT | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 D:0:A dark rift opens to the void here.
 
 ###### Here are the altars. ######
 
 N:161:Altar of Being
 G:0:W
-F:FLOOR | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 D:0:You feel at peace.
 
 N:162:Altar of Winds
 G:0:B
-F:FLOOR | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 D:0:You grow a desire to become a bird.
 
 N:163:Altar of Force
 G:0:R
-F:FLOOR | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 D:0:You grow a desire to fight evil.
 
 N:164:Altar of Darkness
 G:0:D
-F:FLOOR | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 D:0:Images of pain and death fill your mind.
 
 N:165:Altar of Nature
 G:0:g
-F:FLOOR | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 D:0:You feel the desire to walk in a great forest.
 
 N:166:Altar of Stone
 G:0:s
-F:FLOOR | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 D:0:You grow a desire to forge items.
 
 N:167:Altar of Light
 G:0:y
-F:FLOOR | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 D:0:You grow a desire to light up dark places.
 
 N:168:Altar of Waters
 G:0:b
-F:FLOOR | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 D:0:You grow a desire to bathe in the ocean.
 
 N:169:Altar of Doom
 G:0:o
-F:FLOOR | REMEMBER | NOTICE | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:REMEMBER
 D:0:You grow a desire to do justice.
 
 # XXX
@@ -732,20 +1099,30 @@ D:0:You grow a desire to do justice.
 # Used as a marker for random quests
 N:172:open floor
 G:.:w
-F:FLOOR | CAN_RUN | DONT_NOTICE_RUNNING
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
 
 # Underground Tunnel
 N:173:Underground Tunnel
 G:#:s
-F:FLOOR | REMEMBER | SUPPORT_LIGHT | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:REMEMBER
+F:SUPPORT_LIGHT
 D:0:Oh, an underground tunnel!
 
 # Tainted water
 N:174:stream of tainted water
 G:~:u
-F:FLOOR | CAN_LEVITATE | CAN_FLY | REMEMBER | SUPPORT_LIGHT
+F:CAN_FLY
+F:CAN_LEVITATE
 F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:REMEMBER
+F:SUPPORT_LIGHT
 
 N:175:monster trap
 G:;:v
@@ -753,14 +1130,22 @@ F:FLOOR
 
 N:176:Void Jumpgate
 G:+:v
-F:FLOOR | REMEMBER | NOTICE | PERMANENT | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 D:0:A dark rift opens to the void here.
 
 N:177:lava wall
 G:#:R
 S:R:R:r:r:U:u:R
 F:ATTR_MULTI
-F:WALL | NO_WALK | NO_VISION | PERMANENT | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 D:1:The lava is far too hot to tunnel into it.
 D:2:a lava wall blocking your way
 
@@ -769,33 +1154,51 @@ G:%:v
 S:R:R:y:v:y:v:R
 E:150d2:1:HELL_FIRE
 F:ATTR_MULTI
-F:FLOOR | REMEMBER | NOTICE | PERMANENT
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 D:0:This fire is so powerful it could destroy even the most powerful artifacts.
 
 N:179:path to the next area
 G:>:w
-F:FLOOR | PERMANENT | NOTICE | REMEMBER | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 D:0:There is a path leading to the next area here.
 D:1:You cannot tunnel a path.
 
 N:180:path to the previous area
 G:<:w
-F:FLOOR | PERMANENT | NOTICE | REMEMBER | CAN_RUN
+F:CAN_RUN
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 D:0:There is a path leading to the previous area here.
 D:1:You cannot tunnel a path.
 
 N:181:field
 G:::g
-F:FLOOR | PERMANENT | NOTICE | REMEMBER
 F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
 D:1:You cannot tunnel a field.
 
 N:182:Ekkaia, the Encircling Sea
 G:*:b
 S:b:b:b:b:b:b:B
 F:ATTR_MULTI
-F:WALL | NO_WALK | NO_VISION | PERMANENT | SUPPORT_LIGHT
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 
 N:183:void
 G: :d
@@ -809,97 +1212,159 @@ N:187:pool of deep water
 G:~:b
 S:b:b:b:b:b:b:B
 F:ATTR_MULTI
-F:FLOOR | CAN_LEVITATE | CAN_FLY | REMEMBER | SUPPORT_LIGHT
+F:CAN_FLY
+F:CAN_LEVITATE
+F:FLOOR
+F:REMEMBER
+F:SUPPORT_LIGHT
 
 # Glass wall -- can see but not pass
 N:188:glass wall
 G:.:B
-F:NO_WALK | WALL | PERMANENT | NOTICE
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_WALK
+F:PERMANENT
+F:WALL
 D:1:This glass seems to be totaly impenetrable.
 D:2:a glass wall blocking your way
 
 # Illusion wall -- can't see but can pass
 N:189:illusion wall
 G:#:w
-F:FLOOR | NO_VISION | REMEMBER | SUPPORT_LIGHT | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:NO_VISION
+F:REMEMBER
+F:SUPPORT_LIGHT
 D:0:Looks like this wall is not so real.
 
 # Grass roof
 N:190:Grass roof
 G:#:y
-F:WALL | NO_WALK | NO_VISION | PERMANENT | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 
 # grass roof top
 N:191:grass roof top
 G:#:y
-F:WALL | NO_WALK | NO_VISION | PERMANENT | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 
 # grass roof chimney
 N:192:grass roof chimney
 G:#:y
-F:WALL | NO_WALK | NO_VISION | PERMANENT | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 
 # brick roof
 N:193:brick roof
 G:#:r
-F:WALL | NO_WALK | NO_VISION | PERMANENT | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 
 # brick roof top
 N:194:brick roof top
 G:#:r
-F:WALL | NO_WALK | NO_VISION | PERMANENT | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 
 # brick roof chimney
 N:195:brick roof chimney
 G:#:r
-F:WALL | NO_WALK | NO_VISION | PERMANENT | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 
 # window
 N:196:window
 G:#:w
-F:WALL | NO_WALK | NO_VISION | PERMANENT | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 
 # small window
 N:197:small window
 G:#:w
-F:WALL | NO_WALK | NO_VISION | PERMANENT | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 
 # rain barrel
 N:198:rain barrel
 G:#:w
-F:WALL | NO_WALK | NO_VISION | PERMANENT | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 
 # grass with Kingsfoil flowers
 N:199:grass with Kingsfoil flowers
 G:;:G
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
 
 # cobblestone road
 N:200:cobblestone road
 G:.:w
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 
 # cobblestone with outlet
 N:201:cobblestone with outlet
 G:.:w
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 
 N:202:small tree
 G:#:g
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN | SUPPORT_LIGHT | REMEMBER
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:NO_VISION
+F:REMEMBER
+F:SUPPORT_LIGHT
 
 # Just to have a town entrance picture
 N:203:town
 G:*:w
-F:FLOOR | NOTICE
+F:FLOOR
+F:NOTICE
 
 # Underground Tunnel
 N:204:Underground Tunnel
 G:^:U
-F:FLOOR | REMEMBER | SUPPORT_LIGHT | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:REMEMBER
+F:SUPPORT_LIGHT
 D:0:Oh, an underground tunnel!
 
 # Fire
@@ -909,108 +1374,166 @@ S:y:y:y:R:r:y:R
 E:-1d2:1:FIRE
 D:0:The blazing fire burns you!
 F:ATTR_MULTI
-F:FLOOR | CAN_FLY | REMEMBER | SUPPORT_LIGHT
+F:CAN_FLY
 F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:REMEMBER
+F:SUPPORT_LIGHT
 
 # Permanent rubble -- town use
 N:206:pile of rubble
 G:::w
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE
-F:CAN_FLY | SUPPORT_LIGHT | PERMANENT
+F:CAN_FLY
+F:CAN_PASS
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 D:1:Looks like this pile of rubble is quite hard.
 
 # Rocky ground - rougher terrain.
 N:207:rocky ground
 G:.:s
-F:FLOOR | SUPPORT_LIGHT | CAN_RUN
+F:CAN_RUN
 F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:SUPPORT_LIGHT
 
 # cloud-like vapour. Floor for Eru's temple
 N:208:cloud-like vapour
 G:.:W
 S:W:B:B:W:w:W:B
-F:FLOOR | CAN_LEVITATE | CAN_FLY | SUPPORT_LIGHT 
-F:ATTR_MULTI | CAN_RUN | DONT_NOTICE_RUNNING
+F:ATTR_MULTI
+F:CAN_FLY
+F:CAN_LEVITATE
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:SUPPORT_LIGHT
 
 # condensing water
 N:209:condensing water
 G:~:B
 S:B:B:B:B:B:B:b
 F:ATTR_MULTI
-F:FLOOR | CAN_LEVITATE | CAN_FLY | REMEMBER | SUPPORT_LIGHT | CAN_RUN
+F:CAN_FLY
+F:CAN_LEVITATE
+F:CAN_RUN
 F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:REMEMBER
+F:SUPPORT_LIGHT
 
 # Dense mist. Can pass through, but not see through
 N:210:dense mist
 G:#:w
 S:w:W:s:s:s:w:w
-F:FLOOR | NO_VISION | REMEMBER | SUPPORT_LIGHT
-F:ATTR_MULTI | DONT_NOTICE_RUNNING
+F:ATTR_MULTI
+F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:NO_VISION
+F:REMEMBER
+F:SUPPORT_LIGHT
 D:0:You wander through the mist.
 D:1:You cannot tunnel through mist!
 
 # Hail-stone wall
 N:211:hail-stone wall
 G:#:W
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | SUPPORT_LIGHT
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the hail-stone wall.
 
 N:212:dead small tree
 G:#:D
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN | SUPPORT_LIGHT | REMEMBER
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:NO_VISION
+F:REMEMBER
+F:SUPPORT_LIGHT
 
 # Low hill
 N:213:low hill
 G:^:g
-F:FLOOR | DONT_NOTICE_RUNNING| CAN_RUN | SUPPORT_LIGHT | NO_VISION
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:NO_VISION
+F:SUPPORT_LIGHT
 D:0:You go over the hill.
 D:1:You cannot tunnel through that.
 
 #Angband and Mordor (Ered Lithui, Ephel Duath) mountains
 N:214:dark mountain chain
 G:^:D
-F:WALL | NO_WALK | NO_VISION | PERMANENT
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 D:1:This rock is far too hard.
 D:2:a very hard stone block blocking your way
 
 #Ered Luin - Blue Mountains
 N:215:blue mountain chain
 G:^:B
-F:CAN_CLIMB | CAN_PASS | SUPPORT_LIGHT
-F:WALL | NO_WALK | NO_VISION
+F:CAN_CLIMB
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
 F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 D:1:You cannot tunnel into such a hard stone.
 D:2:a hard stone block blocking your way
 
 #Ered Mithrin - Grey Mountains
 N:216:grey mountain chain
 G:^:s
-F:CAN_CLIMB | CAN_PASS | SUPPORT_LIGHT
-F:WALL | NO_WALK | NO_VISION
+F:CAN_CLIMB
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
 F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 D:1:You cannot tunnel into such a hard stone.
 D:2:a hard stone block blocking your way
 
 #Orodruin - Mount Doom
 N:217:part of Mount Doom
 G:^:R
-F:WALL | NO_WALK | NO_VISION | NOTICE | SUPPORT_LIGHT
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
 F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 D:1:You cannot tunnel through that.
 D:2:a stream of searing lava barring your way
 
 #Snow-capped peak
 N:218:snow-capped peak
 G:^:w
-F:WALL | NO_WALK | NO_VISION | NOTICE | SUPPORT_LIGHT
-F:DONT_NOTICE_RUNNING | PERMANENT
+F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 D:1:The ice is too cold to tunnel into it.
 D:2:an unusually thick wall of ice barring your way
 
@@ -1018,45 +1541,66 @@ D:2:an unusually thick wall of ice barring your way
 #BUG - these do not burn.
 N:219:fir tree
 G:#:g
-F:CAN_FLY | CAN_PASS | SUPPORT_LIGHT
-F:WALL | NO_WALK | NO_VISION
+F:CAN_FLY
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
 F:TUNNELABLE
+F:WALL
 D:1:You chop away at the fir tree.
 D:2:a fir tree blocking your way
 
 #section of a flet (wooden platforms built high up in the trees of Lothlórien)
 N:220:section of a flet
 G:_:u
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 
 #light post
 N:221:light post
 G:|:w
-F:WALL | NO_WALK | CAN_FLY | CAN_PASS
-F:SUPPORT_LIGHT | REMEMBER
+F:CAN_FLY
+F:CAN_PASS
+F:NO_WALK
+F:REMEMBER
+F:SUPPORT_LIGHT
+F:WALL
 D:1:You cannot tunnel a light post.
 D:2:A light post blocking your way
 
 #Water lily
 N:222:water lily
 G:;:B
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
 
 #Dead Marshes swamp water
 N:223:part of the Dead Marshes
 G:~:G
 E:10d10:6:CONFUSION
-F:FLOOR | CAN_LEVITATE | CAN_FLY | REMEMBER | SUPPORT_LIGHT
+F:CAN_FLY
+F:CAN_LEVITATE
+F:FLOOR
+F:REMEMBER
+F:SUPPORT_LIGHT
 
 #Morannon
 N:224:Black Gate
 G:+:D
-F:CAN_CLIMB | CAN_PASS | SUPPORT_LIGHT
-F:WALL | NO_WALK | NO_VISION | NOTICE 
+F:CAN_CLIMB
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
 F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 D:1:You cannot tunnel through that.
 D:2:a closed Black Gate blocking your way
 
@@ -1065,14 +1609,24 @@ N:225:river
 G:~:w
 S:w:w:w:B:w:w:B
 F:ATTR_MULTI
-F:FLOOR | CAN_LEVITATE | CAN_FLY | REMEMBER | SUPPORT_LIGHT | CAN_RUN
-F:DONT_NOTICE_RUNNING | SUPPORT_GROWTH 
+F:CAN_FLY
+F:CAN_LEVITATE
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:REMEMBER
+F:SUPPORT_GROWTH
+F:SUPPORT_LIGHT
 
 #Swamp
 N:226:swamp pool
 G:~:g
 E:1d1:1:POISON
-F:FLOOR | CAN_LEVITATE | CAN_FLY | REMEMBER | SUPPORT_LIGHT
+F:CAN_FLY
+F:CAN_LEVITATE
+F:FLOOR
+F:REMEMBER
+F:SUPPORT_LIGHT
 
 #Anduin river
 N:227:stream of the Anduin river
@@ -1080,14 +1634,23 @@ G:~:B
 E:1d1:1:WATER
 S:w:w:w:b:w:w:b
 F:ATTR_MULTI
-F:FLOOR | CAN_LEVITATE | CAN_FLY | REMEMBER | SUPPORT_LIGHT | SUPPORT_GROWTH
+F:CAN_FLY
+F:CAN_LEVITATE
+F:FLOOR
+F:REMEMBER
+F:SUPPORT_GROWTH
+F:SUPPORT_LIGHT
 
 #Road sign to Gondolin to avoid Maeglin quest silliness somewhat
 N:228:road sign that says 'Find Gondolin!'
 G:?:v
 S:v:R:B:G:w:v:R
 F:ATTR_MULTI
-F:WALL | PERMANENT | NOTICE | SUPPORT_LIGHT | REMEMBER | 
+F:NOTICE
+F:PERMANENT
+F:REMEMBER
+F:SUPPORT_LIGHT
+F:WALL
 
 ### New terrain features for town use ###
 
@@ -1095,8 +1658,15 @@ F:WALL | PERMANENT | NOTICE | SUPPORT_LIGHT | REMEMBER |
 N:229:beehive
 G:*:o
 E:1d1:1:POISON
-F:WALL | PERMANENT | CAN_FLY | REMEMBER | SUPPORT_LIGHT | 
-F:CAN_PASS | NO_WALK | NO_VISION | DONT_NOTICE_RUNNING | 
+F:CAN_FLY
+F:CAN_PASS
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:REMEMBER
+F:SUPPORT_LIGHT
+F:WALL
 D:0:Ouch! A bee stung you!
 D:1:You'll just get stung.
 D:2:a beehive blocking your way
@@ -1104,49 +1674,81 @@ D:2:a beehive blocking your way
 #Dirt road - same as dirt but more appropriate for towns
 N:230:dirt road
 G:.:U
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
 F:SUPPORT_GROWTH
 
 #Wide gate
 N:231:wide gate
 G:-:D
-F:WALL | PERMANENT | CAN_FLY | SUPPORT_LIGHT | NOTICE | 
-F:CAN_PASS | NO_WALK | NO_VISION | DONT_NOTICE_RUNNING | 
+F:CAN_FLY
+F:CAN_PASS
+F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 D:1:You cannot tunnel through that.
 D:2:a closed gate barring your way
 
 #Same gate, but opened
 N:232:open gate
 G:':D
-F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN | SUPPORT_LIGHT | 
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:SUPPORT_LIGHT
 
 ### For wood houses, bridges, etc:
 
 #Wooden board - horizontal
 N:233:wooden board
 G:-:u
-F:WALL | PERMANENT | SUPPORT_LIGHT | NO_WALK | NO_VISION | CAN_FLY
+F:CAN_FLY
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 D:1:You cannot tunnel through that.
 D:2:a wooden board blocking your way
 
 #Wooden board - vertical
 N:234:wooden board
 G:|:u
-F:WALL | PERMANENT | SUPPORT_LIGHT | NO_WALK | NO_VISION | CAN_FLY
+F:CAN_FLY
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 D:1:You cannot tunnel through that.
 D:2:a wooden board blocking your way
 
 #Light wooden board - horizontal
 N:235:wooden board
 G:-:U
-F:WALL | PERMANENT | SUPPORT_LIGHT | NO_WALK | NO_VISION | CAN_FLY
+F:CAN_FLY
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 D:1:You cannot tunnel through that.
 D:2:a wooden board blocking your way
 
 #Light wooden board - vertical
 N:236:wooden board
 G:|:U
-F:WALL | PERMANENT | SUPPORT_LIGHT | NO_WALK | NO_VISION | CAN_FLY
+F:CAN_FLY
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 D:1:You cannot tunnel through that.
 D:2:a wooden board blocking your way
 
@@ -1154,9 +1756,14 @@ D:2:a wooden board blocking your way
 #BUG - these do not burn.
 N:237:white tree
 G:#:w
-F:CAN_FLY | CAN_PASS | SUPPORT_LIGHT
-F:WALL | NO_WALK | NO_VISION | PERMANENT 
+F:CAN_FLY
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:SUPPORT_LIGHT
+F:WALL
 D:1:You cannot tunnel through that.
 D:2:a white tree blocking your way
 
@@ -1166,35 +1773,52 @@ G:|:B
 E:25d10:1:WATER
 S:w:w:w:b:w:w:b
 F:ATTR_MULTI
-F:FLOOR | CAN_LEVITATE | CAN_FLY | REMEMBER | SUPPORT_LIGHT | 
-F:DONT_NOTICE_RUNNING | SUPPORT_GROWTH | 
+F:CAN_FLY
+F:CAN_LEVITATE
+F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:REMEMBER
+F:SUPPORT_GROWTH
+F:SUPPORT_LIGHT
 
 #Slippery rock ledge
 N:239:slippery rock ledge
 G:&:s
 E:5d10:1:COLD
-F:FLOOR | CAN_LEVITATE | CAN_FLY | SUPPORT_LIGHT | 
+F:CAN_FLY
+F:CAN_LEVITATE
+F:FLOOR
 F:SUPPORT_GROWTH
+F:SUPPORT_LIGHT
 
 #Stable
 N:240:stable
 G:#:u
-F:WALL | NO_WALK | NO_VISION | PERMANENT | CAN_FLY
+F:CAN_FLY
+F:NO_VISION
+F:NO_WALK
+F:PERMANENT
+F:WALL
 D:1:You cannot tunnel through that.
 D:2:a stable wall blocking your way
 
 #Wooden plank
 N:241:wooden plank
 G:%:U
-F:FLOOR | CAN_RUN | DONT_NOTICE_RUNNING | SUPPORT_LIGHT | 
-F:SUPPORT_GROWTH  | 
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:SUPPORT_GROWTH
+F:SUPPORT_LIGHT
 
 #Fosse (dry moat)
 N:242:fosse pit
 G:&:g
-F:CAN_LEVITATE | CAN_FLY
-F:NO_WALK | SUPPORT_LIGHT
+F:CAN_FLY
+F:CAN_LEVITATE
 F:DONT_NOTICE_RUNNING
+F:NO_WALK
+F:SUPPORT_LIGHT
 D:1:You cannot tunnel through that.
 D:2:a dry moat blocking your way
 
@@ -1202,9 +1826,13 @@ D:2:a dry moat blocking your way
 N:243:Mallorn
 G:*:y
 S:y:W:W:y:w:W:y
-F:CAN_FLY | CAN_PASS | SUPPORT_LIGHT
-F:WALL | NO_WALK | NO_VISION
+F:CAN_FLY
+F:CAN_PASS
 F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
+F:WALL
 D:1:It isn't a good idea to harm a Mallorn.
 D:2:a Mallorn blocking your way
 
@@ -1213,33 +1841,56 @@ D:2:a Mallorn blocking your way
 N:244:copper pillar
 G:#:u
 S:u:u:u:o:u:u:u
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | NOTICE | SUPPORT_LIGHT
-F:DONT_NOTICE_RUNNING | ATTR_MULTI
+F:ATTR_MULTI
+F:CAN_PASS
+F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
+F:WALL
 D:1:The copper is too tough to tunnel through.
 D:2:a copper pillar blocking your way
 
 N:245:ethereal wall
 G:.:w
-F:WALL | NO_WALK | PERMANENT | NOTICE | DONT_NOTICE_RUNNING
+F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_WALK
+F:PERMANENT
+F:WALL
 D:1:You can't even see your obstruction!
 D:2:an unseen force blocking your way
 
 N:246:glacial wall
 G:#:B
-F:WALL | NO_WALK | CAN_PASS | NO_VISION | SUPPORT_LIGHT
-F:DONT_NOTICE_RUNNING | TUNNELABLE
+F:CAN_PASS
+F:DONT_NOTICE_RUNNING
+F:NO_VISION
+F:NO_WALK
+F:SUPPORT_LIGHT
+F:TUNNELABLE
+F:WALL
 D:1:You tunnel into the glacial wall... #BOh, chilly!#w.
 D:2:a hard glacial wall blocking your way
 
 N:247:battlement
 G:#:w
-F:NO_WALK | CAN_PASS | NOTICE | SUPPORT_LIGHT
-F:DONT_NOTICE_RUNNING | TUNNELABLE
+F:CAN_PASS
+F:DONT_NOTICE_RUNNING
+F:NOTICE
+F:NO_WALK
+F:SUPPORT_LIGHT
+F:TUNNELABLE
 D:1:You tunnel into the battlement.
 D:2:a hard stone battlement blocking your way
 
 N:248:door of Orthanc
 G:':r
-F:FLOOR | NOTICE | REMEMBER | CAN_RUN
-F:SUPPORT_LIGHT | DONT_NOTICE_RUNNING
-D:0:The Key of Orthanc allows you to pass.
\ No newline at end of file
+F:CAN_RUN
+F:DONT_NOTICE_RUNNING
+F:FLOOR
+F:NOTICE
+F:REMEMBER
+F:SUPPORT_LIGHT
+D:0:The Key of Orthanc allows you to pass.
diff --git a/lib/mods/theme/edit/k_info.txt b/lib/mods/theme/edit/k_info.txt
index 07e4bbe2..6cfe4dee 100644
--- a/lib/mods/theme/edit/k_info.txt
+++ b/lib/mods/theme/edit/k_info.txt
@@ -27,10 +27,6 @@
 # A: depth/rarity : depth/rarity : etc
 # F: flag | flag | etc
 
-# Version stamp (required)
-
-V:2.0.0
-
 
 ##### Something special #####
 
@@ -279,7 +275,8 @@ N:29:& Blue Stone~
 G:":B
 I:40:18:0
 W:60:0:3:90000
-F:INSTA_ART | SPECIAL_GENE
+F:INSTA_ART
+F:SPECIAL_GENE
 
 ##### Edged Weapons #####
 
@@ -298,7 +295,8 @@ I:23:21:0
 W:15:0:140:350
 A:15/1
 P:0:3d4:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:This is a long, double-edged sword with a plain hilt that could
 D:be wielded in one or two hands. It's called a "bastard sword" because in
@@ -353,8 +351,11 @@ W:70:0:180:4000
 A:70/8
 P:0:6d5:0:0:0
 F:ATTR_MULTI
-F:RES_CHAOS | CHAOTIC | SHOW_MODS
-f:RES_CHAOS | CHAOTIC
+F:CHAOTIC
+F:RES_CHAOS
+F:SHOW_MODS
+f:CHAOTIC
+f:RES_CHAOS
 D:A mighty sword which seems to be completely blunt. However, it is a conduit
 D:into the realms of pure chaos and strikes its victims with the devastating
 D:might of chaos itself whenever it connects. It gives you resistance to chaos
@@ -367,7 +368,8 @@ I:23:25:0
 W:30:0:200:775
 A:30/1:40/1
 P:0:3d6:0:0:0
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 f:MUST2H
 D:This blade is lot longer, wider and heavier than a long sword. You have to
 D:wield it with two hands. This means that wielding a shield makes fighting
@@ -401,7 +403,8 @@ I:23:28:0
 W:40:0:260:850
 A:40/1
 P:0:4d5:0:0:0
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 f:MUST2H
 D:These weapons have been built in all sizes. They are custom-made
 D:for warriors that want to set out and kill their archenemy. These
@@ -413,7 +416,8 @@ I:23:20:0
 W:20:0:120:400
 A:20/1
 P:0:3d4:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:The katana is a long blade with only a small disk for a guard.
 D:Its hilt is long enough for two hands, though it could be used
@@ -493,7 +497,8 @@ I:21:6:0
 W:20:0:150:200
 A:20/1
 P:0:2d4:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:This weapon has a ball linked with a chain to a wooden handle.
 D:Preferred tactic is smashing the brains of your opponent.
@@ -515,7 +520,8 @@ I:21:13:0
 W:10:0:150:353
 A:10/1
 P:0:2d6:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:This weapon was originally used to cut corn. More warlike versions
 D:sport a large blade stuck on a wooden handle. The hinge allows it to get
@@ -527,7 +533,8 @@ I:21:18:0
 W:45:0:280:590
 A:45/1
 P:0:3d6:0:0:0
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 f:MUST2H
 D:This two-handed version of the flail gives the fighter a fearsome
 D:weapon that can do a fair amount of damage.  It typically has several
@@ -549,7 +556,8 @@ I:21:5:0
 W:5:0:120:130
 A:5/1
 P:0:2d4:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:This weapon is a club ending in a sphere. The sphere is studded
 D:with metal shards, and thus can both crush and cut your adversary.
@@ -560,7 +568,8 @@ I:21:3:0
 W:10:0:150:200
 A:10/1
 P:0:1d9:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:A long, wooden pole, usually the height of the wielder. Four of them can be
 D:made out of the trunk of one young tree, hence the name. The quarterstaff
@@ -574,7 +583,8 @@ I:21:8:0
 W:5:0:120:225
 A:5/1
 P:0:3d3:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:A large hammer, designed to crush skulls with mighty strikes.
 
@@ -584,7 +594,8 @@ I:21:15:0
 W:15:0:180:502
 A:15/1
 P:0:3d4:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:A large, mean mace filled with lead in order to wreak a maximum of havoc.
 
@@ -594,8 +605,11 @@ I:21:20:0
 W:80:0:400:4300
 A:80/5
 P:0:5d8:0:0:0
-F:SLAY_UNDEAD | SHOW_MODS | MUST2H
-f:MUST2H | SLAY_UNDEAD
+F:MUST2H
+F:SHOW_MODS
+F:SLAY_UNDEAD
+f:MUST2H
+f:SLAY_UNDEAD
 D:This mace is custom-made for priests that go out to destroy evil.
 D:It is deadly, especially for undead.
 
@@ -605,7 +619,8 @@ I:21:10:0
 W:10:0:120:376
 A:10/1
 P:0:2d5:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:A war hammer combined with a spearpoint, mounted on a long pole.
 
@@ -617,7 +632,8 @@ I:22:10:0
 W:15:0:180:408
 A:15/1
 P:0:2d6:0:0:0
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 f:MUST2H
 D:This polearm has a beak mounted opposite the blade.
 
@@ -627,7 +643,8 @@ I:22:13:0
 W:20:0:190:363
 A:20/1
 P:0:2d6:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:A polearm with a long, slightly curved knife-like blade. It has spurs on
 D:the dull side of the blade. It's primarily a slashing and chopping weapon. Glaives
@@ -641,7 +658,8 @@ I:22:15:0
 W:25:0:190:430
 A:25/1
 P:0:3d5:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:The halberd has a broad, short axe blade on a 5-6 ft long haft, with a
 D:spearpoint at the top, often a back-spike and occasionally a butt-spike. Used to
@@ -657,7 +675,8 @@ I:22:4:0
 W:10:0:160:340
 A:10/1
 P:0:1d8:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:This is a polearm with a long square-sectioned spike on the end.
 
@@ -667,7 +686,8 @@ I:22:8:0
 W:15:0:160:358
 A:15/1
 P:0:2d5:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:A staff, 16-18 feet long, that has a small piercing head about 10 inches
 D:long. The pike is often used by infantry to fend off cavalry.  It is very
@@ -692,7 +712,8 @@ I:22:5:0
 W:5:0:70:120
 A:5/1
 P:0:1d8:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:The trident is based on the pitchfork.  In fact, when not used as a weapon,
 D:it is often employed as a pitchfork. It is famous for its uses in
@@ -705,7 +726,8 @@ I:22:20:0
 W:10:0:300:230
 A:10/1
 P:0:2d8:0:0:0
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 f:MUST2H
 D:This is the original polearm. It is shaped like a spear but is bigger. It's
 D:meant to fend off enemies, not to be thrown.
@@ -716,7 +738,8 @@ I:24:25:0
 W:40:0:230:500
 A:40/1
 P:0:4d4:0:0:0
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 f:MUST2H
 D:A huge and heavy two-headed axe.
 
@@ -726,7 +749,8 @@ I:22:22:0
 W:15:0:170:334
 A:15/1
 P:0:2d8:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:Nordic polearm with a broad blade and a hook mounted on the end of the shaft.
 D:The Nordics' take on the halberd. The polearm of choice for many Nordics,
@@ -738,7 +762,8 @@ I:22:28:0
 W:45:0:250:750
 A:45/1
 P:0:3d8:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:Nordic polearm with a broad blade and a hook mounted on the end of the shaft.
 D:Another Nordic version of the halberd. The polearm of choice for many Nordics,
@@ -750,7 +775,8 @@ I:24:11:0
 W:15:0:160:304
 A:15/1
 P:0:2d6:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:A one-headed axe made for combat, with an elongated moon-shaped blade.
 
@@ -760,7 +786,8 @@ I:22:17:0
 W:45:0:250:800
 A:45/1
 P:0:5d3:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:A simple farm implement, converted into a weapon by slightly straightening
 D:its blade and putting it in line with its pole, instead of the typical
@@ -772,8 +799,13 @@ I:22:30:0
 W:80:0:250:10000
 A:80/20
 P:0:8d4:0:0:0
-F:SHOW_MODS | MUST2H | WOUNDING | VORPAL
-f:MUST2H | VORPAL | WOUNDING
+F:MUST2H
+F:SHOW_MODS
+F:VORPAL
+F:WOUNDING
+f:MUST2H
+f:VORPAL
+f:WOUNDING
 D:The simple design of the war scythe, but this one uses a finely crafted and
 D:incredibly sharp steel blade which causes terrible wounds when it hits.
 
@@ -966,8 +998,12 @@ I:35:2:0
 W:30:0:5:1500
 A:30/4
 P:4:0d0:0:0:4
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_FIRE | IGNORE_ELEC
-F:STEALTH | SEARCH | LUCK
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:LUCK
+F:STEALTH
 f:STEALTH
 D:A wonderfully light cloak coloured in brown and green hues. Its colouring
 D:greatly helps the wearer to avoid undesired attention. Wearing it makes you
@@ -1219,7 +1255,10 @@ I:37:30:0
 W:75:0:420:20000
 A:75/4
 P:40:2d4:-4:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE |
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:A suit of plate armour fashioned from a metal whose secret is only known to Eol,
 D:the dark Elvensmith. It is practically unbreakable.
 
@@ -1280,7 +1319,9 @@ I:35:6:1
 W:60:0:5:7500
 A:75/4
 P:6:0d0:0:0:4
-F:RES_DARK | RES_LITE | STEALTH
+F:RES_DARK
+F:RES_LITE
+F:STEALTH
 f:STEALTH
 D:A rare cloak imbued with magic to radiate a strange twilight, absorbing both
 D:extreme brightness and darkness.
@@ -1358,7 +1399,9 @@ G:=:d
 I:45:24:0
 W:30:0:2:500
 A:30/1
-F:STR | HIDE_TYPE | SUST_STR
+F:HIDE_TYPE
+F:STR
+F:SUST_STR
 f:STR
 D:This bauble magically improves your strength.
 
@@ -1367,7 +1410,9 @@ G:=:d
 I:45:26:0
 W:30:0:2:500
 A:30/1
-F:DEX | HIDE_TYPE | SUST_DEX
+F:DEX
+F:HIDE_TYPE
+F:SUST_DEX
 f:DEX
 D:This piece of jewellery magically improves your agility.
 
@@ -1376,7 +1421,9 @@ G:=:d
 I:45:27:0
 W:30:0:2:500
 A:30/1
-F:CON | HIDE_TYPE | SUST_CON
+F:CON
+F:HIDE_TYPE
+F:SUST_CON
 f:CON
 D:This ring magically grants you health, improving your constitution.
 
@@ -1385,7 +1432,9 @@ G:=:d
 I:45:25:0
 W:30:0:2:500
 A:30/1
-F:INT | HIDE_TYPE | SUST_INT
+F:HIDE_TYPE
+F:INT
+F:SUST_INT
 f:INT
 D:This magical piece of jewellery makes you smarter.
 
@@ -1394,27 +1443,22 @@ G:=:d
 I:45:31:0
 W:75:0:2:100000
 A:75/1
-F:SPEED | HIDE_TYPE
+F:HIDE_TYPE
+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:SEARCH | HIDE_TYPE
-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
 I:45:4:0
 W:5:0:2:250
 A:5/1
-a:HARDCORE=DEST_TELE
-F:CURSED | TELEPORT | EASY_KNOW | ACTIVATE
+a:DEST_TELE
+F:ACTIVATE
+F:CURSED
+F:EASY_KNOW
+F:TELEPORT
 f:TELEPORT
 D:This ring will uncontrollably send you to different places at its whim.
 D:You can use its power once at your will, but it will destroy the ring.
@@ -1424,7 +1468,8 @@ G:=:d
 I:45:6:0
 W:5:0:2:250
 A:5/1
-F:SLOW_DIGEST | EASY_KNOW
+F:EASY_KNOW
+F:SLOW_DIGEST
 f:SLOW_DIGEST
 D:This magical bauble grants you some sustenance, allowing you to subsist on less food.
 
@@ -1433,7 +1478,8 @@ G:=:d
 I:45:7:0
 W:5:0:2:200
 A:5/1
-F:FEATHER | EASY_KNOW
+F:EASY_KNOW
+F:FEATHER
 f:FEATHER
 D:When you put on this ring, you will be able to float just above the floor.
 D:It prevents you from drowning, and all your falls will be painless.
@@ -1443,7 +1489,8 @@ G:=:d
 I:45:20:0
 W:60:0:2:16000
 A:60/2
-F:RES_POIS | EASY_KNOW
+F:EASY_KNOW
+F:RES_POIS
 f:RES_POIS
 D:This magical ring grants protection from poison.
 D:It is rumoured that in deep dungeons monsters can kill you at once if you
@@ -1454,7 +1501,8 @@ G:=:d
 I:45:21:0
 W:20:0:2:1500
 A:20/1
-F:FREE_ACT | EASY_KNOW
+F:EASY_KNOW
+F:FREE_ACT
 f:FREE_ACT
 D:This magical bauble prevents you from being held.
 D:Some monsters will paralyse you and then kill you if you lack free action.
@@ -1464,7 +1512,9 @@ G:=:d
 I:45:2:-5
 W:5:0:2:0
 A:5/1
-F:CURSED | STR | HIDE_TYPE
+F:CURSED
+F:HIDE_TYPE
+F:STR
 f:STR
 D:This accursed ring will sap your strength, rendering you much weaker as long as you wear it.
 
@@ -1474,9 +1524,11 @@ I:45:18:0
 W:50:0:2:3000
 A:50/1
 P:0:0d0:0:0:15
-a:HARDCORE=BA_FIRE_4
-F:RES_FIRE | ACTIVATE
-f:RES_FIRE | IGNORE_FIRE
+a:BA_FIRE_4
+F:ACTIVATE
+F:RES_FIRE
+f:IGNORE_FIRE
+f:RES_FIRE
 D:This fiery circlet grants you protection, makes fire less dangerous and even
 D:allows you to call forth a ball of flame.
 
@@ -1486,9 +1538,11 @@ I:45:17:0
 W:50:0:2:3000
 A:50/1
 P:0:0d0:0:0:15
-a:HARDCORE=BA_ACID_4
-F:RES_ACID | ACTIVATE
-f:RES_ACID | IGNORE_ACID
+a:BA_ACID_4
+F:ACTIVATE
+F:RES_ACID
+f:IGNORE_ACID
+f:RES_ACID
 D:This magical ring is imbued with spells of devouring acid, granting protection against such
 D:assaults and the ability to shoot acid at your foes.
 
@@ -1497,10 +1551,12 @@ G:=:d
 I:45:19:0
 W:50:0:2:3000
 A:50/1
-a:HARDCORE=BA_COLD_4
+a:BA_COLD_4
 P:0:0d0:0:0:15
-F:RES_COLD | ACTIVATE
-f:RES_COLD | IGNORE_COLD
+F:ACTIVATE
+F:RES_COLD
+f:IGNORE_COLD
+f:RES_COLD
 D:This ring is imbued with supernatural cold, which makes you less vulnerable to such effects
 D:and occasionally allows you to throw balls of ice at your foes.
 
@@ -1509,7 +1565,12 @@ G:=:d
 I:45:0:-5
 W:50:0:2:0
 A:50/1
-F:CURSED | TELEPORT | WIS | CHR | HIDE_TYPE | AUTO_CURSE
+F:AUTO_CURSE
+F:CHR
+F:CURSED
+F:HIDE_TYPE
+F:TELEPORT
+F:WIS
 D:This accursed ring will turn you into a bumbling fool and, in addition, magically 
 D:transports you to places you never wanted to see. It can recurse itself if
 D:you leave it on too long.
@@ -1519,7 +1580,9 @@ G:=:d
 I:45:3:-5
 W:5:0:2:0
 A:5/1
-F:CURSED | INT | HIDE_TYPE
+F:CURSED
+F:HIDE_TYPE
+F:INT
 f:INT
 D:This wicked ring feeds off your intellect, magically making you stupid.
 
@@ -1537,8 +1600,10 @@ G:=:d
 I:45:28:0
 W:20:0:2:500
 A:20/1
-F:HIDE_TYPE | EASY_USE | ACTIVATE |
-a:HARDCORE=WHIRLWIND
+F:ACTIVATE
+F:EASY_USE
+F:HIDE_TYPE
+a:WHIRLWIND
 D:This ring magically improves your control in combat, allowing you to hit more often.
 D:It can also sometimes be used to hit several nearby opponents with deadly accuracy.
 
@@ -1554,7 +1619,10 @@ G:=:d
 I:45:1:0
 W:5:0:2:0
 A:5/1
-F:CURSED | AGGRAVATE | EASY_KNOW | AUTO_CURSE
+F:AGGRAVATE
+F:AUTO_CURSE
+F:CURSED
+F:EASY_KNOW
 f:AGGRAVATE
 D:This faithless ring will draw opponents' attention towards its hapless owner.
 D:If you have any pets, it will also make them turn against you.
@@ -1564,7 +1632,8 @@ G:=:d
 I:45:22:0
 W:30:0:2:340
 A:30/1
-F:SEE_INVIS | EASY_KNOW
+F:EASY_KNOW
+F:SEE_INVIS
 f:SEE_INVIS
 D:This magical piece of jewellery allows your eyes to perceive beings otherwise unseen.
 
@@ -1583,7 +1652,10 @@ G:":d
 I:40:6:0
 W:50:0:3:1000
 A:50/4
-F:INT | WIS | HIDE_TYPE | LITE1
+F:HIDE_TYPE
+F:INT
+F:LITE1
+F:WIS
 D:This talisman grants a sharper wit, greater insight and brightness to light dark places.
 
 N:164:Charisma
@@ -1591,37 +1663,32 @@ G:":d
 I:40:7:0
 W:30:0:3:500
 A:30/1
-F:CHR | HIDE_TYPE
+F:CHR
+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:SEARCH | HIDE_TYPE
-f:SEARCH
-D:This amulet grants keen sight, finding things that are hidden.
-
 N:166:Teleportation
 G:":d
 I:40:1:0
 W:10:0:3:250
 A:10/1
-F:CURSED | TELEPORT | EASY_KNOW
+F:CURSED
+F:EASY_KNOW
+F:TELEPORT
 f:TELEPORT
 D:This amulet nastily throws you all over the place.
 
-# Replacing Adornment with Protection from Evil from T-Plus by Ingeborg S. Norden
-
 N:169:Protection from Evil
 G:":d
 I:40:2:0
 W:25:0:3:10000
 A:25/1
-F:EASY_KNOW | ACTIVATE | BLESSED | ESP_EVIL
-a:HARDCORE=PROT_EVIL
+F:ACTIVATE
+F:BLESSED
+F:EASY_KNOW
+F:ESP_EVIL
+a:PROT_EVIL
 D:This blessed amulet fends off evil beings and warns the wearer
 D:of their presence.
 
@@ -1644,9 +1711,17 @@ I:40:8:0
 W:70:0:3:30000
 A:70/8
 P:0:0d0:-4:-4:0
-F:INT | SUST_INT | SEARCH | SPELL_CONTAIN | WIELD_CAST
-F:FREE_ACT | RES_BLIND | RES_CONF |
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:FREE_ACT
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:INT
+F:RES_BLIND
+F:RES_CONF
+F:SPELL_CONTAIN
+F:SUST_INT
+F:WIELD_CAST
 D:This rare amulet is highly desirable for mages, as it makes its wearer smarter, more attentive
 D:and impervious to magics which would make their own magic-use impossible.
 
@@ -1655,8 +1730,16 @@ G:":d
 I:40:0:-5
 W:50:0:3:0
 A:50/1
-F:CURSED | STR | INT | WIS | DEX | CON | CHR | HIDE_TYPE
-F:AUTO_CURSE | CURSE_NO_DROP
+F:AUTO_CURSE
+F:CHR
+F:CON
+F:CURSED
+F:CURSE_NO_DROP
+F:DEX
+F:HIDE_TYPE
+F:INT
+F:STR
+F:WIS
 D:This wicked amulet will drain all your abilities, turning you into a mere shadow of yourself. It
 D:is exceedingly hard to get rid of.
 
@@ -1717,7 +1800,10 @@ G:?:d
 I:70:50:0
 W:100:0:5:10000
 A:100/8
-F:IGNORE_FIRE | IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:A piece of paper inscribed with strange shifting runes. Upon reading them, they will release
 D:a blast of chaotic forces.
 
@@ -1831,14 +1917,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~
@@ -1857,7 +1935,8 @@ I:16:2:0
 W:40:0:4:20
 A:40/2:65/1
 P:0:3d4:5:5:0
-F:SHOW_MODS | IGNORE_ACID
+F:IGNORE_ACID
+F:SHOW_MODS
 D:Sling bullets made from the slags of mithril smelting. They are unusually heavy, hitting
 D:with great force, and are almost imperishable.
 
@@ -1910,22 +1989,6 @@ W:5:0:5:0
 A:5/1
 D:This nasty scroll will make a loud noise when read, 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
@@ -2490,8 +2553,11 @@ I:71:60:100
 W:20:0:4:250
 A:20/1:45/1:80/1:100/1
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
 F:FOUNTAIN
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This great potion infuses you with the power of the elements, so that you can better
 D:withstand their ravages.
 
@@ -2698,9 +2764,13 @@ W:127:0:4:0
 A:127/255
 P:0:1d1:0:0:0
 T:39:2
-F:NORM_ART | FULL_NAME | SPECIAL_GENE
-F:ACTIVATE | ACTIVATE_NO_WIELD
-a:SPELL=Artifact Eternal Flame
+F:ACTIVATE
+F:ACTIVATE_NO_WIELD
+F:EASY_USE
+F:FULL_NAME
+F:NORM_ART
+F:SPECIAL_GENE
+a:ETERNAL_FLAME
 D:An impossibly bright, flickering living flame. It can be used
 D:once to imbue an object with the power of Eru Iluvatar himself.
 
@@ -2710,7 +2780,9 @@ I:23:34:0
 W:0:0:7:10
 A:0/1:5/1:10/1:20/1
 P:0:1d4:0:0:0
-F:SHOW_MODS | VAMPIRIC | SPECIAL_GENE
+F:SHOW_MODS
+F:SPECIAL_GENE
+F:VAMPIRIC
 D:A temporary weapon that only a necromancer can use.
 
 # The Horn of the Thunderlords
@@ -2721,8 +2793,16 @@ W:50:10:10:12000
 P:0:1d4:0:0:0
 A:50/200
 T:55:8
-F:IGNORE_ACID | IGNORE_FIRE | IGNORE_ELEC | IGNORE_COLD | 
-F:NO_RECHARGE | EASY_USE | RECHARGED | NORM_ART | FULL_NAME | SPECIAL_GENE
+F:EASY_USE
+F:FULL_NAME
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:NORM_ART
+F:NO_RECHARGE
+F:RECHARGED
+F:SPECIAL_GENE
 D:This horn was given to you as a reward. Blow it if you are in dire need
 D:of leaving your current location fast.
 
@@ -2780,13 +2860,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
@@ -2898,7 +2971,8 @@ I:111:0:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:The slick black cover of this tome seems to glow
 D:with an inner violet light. You feel more attuned
 D:to raw magic as you hold it.
@@ -2909,7 +2983,9 @@ I:111:1:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW | IGNORE_FIRE
+F:EASY_KNOW
+F:FULL_NAME
+F:IGNORE_FIRE
 D:The cover of this tome is bright red, with flickering
 D:flames dancing across it once in a while. As you hold
 D:it, you begin to gain a much closer knowledge of all
@@ -2921,7 +2997,9 @@ I:111:2:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW | IGNORE_ELEC
+F:EASY_KNOW
+F:FULL_NAME
+F:IGNORE_ELEC
 D:The pages of this tome have a tendency to turn themselves,
 D:as though flipped by an errant wind. As you hold it,
 D:you start feeling wind at your fingertips.
@@ -2932,7 +3010,9 @@ I:111:3:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW | IGNORE_ACID
+F:EASY_KNOW
+F:FULL_NAME
+F:IGNORE_ACID
 D:The solid leather cover of this tome seems permanently
 D:stained with caked mud and grass. Heavy it is to lift,
 D:yet strangely comforting to hold - you feel stronger
@@ -2944,7 +3024,8 @@ I:111:4:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:The cover and pages of this tome seem to be perpetually
 D:wet, though they are not wet to the touch. As you hold
 D:it, you begin to understand ocean storms better.
@@ -2955,7 +3036,8 @@ I:111:5:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:This book seems to flicker strangely. It's one of those books
 D:with an annoying tendency to disappear when you need it and
 D:reappear in the unlikeliest places. As you hold it, you start
@@ -2967,7 +3049,8 @@ I:111:6:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:The cover of this tome is a bright shade of green, and it gives off
 D:a healthy, zesty scent that makes your thoughts clearer. As you
 D:hold it, your heart goes out to all living things upon Arda.
@@ -2978,7 +3061,8 @@ I:111:7:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 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.
@@ -3058,8 +3142,11 @@ I:39:0:0:4000
 W:1:0:30:2
 A:1/1
 P:0:1d1:0:0:0
-F:EASY_KNOW | LITE1 | FUEL_LITE
-f:LITE1 | FUEL_LITE
+F:EASY_KNOW
+F:FUEL_LITE
+F:LITE1
+f:FUEL_LITE
+f:LITE1
 D:A piece of wood with an oily rag wrapped around it. When lit, it will give off a little light and
 D:much smoke.
 
@@ -3069,8 +3156,12 @@ I:39:1:0:7500
 W:3:0:50:35
 A:3/1
 P:0:1d1:0:0:0
-F:EASY_KNOW | IGNORE_FIRE | LITE2 | FUEL_LITE
-f:LITE2 | FUEL_LITE
+F:EASY_KNOW
+F:FUEL_LITE
+F:IGNORE_FIRE
+F:LITE2
+f:FUEL_LITE
+f:LITE2
 D:A brass container with a wick emerging from it, protected from draughts by a sheet of greased
 D:paper. It can be carried by a handle.
 
@@ -3100,7 +3191,10 @@ I:66:28:90
 W:95:0:15:150000
 A:100/16
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This powerful rod will release great blasts of destructive energy, but there's no knowing what
 D:this effect will concentrate on.
 
@@ -3110,35 +3204,22 @@ I:66:1:10
 W:15:0:15:1000
 A:15/1
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 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
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
-D:Zapping this rod will release a minor detection magic, alerting you of nearby pits and snares.
-
-N:353:Probing
-G:-:d
-I:66:7:50
-W:40:0:15:4000
-A:40/4
-P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
-D:A rod of knowledge which will tell you about nearby creatures' health.
-D:If they are sleeping, the intrusion will wake them.
-
 N:354:Recall
 G:-:d
 I:66:3:80
 W:30:0:15:4500
 A:30/4
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:A rod which can transport you from the depths to your home and back.
 
 N:355:Illumination
@@ -3148,7 +3229,10 @@ W:20:0:15:1000
 A:20/1
 P:0:1d1:0:0:0
 F:EASY_KNOW
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This rod carries a minor spell of brightness, lighting your immediate surroundings whenever
 D:activated.
 
@@ -3158,7 +3242,10 @@ I:66:15:15
 W:10:0:15:500
 A:10/1
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This rod can shoot a lance of bright light, hurting creatures which lurk in the dark.
 
 N:357:Lightning Bolts
@@ -3167,7 +3254,10 @@ I:66:21:30
 W:20:0:15:2000
 A:20/1
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This rod shoots a small spark of lightning, zapping the creature it hits.
 
 N:358:Frost Bolts
@@ -3176,7 +3266,10 @@ I:66:23:35
 W:25:0:15:2500
 A:25/1
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:A small but extremely cold shard of ice will fly from this rod to the enemy you zap it at.
 
 N:359:Fire Bolts
@@ -3185,7 +3278,10 @@ I:66:22:40
 W:30:0:15:3000
 A:30/1
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This rod fires a magical flaming arrow at your foe, burning them.
 
 N:360:Polymorph
@@ -3194,7 +3290,10 @@ I:66:19:25
 W:35:0:15:1200
 A:35/1
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This rod of change will cause its target creature to mutate into someone else.
 D:Beware, it can make a weak enemy into a more powerful one.
 
@@ -3204,7 +3303,10 @@ I:66:17:25
 W:30:0:15:1500
 A:30/1
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This obstructive rod will slow the creature its spell hits.
 
 N:362:Sleep Monster
@@ -3213,7 +3315,10 @@ I:66:16:25
 W:30:0:15:1500
 A:30/1
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This sorcerous rod will cause its target to stop in its tracks.
 
 N:363:Drain Life
@@ -3222,7 +3327,10 @@ I:66:18:30
 W:75:0:15:3600
 A:75/4
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This necromantic magical rod will hurt a living creature struck by its spell.
 
 N:364:Teleport Other
@@ -3231,25 +3339,22 @@ I:66:13:60
 W:45:0:15:1400
 A:45/2
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 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
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
-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
 W:55:0:15:4000
 A:55/1
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This rod will hurl a large ball of lightning at its target, electrifying all it engulfs.
 
 N:367:Cold Balls
@@ -3258,7 +3363,10 @@ I:66:27:55
 W:60:0:15:4500
 A:60/1
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This rod will call forth a minor storm of ice which freezes everything in the area of its blast.
 
 N:368:Fire Balls
@@ -3268,7 +3376,10 @@ W:75:0:15:5000
 A:75/1
 P:0:1d1:0:0:0
 D:This rod will cause a small storm of flame to rage in a small circular area of your choice.
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 
 N:369:Acid Balls
 G:-:d
@@ -3276,7 +3387,10 @@ I:66:24:60
 W:70:0:15:5500
 A:70/1
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This destructive rod will drown its target and its immediate surroundings in caustic acid.
 
 N:370:Acid Bolts
@@ -3285,7 +3399,10 @@ I:66:20:40
 W:40:0:15:3500
 A:40/1
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This rod will shoot a small glob of powerful acid at its target.
 
 N:371:Enlightenment
@@ -3294,7 +3411,10 @@ I:66:5:40
 W:65:0:15:10000
 A:65/4
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This rod grants you knowledge of your surroundings.
 
 N:372:Perception
@@ -3303,7 +3423,10 @@ I:66:2:20
 W:50:0:15:13000
 A:50/8:100/8
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+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
@@ -3312,7 +3435,10 @@ I:66:8:35
 W:65:0:15:15000
 A:65/8
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This is a rod with minor healing powers, alleviating many disabling conditions.
 
 N:374:Healing
@@ -3321,7 +3447,10 @@ I:66:9:120
 W:80:0:15:20000
 A:80/8
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This rod has major healing powers and can restore your health if you have been wounded.
 
 N:375:Detection
@@ -3330,7 +3459,10 @@ I:66:6:80
 W:30:0:15:5000
 A:30/8
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This rod grants knowledge about all things worthy of notice in your vicinity.
 
 N:376:Restoration
@@ -3339,7 +3471,10 @@ I:66:10:140
 W:80:0:15:25000
 A:80/16
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This rod lets you remember and gain back previously reduced abilities.
 
 N:377:Speed
@@ -3348,7 +3483,10 @@ I:66:11:100
 W:95:0:15:50000
 A:95/16
 P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This energising rod will allow you to act a lot faster for some time.
 
 # Ring of Spell
@@ -3358,7 +3496,8 @@ G:=:d
 I:45:58:0
 W:10:0:2:1000
 A:10/1
-F:SPELL_CONTAIN | WIELD_CAST
+F:SPELL_CONTAIN
+F:WIELD_CAST
 f:SPELL_CONTAIN
 D:This ring is a container for spells. Those that are skilled in copying spells can inscribe a
 D:spell onto it.
@@ -3370,7 +3509,8 @@ G:":d
 I:40:27:0
 W:10:0:2:1000
 A:10/1
-F:SPELL_CONTAIN | WIELD_CAST
+F:SPELL_CONTAIN
+F:WIELD_CAST
 f:SPELL_CONTAIN
 D:This amulet is a container for spells. Those that are skilled in copying spells can inscribe a
 D:spell onto it.
@@ -3472,10 +3612,15 @@ I:38:1:0
 W:60:0:200:50000
 A:60/8
 P:30:2d4:-2:0:10
-a:HARDCORE=BR_ACID
-F:RES_ACID | FLY |
-f:RES_ACID |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+a:BR_ACID
+F:ACTIVATE
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_ACID
+f:RES_ACID
 D:A pitch-black armour made from a black dragon's hide.
 D:It contains some of the dead beast's powers.
 
@@ -3485,10 +3630,15 @@ I:38:2:0
 W:50:0:200:40000
 A:50/8
 P:30:2d4:-2:0:10
-a:HARDCORE=BR_ELEC
-F:RES_ELEC | FLY |
-f:RES_ELEC |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+a:BR_ELEC
+F:ACTIVATE
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_ELEC
+f:RES_ELEC
 D:A shimmering bright blue armour made from a blue dragon's hide.
 D:It contains some of the dead beast's powers.
 
@@ -3497,11 +3647,16 @@ G:[:w
 I:38:3:0
 W:50:0:200:40000
 A:50/8
-a:HARDCORE=BR_COLD
+a:BR_COLD
 P:30:2d4:-2:0:10
-F:RES_COLD | FLY |
-f:RES_COLD |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:ACTIVATE
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_COLD
+f:RES_COLD
 D:A gleaming white armour made from a white dragon's hide.
 D:It contains some of the dead beast's powers.
 
@@ -3511,10 +3666,15 @@ I:38:4:0
 W:60:0:200:50000
 A:60/8
 P:30:2d4:-2:0:10
-a:HARDCORE=BR_FIRE
-F:RES_FIRE | FLY |
-f:RES_FIRE |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+a:BR_FIRE
+F:ACTIVATE
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_FIRE
+f:RES_FIRE
 D:A glowing red armour made from a red dragon's hide.
 D:It contains some of the dead beast's powers.
 
@@ -3524,10 +3684,15 @@ I:38:5:0
 W:50:0:200:40000
 A:50/8
 P:30:2d4:-2:0:10
-a:HARDCORE=BR_POIS
-F:RES_POIS | FLY |
-f:RES_POIS |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+a:BR_POIS
+F:ACTIVATE
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_POIS
+f:RES_POIS
 D:A dirty green, foul-smelling armour made from a green dragon's hide.
 D:It contains some of the dead beast's powers.
 
@@ -3537,11 +3702,24 @@ I:38:6:0
 W:90:0:200:150000
 A:90/32
 P:30:2d4:-2:0:10
-a:HARDCORE=BR_MANY
+a:BR_MANY
+F:ACTIVATE
 F:ATTR_MULTI
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_POIS | FLY |
-f:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_POIS |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+F:RES_POIS
+f:RES_ACID
+f:RES_COLD
+f:RES_ELEC
+f:RES_FIRE
+f:RES_POIS
 D:A powerful armour glowing red, blue, green, black, and white.
 D:made from a multihued dragon's hide, it contains some of the dead beast's powers.
 
@@ -3551,9 +3729,15 @@ I:38:10:0
 W:70:0:200:70000
 A:70/16
 P:30:2d4:-2:0:10
-a:HARDCORE=BR_LIGHT
-F:RES_LITE | RES_DARK | FLY |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+a:BR_LIGHT
+F:ACTIVATE
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_DARK
+F:RES_LITE
 D:A strangely glowing armour made from a pseudo-dragon's hide.
 D:It contains some of the dead beast's powers.
 
@@ -3563,9 +3747,15 @@ I:38:12:0
 W:80:0:200:80000
 A:80/16
 P:30:2d4:-2:0:10
-a:HARDCORE=BR_SHARD
-F:RES_SOUND | RES_SHARDS | FLY |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+a:BR_SHARD
+F:ACTIVATE
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_SHARDS
+F:RES_SOUND
 D:A sharp-scaled armour that seems to roar, made from a law dragon's hide.
 D:It contains some of the dead beast's powers.
 
@@ -3575,9 +3765,14 @@ I:38:14:0
 W:50:0:200:40000
 A:50/8
 P:30:2d4:-2:0:10
-a:HARDCORE=BR_CONF
-F:RES_CONF | FLY |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+a:BR_CONF
+F:ACTIVATE
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_CONF
 D:A brownish armour glittering in a dazzling light, made from a bronze dragon's hide.
 D:It contains some of the dead beast's powers.
 
@@ -3587,9 +3782,14 @@ I:38:16:0
 W:60:0:200:50000
 A:60/8
 P:30:2d4:-2:0:10
-a:HARDCORE=BR_SOUND
-F:RES_SOUND | FLY |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+a:BR_SOUND
+F:ACTIVATE
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_SOUND
 D:A suit of armour with rustling scales, made from a gold dragon's hide.
 D:It contains some of the dead beast's powers.
 
@@ -3599,11 +3799,17 @@ I:38:18:0
 W:80:0:200:80000
 A:80/16
 P:30:2d4:-2:0:10
-a:HARDCORE=BR_CHAOS
+a:BR_CHAOS
+F:ACTIVATE
 F:ATTR_MULTI
-F:RES_CHAOS | RES_DISEN | FLY |
-f:RES_CHAOS |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_CHAOS
+F:RES_DISEN
+f:RES_CHAOS
 D:A suit of armour made of dragon hide. It glows in colours you have never seen before. As you
 D:put it on, you feel like you could change the world and are no longer afraid of your equipment
 D:losing its magic.
@@ -3614,9 +3820,17 @@ I:38:20:0
 W:95:0:200:100000
 A:95/32
 P:30:2d4:-2:0:10
-a:HARDCORE=BR_BALANCE
-F:RES_CHAOS | RES_DISEN | RES_SOUND | RES_SHARDS | FLY |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+a:BR_BALANCE
+F:ACTIVATE
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_CHAOS
+F:RES_DISEN
+F:RES_SHARDS
+F:RES_SOUND
 D:A suit of armour made of the hide of a dead dragon. When wearing it, you feel like you
 D:understand the principles of law and chaos, and no longer fear either.
 
@@ -3626,12 +3840,28 @@ I:38:30:0
 W:100:0:250:350000
 A:100/64
 P:40:2d4:-3:0:15
-a:HARDCORE=BR_POWER
+a:BR_POWER
+F:ACTIVATE
 F:ATTR_MULTI
-F:RES_ACID | RES_FIRE | RES_COLD | RES_ELEC | RES_POIS | FLY |
-F:RES_NETHER | RES_NEXUS | RES_CHAOS | RES_LITE | RES_DARK |
-F:RES_SHARDS | RES_SOUND | RES_DISEN | RES_CONF |
-F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:FLY
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_ACID
+F:RES_CHAOS
+F:RES_COLD
+F:RES_CONF
+F:RES_DARK
+F:RES_DISEN
+F:RES_ELEC
+F:RES_FIRE
+F:RES_LITE
+F:RES_NETHER
+F:RES_NEXUS
+F:RES_POIS
+F:RES_SHARDS
+F:RES_SOUND
 D:A suit of armour made of a very thick richly coloured dragonhide. You think you'll never have
 D:to fear dragons if you put it on.
 
@@ -3643,7 +3873,10 @@ I:32:7:0
 W:45:0:50:10000
 A:80/4
 P:8:1d3:0:0:10
-F:IGNORE_ACID | IGNORE_FIRE | IGNORE_ELEC | IGNORE_COLD
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:An iron helmet, covered with a layer of dragonhide. It offers great protection and may grant
 D:protection against some dragon's attacks, based on the dragon the hide was taken from.
 
@@ -3653,7 +3886,10 @@ I:34:6:0
 W:70:0:100:10000
 A:80/4
 P:8:1d3:0:0:10
-F:IGNORE_ACID | IGNORE_FIRE | IGNORE_ELEC | IGNORE_COLD
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:A large shield, with a dragonskin cover. Depending on which dragon the hide came from, it
 D:might grant protection against some sorts of dragon breath.
 
@@ -3718,15 +3954,6 @@ F:FOUNTAIN
 D:This wonderful potion will fully heal you no matter how badly you're hurt, allow drained
 D:abilities to recover and remove various other ailments.
 
-N:421:Self Knowledge
-G:!:d
-I:71:58:0
-W:40:0:4:2000
-A:40/1
-P:0:1d1:0:0:0
-F:FOUNTAIN
-D:A drink of insight that lets you know yourself better.
-
 N:422:*Enlightenment*
 G:!:d
 I:71:57:0
@@ -3745,8 +3972,9 @@ G:=:d
 I:45:38:0
 W:10:0:2:300
 A:10/2
-F:RES_FEAR | EASY_KNOW
-f:RES_FEAR |
+F:EASY_KNOW
+F:RES_FEAR
+f:RES_FEAR
 D:This ring grants courage, so that you can never become afraid.
 
 N:426:Light and Darkness Resistance
@@ -3754,8 +3982,11 @@ G:=:d
 I:45:39:0
 W:30:0:2:3000
 A:30/2
-F:RES_LITE | RES_DARK | EASY_KNOW
-f:RES_LITE | RES_DARK |
+F:EASY_KNOW
+F:RES_DARK
+F:RES_LITE
+f:RES_DARK
+f:RES_LITE
 D:This ring protects against fluctuations of the light.
 
 N:427:Nether Resistance
@@ -3763,8 +3994,10 @@ G:=:d
 I:45:40:0
 W:34:0:2:14500
 A:34/2
-F:RES_NETHER | HOLD_LIFE | EASY_KNOW
-f:RES_NETHER |
+F:EASY_KNOW
+F:HOLD_LIFE
+F:RES_NETHER
+f:RES_NETHER
 D:This blessed ring improves your life force, protecting you from the draining forces of nether
 D:and other attempts to suck your lifeblood.
 
@@ -3773,8 +4006,9 @@ G:=:d
 I:45:41:0
 W:24:0:2:3000
 A:24/2
-F:RES_NEXUS | EASY_KNOW
-f:RES_NEXUS |
+F:EASY_KNOW
+F:RES_NEXUS
+f:RES_NEXUS
 D:This ring of stability protects you from the warping forces of nexus.
 
 N:429:Sound Resistance
@@ -3782,8 +4016,9 @@ G:=:d
 I:45:42:0
 W:26:0:2:3000
 A:26/2
-F:RES_SOUND | EASY_KNOW
-f:RES_SOUND |
+F:EASY_KNOW
+F:RES_SOUND
+f:RES_SOUND
 D:This ring projects an aura of quiet around you, protecting you from loud noise.
 
 N:430:Confusion Resistance
@@ -3791,8 +4026,9 @@ G:=:d
 I:45:43:0
 W:22:0:2:3000
 A:22/2
-F:RES_CONF | EASY_KNOW
-f:RES_CONF |
+F:EASY_KNOW
+F:RES_CONF
+f:RES_CONF
 D:This ring stabilises your mind, protecting you from all kinds of befuddlement.
 
 N:431:Shard Resistance
@@ -3800,8 +4036,9 @@ G:=:d
 I:45:44:0
 W:25:0:2:3000
 A:25/2
-F:RES_SHARDS | EASY_KNOW
-f:RES_SHARDS |
+F:EASY_KNOW
+F:RES_SHARDS
+f:RES_SHARDS
 D:This piece of jewellery magically toughens your skin, protecting you from flying shrapnel.
 
 N:432:Disenchantment Resistance
@@ -3809,8 +4046,9 @@ G:=:d
 I:45:45:0
 W:90:0:2:15000
 A:90/10
-F:RES_DISEN | EASY_KNOW
-f:RES_DISEN |
+F:EASY_KNOW
+F:RES_DISEN
+f:RES_DISEN
 D:This rare ring of preservation protects your equipment from attempts to sap its magic, also
 D:causing you to suffer less pain from such attacks.
 
@@ -3819,8 +4057,10 @@ G:=:d
 I:45:46:0
 W:50:0:2:13000
 A:50/2
-F:RES_CHAOS | RES_CONF | EASY_KNOW
-f:RES_CHAOS |
+F:EASY_KNOW
+F:RES_CHAOS
+F:RES_CONF
+f:RES_CHAOS
 D:This ring protects you from the horribly warping forces of chaos.
 
 N:434:Blindness Resistance
@@ -3828,8 +4068,9 @@ G:=:d
 I:45:47:0
 W:60:0:2:7500
 A:60/2
-F:RES_BLIND | EASY_KNOW
-f:RES_BLIND |
+F:EASY_KNOW
+F:RES_BLIND
+f:RES_BLIND
 D:This ring magically preserves your eyesight, making you impervious to any attempt to blind
 D:you.
 
@@ -3838,8 +4079,14 @@ G:=:d
 I:45:48:0
 W:100:0:2:100000
 A:100/5
-F:RES_DISEN | RES_POIS | HOLD_LIFE | FREE_ACT
-f:RES_DISEN | RES_POIS | HOLD_LIFE | FREE_ACT
+F:FREE_ACT
+F:HOLD_LIFE
+F:RES_DISEN
+F:RES_POIS
+f:FREE_ACT
+f:HOLD_LIFE
+f:RES_DISEN
+f:RES_POIS
 D:This blessed ring will protect you from disenchantment, poison, attempts to drain your life
 D:force and holding magic.
 
@@ -3848,9 +4095,12 @@ G:=:d
 I:45:49:0
 W:50:0:2:100000
 A:50/2
-F:BLOWS | ACTIVATE | EASY_USE |
-f:BLOWS | ACTIVATE
-a:HARDCORE=SPIN
+F:ACTIVATE
+F:BLOWS
+F:EASY_USE
+f:ACTIVATE
+f:BLOWS
+a:SPIN
 D:This powerful ring of fighters greatly enhances your fighting speed, allowing you to attack
 D:more often in a round of combat.
 
@@ -3923,7 +4173,10 @@ I:17:3:0
 W:55:0:2:35
 A:50/4:90/2
 P:0:3d4:0:0:0
-F:SHOW_MODS | SLAY_EVIL | IGNORE_ACID | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_FIRE
+F:SHOW_MODS
+F:SLAY_EVIL
 D:An arrow to be shot with a bow, its iron head coated with hallowed silver,
 D:a material that sears the flesh of all evil creatures.
 
@@ -3933,7 +4186,10 @@ I:18:3:0
 W:50:0:2:40
 A:60/4:95/2
 P:0:3d5:0:0:0
-F:SHOW_MODS | SLAY_EVIL | IGNORE_ACID | IGNORE_FIRE
+F:IGNORE_ACID
+F:IGNORE_FIRE
+F:SHOW_MODS
+F:SLAY_EVIL
 D:This crossbow bolt has a silver tip, blessed by the Valar for fighting evil.
 
 N:468:Wisdom
@@ -3941,8 +4197,10 @@ G:":d
 I:40:28:0
 W:30:0:3:500
 A:30/1
-F:WIS | SUST_WIS |  HIDE_TYPE
-f:WIS |
+F:HIDE_TYPE
+F:SUST_WIS
+F:WIS
+f:WIS
 D:This magical amulet will magically make you wiser, and fend off
 D:attacks that would reduce your wisdom. Beware: if cursed, the
 D:amulet will do the opposite.
@@ -3952,8 +4210,9 @@ G:":d
 I:40:30:0
 W:30:0:3:600
 A:30/3
-F:REGEN | EASY_KNOW
-f:REGEN |
+F:EASY_KNOW
+F:REGEN
+f:REGEN
 D:Wearing this amulet will trigger your body's regenerational
 D:processes quicker and make them proceed faster.
 
@@ -3962,8 +4221,9 @@ G:":d
 I:40:26:0
 W:10:0:3:200
 A:10/1
-F:INFRA | HIDE_TYPE
-f:INFRA |
+F:HIDE_TYPE
+F:INFRA
+f:INFRA
 D:This amulet will increase your ability to sense warm-blooded
 D:creatures in your vicinity. Beware: if cursed, it will do
 D:just the opposite.
@@ -3973,8 +4233,16 @@ G:":d
 I:40:25:0
 W:70:0:3:30000
 A:70/8
-F:WIS | CHR | SUST_WIS | SUST_CHR | LITE1 | HIDE_TYPE |
-F:RES_DARK | RES_LITE | RES_FIRE | HOLD_LIFE |
+F:CHR
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:LITE1
+F:RES_DARK
+F:RES_FIRE
+F:RES_LITE
+F:SUST_CHR
+F:SUST_WIS
+F:WIS
 D:This blessed amulet will protect your wisdom and charms from
 D:diminishing, often adding to them as well. It also grants
 D:some extra protective magics by the grace of the Valar.
@@ -3984,8 +4252,14 @@ G:":d
 I:40:24:0
 W:70:0:3:30000
 A:70/8
-F:STR | CON | SUST_STR | SUST_CON | FREE_ACT | HIDE_TYPE |
-F:RES_FEAR | RES_DISEN |
+F:CON
+F:FREE_ACT
+F:HIDE_TYPE
+F:RES_DISEN
+F:RES_FEAR
+F:STR
+F:SUST_CON
+F:SUST_STR
 D:The ultimate amulet for a warrior, it will grant protection
 D:in the face of some evil magics, protect your strength and health,
 D:also increasing them. Beware: if cursed, the amulet will
@@ -3996,8 +4270,14 @@ G:":d
 I:40:23:0
 W:70:0:3:30000
 A:70/8
-F:DEX | SUST_DEX | STEALTH | SPEED | INFRA | HIDE_TYPE |
-F:RES_NEXUS | RES_POIS
+F:DEX
+F:HIDE_TYPE
+F:INFRA
+F:RES_NEXUS
+F:RES_POIS
+F:SPEED
+F:STEALTH
+F:SUST_DEX
 D:The ultimate amulet for a rogue or assassin, it protects the
 D:wearer against some evil magics, granting improvements in
 D:the abilities vital to these adventurers. Beware: if cursed,
@@ -4008,9 +4288,12 @@ G:":d
 I:40:22:0
 W:50:0:3:25000
 A:50/6
-F:ESP_ALL |
-f:ESP_ALL |
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:ESP_ALL
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+f:ESP_ALL
 D:This rare and powerful amulet lays bare the minds of monsters
 D:before the wearer.
 
@@ -4019,9 +4302,19 @@ G:":d
 I:40:21:0
 W:60:0:3:20000
 A:60/4
-F:SUST_STR | SUST_INT | SUST_WIS | SUST_DEX | SUST_CON | SUST_CHR |
-F:HOLD_LIFE | SLOW_DIGEST | EASY_KNOW |
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:EASY_KNOW
+F:HOLD_LIFE
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:SLOW_DIGEST
+F:SUST_CHR
+F:SUST_CON
+F:SUST_DEX
+F:SUST_INT
+F:SUST_STR
+F:SUST_WIS
 D:This blessed amulet will make the wearer impervious to evil magics
 D:that would sap innate abilities. It also slows down the digestive
 D:system, making food less necessary on long journeys.
@@ -4057,7 +4350,8 @@ N:479:& Ring~
 G:=:d
 I:45:57:0
 W:70:0:2:65000
-F:INSTA_ART | SPECIAL_GENE
+F:INSTA_ART
+F:SPECIAL_GENE
 
 ##### And here starts the gold/gems #####
 
@@ -4163,7 +4457,10 @@ G:\:D
 I:21:50:0
 W:15:0:200:1000
 P:0:3d9:0:0:0
-F:SHOW_MODS | INSTA_ART | MUST2H | SPECIAL_GENE
+F:INSTA_ART
+F:MUST2H
+F:SHOW_MODS
+F:SPECIAL_GENE
 f:MUST2H
 
 N:499:& Massive Iron Crown~
@@ -4171,7 +4468,8 @@ G:]:D
 I:33:50:0
 W:44:0:20:1000
 P:0:1d1:0:0:0
-F:INSTA_ART | SPECIAL_GENE
+F:INSTA_ART
+F:SPECIAL_GENE
 
 
 ##### Objects 500 to 511 are "Special Artifacts" #####
@@ -4275,7 +4573,8 @@ N:508:& Ring~
 G:=:d
 I:45:34:0
 W:80:0:2:100000
-F:INSTA_ART | SPECIAL_GENE
+F:INSTA_ART
+F:SPECIAL_GENE
 
 # The Ring of Power 'Nenya' -- see artifact list
 
@@ -4318,9 +4617,13 @@ G:":d
 I:40:9:0
 W:60:0:3:30000
 A:60/4
-F:REFLECT | EASY_KNOW
-f:REFLECT |
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:EASY_KNOW
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:REFLECT
+f:REFLECT
 D:This wondrous amulet will magically make the wearer
 D:reflect arrows and bolts launched by adversaries.
 
@@ -4331,9 +4634,12 @@ G:":d
 I:40:13:0
 W:40:0:3:30000
 A:40/4
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 F:NO_MAGIC
 f:NO_MAGIC
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
 D:This amulet wards off magic of any kind, good or bad.
 
 N:522:Anti-Teleportation
@@ -4341,9 +4647,12 @@ G:":d
 I:40:14:0
 W:30:0:3:15000
 A:30/4
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 F:NO_TELE
 f:NO_TELE
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
 D:This amulet will prevent the space-time continuum from
 D:being disrupted around the wearer.
 
@@ -4354,9 +4663,18 @@ G:":d
 I:40:15:0
 W:50:0:3:25000
 A:50/4
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD
-f:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:RES_ACID
+F:RES_COLD
+F:RES_ELEC
+F:RES_FIRE
+f:RES_ACID
+f:RES_COLD
+f:RES_ELEC
+f:RES_FIRE
 D:This amulet will make the wearer resist the elements.
 
 ##### New arms #####
@@ -4367,7 +4685,8 @@ I:23:29:0
 W:40:0:280:580
 A:40/3
 P:0:4d6:0:0:0
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 f:MUST2H
 D:This great sword of foreign origin is approximately 6 feet long. The hilt is
 D:long enough for even four hands to grip. A mighty weapon for a warrior.
@@ -4379,7 +4698,9 @@ I:39:3:0
 W:15:0:50:5000
 A:15/2
 P:0:1d1:0:0:0
-F:EASY_KNOW | IGNORE_FIRE | LITE2
+F:EASY_KNOW
+F:IGNORE_FIRE
+F:LITE2
 f:LITE2
 D:Made by the Dwarves, this lantern provides light in the
 D:darkest recesses of the earth.
@@ -4400,7 +4721,9 @@ I:39:2:0
 W:5:0:50:2500
 A:5/1
 P:0:1d1:0:0:0
-F:EASY_KNOW | IGNORE_FIRE | LITE1
+F:EASY_KNOW
+F:IGNORE_FIRE
+F:LITE1
 f:LITE1
 D:This enchanted torch never needs to be fuelled.
 
@@ -4431,7 +4754,9 @@ I:39:4:0
 W:25:0:50:15000
 A:25/3
 P:0:1d1:0:0:0
-F:EASY_KNOW | IGNORE_FIRE | LITE3
+F:EASY_KNOW
+F:IGNORE_FIRE
+F:LITE3
 f:LITE3
 D:Made by the descendants of the Noldo craftsman, this lamp
 D:contains a part of the flame which burned inside Feanor.
@@ -4462,7 +4787,8 @@ I:24:1:0
 W:10:0:60:120
 A:10/2
 P:0:1d5:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:This is a larger version of a throwing axe. It has a single
 D:blade with a pick on the reverse, designed for armour piercing.
@@ -4541,7 +4867,8 @@ I:23:26:0
 W:40:0:230:600
 A:40/2
 P:0:3d7:0:0:0
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 f:MUST2H
 D:A large, two-handed sword with a blade that weaves
 D:left and right until it reaches the hilt.
@@ -4552,7 +4879,8 @@ I:23:23:0
 W:40:0:200:600
 A:40/2
 P:0:2d8:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:Also known as a Claidhmore, or Greatsword, this weapon is favoured
 D:by powerful mercenaries. The blade is large, straight, and broad,
@@ -4564,7 +4892,8 @@ I:23:24:0
 W:40:0:200:600
 A:40/3
 P:0:2d9:0:0:0
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 f:MUST2H
 D:This is the strictly two-handed version of the bastard sword.
 D:The blade is of medium length, double-edged, and considerably
@@ -4576,39 +4905,21 @@ I:23:22:0
 W:40:0:240:500
 A:40/3
 P:0:4d5:0:0:0
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 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
 W:18:0:155:301
 A:18/2
 P:0:1d10:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:It is a type of glaive with two ornate hooks on the back
 D:of the blade. It is typically 8 to 9 feet long.
@@ -4619,7 +4930,8 @@ I:22:16:0
 W:21:0:165:320
 A:21/1
 P:0:2d5:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:Mounted on a long shaft for maximum reach, this weapon is
 D:effective at repelling both cavalry and infantry.
@@ -4630,7 +4942,8 @@ I:22:29:0
 W:43:0:400:700
 A:43/2
 P:0:4d8:0:0:0
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 f:MUST2H
 D:This is a shock weapon. Its purpose is to unhorse a rider
 D:in single combat, or smash through the armour of opposing lines.
@@ -4646,17 +4959,6 @@ D:This is a two-edged dagger with a long blade. A favourite among travellers
 D:and warriors alike, because 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
@@ -4695,16 +4997,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:& Golden Ring Mail~
 G:(:y
 I:36:15:0
@@ -4714,26 +5006,6 @@ P:8:1d4:-1:0:0
 D:A suit of non-overlapping thin golden rings sewn onto a soft leather
 D:backing. It looks beautiful, and is worn on special occasions.
 
-### Trapping Kits
-
-N:562:Magic
-G:`:g
-I:46:5:0
-W:5:0:20:50
-A:5/2:40/2
-F:IGNORE_ACID | IGNORE_FIRE | IGNORE_COLD | IGNORE_ELEC
-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 | IGNORE_FIRE | IGNORE_COLD | IGNORE_ELEC
-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.
-
 # XXX
 # XXX
 # XXX
@@ -4756,7 +5028,8 @@ W:70:0:4:10000
 A:70/16
 P:0:1d1:0:0:0
 T:71:2
-F:NORM_ART | FULL_NAME
+F:FULL_NAME
+F:NORM_ART
 D:This magical potion contains a small part of the power of
 D:Eru Iluvatar on Middle-Earth.
 
@@ -4772,7 +5045,8 @@ I:6:1:0
 W:5:0:12:300
 A:5/1:20/1:50/1:80/1
 P:0:1d4:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:It looks like a simple walking stick, plain and nondescript.
 D:In the hands of a spellcaster, it can be a deadly weapon.
@@ -4785,9 +5059,11 @@ I:45:56:0
 W:50:0:2:3000
 A:50/1
 P:0:0d0:0:0:15
-a:HARDCORE=BA_ELEC_4
-F:RES_ELEC | ACTIVATE
-f:RES_ELEC | IGNORE_ELEC
+a:BA_ELEC_4
+F:ACTIVATE
+F:RES_ELEC
+f:IGNORE_ELEC
+f:RES_ELEC
 D:This sparkling circlet grants you protection, makes electricity less
 D:dangerous and even allows you to call forth a ball of lightning.
 
@@ -4831,8 +5107,9 @@ G:=:d
 I:45:53:4
 W:50:0:2:10000
 A:50/1
-F:INVIS | HIDE_TYPE
-f:INVIS |
+F:HIDE_TYPE
+F:INVIS
+f:INVIS
 D:This magical bauble will hide you from sight.
 
 # XXX
@@ -4986,7 +5263,8 @@ I:72:1:0
 W:5:0:4:100
 A:1/3:5/1:10/1
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:This concoction can transform your body for a short period of time.
 
 ### New Parchments for Theme - monster and artifact spoilers
@@ -5178,7 +5456,8 @@ I:36:16:0
 W:5:0:60:400
 A:25/1
 P:9:1d1:0:0:0
-F:RES_FIRE | RES_COLD |
+F:RES_COLD
+F:RES_FIRE
 D:This coat is made from the down of Manwe's Great Eagles, 
 D:gathered painstakingly from nests. It is magical, protecting  
 D:the wearer from extremes of temperatures.
@@ -5188,7 +5467,8 @@ N:647:& Key~
 G:~:g
 I:39:106:0
 W:15:0:15:20000
-F:INSTA_ART | SPECIAL_GENE
+F:INSTA_ART
+F:SPECIAL_GENE
 
 # Here are the boomerangs
 
@@ -5316,7 +5596,9 @@ G:~:o
 I:102:0:0
 W:1:0:50:0
 A:1/1:10/1:20/1:30/1
-F:INSTA_ART | ACTIVATE | ACTIVATE_NO_WIELD
+F:ACTIVATE
+F:ACTIVATE_NO_WIELD
+F:INSTA_ART
 
 N:663:Craftsmanship
 G:?:d
@@ -5345,7 +5627,9 @@ I:14:60:1
 W:7:0:30:400
 A:7/2:20/1:40/1:80/1
 P:0:1d1:0:0:0
-F:CON | ACTIVATE | WIELD_CAST
+F:ACTIVATE
+F:CON
+F:WIELD_CAST
 D:A simple wind instrument made from brass. If used by inexperienced musicians it sounds
 D:like somebody making "prbbt!" noises down a drainpipe.
 
@@ -5355,7 +5639,8 @@ I:14:58:1
 W:7:0:30:400
 A:7/2:20/1:40/1:80/1
 P:0:1d1:0:0:0
-F:STR | WIELD_CAST
+F:STR
+F:WIELD_CAST
 D:A sort of clay pot with a bit of skin stretched over its mouth.
 
 N:671:& Harp~
@@ -5364,7 +5649,8 @@ I:14:59:1
 W:7:0:30:400
 A:7/2:20/1:40/1:80/1
 P:0:1d1:0:0:0
-F:CHR | WIELD_CAST
+F:CHR
+F:WIELD_CAST
 D:A number of strings held by a wooden frame.
 
 # XXX
@@ -5387,7 +5673,8 @@ I:10:1:0
 W:5:0:30:100
 A:5/1:15/1:25/1:35/1
 P:0:1d1:0:0:0
-F:ACTIVATE | ACTIVATE_NO_WIELD
+F:ACTIVATE
+F:ACTIVATE_NO_WIELD
 
 ### Two more scrolls ###
 
@@ -5407,182 +5694,6 @@ A:30/1:45/1:55/1
 D:This scroll is inscribed with a ritual which allows you to discern what fate holds in store for
 D:you.
 
-### Here comes the Runes ###
-
-N:679:Self
-G:?:b
-I:105:0:0
-W:3:5:2:40
-A:3/1
-P:0:1d1:0:0:0
-F:EASY_KNOW
-D:A rune signifying the caster.
-
-N:680:Ray
-G:?:b
-I:105:2:0
-W:10:5:2:300
-A:10/1
-P:0:1d1:0:0:0
-F:IGNORE_COLD | IGNORE_ELEC | EASY_KNOW
-D:A rune signifying a beam or ray.
-
-N:681:Sphere
-G:?:b
-I:105:3:0
-W:15:5:2:1000
-A:15/1
-P:0:1d1:0:0:0
-F:IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | EASY_KNOW
-D:A rune signifying a ball or sphere.
-
-N:682:Knowledge
-G:?:b
-I:104:91:0
-W:6:5:2:200
-A:6/1
-P:0:1d1:0:0:0
-F:EASY_KNOW
-D:A rune signifying knowledge.
-
-N:683:Life
-G:?:D
-I:104:53:0
-W:3:5:2:200
-A:3/1
-P:0:1d1:0:0:0
-F:EASY_KNOW
-D:A rune signifying life.
-
-N:684:Fire
-G:?:r
-I:104:5:0
-W:10:5:2:300
-A:10/1
-P:0:1d1:0:0:0
-F:IGNORE_FIRE | EASY_KNOW
-D:A rune signifying flame.
-
-N:685:Cold
-G:?:b
-I:104:4:0
-W:12:5:2:300
-A:12/1
-P:0:1d1:0:0:0
-F:IGNORE_COLD | EASY_KNOW
-D:A rune signifying cold.
-
-N:686:Lightning
-G:?:W
-I:104:1:0
-W:13:5:2:300
-A:13/1
-P:0:1d1:0:0:0
-F:IGNORE_ELEC | EASY_KNOW
-D:A rune signifying a lightning beam.
-
-N:687:Acid
-G:?:B
-I:104:3:0
-W:16:5:2:300
-A:16/1
-P:0:1d1:0:0:0
-F:IGNORE_ACID | EASY_KNOW
-D:A rune signifying acid.
-
-N:688:Element
-G:?:g
-I:104:10:0
-W:23:5:2:1000
-A:23/1
-P:0:1d1:0:0:0
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | EASY_KNOW
-D:A rune signifying an element.
-
-N:689:Chaos
-G:?:v
-I:104:30:0
-W:26:5:2:2000
-A:26/1
-P:0:1d1:0:0:0
-F:ATTR_MULTI
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | EASY_KNOW
-D:A rune signifying raw chaos.
-
-N:690:Mind
-G:?:D
-I:104:85:0
-W:19:5:2:3000
-A:19/1
-P:0:1d1:0:0:0
-F:IGNORE_ELEC | EASY_KNOW
-D:A rune signifying the mind.
-
-N:691:Holding
-G:?:B
-I:104:75:0
-W:5:5:2:500
-A:5/1
-P:0:1d1:0:0:0
-F:IGNORE_ACID | EASY_KNOW
-D:A rune signifying the action of holding, or sleep.
-
-N:692:Arrow
-G:?:b
-I:105:1:0
-W:6:5:2:100
-A:6/1
-P:0:1d1:0:0:0
-F:IGNORE_ELEC | EASY_KNOW
-D:A rune signifying an arrow.
-
-N:693:Power Surge
-G:?:b
-I:105:4:0
-W:50:5:2:5000
-A:50/1
-P:0:1d1:0:0:0
-F:IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | IGNORE_ACID | EASY_KNOW
-D:A rune signifying a powerful surge.
-
-N:694:Armageddon
-G:?:b
-I:105:5:0
-W:30:5:2:4000
-A:30/1
-P:0:1d1:0:0:0
-F:IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | IGNORE_ACID | EASY_KNOW
-D:A rune signifying a powerful blast.
-
-N:695:Gravity
-G:?:G
-I:104:35:0
-W:16:5:2:300
-A:16/1
-P:0:1d1:0:0:0
-F:IGNORE_ACID | EASY_KNOW
-D:A rune signifying the forces of gravity.
-
-# XXX
-
-N:697:Undeath
-G:?:G
-I:104:92:0
-W:35:5:2:1000
-A:35/1
-P:0:1d1:0:0:0
-F:IGNORE_ACID | EASY_KNOW
-D:A rune signifying undeath.
-
-N:698:Protection
-G:?:G
-I:104:74:0
-W:45:5:2:1500
-A:45/1
-P:0:1d1:0:0:0
-F:IGNORE_ACID | EASY_KNOW
-D:A rune signifying protection.
-
 # XXX
 
 # The Ring of Precognition (now a k_info.txt artifact)
@@ -5592,10 +5703,14 @@ I:45:51:0
 W:90:0:2:300000
 A:90/100
 T:45:23
-F:PRECOGNITION |
-f:PRECOGNITION |
-F:NORM_ART | FULL_NAME
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:FULL_NAME
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:NORM_ART
+F:PRECOGNITION
+f:PRECOGNITION
 D:This magical ring allows you to know what you will encounter in the near future.
 
 # Athelas, cures Black Breath
@@ -5635,8 +5750,12 @@ I:70:40:0
 W:90:0:5:160000
 A:90/140
 T:70:51
-F:NORM_ART | FULL_NAME
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+F:FULL_NAME
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:NORM_ART
 D:It allows you to leave your body to reincarnate into
 D:another one. However, your current body is lost in the process.
 
@@ -5646,7 +5765,8 @@ I:23:33:0
 W:25:0:70:500
 A:25/1:80/2
 P:0:3d7:0:0:0
-F:SHOW_MODS | ANTIMAGIC_50
+F:ANTIMAGIC_50
+F:SHOW_MODS
 f:ANTIMAGIC_50
 D:A strange, very sharp long sword, which seems to drain light from its surroundings. As you
 D:wield it, you feel much less attuned to magic.
@@ -5788,8 +5908,9 @@ G:=:d
 I:45:54:0
 W:20:0:2:16000
 A:20/3
-F:FLY | EASY_KNOW
-f:FLY |
+F:EASY_KNOW
+F:FLY
+f:FLY
 D:This ring is imbued with the power of eagles. It grants you the power of flight.
 
 N:756:& Tome~ of the Time
@@ -5798,7 +5919,8 @@ I:111:8:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:This tome seems to have trouble deciding whether it really exists now. Its flickering pages
 D:contain all that is known about the currents of time.
 
@@ -5816,7 +5938,10 @@ I:111:9:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW | IGNORE_FIRE | ATTR_MULTI
+F:ATTR_MULTI
+F:EASY_KNOW
+F:FULL_NAME
+F:IGNORE_FIRE
 D:This tome gives you deeper insights on the works of magic.
 
 N:759:& Tome~ of the Mind
@@ -5825,7 +5950,8 @@ I:111:10:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:This tome has no pages; knowledge is transferred to you if you simply
 D:hold it.
 
@@ -5835,7 +5961,8 @@ I:111:20:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:This dusty tome is filled with ancient rituals,
 D:designed to uncover all that is hidden.
 
@@ -5845,7 +5972,8 @@ I:111:21:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:A large jewel-encrusted tome that transfers
 D:wisdom and understanding to its bearer.
 
@@ -5855,7 +5983,8 @@ I:111:22:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:This tome fills you with glorious visions of total devastation.
 D:Anyone in your way shall be destroyed.
 
@@ -5865,7 +5994,9 @@ I:111:11:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW | ATTR_MULTI
+F:ATTR_MULTI
+F:EASY_KNOW
+F:FULL_NAME
 D:This singed book smells like burned flesh.  Its power is as evident
 D:as its thirst for your blood.
 
@@ -5875,7 +6006,8 @@ I:111:23:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:A black and scarlet flame springs from this tome, issuing
 D:a thunderous roar, and you hear the screams of tormented souls.
 
@@ -5885,7 +6017,8 @@ I:111:63:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:The sleek black cover of this tome is covered with intricate
 D:carved decorations, inset with rubies that sparkle like fire.
 
@@ -5895,7 +6028,8 @@ I:111:64:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:This tome's cover and pages radiate a soft white light.
 
 N:767:& Ocean Tome~ of Ulmo
@@ -5904,7 +6038,8 @@ I:111:65:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:This book smells faintly of seaweed and appears to be wet.
 
 N:768:& Forest Tome~ of Yavanna
@@ -5913,7 +6048,8 @@ I:111:24:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:The cover of this tome reminds you of tree bark.
 D:You feel the smell of grass and flowers as you read it.
 
@@ -5925,8 +6061,15 @@ I:111:61:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW | ATTR_MULTI | SPECIAL_GENE
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | NORM_ART
+F:ATTR_MULTI
+F:EASY_KNOW
+F:FULL_NAME
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:NORM_ART
+F:SPECIAL_GENE
 D:This book has some of your favourite spells inside.
 
 # The Ring of Phasing -- see artifact list
@@ -5936,7 +6079,8 @@ G:=:d
 I:45:55:0
 W:110:0:2:300000
 A:110/5
-F:INSTA_ART | SPECIAL_GENE
+F:INSTA_ART
+F:SPECIAL_GENE
 
 N:771:& Holy Tome~ of Mandos
 G:?:w
@@ -5944,7 +6088,8 @@ I:111:66:0
 W:50:0:30:25000
 A:50/4
 P:0:1d1:0:0:0
-F:FULL_NAME | EASY_KNOW
+F:EASY_KNOW
+F:FULL_NAME
 D:Just holding this tome makes you fill with quiet strength.
 
 # XXX #
@@ -5961,8 +6106,12 @@ W:90:0:15:150000
 A:100/14
 P:0:1d1:0:0:0
 T:66:1
-F:NORM_ART | FULL_NAME
-F:IGNORE_FIRE | IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC
+F:FULL_NAME
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:NORM_ART
 D:This rod creates a little hatch, allowing access to your home no matter how far away it is.
 
 # Additional swords
@@ -5972,7 +6121,9 @@ I:23:32:1
 W:50:900:45:2000
 A:48/4:60/2:80/1
 P:0:4d4:-2:2:0
-F:IGNORE_ACID | RES_DARK | STEALTH
+F:IGNORE_ACID
+F:RES_DARK
+F:STEALTH
 f:STEALTH
 D:A thin long sword made of a completely black metal, which reflects no light.
 
@@ -5982,7 +6133,8 @@ I:23:31:0
 W:60:1800:50:6000
 A:60/20
 P:0:1d6:4:0:0
-F:SHOW_MODS | VORPAL
+F:SHOW_MODS
+F:VORPAL
 D:A small sword made of a blueish metal with a strangely rough surface. As anything is hurt
 D:with it, the weapon will stick inside the wound and cause horrible wounds when torn away.
 
@@ -5992,8 +6144,10 @@ G:":G
 I:40:17:0
 W:25:0:3:10000
 A:25/1
-a:HARDCORE=BA_POIS_4
-F:RES_POIS | DEX | ACTIVATE
+a:BA_POIS_4
+F:ACTIVATE
+F:DEX
+F:RES_POIS
 D:A petrified serpent's tongue, hung on a thin chain to be clasped around your neck. It makes you
 D:like a snake, able to wriggle out of tight corners, impervious to poisons and poisonous
 D:yourself.
@@ -6012,9 +6166,14 @@ G:=:d
 I:45:5:0
 W:100:0:2:1
 A:100/100
-F:INVIS | DRAIN_EXP | CURSED | HEAVY_CURSE | CURSE_NO_DROP
+F:CURSED
+F:CURSE_NO_DROP
+F:DRAIN_EXP
+F:FULL_NAME
+F:HEAVY_CURSE
+F:INVIS
+F:SPECIAL_GENE
 f:INVIS
-F:SPECIAL_GENE | FULL_NAME
 
 # To help people climb mountains...
 
@@ -6043,7 +6202,9 @@ I:115:55:0
 W:10:0:150:500
 A:10/1
 P:0:4d6:0:0:0
-F:SHOW_MODS | SLAY_DEMON | WIELD_CAST
+F:SHOW_MODS
+F:SLAY_DEMON
+F:WIELD_CAST
 D:This blade has been taken from the corpse of a demon.
 D:Some demonic energy is still coursing through it, helping
 D:you slay other demons.
@@ -6054,7 +6215,8 @@ I:115:56:0
 W:15:0:70:500
 A:15/1
 P:5:1d1:0:0:0
-F:REGEN | WIELD_CAST
+F:REGEN
+F:WIELD_CAST
 D:This shield has been taken from the corpse of a demon.
 D:Some demonic energy is still coursing through it, giving
 D:life to any that wield it.
@@ -6065,7 +6227,8 @@ I:115:57:0
 W:20:0:30:500
 A:20/1
 P:2:1d1:0:0:0
-F:LITE2 | WIELD_CAST
+F:LITE2
+F:WIELD_CAST
 D:This horn is about six feet long, and originates from a demon.
 D:Some demonic energy is still coursing through it.
 
@@ -6140,7 +6303,10 @@ W:70:0:15:2000
 A:70/30
 P:0:1d1:0:0:0
 F:ATTR_MULTI
-F:IGNORE_ACID | IGNORE_FIRE | IGNORE_COLD | IGNORE_ELEC
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
 D:This is the rarest and most powerful kind of rod there is. Its material was once used
 D:to chain Melkor Bauglir in the Halls of Mandos, and only Aule knows the secret of its
 D:making. Treasure this rod greatly.
@@ -6159,8 +6325,12 @@ I:70:43:0
 W:55:0:5:0
 A:55/1
 T:70:1
-F:NORM_ART | FULL_NAME
-F:IGNORE_FIRE | IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC
+F:FULL_NAME
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:NORM_ART
 D:This magical scroll sends a call to the halls of Mandos, issuing forth all those who have been
 D:slain by the reader.
 
@@ -6190,20 +6360,11 @@ I:24:30:0
 W:70:0:300:6000
 A:70/8
 P:0:5d7:0:0:0
-F:SLAY_ANIMAL | SHOW_MODS
+F:SHOW_MODS
+F:SLAY_ANIMAL
 D:A huge axe, the sort used for slaughtering animals, this weapon is unusually deadly against
 D:natural creatures.
 
-N:806:& Runestone~
-G:?:v
-I:105:255:0
-W:10:5:2:300
-A:10/3:20/2:30/1:60/1
-P:0:1d1:0:0:0
-F:IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE | IGNORE_ACID
-D:A small oval stone. One surface is flat, as if something ought to be scratched or inscribed into
-D:it.
-
 N:807:& Fortune cookie~
 G:,:U
 I:80:42:500
@@ -6230,7 +6391,12 @@ W:10:10:10:3200
 A:10/200
 P:0:10d10:0:0:0
 T:65:6
-F:RECHARGE | SPECIAL_GENE | EASY_USE | RECHARGED | NORM_ART | FULL_NAME
+F:EASY_USE
+F:FULL_NAME
+F:NORM_ART
+F:RECHARGE
+F:RECHARGED
+F:SPECIAL_GENE
 D:The miner's friend.  This wand was used by Thrain to dig into the
 D:walls of the dungeon.  Its indestructible nature makes it quite useful.
 
@@ -6242,7 +6408,11 @@ W:50:10:10:12000
 P:0:10d4:0:0:0
 A:50/200
 T:55:8
-F:RECHARGE | EASY_USE | RECHARGED | NORM_ART | FULL_NAME
+F:EASY_USE
+F:FULL_NAME
+F:NORM_ART
+F:RECHARGE
+F:RECHARGED
 D:Mithrandir's staff that throws powerful fire attacks at all enemies.  It
 D:can be recharged without blowing up, for it is built to hold
 D:much magical energy.
@@ -6276,7 +6446,11 @@ I:11:7:0
 W:0:0:0:1000
 A:0/1
 P:0:1d1:0:0:0
-F:SPECIAL_GENE | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE | IGNORE_ACID
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:SPECIAL_GENE
 D:Although it looks like a piece of junk, it is actually part of an ancient
 D:relic belonging to Priests of Eru. The relic now lies in pieces, hidden
 D:from all but but his most dedicated followers.
@@ -6287,7 +6461,11 @@ I:11:8:0
 W:0:0:0:1000
 A:0/1
 P:0:1d1:0:0:0
-F:SPECIAL_GENE | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE | IGNORE_ACID
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:SPECIAL_GENE
 D:Although it looks like a piece of junk, it is actually part of an ancient
 D:relic belonging to Priests of Manwe. The relic now lies in pieces, hidden
 D:from all but his most dedicated followers.
@@ -6298,7 +6476,11 @@ I:11:9:0
 W:0:0:0:1000
 A:0/1
 P:0:1d1:0:0:0
-F:SPECIAL_GENE | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE | IGNORE_ACID
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:SPECIAL_GENE
 D:Although it looks like a piece of junk, it is actually part of an ancient
 D:relic belonging to worshippers of Tulkas. The relic now lies in pieces,
 D:hidden from all but his most dedicated followers.
@@ -6309,7 +6491,11 @@ I:11:10:0
 W:0:0:0:1000
 A:0/1
 P:0:1d1:0:0:0
-F:SPECIAL_GENE | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE | IGNORE_ACID
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:SPECIAL_GENE
 D:Although it looks like a piece of junk, it is actually part of an ancient
 D:relic belonging to Dark Priests. The relic now lies in pieces, hidden
 D:from all but the most faithful followers of Melkor.
@@ -6320,7 +6506,11 @@ I:11:11:0
 W:0:0:0:1000
 A:0/1
 P:0:1d1:0:0:0
-F:SPECIAL_GENE | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE | IGNORE_ACID
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:SPECIAL_GENE
 D:Although it looks like a piece of junk, it is actually part of an ancient
 D:relic belonging to Druids. The relic now lies in pieces, hidden
 D:from all but the most faithful followers of Yavanna.
@@ -6342,8 +6532,12 @@ I:11:16:0
 W:0:0:0:1000
 A:0/1
 P:0:1d1:0:0:0
-F:SPECIAL_GENE | FULL_NAME
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE |
+F:FULL_NAME
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:SPECIAL_GENE
 D:Although it looks like a piece of junk, it is actually part of an ancient
 D:relic belonging to the Stonewrights. The relic now lies in pieces, hidden
 D:from all but the most faithful followers of Aule.
@@ -6354,8 +6548,12 @@ I:11:17:0
 W:0:0:0:1000
 A:0/1
 P:0:1d1:0:0:0
-F:SPECIAL_GENE | FULL_NAME
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE |
+F:FULL_NAME
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:SPECIAL_GENE
 D:Although it looks like a piece of junk, it is actually part of an ancient
 D:relic belonging to the Priests of Varda. The relic now lies in pieces, 
 D:hidden from all but the most faithful followers of Varda.
@@ -6366,8 +6564,12 @@ I:11:18:0
 W:0:0:0:1000
 A:0/1
 P:0:1d1:0:0:0
-F:SPECIAL_GENE | FULL_NAME
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE |
+F:FULL_NAME
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:SPECIAL_GENE
 D:Although it looks like a piece of junk, it is actually part of an ancient
 D:relic belonging to the Priests of Ulmo. The relic now lies in pieces, hidden
 D:from all but the most faithful followers of Ulmo.
@@ -6378,8 +6580,12 @@ I:11:19:0
 W:0:0:0:1000
 A:0/1
 P:0:1d1:0:0:0
-F:SPECIAL_GENE | FULL_NAME
-F:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE |
+F:FULL_NAME
+F:IGNORE_ACID
+F:IGNORE_COLD
+F:IGNORE_ELEC
+F:IGNORE_FIRE
+F:SPECIAL_GENE
 D:Although it looks like a piece of junk, it is actually part of an ancient
 D:relic belonging to the Priests of Mandos. The relic now lies in pieces, 
 D:hidden from all but the most faithful followers of Mandos.
@@ -6427,8 +6633,12 @@ G:":d
 I:40:3:3
 W:70:12:3:55000
 A:70/12
-F:BLOWS | STR | DEX
-F:AGGRAVATE | DRAIN_MANA | DRAIN_EXP
+F:AGGRAVATE
+F:BLOWS
+F:DEX
+F:DRAIN_EXP
+F:DRAIN_MANA
+F:STR
 D:This rare amulet will magically improve your fighting prowess 
 D:greatly, but this improvement comes at a cost. Nothing can 
 D:ignore the challenge this amulet magically issues when worn.
@@ -6438,7 +6648,10 @@ G:":d
 I:40:16:1
 W:70:12:3:100000
 A:70/12
-F:LIFE | SUST_CON | HOLD_LIFE | DRAIN_MANA
+F:DRAIN_MANA
+F:HOLD_LIFE
+F:LIFE
+F:SUST_CON
 D:This rare amulet will magically increase your life force and 
 D:even prevent it from being sapped. However, wearing this 
 D:amulet makes you feel less adept at using magic.
@@ -6451,8 +6664,16 @@ G:=:d
 I:45:10:2
 W:100:0:2:125000
 A:100/10
-F:MANA | SPELL | SPELL_CONTAIN | WIELD_CAST | HIDE_TYPE |
-f:IGNORE_ACID | IGNORE_COLD | IGNORE_ELEC | IGNORE_FIRE | SPELL |
+F:HIDE_TYPE
+F:MANA
+F:SPELL
+F:SPELL_CONTAIN
+F:WIELD_CAST
+f:IGNORE_ACID
+f:IGNORE_COLD
+f:IGNORE_ELEC
+f:IGNORE_FIRE
+f:SPELL
 D:This powerful ring not only stores a chosen spell (which must be 
 D:engraved by 'copying' it); it also improves the power of cast spells 
 D:and augments the wearer's magical reserves.
@@ -6462,11 +6683,19 @@ G:=:d
 I:45:11:2
 W:100:0:2:125000
 A:100/10
-F:SUST_STR | SUST_DEX | SUST_CON | REGEN |
-F:HOLD_LIFE | LIFE |
-F:HIDE_TYPE | ACTIVATE |
-a:HARDCORE=CURE_HUNGER
-f:SUST_STR | SUST_DEX | SUST_CON | REGEN |
+F:ACTIVATE
+F:HIDE_TYPE
+F:HOLD_LIFE
+F:LIFE
+F:REGEN
+F:SUST_CON
+F:SUST_DEX
+F:SUST_STR
+a:CURE_HUNGER
+f:REGEN
+f:SUST_CON
+f:SUST_DEX
+f:SUST_STR
 D:This valuable ring enhances and protects the wearer's life force in every way.
 
 N:842:Clear Thought
@@ -6474,14 +6703,29 @@ G:=:d
 I:45:12:0
 W:100:0:2:125000
 A:100/10
-F:SUST_INT | SUST_WIS | RES_FEAR | RES_CONF |
-F:ACTIVATE | EASY_KNOW |
-a:HARDCORE=CURE_INSANITY
-f:SUST_INT | SUST_WIS |
+F:ACTIVATE
+F:EASY_KNOW
+F:RES_CONF
+F:RES_FEAR
+F:SUST_INT
+F:SUST_WIS
+a:CURE_INSANITY
+f:SUST_INT
+f:SUST_WIS
 D:This valuable ring protects the wearer's intellect and intuition, as well as   
 D:guarding him from most mental attacks.  From time to time, the wearer can 
 D:even purge himself of insanity.
 
+N:843:Unmagic
+G:=:d
+I:45:10:2
+W:50:0:2:3000
+A:50/1
+F:ANTIMAGIC_50
+f:ANTIMAGIC_50
+D:This valuable ring projects an aura of anti-magic around its wearer.
+
+
 ### New scroll ###
 N:846:Sterilise
 G:?:d
@@ -6589,7 +6833,8 @@ I:24:3:0
 W:8:0:35:100
 P:0:1d6:0:0:0
 A:8/1:15/1
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:A throwing-length axe with a "beard", an increased depth at the lower
 D:end of the blade. Surprisingly light and durable, it doubles as a
@@ -6601,7 +6846,8 @@ I:24:4:0
 W:25:0:200:450
 P:0:3d6:0:0:0
 A:25/1:40/1
-F:SHOW_MODS | MUST2H
+F:MUST2H
+F:SHOW_MODS
 f:MUST2H
 D:A mighty axe with two moon-shaped blades on each side of the headpiece,
 D:the immense weight leads to slow but powerful swings.
@@ -6622,7 +6868,8 @@ I:24:7:0
 W:22:0:150:420
 A:22/1
 P:0:3d4:0:0:0
-F:SHOW_MODS | COULD2H
+F:COULD2H
+F:SHOW_MODS
 f:COULD2H
 D:A large axe with an elongated moon shaped blade. Strikes a good balance
 D:between swinging power and speed.
@@ -6677,7 +6924,7 @@ N:867:Map
 G:?:U
 I:8:33:0
 W:70:100:30:50000
-F:INSTA_ART |
+F:INSTA_ART
 D:At first glance, this looks like another crumpled piece of paper. 
 D:As you smooth out the parchment, you see the faint outline of a 
 D:map... You have a feeling you might find use for this map one day.
@@ -6687,7 +6934,7 @@ N:868:& Key~
 G:-:W
 I:11:13:0
 W:70:100:5:50000
-F:INSTA_ART | 
+F:INSTA_ART
 D:As you clear away some mud from this item, you notice that it is 
 D:actually a small silver key. You wonder what it opens. Perhaps 
 D:you should hang on to this key, you might find it useful later.
@@ -6698,7 +6945,7 @@ N:869:& Cup~
 G:+:y
 I:11:14:0
 W:70:100:50:100000
-F:INSTA_ART | 
+F:INSTA_ART
 D:It looks like a lump of clay, and as you prepare to throw it 
 D:away, a piece breaks off, and you see a faint gleam of gold. 
 D:Taking off the rest of the caked-on mud, you see that it is 
@@ -6741,14 +6988,15 @@ N:874:& Amulet~
 G:":B
 I:40:29:5
 W:10:2:2:10000
-F:INSTA_ART 
+F:INSTA_ART
 
 # The Black Banner of Gondor - see artifact list
 N:875:& Black Banner~
 G:~:D
 I:39:108:0
 W:60:30:50:50000
-F:LITE1 | INSTA_ART
+F:INSTA_ART
+F:LITE1
 D:A strange banner of black thread rolled up as though it were a scroll.
 
 # The Pearl 'Nimphelos' - see artifact list
@@ -6757,7 +7005,9 @@ G:~:w
 I:39:109:1
 W:20:10:10:40000
 P:0:1d1:0:0:0
-F:LITE3 | INSTA_ART | FULL_NAME
+F:FULL_NAME
+F:INSTA_ART
+F:LITE3
 D:A beautiful shining pearl, about the size of a dove's egg.
 
 # The Silmaril of Flames - see artifact list
@@ -6766,7 +7016,10 @@ G:*:R
 I:39:110:2
 W:75:90:200:100000
 P:0:10d10:0:0:0
-F:LITE2 | LITE3 | INSTA_ART | FULL_NAME
+F:FULL_NAME
+F:INSTA_ART
+F:LITE2
+F:LITE3
 D:A dazzling, mesmerizingly beautiful jewel, shining in pure white 
 D:light with a slight tinge of red. It hurts your eyes to look at it, 
 D:yet you cannot bear to turn away from it, either.
@@ -6777,7 +7030,9 @@ G:*:B
 I:39:111:2
 W:75:90:200:100000
 P:0:10d10:0:0:0
-F:LITE2 | LITE3 | INSTA_ART
+F:INSTA_ART
+F:LITE2
+F:LITE3
 D:A dazzling, mesmerizingly beautiful jewel, shining in pure white 
 D:light with a slight tinge of blue. It hurts your eyes to look at it, 
 D:yet you cannot bear to turn away from it, either.
@@ -6806,8 +7061,9 @@ I:17:3:0
 W:5:7:1:3
 P:0:2d6:0:0:0
 A:5/7:20/7:50/7
+F:ESP_ANIMAL
 F:SHOW_MODS
-F:SLAY_ANIMAL | ESP_ANIMAL
+F:SLAY_ANIMAL
 D:A sharpened metal head on a piece of wood, fitted with decorative 
 D:green feathers. You can use it for 'f'iring a bow.
 
@@ -6844,7 +7100,8 @@ I:15:3:0
 W:25:0:40:300
 A:25/1:35:/2
 P:0:2d5:0:0:0
-F:SHOW_MODS | IGNORE_ACID
+F:IGNORE_ACID
+F:SHOW_MODS
 D:A small curved piece of wood with mithril blades on the "forward" edges.
 
 N:885:& Mithril Boomerang~
@@ -6853,7 +7110,8 @@ I:15:4:0
 W:35:5:40:1000
 A:35/1:50/2
 P:0:5d6:0:0:0
-F:SHOW_MODS | IGNORE_ACID
+F:IGNORE_ACID
+F:SHOW_MODS
 D:A curved leaf-shaped piece of wood, its "forward" edges enhanced with mithril blades.
 
 # N: serial number : & object name~
@@ -6862,4 +7120,4 @@ D:A curved leaf-shaped piece of wood, its "forward" edges enhanced with mithril
 # W: depth : rarity : weight : cost
 # P: base armor class : base damage : plus to-hit : plus to-dam : plus to-ac
 # A: depth/rarity : depth/rarity : etc
-# F: flag | flag | etc
\ No newline at end of file
+# F: flag | flag | etc
diff --git a/lib/mods/theme/edit/maeglin.map b/lib/mods/theme/edit/maeglin.map
index e3be9972..7916fd9b 100644
--- a/lib/mods/theme/edit/maeglin.map
+++ b/lib/mods/theme/edit/maeglin.map
@@ -11,7 +11,7 @@ F:X:63:3
 F:<:172:3
 
 # up stairs with maeglin
-F:{:6:3:825:0:0:0:0:0:0:2
+F:{:6:3:825:0:0:0:0:0:2
 
 # Floor with dirt
 F:.:88:5
@@ -56,7 +56,7 @@ F:R:88:5:644
 F:O:88:5:645
 
 # Floor with dirt with a Lesser Balrog
-F:U:88:5:996:0:0:0:0:0:0:2
+F:U:88:5:996:0:0:0:0:0:2
 
 # Granite wall
 F:#:56:5
diff --git a/lib/mods/theme/edit/misc.txt b/lib/mods/theme/edit/misc.txt
index 2d380202..07261ba3 100644
--- a/lib/mods/theme/edit/misc.txt
+++ b/lib/mods/theme/edit/misc.txt
@@ -12,80 +12,8 @@ M:X:101
 # Maximum y size of the wilderness
 M:Y:66
 
-# Maximum number of randart parts in ra_info.txt
-M:Z:519
-
-# Maximum number of monsters in r_info.txt
-# WARNING ! add one more to the real count for the player ghost !!
-M:R:1081
-
-# Maximum number of monsters in re_info.txt
-# WARNING ! Use the exact amount of ego types used, if not you
-# will get weird results !
-M:r:14
-
-# Maximum number of items in k_info.txt
-M:K:886
-
-# Maximum number of vaults in v_info.txt
-M:V:108
-
-# Maximum number of terrain features in f_info.txt
-M:F:249
-
-# Maximum number of alchemist recipes
-M:a:1000
-
-# Maximum number of artifacts in a_info.txt
-M:A:257
-
-# Maximum number of sets types in set_info.txt
-M:s:17
-
-# Maximum number of ego-items in e_info.txt
-M:E:238
-
-# Maximum number of dungeon types in d_info.txt
-M:D:41
-
-# Maximum number of trap types in tr_info.txt
-M:U:176
-
-# Maximum number of terrain types in wf_info.txt
-M:W:64
-
-# Maximum number of owners types in ow_info.txt
-M:N:215
-
-# Maximum number of building actions in ba_info.txt
-M:B:70
-
-# Maximum number of store types in st_info.txt
-M:S:89
-
 # Maximum size for "o_list[]"
 M:O:1024
 
 # Maximum size for "m_list[]"
 M:M:768
-
-# Maximum number of race types in p_info.txt
-M:P:R:24
-
-# Maximum number of subrace types in p_info.txt
-M:P:S:26
-
-# Maximum number of class types in p_info.txt
-M:P:C:50
-
-# Maximum number of meta class types in p_info.txt
-M:P:M:1
-
-# Maximum number of histories types in p_info.txt
-M:P:H:294
-
-# Maximum number of skills in s_info.txt
-M:k:60
-
-# Maximum number of traits in ab_info.txt
-M:b:50
diff --git a/lib/mods/theme/edit/nirnaeth.map b/lib/mods/theme/edit/nirnaeth.map
index a8c06999..3ad0789c 100644
--- a/lib/mods/theme/edit/nirnaeth.map
+++ b/lib/mods/theme/edit/nirnaeth.map
@@ -14,28 +14,28 @@ F:s:88:5
 F:V:84:5
 
 # Dirt with Olog
-F:a:88:5:538:0:0:0:0:0:0:2
+F:a:88:5:538:0:0:0:0:0:2
 
 # Dirt with Cave Troll
-F:b:88:5:496:0:0:0:0:0:0:2
+F:b:88:5:496:0:0:0:0:0:2
 
 # Dirt with with Eldrak
-F:c:88:1:620:0:0:0:0:0:0:2
+F:c:88:1:620:0:0:0:0:0:2
 
 # Dirt with with Ettin
-F:e:88:1:621:0:0:0:0:0:0:2
+F:e:88:1:621:0:0:0:0:0:2
 
 # Dirt with with War troll
-F:f:88:1:631:0:0:0:0:0:0:2
+F:f:88:1:631:0:0:0:0:0:2
 
 # Dirt with with Hru
-F:g:88:1:709:0:0:0:0:0:0:2
+F:g:88:1:709:0:0:0:0:0:2
 
 # Dirt with Ulik the Troll
-F:h:88:5:729:0:0:0:0:0:0:2
+F:h:88:5:729:0:0:0:0:0:2
 
 # Dirt with Ancient green dragon
-F:i:88:5:618:0:0:0:0:0:0:2
+F:i:88:5:618:0:0:0:0:0:2
 
 # Dungeon
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
diff --git a/lib/mods/theme/edit/numenor.txt b/lib/mods/theme/edit/numenor.txt
index ec8621b1..0ca52738 100644
--- a/lib/mods/theme/edit/numenor.txt
+++ b/lib/mods/theme/edit/numenor.txt
@@ -1,7 +1,7 @@
 # File: numenor.txt
 
 # Way to the lost land of Numenor
-F:>:7:3:0:0:0:0:0:7
+F:>:7:3:0:0:0:0:7
 
 ############### Town Layout ###############
 
diff --git a/lib/mods/theme/edit/ow_info.txt b/lib/mods/theme/edit/ow_info.txt
index bf1283fb..abb4b1d9 100644
--- a/lib/mods/theme/edit/ow_info.txt
+++ b/lib/mods/theme/edit/ow_info.txt
@@ -13,1407 +13,2723 @@
 # L:liked races
 # H:hated races
 
-# Version stamp (required)
-
-V:2.0.0
-
 # The zero index owner. If she owns a shop, there is a problem. :P
 N:0:Bell Goodchild(Hobbit)
-I:20000:170:108:5:15
+I:20000:120
 C:120:100:80
-L:Elf | Half-Elf | High-Elf | Dunadan | Hobbit | Dwarf | RohanKnight
-H:Dragon | Demon | Orc | Troll | Half-Ogre | Beorning | Druadan | Dark-Elf
+L:Dunadan
+L:Dwarf
+L:Elf
+L:Half-Elf
+L:High-Elf
+L:Hobbit
+L:RohanKnight
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Druadan
+H:Half-Ogre
+H:Orc
+H:Troll
 
 ### The General Store - 1 ###
 
 N:1:Balin(Dwarf)
-I:25000:180:108:2:2
+I:25000:130
 C:150:100:50
-L:Dwarf | Petty-Dwarf
-H:Dragon | Demon | Orc | Dark-Elf | Half-Ogre | Troll
+L:Dwarf
+L:Petty-Dwarf
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:2:Berylla Boffin(Hobbit)
-I:20000:190:109:3:4
+I:20000:130
 C:125:100:70
-L:Human | Hobbit
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll | Easterling
+L:Hobbit
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:3:Adrahil(Half-Elf)
-I:30000:170:107:1:1
+I:30000:120
 C:110:100:80
-L:Half-Elf | High-Elf | Dunadan | Elf
-H:Dragon | Demon | Orc | Dark-Elf | Half-Ogre | Petty-Dwarf | Dwarf | Troll
+L:Dunadan
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Dwarf
+H:Half-Ogre
+H:Orc
+H:Petty-Dwarf
+H:Troll
 
 N:4:Aegnor(Wood-Elf)
-I:10000:200:110:4:8
+I:10000:140
 C:110:100:80
-L:High-Elf | Dunadan | Elf
-H:Dragon | Demon | Orc | Half-Ogre | Troll | Easterling
+L:Dunadan
+L:Elf
+L:High-Elf
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 ### The Armoury - 2 ###
 
 N:5:Bifur(Dwarf)
-I:20000:190:109:3:4
+I:20000:130
 C:125:100:70
-L:Hobbit | Petty-Dwarf | Dwarf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll
+L:Dwarf
+L:Hobbit
+L:Petty-Dwarf
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:6:Lalia Clayhanger(Hobbit)
-I:25000:180:108:2:2
+I:25000:130
 C:125:100:50
-L:Human | Hobbit | Elf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll
+L:Elf
+L:Hobbit
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:7:Alcarin(Human)
-I:10000:200:110:4:8
+I:10000:140
 C:110:100:80
-L:Human | Half-Elf | RohanKnight | Dunadan
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Petty-Dwarf | Troll | Easterling
+L:Dunadan
+L:Half-Elf
+L:Human
+L:RohanKnight
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Petty-Dwarf
+H:Troll
 
 N:8:Alatariel(High-Elf)
-I:30000:170:107:1:1
+I:30000:120
 C:110:100:80
-L:High-Elf | Dunadan | Elf
-H:Dragon | Demon | Orc | Dark-Elf | Half-Ogre | Petty-Dwarf | Troll | Easterling
+L:Dunadan
+L:Elf
+L:High-Elf
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Petty-Dwarf
+H:Troll
 
 ### The Weaponsmith - 3 ###
 
 N:9:Bofur(Dwarf)
-I:30000:170:107:1:1
+I:30000:120
 C:125:100:70
-L:Human | Dwarf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll
+L:Dwarf
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:10:Daisy Gamgee(Hobbit)
-I:20000:190:109:3:4
+I:20000:130
 C:110:100:80
-L:Human | Hobbit
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll
+L:Hobbit
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:11:Beregond(Dunadan)
-I:25000:180:108:2:2
+I:25000:130
 C:110:100:80
-L:Human | High-Elf | Dunadan | Elf
-H:Dragon | Demon | Orc | Half-Ogre | Troll
+L:Dunadan
+L:Elf
+L:High-Elf
+L:Human
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:12:Amarie(Dark-Elf)
-I:10000:200:110:4:8
+I:10000:140
 C:125:100:50
-L:Dark-Elf | Elf
-H:Dragon | Demon | Orc | Half-Ogre | Petty-Dwarf | Dwarf | Troll | Easterling
+L:Dark-Elf
+L:Elf
+H:Demon
+H:Dragon
+H:Dwarf
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Petty-Dwarf
+H:Troll
 
 ### The Temple - 4 ###
 
 N:13:Bombur(Dwarf)
-I:20000:190:109:3:4
+I:20000:130
 C:125:100:70
-L:Half-Elf | Petty-Dwarf | Dwarf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll
+L:Dwarf
+L:Half-Elf
+L:Petty-Dwarf
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:14:Dora Baggins(Hobbit)
-I:30000:170:107:1:1
+I:30000:120
 C:110:100:80
-L:Human | High-Elf | Hobbit | Elf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll
+L:Elf
+L:High-Elf
+L:Hobbit
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:15:Bergil(Half-Elf)
-I:10000:200:110:4:8
+I:10000:140
 C:125:100:50
-L:Human | Half-Elf | Dunadan | Elf
-H:Dragon | Demon | Beorning | Orc | Dark-Elf | Half-Ogre | Troll | Easterling
+L:Dunadan
+L:Elf
+L:Half-Elf
+L:Human
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:16:Amdir(Wood-Elf)
-I:25000:180:108:2:2
+I:25000:130
 C:110:100:80
-L:High-Elf | Dunadan | Hobbit | Elf
-H:Dragon | Demon | Orc | Dark-Elf | Half-Ogre | Dwarf | Troll | Easterling
+L:Dunadan
+L:Elf
+L:High-Elf
+L:Hobbit
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Dwarf
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 ### The Alchemist - 5 ###
 
 N:17:Borin(Dwarf)
-I:20000:190:109:3:4
+I:20000:130
 C:110:100:80
-L:Petty-Dwarf | Dwarf
-H:Dragon | Demon | Orc | Dark-Elf | Half-Ogre | Elf | Troll
+L:Dwarf
+L:Petty-Dwarf
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Elf
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:18:Elfstan Fairbairn(Hobbit)
-I:10000:200:110:4:8
+I:10000:140
 C:125:100:50
-L:Human | Half-Elf | High-Elf | Hobbit | Elf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Dwarf | Troll
+L:Elf
+L:Half-Elf
+L:High-Elf
+L:Hobbit
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Dwarf
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:19:Cemendur(Human)
-I:25000:180:108:2:2
+I:25000:130
 C:110:100:80
-L:Human | Half-Elf | RohanKnight | Dunadan | Elf
-H:Dragon | Demon | Beorning | Orc | Dark-Elf | Half-Ogre | Troll | Easterling
+L:Dunadan
+L:Elf
+L:Half-Elf
+L:Human
+L:RohanKnight
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:20:Annael(High-Elf)
-I:30000:170:107:1:1
+I:30000:120
 C:125:100:70
-L:Human | Half-Elf | High-Elf | Dunadan | Elf
-H:Dragon | Demon | Beorning | Orc | Dark-Elf | Half-Ogre | Dwarf | Troll
+L:Dunadan
+L:Elf
+L:Half-Elf
+L:High-Elf
+L:Human
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Dwarf
+H:Half-Ogre
+H:Orc
+H:Troll
 
 ### The Magic Shop - 6 ###
 
 N:21:Dis(Dwarf)
-I:30000:170:107:1:1
+I:30000:120
 C:125:100:50
-L:Petty-Dwarf | Dwarf | Half-Elf | Dunadan
-H:Dragon | Demon | Beorning | Orc | Dark-Elf | Half-Ogre | Human | Troll | Eagle
+L:Dunadan
+L:Dwarf
+L:Half-Elf
+L:Petty-Dwarf
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Eagle
+H:Half-Ogre
+H:Human
+H:Orc
+H:Troll
 
 N:22:Folco Boffin(Hobbit)
-I:10000:200:110:4:8
+I:10000:140
 C:110:100:80
 L:Hobbit
-H:Dragon | Demon | Orc | Troll
+H:Demon
+H:Dragon
+H:Orc
+H:Troll
 
 N:23:Ciryon(Dunadan)
-I:25000:180:108:2:2
+I:25000:130
 C:110:100:80
-L:Human | Half-Elf | High-Elf | RohanKnight | Dunadan | Hobbit | Elf
-H:Dragon | Demon | Orc | Half-Ogre | Troll
+L:Dunadan
+L:Elf
+L:Half-Elf
+L:High-Elf
+L:Hobbit
+L:Human
+L:RohanKnight
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:24:Arminas(Dark-Elf)
-I:20000:190:109:3:4
+I:20000:130
 C:125:100:70
-L:Human | Dark-Elf | Elf
-H:Dragon | Demon | Beorning | Orc | High-Elf | Half-Ogre | Petty-Dwarf | Troll | Easterling
+L:Dark-Elf
+L:Elf
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:High-Elf
+H:Orc
+H:Petty-Dwarf
+H:Troll
 
 ### The Black Market - 7 ###
 
 N:25:Dori(Dwarf)
-I:30000:210:120:8:8
+I:30000:150
 C:110:100:90
-L:Dwarf | Easterling
-H:Dragon | Demon | Orc 
+L:Dwarf
+L:Easterling
+H:Demon
+H:Dragon
+H:Orc
 
 N:26:Halfred Greenhand(Hobbit)
-I:30000:210:120:8:8
+I:30000:150
 C:110:100:90
-L:Hobbit 
-H:Dragon | Demon | Troll
+L:Hobbit
+H:Demon
+H:Dragon
+H:Troll
 
 N:27:Deorwine(Half-Elf)
-I:30000:210:120:8:8
+I:30000:150
 C:110:100:90
-L:Half-Elf | Easterling
-H:Dragon | Demon | Dark-Elf
+L:Easterling
+L:Half-Elf
+H:Dark-Elf
+H:Demon
+H:Dragon
 
 N:28:Artanis(Wood-Elf)
-I:30000:210:120:8:8
+I:30000:150
 C:110:100:90
-L:High-Elf | Elf | Easterling
-H:Dragon | Demon | Orc | Troll
+L:Easterling
+L:Elf
+L:High-Elf
+H:Demon
+H:Dragon
+H:Orc
+H:Troll
 
 ### The Bookstore - 9 ###
 
 N:29:Dwalin(Dwarf)
-I:20000:190:109:3:4
+I:20000:130
 C:125:100:70
-L:Human | Petty-Dwarf | Dwarf
-H:Dragon | Demon | Orc | Elf | Half-Ogre | Troll
+L:Dwarf
+L:Human
+L:Petty-Dwarf
+H:Demon
+H:Dragon
+H:Elf
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:30:Tanta Hornblower(Hobbit)
-I:10000:200:110:4:8
+I:10000:140
 C:110:100:80
-L:Human | Hobbit | Elf
-H:Dragon | Demon | Beorning | Orc | Troll
+L:Elf
+L:Hobbit
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Orc
+H:Troll
 
 N:31:Dorlas(Human)
-I:30000:170:107:1:1
+I:30000:120
 C:150:100:50
-L:Human | RohanKnight | Dunadan
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll | Easterling
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:32:Caranthir(High-Elf)
-I:25000:180:108:2:2
+I:25000:130
 C:110:100:80
-L:Half-Elf | High-Elf | Elf
-H:Dragon | Demon | Orc | Dark-Elf | Half-Ogre | Petty-Dwarf | Dwarf | Troll | Easterling
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Dwarf
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Petty-Dwarf
+H:Troll
 
 ### The Pet Shop - 0 ###
 
 N:33:Fili(Dwarf)
-I:20000:190:109:3:4
+I:20000:130
 C:125:100:70
-L:RohanKnight | Petty-Dwarf | Dwarf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll
+L:Dwarf
+L:Petty-Dwarf
+L:RohanKnight
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:34:Lalia Clayhanger(Hobbit)
-I:25000:180:108:2:2
+I:25000:130
 C:110:100:80
-L:Human | Hobbit | Elf
-H:Dragon | Demon | Beorning | Orc | Troll
+L:Elf
+L:Hobbit
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Orc
+H:Troll
 
 N:35:Elfwine(Dunadan)
-I:10000:200:110:4:8
+I:10000:140
 C:110:100:80
-L:Human | Half-Elf | High-Elf | RohanKnight | Dunadan | Elf
-H:Dragon | Demon | Beorning | Orc | Dark-Elf | Half-Ogre | Petty-Dwarf | Troll
+L:Dunadan
+L:Elf
+L:Half-Elf
+L:High-Elf
+L:Human
+L:RohanKnight
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Petty-Dwarf
+H:Troll
 
 N:36:Edrahil(Dark-Elf)
-I:30000:170:107:1:1
+I:30000:120
 C:150:100:50
-L:Dark-Elf | Elf | Easterling
-H:Dragon | Demon | Orc | High-Elf | Half-Ogre | Dwarf | Troll
+L:Dark-Elf
+L:Easterling
+L:Elf
+H:Demon
+H:Dragon
+H:Dwarf
+H:Half-Ogre
+H:High-Elf
+H:Orc
+H:Troll
 
 ### The Mayors/Kings/Rulers ###
 
 #Bree
 N:37:Uldrik(Human)
-I:0:0:0:0:0
+I:0:0
 C:0:0:0
-L:Human | RohanKnight | Dunadan | Hobbit | 
-H:Dragon | Demon | Orc | Half-Ogre | Troll
+L:Dunadan
+L:Hobbit
+L:Human
+L:RohanKnight
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 #Minas Anor
 N:38:Aragorn (Dunadan)
-I:0:0:0:0:0
+I:0:0
 C:0:0:0
-L:Human | High-Elf | RohanKnight | Dunadan | Hobbit | Elf  
-H:Dragon | Demon | Orc | Half-Ogre | Petty-Dwarf | Troll
+L:Dunadan
+L:Elf
+L:High-Elf
+L:Hobbit
+L:Human
+L:RohanKnight
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Petty-Dwarf
+H:Troll
 
 #Khazad-Dum
 N:39:Gimli(Dwarf)
-I:0:0:0:0:0
+I:0:0
 C:0:0:0
-L:RohanKnight | Dunadan | Hobbit | Elf | Dwarf 
-H:Dragon | Demon | Orc | Half-Ogre | Troll
+L:Dunadan
+L:Dwarf
+L:Elf
+L:Hobbit
+L:RohanKnight
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 #Beorn's Halls
 N:40:Deor(Beorning)
-I:100:100:100:0:0
+I:100:100
 C:110:100:90
-L:Beorning | Dwarf | Maia | Hobbit | Ent
-H:Dragon | Demon | Orc | Half-Ogre | Troll
+L:Beorning
+L:Dwarf
+L:Ent
+L:Hobbit
+L:Maia
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 #Dale
 N:41:Bard the Grim(Human)
-I:100:100:100:0:0
+I:100:100
 C:110:100:90
-L:Human | Hobbit | Dwarf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll  
+L:Dwarf
+L:Hobbit
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 #Henneth Annun
 N:42:Halbarad(Dunadan)
-I:100:100:100:0:0
+I:100:100
 C:110:100:90
-L:Human | High-Elf | Dunadan | Hobbit | Elf  
-H:Dragon | Demon | Orc | Half-Ogre | Troll
+L:Dunadan
+L:Elf
+L:High-Elf
+L:Hobbit
+L:Human
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 #Imladris
 N:43:Elrond Half-Elven
-I:100:100:100:0:0
+I:100:100
 C:110:100:90
-L:Human | Half-Elf | High-Elf | RohanKnight | Dunadan | Hobbit | Elf | Dwarf | Ent
-H:Dragon | Demon | Orc | Half-Ogre | Troll
+L:Dunadan
+L:Dwarf
+L:Elf
+L:Ent
+L:Half-Elf
+L:High-Elf
+L:Hobbit
+L:Human
+L:RohanKnight
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 #Helm's Deep
 N:44:Erkenbrand(RohanKnight)
-I:100:100:100:0:0
+I:100:100
 C:110:100:90
-L:Human | Maia | RohanKnight | Dunadan | Hobbit | Elf | Dwarf | Ent
-H:Dragon | Demon | Beorning | Orc | Dark-Elf | Half-Ogre | Petty-Dwarf | Troll
+L:Dunadan
+L:Dwarf
+L:Elf
+L:Ent
+L:Hobbit
+L:Human
+L:Maia
+L:RohanKnight
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Petty-Dwarf
+H:Troll
 
 #Thranduil's Halls
 N:45:Legolas Greenleaf(Wood-Elf)
-I:100:100:100:0:0
+I:100:100
 C:110:100:90
-L:High-Elf | Dunadan | Ent | Elf
-H:Dragon | Demon | Orc | Half-Ogre | Petty-Dwarf | Troll
+L:Dunadan
+L:Elf
+L:Ent
+L:High-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Petty-Dwarf
+H:Troll
 
 #Edoras
 N:46:Theoden(RohanKnight)
-I:100:100:100:0:0
+I:100:100
 C:110:100:90
-L:Human | RohanKnight | Dunadan | Hobbit | Elf  
-H:Dragon | Demon | Orc | Half-Ogre | Troll  
+L:Dunadan
+L:Elf
+L:Hobbit
+L:Human
+L:RohanKnight
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 #Esgaroth
 N:47:The Master(Human)
-I:100:100:100:0:0
+I:100:100
 C:110:100:90
-L:Human 
-H:Dragon | Demon | Beorning | Orc | Dark-Elf | Half-Ogre | Troll  
+L:Human
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 #Hobbiton
 N:48:Samwise Gamgee(Hobbit)
-I:100:100:100:0:0
+I:100:100
 C:110:100:90
-L:Hobbit | Elf | High-Elf | Dark-Elf
-H:Dragon | Demon | Orc | Half-Ogre | Troll  
+L:Dark-Elf
+L:Elf
+L:High-Elf
+L:Hobbit
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 #Osgiliath
 N:49:Eldacar(Human)
-I:100:100:100:0:0
+I:100:100
 C:110:100:90
-L:Human | Half-Elf | High-Elf | RohanKnight | Dunadan | Hobbit | Elf
-H:Dragon | Demon | Beorning | Orc | Dark-Elf | Half-Ogre | Petty-Dwarf | Dwarf | Troll
+L:Dunadan
+L:Elf
+L:Half-Elf
+L:High-Elf
+L:Hobbit
+L:Human
+L:RohanKnight
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Dwarf
+H:Half-Ogre
+H:Orc
+H:Petty-Dwarf
+H:Troll
 
 #Pelargir
 N:50:Earnil(Dunadan)
-I:100:100:100:0:0
+I:100:100
 C:110:100:90
-L:Human | Half-Elf | High-Elf | RohanKnight | Dunadan | Hobbit | Elf
-H:Dragon | Demon | Beorning | Orc | Dark-Elf | Half-Ogre | Petty-Dwarf | Dwarf | Troll
+L:Dunadan
+L:Elf
+L:Half-Elf
+L:High-Elf
+L:Hobbit
+L:Human
+L:RohanKnight
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Dwarf
+H:Half-Ogre
+H:Orc
+H:Petty-Dwarf
+H:Troll
 
 ### Caras Galadhon owners ###
 
 N:51:Galadriel(High-Elf)
-I:15000:120:105:6:16
+I:15000:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
-H:Dragon | Demon | Orc | Troll | Half-Ogre | Beorning
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:52:Celeborn(High-Elf)
-I:15000:120:105:6:16
+I:15000:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
-H:Dragon | Demon | Orc | Troll | Half-Ogre | Beorning 
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:53:Aulendil(Elf)
-I:30000:140:105:6:12
+I:30000:110
 C:120:100:80
 #L:Warrior | 
-H:Dragon | Demon | Orc | Troll | Half-Ogre | Beorning 
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:54:Valceronwe(Elf)
-I:30000:140:105:6:12
+I:30000:110
 C:120:100:80
 #L:Mage | Thaumaturgist | Sorceror
-H:Dragon | Demon | Orc | Troll | Half-Ogre | Beorning 
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:55:Voronwe(Elf)
-I:30000:140:105:6:12
+I:30000:110
 C:120:100:80
 #L:Priest | Paladin
-H:Dragon | Demon | Orc | Troll | Half-Ogre | Beorning 
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:56:Celegail(Elf)
-I:30000:140:105:6:12
+I:30000:110
 C:120:100:80
 #L:Ranger
-H:Dragon | Demon | Orc | Troll | Half-Ogre | Beorning 
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 ### Gondolin owners ###
 
 N:57:Turgon(High-Elf)
-I:30000:120:105:6:16
+I:30000:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
-H:Dragon | Demon | Orc | Troll | Half-Ogre | Beorning  | Easterling
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:58:Pengolodh(High-Elf)
-I:0:120:105:6:16
+I:0:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
-H:Dragon | Demon | Orc | Troll | Half-Ogre | Beorning  | Easterling
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:59:Aerandir(High-Elf)
-I:0:120:105:6:16
+I:0:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
-H:Dragon | Demon | Orc | Troll | Half-Ogre | Beorning  | Easterling 
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:60:Celebrimbor(High-Elf)
-I:0:120:105:6:16
+I:0:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
+L:Elf
+L:Half-Elf
+L:High-Elf
 #L:Warrior | 
-H:Dragon | Demon | Orc | Troll | Half-Ogre | Beorning  | Easterling 
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:61:Lomelosse(High-Elf)
-I:0:120:105:6:16
+I:0:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf |
-H:Dragon | Demon | Orc | Troll | Half-Ogre | Beorning  | Easterling 
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:62:Arlindel(High-Elf)
-I:0:120:105:6:16
+I:0:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
+L:Elf
+L:Half-Elf
+L:High-Elf
 #L:Harper | Ranger
-H:Dragon | Demon | Orc | Troll | Half-Ogre | Beorning  | Easterling 
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:63:Sulraen(High-Elf)
-I:0:120:105:6:16
+I:0:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
+L:Elf
+L:Half-Elf
+L:High-Elf
 #L:Mage | Sorceror
-H:Dragon | Demon | Orc | Troll | Half-Ogre | Beorning  | Easterling 
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:64:Firiel(High-Elf)
-I:0:120:105:6:16
+I:0:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf | 
-H:Dragon | Demon | Orc | Troll | Half-Ogre | Beorning  | Easterling 
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:65:Earendur(High-Elf)
-I:0:120:105:6:16
+I:0:110
 C:120:100:80
-L:High-Elf | Half-Elf | Elf
-H:Dragon | Demon | Orc | Troll | Half-Ogre | Beorning  | Easterling 
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:66:Glorfindel(High-Elf)
-I:0:120:105:6:16
+I:0:110
 C:120:100:80
-L:High-Elf | Half-Elf
+L:Half-Elf
+L:High-Elf
 #L:Ranger
-H:Dragon | Demon | Orc | Troll | Half-Ogre | Beorning  | Easterling 
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:67:Ecthelion(High-Elf)
-I:0:120:105:6:16
+I:0:110
 C:120:100:80
-L:High-Elf | Half-Elf
+L:Half-Elf
+L:High-Elf
 #L:Paladin
-H:Dragon | Demon | Orc | Troll | Half-Ogre | Beorning  | Easterling 
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 ### The Inn-Keepers (minus Gondolin) ###
 
 #Bree
 N:68:Barliman Butterbur(Human)
-I:100:170:108:4:10
+I:100:120
 C:120:100:80
-L:Dunadan | Hobbit | Human |
-H:Dragon | Demon | Orc | Troll | Half-Ogre | Beorning | Easterling
+L:Dunadan
+L:Hobbit
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 #Pelargir
 N:69:Ciryatur(Dunadan)
-I:100:170:108:4:10
+I:100:120
 C:110:100:80
-L:Dunadan | Human | RohanKnight
-H:Dragon | Demon | Orc | Troll | Half-Ogre | Beorning
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 #Caras Galadhon
 N:70:Celebor(Elf)
-I:100:170:108:4:10
+I:100:120
 C:110:100:80
-L:High-Elf | Elf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll | Easterling
+L:Elf
+L:High-Elf
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 #Minas Anor
 N:71:Bregolas(Human)
-I:100:170:108:4:10
+I:100:120
 C:110:100:80
-L:Human | RohanKnight | Dunadan
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll | Easterling
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 #Khazad-Dum
 N:72:Thror(Dwarf)
-I:100:170:108:4:10
+I:100:120
 C:110:100:80
-L:Petty-Dwarf | Dwarf
-H:Dragon | Demon | Beorning | Orc | Dark-Elf | Half-Ogre | High-Elf | Troll
+L:Dwarf
+L:Petty-Dwarf
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:High-Elf
+H:Orc
+H:Troll
 
 #Dale
 N:73:Troin(Dwarf)
-I:100:170:108:4:10
+I:100:120
 C:110:100:80
-L:Human | Dwarf
-H:Dragon | Demon | Orc | Half-Ogre | Troll
+L:Dwarf
+L:Human
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 #Edoras
 N:74:Theodwyn(Shieldmaiden)
-I:100:170:108:4:10
+I:100:120
 C:110:100:80
-L:Human | RohanKnight | Dunadan
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll  | Easterling
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 #Esgaroth
 N:75:Garm(Human)
-I:100:170:108:4:10
+I:100:120
 C:110:100:80
-L:Human | Dwarf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Petty-Dwarf | Troll
+L:Dwarf
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Petty-Dwarf
+H:Troll
 
 #Hobbiton
 N:76:Rose Cotton(Hobbit)
-I:100:170:108:4:10
+I:100:120
 C:110:100:80
-L:Human | High-Elf | Hobbit
-H:Dragon | Demon | Orc | Half-Ogre | Troll  | Easterling
+L:High-Elf
+L:Hobbit
+L:Human
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 #Osgiliath
 N:77:Palantir(Human)
-I:100:170:108:4:10
+I:100:120
 C:110:100:80
-L:Human | High-Elf | RohanKnight | Dunadan | Elf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll  | Easterling
+L:Dunadan
+L:Elf
+L:High-Elf
+L:Human
+L:RohanKnight
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 ### The Soothsayers ###
 
 N:78:Ori(Dwarf)
-I:20000:190:109:3:4
+I:20000:130
 C:125:100:70
-L:Hobbit | Petty-Dwarf | Dwarf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll
+L:Dwarf
+L:Hobbit
+L:Petty-Dwarf
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:79:Tolman Gardner(Hobbit)
-I:25000:180:108:2:2
+I:25000:130
 C:150:100:50
-L:Human | Hobbit | Elf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll
+L:Elf
+L:Hobbit
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:80:Inziladun(Human)
-I:10000:200:110:4:8
+I:10000:140
 C:110:100:80
-L:Human | Half-Elf | RohanKnight | Dunadan  | Easterling
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Petty-Dwarf | Troll
+L:Dunadan
+L:Easterling
+L:Half-Elf
+L:Human
+L:RohanKnight
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Petty-Dwarf
+H:Troll
 
 N:81:Gelmir(High-Elf)
-I:30000:170:107:1:1
+I:30000:120
 C:110:100:80
-L:High-Elf | Dunadan | Elf
-H:Dragon | Demon | Orc | Dark-Elf | Half-Ogre | Petty-Dwarf | Troll
+L:Dunadan
+L:Elf
+L:High-Elf
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Petty-Dwarf
+H:Troll
 
 ### The Eagles ###
 
 N:82:Palano(Eagle)
-I:30000:170:110:1:1
+I:30000:130
 C:125:100:50
 L:Eagle
-H:Dragon | Demon | RohanKnight
+H:Demon
+H:Dragon
+H:RohanKnight
 
 N:83:Eglad(Eagle)
-I:30000:170:110:1:1
+I:30000:130
 C:125:100:50
 L:Eagle
-H:Dragon | Demon | Hobbit
+H:Demon
+H:Dragon
+H:Hobbit
 
 N:84:Hiron(Eagle)
-I:30000:170:110:1:1
+I:30000:130
 C:125:100:50
 L:Eagle
-H:Dragon | Demon | Dunadan
+H:Demon
+H:Dragon
+H:Dunadan
 
 N:85:Grada(Eagle)
-I:30000:170:110:1:1
+I:30000:130
 C:125:100:50
 L:Eagle
-H:Dragon | Demon | High-Elf
+H:Demon
+H:Dragon
+H:High-Elf
 
 ### The Librarians ###
 
 N:86:Frerin(Dwarf)
-I:25000:180:108:2:2
+I:25000:130
 C:150:100:50
-L:Dwarf | Petty-Dwarf
-H:Dragon | Demon | Orc | Dark-Elf | Half-Ogre | Troll
+L:Dwarf
+L:Petty-Dwarf
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:87:Malva Headstrong(Hobbit)
-I:20000:190:109:3:4
+I:20000:130
 C:125:100:70
-L:Human | Hobbit
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll
+L:Hobbit
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:88:Erendis(Half-Elf)
-I:30000:170:107:1:1
+I:30000:120
 C:110:100:80
-L:Half-Elf | High-Elf | Dunadan | Elf  | Easterling
-H:Dragon | Demon | Orc | Dark-Elf | Half-Ogre | Petty-Dwarf | Dwarf | Troll
+L:Dunadan
+L:Easterling
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Dwarf
+H:Half-Ogre
+H:Orc
+H:Petty-Dwarf
+H:Troll
 
 N:89:Elemmakil(Wood-Elf)
-I:10000:200:110:4:8
+I:10000:140
 C:110:100:80
-L:High-Elf | Dunadan | Elf
-H:Dragon | Demon | Orc | Half-Ogre | Troll
+L:Dunadan
+L:Elf
+L:High-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 ### The Casino Owners ###
 
 N:90:Fror(Dwarf)
-I:20000:190:109:3:4
+I:20000:130
 C:125:100:70
-L:Hobbit | Petty-Dwarf | Dwarf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll
+L:Dwarf
+L:Hobbit
+L:Petty-Dwarf
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:91:Marmadas Brandybuck(Hobbit)
-I:25000:180:108:2:2
+I:25000:130
 C:150:100:50
-L:Human | Hobbit | Elf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll
+L:Elf
+L:Hobbit
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:92:Fastred(Human)
-I:10000:200:110:4:8
+I:10000:140
 C:110:100:80
-L:Human | Half-Elf | RohanKnight | Dunadan  | Easterling
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Petty-Dwarf | Troll
+L:Dunadan
+L:Easterling
+L:Half-Elf
+L:Human
+L:RohanKnight
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Petty-Dwarf
+H:Troll
 
 N:93:Elured(High-Elf)
-I:30000:170:107:1:1
+I:30000:120
 C:110:100:80
-L:High-Elf | Dunadan | Elf
-H:Dragon | Demon | Orc | Dark-Elf | Half-Ogre | Petty-Dwarf | Troll
+L:Dunadan
+L:Elf
+L:High-Elf
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Petty-Dwarf
+H:Troll
 
 ### The Beastmasters ###
 
 N:94:Gloin(Dwarf)
-I:30000:170:107:1:1
+I:30000:120
 C:125:100:70
-L:Human | Dwarf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll
+L:Dwarf
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:95:Milo Burrows(Hobbit)
-I:20000:190:109:3:4
+I:20000:130
 C:110:100:80
-L:Human | Hobbit
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll
+L:Hobbit
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:96:Findegil(Dunadan)
-I:25000:180:108:2:2
+I:25000:130
 C:110:100:80
-L:Human | High-Elf | Dunadan | Elf
-H:Dragon | Demon | Orc | Half-Ogre | Troll
+L:Dunadan
+L:Elf
+L:High-Elf
+L:Human
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:97:Elurin(Dark-Elf)
-I:10000:200:110:4:8
+I:10000:140
 C:150:100:50
-L:Dark-Elf | Elf  | Easterling
-H:Dragon | Demon | Orc | Half-Ogre | Petty-Dwarf | Dwarf | Troll
+L:Dark-Elf
+L:Easterling
+L:Elf
+H:Demon
+H:Dragon
+H:Dwarf
+H:Half-Ogre
+H:Orc
+H:Petty-Dwarf
+H:Troll
 
 ### Gondor/Rohan owners ###
 
 #Fighters Hall
 
 N:98:Tarcil(Human)
-I:30000:170:107:1:1
+I:30000:120
 C:150:100:50
-L:Human | RohanKnight | Dunadan
-H:Dragon | Demon | Orc | Half-Ogre | Troll  | Easterling
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:99:Ulbar(Easterling)
-I:10000:200:110:4:8
+I:10000:140
 C:110:100:80
-L:Human | RohanKnight | Dunadan
-L:Half-Elf | High-Elf | Elf  | Easterling
+L:Dunadan
+L:Easterling
+L:Elf
+L:Half-Elf
+L:High-Elf
+L:Human
+L:RohanKnight
 
 N:100:Brego(RohanKnight)
-I:25000:180:108:2:2
+I:25000:130
 C:110:100:80
-L:Human | RohanKnight | Dunadan
-H:Dragon | Demon | Beorning | Dark-Elf | Petty-Dwarf | Troll  | Easterling
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Easterling
+H:Petty-Dwarf
+H:Troll
 
 N:101:Ostoher(Dunadan)
-I:20000:190:109:3:4
+I:20000:130
 C:125:100:70
-L:Human | RohanKnight | Dunadan
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Dwarf | Troll  | Easterling
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Beorning
+H:Demon
+H:Dragon
+H:Dwarf
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 #Tower of Magery
 
 N:102:Arveleg(Human)
-I:25000:180:108:2:2
+I:25000:130
 C:125:100:70
-L:Human | RohanKnight | Dunadan
-H:Dragon | Demon | Orc | Half-Ogre | Troll  | Easterling
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:103:Uldar(Easterling)
-I:30000:170:107:1:1
+I:30000:120
 C:110:100:80
-L:Human | RohanKnight | Dunadan  | Easterling
-L:Half-Elf | High-Elf | Elf
+L:Dunadan
+L:Easterling
+L:Elf
+L:Half-Elf
+L:High-Elf
+L:Human
+L:RohanKnight
 
 N:104:Aldor(RohanKnight)
-I:20000:190:109:3:4
+I:20000:130
 C:150:100:50
-L:Human | RohanKnight | Dunadan
-H:Dragon | Demon | Beorning | Dark-Elf | Petty-Dwarf | Troll  | Easterling
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Easterling
+H:Petty-Dwarf
+H:Troll
 
 N:105:Tarannon(Dunadan)
-I:10000:200:110:4:8
+I:10000:140
 C:110:100:80
-L:Human | RohanKnight | Dunadan
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Dwarf | Troll  | Easterling
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Beorning
+H:Demon
+H:Dragon
+H:Dwarf
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 #Inner Temple
 
 N:106:Eradan(Human)
-I:30000:170:107:1:1
+I:30000:120
 C:125:100:70
-L:Human | RohanKnight | Dunadan
-H:Dragon | Demon | Orc | Half-Ogre | Troll
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:107:Ulwise(Easterling)
-I:25000:180:108:2:2
+I:25000:130
 C:150:100:50
-L:Human | RohanKnight | Dunadan  | Easterling
-L:Half-Elf | High-Elf | Elf
+L:Dunadan
+L:Easterling
+L:Elf
+L:Half-Elf
+L:High-Elf
+L:Human
+L:RohanKnight
 
 N:108:Gram(RohanKnight)
-I:20000:190:109:3:4
+I:20000:130
 C:110:100:80
-L:Human | RohanKnight | Dunadan
-H:Dragon | Demon | Beorning | Dark-Elf | Petty-Dwarf | Troll  | Easterling
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Easterling
+H:Petty-Dwarf
+H:Troll
 
 N:109:Minalcar(Dunadan)
-I:10000:200:110:4:8
+I:10000:140
 C:110:100:80
-L:Human | RohanKnight | Dunadan
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Dwarf | Troll
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Beorning
+H:Demon
+H:Dragon
+H:Dwarf
+H:Half-Ogre
+H:Orc
+H:Troll
 
 #Paladins Guild
 
 N:110:Herion(Human)
-I:30000:170:107:1:1
+I:30000:120
 C:150:100:50
-L:Human | RohanKnight | Dunadan  | Easterling
-H:Dragon | Demon | Orc | Half-Ogre | Troll
+L:Dunadan
+L:Easterling
+L:Human
+L:RohanKnight
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:111:Ulgug(Easterling)
-I:10000:200:110:4:8
+I:10000:140
 C:110:100:80
-L:Human | RohanKnight | Dunadan  | Easterling
-L:Half-Elf | High-Elf | Elf
+L:Dunadan
+L:Easterling
+L:Elf
+L:Half-Elf
+L:High-Elf
+L:Human
+L:RohanKnight
 
 N:112:Walda(RohanKnight)
-I:25000:180:108:2:2
+I:25000:130
 C:110:100:80
-L:Human | RohanKnight | Dunadan
-H:Dragon | Demon | Beorning | Dark-Elf | Petty-Dwarf | Troll  | Easterling
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Easterling
+H:Petty-Dwarf
+H:Troll
 
 N:113:Calimehtar(Dunadan)
-I:20000:190:109:3:4
+I:20000:130
 C:125:100:70
-L:Human | RohanKnight | Dunadan
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Dwarf | Troll  | Easterling
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Beorning
+H:Demon
+H:Dragon
+H:Dwarf
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 #Rangers Guild
 
 N:114:Egalmoth(Human)
-I:25000:180:108:2:2
+I:25000:130
 C:125:100:70
-L:Human | RohanKnight | Dunadan
-H:Dragon | Demon | Orc | Half-Ogre | Troll  | Easterling
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:115:Ulaf(Easterling)
-I:30000:170:107:1:1
+I:30000:120
 C:110:100:80
-L:Human | RohanKnight | Dunadan  | Easterling
-L:Half-Elf | High-Elf | Elf
+L:Dunadan
+L:Easterling
+L:Elf
+L:Half-Elf
+L:High-Elf
+L:Human
+L:RohanKnight
 
 N:116:Fengel(RohanKnight)
-I:20000:190:109:3:4
+I:20000:130
 C:150:100:50
-L:Human | RohanKnight | Dunadan
-H:Dragon | Demon | Beorning | Dark-Elf | Petty-Dwarf | Troll  | Easterling
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Easterling
+H:Petty-Dwarf
+H:Troll
 
 N:117:Telemnar(Dunadan)
-I:10000:200:110:4:8
+I:10000:140
 C:110:100:80
-L:Human | RohanKnight | Dunadan
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Dwarf | Troll
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Beorning
+H:Demon
+H:Dragon
+H:Dwarf
+H:Half-Ogre
+H:Orc
+H:Troll
 
 ### Dungeon Markets ###
 
 ### The Axesmiths ###
 
 N:118:Ris(Dwarf)
-I:30000:200:130:1:1
+I:30000:150
 C:150:100:50
 L:Dwarf
-H:Dragon | Demon | Orc
+H:Demon
+H:Dragon
+H:Orc
 
 N:119:Malach Aradan(Human)
-I:25000:300:150:2:2
+I:25000:200
 C:125:100:60
-L:Human  | Easterling
-H:Dragon | Demon | Troll
+L:Easterling
+L:Human
+H:Demon
+H:Dragon
+H:Troll
 
 N:120:Indis(Half-Elf)
-I:20000:250:140:3:4
+I:20000:170
 C:115:100:70
-L:Half-Elf  | Easterling
-H:Dragon | Demon | Half-Ogre
+L:Easterling
+L:Half-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
 
 N:121:Rogdug(Half-Orc)
-I:10000:150:120:4:8
+I:10000:130
 C:125:100:80
-L:Orc  | Easterling
-H:Dragon | Demon | Elf
+L:Easterling
+L:Orc
+H:Demon
+H:Dragon
+H:Elf
 
 ### The Haftedsmiths ###
 
 N:122:Sogur(Dwarf)
-I:20000:250:140:3:4
+I:20000:170
 C:125:100:80
 L:Dwarf
-H:Dragon | Demon | Orc
+H:Demon
+H:Dragon
+H:Orc
 
 N:123:Manwendil(Human)
-I:25000:300:150:2:2
+I:25000:200
 C:115:100:70
-L:Human  | Easterling
-H:Dragon | Demon | Troll
+L:Easterling
+L:Human
+H:Demon
+H:Dragon
+H:Troll
 
 N:124:Lenwe(Half-Elf)
-I:10000:150:120:4:8
+I:10000:130
 C:150:100:50
-L:Half-Elf  | Easterling
-H:Dragon | Demon | Half-Ogre
+L:Easterling
+L:Half-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
 
 N:125:Ghaz(Half-Orc)
-I:30000:200:130:1:1
+I:30000:150
 C:125:100:60
-L:Orc  | Easterling
-H:Dragon | Demon | Elf
+L:Easterling
+L:Orc
+H:Demon
+H:Dragon
+H:Elf
 
 ### The Polearmsmiths ###
 
 N:126:Tolin(Dwarf)
-I:10000:150:120:4:8
+I:10000:130
 C:115:100:70
 L:Dwarf
-H:Dragon | Demon | Orc
+H:Demon
+H:Dragon
+H:Orc
 
 N:127:Narmacil(Human)
-I:25000:300:150:2:2
+I:25000:200
 C:125:100:80
-L:Human  | Easterling
-H:Dragon | Demon | Troll
+L:Easterling
+L:Human
+H:Demon
+H:Dragon
+H:Troll
 
 N:128:Lindir(Half-Elf)
-I:20000:250:140:3:4
+I:20000:170
 C:150:100:50
-L:Half-Elf  | Easterling
-H:Dragon | Demon | Half-Ogre
+L:Easterling
+L:Half-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
 
 N:129:Stogash(Half-Orc)
-I:30000:200:130:1:1
+I:30000:150
 C:125:100:60
-L:Orc  | Easterling
-H:Dragon | Demon | Elf
+L:Easterling
+L:Orc
+H:Demon
+H:Dragon
+H:Elf
 
 ### The Swordsmiths ###
 
 N:130:Tis(Dwarf)
-I:20000:250:140:3:4
+I:20000:170
 C:125:100:80
 L:Dwarf
-H:Dragon | Demon | Orc
+H:Demon
+H:Dragon
+H:Orc
 
 N:131:Nuneth(Human)
-I:10000:150:120:4:8
+I:10000:130
 C:125:100:60
-L:Human  | Easterling
-H:Dragon | Demon | Troll
+L:Easterling
+L:Human
+H:Demon
+H:Dragon
+H:Troll
 
 N:132:Mahtan(Half-Elf)
-I:30000:200:130:1:1
+I:30000:150
 C:115:100:70
-L:Half-Elf  | Easterling
-H:Dragon | Demon | Half-Ogre
+L:Easterling
+L:Half-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
 
 N:133:Rudak(Half-Orc)
-I:25000:300:150:2:2
+I:25000:200
 C:150:100:50
-L:Orc  | Easterling
-H:Dragon | Demon | Elf
+L:Easterling
+L:Orc
+H:Demon
+H:Dragon
+H:Elf
 
 ### The Rare Jewellers ###
 
 N:134:Uin(Dwarf)
-I:25000:300:150:2:2
+I:25000:200
 C:115:100:70
 L:Dwarf
-H:Dragon | Demon | Orc
+H:Demon
+H:Dragon
+H:Orc
 
 N:135:Ornendil(Human)
-I:10000:150:120:4:8
+I:10000:130
 C:125:100:60
-L:Human  | Easterling
-H:Dragon | Demon | Troll
+L:Easterling
+L:Human
+H:Demon
+H:Dragon
+H:Troll
 
 N:136:Malgalad(Half-Elf)
-I:30000:200:130:1:1
+I:30000:150
 C:125:100:80
-L:Half-Elf  | Easterling
-H:Dragon | Demon | Half-Ogre
+L:Easterling
+L:Half-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
 
 N:137:Ghashuf(Half-Orc)
-I:20000:250:140:3:4
+I:20000:170
 C:150:100:50
-L:Orc  | Easterling
-H:Dragon | Demon | Elf
+L:Easterling
+L:Orc
+H:Demon
+H:Dragon
+H:Elf
 
 ### The Jewellers ###
 
 N:138:Vali(Dwarf)
-I:25000:300:150:2:2
+I:25000:200
 C:150:100:50
 L:Dwarf
-H:Dragon | Demon | Orc
+H:Demon
+H:Dragon
+H:Orc
 
 N:139:Orodreth(Human)
-I:30000:200:130:1:1
+I:30000:150
 C:115:100:70
-L:Human  | Easterling
-H:Dragon | Demon | Troll
+L:Easterling
+L:Human
+H:Demon
+H:Dragon
+H:Troll
 
 N:140:Theodred(Half-Elf)
-I:10000:150:120:4:8
+I:10000:130
 C:125:100:80
-L:Half-Elf  | Easterling
-H:Dragon | Demon | Half-Ogre
+L:Easterling
+L:Half-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
 
 N:141:Rangush(Half-Orc)
-I:20000:250:140:3:4
+I:20000:170
 C:125:100:60
-L:Orc  | Easterling
-H:Dragon | Demon | Elf
+L:Easterling
+L:Orc
+H:Demon
+H:Dragon
+H:Elf
 
 ### The Footwear Shop owners ###
 
 N:142:Nellas(Human)
-I:10000:150:120:4:8
+I:10000:130
 C:115:100:70
-L:Human  | Easterling
-H:Dragon | Demon | Troll
+L:Easterling
+L:Human
+H:Demon
+H:Dragon
+H:Troll
 
 N:143:Tindomiel(Half-Elf)
-I:25000:300:150:2:2
+I:25000:200
 C:125:100:80
-L:Half-Elf  | Easterling
-H:Dragon | Demon | Half-Ogre
+L:Easterling
+L:Half-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
 
 N:144:Ragnor(Half-Elf)
-I:20000:250:140:3:4
+I:20000:170
 C:150:100:50
-L:Half-Elf  | Easterling
-H:Dragon | Demon | Half-Ogre
+L:Easterling
+L:Half-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
 
 N:145:Idrish(Half-Orc)
-I:30000:200:130:1:1
+I:30000:150
 C:125:100:60
-L:Orc  | Easterling
-H:Dragon | Demon | Elf
+L:Easterling
+L:Orc
+H:Demon
+H:Dragon
+H:Elf
 
 ### The Rare Footwear Shop owners ###
 
 N:146:Nerwen(Human)
-I:20000:250:140:3:4
+I:20000:170
 C:125:100:80
-L:Human  | Easterling
-H:Dragon | Demon | Troll
+L:Easterling
+L:Human
+H:Demon
+H:Dragon
+H:Troll
 
 N:147:Ulbar (Half-Elf)
-I:10000:150:120:4:8
+I:10000:130
 C:125:100:60
-L:Half-Elf  | Easterling
-H:Dragon | Demon | Half-Ogre
+L:Easterling
+L:Half-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
 
 N:148:Pelendur(Half-Elf)
-I:30000:200:130:1:1
+I:30000:150
 C:115:100:70
-L:Half-Elf  | Easterling
-H:Dragon | Demon | Half-Ogre
+L:Easterling
+L:Half-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
 
 N:149:Budgar(Half-Orc)
-I:25000:300:150:2:2
+I:25000:200
 C:150:100:50
-L:Orc  | Easterling
-H:Dragon | Demon | Elf
+L:Easterling
+L:Orc
+H:Demon
+H:Dragon
+H:Elf
 
 ### The Dungeon Librarians ###
 
 N:150:Nom(Human)
-I:25000:300:150:2:2
+I:25000:200
 C:115:100:70
-L:Human  | Easterling
-H:Dragon | Demon | Troll
+L:Easterling
+L:Human
+H:Demon
+H:Dragon
+H:Troll
 
 N:151:Urwen (Half-Elf)
-I:10000:150:120:4:8
+I:10000:130
 C:125:100:60
-L:Half-Elf  | Easterling
-H:Dragon | Demon | Half-Ogre
+L:Easterling
+L:Half-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
 
 N:152:Rian(Half-Elf)
-I:30000:200:130:1:1
+I:30000:150
 C:125:100:80
-L:Half-Elf  | Easterling
-H:Dragon | Demon | Half-Ogre
+L:Easterling
+L:Half-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
 
 N:153:Mosrog(Half-Orc)
-I:20000:250:140:3:4
+I:20000:170
 C:150:100:50
-L:Orc  | Easterling
-H:Dragon | Demon | Elf
+L:Easterling
+L:Orc
+H:Demon
+H:Dragon
+H:Elf
 
 ### The Expensive Black Marketeers ###
 
 N:154:Olwe(Human)
-I:30000:300:150:8:8
+I:30000:200
 C:125:100:90
-L:Human  | Easterling
-H:Dragon | Demon | Troll
+L:Easterling
+L:Human
+H:Demon
+H:Dragon
+H:Troll
 
 N:155:Valacar(Half-Elf)
-I:30000:300:150:8:8
+I:30000:200
 C:125:100:90
-L:Half-Elf  | Easterling
-H:Dragon | Demon | Half-Ogre
+L:Easterling
+L:Half-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
 
 N:156:Silmarien(Half-Elf)
-I:30000:300:150:8:8
+I:30000:200
 C:125:100:90
-L:Half-Elf  | Easterling
-H:Dragon | Demon | Half-Ogre
+L:Easterling
+L:Half-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
 
 N:157:Ghaz(Half-Orc)
-I:30000:300:150:8:8
+I:30000:200
 C:125:100:90
-L:Orc  | Easterling
-H:Dragon | Demon | Elf
+L:Easterling
+L:Orc
+H:Demon
+H:Dragon
+H:Elf
 
 ### The Common Shop Owners ###
 
 N:158:Ioreth(Human)
-I:25000:300:150:2:2
+I:25000:200
 C:150:100:50
-L:Human  | Easterling
-H:Dragon | Demon | Troll
+L:Easterling
+L:Human
+H:Demon
+H:Dragon
+H:Troll
 
 N:159:Vidugavia(Half-Elf)
-I:30000:200:130:1:1
+I:30000:150
 C:115:100:70
-L:Half-Elf  | Easterling
-H:Dragon | Demon | Half-Ogre
+L:Easterling
+L:Half-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
 
 N:160:Soronto(Half-Elf)
-I:10000:150:120:4:8
+I:10000:130
 C:125:100:80
-L:Half-Elf  | Easterling
-H:Dragon | Demon | Half-Ogre
+L:Easterling
+L:Half-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
 
 N:161:Nazg(Half-Orc)
-I:20000:250:140:3:4
+I:20000:170
 C:125:100:60
-L:Orc  | Easterling
-H:Dragon | Demon | Elf
+L:Easterling
+L:Orc
+H:Demon
+H:Dragon
+H:Elf
 
 ### The Dragon Hunters ###
 
 N:162:Oropher(Human)
-I:10000:150:120:4:8
+I:10000:130
 C:115:100:70
-L:Human  | Easterling
-H:Dragon | Demon | Troll
+L:Easterling
+L:Human
+H:Demon
+H:Dragon
+H:Troll
 
 N:163:Walda(Half-Elf)
-I:25000:300:150:2:2
+I:25000:200
 C:125:100:80
-L:Half-Elf  | Easterling
-H:Dragon | Demon | Half-Ogre
+L:Easterling
+L:Half-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
 
 N:164:Mithrellas(Half-Elf)
-I:20000:250:140:3:4
+I:20000:170
 C:150:100:50
-L:Half-Elf  | Easterling
-H:Dragon | Demon | Half-Ogre
+L:Easterling
+L:Half-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
 
 N:165:Urbag(Half-Orc)
-I:30000:200:130:1:1
+I:30000:150
 C:125:100:60
-L:Orc  | Easterling
-H:Dragon | Demon | Elf
+L:Easterling
+L:Orc
+H:Demon
+H:Dragon
+H:Elf
 
 ### The Speed Ring Market Owners ###
 
 N:166:Orophin(Human)
-I:20000:250:140:3:4
+I:20000:170
 C:125:100:80
-L:Human  | Easterling
-H:Dragon | Demon | Troll
+L:Easterling
+L:Human
+H:Demon
+H:Dragon
+H:Troll
 
 N:167:Wulf(Half-Orc)
-I:10000:150:120:4:8
+I:10000:130
 C:125:100:60
-L:Orc  | Easterling
-H:Dragon | Demon | Elf
+L:Easterling
+L:Orc
+H:Demon
+H:Dragon
+H:Elf
 
 N:168:Baguk(Half-Troll)
-I:30000:200:130:1:1
+I:30000:150
 C:115:100:70
-L:Troll  | Easterling
-H:Dragon | Demon | Human
+L:Easterling
+L:Troll
+H:Demon
+H:Dragon
+H:Human
 
 N:169:Zikram(Half-Orc)
-I:25000:300:150:2:2
+I:25000:200
 C:150:100:50
-L:Orc  | Easterling
-H:Dragon | Demon | Elf
+L:Easterling
+L:Orc
+H:Demon
+H:Dragon
+H:Elf
 
 ### The Scribes ###
 
 N:170:Rumil(Human)
-I:25000:300:150:2:2
+I:25000:200
 C:115:100:70
-L:Human  | Easterling
-H:Dragon | Demon | Troll
+L:Easterling
+L:Human
+H:Demon
+H:Dragon
+H:Troll
 
 N:171:Saeros(Half-Elf)
-I:10000:150:120:4:8
+I:10000:130
 C:125:100:60
-L:Half-Elf  | Easterling
-H:Dragon | Demon | Half-Ogre
+L:Easterling
+L:Half-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
 
 N:172:Zartosh(Half-Orc)
-I:30000:200:130:1:1
+I:30000:150
 C:125:100:80
-L:Orc  | Easterling
-H:Dragon | Demon | Elf
+L:Easterling
+L:Orc
+H:Demon
+H:Dragon
+H:Elf
 
 N:173:Shog(Half-Troll)
-I:20000:250:140:3:4
+I:20000:170
 C:150:100:50
-L:Troll  | Easterling
-H:Dragon | Demon | Human
+L:Easterling
+L:Troll
+H:Demon
+H:Dragon
+H:Human
 
 ### The Potion Peddlers ###
 
 N:174:Zamin(Human)
-I:25000:300:150:2:2
+I:25000:200
 C:150:100:50
-L:Human  | Easterling
-H:Dragon | Demon | Troll
+L:Easterling
+L:Human
+H:Demon
+H:Dragon
+H:Troll
 
 N:175:Algosh(Half-Orc)
-I:30000:200:130:1:1
+I:30000:150
 C:115:100:70
-L:Orc  | Easterling
-H:Dragon | Demon | Elf
+L:Easterling
+L:Orc
+H:Demon
+H:Dragon
+H:Elf
 
 N:176:Seghash(Half-Troll)
-I:10000:150:120:4:8
+I:10000:130
 C:125:100:80
-L:Troll  | Easterling
-H:Dragon | Demon | Human
+L:Easterling
+L:Troll
+H:Demon
+H:Dragon
+H:Human
 
 N:177:Kabbug(Half-Orc)
-I:20000:250:140:3:4
+I:20000:170
 C:125:100:60
-L:Orc  | Easterling
-H:Dragon | Demon | Elf
+L:Easterling
+L:Orc
+H:Demon
+H:Dragon
+H:Elf
 
 ### The Master Archers ###
 
 N:178:Palin(Dwarf)
-I:30000:170:107:1:1
+I:30000:120
 C:125:100:70
-L:Human | Dwarf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll  | Easterling
+L:Dwarf
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:179:Wilcome Cotton(Hobbit)
-I:20000:190:109:3:4
+I:20000:130
 C:110:100:80
-L:Human | Hobbit
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll  | Easterling
+L:Hobbit
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:180:Inzilbeth(Dunadan)
-I:25000:180:108:2:2
+I:25000:130
 C:110:100:80
-L:Human | High-Elf | Dunadan | Elf
-H:Dragon | Demon | Orc | Half-Ogre | Troll
+L:Dunadan
+L:Elf
+L:High-Elf
+L:Human
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:181:Gildor Inglorion(Dark-Elf)
-I:10000:200:110:4:8
+I:10000:140
 C:150:100:50
-L:Dark-Elf | Elf  | Easterling
-H:Dragon | Demon | Orc | Half-Ogre | Petty-Dwarf | Dwarf | Troll
+L:Dark-Elf
+L:Easterling
+L:Elf
+H:Demon
+H:Dragon
+H:Dwarf
+H:Half-Ogre
+H:Orc
+H:Petty-Dwarf
+H:Troll
 
 ### Theme stores ###
 
 ### The Miners / Builders ###
 
 N:182:Gror(Dwarf)
-I:20000:190:109:3:4
+I:20000:130
 C:125:100:70
-L:Half-Elf | Petty-Dwarf | Dwarf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll
+L:Dwarf
+L:Half-Elf
+L:Petty-Dwarf
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:183:Saradoc Oldbuck(Hobbit)
-I:30000:170:107:1:1
+I:30000:120
 C:110:100:80
-L:Human | High-Elf | Hobbit | Elf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll
+L:Elf
+L:High-Elf
+L:Hobbit
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:184:Gloredhel(Half-Elf)
-I:10000:200:110:4:8
+I:10000:140
 C:150:100:50
-L:Human | Half-Elf | Dunadan | Elf  | Easterling
-H:Dragon | Demon | Beorning | Orc | Dark-Elf | Half-Ogre | Troll
+L:Dunadan
+L:Easterling
+L:Elf
+L:Half-Elf
+L:Human
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:185:Erellont(Wood-Elf)
-I:25000:180:108:2:2
+I:25000:130
 C:110:100:80
-L:High-Elf | Dunadan | Hobbit | Elf
-H:Dragon | Demon | Orc | Dark-Elf | Half-Ogre | Dwarf | Troll  | Easterling
+L:Dunadan
+L:Elf
+L:High-Elf
+L:Hobbit
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Dwarf
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 ### The Hunters ###
 
 N:186:Kili(Dwarf)
-I:20000:190:109:3:4
+I:20000:130
 C:110:100:80
-L:Petty-Dwarf | Dwarf
-H:Dragon | Demon | Orc | Dark-Elf | Half-Ogre | Elf | Troll
+L:Dwarf
+L:Petty-Dwarf
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Elf
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:187:Ruby Bolger(Hobbit)
-I:10000:200:110:4:8
+I:10000:140
 C:150:100:50
-L:Human | Half-Elf | High-Elf | Hobbit | Elf  | Easterling
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Dwarf | Troll
+L:Easterling
+L:Elf
+L:Half-Elf
+L:High-Elf
+L:Hobbit
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Dwarf
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:188:Goldwine(Human)
-I:25000:180:108:2:2
+I:25000:130
 C:110:100:80
-L:Human | Half-Elf | RohanKnight | Dunadan | Elf  | Easterling
-H:Dragon | Demon | Beorning | Orc | Dark-Elf | Half-Ogre | Troll
+L:Dunadan
+L:Easterling
+L:Elf
+L:Half-Elf
+L:Human
+L:RohanKnight
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:189:Erestor(High-Elf)
-I:30000:170:107:1:1
+I:30000:120
 C:125:100:70
-L:Human | Half-Elf | High-Elf | Dunadan | Elf
-H:Dragon | Demon | Beorning | Orc | Dark-Elf | Half-Ogre | Dwarf | Troll  | Easterling
+L:Dunadan
+L:Elf
+L:Half-Elf
+L:High-Elf
+L:Human
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Dwarf
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 ### The Runecrafters ###
 
 N:190:Nori(Dwarf)
-I:30000:170:107:1:1
+I:30000:120
 C:150:100:50
-L:Petty-Dwarf | Dwarf | Half-Elf | Dunadan
-H:Dragon | Demon | Beorning | Orc | Dark-Elf | Half-Ogre | Human | Troll | Eagle
+L:Dunadan
+L:Dwarf
+L:Half-Elf
+L:Petty-Dwarf
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Eagle
+H:Half-Ogre
+H:Human
+H:Orc
+H:Troll
 
 N:191:Camellia Sackville(Hobbit)
-I:10000:200:110:4:8
+I:10000:140
 C:110:100:80
-L:Hobbit  | Easterling
-H:Dragon | Demon | Orc | Troll
+L:Easterling
+L:Hobbit
+H:Demon
+H:Dragon
+H:Orc
+H:Troll
 
 N:192:Hador Lorindol(Dunadan)
-I:25000:180:108:2:2
+I:25000:130
 C:110:100:80
-L:Human | Half-Elf | High-Elf | RohanKnight | Dunadan | Hobbit | Elf
-H:Dragon | Demon | Orc | Half-Ogre | Troll  | Easterling
+L:Dunadan
+L:Elf
+L:Half-Elf
+L:High-Elf
+L:Hobbit
+L:Human
+L:RohanKnight
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:193:Galathil(Dark-Elf)
-I:20000:190:109:3:4
+I:20000:130
 C:125:100:70
-L:Human | Dark-Elf | Elf
-H:Dragon | Demon | Beorning | Orc | High-Elf | Half-Ogre | Petty-Dwarf | Troll
+L:Dark-Elf
+L:Elf
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:High-Elf
+H:Orc
+H:Petty-Dwarf
+H:Troll
 
 ### The Musicians ###
 
 N:194:Oin(Dwarf)
-I:20000:190:109:3:4
+I:20000:130
 C:125:100:70
-L:Human | Petty-Dwarf | Dwarf
-H:Dragon | Demon | Orc | Elf | Half-Ogre | Troll  | Easterling
+L:Dwarf
+L:Human
+L:Petty-Dwarf
+H:Demon
+H:Dragon
+H:Easterling
+H:Elf
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:195:Robin Smallburrow(Hobbit)
-I:10000:200:110:4:8
+I:10000:140
 C:110:100:80
-L:Human | Hobbit | Elf
-H:Dragon | Demon | Beorning | Orc | Troll  | Easterling
+L:Elf
+L:Hobbit
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Orc
+H:Troll
 
 N:196:Hareth(Half-Elf)
-I:30000:170:107:1:1
+I:30000:120
 C:150:100:50
-L:Human | RohanKnight | Dunadan
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll  | Easterling
+L:Dunadan
+L:Human
+L:RohanKnight
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:197:Galdor(Wood-Elf)
-I:25000:180:108:2:2
+I:25000:130
 C:110:100:80
-L:Half-Elf | High-Elf | Elf
-H:Dragon | Demon | Orc | Dark-Elf | Half-Ogre | Petty-Dwarf | Dwarf | Troll  | Easterling
+L:Elf
+L:Half-Elf
+L:High-Elf
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Dwarf
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Petty-Dwarf
+H:Troll
 
 ### The Precious Metalsmiths ###
 
 N:198:Gabil(Dwarf)
-I:10000:150:120:4:8
+I:10000:130
 C:115:100:70
 L:Dwarf
-H:Dragon | Demon | Orc
+H:Demon
+H:Dragon
+H:Orc
 
 N:199:Isil(Human)
-I:25000:300:150:2:2
+I:25000:200
 C:125:100:80
-L:Human  | Easterling
-H:Dragon | Demon | Troll
+L:Easterling
+L:Human
+H:Demon
+H:Dragon
+H:Troll
 
 N:200:Grima(Half-Orc)
-I:20000:250:140:3:4
+I:20000:170
 C:150:100:50
-L:Orc  | Easterling
-H:Dragon | Demon | Elf
+L:Easterling
+L:Orc
+H:Demon
+H:Dragon
+H:Elf
 
 N:201:Kosh(Half-Troll)
-I:30000:200:130:1:1
+I:30000:150
 C:125:100:60
-L:Troll  | Easterling
-H:Dragon | Demon | Human
+L:Easterling
+L:Troll
+H:Demon
+H:Dragon
+H:Human
 
 ### The Mapmakers ###
 
 N:202:Pas(Dwarf)
-I:20000:190:109:3:4
+I:20000:130
 C:125:100:70
-L:Half-Elf | Petty-Dwarf | Dwarf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll
+L:Dwarf
+L:Half-Elf
+L:Petty-Dwarf
+H:Beorning
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:203:Isumbras Took(Hobbit)
-I:30000:170:107:1:1
+I:30000:120
 C:110:100:80
-L:Human | High-Elf | Hobbit | Elf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll  | Easterling
+L:Elf
+L:High-Elf
+L:Hobbit
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:204:Labadal(Half-Elf)
-I:10000:200:110:4:8
+I:10000:140
 C:150:100:50
-L:Human | Half-Elf | Dunadan | Elf  | Easterling
-H:Dragon | Demon | Beorning | Orc | Dark-Elf | Half-Ogre | Troll
+L:Dunadan
+L:Easterling
+L:Elf
+L:Half-Elf
+L:Human
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:205:Guilin(Wood-Elf)
-I:25000:180:108:2:2
+I:25000:130
 C:110:100:80
-L:High-Elf | Dunadan | Hobbit | Elf
-H:Dragon | Demon | Orc | Dark-Elf | Half-Ogre | Dwarf | Troll
+L:Dunadan
+L:Elf
+L:High-Elf
+L:Hobbit
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Dwarf
+H:Half-Ogre
+H:Orc
+H:Troll
 
 ### The Farmers ###
 
 N:206:Rili(Dwarf)
-I:20000:190:109:3:4
+I:20000:130
 C:110:100:80
-L:Petty-Dwarf | Dwarf
-H:Dragon | Demon | Orc | Dark-Elf | Half-Ogre | Elf | Troll
+L:Dwarf
+L:Petty-Dwarf
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Elf
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:207:Wiseman Gamwich(Hobbit)
-I:10000:200:110:4:8
+I:10000:140
 C:150:100:50
-L:Human | Half-Elf | High-Elf | Hobbit | Elf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Dwarf | Troll
+L:Elf
+L:Half-Elf
+L:High-Elf
+L:Hobbit
+L:Human
+H:Beorning
+H:Demon
+H:Dragon
+H:Dwarf
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:208:Lalaith(Human)
-I:25000:180:108:2:2
+I:25000:130
 C:110:100:80
-L:Human | Half-Elf | RohanKnight | Dunadan | Elf
-H:Dragon | Demon | Beorning | Orc | Dark-Elf | Half-Ogre | Troll  | Easterling
+L:Dunadan
+L:Elf
+L:Half-Elf
+L:Human
+L:RohanKnight
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
 
 N:209:Gwindor(High-Elf)
-I:30000:170:107:1:1
+I:30000:120
 C:125:100:70
-L:Human | Half-Elf | High-Elf | Dunadan | Elf
-H:Dragon | Demon | Beorning | Orc | Dark-Elf | Half-Ogre | Dwarf | Troll
+L:Dunadan
+L:Elf
+L:Half-Elf
+L:High-Elf
+L:Human
+H:Beorning
+H:Dark-Elf
+H:Demon
+H:Dragon
+H:Dwarf
+H:Half-Ogre
+H:Orc
+H:Troll
 
 ### The Old Mage in Minas Anor ###
 
 N:210:Malbeth the Seer
-I:20000:170:110:4:4
+I:20000:130
 C:110:100:80
-L:Human | RohanKnight | Dunadan | High-Elf
-H:Dragon | Demon | Beorning | Orc | Half-Ogre | Troll  | Easterling
-
-### For the Merchants' Guild ###
-N:211:Worm(Human)
-I:30000:180:110:0:0
-C:110:100:90
\ No newline at end of file
+L:Dunadan
+L:High-Elf
+L:Human
+L:RohanKnight
+H:Beorning
+H:Demon
+H:Dragon
+H:Easterling
+H:Half-Ogre
+H:Orc
+H:Troll
diff --git a/lib/mods/theme/edit/p_info.txt b/lib/mods/theme/edit/p_info.txt
index 49832c32..f8a3e25e 100644
--- a/lib/mods/theme/edit/p_info.txt
+++ b/lib/mods/theme/edit/p_info.txt
@@ -8,8 +8,6 @@
 # Do not modify this file unless you know exactly what you are doing,
 # unless you wish to risk possible system crashes and broken savefiles.
 
-V:2.0.0
-
 ##############################################################################
 ##############################################################################
 ##############################################################################
@@ -31,7 +29,6 @@ G:k:+1000:+1000:Magic-Device
 # C:D:1:titles
 # C:S:str:int:wis:dex:con:chr:mana:bonus blows
 # C:K:dis:dev:sav:stl:srh:fos:thn:thb
-# C:X:dis:dev:sav:stl:srh:fos:thn:thb
 # C:P:hitdie:xp%
 # C:B:num:wgt:mul
 # C:C:(H|L):(H|L):base:pl:plus
@@ -54,7 +51,7 @@ G:k:+1000:+1000:Magic-Device
 # C:a:b:level:ability
 # C:a:O:tval:sval:xdy
 
-C:N:0:Warrior
+C:N:0:0:Warrior
 C:D:0:Simple fighters, they hack away with their trusty weapon.
 C:D:1:Rookie
 C:D:1:Soldier
@@ -67,10 +64,7 @@ C:D:1:Baron
 C:D:1:Duke
 C:D:1:Lord
 C:S:5:-2:-2:2:2:-1:0:3
-C:K:10:10:0:1:10:10:10:10
-C:X:0:0:0:0:0:0:0:0
 C:B:4:30:5
-C:C:H:L:9000:2:40
 C:P:9:0
 C:R:30:0
 C:F:RES_FEAR
@@ -84,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
@@ -184,8 +176,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
@@ -211,7 +201,7 @@ C:a:k:+0:+500:Spirituality
 C:a:k:+1000:+200:Prayer 
 C:a:k:=0:=0:Antimagic
 
-C:N:1:Mage
+C:N:1:3:Mage
 C:D:0:The basic spellcaster with lots of different skills
 C:D:1:Apprentice
 C:D:1:Trickster
@@ -224,10 +214,7 @@ C:D:1:Sorcerer
 C:D:1:Ipsissimus
 C:D:1:Archimage
 C:S:-5:3:0:1:-2:1:50:0
-C:K:10:10:0:1:10:10:10:10
-C:X:0:0:0:0:0:0:0:0
 C:B:4:40:2
-C:C:L:H:240000:1:5
 C:P:0:30
 C:E:0:0:0:0:0:0
 C:k:+1000:+900:Magic
@@ -245,12 +232,10 @@ C:k:+0:+700:Nature
 C:k:+0:+700:Meta
 C:k:+0:+700:Mind
 C:k:+0:+700:Necromancy
-C:k:+0:+700:Runecraft
 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
@@ -323,7 +308,6 @@ C:a:k:+0:+300:Divination
 C:a:k:+0:+300:Meta
 C:a:k:+0:+300:Mind
 C:a:k:+0:+200:Necromancy
-C:a:k:+0:+200:Runecraft
 C:a:k:+0:+200:Thaumaturgy
 C:a:O:36:2:1d1
 C:a:O:111:50:1d1
@@ -345,17 +329,6 @@ C:a:O:23:4:1d1
 C:a:O:111:50:1d1
 C:a:b:25:Undead Form
 
-C:a:N:Runecrafter
-C:a:D:Runecrafters use the runes found in Middle-earth to create
-C:a:D:finely tuned spells for each specific situation.
-C:a:k:+1000:+50:Magic
-C:a:k:+1000:+300:Runecraft
-C:a:k:+0:-100:Weaponmastery
-C:a:O:111:50:1d1
-C:a:O:105:1:1d1
-C:a:O:104:5:1d1
-C:a:O:23:4:1d1
-
 C:a:N:Thaumaturgist
 C:a:D:Thaumaturgy spells come from within and are different for each character.
 C:a:D:Since attack is the best defence, all their spells are offensive.
@@ -373,7 +346,6 @@ C:a:k:=0:=0:Nature
 C:a:k:=0:=0:Meta
 C:a:k:=0:=0:Mind
 C:a:k:=0:=0:Necromancy
-C:a:k:=0:=0:Runecraft
 C:a:k:+1000:+300:Thaumaturgy
 C:a:k:+0:-100:Weaponmastery
 C:a:k:+0:-150:Magic-Device
@@ -395,7 +367,6 @@ C:a:k:=0:=0:Nature
 C:a:k:=0:=0:Temporal 
 C:a:k:=0:=0:Meta 
 C:a:k:=0:=0:Necromancy 
-C:a:k:=0:=0:Runecraft 
 C:a:k:=0:=0:Thaumaturgy 
 C:a:k:+1000:+300:Divination
 C:a:k:+1000:+300:Mind
@@ -405,7 +376,7 @@ C:a:k:+1000:+700:Mindcraft
 C:a:O:111:50:1d1
 C:a:O:21:3:1d1
 
-C:N:2:Archer
+C:N:2:1:Archer
 C:D:0:'Kill them before they see you' could be the motto of the archer class.
 C:D:0:As deadly with a bow as a warrior is with a sword.
 C:D:1:Rock Thrower
@@ -419,10 +390,7 @@ C:D:1:Archer
 C:D:1:Archer
 C:D:1:Great Archer
 C:S:2:1:0:2:1:1:0:0
-C:K:10:10:0:1:10:10:10:10
-C:X:0:0:0:0:0:0:0:0
 C:B:4:35:4
-C:C:H:L:9000:2:40
 C:P:4:30
 C:E:0:0:0:0:0:0
 C:k:+1000:+800:Combat
@@ -433,9 +401,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
@@ -463,8 +429,6 @@ C:a:k:+0:+200:Weaponmastery
 C:a:k:+0:+400:Magic
 C:a:k:+0:+500:Nature
 C:a:k:+0:+500:Divination
-C:a:k:+0:+700:Disarming
-C:a:k:+0:+50:Sneakiness
 C:a:k:+0:+200:Monster-lore
 C:a:k:+0:+300:Summoning
 C:a:O:19:12:1d1
@@ -479,15 +443,12 @@ C:a:g:Varda Elentari
 C:a:g:Aule the Smith
 C:a:g:Ulmo
 C:a:g:Mandos
-C:a:b:1:Trapping
 
 C:a:N:Sniper
 C:a:D:Snipers are very stealthy archers without much hand-to-hand combat 
 C:a:D:ability, but with a penchant to disappear when it suits them.
 C:a:k:+0:-300:Combat
-C:a:k:+1000:+100:Sneakiness
 C:a:k:+1000:+700:Stealth 
-C:a:k:+0:+100:Disarming
 C:a:k:+1000:+700:Backstab
 C:a:k:+0:+300:Magic
 C:a:k:+1000:+500:Conveyance
@@ -495,9 +456,9 @@ C:a:O:19:12:1d1
 C:a:O:17:1:10d3
 C:a:g:All Gods
 
-C:N:3:Rogue
+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
@@ -509,10 +470,7 @@ C:D:1:Master Thief
 C:D:1:Assassin
 C:D:1:Guildmaster
 C:S:2:1:-2:3:1:-1:0:0
-C:K:10:10:0:1:10:10:10:10
-C:X:0:0:0:0:0:0:0:0
 C:B:4:30:3
-C:C:H:H:20000:2:40
 C:P:6:25
 C:O:23:4:1d1
 C:G:EASE_STEAL
@@ -559,9 +517,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
@@ -571,7 +527,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
@@ -586,7 +541,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:-550:Magic-Device
@@ -604,7 +558,7 @@ C:a:b:15:Extra Max Blow(2)
 C:a:O:23:7:1d1
 C:a:O:35:1:1d1
 
-C:N:4:Loremaster
+C:N:4:5:Loremaster
 C:D:0:Loremasters are skilled in most combat and monster skills.
 C:D:1:Apprentice
 C:D:1:Apprentice
@@ -617,10 +571,7 @@ C:D:1:Lorekeeper
 C:D:1:Loremaster
 C:D:1:Loremaster
 C:S:1:-2:1:1:0:1:0:0
-C:K:10:10:0:1:10:10:10:10
-C:X:0:0:0:0:0:0:0:0
 C:B:4:30:3
-C:C:H:L:9000:2:40
 C:P:8:40
 C:E:0:0:0:0:0:0
 C:k:+1000:+700:Combat
@@ -628,9 +579,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
@@ -659,7 +608,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
@@ -678,7 +626,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
@@ -697,7 +644,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
@@ -717,9 +663,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
@@ -739,9 +683,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
@@ -764,7 +706,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
@@ -780,7 +721,6 @@ C:a:k:+0:+200:Combat
 C:a:k:=0:=0:Weaponmastery
 C:a:k:+0:+200:Barehand-combat
 C:a:k:+1000:+1000:Antimagic
-C:a:k:+0:+200:Disarming
 C:a:k:+0:+300:Stealth
 C:a:k:+0:+1000:Dodging
 C:a:k:=0:=0:Magic
@@ -803,7 +743,7 @@ C:a:b:5:Extra Max Blow(2)
 C:a:O:71:37:1d1
 C:a:g:Nobody
 
-C:N:5:Pacifist
+C:N:5:6:Pacifist
 C:D:0:Pacifists do not believe in violence and do not want to kill 
 C:D:0:everything in sight.
 C:D:1:Novice
@@ -817,21 +757,16 @@ C:D:1:Negotiator
 C:D:1:Pacifist
 C:D:1:Peacemaker
 C:S:0:2:2:2:0:4:0:0
-C:K:10:10:0:1:10:10:10:10
-C:X:0:0:0:0:0:0:0:0
 C:P:0:0
 C:B:0:0:0
-C:C:H:H:20000:2:40
 C:Z:detect doors and traps
 C:E:-1:0:0:0:0:0
 C:k:=0:=0:Combat
 C:k:=0:=0:Weaponmastery
 C:k:=0:=0:Archery
 C:k:=0:=0:Barehand-combat
-C:k:+0:+600:Sneakiness
 C:k:+0:+600:Stealth
 C:k:+1000:+700:Dodging
-C:k:+1000:+600:Disarming
 C:k:+1000:+600:Magic
 C:k:=0:=0:Magic-Device
 C:k:+0:+500:Spell-power
@@ -845,14 +780,6 @@ C:k:=0:=0:Music
 C:b:15:Perfect casting
 C:g:All Gods
 
-C:a:N:Trapper
-C:a:D:These pacifists use traps to snare monsters, and
-C:a:D:make totems from corpses to summon aid.
-C:O:46:1:1d1
-C:a:k:+1000:+600:Summoning
-C:a:b:1:Trapping
-C:a:b:10:Ammo creation
-
 C:a:N:Peace-mage
 C:a:D:These pacifists use magic to escape danger, and
 C:a:D:rely on symbiotic relationships to defend themselves.
@@ -863,7 +790,7 @@ C:a:k:+0:+700:Divination
 C:a:k:+0:+700:Temporal
 C:a:k:+1000:+600:Symbiosis
 
-C:N:6:Priest
+C:N:6:4:Priest
 C:D:0:A priest serves a god (Vala, Maia or Eru himself) to bring down
 C:D:0:the empire of fear and shadows of Morgoth.
 C:D:1:Believer
@@ -877,13 +804,10 @@ C:D:1:Cardinal
 C:D:1:Inquisitor
 C:D:1:Pope
 C:S:-1:-3:3:-1:0:2:0:0
-C:K:10:10:0:1:10:10:10:10
-C:X:0:0:0:0:0:0:0:0
 C:B:4:35:3
-C:C:L:H:10000:2:40
 C:P:2:20
 C:Z:detect curses
-C:G:GOD_FRIEND |
+C:G:GOD_FRIEND
 C:E:0:0:0:0:0:0
 C:k:+1000:+900:Magic
 C:k:+0:+600:Spell-power
@@ -893,8 +817,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
@@ -966,7 +888,6 @@ C:a:g:Mandos
 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
 
 C:a:N:Stonewright
@@ -1010,47 +931,6 @@ C:a:k:+0:+300:Prayer
 C:a:k:+0:-600:Necromancy
 C:a:k:+0:+100:Spell-power
 
-###############################TEST###############################
-C:N:30:Test
-C:D:0:Simple testers.
-C:D:1:Rookie
-C:D:1:Soldier
-C:D:1:Mercenary
-C:D:1:Veteran
-C:D:1:Swordsman
-C:D:1:Champion
-C:D:1:Hero
-C:D:1:Baron
-C:D:1:Duke
-C:D:1:Lord
-C:S:5:-2:-2:2:2:-1:0:3
-C:K:10:10:0:1:10:10:10:10
-C:X:0:0:0:0:0:0:0:0
-C:B:6:30:5
-C:C:H:L:9000:2:40
-C:P:9:0
-C:R:30:0
-C:F:RES_FEAR
-C:E:0:0:0:0:0:0
-C:O:45:38:1d1
-C:O:37:4:1d1
-C:k:+1000:+800:Combat
-C:k:+1000:+850:Weaponmastery
-C:k:+0:+200:Sword-mastery
-C:k:+0:+200:Axe-mastery
-C:k:+0:+200:Hafted-mastery
-C:k:+0:+200:Polearm-mastery
-C:k:+1000:+600:Archery
-C:k:+1000:+900:Sneakiness
-C:k:+1000:+900:Disarming
-C:k:+1000:+300:Magic
-C:k:+0:+550:Antimagic
-
-C:a:N:Shinny test
-C:a:D:Simple testers, they test all with their shiny hacks !
-C:a:O:23:16:1d1
-###############################TEST###############################
-
 
 
 
@@ -1065,8 +945,7 @@ C:a:O:23:16:1d1
 # R:D:race desc
 # R:S:str:int:wis:dex:con:chr:luck
 # R:K:dis:dev:sav:stl:srh:fos:thn:thb
-# R:P:hitdie:xp%:infra:history chart
-# R:M:b_age:m_age:m_b_ht:m_m_ht:m_b_wt:m_m_wt:f_b_ht:f_m_ht:f_b_wt:f_m_wt
+# R:P:hitdie:xp%:infra
 # R:E:weapons:torso:arms:finger:head:legs
 # R:C:allowed classes
 # R:G:race flags
@@ -1082,26 +961,32 @@ R:D:Humans are the second born, the Edain.
 R:D:They are the basic race to which all others are compared.
 R:D:Average in ability, they can be any class.
 R:S:0:0:0:0:0:0:0
-R:K:0:0:0:0:0:10:0:0
-R:P:10:100:0:1
-R:M:14:6:72:6:180:25:66:4:150:20
+R:P:10:100:0
 R:E:1:1:1:2:1:1
-R:C:Warrior | Archer | Mage | Rogue | Priest | Loremaster | Pacifist
+R:C:Archer
+R:C:Loremaster
+R:C:Mage
+R:C:Pacifist
+R:C:Priest
+R:C:Rogue
+R:C:Warrior
 
 R:N:1:Half-Elf
 R:D:A crossbreed of elf and human, they get the best of the two races.
 R:S:0:1:1:1:-1:1:0
-R:K:2:3:3:1:6:11:-1:5
-R:P:9:110:2:4
-R:M:24:16:66:6:130:15:62:6:100:10
+R:P:9:110:2
 R:E:1:1:1:2:1:1
-R:C:Warrior | Archer | Mage | Rogue | Priest | Loremaster | Pacifist
+R:C:Archer
+R:C:Loremaster
+R:C:Mage
+R:C:Pacifist
+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
 
@@ -1110,19 +995,20 @@ R:D:Elves are the first born, the Eldar.
 R:D:More spiritual than physical beings, they are weaker than humans
 R:D:but are more intelligent.
 R:S:-1:2:2:1:-2:2:0
-R:K:5:6:6:2:8:12:-5:15
-R:P:8:120:3:5
-R:M:75:75:60:4:100:6:54:4:80:6
+R:P:8:120:3
 R:E:1:1:1:2:1:1
 R:R:1:0
-R:F:RES_LITE | 
-R:C:Warrior | Archer | Mage | Priest | Loremaster | Pacifist
+R:F:RES_LITE
+R:C:Archer
+R:C:Loremaster
+R:C:Mage
+R:C:Pacifist
+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
 
@@ -1130,21 +1016,23 @@ R:N:3:Hobbit
 R:D:An old but quiet race related to humans.
 R:D:They are small and quite weak but good at many things.
 R:S:-2:2:1:3:2:1:5
-R:K:15:18:18:5:12:15:-10:20
-R:P:7:110:4:10
-R:M:21:12:36:3:60:3:33:3:50:3
+R:P:7:110:4
 R:E:1:1:1:2:1:0
 R:Z:create food
-R:G:RESIST_BLACK_BREATH | XTRA_MIGHT_SLING |
+R:G:RESIST_BLACK_BREATH
+R:G:XTRA_MIGHT_SLING
 R:R:1:0
-R:F:SUST_DEX | 
-R:C:Warrior | Archer | Mage | Rogue | Loremaster | Pacifist
+R:F:SUST_DEX
+R:C:Archer
+R:C:Loremaster
+R:C:Mage
+R:C:Pacifist
+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:+6000:+000:Stealth
-R:k:+1200:+000:Sneakiness
 R:k:-1000:+000:Weaponmastery
 R:k:+2000:+000:Archery
 
@@ -1152,19 +1040,18 @@ R:N:4:Gnome
 R:D:Related to dwarves, Gnomes are between Dwarves and Hobbits in size.
 R:D:Very good at magic use, they are poor as fighters.
 R:S:-1:2:0:2:1:-2:2
-R:K:10:12:12:3:6:13:-8:12
-R:P:8:135:4:13
-R:M:50:40:42:3:90:6:39:3:75:3
+R:P:8:135:4
 R:E:1:1:1:2:1:1
 R:Z:blink
 R:R:1:0
-R:F:FREE_ACT | 
-R:C:Warrior | Mage | Rogue | Pacifist
-R:k:+1000:+000:Disarming
+R:F:FREE_ACT
+R:C:Mage
+R:C:Pacifist
+R:C:Rogue
+R:C:Warrior
 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
 
@@ -1172,39 +1059,37 @@ R:N:5:Dwarf
 R:D:The children of Aule, a strong but small race.
 R:D:Miners and fighters of legend.
 R:S:2:-2:2:-2:2:-3:0
-R:K:2:9:10:-1:7:10:15:0
-R:P:11:125:5:16
-R:M:35:15:48:3:150:10:46:3:120:10
+R:P:11:125:5
 R:E:1:1:1:2:1:1
 R:Z:find secret passages
 R:R:1:0
-R:F:RES_BLIND | LITE1
-R:C:Warrior | Priest | Pacifist
+R:F:LITE1
+R:F:RES_BLIND
+R:C:Pacifist
+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
 
 R:N:6:Orc
 R:D:Quite strong but not very smart.
 R:S:2:-1:0:1:1:-4:-3
-R:K:-3:-3:-3:-1:0:7:12:-5
-R:P:10:110:3:25
-R:M:11:4:66:1:150:5:62:1:120:5
+R:P:10:110:3
 R:E:1:1:1:2:1:1
 R:Z:remove fear
 R:R:1:0
-R:F:RES_DARK | 
-R:C:Warrior | Archer | Rogue | Priest
-R:k:-300:+000:Disarming
+R:F:RES_DARK
+R:C:Archer
+R:C:Priest
+R:C:Rogue
+R:C:Warrior
 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
 
@@ -1212,21 +1097,17 @@ R:N:7:Troll
 R:D:They can bear the light of the sun.
 R:D:They are extremely strong and dumb.
 R:S:4:-4:-2:-4:3:-6:-4
-R:K:-5:-8:-8:-2:-1:5:20:-10
-R:P:12:137:3:22
-R:M:20:10:96:10:250:50:84:8:225:40
+R:P:12:137:3
 R:E:1:1:1:2:1:1
 R:Z:berserk
 R:R:1:0
-R:F:SUST_STR | 
+R:F:SUST_STR
 R:R:15:0
-R:F:REGEN | 
+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:+0:+200:Hafted-mastery
 R:k:-1000:+000:Archery
@@ -1235,18 +1116,21 @@ R:N:8:Dunadan
 R:D:The greatest of the Edain, humans in all respects but
 R:D:stronger, smarter and wiser.
 R:S:1:2:2:2:3:2:2
-R:K:4:5:5:2:3:13:15:10
-R:P:10:180:0:1
-R:M:50:50:82:5:190:20:78:6:180:15
+R:P:10:180:0
 R:E:1:1:1:2:1:1
 R:R:1:0
-R:F:SUST_CON | REGEN | 
-R:C:Warrior | Archer | Mage | Rogue | Priest | Loremaster | Pacifist
-R:k:+400:+000:Disarming
+R:F:REGEN
+R:F:SUST_CON
+R:C:Archer
+R:C:Loremaster
+R:C:Mage
+R:C:Pacifist
+R:C:Priest
+R:C:Rogue
+R:C:Warrior
 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
 
@@ -1255,20 +1139,21 @@ R:D:Elves are the first born, the Eldar.
 R:D:High elves are the best of the Eldar, strong, fast, intellectual, though
 R:D:they sometimes lack wisdom.
 R:S:1:3:2:3:1:5:0
-R:K:4:20:20:4:3:14:10:25
-R:P:10:200:4:7
-R:M:100:30:90:10:190:20:82:10:180:15
+R:P:10:200:4
 R:E:1:1:1:2:1:1
 R:R:1:0
-R:F:SEE_INVIS | 
-R:F:RES_LITE | 
+R:F:RES_LITE
+R:F:SEE_INVIS
 R:G:ELF
-R:C:Warrior | Archer | Mage | Priest | Loremaster | Pacifist
-R:k:+400:+000:Disarming
+R:C:Archer
+R:C:Loremaster
+R:C:Mage
+R:C:Pacifist
+R:C:Priest
+R:C:Warrior
 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
 
@@ -1276,19 +1161,18 @@ R:N:10:Half-Ogre
 R:D:A crossbreed between a human and an ogre.
 R:D:They are similar to half-trolls, strong and dumb.
 R:S:3:-1:-1:-1:3:-3:-2
-R:K:-3:-5:-5:-2:-1:5:20:0
-R:P:12:130:3:74
-R:M:40:10:92:10:255:60:80:8:235:60
+R:P:12:130:3
 R:E:1:1:1:2:1:1
 R:Z:set explosive rune
 R:R:1:0
-R:F:SUST_STR | RES_DARK | 
-R:C:Warrior | Priest | Pacifist
-R:k:-300:+000:Disarming
+R:F:RES_DARK
+R:F:SUST_STR
+R:C:Pacifist
+R:C:Priest
+R:C:Warrior
 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
 
@@ -1296,22 +1180,20 @@ R:N:11:Beorning
 R:D:A race of men shapeshifters.
 R:D:They have the unique power of being able to polymorph to bear forms.
 R:S:4:-2:-2:-1:3:-5:1
-R:K:-6:-8:-6:-2:-1:5:25:5
-R:P:12:150:3:75
-R:M:40:10:100:10:255:65:80:10:240:64
+R:P:12:150:3
 R:E:1:1:1:2:1:1
 R:Z:turn into a bear
 R:R:1:0
-R:F:SUST_STR | 
+R:F:SUST_STR
 R:R:20:1
-R:F:STR | 
-R:C:Warrior | Rogue | Loremaster
+R:F:STR
+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
 
@@ -1322,20 +1204,20 @@ R:D:Druedain are an ancient branch of the race of Men.
 R:D:Wiser and quicker than the Edain, but weaker and less intelligent. 
 R:D:Not as pretty as their common human cousins, but sturdier. 
 R:S:-2:-3:2:3:2:-2:1 
-R:K:5:0:0:5:15:15:0:5 
-R:P:9:115:0:82
-R:M:14:6:65:6:162:25:58:4:145:20 
+R:P:9:115:0
 R:E:1:1:1:2:1:1 
 R:Z:poison dart
 R:R:1:0
-R:F:RES_POIS | 
-R:C:Warrior | Archer | Rogue | Loremaster | Pacifist
+R:F:RES_POIS
+R:C:Archer
+R:C:Loremaster
+R:C:Pacifist
+R:C:Rogue
+R:C:Warrior
 R:k:+0:+250:Boomerang-mastery 
-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
 
@@ -1343,19 +1225,18 @@ R:N:13:Petty-Dwarf
 R:D:A nearly extinct subrace of dwarves.
 R:D:They prefer to live in the darkness.
 R:S:1:-1:2:0:2:-4:-5
-R:K:3:5:10:1:5:10:9:0
-R:P:11:135:5:87
-R:M:40:12:43:3:92:6:40:3:78:3
+R:P:11:135:5
 R:E:1:1:1:2:1:1
 R:Z:detect doors and traps
 R:R:1:0
-R:F:RES_DARK | RES_DISEN | LITE1
-R:C:Warrior | Rogue
-R:k:+300:+000:Disarming
+R:F:LITE1
+R:F:RES_DARK
+R:F:RES_DISEN
+R:C:Rogue
+R:C:Warrior
 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
 
@@ -1364,23 +1245,23 @@ R:D:Elves are the first born, the Eldar.
 R:D:Dark elves are rare on Middle-earth and even though not evil
 R:D:they are not good.
 R:S:-1:3:2:2:-2:1:-2
-R:K:5:15:20:3:8:12:-5:10
-R:P:9:150:5:69
-R:M:75:75:60:4:100:6:54:4:80:6
+R:P:9:150:5
 R:E:1:1:1:2:1:1
 R:Z:magic missile
 R:R:1:0
-R:F:RES_DARK | 
+R:F:RES_DARK
 R:R:20:0
-R:F:SEE_INVIS | 
-R:C:Warrior | Archer | Mage | Rogue | Priest
+R:F:SEE_INVIS
+R:C:Archer
+R:C:Mage
+R:C:Priest
+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
 
@@ -1388,30 +1269,34 @@ R:N:15:Ent
 R:D:Guardian of the forests of Middle-earth, summoned by Yavanna before
 R:D:even the elves awoke. It is said 'Trolls are strong, Ents are STRONGER'.
 R:S:10:-3:2:-5:11:-3:-2
-R:K:5:5:20:-6:5:4:15:5
-R:P:14:210:5:95
-R:M:255:70:72:6:100:25:66:4:100:20
+R:P:14:210:5
 R:E:1:1:1:2:1:1
 R:Z:grow trees
-R:G:NO_STUN | NO_FOOD |
-R:G:AC_LEVEL | 
+R:G:AC_LEVEL
+R:G:NO_FOOD
+R:G:NO_STUN
 R:R:1:-5
-R:F:SPEED | SENS_FIRE | SLOW_DIGEST | RES_POIS
+R:F:RES_POIS
+R:F:SENS_FIRE
+R:F:SLOW_DIGEST
+R:F:SPEED
 R:R:5:0
-R:F:SEE_INVIS | 
+R:F:SEE_INVIS
 R:R:20:0
-R:F:ESP_ORC | 
-R:F:ESP_TROLL | ESP_EVIL | 
-R:C:Warrior | Priest | Loremaster | Pacifist
+R:F:ESP_EVIL
+R:F:ESP_ORC
+R:F:ESP_TROLL
+R:C:Loremaster
+R:C:Pacifist
+R:C:Priest
+R:C:Warrior
 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
 
@@ -1419,37 +1304,35 @@ R:N:16:RohanKnight
 R:D:Humans from the land of Rohan, riding the great Mearas.
 R:D:Fast and powerful in battle.
 R:S:4:-2:3:1:4:2:0
-R:K:10:5:5:-8:1:1:5:5
-R:P:10:220:0:84
-R:M:20:3:60:3:80:4:54:3:70:4
+R:P:10:220:0
 R:E:1:1:1:2:1:1
 R:Z:Rohan Knight's Powers
 R:R:1:3
-R:F:SPEED | 
+R:F:SPEED
 R:R:5:1
-R:F:SPEED | 
+R:F:SPEED
 R:R:10:1
-R:F:SPEED | 
+R:F:SPEED
 R:R:15:1
-R:F:SPEED | 
+R:F:SPEED
 R:R:20:1
-R:F:SPEED | 
+R:F:SPEED
 R:R:25:1
-R:F:SPEED | 
+R:F:SPEED
 R:R:30:1
-R:F:SPEED | 
+R:F:SPEED
 R:R:35:1
-R:F:SPEED | 
+R:F:SPEED
 R:R:40:1
-R:F:SPEED | 
+R:F:SPEED
 R:R:45:1
-R:F:SPEED | 
-R:C:Warrior | Priest | Pacifist
-R:k:+1000:+000:Disarming
+R:F:SPEED
+R:C:Pacifist
+R:C:Priest
+R:C:Warrior
 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
 
@@ -1459,35 +1342,35 @@ R:N:17:Eagle
 R:D:A Great Eagle of Manwe, his most faithful servant.
 R:D:They have been given many gifts from their master.
 R:S:6:2:1:-2:3:6:4
-R:K:6:0:10:-16:30:10:0:0
-R:P:12:300:5:89
-R:M:14:6:180:6:255:25:150:4:230:20
+R:P:12:300:5
 R:E:0:1:0:4:1:1
 R:R:1:0
-R:F:FEATHER | FLY
+R:F:FEATHER
+R:F:FLY
 R:R:4:0
-R:F:ESP_DRAGON |
+R:F:ESP_DRAGON
 R:R:5:0
-R:F:RES_ELEC | 
+R:F:RES_ELEC
 R:R:10:0
-R:F:RES_COLD | 
+R:F:RES_COLD
 R:R:15:0
-R:F:RES_ACID | 
+R:F:RES_ACID
 R:R:17:0
-R:F:RES_FIRE | 
+R:F:RES_FIRE
 R:R:35:0
-R:F:RES_POIS | 
+R:F:RES_POIS
 R:R:45:0
-R:F:IM_ELEC | 
+R:F:IM_ELEC
 R:R:50:0
 R:F:CLIMB
 R:k:+1000:+300:Barehand-combat
-R:C:Loremaster | Mage | Priest | Pacifist
-R:k:+600:+000:Disarming
+R:C:Loremaster
+R:C:Mage
+R:C:Pacifist
+R:C:Priest
 R:k:+000:+000:Magic-Device
 R:k:+5000:+000:Spirituality
 R:k:-16000:+000:Stealth
-R:k:+3000:+000:Sneakiness
 
 ### Base race characteristics tweaked from Annals of Ea for Theme.
 
@@ -1497,37 +1380,37 @@ R:D:Very strong and smart, but unstealthy.
 R:D:They cannot play instruments or wield weapons.
 # R:S:str:int:wis:dex:con:chr:luck
 R:S:3:2:2:-2:2:-5:-2
-R:K:5:5:5:-10:5:5:5:-20
-R:P:9:250:5:100
-R:M:50:150:200:-200:80:120:54:-50:100:60
-# R:E:weapons:torso:arms:finger:head:legs
+R:P:9:250:5
 R:E:0:1:0:6:1:1
 R:R:1:0
 R:k:=0:=0:Weaponmastery
 R:k:+0:+400:Barehand-combat
 R:k:=0:=0:Geomancy
 R:F:FLY
-R:C:Loremaster | Mage | Priest | Pacifist
+R:C:Loremaster
+R:C:Mage
+R:C:Pacifist
+R:C:Priest
 #R:G:EVIL
-R:k:+1000:+000:Disarming
 R:k:+500:+000:Magic-Device
 R:k:-4000:+000:Spirituality
 R:k:-10000:+000:Stealth
-R:k:+000:+000:Sneakiness
 
 R:N:19:Yeek
 R:D:The weakest of all the races, bad at everything except gaining levels quickly.
 R:S:-5:-5:-5:-5:-5:-5:-5
-R:K:-5:-5:-10:0:-5:0:-10:-10
-R:P:6:25:2:29
-R:M:10:4:40:5:50:10:35:4:45:10
+R:P:6:25:2
 R:E:1:1:1:2:1:1
-R:C:Warrior | Archer | Mage | Rogue | Priest | Loremaster | Pacifist
-R:k:-500:+000:Disarming
+R:C:Archer
+R:C:Loremaster
+R:C:Mage
+R:C:Pacifist
+R:C:Priest
+R:C:Rogue
+R:C:Warrior
 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
 
@@ -1538,22 +1421,24 @@ R:D:Elves are the first born, the Eldar.
 R:D:Wood Elves live in the great forests of Middle-earth.
 R:D:They are more dangerous but less wise than High Elves.
 R:S:2:2:-3:5:0:1:0
-R:K:5:6:6:5:8:12:-5:40
-R:P:7:130:4:5
-R:M:75:75:60:4:100:6:54:4:80:6
+R:P:7:130:4
 R:E:1:1:1:2:1:1
-R:G:XTRA_MIGHT_BOW | 
+R:G:XTRA_MIGHT_BOW
 R:R:1:1
-R:F:XTRA_MIGHT | RES_LITE | 
-R:C:Warrior | Archer | Mage | Priest | Loremaster | Pacifist
+R:F:RES_LITE
+R:F:XTRA_MIGHT
+R:C:Archer
+R:C:Loremaster
+R:C:Mage
+R:C:Pacifist
+R:C:Priest
+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:+1000:+000:Weaponmastery
 R:k:+4000:+000:Archery
 
@@ -1563,36 +1448,75 @@ R:N:21:Maia
 R:D:An old race, dating from before the creation of Arda, the Maiar were
 R:D:created by Eru to help the Valar in their task.
 R:S:0:0:0:0:0:0:4
-R:K:0:0:0:0:0:10:0:0
-R:P:10:100:0:91
-R:M:14:6:72:6:180:25:66:4:150:20
+R:P:10:100:0
 R:E:1:1:1:2:1:1
 R:G:NO_GOD
 R:R:20:0
-R:F:DRAIN_EXP | 
+R:F:DRAIN_EXP
 R:R:6:1
-R:F:STR | INT | WIS | DEX | CON | CHR | 
+R:F:CHR
+R:F:CON
+R:F:DEX
+R:F:INT
+R:F:STR
+R:F:WIS
 R:R:12:1
-R:F:STR | INT | WIS | DEX | CON | CHR | 
+R:F:CHR
+R:F:CON
+R:F:DEX
+R:F:INT
+R:F:STR
+R:F:WIS
 R:R:18:1
-R:F:STR | INT | WIS | DEX | CON | CHR | 
+R:F:CHR
+R:F:CON
+R:F:DEX
+R:F:INT
+R:F:STR
+R:F:WIS
 R:R:24:1
-R:F:STR | INT | WIS | DEX | CON | CHR | 
+R:F:CHR
+R:F:CON
+R:F:DEX
+R:F:INT
+R:F:STR
+R:F:WIS
 R:R:30:1
-R:F:STR | INT | WIS | DEX | CON | CHR | 
+R:F:CHR
+R:F:CON
+R:F:DEX
+R:F:INT
+R:F:STR
+R:F:WIS
 R:R:36:1
-R:F:STR | INT | WIS | DEX | CON | CHR | 
+R:F:CHR
+R:F:CON
+R:F:DEX
+R:F:INT
+R:F:STR
+R:F:WIS
 R:R:42:1
-R:F:STR | INT | WIS | DEX | CON | CHR | 
+R:F:CHR
+R:F:CON
+R:F:DEX
+R:F:INT
+R:F:STR
+R:F:WIS
 R:R:48:1
-R:F:STR | INT | WIS | DEX | CON | CHR | 
-R:C:Warrior | Archer | Mage | Pacifist
-R:k:+000:+000:Disarming
+R:F:CHR
+R:F:CON
+R:F:DEX
+R:F:INT
+R:F:STR
+R:F:WIS
+R:C:Archer
+R:C:Mage
+R:C:Pacifist
+R:C:Warrior
 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
 
@@ -1603,12 +1527,12 @@ R:D:The humans of the Southeast, servants of the Dark.
 R:D:They are traditional masters of many combat skills.
 R:D:Fanatical warriors, they do not trust magic.
 R:S:2:-2:-2:-2:2:-1:-1
-R:K:0:-5:-1:0:0:10:5:5
-R:P:10:140:0:105
-R:M:14:6:72:6:180:25:66:4:150:20
+R:P:10:140:0
 R:E:1:1:1:2:1:1
-R:C:Warrior | Archer
-R:G:XTRA_MIGHT_XBOW | NO_STUN
+R:C:Archer
+R:C:Warrior
+R:G:NO_STUN
+R:G:XTRA_MIGHT_XBOW
 R:R:5:0
 R:F:FREE_ACT
 R:R:15:0
@@ -1620,9 +1544,7 @@ R:k:+0:+200:Axe-mastery
 R:k:+0:+200:Hafted-mastery
 R:k:+0:+200:Polearm-mastery
 R:k:+2000:+200:Archery
-R:k:+1000:+300:Sneakiness
 R:k:+1000:+200:Stealth
-R:k:+1000:+200:Disarming
 R:k:=0:=0:Magic
 R:k:=0:=0:Magic-Device
 R:k:=0:=0:Spell-power
@@ -1637,20 +1559,23 @@ R:D:corrupted by Melkor to serve his ends.
 # They all get an inherent CHR penalty, other stats depend on subrace.
 R:S:0:0:0:0:0:-1:0
 # Again, here everything depends on subrace
-R:K:0:0:0:0:0:0:0:0
-R:P:10:170:3:109
-R:M:14:6:72:6:180:25:66:4:150:20
+R:P:10:170:3
 # Everything at zero here, depends on type of demon.
 R:E:0:0:0:0:0:0
-R:C:Warrior | Archer | Mage | Rogue | Priest | Loremaster
+R:C:Archer
+R:C:Loremaster
+R:C:Mage
+R:C:Priest
+R:C:Rogue
+R:C:Warrior
 R:G:CORRUPT
-R:F:RES_FEAR | HOLD_LIFE | RES_DARK
+R:F:HOLD_LIFE
+R:F:RES_DARK
+R:F:RES_FEAR
 R:Z:spear of darkness
-R:k:+500:+000:Disarming
 R:k:+050:+000:Magic-Device
 R:k:-5000:+000:Spirituality
 R:k:+000:+000:Stealth
-R:k:+000:+000:Sneakiness
 R:k:+000:+000:Weaponmastery
 R:k:+000:+000:Archery
 
@@ -1664,7 +1589,6 @@ R:k:+000:+000:Archery
 # S:S:str:int:wis:dex:con:chr:luck:mana
 # S:K:dis:dev:sav:stl:srh:fos:thn:thb
 # S:P:hitdie:xp%:infra
-# S:M:b_age:m_age:m_b_ht:m_m_ht:m_b_wt:m_m_wt:f_b_ht:f_m_ht:f_b_wt:f_m_wt
 # S:E:weapons:torso:arms:finger:head:legs
 # S:A:allowed races
 # S:C:'A'llow/'F'orbid:allowed/forbiden classes
@@ -1680,14 +1604,30 @@ I:
 S:N:0: 
 S:D:A:A normal member of the race.
 S:S:0:0:0:0:0:0:0:100
-S:K:0:0:0:0:0:0:0:0
 S:P:0:0:0
-S:M:0:0:0:0:0:0:0:0:0:0
 S:E:0:0:0:0:0:0
-S:A:Human | Half-Elf | Elf | Hobbit | Gnome | Dwarf | 
-S:A:Orc | Troll | Dunadan | High-Elf | Half-Ogre | Beorning | 
-S:A:Druadan | Petty-Dwarf | Dark-Elf | Ent | RohanKnight | Eagle | 
-S:A:Yeek | Wood-Elf | Maia | Easterling
+S:A:Beorning
+S:A:Dark-Elf
+S:A:Druadan
+S:A:Dunadan
+S:A:Dwarf
+S:A:Eagle
+S:A:Easterling
+S:A:Elf
+S:A:Ent
+S:A:Gnome
+S:A:Half-Elf
+S:A:Half-Ogre
+S:A:High-Elf
+S:A:Hobbit
+S:A:Human
+S:A:Maia
+S:A:Orc
+S:A:Petty-Dwarf
+S:A:RohanKnight
+S:A:Troll
+S:A:Wood-Elf
+S:A:Yeek
 
 # Just a place holder, the actualy setting are done with corruptions, see
 # corrupt.lua and player.lua
@@ -1695,13 +1635,24 @@ S:N:1:Vampire
 S:D:B:Vampires are powerful undead, wielding great powers. They still fear the
 S:D:B:sunlight and cannot easily satiate their hunger.
 S:S:0:0:0:0:0:0:0:100
-S:K:0:0:0:0:0:0:0:0
 S:P:0:0:0
-S:M:0:0:0:0:0:0:0:0:0:0
 S:E:0:0:0:0:0:0
-S:A:Human | Half-Elf | Hobbit | Gnome | Dwarf | Orc |
-S:A:Troll | Dunadan | Half-Ogre | Beorning | Druadan | Petty-Dwarf | 
-S:A:Dark-Elf | RohanKnight | Yeek | Easterling
+S:A:Beorning
+S:A:Dark-Elf
+S:A:Druadan
+S:A:Dunadan
+S:A:Dwarf
+S:A:Easterling
+S:A:Gnome
+S:A:Half-Elf
+S:A:Half-Ogre
+S:A:Hobbit
+S:A:Human
+S:A:Orc
+S:A:Petty-Dwarf
+S:A:RohanKnight
+S:A:Troll
+S:A:Yeek
 S:C:A:Mage
 S:O:70:0:5d3
 S:O:70:32:2d3
@@ -1710,24 +1661,45 @@ S:N:2:Spectre
 S:D:B:Spectres only partially exist in the mortal world and so they can
 S:D:B:pass through walls. They are somewhat physically weak.
 S:S:-5:1:1:2:-3:-6:-3:105
-S:K:2:8:7:2:2:7:-5:-2
 S:P:-4:80:3
-S:M:50:15:0:0:-10:-5:0:0:-10:-5
 S:E:0:0:0:0:0:0
-S:A:Human | Half-Elf | Elf | Hobbit | Gnome | Dwarf | 
-S:A:Orc | Troll | Dunadan | High-Elf | Half-Ogre | Beorning | Easterling | 
-S:A:Druadan | Petty-Dwarf | Dark-Elf | RohanKnight | Yeek | Wood-Elf | 
-S:C:F:Warrior | Archer
-S:G:UNDEAD | NO_CUT | NO_FOOD | SEMI_WRAITH | NO_SUBRACE_CHANGE
+S:A:Beorning
+S:A:Dark-Elf
+S:A:Druadan
+S:A:Dunadan
+S:A:Dwarf
+S:A:Easterling
+S:A:Elf
+S:A:Gnome
+S:A:Half-Elf
+S:A:Half-Ogre
+S:A:High-Elf
+S:A:Hobbit
+S:A:Human
+S:A:Orc
+S:A:Petty-Dwarf
+S:A:RohanKnight
+S:A:Troll
+S:A:Wood-Elf
+S:A:Yeek
+S:C:F:Archer
+S:C:F:Warrior
+S:G:NO_CUT
+S:G:NO_FOOD
+S:G:NO_SUBRACE_CHANGE
+S:G:SEMI_WRAITH
+S:G:UNDEAD
 S:R:1:0
-S:F:SEE_INVIS | HOLD_LIFE | 
-S:F:SLOW_DIGEST | RES_COLD | RES_POIS | RES_NETHER | 
+S:F:HOLD_LIFE
+S:F:RES_COLD
+S:F:RES_NETHER
+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
 
@@ -1735,70 +1707,106 @@ S:N:3:Skeleton
 S:D:B:Yet an other kind of undead. Their physical 'body' is not very vulnerable
 S:D:B:to sharp things.
 S:S:0:-2:-2:0:1:-4:-3:70
-S:K:-5:-5:5:-1:-1:8:8:0
 S:P:0:45:1
-S:M:50:15:0:0:-10:-5:0:0:-10:-5
 S:E:0:0:0:0:0:0
-S:A:Human | Half-Elf | Elf | Hobbit | Gnome | Dwarf | 
-S:A:Orc | Troll | Dunadan | High-Elf | Half-Ogre | Beorning | Easterling | 
-S:A:Druadan | Petty-Dwarf | Dark-Elf | RohanKnight | Yeek | Wood-Elf | 
-S:G:UNDEAD | NO_CUT | NO_FOOD | NO_SUBRACE_CHANGE
+S:A:Beorning
+S:A:Dark-Elf
+S:A:Druadan
+S:A:Dunadan
+S:A:Dwarf
+S:A:Easterling
+S:A:Elf
+S:A:Gnome
+S:A:Half-Elf
+S:A:Half-Ogre
+S:A:High-Elf
+S:A:Hobbit
+S:A:Human
+S:A:Orc
+S:A:Petty-Dwarf
+S:A:RohanKnight
+S:A:Troll
+S:A:Wood-Elf
+S:A:Yeek
+S:G:NO_CUT
+S:G:NO_FOOD
+S:G:NO_SUBRACE_CHANGE
+S:G:UNDEAD
 S:R:1:0
-S:F:SEE_INVIS | HOLD_LIFE | 
-S:F:RES_POIS | RES_SHARDS | 
+S:F:HOLD_LIFE
+S:F:RES_POIS
+S:F:RES_SHARDS
+S:F:SEE_INVIS
 S:R:10:0
-S:F:RES_COLD | 
+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
 
 S:N:4:Zombie
 S:D:B:Strong and dumb is a zombie.
 S:S:2:-6:-6:1:4:-5:-4:70
-S:K:-2:-2:5:-1:-1:2:5:0
 S:P:3:45:1
-S:M:50:15:0:0:0:0:0:0:0:0
 S:E:0:0:0:0:0:0
-S:A:Human | Half-Elf | Elf | Hobbit | Gnome | Dwarf | 
-S:A:Orc | Troll | Dunadan | High-Elf | Half-Ogre | Beorning | Easterling | 
-S:A:Druadan | Petty-Dwarf | Dark-Elf | RohanKnight | Yeek | Wood-Elf | 
+S:A:Beorning
+S:A:Dark-Elf
+S:A:Druadan
+S:A:Dunadan
+S:A:Dwarf
+S:A:Easterling
+S:A:Elf
+S:A:Gnome
+S:A:Half-Elf
+S:A:Half-Ogre
+S:A:High-Elf
+S:A:Hobbit
+S:A:Human
+S:A:Orc
+S:A:Petty-Dwarf
+S:A:RohanKnight
+S:A:Troll
+S:A:Wood-Elf
+S:A:Yeek
 S:C:F:Mage
-S:G:UNDEAD | NO_FOOD | NO_SUBRACE_CHANGE
+S:G:NO_FOOD
+S:G:NO_SUBRACE_CHANGE
+S:G:UNDEAD
 S:R:1:0
-S:F:SEE_INVIS | HOLD_LIFE | 
-S:F:SLOW_DIGEST | RES_POIS | 
+S:F:HOLD_LIFE
+S:F:RES_POIS
+S:F:SEE_INVIS
+S:F:SLOW_DIGEST
 S:R:5:0
-S:F:RES_COLD | 
+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
 
 S:N:5:Barbarian
 S:D:A:Hardy members of their race, they are strong fighters but poor spellcasters.
 S:S:2:-3:-2:1:1:-3:1:50
-S:K:-2:-10:2:-2:0:1:12:5
 S:P:1:25:0
-S:M:0:0:0:0:0:0:0:0:0:0
 S:E:0:0:0:0:0:0
-S:A:Human | Dwarf | Orc | Troll | Half-Ogre | Beorning | Druadan | Easterling
+S:A:Beorning
+S:A:Druadan
+S:A:Dwarf
+S:A:Easterling
+S:A:Half-Ogre
+S:A:Human
+S:A:Orc
+S:A:Troll
 S:C:F:Mage
 S:R:10:0
-S:F:RES_FEAR | 
-S:k:-200:+000:Disarming
+S:F:RES_FEAR
 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
 
@@ -1806,34 +1814,53 @@ S:N:6:Hermit
 S:D:A:Through years of isolation hermits can manage to increase their mana
 S:D:A:reserves but at the cost of an increased physical weakness.
 S:S:-3:1:1:-3:-3:1:0:120
-S:K:5:10:5:3:4:10:-5:-5
 S:P:-3:20:1
-S:M:0:0:0:0:0:0:0:0:0:0
 S:E:0:0:0:0:0:0
-S:A:Human | Half-Elf | Elf | Hobbit | Gnome | Dwarf |
-S:A:Dunadan | High-Elf | Petty-Dwarf | Dark-Elf | Ent | RohanKnight | 
-S:A:Eagle | Yeek | Wood-Elf | Maia | 
-S:C:F:Warrior | Archer
-S:k:+500:+000:Disarming
+S:A:Dark-Elf
+S:A:Dunadan
+S:A:Dwarf
+S:A:Eagle
+S:A:Elf
+S:A:Ent
+S:A:Gnome
+S:A:Half-Elf
+S:A:High-Elf
+S:A:Hobbit
+S:A:Human
+S:A:Maia
+S:A:Petty-Dwarf
+S:A:RohanKnight
+S:A:Wood-Elf
+S:A:Yeek
+S:C:F:Archer
+S:C:F:Warrior
 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
 
 S:N:8:LostSoul
 S:D:A:In some very rare occasions souls can come back from the Halls of Mandos.
 S:S:0:0:0:0:0:0:0:100
-S:K:0:0:0:0:0:0:0:0
 S:P:0:0:0
-S:M:0:0:0:0:0:0:0:0:0:0
 S:E:0:0:0:0:0:0
-S:G:ASTRAL | NO_SUBRACE_CHANGE
+S:G:ASTRAL
+S:G:NO_SUBRACE_CHANGE
 S:R:1:0
 S:F:SEE_INVIS
-S:A:Half-Elf | Elf | High-Elf | Dark-Elf | Wood-Elf | Maia | 
-S:A:Hobbit | Gnome | Dwarf | Petty-Dwarf | Ent | Eagle |
+S:A:Dark-Elf
+S:A:Dwarf
+S:A:Eagle
+S:A:Elf
+S:A:Ent
+S:A:Gnome
+S:A:Half-Elf
+S:A:High-Elf
+S:A:Hobbit
+S:A:Maia
+S:A:Petty-Dwarf
+S:A:Wood-Elf
 S:O:70:32:25d2
 S:O:70:12:25d3
 
@@ -1841,9 +1868,7 @@ S:O:70:12:25d3
 S:N:9:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 S:D:A:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 S:S:0:0:0:0:0:0:0:100
-S:K:0:0:0:0:0:0:0:0
 S:P:0:0:0
-S:M:0:0:0:0:0:0:0:0:0:0
 S:E:0:0:0:0:0:0
 
 ### Dragon subraces added for Theme
@@ -1854,15 +1879,16 @@ S:D:B:They are especially resistant to fire and with time learn
 S:D:B:to resist its effects entirely. They are stronger than other
 S:D:B:dragons and can prevent attacks from sapping their strength.
 S:S:3:0:0:0:0:0:0:100
-S:K:0:0:0:0:-2:2:5:0
 S:P:0:0:1
-S:M:0:0:0:0:0:0:0:0:0:0
 S:E:0:0:0:0:0:0
-S:A:Dragon 
-S:C:F:Warrior | Archer
+S:A:Dragon
+S:C:F:Archer
+S:C:F:Warrior
 S:G:NO_SUBRACE_CHANGE
 S:R:1:0
-S:F:SUST_STR | SH_FIRE | RES_FIRE
+S:F:RES_FIRE
+S:F:SH_FIRE
+S:F:SUST_STR
 S:R:5:1
 S:F:STR
 S:R:10:1
@@ -1878,7 +1904,8 @@ S:F:STR
 S:R:45:0
 S:F:IM_FIRE
 S:R:50:1
-S:F:STR | CLIMB
+S:F:CLIMB
+S:F:STR
 S:Z:fire breath
 S:k:+1000:+600:Fire
 
@@ -1888,15 +1915,15 @@ S:D:B:liquid. They are especially resistant to acid and with time
 S:D:B:will come to resist its effects entirely. They look more  
 S:D:B:beautiful than other dragons and are expert at protecting that.
 S:S:0:0:0:0:0:3:0:100
-S:K:2:0:1:0:0:0:0:0
 S:P:0:0:0
-S:M:0:0:0:0:0:0:0:0:0:0
 S:E:0:0:0:0:0:0
-S:A:Dragon 
-S:C:F:Archer | Warrior
+S:A:Dragon
+S:C:F:Archer
+S:C:F:Warrior
 S:G:NO_SUBRACE_CHANGE
 S:R:1:0
-S:F:SUST_CHR | | RES_ACID
+S:F:RES_ACID
+S:F:SUST_CHR
 S:R:5:1
 S:F:CHR
 S:R:10:1
@@ -1912,7 +1939,8 @@ S:F:CHR
 S:R:45:0
 S:F:IM_ACID
 S:R:50:1
-S:F:CHR | CLIMB
+S:F:CHR
+S:F:CLIMB
 S:Z:spit acid
 S:k:+1000:+600:Water
 
@@ -1922,15 +1950,15 @@ S:D:B:vapours. They are especially resistant to poison and resist
 S:D:B:poison attacks exceptionally well. They are healthier and sturdier
 S:D:B:than other dragons and are not as susceptible to diseases.
 S:S:0:0:0:0:3:0:0:100
-S:K:0:0:2:0:0:0:0:0
 S:P:0:0:0
-S:M:0:0:0:0:0:0:0:0:0:0
 S:E:0:0:0:0:0:0
-S:A:Dragon 
-S:C:F:Archer | Warrior
+S:A:Dragon
+S:C:F:Archer
+S:C:F:Warrior
 S:G:NO_SUBRACE_CHANGE
 S:R:1:0
-S:F:SUST_CON | RES_POIS
+S:F:RES_POIS
+S:F:SUST_CON
 S:R:5:1
 S:F:CON
 S:R:10:1
@@ -1944,7 +1972,8 @@ S:F:CON
 S:R:40:1
 S:F:CON
 S:R:50:1
-S:F:CON | CLIMB
+S:F:CLIMB
+S:F:CON
 S:Z:poison dart
 S:k:+1000:+600:Air
 
@@ -1953,15 +1982,16 @@ S:D:B:These enormous creatures are wreathed in living lightning.
 S:D:B:They are especially nimble and agile, and their dexterity  
 S:D:B:is not sapped easily.
 S:S:0:0:0:3:0:0:0:100
-S:K:3:0:0:2:1:0:0:0
 S:P:0:0:1
-S:M:0:0:0:0:0:0:0:0:0:0
 S:E:0:0:0:0:0:0
-S:A:Dragon 
-S:C:F:Archer | Warrior
+S:A:Dragon
+S:C:F:Archer
+S:C:F:Warrior
 S:G:NO_SUBRACE_CHANGE
 S:R:1:0
-S:F:SUST_DEX | RES_ELEC | SH_ELEC
+S:F:RES_ELEC
+S:F:SH_ELEC
+S:F:SUST_DEX
 S:R:5:1
 S:F:DEX
 S:R:10:1
@@ -1977,7 +2007,8 @@ S:F:DEX
 S:R:45:0
 S:F:IM_ELEC
 S:R:50:1
-S:F:DEX | CLIMB
+S:F:CLIMB
+S:F:DEX
 S:Z:dazzle
 S:k:+1000:+600:Earth
 
@@ -1986,15 +2017,16 @@ S:D:B:These enormous dragons look like they'd been hewed from ice.
 S:D:B:They are the most cunning and calculating among their kind,   
 S:D:B:and attacks against their intelligence are unlikely to succeed.
 S:S:0:3:0:0:0:0:0:100
-S:K:0:2:0:0:0:0:0:0
 S:P:0:0:0
-S:M:0:0:0:0:0:0:0:0:0:0
 S:E:0:0:0:0:0:0
-S:A:Dragon 
-S:C:F:Archer | Warrior
+S:A:Dragon
+S:C:F:Archer
+S:C:F:Warrior
 S:G:NO_SUBRACE_CHANGE
 S:R:1:0
-S:F:SUST_INT | RES_COLD | SENS_FIRE
+S:F:RES_COLD
+S:F:SENS_FIRE
+S:F:SUST_INT
 S:R:5:1
 S:F:INT
 S:R:10:1
@@ -2010,7 +2042,8 @@ S:F:INT
 S:R:45:0
 S:F:IM_COLD
 S:R:50:1
-S:F:INT | CLIMB
+S:F:CLIMB
+S:F:INT
 S:Z:cold breath
 S:k:+1000:+600:Divination
 
@@ -2020,15 +2053,17 @@ S:D:B:They are powerful undead beings and are thus wiser than other
 S:D:B:dragons. Wisdom-sapping and life-draining attacks are not 
 S:D:B:very effective against them.
 S:S:0:0:3:0:0:0:0:100
-S:K:0:0:1:5:2:2:0:0
 S:P:0:0:3
-S:M:0:0:0:0:0:0:0:0:0:0
 S:E:0:0:0:0:0:0
-S:A:Dragon 
-S:C:F:Archer | Warrior
-S:G:NO_SUBRACE_CHANGE | UNDEAD | SEMI_WRAITH
+S:A:Dragon
+S:C:F:Archer
+S:C:F:Warrior
+S:G:NO_SUBRACE_CHANGE
+S:G:SEMI_WRAITH
+S:G:UNDEAD
 S:R:1:0
-S:F:SUST_WIS | HOLD_LIFE
+S:F:HOLD_LIFE
+S:F:SUST_WIS
 S:R:5:1
 S:F:WIS
 S:R:10:1
@@ -2042,7 +2077,8 @@ S:F:WIS
 S:R:40:1
 S:F:WIS
 S:R:50:1
-S:F:WIS | CLIMB
+S:F:CLIMB
+S:F:WIS
 S:Z:chaos breath
 S:k:+1000:+600:Meta
 
@@ -2054,11 +2090,9 @@ S:D:A:quick, scurrying feet, and winglike appendages on their
 S:D:A:slick, black backs. They are somewhat weak and sickly,
 S:D:A:but sly, cunning, and agile.
 S:S:-1:1:1:1:-1:-2:0:100
-S:K:2:0:1:2:2:20:0:0
 S:P:1:20:1
-S:M:14:6:72:6:180:25:66:4:150:20
 S:E:1:1:1:2:1:1
-S:A:Demon 
+S:A:Demon
 S:C:F:Priest
 S:G:NO_SUBRACE_CHANGE
 S:R:1:0
@@ -2074,8 +2108,6 @@ S:F:SPEED
 S:Z:poison dart
 R:k:-200:+000:Weaponmastery
 R:k:+1000:+300:Archery
-R:k:+1000:+000:Sneakiness
-R:k:+500:+200:Disarming
 S:k:+1000:+500:Stealth
 R:k:+050:+000:Magic-Device
 S:k:+0:+200:Magic
@@ -2087,16 +2119,17 @@ S:D:A:These birdlike demons' wings flap with blinding speed.
 S:D:A:They are somewhat physically weak, but may befuddle enemies
 S:D:A:so that they believe they'd never seen anything so beautiful.
 S:S:-2:0:0:0:0:+3:0:100
-S:K:0:0:1:-2:0:10:0:0
 S:P:1:0:1
-S:M:14:6:72:6:180:25:66:4:150:20
 # R:E:weapons:torso:arms:finger:head:legs
 S:E:0:1:2:4:1:1
 S:A:Demon
-S:C:F:Warrior | Archer | Priest
+S:C:F:Archer
+S:C:F:Priest
+S:C:F:Warrior
 S:G:NO_SUBRACE_CHANGE
 S:R:1:0
-S:F:SUST_CHR | FLY
+S:F:FLY
+S:F:SUST_CHR
 S:R:5:0
 S:F:FREE_ACT
 S:R:10:0
@@ -2105,8 +2138,6 @@ S:R:50:0
 S:F:CLIMB
 R:k:-400:+000:Weaponmastery
 R:k:+000:+300:Archery
-R:k:+1000:+000:Sneakiness
-R:k:+500:+100:Disarming
 S:k:+500:+200:Stealth
 S:k:+0:+200:Magic
 S:k:+1000:+300:Mind
@@ -2117,37 +2148,34 @@ S:D:A:These doglike demons are one of the lowest forms of Morgoth's
 S:D:A:corrupted races, though their sense of smell is uncanny, and 
 S:D:A:increases with experience.
 S:S:-1:0:0:0:-1:0:0:100
-S:K:2:0:2:0:5:30:0:0
 S:P:0:-10:2
-S:M:14:6:72:6:180:25:66:4:150:20
 S:E:1:1:1:2:1:1
-S:A:Demon 
+S:A:Demon
 S:C:F:Priest
 S:G:NO_SUBRACE_CHANGE
 S:R:5:0
 S:F:ESP_ANIMAL
 S:R:10:1
-S:F:ESP_ORC | SEARCH
+S:F:ESP_ORC
 S:R:15:0
 S:F:ESP_TROLL
 S:R:20:1
-S:F:ESP_DRAGON | SEARCH
+S:F:ESP_DRAGON
 S:R:25:0
 S:F:ESP_UNDEAD
 S:R:30:1
-S:F:ESP_NONLIVING | SEARCH
+S:F:ESP_NONLIVING
 S:R:35:0
 S:F:ESP_EVIL
 S:R:40:1
-S:F:ESP_GOOD | SEARCH
+S:F:ESP_GOOD
 S:R:45:0
 S:F:ESP_DEMON
 S:R:50:1
-S:F:ESP_ALL | SEARCH
+S:F:ESP_ALL
 S:Z:smell monsters
 S:Z:smell metal
 R:k:+500:+300:Stealth
-R:k:+500:+200:Sneakiness
 R:k:+000:+000:Weaponmastery
 R:k:+000:+000:Archery
 
@@ -2157,31 +2185,36 @@ S:D:A:They are clumsy and dumb, but very strong and stout, and
 S:D:A:resist the elements fairly well.
 S:S:2:-1:-2:-2:2:-1:0:100
 # S:K:dis:dev:sav:stl:srh:fos:thn:thb
-S:K:-1:0:0:-8:-2:-10:5:0
 S:P:2:20:0
-S:M:14:6:72:6:180:25:66:4:150:20
 S:E:1:1:1:2:1:1
-S:A:Demon 
-S:C:F:Priest | Mage
-S:G:NO_SUBRACE_CHANGE | NO_STUN
+S:A:Demon
+S:C:F:Mage
+S:C:F:Priest
+S:G:NO_STUN
+S:G:NO_SUBRACE_CHANGE
 S:R:1:0
 S:F:RES_POIS
 S:R:10:1
-S:F:RES_FIRE | TUNNEL
+S:F:RES_FIRE
+S:F:TUNNEL
 S:R:20:1
-S:F:RES_ACID | TUNNEL
+S:F:RES_ACID
+S:F:TUNNEL
 S:R:30:1
-S:F:RES_ELEC | TUNNEL
+S:F:RES_ELEC
+S:F:TUNNEL
 S:R:40:1
-S:F:RES_COLD | TUNNEL
+S:F:RES_COLD
+S:F:TUNNEL
 S:R:45:1
-S:F:RES_SHARDS | TUNNEL
+S:F:RES_SHARDS
+S:F:TUNNEL
 S:R:50:1
-S:F:RES_SOUND | TUNNEL
+S:F:RES_SOUND
+S:F:TUNNEL
 S:k:+1000:+500:Boulder-throwing
 S:Z:eat rock
 R:k:-800:+000:Stealth
-R:k:-500:+000:Sneakiness
 R:k:-500:+000:Archery
 
 S:N:20:(Caborrog)
@@ -2191,13 +2224,14 @@ S:D:A:As a result of their corruption, they develop a strange
 S:D:A:protective layer around them as they mature.
 S:S:-1:2:1:0:0:-3:0:100
 # S:K:dis:dev:sav:stl:srh:fos:thn:thb
-S:K:0:0:1:-10:2:10:0:0
 S:P:2:10:0
-S:M:14:6:72:6:180:25:66:4:150:20
 S:E:1:1:1:2:1:1
 S:A:Demon
-S:C:F:Archer | Priest
-S:G:NO_SUBRACE_CHANGE | NO_STUN | AC_LEVEL
+S:C:F:Archer
+S:C:F:Priest
+S:G:AC_LEVEL
+S:G:NO_STUN
+S:G:NO_SUBRACE_CHANGE
 S:R:1:0
 S:F:RES_POIS
 S:R:1:7
@@ -2214,7 +2248,6 @@ S:k:+0:+300:Conveyance
 S:k:+0:+300:Temporal
 S:Z:panic hit
 R:k:-1000:+000:Stealth
-R:k:-500:+000:Sneakiness
 
 S:N:21:(Draugrog)
 S:D:A:These doglike demons are of a higher order than the Huroeg, 
@@ -2222,33 +2255,31 @@ S:D:A:they learn more quickly and have more sophisticated magical
 S:D:A:powers. Their arrogant snarling, however, makes them quite
 S:D:A:unstealthy.
 S:S:1:1:1:1:1:-1:0:100
-S:K:2:0:2:-20:5:30:0:0
 S:P:0:-20:2
-S:M:14:6:72:6:180:25:66:4:150:20
 S:E:1:1:1:2:1:1
-S:A:Demon 
+S:A:Demon
 S:C:F:Priest
 S:G:NO_SUBRACE_CHANGE
 S:R:4:0
 S:F:ESP_ANIMAL
 S:R:8:1
-S:F:ESP_ORC | SEARCH
+S:F:ESP_ORC
 S:R:12:0
 S:F:ESP_TROLL
 S:R:16:1
-S:F:ESP_DRAGON | SEARCH
+S:F:ESP_DRAGON
 S:R:20:0
 S:F:ESP_UNDEAD
 S:R:24:1
-S:F:ESP_NONLIVING | SEARCH
+S:F:ESP_NONLIVING
 S:R:28:0
 S:F:ESP_EVIL
 S:R:32:1
-S:F:ESP_GOOD | SEARCH
+S:F:ESP_GOOD
 S:R:36:0
 S:F:ESP_DEMON
 S:R:40:1
-S:F:ESP_ALL | SEARCH
+S:F:ESP_ALL
 S:R:50:0
 S:F:PRECOGNITION
 S:Z:smell monsters
@@ -2257,7 +2288,6 @@ S:k:+0:+200:Magic
 S:k:+0:+200:Spirituality
 S:k:+1000:+500:Mindcraft
 R:k:-10000:+000:Stealth
-R:k:-500:+200:Sneakiness
 R:k:+300:+000:Weaponmastery
 R:k:+200:+000:Archery
 
@@ -2268,61 +2298,114 @@ S:D:A:These slithering snakelike forms lack many physical
 S:D:A:advantages, but are no less deadly for it. Their magical
 S:D:A:abilities, stealth, and cunning are legendary.
 S:S:-3:5:5:5:-1:-6:0:200
-S:K:5:5:5:10:5:50:0:0
 S:P:2:40:3
-S:M:14:6:72:6:180:25:66:4:150:20
 S:E:0:1:0:1:1:0
 S:A:Demon
-S:C:F:Warrior | Archer | Priest | Rogue
+S:C:F:Archer
+S:C:F:Priest
+S:C:F:Rogue
+S:C:F:Warrior
 S:G:NO_SUBRACE_CHANGE
 S:R:1:0
-S:F:FEATHER | FREE_ACT | LITE1 | RES_POIS | 
+S:F:FEATHER
+S:F:FREE_ACT
+S:F:LITE1
+S:F:RES_POIS
 S:R:1:0
-S:F:REGEN | SEE_INVIS | SLOW_DIGEST | SUST_CHR |
+S:F:REGEN
+S:F:SEE_INVIS
+S:F:SLOW_DIGEST
+S:F:SUST_CHR
 S:R:1:10
-S:F:SPEED |
+S:F:SPEED
 S:R:5:0
-S:F:ESP_ANIMAL | RES_FIRE | RES_COLD | SUST_WIS |
+S:F:ESP_ANIMAL
+S:F:RES_COLD
+S:F:RES_FIRE
+S:F:SUST_WIS
 S:R:5:1
-S:F:LUCK | SPEED |
+S:F:LUCK
+S:F:SPEED
 S:R:10:0
-S:F:ESP_ORC | RES_ELEC | RES_ACID | SUST_INT | WATER_BREATH |
+S:F:ESP_ORC
+S:F:RES_ACID
+S:F:RES_ELEC
+S:F:SUST_INT
+S:F:WATER_BREATH
 S:R:10:1
-S:F:LUCK | SPEED |
+S:F:LUCK
+S:F:SPEED
 S:R:15:0
-S:F:ESP_TROLL | FLY | RES_CONF | RES_LITE | SUST_CON |
+S:F:ESP_TROLL
+S:F:FLY
+S:F:RES_CONF
+S:F:RES_LITE
+S:F:SUST_CON
 S:R:15:1
-S:F:LUCK | SPEED | SPELL |
+S:F:LUCK
+S:F:SPEED
+S:F:SPELL
 S:R:20:0
-S:F:ESP_DRAGON | ESP_GIANT | LITE2 | RES_BLIND | SUST_DEX |
+S:F:ESP_DRAGON
+S:F:ESP_GIANT
+S:F:LITE2
+S:F:RES_BLIND
+S:F:SUST_DEX
 S:R:20:1
-S:F:LUCK | SPEED |
+S:F:LUCK
+S:F:SPEED
 S:R:25:0
-S:F:ESP_UNDEAD | ESP_NONLIVING | RES_DISEN | RES_CHAOS | SUST_STR |
+S:F:ESP_NONLIVING
+S:F:ESP_UNDEAD
+S:F:RES_CHAOS
+S:F:RES_DISEN
+S:F:SUST_STR
 S:R:25:1
-S:F:LUCK | SPEED |
+S:F:LUCK
+S:F:SPEED
 S:R:30:0
-S:F:ESP_EVIL | ESP_DEMON | RES_SOUND |
+S:F:ESP_DEMON
+S:F:ESP_EVIL
+S:F:RES_SOUND
 S:R:30:1
-S:F:LUCK | SPEED | SPELL |
+S:F:LUCK
+S:F:SPEED
+S:F:SPELL
 S:R:35:0
-S:F:CLIMB | ESP_GOOD | ESP_THUNDERLORD | RES_SHARDS |
+S:F:CLIMB
+S:F:ESP_GOOD
+S:F:ESP_THUNDERLORD
+S:F:RES_SHARDS
 S:R:35:1
-S:F:LUCK | SPEED |
+S:F:LUCK
+S:F:SPEED
 S:R:40:0
-S:F:ESP_UNIQUE | LITE3 | PRECOGNITION | RES_NEXUS | RES_NETHER |
+S:F:ESP_UNIQUE
+S:F:LITE3
+S:F:PRECOGNITION
+S:F:RES_NETHER
+S:F:RES_NEXUS
 S:R:40:1
-S:F:LUCK | SPEED |
+S:F:LUCK
+S:F:SPEED
 S:R:45:0
-S:F:ESP_ALL | IM_ACID | IM_ELEC | IM_FIRE | IM_COLD | MAGIC_BREATH |
+S:F:ESP_ALL
+S:F:IM_ACID
+S:F:IM_COLD
+S:F:IM_ELEC
+S:F:IM_FIRE
+S:F:MAGIC_BREATH
 S:R:45:1
-S:F:SPEED | SPELL |
+S:F:SPEED
+S:F:SPELL
 S:R:50:0
-S:F:IM_NETHER | REFLECT | WRAITH |
+S:F:IM_NETHER
+S:F:REFLECT
+S:F:WRAITH
 S:R:50:1
-S:F:LUCK | SPEED |
+S:F:LUCK
+S:F:SPEED
 R:k:+25000:+500:Stealth
-R:k:+2000:+200:Sneakiness
 R:k:+2000:+300:Magic-Device
 
 S:N:23:(Limrog)
@@ -2330,11 +2413,9 @@ S:D:A:Humanoid creatures with gill slits at the necks,
 S:D:A:they seem to flit in and out of existence. 
 S:S:-2:1:1:3:-1:-1:2:150
 # S:K:dis:dev:sav:stl:srh:fos:thn:thb
-S:K:2:2:2:2:2:30:0:0
 S:P:1:50:2
-S:M:14:6:72:6:180:25:66:4:150:20
 S:E:1:1:1:2:1:1
-S:A:Demon 
+S:A:Demon
 S:C:F:Priest
 S:G:NO_SUBRACE_CHANGE
 S:R:1:0
@@ -2342,8 +2423,6 @@ S:F:WATER_BREATH
 S:R:50:0
 S:F:MAGIC_BREATH
 R:k:+3000:+300:Stealth
-R:k:+500:+200:Sneakiness
-R:k:+2000:+200:Disarming
 S:k:+0:+200:Magic
 S:k:+0:+500:Conveyance
 S:k:+0:+500:Temporal
@@ -2358,25 +2437,25 @@ S:D:A:These creatures resemble lions standing on two legs.
 S:D:A:Very strong and smart, they instill fear in all who 
 S:D:A:encounter them and are afraid of nothing.
 S:S:2:1:1:-1:2:1:1:100
-S:K:0:0:4:-3:0:10:10:10
 S:P:2:30:0
-S:M:14:6:72:6:180:25:66:4:150:20
 S:E:1:1:1:2:1:1
-S:A:Demon 
-S:C:F:Priest | Mage
+S:A:Demon
+S:C:F:Mage
+S:C:F:Priest
 S:G:NO_SUBRACE_CHANGE
 S:R:5:0
-S:F:RES_FIRE | RES_COLD
+S:F:RES_COLD
+S:F:RES_FIRE
 S:R:10:0
-S:F:RES_ELEC | RES_ACID
+S:F:RES_ACID
+S:F:RES_ELEC
 S:R:15:0
-S:F:RES_POIS | RES_CONF
+S:F:RES_CONF
+S:F:RES_POIS
 S:k:+1000:+100:Combat
 S:k:+1000:+100:Weaponmastery
 R:k:+1000:+100:Archery
 R:k:-300:+000:Stealth
-R:k:+500:+200:Sneakiness
-R:k:+500:+100:Disarming
 S:Z:scare monster
 S:Z:berserk
 
@@ -2386,470 +2465,20 @@ S:D:A:They can be equally skilled in combat and
 S:D:A:magic; and they can temporarily assume the 
 S:D:A:forms of true Balrogs.
 S:S:1:1:1:1:1:1:0:150
-S:K:1:1:1:1:1:20:15:10
 S:P:3:50:2
-S:M:14:6:72:6:180:25:66:4:150:20
 S:E:1:1:1:2:1:1
-S:A:Demon 
-S:C:F:Priest | Loremaster | Rogue
+S:A:Demon
+S:C:F:Loremaster
+S:C:F:Priest
+S:C:F:Rogue
 S:G:NO_SUBRACE_CHANGE
 S:R:1:0
-S:F:IM_FIRE | SH_FIRE
+S:F:IM_FIRE
+S:F:SH_FIRE
 S:k:+0:+300:Combat
 S:k:+0:+300:Magic
 S:Z:turn into a Balrog
 R:k:+1000:+300:Weaponmastery
 R:k:+1000:+300:Archery
 R:k:+1000:+200:Stealth
-R:k:+500:+200:Sneakiness
-R:k:+1000:+200:Disarming
 R:k:+500:+200:Magic
-
-##############################################################################
-##############################################################################
-##############################################################################
-##############################################################################
-# H: Race history
-# H:index:chance:chart:next chart:social class bonus:desc
-
-# Dunadan, Human: 1 -> 2 -> 3 -> 50 -> 51 -> 52 -> 53.
-# RohanKnight:   84 -> 85 -> 50 -> 51 -> 52 -> 53.
-# Half-Ogre:     74 -> 20 -> 2 -> 3 -> 50 -> 51 -> 52 -> 53.
-# Beorning:      75 -> 76 -> 20 -> 2 -> 3 -> 50 -> 51 -> 52 -> 53.
-# Half-elf:       4 -> 1 -> 2 -> 3 -> 50 -> 51 -> 52 -> 53.
-# Elf,  Wood-elf: 5 -> 6 -> 9 -> 54 -> 55 -> 56.
-# High-elf:       7 -> 8 -> 9 -> 54 -> 55 -> 56.
-# Dark-elf:      69 -> 70 -> 71 -> 72 -> 73.
-# Hobbit:        10 -> 11 -> 3 -> 50 -> 51 -> 52 -> 53.
-# Gnome:         13 -> 14 -> 3 -> 50 -> 51 -> 52 -> 53.
-# Dwarf:         16 -> 17 -> 18 -> 57 -> 58 -> 59 -> 60 -> 61.
-# Petty-Dwarf:   87 -> 88 -> 18 -> 57 -> 58 -> 59 -> 60 -> 61.
-# Eagle:   	     89 -> 90.
-# Maia:          91 -> 92 -> 93 -> 94.
-# Ent:           95 -> 96.
-# Troll:         22 -> 23 -> 24 -> 62 -> 63 -> 64 -> 65 -> 66.
-# Orc            25 -> 26 -> 27 -> 28 -> 80 -> 81 -> 65 -> 66.
-# Yeek:          29 -> 3 -> 50 -> 51 -> 52 -> 53.
-#   (not used:   78 -> 79 -> 80 -> 81 -> 65 -> 66.)
-# Druadan:       82 -> 83 -> 71 -> 72 -> 73.
-# Dragon:	100 -> 101 -> 102 -> 103 -> 104.
-# Easterling:	105 -> 106 -> 107 -> 108.
-# Demon:	109 -> 110 -> 111 -> 112.
-
-H:0:10:1:2:25:You are the illegitimate and unacknowledged child 
-H:1:20:1:2:35:You are the illegitimate but acknowledged child 
-H:2:95:1:2:45:You are one of several children 
-H:3:100:1:2:50:You are the first child 
-
-H:4:40:2:3:65:of a Serf.  
-H:5:65:2:3:80:of a Yeoman.  
-H:6:80:2:3:90:of a Townsman.  
-H:7:90:2:3:105:of a Guildsman.  
-H:8:96:2:3:120:of a Landed Knight.  
-H:9:99:2:3:130:of a Noble Lord.  
-H:10:100:2:3:140:of the Royal Blood Line.  
-
-H:11:20:3:50:20:You are the black sheep of the family.  
-H:12:80:3:50:55:You are a credit to the family.  
-H:13:100:3:50:60:You are a well-liked child.  
-
-H:14:25:4:1:40:Your mother was of the Avari.  
-H:15:40:4:1:50:Your father was of the Avari.  
-H:16:65:4:1:60:Your mother was of the Nandor.  
-H:17:80:4:1:60:Your father was of the Nandor.  
-H:18:96:4:1:70:Your mother was of the Sindar.  
-H:19:99:4:1:70:Your father was of the Sindar.  
-H:20:100:4:1:100:Your ancestry traces to Elrond.  
-
-H:21:60:5:6:50:You are one of several children 
-H:22:100:5:6:55:You are the only child 
-
-H:23:40:6:9:40:of an Avarin 
-H:24:70:6:9:50:of a Nandorin 
-H:25:100:6:9:60:of a Sindarin 
-
-H:26:60:7:8:50:You are one of several children 
-H:27:100:7:8:55:You are the only child 
-
-H:28:75:8:9:50:of a Telerin 
-H:29:95:8:9:55:of a Noldorin 
-H:30:100:8:9:60:of a Vanyarin 
-
-H:31:40:9:54:80:Ranger.  
-H:32:70:9:54:90:Archer.  
-H:33:87:9:54:110:Warrior.  
-H:34:95:9:54:125:Mage.  
-H:35:99:9:54:140:Prince.  
-H:36:100:9:54:145:King.  
-
-H:37:85:10:11:45:You are one of several children of a Hobbit 
-H:38:100:10:11:55:You are the only child of a Hobbit 
-
-H:39:20:11:3:55:Bum.  
-H:40:30:11:3:80:Tavern Owner.  
-H:41:40:11:3:90:Miller.  
-H:42:50:11:3:100:Home Owner.  
-H:43:80:11:3:110:Burglar.  
-H:44:95:11:3:115:Warrior.  
-H:45:99:11:3:125:Mage.  
-H:46:100:11:3:140:Clan Elder.  
-
-H:47:85:13:14:45:You are one of several children of a Gnome 
-H:48:100:13:14:55:You are the only child of a Gnome 
-
-H:49:20:14:3:55:Beggar.  
-H:50:50:14:3:70:Braggart.  
-H:51:75:14:3:85:Prankster.  
-H:52:95:14:3:100:Warrior.  
-H:53:100:14:3:125:Mage.  
-
-H:54:25:16:17:40:You are one of two children of a Dwarven 
-H:55:100:16:17:50:You are the only child of a Dwarven 
-
-H:56:10:17:18:60:Thief.  
-H:57:35:17:18:80:Smith.  
-H:58:75:17:18:90:Miner.  
-H:59:90:17:18:110:Warrior.  
-H:60:99:17:18:130:Priest.  
-H:61:100:17:18:150:King.  
-
-H:62:15:18:57:10:You are the black sheep of the family.  
-H:63:85:18:57:50:You are a credit to the family.  
-H:64:100:18:57:55:You are a well liked child.  
-
-H:65:100:20:2:50:You are the adopted child 
-
-H:66:100:22:23:50:You are the offspring of a 
-
-H:67:30:23:24:20:Forest-Troll 
-H:68:60:23:24:25:Cave-Troll 
-H:69:75:23:24:30:Hill-Troll 
-H:70:90:23:24:35:Stone-Troll 
-H:71:95:23:24:40:Snow-Troll 
-H:72:100:23:24:45:Water-Troll 
-
-H:73:25:24:62:50:Worker.  
-H:74:95:24:62:55:Warrior.  
-H:75:99:24:62:65:Shaman.  
-H:76:100:24:62:80:Clan Chief.  
-
-H:77:100:25:26:50:You are one of several children of 
-
-H:78:40:26:27:40:a Snaga 
-H:79:80:26:27:50:an Orc 
-H:80:100:26:27:60:an Uruk 
-
-H:81:30:27:28:20:Slave 
-H:82:60:27:28:50:Archer 
-H:83:90:27:28:60:Warrior 
-H:84:95:27:28:80:Shaman 
-H:85:100:27:28:100:Chieftain 
-
-H:86:30:28:80:50:from the Misty Mountains.  
-H:87:60:28:80:50:from the Grey Mountains.  
-H:88:90:28:80:70:from the orc-hold of Mount Gundabad.  
-H:89:100:28:80:80:from the Pits of Angband.  
-
-H:90:25:29:3:50:You are one of five children of a blue Yeek.  
-H:91:75:29:3:75:You are one of five children of a brown Yeek.  
-H:92:100:29:3:100:You are one of five children of a master Yeek.  
-
-H:93:20:50:51:50:You have dark brown eyes, 
-H:94:60:50:51:50:You have brown eyes, 
-H:95:70:50:51:50:You have hazel eyes, 
-H:96:80:50:51:50:You have green eyes, 
-H:97:90:50:51:50:You have blue eyes, 
-H:98:100:50:51:50:You have blue-gray eyes, 
-
-H:99:70:51:52:50:straight 
-H:100:90:51:52:50:wavy 
-H:101:100:51:52:50:curly 
-
-H:102:30:52:53:50:black hair, 
-H:103:70:52:53:50:brown hair, 
-H:104:80:52:53:50:auburn hair, 
-H:105:90:52:53:50:red hair, 
-H:106:100:52:53:50:blond hair, 
-
-H:107:10:53:0:50:and a very dark complexion.
-H:108:30:53:0:50:and a dark complexion.
-H:109:80:53:0:50:and an average complexion.
-H:110:90:53:0:50:and a fair complexion.
-H:111:100:53:0:50:and a very fair complexion.
-
-H:112:85:54:55:50:You have light grey eyes, 
-H:113:95:54:55:50:You have light blue eyes, 
-H:114:100:54:55:50:You have light green eyes, 
-
-H:115:75:55:56:50:straight 
-H:116:100:55:56:50:wavy 
-
-H:117:75:56:0:50:black hair, and a fair complexion.
-H:118:85:56:0:50:brown hair, and a fair complexion.
-H:119:95:56:0:50:blond hair, and a fair complexion.
-H:120:100:56:0:50:silver hair, and a fair complexion.
-
-H:121:99:57:58:50:You have dark brown eyes, 
-H:122:100:57:58:60:You have glowing red eyes, 
-
-H:123:90:58:59:50:straight 
-H:124:100:58:59:50:wavy 
-
-H:125:75:59:60:50:black hair, 
-H:126:100:59:60:50:brown hair, 
-
-H:127:25:60:61:50:a one foot beard, 
-H:128:60:60:61:51:a two foot beard, 
-H:129:90:60:61:53:a three foot beard, 
-H:130:100:60:61:55:a four foot beard, 
-
-H:131:100:61:0:50:and a dark complexion.
-
-H:132:60:62:63:50:You have slime green eyes, 
-H:133:85:62:63:50:You have puke yellow eyes, 
-H:134:99:62:63:50:You have blue-bloodshot eyes, 
-H:135:100:62:63:55:You have glowing red eyes, 
-
-H:136:33:63:64:50:dirty 
-H:137:66:63:64:50:mangy 
-H:138:100:63:64:50:oily 
-
-H:139:33:64:65:50:sea-weed green hair, 
-H:140:66:64:65:50:bright red hair, 
-H:141:100:64:65:50:dark purple hair, 
-
-H:142:25:65:66:50:and green 
-H:143:50:65:66:50:and blue 
-H:144:75:65:66:50:and white 
-H:145:100:65:66:50:and black 
-
-H:146:33:66:0:50:ulcerous skin.
-H:147:66:66:0:50:scabby skin.
-H:148:100:66:0:50:leprous skin.
-
-H:149:85:69:70:45:You are one of several children of a Dark Elven 
-H:150:100:69:70:55:You are the only child of a Dark Elven 
-
-H:151:50:70:71:60:Warrior.  
-H:152:80:70:71:75:Warlock.  
-H:153:100:70:71:95:Noble.  
-
-H:154:100:71:72:50:You have black eyes, 
-
-H:155:70:72:73:50:straight 
-H:156:90:72:73:50:wavy 
-H:157:100:72:73:50:curly 
-
-H:158:100:73:0:50:black hair and a very dark complexion.
-
-H:159:25:74:20:25:Your mother was an Ogre, but it is unacknowledged.  
-H:160:100:74:20:25:Your father was an Ogre, but it is unacknowledged.  
-
-H:161:90:75:76:50:You are a descendant of Beorn to the 
-H:162:100:75:20:100:Your father was Beorn.  
-
-H:163:13:76:20:55:9th degree.  
-H:164:25:76:20:60:8th degree.  
-H:165:38:76:20:65:7th degree.  
-H:166:50:76:20:70:6th degree.  
-H:167:63:76:20:75:5th degree.  
-H:168:75:76:20:80:4th degree.  
-H:169:88:76:20:85:3rd degree.  
-H:170:100:76:20:90:2nd degree.  
-
-H:171:100:78:79:50:You are one of several children of 
-
-H:172:50:79:80:50:a Brown Yeek.  
-H:173:75:79:80:50:a Blue Yeek.  
-H:174:95:79:80:85:a Master Yeek.  
-H:175:100:79:80:120:Boldor, the King of the Yeeks.  
-
-H:176:25:80:81:50:You have pale eyes, 
-H:177:50:80:81:50:You have glowing eyes, 
-H:178:75:80:81:50:You have tiny black eyes, 
-H:179:100:80:81:50:You have shining black eyes, 
-
-H:180:20:81:65:50:no hair at all, 
-H:181:40:81:65:50:short black hair, 
-H:182:60:81:65:50:long black hair, 
-H:183:80:81:65:50:bright red hair, 
-H:184:100:81:65:50:colourless albino hair, 
-
-### Kobold histories replaced by Druadan histories
-
-H:185:100:82:83:50:You are one of several children of 
-
-H:186:40:83:71:50:a Druadan Gatherer.  
-H:187:75:83:71:55:a Druadan Hunter.  
-H:188:95:83:71:65:a Druadan Shaman.  
-H:189:100:83:71:100:Ghan-buri-Ghan.  
-
-H:190:85:84:85:45:You are one of several children 
-H:191:100:84:85:50:You are the first child 
-
-H:192:60:85:50:40:of a Serf.  
-H:193:85:85:50:55:of a Devoted Mercenary.  
-H:194:96:85:50:60:of a Landed Knight.  
-H:195:99:85:50:100:of a Marshal of the Riddermark.  
-H:196:100:85:50:120:of a King of the Mark.  
-
-H:197:100:87:88:89:You are one of several children of 
-
-H:198:30:88:18:20:a Petty-Dwarf Slave.  
-H:199:50:88:18:40:a Petty-Dwarf Thief.  
-H:200:70:88:18:60:a Petty-Dwarf Smith.  
-H:201:90:88:18:75:a Petty-Dwarf Miner.  
-H:202:95:88:18:100:a Petty-Dwarf Shaman.  
-H:203:100:88:18:100:Mim, Betrayer of Turin.  
-
-H:204:85:89:90:50:You are one of many Eagles of Manwe.  
-H:205:100:89:90:60:You are the one of the most known Eagles of Manwe.  
-
-H:206:90:90:0:100:Your back and breast are dark brown, and you have very large wings.  
-H:207:100:90:0:120:Your back and breast are dazzling white, your wings magnificent.  
-
-H:208:10:91:92:20:You are a unnoticed minion of 
-H:209:25:91:92:30:You are a minor servant of 
-H:210:45:91:92:40:You are a subject of 
-H:211:65:91:92:50:You have attached yourself to 
-H:212:85:91:92:65:You are associated with 
-H:213:95:91:92:80:You are a notable follower of 
-H:214:100:91:92:100:You are a celebrated assistant to 
-
-H:215:20:92:93:55:Nessa.  
-H:216:40:92:93:60:Vana.  
-H:217:50:92:93:65:Tulkas.  
-H:218:80:92:93:75:Mandos.  
-H:219:90:92:93:80:Nienna.  
-H:220:95:92:93:90:Varda.  
-H:221:100:92:93:95:Manwe.  
-
-H:222:100:93:94:50:In the past you dwelt on earth in the form of 
-
-H:223:25:94:0:50:various animals.
-H:224:55:94:0:55:a spirit of forest and river.
-H:225:70:94:0:60:a beneficent but unseen force.
-H:226:96:94:0:70:a wise and ancient counsellor.
-H:227:100:94:0:80:a Wizard of legend.
-
-H:228:30:95:96:30:You are of an unknown generation of the Ents.  
-H:229:40:95:96:50:You are of the third generation of the Ents.  
-H:230:60:95:96:60:You are of the second generation of the Ents.  
-H:231:100:95:96:80:You are one of the first beings who awoke on Arda.  
-
-H:232:50:96:0:50:You have green skin and inflexible members.
-H:233:100:96:0:50:You have brown skin and inflexible members.
-
-### Death Mold histories have been replaced by Dragon histories.
-
-H:234:10:100:101:30:You were born in the land of Rhun, 
-H:235:20:100:101:35:You were born in the Misty Mountains, 
-H:236:30:100:101:40:You were born in the Blue Mountains, 
-H:237:40:100:101:45:You were born in Dol Guldur, 
-H:238:50:100:101:50:You were born in Angmar, 
-H:239:60:100:101:50:You were born in Barad-dur, 
-H:240:70:100:101:55:You were born at the foot of the Orodruin, 
-H:241:80:100:101:60:You were born in Angband, 
-H:242:90:100:101:65:You were born in Utumno, 
-H:243:100:100:101:70:You were born in the Void, 
-
-H:244:10:101:102:30:awakened by accident.  
-H:245:20:101:102:35:awakened by hunger.  
-H:246:30:101:102:40:awakened by the glint of jewels.  
-H:247:40:101:102:45:awakened by an unsuspecting traveler.  
-H:248:50:101:102:50:awakened by a corrupt Mage.  
-H:249:60:101:102:50:awakened by an evil Sorcerer.  
-H:250:70:101:102:55:awakened by a powerful evil Wizard.  
-H:251:80:101:102:60:awakened by the Witch-King of Angmar.  
-H:252:90:101:102:65:awakened by Gorthaur.  
-H:253:100:101:102:70:awakened by Melkor Bauglir.  
-
-H:254:100:102:103:50:Since then you have destroyed 
-
-H:255:10:103:104:30:no 
-H:256:20:103:104:35:one weak-willed 
-H:257:30:103:104:40:two 
-H:258:40:103:104:45:three 
-H:259:50:103:104:50:four 
-H:260:60:103:104:50:five 
-H:261:70:103:104:55:about twenty 
-H:262:80:103:104:60:dozens of 
-H:263:90:103:104:65:hundreds of 
-H:264:100:103:104:70:uncounted multitudes of 
-
-H:265:100:104:0:50:enemies of the Dark.
-
-### Easterling histories added in the Theme module
-
-H:266:50:105:106:50:You are one of many children of 
-H:267:100:105:106:50:You are the only child of 
-
-H:268:20:106:107:35:an Easterling slave. 
-H:269:30:106:107:40:an Easterling landlord. 
-H:270:40:106:107:45:an Easterling squire. 
-H:271:50:106:107:50:an Easterling warrior. 
-H:272:60:106:107:55:a Wainrider from Near Harad. 
-H:273:70:106:107:60:a warlord from Far Harad. 
-H:274:80:106:107:65:a Corsair of Umbar. 
-H:275:90:106:107:70:Ulfast, son of Ulfang. 
-H:276:100:106:107:75:Ulwarth, son of Ulfang. 
-
-H:277:25:107:108:10:You have brown eyes, 
-H:278:50:107:108:30:You have piercing black eyes, 
-H:279:100:107:108:60:You have alert yellow eyes, 
-
-H:280:50:108:0:25:chestnut brown hair, and a dark complexion.
-H:281:100:108:0:50:jet-black hair, and a dark complexion.
-
-H:282:40:109:110:60:You have only recently been corrupted, 
-H:283:60:109:110:70:You've been corrupted for quite a while, 
-H:284:100:109:110:80:You were one of the first beings to be corrupted, 
-
-H:285:40:110:111:60:and your entire being detests this fact. 
-H:286:60:110:111:70:but you don't mind it so much anymore. 
-H:287:100:110:111:80:and you consider that to have been your true birth. 
-
-H:288:40:111:112:60:Your watery green eyes 
-H:289:60:111:112:70:Your piercing black eyes 
-H:290:100:111:112:80:Your glowing red eyes 
-
-H:291:40:112:0:60:radiate miserable servility.
-H:292:60:112:0:70:radiate contempt.
-H:293:100:112:0:80:radiate pure evil.
-
-##############################################################################
-##############################################################################
-##############################################################################
-##############################################################################
-# M:N:idx:color:Meta class name
-# M:C:class name
-
-I:
-
-M:N:0:U:Classes       -- The Classes of Middle-earth
-M:C:Warrior
-M:C:Archer
-M:C:Rogue
-M:C:Mage
-M:C:Priest
-M:C:Loremaster
-M:C:Pacifist
-#M:C:Test
-#M:C:Chaos-Warrior
-
-#M:N:1:B:Spellcasters -- Magic is The One True Way
-
-#M:N:2:y:Priests      -- Hail the powers of the Ainur
-#M:C:Mindcrafter
-
-#M:N:3:G:Beastfriends -- Monsters are fun
-#M:C:BeastMaster
-
-#M:N:4:v:Others       -- The way to your independence
-#M:C:Harper
-#M:C:Merchant
-
-#M:N:5:o:Tests        -- Test is you dare !
-#M:C:Test
-#M:C:Blade
-#M:C:Black-Knight
diff --git a/lib/mods/theme/edit/qrand1.map b/lib/mods/theme/edit/qrand1.map
index f42cbf1c..041e221c 100644
--- a/lib/mods/theme/edit/qrand1.map
+++ b/lib/mods/theme/edit/qrand1.map
@@ -16,9 +16,6 @@ F:G:188:6
 # Door
 F:D:38:6
 
-# Floor with Trap
-F:t:1:8:0:0:0:0:*
-
 # Deep lava
 F:F:85:12
 
diff --git a/lib/mods/theme/edit/qrand10.map b/lib/mods/theme/edit/qrand10.map
index ae45b9cb..cfe57e16 100644
--- a/lib/mods/theme/edit/qrand10.map
+++ b/lib/mods/theme/edit/qrand10.map
@@ -16,9 +16,6 @@ F:G:188:6
 # Door
 F:D:38:6
 
-# Floor with Trap
-F:t:1:2056:0:0:0:0:*
-
 # Deep lava
 F:F:85:12
 
@@ -26,11 +23,11 @@ F:F:85:12
 D:                   
 D:      xxxxxxx      
 D:      xFFFFFx      
-D: xxxxxx,t.ttxxxx   
-D: xFFG,t....t,,,xxx 
-D: xFpG.......t.t.DD 
-D: xFFG,t....t,,,xxx 
-D: xxxxxx,t.ttxxxx   
+D: xxxxxx,....xxxx   
+D: xFFG,......,,,xxx 
+D: xFpG...........DD 
+D: xFFG,......,,,xxx 
+D: xxxxxx,....xxxx   
 D:      xFFFFFx      
 D:      xxxxxxx      
 D:                   
diff --git a/lib/mods/theme/edit/qrand11.map b/lib/mods/theme/edit/qrand11.map
index 4af3c266..67d5258a 100644
--- a/lib/mods/theme/edit/qrand11.map
+++ b/lib/mods/theme/edit/qrand11.map
@@ -16,9 +16,6 @@ F:G:188:6
 # Door
 F:D:38:6
 
-# Floor with Trap
-F:t:1:8:0:0:0:0:*
-
 # Deep lava
 F:L:85:6
 
diff --git a/lib/mods/theme/edit/qrand12.map b/lib/mods/theme/edit/qrand12.map
index 4621ef0b..f24a7927 100644
--- a/lib/mods/theme/edit/qrand12.map
+++ b/lib/mods/theme/edit/qrand12.map
@@ -16,9 +16,6 @@ F:G:188:6
 # Door
 F:D:38:6
 
-# Floor with Trap
-F:t:1:8:0:0:0:0:*
-
 # Deep water
 F:W:187:6
 
diff --git a/lib/mods/theme/edit/qrand14.map b/lib/mods/theme/edit/qrand14.map
index 9f339db0..ee6e8975 100644
--- a/lib/mods/theme/edit/qrand14.map
+++ b/lib/mods/theme/edit/qrand14.map
@@ -16,9 +16,6 @@ F:G:188:6
 # Door
 F:D:38:6
 
-# Floor with Trap
-F:t:1:8:0:0:0:0:*
-
 # Deep water
 F:W:84:6
 
diff --git a/lib/mods/theme/edit/qrand6.map b/lib/mods/theme/edit/qrand6.map
index 3b55e985..407a9083 100644
--- a/lib/mods/theme/edit/qrand6.map
+++ b/lib/mods/theme/edit/qrand6.map
@@ -16,9 +16,6 @@ F:G:188:6
 # Door
 F:D:38:6
 
-# Floor with Trap
-F:t:1:8:0:0:0:0:*
-
 # Deep water
 F:W:84:6
 
diff --git a/lib/mods/theme/edit/qrand7.map b/lib/mods/theme/edit/qrand7.map
index a7c0607f..4da79778 100644
--- a/lib/mods/theme/edit/qrand7.map
+++ b/lib/mods/theme/edit/qrand7.map
@@ -16,9 +16,6 @@ F:G:188:6
 # Door
 F:D:38:6
 
-# Floor with Trap
-F:t:1:8:0:0:0:0:*
-
 # Deep water
 F:W:84:6
 
@@ -26,10 +23,10 @@ F:W:84:6
 F:w:187:6
 
 # Dungeon wayout
-D:ttttt      
-D:tGGGt  ,x, 
-D:tGpGt  x,x 
-D:tGGGt  ,x, 
-D:ttttt      
+D:           
+D: GGG   ,x, 
+D: GpG   x,x 
+D: GGG   ,x, 
+D:           
 D:      ,x,  
 D:           
diff --git a/lib/mods/theme/edit/r_info.txt b/lib/mods/theme/edit/r_info.txt
index bcc46bd5..2f6ab2fe 100644
--- a/lib/mods/theme/edit/r_info.txt
+++ b/lib/mods/theme/edit/r_info.txt
@@ -130,6 +130,7 @@
 # S: spell frequency |
 # S: spell type | spell type | etc
 # D: Description
+# A: a_ptr_index : %chance
 
 # 'N' indicates the beginning of an entry. The serial number must
 # increase for each new item. Entry 0 is used for the player.
@@ -183,10 +184,6 @@
 
 # Note that monster zero is used for the "player" picture.
 
-# Version stamp (required)
-
-V:2.2.0
-
 ##### The Player #####
 
 N:0:Player
@@ -204,10 +201,18 @@ E:1:1:1:2:1:1
 O:1:1:1:1
 B:BEG:*
 B:TOUCH:EAT_GOLD
-F:MALE | EVIL | WILD_TOWN | WILD_ONLY | 
-F:RAND_25 |  FRIENDS | 
-F:TAKE_ITEM | OPEN_DOOR | DROP_CORPSE | DROP_SKELETON | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:RAND_25
+F:TAKE_ITEM
+F:WILD_ONLY
+F:WILD_TOWN
 D:He looks squalid and thoroughly revolting. 
 
 N:2:Scrawny cat
@@ -217,9 +222,16 @@ W:0:3:100:0
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:CLAW:HURT:1d1
-F:RAND_25 | WILD_GRASS | WILD_TOWN | WILD_ONLY | 
-F:ANIMAL | DROP_CORPSE | DROP_SKELETON | 
-F:MORTAL | BASEANGBAND | NEUTRAL | NO_TARGET
+F:ANIMAL
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:RAND_25
+F:WILD_GRASS
+F:WILD_ONLY
+F:WILD_TOWN
 D:A skinny little furball with sharp claws. 
 
 N:3:Sparrow
@@ -229,9 +241,18 @@ W:0:3:90:0
 E:0:1:1:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d1
-F:RAND_25 | CAN_FLY | WILD_TOWN | WILD_ONLY | 
-F:ANIMAL | DROP_SKELETON | HAS_EGG | IMPRESED | 
-F:MORTAL | BASEANGBAND | NEUTRAL | NO_TARGET | AQUATIC 
+F:ANIMAL
+F:AQUATIC
+F:CAN_FLY
+F:DROP_SKELETON
+F:HAS_EGG
+F:IMPRESED
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:RAND_25
+F:WILD_ONLY
+F:WILD_TOWN
 D:Utterly harmless, except when angry. 
 
 N:4:Chaffinch
@@ -241,9 +262,19 @@ W:0:3:80:0
 E:0:1:1:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d1
-F:RAND_25 | CAN_FLY | WILD_ONLY | WILD_WOOD | WILD_GRASS | 
-F:ANIMAL | DROP_SKELETON | HAS_EGG | IMPRESED | AQUATIC 
-F:MORTAL | BASEANGBAND | NEUTRAL | NO_TARGET
+F:ANIMAL
+F:AQUATIC
+F:CAN_FLY
+F:DROP_SKELETON
+F:HAS_EGG
+F:IMPRESED
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:RAND_25
+F:WILD_GRASS
+F:WILD_ONLY
+F:WILD_WOOD
 D:Utterly harmless, except when angry. 
 
 N:5:Wild rabbit
@@ -253,9 +284,16 @@ W:0:3:100:0
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d1
-F:RAND_50 | WILD_ONLY | WILD_GRASS | WILD_WOOD |
-F:ANIMAL | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND | NEUTRAL | NO_TARGET
+F:ANIMAL
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:RAND_50
+F:WILD_GRASS
+F:WILD_ONLY
+F:WILD_WOOD
 D:It is not a carnivore, but will defend itself if you stray too 
 D:close. 
 
@@ -266,11 +304,21 @@ W:0:1:1000:0
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:1d6
-F:MALE | WILD_ONLY | WILD_WOOD |
-F:RAND_25 | DROP_SKELETON | DROP_CORPSE |
-F:ONLY_GOLD | DROP_60 | HAS_LITE | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND | NEUTRAL | NO_TARGET |
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:RAND_25
+F:TAKE_ITEM
+F:WILD_ONLY
+F:WILD_WOOD
 D:He has a strong axe with a sharp edge. 
 
 N:7:Scruffy little dog
@@ -280,8 +328,15 @@ W:0:3:300:0
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d1
-F:RAND_25 | DROP_SKELETON | DROP_CORPSE | WILD_TOWN | WILD_ONLY | 
-F:ANIMAL | MORTAL | BASEANGBAND | NEUTRAL | NO_TARGET
+F:ANIMAL
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:RAND_25
+F:WILD_ONLY
+F:WILD_TOWN
 D:A thin flea-ridden mutt, growling as you get close. 
 
 N:8:Farmer Maggot
@@ -290,12 +345,23 @@ I:110:35d10:40:10:3
 W:0:4:730:0
 E:0:1:1:2:1:1
 O:0:100:0:0
-F:UNIQUE | MALE | CAN_SPEAK | DROP_CORPSE |
-F:FORCE_MAXHP | WILD_TOWN | WILD_ONLY | NO_TARGET
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:NEUTRAL
 F:NEVER_MOVE
-F:OPEN_DOOR | BASH_DOOR | SPECIAL_GENE
-F:NEUTRAL | NO_TARGET | NO_DEATH
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:NO_DEATH
+F:NO_TARGET
+F:NO_TARGET
+F:OPEN_DOOR
+F:SPECIAL_GENE
+F:UNIQUE
+F:WILD_ONLY
+F:WILD_TOWN
 D:A broad and thick-set hobbit with a round red face. "There's earth under
 D:his old feet, and clay on his fingers; wisdom in his bones, and both his 
 D:eyes are open." He seems sad about something.
@@ -307,9 +373,18 @@ W:0:1:1500:0
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:DROOL:*
-F:MALE | DROP_CORPSE | DROP_SKELETON | WILD_TOWN | WILD_ONLY | 
-F:RAND_25 | DROP_1D2 | TAKE_ITEM | NEUTRAL | NO_TARGET | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:RAND_25
+F:TAKE_ITEM
+F:WILD_ONLY
+F:WILD_TOWN
 D:He tends to blubber a lot. 
 
 N:10:Boil-covered wretch
@@ -319,10 +394,20 @@ W:0:1:1400:0
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:DROOL:*
-F:MALE | DROP_SKELETON | DROP_CORPSE | WILD_TOWN | WILD_ONLY |
-F:RAND_25 | DROP_1D2 | NEUTRAL | NO_TARGET
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:OPEN_DOOR
+F:RAND_25
+F:TAKE_ITEM
+F:WILD_ONLY
+F:WILD_TOWN
 D:Ugly doesn't begin to describe him. 
 
 N:11:Village idiot
@@ -332,9 +417,18 @@ W:0:1:1400:0
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:DROOL:*
-F:MALE | DROP_CORPSE | DROP_SKELETON | WILD_TOWN | WILD_ONLY | 
-F:RAND_25 | DROP_1D2 | TAKE_ITEM | NEUTRAL | NO_TARGET
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:RAND_25
+F:TAKE_ITEM
+F:WILD_ONLY
+F:WILD_TOWN
 D:Drooling and comical, he runs around town with a stupid grin. 
 
 N:12:Pitiful-looking beggar
@@ -344,10 +438,19 @@ W:0:1:1300:0
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:BEG:*
-F:MALE | DROP_SKELETON | DROP_CORPSE | 
-F:RAND_25 | WILD_TOWN | WILD_ONLY | DROP_1D2 | 
-F:TAKE_ITEM | OPEN_DOOR | NEUTRAL | NO_TARGET
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:OPEN_DOOR
+F:RAND_25
+F:TAKE_ITEM
+F:WILD_ONLY
+F:WILD_TOWN
 D:You just can't help feeling sorry for him. 
 
 N:13:Mangy-looking leper
@@ -358,10 +461,19 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:BEG:*
 B:TOUCH:DISEASE
-F:MALE | DROP_CORPSE | DROP_SKELETON | 
-F:RAND_25 | WILD_TOWN | WILD_ONLY | DROP_1D2 | 
-F:TAKE_ITEM | OPEN_DOOR | NEUTRAL | NO_TARGET
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:OPEN_DOOR
+F:RAND_25
+F:TAKE_ITEM
+F:WILD_ONLY
+F:WILD_TOWN
 D:You feel it isn't safe to touch him. 
 
 N:14:Agent of the black market
@@ -373,11 +485,21 @@ O:25:50:20:5
 B:HIT:HURT:1d6
 B:TOUCH:EAT_ITEM
 B:INSULT:*
-F:MALE | DROP_CORPSE | DROP_SKELETON | 
-F:DROP_60 | WILD_TOWN |
-F:WILD_WOOD | WILD_GRASS | WILD_MOUNTAIN | WILD_ONLY | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR |
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:TAKE_ITEM
+F:WILD_GRASS
+F:WILD_MOUNTAIN
+F:WILD_ONLY
+F:WILD_TOWN
+F:WILD_WOOD
 D:He 'finds' new wares for the Black Market. From unwary adventurers. 
 
 N:15:Singing, happy drunk
@@ -387,11 +509,21 @@ W:0:1:1100:0
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:BEG:*
-F:MALE |
-F:RAND_50 | DROP_SKELETON | DROP_CORPSE | 
-F:ONLY_GOLD | DROP_60 | WILD_TOWN | WILD_ONLY | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE | NEUTRAL | NO_TARGET
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:RAND_50
+F:TAKE_ITEM
+F:WILD_ONLY
+F:WILD_TOWN
 D:He makes you glad to be sober. 
 
 N:16:Aimless-looking merchant
@@ -401,10 +533,21 @@ W:0:1:1500:0
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:1d3
-F:MALE | RAND_50 | 
-F:ONLY_GOLD | DROP_60 | DROP_SKELETON | DROP_CORPSE | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | WILD_TOWN | WILD_ONLY | 
-F:MORTAL | BASEANGBAND | HAS_LITE | NEUTRAL | NO_TARGET
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:RAND_50
+F:TAKE_ITEM
+F:WILD_ONLY
+F:WILD_TOWN
 D:The typical ponce around town, with purse jingling, and looking for more 
 D:amulets of adornment to buy. 
 
@@ -415,10 +558,21 @@ W:0:1:1700:0
 E:1:1:1:2:1:1
 O:0:100:0:0
 B:HIT:HURT:1d10
-F:MALE | DROP_SKELETON | DROP_CORPSE | 
-F:RAND_50 | DROP_90 | WILD_GRASS | WILD_TOWN | WILD_WOOD | WILD_ONLY | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:RAND_50
+F:TAKE_ITEM
+F:WILD_GRASS
+F:WILD_ONLY
+F:WILD_TOWN
+F:WILD_WOOD
 D:No job is too low for him. 
 
 N:18:Battle-scarred veteran
@@ -428,10 +582,18 @@ W:0:1:1650:0
 E:1:1:1:2:1:1
 O:25:50:25:0
 B:HIT:HURT:2d6
-F:MALE | DROP_SKELETON | DROP_CORPSE | 
-F:RAND_50 | DROP_90 | WILD_TOWN | WILD_ONLY | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:RAND_50
+F:TAKE_ITEM
+F:WILD_ONLY
+F:WILD_TOWN
 D:He doesn't take to strangers kindly. 
 
 N:19:The Squint-eyed Southerner
@@ -444,9 +606,20 @@ B:HIT:HURT:3d8
 B:HIT:HURT:3d8
 B:PUNCH:HURT:3d8
 B:PUNCH:HURT:3d8
-F:UNIQUE | MALE | CAN_SPEAK | BASEANGBAND | HAS_LITE |
-F:FORCE_MAXHP | DROP_CORPSE | WILD_TOWN | WILD_ONLY | DROP_1D2 | 
-F:ONLY_ITEM | DROP_GOOD | DROP_GREAT | DROP_RANDART | MORTAL
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:DROP_RANDART
+F:FORCE_MAXHP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:UNIQUE
+F:WILD_ONLY
+F:WILD_TOWN
 D:He doesn't look like he's from around here, and a gut 
 D:feeling tells you he's a spy.
 
@@ -460,11 +633,16 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:HURT:1d4
 B:SPORE:HURT:1d4
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | DROP_CORPSE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | 
-F:MORTAL | BASEANGBAND | NO_CUT
+F:DROP_CORPSE
+F:EMPTY_MIND
+F:IM_POIS
+F:MORTAL
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:A small strange growth. 
 
 N:21:Large white snake
@@ -475,9 +653,14 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d1
 B:CRUSH:HURT:1d1
-F:RAND_50 | WILD_TOO |
-F:BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | HAS_EGG | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_EGG
+F:MORTAL
+F:RAND_50
+F:WILD_TOO
 D:It is about eight feet long. 
 
 N:22:Grey mushroom patch
@@ -487,10 +670,15 @@ W:1:1:10:1
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:CONFUSE:1d4
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | DROP_CORPSE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:DROP_CORPSE
+F:EMPTY_MIND
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:Yum! It looks quite tasty. 
 
 N:23:Newt
@@ -501,9 +689,17 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d3
 B:BITE:HURT:1d3
-F:WEIRD_MIND | CAN_SWIM | WILD_TOO | DROP_CORPSE | 
-F:WILD_GRASS | WILD_WASTE | WILD_SHORE | WILD_MOUNTAIN |
-F:ANIMAL | HAS_EGG | MORTAL | BASEANGBAND | 
+F:ANIMAL
+F:CAN_SWIM
+F:DROP_CORPSE
+F:HAS_EGG
+F:MORTAL
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_MOUNTAIN
+F:WILD_SHORE
+F:WILD_TOO
+F:WILD_WASTE
 D:A small, harmless lizard. 
 
 # New monster added by furiosity for the Theme module
@@ -517,9 +713,21 @@ B:KICK:HURT:10d10
 B:KICK:HURT:10d10
 B:BUTT:HURT:10d10
 B:BUTT:HURT:10d10
-F:BASEANGBAND | ANIMAL | MORTAL | DROP_CORPSE | WILD_ONLY | WILD_GRASS 
-F:FRIEND | FRIENDS | FORCE_SLEEP | STUPID | WEIRD_MIND | 
-F:SUSCEP_POIS | KILL_BODY | NEUTRAL | NO_TARGET | KILL_ITEM | 
+F:ANIMAL
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:FRIEND
+F:FRIENDS
+F:KILL_BODY
+F:KILL_ITEM
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:STUPID
+F:SUSCEP_POIS
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_ONLY
 D:A strong and powerful animal with sharp-looking horns. Large cattle 
 D:used to carry and draw burdens, and for milk and meat. It is domestic and 
 D:utterly harmless, except when angry. 
@@ -535,9 +743,21 @@ B:KICK:HURT:20d20
 B:KICK:HURT:20d20
 B:KICK:HURT:20d20
 B:KICK:HURT:20d20
-F:BASEANGBAND | ANIMAL | MORTAL | DROP_CORPSE | WILD_ONLY | WILD_GRASS | 
-F:FRIEND | FRIENDS | FORCE_SLEEP | WEIRD_MIND | SUSCEP_POIS | GOOD | 
-F:KILL_BODY | NEUTRAL | NO_TARGET | KILL_ITEM | 
+F:ANIMAL
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:FRIEND
+F:FRIENDS
+F:GOOD
+F:KILL_BODY
+F:KILL_ITEM
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:SUSCEP_POIS
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_ONLY
 D:The oxen that live on the lands around the Sea of Rhun are hardier 
 D:and wilder than any others in Middle-earth. Legends claim that they 
 D:are descended from the cattle of the Huntsman of the Valar, Orome 
@@ -556,8 +776,18 @@ B:KICK:HURT:5d5
 B:KICK:HURT:5d5
 B:KICK:HURT:5d5
 B:KICK:HURT:5d5
-F:BASEANGBAND | ANIMAL | MORTAL | DROP_CORPSE | WILD_ONLY | WILD_GRASS | 
-F:FRIEND | FRIENDS | FORCE_SLEEP | WEIRD_MIND | SUSCEP_POIS | NEUTRAL | NO_TARGET | 
+F:ANIMAL
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:FRIEND
+F:FRIENDS
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:SUSCEP_POIS
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_ONLY
 D:Woolly grazing animals, especially common on the Barrow-downs 
 D:and in the Vales of Anduin. Utterly harmless unless angered.
 
@@ -568,10 +798,13 @@ W:1:1:600:1
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d2
-F:RAND_50 | WILD_TOO | WILD_GRASS |
-F:CAN_SWIM |
-F:ANIMAL | DROP_CORPSE |
-F:MORTAL | BASEANGBAND |
+F:ANIMAL
+F:CAN_SWIM
+F:DROP_CORPSE
+F:MORTAL
+F:RAND_50
+F:WILD_GRASS
+F:WILD_TOO
 S:MULTIPLY
 D:It is about three feet long, with large teeth. 
 
@@ -583,9 +816,14 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d3
 B:CRUSH:HURT:1d4
-F:RAND_25 | CAN_SWIM |
-F:BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | HAS_EGG | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_EGG
+F:MORTAL
+F:RAND_25
 D:It is about eight feet long. 
 
 # New monster added by furiosity for the Theme module
@@ -599,8 +837,16 @@ B:KICK:HURT:10d12
 B:KICK:HURT:10d12
 B:KICK:HURT:10d12
 B:KICK:HURT:10d12
-F:BASEANGBAND | ANIMAL | MORTAL | DROP_CORPSE | WILD_ONLY | 
-F:WILD_GRASS | FORCE_SLEEP | WEIRD_MIND | NEUTRAL | NO_TARGET | GOOD | 
+F:ANIMAL
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:GOOD
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_ONLY
 D:The great Mearas are legendary horses bred by the Rohirrim.
 D:Swift and sure they are, but only members of the royal 
 D:family of Rohan are allowed to ride them. This animal will 
@@ -617,8 +863,17 @@ B:KICK:HURT:8d10
 B:KICK:HURT:8d10
 B:KICK:HURT:8d10
 B:KICK:HURT:8d10
-F:BASEANGBAND | ANIMAL | MORTAL | DROP_CORPSE | WILD_ONLY | WILD_GRASS | 
-F:FORCE_SLEEP | WEIRD_MIND | SUSCEP_POIS | WILD_TOWN | NEUTRAL | NO_TARGET | 
+F:ANIMAL
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:SUSCEP_POIS
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_ONLY
+F:WILD_TOWN
 D:Beasts of burden and transport used by Elves and Men through the ages. 
 D:A noble animal, it can be quite a sight as it prances gracefully 
 D:through the fields. It won't attack you unless provoked.
@@ -630,10 +885,17 @@ W:1:1:30:2
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:CRAWL:POISON:1d2
-F:RAND_50 | RAND_25 | CAN_SWIM |
-F:STUPID | WEIRD_MIND | 
-F:ANIMAL | IM_POIS | HURT_LITE | NO_FEAR
-F:MORTAL | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:CAN_SWIM
+F:HURT_LITE
+F:IM_POIS
+F:MORTAL
+F:NO_CUT
+F:NO_FEAR
+F:RAND_25
+F:RAND_50
+F:STUPID
+F:WEIRD_MIND
 S:MULTIPLY
 D:It is a large slimy mass of worms. 
 
@@ -644,8 +906,11 @@ W:1:1:500:1
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:GAZE:PARALYZE
-F:NEVER_MOVE | CAN_FLY | DROP_CORPSE | 
-F:HURT_LITE | NO_FEAR | BASEANGBAND
+F:CAN_FLY
+F:DROP_CORPSE
+F:HURT_LITE
+F:NEVER_MOVE
+F:NO_FEAR
 D:A disembodied eye, floating a few feet above the ground. 
 
 N:33:Rock lizard
@@ -655,9 +920,13 @@ W:1:1:100:2
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d1
-F:ANIMAL | CAN_SWIM | WILD_TOO | WILD_MOUNTAIN | 
-F:DROP_CORPSE | HAS_EGG | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_SWIM
+F:DROP_CORPSE
+F:HAS_EGG
+F:MORTAL
+F:WILD_MOUNTAIN
+F:WILD_TOO
 D:It is a small lizard with a hardened hide. 
 
 # New monster added by furiosity for the Theme module
@@ -670,8 +939,15 @@ O:0:0:0:0
 B:BUTT:HURT:3d6
 B:BUTT:HURT:3d6
 B:BUTT:HURT:3d6
-F:BASEANGBAND | ANIMAL | MORTAL | DROP_CORPSE | WILD_TOO | 
-F:WILD_GRASS | FORCE_SLEEP | WEIRD_MIND | WILD_WOOD | UNIQUE | 
+F:ANIMAL
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:MORTAL
+F:UNIQUE
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_TOO
+F:WILD_WOOD
 D:A monstrous beast that inhabited Everholt in the Firien Wood, 
 D:around the feet of the Halifirien in the White Mountains. It 
 D:is twice the size of a regular boar, and twice as aggressive. 
@@ -684,9 +960,14 @@ W:1:1:400:1
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d1
-F:FRIENDS |
-F:WILD_TOO | WILD_WOOD | WILD_GRASS | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FRIENDS
+F:MORTAL
+F:WILD_GRASS
+F:WILD_TOO
+F:WILD_WOOD
 D:It is a yapping snarling wild dog, dangerous when in a pack. 
 
 N:36:Soldier ant
@@ -696,9 +977,13 @@ W:1:1:300:3
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d2
-F:WEIRD_MIND | BASH_DOOR | DROP_SKELETON |
-F:ANIMAL | WILD_TOO | WILD_GRASS | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:MORTAL
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_TOO
 D:A large ant with powerful mandibles. 
 
 N:37:Fruit bat
@@ -708,8 +993,13 @@ W:1:1:20:1
 E:0:1:1:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d1
-F:ANIMAL | CAN_FLY | WILD_TOO | WILD_WOOD | DROP_CORPSE
-F:MORTAL | BASEANGBAND | AI_ANNOY
+F:AI_ANNOY
+F:ANIMAL
+F:CAN_FLY
+F:DROP_CORPSE
+F:MORTAL
+F:WILD_TOO
+F:WILD_WOOD
 D:A fast-moving pest. 
 
 N:38:Insect swarm
@@ -720,9 +1010,16 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:BITE:HURT:1d1
 B:STING:HURT:1d1
-F:ANIMAL | WEIRD_MIND | CAN_FLY | RAND_25 | WILD_TOO | WILD_GRASS |
-F:WILD_WOOD | 
-F:MORTAL | SUSCEP_FIRE | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:CAN_FLY
+F:MORTAL
+F:NO_CUT
+F:RAND_25
+F:SUSCEP_FIRE
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_TOO
+F:WILD_WOOD
 D:A lone insect may be harmless, but there's a whole swarm of 
 D:them here! 
 
@@ -735,8 +1032,14 @@ E:0:1:0:2:1:2
 O:0:0:0:0
 B:BUTT:HURT:3d3
 B:BUTT:HURT:3d3
-F:BASEANGBAND | ANIMAL | MORTAL | DROP_CORPSE | WILD_TOO | 
-F:WILD_GRASS | FORCE_SLEEP | WEIRD_MIND | WILD_WOOD | 
+F:ANIMAL
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:MORTAL
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_TOO
+F:WILD_WOOD
 D:Aggressive tusked beasts common to woodland regions.
 
 N:40:Shrieker mushroom patch
@@ -745,11 +1048,19 @@ I:110:1d1:4:1:0
 W:2:1:40:1
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:FORCE_SLEEP | NEVER_MOVE | NEVER_BLOW | 
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | WILD_TOO | DROP_CORPSE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_4 | 
+F:DROP_CORPSE
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:IM_POIS
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+F:WILD_TOO
+S:1_IN_4
 S:SHRIEK
 D:Yum!  It looks quite tasty.  It doesn't sound so nice, though. 
 
@@ -764,8 +1075,18 @@ B:KICK:HURT:7d7
 B:BUTT:HURT:7d7
 B:KICK:HURT:7d7
 B:BUTT:HURT:7d7
-F:BASEANGBAND | ANIMAL | MORTAL | DROP_CORPSE | WILD_ONLY | WILD_GRASS | 
-F:FRIEND | FRIENDS | FORCE_SLEEP | WEIRD_MIND | SUSCEP_POIS | NEUTRAL | NO_TARGET | 
+F:ANIMAL
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:FRIEND
+F:FRIENDS
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:SUSCEP_POIS
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_ONLY
 D:Domestic horned beasts kept throughout Middle-earth. 
 D:Utterly harmless, unless angered.
 
@@ -780,7 +1101,7 @@ D:Utterly harmless, unless angered.
 #B:KICK:HURT:4d5
 #B:KICK:HURT:4d5
 #B:KICK:HURT:4d5
-#F:BASEANGBAND | ANIMAL | MORTAL | DROP_CORPSE | WILD_ONLY | WILD_GRASS | 
+#F:ANIMAL | MORTAL | DROP_CORPSE | WILD_ONLY | WILD_GRASS |
 #F:FORCE_SLEEP | WEIRD_MIND | SUSCEP_POIS | NEUTRAL | NO_TARGET | WILD_TOWN | 
 #D:It's a short, stocky pack animal, related to the horse, but smaller. 
 #D:A common beast of burden in Middle-earth, especially used by Hobbits 
@@ -794,10 +1115,15 @@ E:1:1:1:2:1:1
 O:25:50:0:20
 B:HIT:HURT:1d7
 B:HIT:HURT:1d6
-F:MALE | 
-F:DROP_60 | WILD_TOO | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
 D:He looks inexperienced but tough. 
 
 N:44:Novice rogue
@@ -808,10 +1134,16 @@ E:1:1:1:2:1:1
 O:50:25:0:20
 B:HIT:HURT:1d6
 B:TOUCH:EAT_GOLD
-F:MALE | 
-F:DROP_60 | DROP_SKELETON | DROP_CORPSE | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | WILD_TOO |
-F:EVIL | MORTAL | BASEANGBAND
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:TAKE_ITEM
+F:WILD_TOO
 D:A rather shifty individual. 
 
 N:45:Novice priest
@@ -821,13 +1153,21 @@ W:2:1:1500:6
 E:1:1:1:2:1:1
 O:25:0:50:20
 B:HIT:HURT:1d5
-F:MALE | 
-F:FORCE_SLEEP | GOOD | WILD_TOO | DROP_SKELETON | DROP_CORPSE | 
-F:DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_12 | 
-S:HEAL | SCARE | CAUSE_1
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
+S:1_IN_12
+S:CAUSE_1
+S:HEAL
+S:SCARE
 D:He is tripping over his priestly robes. 
 
 N:46:Novice mage
@@ -837,13 +1177,21 @@ W:2:1:1400:6
 E:1:1:1:2:1:1
 O:25:0:70:0
 B:HIT:HURT:1d4
-F:MALE | 
-F:FORCE_SLEEP | WILD_TOO | DROP_SKELETON | DROP_CORPSE | 
-F:DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_12 | 
-S:BLINK | BLIND | CONF | MISSILE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
+S:1_IN_12
+S:BLIND
+S:BLINK
+S:CONF
+S:MISSILE
 D:He is leaving behind a trail of dropped spell components. 
 
 N:47:Yellow mushroom patch
@@ -853,11 +1201,16 @@ W:2:1:30:2
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:TERRIFY:1d6
-F:NEVER_MOVE | WILD_TOO | 
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | 
-F:MORTAL | BASEANGBAND | NO_CUT
+F:EMPTY_MIND
+F:IM_POIS
+F:MORTAL
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+F:WILD_TOO
 D:Yum!  It looks quite tasty. 
 
 N:48:White jelly
@@ -867,10 +1220,16 @@ W:2:1:2000:10
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:POISON:1d2
-F:NEVER_MOVE | CAN_SWIM |
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:EMPTY_MIND
+F:HURT_LITE
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:It's a large pile of white flesh. 
 
 N:49:Giant black ant
@@ -880,10 +1239,15 @@ W:2:1:500:8
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d4
-F:RAND_25 | 
-F:WEIRD_MIND | DROP_SKELETON | 
-F:BASH_DOOR | WILD_TOO | WILD_WOOD | WILD_GRASS |
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:MORTAL
+F:RAND_25
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_TOO
+F:WILD_WOOD
 D:It is about three feet long. 
 
 N:50:Salamander
@@ -893,9 +1257,15 @@ W:2:1:100:10
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:FIRE:1d3
-F:RAND_25 | CAN_SWIM | WILD_TOO | WILD_VOLCANO | DROP_CORPSE | 
-F:ANIMAL | IM_FIRE | SUSCEP_COLD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_SWIM
+F:DROP_CORPSE
+F:IM_FIRE
+F:MORTAL
+F:RAND_25
+F:SUSCEP_COLD
+F:WILD_TOO
+F:WILD_VOLCANO
 D:A small black and orange lizard. 
 
 N:51:White harpy
@@ -907,8 +1277,15 @@ O:0:0:0:0
 B:CLAW:HURT:1d1
 B:CLAW:HURT:1d1
 B:BITE:HURT:1d2
-F:FEMALE | CAN_FLY | WILD_TOO | WILD_MOUNTAIN | 
-F:RAND_50 | DROP_CORPSE | ANIMAL | EVIL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:DROP_CORPSE
+F:EVIL
+F:FEMALE
+F:MORTAL
+F:RAND_50
+F:WILD_MOUNTAIN
+F:WILD_TOO
 D:A flying, screeching bird with a woman's face. 
 
 # New monster added by furiosity for the Theme module
@@ -922,8 +1299,17 @@ B:KICK:HURT:8d8
 B:BUTT:HURT:8d8
 B:KICK:HURT:8d8
 B:BUTT:HURT:8d8
-F:BASEANGBAND | ANIMAL | MORTAL | DROP_CORPSE | WILD_ONLY | WILD_GRASS | 
-F:FORCE_SLEEP | WEIRD_MIND | SUSCEP_POIS | NEUTRAL | NO_TARGET | WILD_WOOD | 
+F:ANIMAL
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:SUSCEP_POIS
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_ONLY
+F:WILD_WOOD
 D:Graceful creature found throughout Middle-earth. Deer are 
 D:traditionally dedicated to the Vala Nessa, and are said to 
 D:follow her as she travels through the wild lands. They will 
@@ -936,10 +1322,14 @@ W:2:2:600:30
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d6
-F:UNIQUE | SPECIAL_GENE
-F:FORCE_MAXHP | RAND_25 | DROP_CORPSE
-F:BASH_DOOR | ANIMAL
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:MORTAL
+F:RAND_25
+F:SPECIAL_GENE
+F:UNIQUE
 D:A rather vicious dog belonging to Farmer Maggot. It thinks you are 
 D:stealing mushrooms. 
 
@@ -950,10 +1340,14 @@ W:2:2:650:30
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d6
-F:UNIQUE | SPECIAL_GENE
-F:FORCE_MAXHP | RAND_25 | DROP_CORPSE
-F:BASH_DOOR 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:MORTAL
+F:RAND_25
+F:SPECIAL_GENE
+F:UNIQUE
 D:A rather vicious dog belonging to Farmer Maggot. It thinks you are 
 D:stealing mushrooms. 
 
@@ -964,10 +1358,14 @@ W:2:2:700:30
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d6
-F:UNIQUE | SPECIAL_GENE
-F:FORCE_MAXHP | RAND_25 | DROP_CORPSE
-F:BASH_DOOR 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:MORTAL
+F:RAND_25
+F:SPECIAL_GENE
+F:UNIQUE
 D:A rather vicious dog belonging to Farmer Maggot. It thinks you are 
 D:stealing mushrooms. 
 
@@ -978,9 +1376,13 @@ W:2:1:200:6
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d3
-F:RAND_25 | WILD_ONLY | WILD_SHORE | DROP_CORPSE | 
-F:BASH_DOOR | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:MORTAL
+F:RAND_25
+F:WILD_ONLY
+F:WILD_SHORE
 D:It is as big as a wolf. 
 
 # New monster added by furiosity for the Theme module
@@ -993,8 +1395,15 @@ O:0:0:0:0
 B:BITE:TERRIFY:2d8
 B:CLAW:HURT:2d16
 B:CLAW:HURT:2d16
-F:BASH_DOOR | WILD_TOO | WILD_GRASS | WILD_WOOD | WILD_MOUNTAIN | 
-F:ANIMAL | DROP_SKELETON | DROP_CORPSE | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:MORTAL
+F:WILD_GRASS
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:Master of all felines, it's a huge cat with enormous paws 
 D:and a thick mane. Its roar is deafeningly terrifying.
 
@@ -1005,11 +1414,17 @@ W:2:1:40:3
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:CRAWL:ACID:1d3
-F:RAND_50 | RAND_25 | 
-F:STUPID | WEIRD_MIND | 
-F:ANIMAL | IM_ACID | CAN_SWIM | 
-F:HURT_LITE | NO_FEAR | 
-F:MORTAL | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:CAN_SWIM
+F:HURT_LITE
+F:IM_ACID
+F:MORTAL
+F:NO_CUT
+F:NO_FEAR
+F:RAND_25
+F:RAND_50
+F:STUPID
+F:WEIRD_MIND
 S:MULTIPLY
 D:It is a large slimy mass of worms. 
 
@@ -1021,8 +1436,15 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d4
 B:CRUSH:HURT:1d6
-F:RAND_25 | CAN_SWIM | WILD_TOO | DROP_SKELETON | DROP_CORPSE
-F:BASH_DOOR | HAS_EGG | ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_EGG
+F:MORTAL
+F:RAND_25
+F:WILD_TOO
 D:It is about ten feet long. 
 
 N:60:Cave spider
@@ -1032,10 +1454,15 @@ W:2:1:400:7
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d4
-F:FRIENDS | 
-F:WEIRD_MIND | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | SPIDER | HURT_LITE | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FRIENDS
+F:HURT_LITE
+F:MORTAL
+F:SPIDER
+F:WEIRD_MIND
 D:It is a black spider that moves in fits and starts. 
 
 N:61:Crow
@@ -1046,8 +1473,14 @@ E:0:1:1:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d3
 B:BITE:HURT:1d3
-F:ANIMAL | WILD_TOO | WILD_WOOD | CAN_FLY | DROP_CORPSE
-F:MORTAL | HAS_EGG | BASEANGBAND | AQUATIC 
+F:ANIMAL
+F:AQUATIC
+F:CAN_FLY
+F:DROP_CORPSE
+F:HAS_EGG
+F:MORTAL
+F:WILD_TOO
+F:WILD_WOOD
 D:It is a hooded crow, gray except for the black wings and head. 
 
 N:62:Wild cat
@@ -1058,8 +1491,12 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
-F:BASH_DOOR | WILD_TOO | DROP_SKELETON | DROP_CORPSE |
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:MORTAL
+F:WILD_TOO
 D:A larger than normal feline, hissing loudly. Its velvet claws conceal a 
 D:fistful of needles. 
 
@@ -1071,13 +1508,28 @@ E:1:1:1:2:1:1
 O:50:50:0:0
 B:TOUCH:EAT_GOLD
 B:BITE:HURT:2d4
-F:UNIQUE | MALE | CAN_SWIM | DROP_SKELETON | DROP_CORPSE | DROP_CHOSEN | 
-F:FORCE_MAXHP | CAN_SPEAK | SMART | 
-F:RAND_50 | RAND_25 | WILD_TOO |
-F:ONLY_ITEM | DROP_90 | DROP_GOOD | DROP_GREAT |
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | INVISIBLE
-F:EVIL | BASEANGBAND
-S:1_IN_25 |
+F:BASH_DOOR
+F:CAN_SPEAK
+F:CAN_SWIM
+F:DROP_90
+F:DROP_CHOSEN
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:INVISIBLE
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RAND_25
+F:RAND_50
+F:SMART
+F:TAKE_ITEM
+F:UNIQUE
+F:WILD_TOO
+S:1_IN_25
 S:S_SPIDER
 D:Also known as Gollum.  He is of the Periannath, but does not look it. 
 D:He is thin and frail, sneaking around in dark corners, hoping to 
@@ -1090,10 +1542,18 @@ W:3:2:300:4
 E:0:0:0:0:0:0
 O:50:0:25:20
 B:CRAWL:ACID:1d3
-F:RAND_50 | RAND_25 | DROP_90 | 
-F:STUPID | EMPTY_MIND | 
-F:IM_ACID | IM_POIS | CAN_SWIM |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:DROP_90
+F:EMPTY_MIND
+F:IM_ACID
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RAND_25
+F:RAND_50
+F:STUPID
 D:It's green and it's oozing. 
 
 N:65:Poltergeist
@@ -1103,12 +1563,24 @@ W:3:1:0:8
 E:0:0:0:0:0:0
 O:50:5:30:10
 B:TOUCH:TERRIFY
-F:RAND_50 | RAND_25 | CAN_FLY |
-F:DROP_60 | DROP_90 | 
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | TAKE_ITEM | 
-F:EVIL | UNDEAD | 
-F:IM_COLD | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_15 | 
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_60
+F:DROP_90
+F:EVIL
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
+F:RAND_25
+F:RAND_50
+F:TAKE_ITEM
+F:UNDEAD
+S:1_IN_15
 S:BLINK
 D:It is a ghastly, ghostly form. 
 
@@ -1119,11 +1591,17 @@ W:3:1:2000:12
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:POISON:1d3
-F:NEVER_MOVE | CAN_SWIM |
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_15 | 
+F:CAN_SWIM
+F:EMPTY_MIND
+F:HURT_LITE
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+S:1_IN_15
 S:DRAIN_MANA
 D:It's a large pile of yellow flesh. 
 
@@ -1135,9 +1613,15 @@ W:0:3:100:0
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d1
-F:WILD_ONLY | WILD_GRASS | WILD_WOOD |
-F:ANIMAL | DROP_SKELETON | DROP_CORPSE | NEUTRAL | NO_TARGET | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:WILD_GRASS
+F:WILD_ONLY
+F:WILD_WOOD
 D:A funny chittering creature, looking for nuts. 
 
 N:68:Raven
@@ -1148,8 +1632,17 @@ E:0:1:1:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d4
 B:BITE:HURT:1d4
-F:ANIMAL | WILD_ONLY | WILD_WOOD | CAN_FLY | DROP_CORPSE
-F:MORTAL | HAS_EGG | NEUTRAL | NO_TARGET | IMPRESED | BASEANGBAND | AQUATIC 
+F:ANIMAL
+F:AQUATIC
+F:CAN_FLY
+F:DROP_CORPSE
+F:HAS_EGG
+F:IMPRESED
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:WILD_ONLY
+F:WILD_WOOD
 D:Larger than a crow, and pitch black. 
 
 N:69:White midge
@@ -1159,8 +1652,12 @@ W:3:1:100:1
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:BITE:HURT:1d1
-F:RAND_50 | RAND_25 | CAN_FLY |
-F:WEIRD_MIND | ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:MORTAL
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
 S:MULTIPLY
 D:It is an evil relative of the moth, native to marshlands.
 
@@ -1174,8 +1671,12 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:6d1
 B:BITE:HURT:7d1
-F:WILD_TOO | WILD_WOOD | DROP_CORPSE | CAN_FLY | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:DROP_CORPSE
+F:MORTAL
+F:WILD_TOO
+F:WILD_WOOD
 D:An ominous-looking squirrel with dark fur, covered in 
 D:leaves for better masquerade. It has glowing eyes and 
 D:unusually sharp teeth. It is a horrific creation of the 
@@ -1189,10 +1690,14 @@ W:3:1:1700:20
 E:0:0:0:0:1:0
 O:0:75:20:5
 B:CRUSH:HURT:1d8
-F:FEMALE | 
-F:RAND_25 | DROP_60 | DROP_CORPSE | 
-F:BASH_DOOR | CAN_SWIM |
-F:EVIL | MORTAL | BASEANGBAND
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FEMALE
+F:MORTAL
+F:RAND_25
 D:A large black serpent's body with a female torso. 
 
 N:72:Spotted mushroom patch
@@ -1202,10 +1707,15 @@ W:3:1:30:3
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:POISON:2d4
-F:NEVER_MOVE | WILD_TOO | 
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:EMPTY_MIND
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+F:WILD_TOO
 D:Yum!  It looks quite tasty. 
 
 N:73:Silver jelly
@@ -1216,11 +1726,17 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:EAT_LITE:1d3
 B:TOUCH:EAT_LITE:1d3
-F:NEVER_MOVE | CAN_SWIM |
-F:STUPID | EMPTY_MIND |
-F:IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_15 | 
+F:CAN_SWIM
+F:EMPTY_MIND
+F:HURT_LITE
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+S:1_IN_15
 S:DRAIN_MANA
 D:It is a large pile of silver flesh that sucks all light from its 
 D:surroundings. 
@@ -1233,10 +1749,14 @@ E:1:1:1:2:1:1
 O:0:50:0:40
 B:HIT:HURT:1d4
 B:TOUCH:EAT_GOLD
-F:MALE | 
-F:DROP_60 | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:TAKE_ITEM
 D:A short little guy, in bedraggled clothes. He appears to be looking 
 D:for a good tavern. 
 
@@ -1247,9 +1767,13 @@ W:3:1:800:7
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d4
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | WILD_GRASS | 
-F:ANIMAL | DROP_SKELETON | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:MORTAL
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_TOO
 D:It is about two feet long and has sharp pincers. 
 
 N:76:Yellow mold
@@ -1259,10 +1783,14 @@ W:3:1:30:9
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:HURT:1d4
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:EMPTY_MIND
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:It is a strange growth on the dungeon floor. 
 
 # New monster added by furiosity for the Theme module
@@ -1275,8 +1803,13 @@ O:0:0:0:0
 B:BITE:HURT:2d2
 B:BITE:DISEASE:1d1
 B:BITE:EAT_FOOD:1d1
-F:BASEANGBAND | ANIMAL | MORTAL | AI_ANNOY | 
-F:RAND_50 | RAND_25 | SMART | WEIRD_MIND | 
+F:AI_ANNOY
+F:ANIMAL
+F:MORTAL
+F:RAND_25
+F:RAND_50
+F:SMART
+F:WEIRD_MIND
 S:1_IN_10
 S:SHRIEK
 D:A large humanoid form, relatively rare on Middle-earth.
@@ -1289,10 +1822,16 @@ W:3:2:200:4
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:CRAWL:LOSE_DEX:1d3
-F:RAND_50 | RAND_25 | CAN_SWIM |
-F:STUPID | WEIRD_MIND | 
-F:ANIMAL | HURT_LITE | NO_FEAR | 
-F:MORTAL | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:CAN_SWIM
+F:HURT_LITE
+F:MORTAL
+F:NO_CUT
+F:NO_FEAR
+F:RAND_25
+F:RAND_50
+F:STUPID
+F:WEIRD_MIND
 S:MULTIPLY
 D:It is a large slimy mass of worms. 
 
@@ -1303,12 +1842,19 @@ W:3:2:200:4
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:CRAWL:POISON:1d2
-F:ATTR_CLEAR | CAN_SWIM |
-F:RAND_50 | RAND_25 | 
-F:STUPID | WEIRD_MIND | INVISIBLE | 
-F:ANIMAL | 
-F:IM_POIS | HURT_LITE | NO_FEAR | 
-F:MORTAL | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:ATTR_CLEAR
+F:CAN_SWIM
+F:HURT_LITE
+F:IM_POIS
+F:INVISIBLE
+F:MORTAL
+F:NO_CUT
+F:NO_FEAR
+F:RAND_25
+F:RAND_50
+F:STUPID
+F:WEIRD_MIND
 S:MULTIPLY
 D:It is a disgusting mass of poisonous worms. 
 
@@ -1319,9 +1865,13 @@ W:3:1:500:6
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:GAZE:LOSE_STR:1d6
-F:NEVER_MOVE | CAN_FLY | DROP_CORPSE | 
-F:HURT_LITE | NO_FEAR | BASEANGBAND | HAS_LITE
-S:1_IN_11 | 
+F:CAN_FLY
+F:DROP_CORPSE
+F:HAS_LITE
+F:HURT_LITE
+F:NEVER_MOVE
+F:NO_FEAR
+S:1_IN_11
 S:DRAIN_MANA
 D:A disembodied eye, crackling with energy. 
 
@@ -1332,8 +1882,14 @@ W:4:1:0:4
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:EXPLODE:BLIND
-F:EMPTY_MIND | CAN_FLY | NONLIVING | SUSCEP_ELEC | 
-F:BASEANGBAND | HAS_LITE | RAND_50 | RAND_25 | NO_CUT
+F:CAN_FLY
+F:EMPTY_MIND
+F:HAS_LITE
+F:NONLIVING
+F:NO_CUT
+F:RAND_25
+F:RAND_50
+F:SUSCEP_ELEC
 D:A fast-moving bright light, apparently totally random in its movement. 
 
 N:82:Cave lizard
@@ -1343,8 +1899,15 @@ W:4:1:100:8
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d5
-F:ANIMAL | CAN_SWIM | DROP_CORPSE | HAS_EGG | WILD_ONLY
-F:MORTAL | NEUTRAL | NO_TARGET | IMPRESED | BASEANGBAND
+F:ANIMAL
+F:CAN_SWIM
+F:DROP_CORPSE
+F:HAS_EGG
+F:IMPRESED
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:WILD_ONLY
 D:It is an armoured lizard with a powerful bite. 
 
 N:83:Novice ranger
@@ -1355,13 +1918,20 @@ E:1:1:1:2:1:1
 O:25:45:25:0
 B:HIT:HURT:1d5
 B:HIT:HURT:1d5
-F:MALE | 
-F:FORCE_SLEEP | DROP_SKELETON | DROP_CORPSE
-F:DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR |  WILD_TOO | WILD_WOOD |
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_9 | 
-S:ARROW_2 | MISSILE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
+F:WILD_WOOD
+S:1_IN_9
+S:ARROW_2
+S:MISSILE
 D:An agile hunter, ready and relaxed. 
 
 N:84:Blue jelly
@@ -1371,10 +1941,18 @@ W:4:1:2000:14
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:COLD:1d6
-F:NEVER_MOVE | COLD_BLOOD | 
-F:STUPID | EMPTY_MIND | CAN_SWIM |
-F:IM_COLD | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | SUSCEP_FIRE | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:HURT_LITE
+F:IM_COLD
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+F:SUSCEP_FIRE
 D:It's a large pile of pulsing blue flesh. 
 
 N:85:Creeping copper coins
@@ -1385,10 +1963,17 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:HURT:1d4
 B:TOUCH:POISON:2d4
-F:ONLY_GOLD | DROP_1D2 | SUSCEP_ACID |
-F:COLD_BLOOD | BASH_DOOR | 
-F:IM_ELEC | IM_POIS | CHAR_MULTI | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:DROP_1D2
+F:IM_ELEC
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_GOLD
+F:SUSCEP_ACID
 D:It appears to be a pile of copper coins, until it starts crawling towards you 
 D:on tiny legs. 
 
@@ -1399,8 +1984,9 @@ W:4:1:200:1
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:POISON:1d3
-F:RAND_25 | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:MORTAL
+F:RAND_25
 S:MULTIPLY
 D:It is a very vicious rodent. 
 
@@ -1411,11 +1997,21 @@ W:4:1:900:15
 E:1:1:1:2:1:1
 O:25:50:0:20
 B:HIT:HURT:1d6
-F:MALE | 
-F:FRIENDS | DROP_60 | RAND_50 | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR |  WILD_TOO | WILD_WOOD |
-F:EVIL | ORC | HURT_LITE | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HAS_LITE
+F:HURT_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:ORC
+F:RAND_50
+F:WILD_TOO
+F:WILD_WOOD
 D:Immature Orcling, running wild and screaming all the time. 
 
 N:88:Swordfish
@@ -1426,8 +2022,11 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:HIT:HURT:1d5
 B:HIT:HURT:1d5
-F:ANIMAL | AQUATIC | WILD_TOO | COLD_BLOOD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:MORTAL
+F:WILD_TOO
 D:A fish with a swordlike "beak". 
 
 N:89:Blue worm mass
@@ -1437,11 +2036,19 @@ W:4:1:40:5
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:CRAWL:COLD:1d4
-F:RAND_50 | RAND_25 | 
-F:STUPID | WEIRD_MIND | COLD_BLOOD | 
-F:ANIMAL | IM_COLD | CAN_SWIM |
-F:HURT_LITE | NO_FEAR | 
-F:MORTAL | SUSCEP_FIRE | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:CAN_SWIM
+F:COLD_BLOOD
+F:HURT_LITE
+F:IM_COLD
+F:MORTAL
+F:NO_CUT
+F:NO_FEAR
+F:RAND_25
+F:RAND_50
+F:STUPID
+F:SUSCEP_FIRE
+F:WEIRD_MIND
 S:MULTIPLY
 D:It is a large slimy mass of worms. 
 
@@ -1453,8 +2060,15 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d5
 B:CRUSH:HURT:1d8
-F:RAND_25 | CAN_SWIM | DROP_SKELETON | DROP_CORPSE | WILD_TOO | 
-F:BASH_DOOR | HAS_EGG | ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_EGG
+F:MORTAL
+F:RAND_25
+F:WILD_TOO
 D:It is about ten feet long. 
 
 # New monster added by furiosity for the Theme module
@@ -1468,14 +2082,31 @@ O:30:50:20:0
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
-F:MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE
-F:ONLY_ITEM | DROP_2D2 | TAKE_ITEM | 
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | NO_CONF | NO_SLEEP | IM_FIRE | IM_ELEC | IM_COLD | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_4 |
-S:ARROW_2 | ARROW_3 | ARROW_4 | MISSILE | 
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:TAKE_ITEM
+S:1_IN_4
+S:ARROW_2
+S:ARROW_3
+S:ARROW_4
+S:MISSILE
 D:A person with no love for Gondor. He thinks you are a soldier in  
 D:the King's army.
 
@@ -1490,12 +2121,20 @@ O:80:10:10:0
 B:HIT:HURT:2d8
 B:HIT:HURT:2d8
 B:HIT:POISON:2d8
-F:MALE | DROP_SKELETON | DROP_CORPSE | 
-F:DROP_2D2 | SUSCEP_ELEC | FRIENDS | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_5 | 
-S:ARROW_1 | 
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:SUSCEP_ELEC
+F:TAKE_ITEM
+S:1_IN_5
+S:ARROW_1
 D:A person with no love for Rohan. He thinks you are a Rider of the 
 D:Mark in disguise.
 
@@ -1506,13 +2145,22 @@ W:6:2:1400:6
 E:1:1:1:2:1:1
 O:25:0:70:0
 B:HIT:HURT:1d4
-F:MALE | 
-F:FORCE_SLEEP | 
-F:FRIENDS | DROP_60 |  WILD_TOO | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_12 | 
-S:BLINK | BLIND | CONF | MISSILE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
+S:1_IN_12
+S:BLIND
+S:BLINK
+S:CONF
+S:MISSILE
 D:He is leaving behind a trail of dropped spell components. 
 
 N:94:Green naga
@@ -1523,10 +2171,18 @@ E:0:0:0:0:1:0
 O:0:25:0:65
 B:CRUSH:HURT:1d8
 B:SPIT:ACID:2d6
-F:FEMALE | 
-F:RAND_25 | TAKE_ITEM | DROP_60 | DROP_CORPSE | 
-F:BASH_DOOR | CAN_SWIM | WILD_TOO | WILD_SHORE |
-F:EVIL | IM_ACID | MORTAL | BASEANGBAND
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FEMALE
+F:IM_ACID
+F:MORTAL
+F:RAND_25
+F:TAKE_ITEM
+F:WILD_SHORE
+F:WILD_TOO
 D:A large green serpent with a female torso. Her green skin glistens with 
 D:acid. 
 
@@ -1538,7 +2194,10 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:3d1
 B:BITE:HURT:3d1
-F:ANIMAL | AQUATIC | WEIRD_MIND | RAND_25 | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:RAND_25
+F:WEIRD_MIND
 D:Yech! The disgusting thing only wants your blood! 
 
 N:96:Barracuda
@@ -1549,8 +2208,11 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d10
 B:BITE:HURT:1d10
-F:AQUATIC | ANIMAL | WILD_TOO | COLD_BLOOD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:MORTAL
+F:WILD_TOO
 D:A predatory fish with razor-sharp teeth. 
 
 N:97:Novice paladin
@@ -1561,13 +2223,20 @@ E:1:1:1:2:1:1
 O:0:70:25:0
 B:HIT:HURT:1d7
 B:HIT:HURT:1d7
-F:MALE | GOOD | WILD_TOO | DROP_SKELETON | DROP_CORPSE |
-F:FORCE_SLEEP | 
-F:DROP_60 |
-F:OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_9 | 
-S:SCARE | CAUSE_1
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
+S:1_IN_9
+S:CAUSE_1
+S:SCARE
 D:An adventurer both devoutly religious and skillful in combat.  
 D:He seems to consider you an agent of Morgoth. 
 
@@ -1581,10 +2250,19 @@ O:30:70:0:0
 B:HIT:HURT:1d4
 B:HIT:HURT:1d4
 B:BITE:HURT:1d6
-F:MALE | 
-F:FRIENDS | DROP_60 | WILD_TOO | WILD_WOOD | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | REGENERATE | MALE | 
-F:EVIL | HURT_LITE | BASEANGBAND
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HURT_LITE
+F:MALE
+F:MALE
+F:OPEN_DOOR
+F:REGENERATE
+F:WILD_TOO
+F:WILD_WOOD
 D:A dark-skinned human who worships Sauron. A powerful warrior, 
 D:almost as strong as a troll. He has bizarre white eyes. 
 
@@ -1595,10 +2273,18 @@ W:5:1:300:7
 E:0:0:0:0:0:0
 O:45:20:20:0
 B:CRAWL:COLD:1d4
-F:RAND_50 | RAND_25 | DROP_60 | 
-F:STUPID | EMPTY_MIND | CAN_SWIM |
-F:IM_COLD | SUSCEP_FIRE
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:DROP_60
+F:EMPTY_MIND
+F:IM_COLD
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RAND_25
+F:RAND_50
+F:STUPID
+F:SUSCEP_FIRE
 D:It's blue and it's oozing. 
 
 N:100:Green glutton ghost
@@ -1608,10 +2294,19 @@ W:5:1:0:15
 E:0:0:0:0:0:0
 O:30:30:30:5
 B:TOUCH:EAT_FOOD:1d1
-F:RAND_50 | RAND_25 | 
-F:DROP_60 | DROP_90 | CAN_FLY |
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | 
-F:EVIL | UNDEAD | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_60
+F:DROP_90
+F:EVIL
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
+F:RAND_25
+F:RAND_50
+F:UNDEAD
 D:It is a very ugly green ghost with a voracious appetite. 
 
 N:101:Green jelly
@@ -1621,10 +2316,16 @@ W:5:1:2500:18
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:ACID:1d2
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | CAN_SWIM |
-F:IM_ACID | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:EMPTY_MIND
+F:HURT_LITE
+F:IM_ACID
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:It is a large pile of pulsing green flesh. 
 
 # New monster added for the Theme module
@@ -1638,9 +2339,22 @@ O:0:50:0:50
 B:HIT:HURT:3d8
 B:HIT:HURT:3d5
 B:HIT:HURT:3d5
-F:BASEANGBAND | UNIQUE | FORCE_MAXHP | CAN_SPEAK | SMART | 
-F:EVIL | ORC | OPEN_DOOR | BASH_DOOR | IM_FIRE | IM_COLD | 
-F:IM_POIS | ESCORT | ESCORTS | DROP_1D2 | DROP_GOOD | MALE | 
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_GOOD
+F:ESCORT
+F:ESCORTS
+F:EVIL
+F:FORCE_MAXHP
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:OPEN_DOOR
+F:ORC
+F:SMART
+F:UNIQUE
 D:A strong and cunning orc warrior, a commander of Saruman's orcs. 
 
 # New monster added for the Theme module
@@ -1654,19 +2368,50 @@ O:0:45:45:10
 B:INSULT:INSANITY:2d10
 B:INSULT:EAT_GOLD:2d10
 B:INSULT:EAT_ITEM:2d10
-F:MALE | SMART | CAN_SPEAK | JOKEANGBAND | 
-F:FORCE_MAXHP |
-F:RAND_25 |
-F:DROP_90 | DROP_GOOD | DROP_GREAT |
-F:DROP_4D2 | DROP_2D2 | ONLY_ITEM | AI_ANNOY | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | KILL_BODY | RES_NETH | RES_DISE |
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP |
-F:RES_NEXU | RES_PLAS | HAS_LITE | NO_CUT | NO_STUN |
-F:REFLECTING |
-S:1_IN_5 
-S:HEAL | HASTE | TPORT | TELE_AWAY | BLIND | CONF | SCARE | 
-S:CAUSE_2 | FORGET | TRAPS | 
-S:BO_MANA | ROCKET |
+F:AI_ANNOY
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_90
+F:DROP_GOOD
+F:DROP_GREAT
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:JOKEANGBAND
+F:KILL_BODY
+F:MALE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:RAND_25
+F:REFLECTING
+F:RES_DISE
+F:RES_NETH
+F:RES_NEXU
+F:RES_PLAS
+F:SMART
+S:1_IN_5
+S:BLIND
+S:BO_MANA
+S:CAUSE_2
+S:CONF
+S:FORGET
+S:HASTE
+S:HEAL
+S:ROCKET
+S:SCARE
+S:TELE_AWAY
+S:TPORT
 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  
@@ -1679,10 +2424,15 @@ W:5:2:500:20
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:GAZE:UN_BONUS
-F:ATTR_MULTI | ATTR_ANY | RES_DISE | DROP_CORPSE | 
-F:NEVER_MOVE | CAN_FLY | 
-F:HURT_LITE | NO_FEAR | BASEANGBAND
-S:1_IN_9 | 
+F:ATTR_ANY
+F:ATTR_MULTI
+F:CAN_FLY
+F:DROP_CORPSE
+F:HURT_LITE
+F:NEVER_MOVE
+F:NO_FEAR
+F:RES_DISE
+S:1_IN_9
 S:DRAIN_MANA
 D:A disembodied eye, crackling with magic. 
 
@@ -1693,11 +2443,19 @@ W:5:1:40:6
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:CRAWL:FIRE:1d6
-F:RAND_50 | RAND_25 | SUSCEP_COLD |
-F:STUPID | EMPTY_MIND | BASH_DOOR | 
-F:ANIMAL | IM_FIRE | CAN_SWIM |
-F:HURT_LITE | NO_FEAR | 
-F:MORTAL | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:EMPTY_MIND
+F:HURT_LITE
+F:IM_FIRE
+F:MORTAL
+F:NO_CUT
+F:NO_FEAR
+F:RAND_25
+F:RAND_50
+F:STUPID
+F:SUSCEP_COLD
 S:MULTIPLY
 D:It is a large slimy mass of worms. 
 
@@ -1708,8 +2466,16 @@ W:5:1:200:15
 E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:POISON:2d4
-F:RAND_50 | CAN_SWIM | WILD_TOO | DROP_SKELETON | DROP_CORPSE | BASH_DOOR | 
-F:ANIMAL | IM_POIS | HAS_EGG | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_EGG
+F:IM_POIS
+F:MORTAL
+F:RAND_50
+F:WILD_TOO
 D:It has a copper head and sharp venomous fangs. 
 
 N:107:Death sword
@@ -1722,10 +2488,25 @@ B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
-F:NEVER_MOVE | NONLIVING | NO_FEAR | SUSCEP_ACID |
-F:STUPID | EMPTY_MIND | COLD_BLOOD | CHAR_MULTI | NO_CONF | NO_SLEEP | 
-F:DROP_90 | EVIL | IM_COLD | IM_FIRE | FORCE_MAXHP | IM_ELEC | IM_POIS | 
-F:BASEANGBAND | HAS_LITE | NO_CUT
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:DROP_90
+F:EMPTY_MIND
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NEVER_MOVE
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+F:SUSCEP_ACID
 D:A bloodthirsty blade lurking for prey. Beware! 
 
 N:108:Purple mushroom patch
@@ -1737,9 +2518,14 @@ O:0:0:0:0
 B:SPORE:LOSE_CON:1d2
 B:SPORE:LOSE_CON:1d2
 B:SPORE:LOSE_CON:1d2
-F:NEVER_MOVE | CAN_SWIM |
-F:STUPID | EMPTY_MIND | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:EMPTY_MIND
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:Yuck!  It doesn't look so tasty. 
 
 N:109:Apprentice priest
@@ -1749,13 +2535,22 @@ W:6:2:1500:6
 E:1:1:1:2:1:1
 O:20:50:20:5
 B:HIT:HURT:1d5
-F:MALE | GOOD |
-F:FORCE_SLEEP |  WILD_TOO | DROP_SKELETON | DROP_CORPSE | 
-F:FRIENDS | DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_12 | 
-S:HEAL | SCARE | CAUSE_1
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:GOOD
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
+S:1_IN_12
+S:CAUSE_1
+S:HEAL
+S:SCARE
 D:He is tripping over his priestly robes. 
 
 N:110:Apprentice warrior
@@ -1766,10 +2561,16 @@ E:1:1:1:2:1:1
 O:0:95:0:0
 B:HIT:HURT:1d7
 B:HIT:HURT:1d6
-F:MALE | 
-F:FRIENDS | DROP_60 | WILD_TOO |
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FRIENDS
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
 D:He looks inexperienced but tough. 
 
 # New monster added for the Theme module
@@ -1780,10 +2581,13 @@ I:110:6d6:25:80:200
 W:8:4:0:30
 B:HIT:HURT:3d4
 B:TOUCH:EAT_GOLD
-F:MALE
-F:DROP_1D2 | DROP_GOOD
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_GOOD
 F:EVIL
+F:MALE
+F:OPEN_DOOR
+F:TAKE_ITEM
 S:1_IN_8
 S:ARROW_1
 D:A filthy little dwarf. He wants your purse, and judging by the 
@@ -1797,13 +2601,19 @@ I:120:7d10:20:16:20
 W:10:1:0:50
 B:HIT:HURT:1d6
 B:HIT:HURT:UN_BONUS:1d6
-F:MALE
-F:FORCE_SLEEP
-F:ONLY_ITEM | DROP_1D2
-F:OPEN_DOOR | BASH_DOOR
+F:BASH_DOOR
+F:DROP_1D2
 F:EVIL
+F:FORCE_SLEEP
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
 S:1_IN_5
-S:BLIND | CONF | MISSILE | DARKNESS | BA_POIS
+S:BA_POIS
+S:BLIND
+S:CONF
+S:DARKNESS
+S:MISSILE
 D:A small dwarf in mage's robes. He looks comical, but he has slain any 
 D:adventurer foolish enough to laugh at him.
 
@@ -1814,10 +2624,15 @@ W:6:1:50:20
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:CONFUSE:1d4
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | CAN_SWIM |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:EMPTY_MIND
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:A strange brown growth on the dungeon floor. 
 
 N:114:Giant brown bat
@@ -1827,9 +2642,15 @@ W:6:1:600:10
 E:0:1:1:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d3
-F:RAND_50 | CAN_FLY | WILD_TOO | WILD_MOUNTAIN | WILD_WOOD |
-F:ANIMAL | DROP_CORPSE | AI_ANNOY
-F:MORTAL | BASEANGBAND
+F:AI_ANNOY
+F:ANIMAL
+F:CAN_FLY
+F:DROP_CORPSE
+F:MORTAL
+F:RAND_50
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:It screeches as it attacks. 
 
 # New monster added by furiosity for the Theme module
@@ -1839,8 +2660,17 @@ I:120:1d1:6:5:10
 W:3:1:100:1
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:RAND_50 | RAND_25 | NEUTRAL | NO_TARGET | WILD_ONLY | WILD_WOOD | NEVER_BLOW | 
-F:WEIRD_MIND | ANIMAL | MORTAL | BASEANGBAND | WILD_GRASS | 
+F:ANIMAL
+F:MORTAL
+F:NEUTRAL
+F:NEVER_BLOW
+F:NO_TARGET
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_ONLY
+F:WILD_WOOD
 D:A large insect with beautiful fluttering wings.
 
 N:116:Apprentice rogue
@@ -1851,10 +2681,17 @@ E:1:1:1:2:1:1
 O:50:25:0:20
 B:HIT:HURT:1d6
 B:TOUCH:EAT_GOLD
-F:MALE | FRIENDS | 
-F:DROP_60 | DROP_SKELETON | DROP_CORPSE | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | WILD_TOO |
-F:EVIL | MORTAL | BASEANGBAND
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:TAKE_ITEM
+F:WILD_TOO
 D:A rather shifty individual. 
 
 N:117:Creeping silver coins
@@ -1865,9 +2702,18 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:HURT:1d6
 B:TOUCH:POISON:2d6
-F:ONLY_GOLD | DROP_60 | DROP_1D2 | 
-F:COLD_BLOOD | BASH_DOOR | SUSCEP_ACID | CHAR_MULTI | 
-F:IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_60
+F:IM_ELEC
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_GOLD
+F:SUSCEP_ACID
 D:It appears to be a pile of silver coins, until it starts crawling towards you 
 D:on tiny legs. 
 
@@ -1878,11 +2724,19 @@ W:6:1:1600:15
 E:1:1:1:2:1:1
 O:20:50:5:15
 B:HIT:HURT:1d8
-F:MALE | 
-F:FRIENDS | DROP_60 | WILD_TOO | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | HURT_LITE | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HAS_LITE
+F:HURT_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:ORC
+F:WILD_TOO
 D:He is one of the many weaker 'slave' orcs, often mistakenly known as a 
 D:goblin. 
 
@@ -1893,8 +2747,16 @@ W:6:1:200:20
 E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:POISON:2d5
-F:RAND_50 | CAN_SWIM | WILD_TOO | DROP_SKELETON | DROP_CORPSE | 
-F:BASH_DOOR | HAS_EGG | ANIMAL | IM_POIS | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_EGG
+F:IM_POIS
+F:MORTAL
+F:RAND_50
+F:WILD_TOO
 D:It is recognised by the hard-scaled end of its body that is often rattled 
 D:to frighten its prey. 
 
@@ -1906,9 +2768,14 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:ACID:2d4
 B:BITE:ACID:2d6
-F:ANIMAL | EMPTY_MIND | KILL_ITEM | KILL_BODY | CAN_SWIM |  WILD_TOO |
-F:DROP_CORPSE | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_SWIM
+F:DROP_CORPSE
+F:EMPTY_MIND
+F:KILL_BODY
+F:KILL_ITEM
+F:MORTAL
+F:WILD_TOO
 S:1_IN_10
 S:BR_ACID
 D:It is slowly making its way towards you, eating everything in 
@@ -1921,9 +2788,13 @@ W:7:1:200:16
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:LOSE_STR:2d4
-F:RAND_50 | WILD_ONLY | WILD_SHORE | 
-F:BASH_DOOR | DROP_CORPSE | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:MORTAL
+F:RAND_50
+F:WILD_ONLY
+F:WILD_SHORE
 D:It looks poisonous. 
 
 N:122:Dark elf
@@ -1934,13 +2805,20 @@ E:1:1:1:2:1:1
 O:20:20:50:10
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
-F:MALE | 
-F:FORCE_SLEEP | 
-F:DROP_90 | 
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | HURT_LITE | BASEANGBAND | HAS_LITE
-S:1_IN_10 | 
-S:CONF | DARKNESS | MISSILE
+F:BASH_DOOR
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:HURT_LITE
+F:MALE
+F:OPEN_DOOR
+S:1_IN_10
+S:CONF
+S:DARKNESS
+S:MISSILE
 D:An elven figure with jet black skin and white hair, his eyes are large and 
 D:twisted with evil. 
 
@@ -1952,8 +2830,15 @@ W:3:1:100:1
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:BITE:EAT_LITE:1d1
-F:RAND_50 | RAND_25 | HURT_LITE | WILD_TOO | WILD_WOOD | 
-F:WEIRD_MIND | ANIMAL | MORTAL | BASEANGBAND | WILD_GRASS | 
+F:ANIMAL
+F:HURT_LITE
+F:MORTAL
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_TOO
+F:WILD_WOOD
 S:MULTIPLY
 D:Nocturnal insect of a kind closely related to butterflies.
 
@@ -1966,12 +2851,22 @@ O:0:0:0:0
 B:CLAW:HURT:1d2
 B:CLAW:HURT:1d2
 B:BITE:POISON
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EVIL
+F:FRIENDS
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
 F:RAND_25
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | FRIENDS |
-F:EVIL | UNDEAD | IM_POIS | IM_COLD | 
-F:NO_CONF | NO_SLEEP | HURT_LITE | BASEANGBAND | NO_CUT
+F:UNDEAD
 S:1_IN_10
-S:CAUSE_1 | S_UNDEAD
+S:CAUSE_1
+S:S_UNDEAD
 D:A frightening skeletal figure in a black robe. 
 
 N:125:Rotting corpse
@@ -1982,9 +2877,19 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:CLAW:POISON:1d3
 B:CLAW:POISON:1d3
-F:OPEN_DOOR | BASH_DOOR | FRIENDS |
-F:NO_CONF | NO_SLEEP | UNDEAD | EVIL | NO_FEAR | IM_POIS | 
-F:IM_COLD | COLD_BLOOD | EMPTY_MIND | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:FRIENDS
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:UNDEAD
 D:Corpses awakened from their sleep by dark sorcery. 
 
 N:126:Cave orc
@@ -1994,11 +2899,18 @@ W:7:1:1900:20
 E:1:1:1:2:1:1
 O:20:70:0:0
 B:HIT:HURT:1d8
-F:MALE | 
-F:FRIENDS | DROP_60 | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | HURT_LITE | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HAS_LITE
+F:HURT_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:ORC
 D:He is often found in huge numbers in deep caves. 
 
 N:127:Wood spider
@@ -2009,10 +2921,16 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d3
 B:STING:POISON:1d4
-F:FRIENDS | DROP_SKELETON | 
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | WILD_WOOD | 
-F:ANIMAL | SPIDER | IM_POIS | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:FRIENDS
+F:IM_POIS
+F:MORTAL
+F:SPIDER
+F:WEIRD_MIND
+F:WILD_TOO
+F:WILD_WOOD
 D:It scuttles towards you. 
 
 N:128:Hurog
@@ -2022,10 +2940,14 @@ W:7:2:300:16
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:1d8
-F:FRIENDS | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DEMON | IM_FIRE | NO_FEAR | BASEANGBAND | 
-S:1_IN_50 | 
+F:BASH_DOOR
+F:DEMON
+F:EVIL
+F:FRIENDS
+F:IM_FIRE
+F:NO_FEAR
+F:OPEN_DOOR
+S:1_IN_50
 S:BR_NETH
 D:A minor demonic servant of evil. Its features remind you of a dog - in fact, 
 D:Huroeg are the result of the corruption of dogs by Morgoth. 
@@ -2037,9 +2959,13 @@ W:7:3:550:30
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:GAZE:BLIND:2d6
-F:NEVER_MOVE | CAN_FLY | DROP_CORPSE | 
-F:HURT_LITE | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_7 | 
+F:CAN_FLY
+F:DROP_CORPSE
+F:HURT_LITE
+F:NEVER_MOVE
+F:NO_CUT
+F:NO_FEAR
+S:1_IN_7
 S:DRAIN_MANA
 D:A disembodied eye, bloodshot and nasty. 
 
@@ -2051,10 +2977,17 @@ E:0:0:0:0:1:0
 O:50:0:50:0
 B:CRUSH:HURT:1d10
 B:BITE:LOSE_STR:1d4
-F:FEMALE |  CAN_SWIM | WILD_TOO | WILD_SHORE |
-F:RAND_25 | DROP_60 | 
-F:TAKE_ITEM | BASH_DOOR | DROP_CORPSE | 
-F:EVIL | MORTAL | BASEANGBAND
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FEMALE
+F:MORTAL
+F:RAND_25
+F:TAKE_ITEM
+F:WILD_SHORE
+F:WILD_TOO
 D:A large red snake with a woman's torso. 
 
 N:131:Red jelly
@@ -2064,10 +2997,15 @@ W:7:1:2500:26
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:LOSE_STR:1d5
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | 
-F:HURT_LITE |  CAN_SWIM |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:EMPTY_MIND
+F:HURT_LITE
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:It is a large pulsating mound of red flesh. 
 
 # New monster added by furiosity for the Theme module
@@ -2077,9 +3015,18 @@ I:110:1d1:30:1:10
 W:0:3:80:0
 E:0:1:1:0:1:0
 O:0:0:0:0
-F:RAND_25 | CAN_FLY | WILD_ONLY | WILD_WOOD | WILD_GRASS | 
-F:ANIMAL | DROP_SKELETON | NEVER_BLOW | NEUTRAL | NO_TARGET | 
-F:MORTAL | BASEANGBAND | DG_CURSE | 
+F:ANIMAL
+F:CAN_FLY
+F:DG_CURSE
+F:DROP_SKELETON
+F:MORTAL
+F:NEUTRAL
+F:NEVER_BLOW
+F:NO_TARGET
+F:RAND_25
+F:WILD_GRASS
+F:WILD_ONLY
+F:WILD_WOOD
 D:Small brown birds of thrush kind, famous for their clear 
 D:singing, and the fact that they will sing during the night 
 D:as well as the day (hence their name). Since the days of 
@@ -2095,12 +3042,23 @@ E:0:0:0:0:0:0
 O:60:0:25:0
 B:HIT:HURT:2d2
 B:TOUCH:LOSE_WIS
-F:RAND_50 | DROP_60 | DROP_90 | CAN_FLY |
-F:INVISIBLE | COLD_BLOOD | TAKE_ITEM | PASS_WALL | 
-F:EVIL | UNDEAD | 
-F:IM_COLD | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_15 | 
-S:TPORT | DRAIN_MANA
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_60
+F:DROP_90
+F:EVIL
+F:IM_COLD
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
+F:RAND_50
+F:TAKE_ITEM
+F:UNDEAD
+S:1_IN_15
+S:DRAIN_MANA
+S:TPORT
 D:It is almost insubstantial. 
 
 N:134:Night lizard
@@ -2111,8 +3069,12 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d6
 B:BITE:HURT:1d6
-F:ANIMAL | CAN_SWIM | WILD_TOO | DROP_CORPSE
-F:MORTAL | HAS_EGG | BASEANGBAND
+F:ANIMAL
+F:CAN_SWIM
+F:DROP_CORPSE
+F:HAS_EGG
+F:MORTAL
+F:WILD_TOO
 D:It is a black lizard with overlapping scales and a powerful jaw. 
 
 # New monster added by furiosity for the Theme module
@@ -2125,8 +3087,16 @@ O:0:0:0:0
 B:BITE:HURT:1d4
 B:BITE:HURT:1d4
 B:BITE:DISEASE:1d4
-F:ANIMAL | WILD_TOO | WILD_WOOD | CAN_FLY | DROP_CORPSE | WILD_SHORE | 
-F:MORTAL | HAS_EGG | BASEANGBAND | EVIL | WILD_SWAMP | IMPRESED | 
+F:ANIMAL
+F:CAN_FLY
+F:DROP_CORPSE
+F:EVIL
+F:HAS_EGG
+F:IMPRESED
+F:MORTAL
+F:WILD_SHORE
+F:WILD_TOO
+F:WILD_WOOD
 D:It is a hooded crow, camouflaged well for a swampland or forest. 
 D:It is a carrion bird that often lives close alongside the mewlips, 
 D:the remains of whose prey it devours.
@@ -2138,10 +3108,19 @@ W:8:1:1700:26
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:2d5
-F:COLD_BLOOD | EMPTY_MIND | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | UNDEAD | 
-F:IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:ORC
+F:UNDEAD
 D:It is an animated orc skeleton. 
 
 N:137:Grima the Wormtongue, Agent of Saruman
@@ -2154,14 +3133,28 @@ B:HIT:HURT:1d7
 B:HIT:HURT:1d7
 B:TOUCH:EAT_GOLD
 B:INSULT:*
-F:UNIQUE | MALE | CAN_SPEAK |
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | DROP_GREAT | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | 
-F:EVIL | RES_TELE | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_5 | 
-S:HEAL | SLOW | TRAPS | BO_COLD | BA_POIS
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_GOOD
+F:DROP_GREAT
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:TAKE_ITEM
+F:UNIQUE
+S:1_IN_5
+S:BA_POIS
+S:BO_COLD
+S:HEAL
+S:SLOW
 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. 
@@ -2176,12 +3169,29 @@ B:HIT:HURT:1d5
 B:HIT:HURT:1d5
 B:TOUCH:EAT_GOLD
 B:TOUCH:EAT_ITEM
-F:UNIQUE | MALE | FORCE_SLEEP | FORCE_MAXHP | CAN_SPEAK |
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | DROP_GREAT | WILD_TOO | WILD_WOOD |
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | EVIL | DROP_SKELETON | DROP_CORPSE
-F:MORTAL | JOKEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:JOKEANGBAND
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:TAKE_ITEM
+F:UNIQUE
+F:WILD_TOO
+F:WILD_WOOD
 S:1_IN_5
-S:ARROW_2 | HEAL | TRAPS
+S:ARROW_2
+S:HEAL
 D:The legendary archer who steals from the rich (you qualify). 
 
 # New monster added by furiosity for the Theme module
@@ -2193,8 +3203,15 @@ E:0:1:1:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d4
 B:BITE:HURT:1d4
-F:ANIMAL | WILD_ONLY | WILD_SHORE | CAN_FLY | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND | WILD_OCEAN | NEUTRAL | NO_TARGET | 
+F:ANIMAL
+F:CAN_FLY
+F:DROP_CORPSE
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:WILD_OCEAN
+F:WILD_ONLY
+F:WILD_SHORE
 D:A sea-bird found around the shores of Middle-earth. The sound of a 
 D:gull mewing is said to awaken the Sea-longing in the heart of an Elf. 
 
@@ -2208,10 +3225,23 @@ B:HIT:HURT:1d11
 B:HIT:HURT:1d11
 B:HIT:HURT:1d10
 B:HIT:HURT:1d10
-F:UNIQUE | MALE | EVIL | ORC | FORCE_MAXHP | ESCORT | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | SPECIAL_GENE | 
-F:OPEN_DOOR | BASH_DOOR | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:ORC
+F:SPECIAL_GENE
+F:UNIQUE
 D:An orc soldier who served under Shagrat in the garrison of the Tower of Cirith Ungol. 
 
 # New monster added by furiosity for the Theme module
@@ -2222,9 +3252,16 @@ W:1:9:80:0
 E:0:1:1:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d1
-F:RAND_25 | CAN_FLY | WILD_TOO | WILD_WOOD | WILD_GRASS | 
-F:ANIMAL | DROP_SKELETON | HAS_EGG | IMPRESED | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:DROP_SKELETON
+F:HAS_EGG
+F:IMPRESED
+F:MORTAL
+F:RAND_25
+F:WILD_GRASS
+F:WILD_TOO
+F:WILD_WOOD
 S:1_IN_10
 S:SHRIEK
 D:A tiny scarlet bird from Numenor, with a really high voice.
@@ -2237,12 +3274,19 @@ E:1:1:1:2:1:1
 O:0:80:0:15
 B:HIT:HURT:1d5
 B:HIT:HURT:1d5
-F:MALE | 
-F:FORCE_SLEEP | FRIENDS | DROP_60 | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_9 | 
-S:ARROW_2 | MISSILE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+S:1_IN_9
+S:ARROW_2
+S:MISSILE
 D:An agile hunter, ready and relaxed. 
 
 N:143:Giant salamander
@@ -2252,11 +3296,15 @@ W:8:1:600:50
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:FIRE:3d6
-F:FORCE_SLEEP | SUSCEP_COLD |
-F:RAND_25 | 
-F:ANIMAL | IM_FIRE | CAN_SWIM | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND
-S:1_IN_9 
+F:ANIMAL
+F:CAN_SWIM
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:IM_FIRE
+F:MORTAL
+F:RAND_25
+F:SUSCEP_COLD
+S:1_IN_9
 S:BR_FIRE
 D:A large black and yellow lizard. You'd better run away! 
 
@@ -2267,7 +3315,14 @@ W:8:2:0:28
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:TERRIFY:1d4
-F:PASS_WALL | NO_CONF | NO_SLEEP | NONLIVING | IM_ACID | CAN_FLY | JOKEANGBAND | NO_CUT
+F:CAN_FLY
+F:IM_ACID
+F:JOKEANGBAND
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
 D:A black hole in the fabric of reality. 
 
 # New monster added by furiosity for the Theme module
@@ -2277,9 +3332,18 @@ I:120:9d10:8:100:255
 W:20:3:300:0
 E:0:1:0:6:1:0
 O:0:0:0:0
-F:CAN_FLY | NEUTRAL | NO_TARGET | GOOD |
-F:MORTAL |  NEVER_BLOW | DG_CURSE | WILD_ONLY | 
-F:AQUATIC | WILD_SHORE | NO_TARGET | WILD_OCEAN
+F:AQUATIC
+F:CAN_FLY
+F:DG_CURSE
+F:GOOD
+F:MORTAL
+F:NEUTRAL
+F:NEVER_BLOW
+F:NO_TARGET
+F:NO_TARGET
+F:WILD_OCEAN
+F:WILD_ONLY
+F:WILD_SHORE
 D:Beautiful and graceful large white birds inhabiting aquatic 
 D:regions. They never do any harm, and it is said that anyone 
 D:who kills a swan incurs the wrath of the Valar.
@@ -2291,10 +3355,16 @@ W:8:1:40:28
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:TERRIFY:1d4
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | 
-F:IM_ACID | IM_POIS | CAN_SWIM |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:EMPTY_MIND
+F:IM_ACID
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:It is a strange growth on the dungeon floor. 
 
 N:147:Apprentice paladin
@@ -2305,13 +3375,21 @@ E:1:1:1:2:1:1
 O:30:55:10:0
 B:HIT:HURT:1d7
 B:HIT:HURT:1d7
-F:MALE | GOOD | WILD_TOO | DROP_SKELETON | DROP_CORPSE |
-F:FORCE_SLEEP | 
-F:FRIENDS | DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_9 | 
-S:SCARE | CAUSE_1
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:GOOD
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
+S:1_IN_9
+S:CAUSE_1
+S:SCARE
 D:He thinks you are an agent of Morgoth. 
 
 N:148:Caborrog
@@ -2321,10 +3399,14 @@ W:8:3:1000:16
 E:0:0:0:0:1:0
 O:0:0:0:0
 B:HIT:HURT:1d8
-F:FRIENDS | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DEMON | IM_FIRE | NO_FEAR | BASEANGBAND |
-S:1_IN_50 | 
+F:BASH_DOOR
+F:DEMON
+F:EVIL
+F:FRIENDS
+F:IM_FIRE
+F:NO_FEAR
+F:OPEN_DOOR
+S:1_IN_50
 S:BR_NETH
 D:A minor demonic servant of evil. It resembles a frog - in fact, 
 D:Caborroeg are the result of Morgoth's corruption of frogs. 
@@ -2336,11 +3418,18 @@ W:8:1:2000:25
 E:1:1:1:2:1:1
 O:10:70:10:0
 B:HIT:HURT:1d10
-F:MALE | 
-F:FRIENDS | DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | ORC | HURT_LITE | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HAS_LITE
+F:HURT_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:ORC
 D:He is a hardy well-weathered survivor. 
 
 N:150:Bandit
@@ -2351,10 +3440,18 @@ E:1:1:1:2:1:1
 O:25:60:0:0
 B:HIT:HURT:2d4
 B:TOUCH:EAT_GOLD
-F:MALE | 
-F:DROP_1D2 | WILD_TOO | WILD_WOOD | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:TAKE_ITEM
+F:WILD_TOO
+F:WILD_WOOD
 D:He is after your cash! 
 
 N:151:Hunting hawk
@@ -2366,8 +3463,16 @@ O:0:0:0:0
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
 B:BITE:HURT:1d4
-F:ANIMAL | NO_FEAR | CAN_FLY | WILD_WOOD | WILD_TOO | DROP_CORPSE
-F:MORTAL | HAS_EGG | IMPRESED | BASEANGBAND | AQUATIC 
+F:ANIMAL
+F:AQUATIC
+F:CAN_FLY
+F:DROP_CORPSE
+F:HAS_EGG
+F:IMPRESED
+F:MORTAL
+F:NO_FEAR
+F:WILD_TOO
+F:WILD_WOOD
 D:Trained to hunt and kill without fear. 
 
 N:152:Phantom warrior
@@ -2378,8 +3483,15 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:HURT:1d11
 B:HIT:HURT:1d11
-F:PASS_WALL | NO_SLEEP | FRIENDS | COLD_BLOOD | NONLIVING |
-F:NO_FEAR | EMPTY_MIND | CAN_FLY | BASEANGBAND | NO_CUT
+F:CAN_FLY
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FRIENDS
+F:NONLIVING
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:PASS_WALL
 D:Spectral creatures that are half real, half illusion. 
 
 # New monster added by furiosity for the Theme module
@@ -2391,8 +3503,16 @@ E:0:1:1:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d3
 B:BITE:HURT:1d3
-F:ANIMAL | WILD_ONLY | WILD_WOOD | CAN_FLY | DROP_CORPSE | 
-F:MORTAL | HAS_EGG | BASEANGBAND | NEUTRAL | NO_TARGET | WILD_GRASS | 
+F:ANIMAL
+F:CAN_FLY
+F:DROP_CORPSE
+F:HAS_EGG
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:WILD_GRASS
+F:WILD_ONLY
+F:WILD_WOOD
 D:Large speckled brown birds with a special fondness for snails, 
 D:whose shells they remove by breaking them against stones. 
 
@@ -2405,9 +3525,15 @@ O:0:0:0:0
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
 B:BITE:HURT:1d4
-F:OPEN_DOOR | BASH_DOOR | WILD_TOO | WILD_MOUNTAIN | DROP_CORPSE | 
-F:ANIMAL | IM_COLD | 
-F:MORTAL | SUSCEP_FIRE | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:IM_COLD
+F:MORTAL
+F:OPEN_DOOR
+F:SUSCEP_FIRE
+F:WILD_MOUNTAIN
+F:WILD_TOO
 D:A large white figure covered in shaggy fur. 
 
 # New monster added by furiosity for the Theme module
@@ -2418,9 +3544,15 @@ W:10:1:600:40
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d6
-F:BASH_DOOR | WILD_TOO | WILD_WOOD | WILD_WASTE | WILD_MOUNTAIN | 
-F:ANIMAL | DROP_CORPSE | MORTAL | BASEANGBAND 
-S:1_IN_8 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:MORTAL
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WASTE
+F:WILD_WOOD
+S:1_IN_8
 S:SHRIEK
 D:Dog-like carnivore of woodland and farmland, distinctive for 
 D:its red-orange coats and its eerie plaintive cries.
@@ -2432,9 +3564,10 @@ W:9:1:250:2
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:POISON:1d4
-F:RAND_25 | 
-F:ANIMAL | IM_POIS | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:IM_POIS
+F:MORTAL
+F:RAND_25
 S:MULTIPLY
 D:It is a rodent of unusual size. 
 
@@ -2447,8 +3580,15 @@ O:0:0:0:0
 B:CLAW:HURT:1d2
 B:CLAW:HURT:1d2
 B:BITE:HURT:1d3
-F:FEMALE | CAN_FLY | WILD_TOO | WILD_MOUNTAIN | DROP_CORPSE | 
-F:RAND_25 | ANIMAL | EVIL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:DROP_CORPSE
+F:EVIL
+F:FEMALE
+F:MORTAL
+F:RAND_25
+F:WILD_MOUNTAIN
+F:WILD_TOO
 D:A woman's face on the body of a vicious black bird. 
 
 # New monster added by furiosity for the Theme module
@@ -2459,8 +3599,12 @@ W:3:1:100:1
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:BITE:HURT:1d1
-F:RAND_50 | RAND_25 | EVIL | 
-F:WEIRD_MIND | ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:EVIL
+F:MORTAL
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
 S:SHRIEK
 D:An evil swarm of bloodsucking flies. They are grey, brown and black 
 D:insects, together in a homogeneous mass. They are loud, hateful and 
@@ -2476,12 +3620,26 @@ E:1:1:1:2:1:1
 O:25:20:25:20
 B:BITE:POISON:5d5
 B:BITE:POISON:5d5
-F:MALE | CAN_SWIM | IM_POIS | IM_ACID | AQUATIC | 
-F:DROP_60 | DROP_2D2 | FRIENDS | DROP_CORPSE |
-F:OPEN_DOOR | BASH_DOOR | EVIL | MORTAL | BASEANGBAND
-F:WILD_TOO | WILD_OCEAN | WILD_SHORE | 
+F:AQUATIC
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_2D2
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FRIENDS
+F:IM_ACID
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_OCEAN
+F:WILD_SHORE
+F:WILD_TOO
 S:1_IN_8
-S:BA_POIS | SCARE | HOLD
+S:BA_POIS
+S:HOLD
+S:SCARE
 D:A sea-serpent of Elvish legend.
 
 N:160:Cave bear
@@ -2493,9 +3651,15 @@ O:0:0:0:0
 B:CLAW:HURT:1d6
 B:CLAW:HURT:1d6
 B:BITE:HURT:1d8
-F:BASH_DOOR | FORCE_MAXHP | FORCE_SLEEP | DROP_CORPSE | 
-F:ANIMAL | WILD_TOO | WILD_WOOD | WILD_MOUNTAIN | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:MORTAL
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:A large bear appears to have made its home in this cave.  It is hungry, 
 D:and you are trespassing in its territory. 
 
@@ -2507,8 +3671,13 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d10
 B:BITE:HURT:1d10
-F:WEIRD_MIND | BASH_DOOR | KILL_WALL | KILL_ITEM | DROP_CORPSE | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:KILL_ITEM
+F:KILL_WALL
+F:MORTAL
+F:WEIRD_MIND
 D:Despite its unimpressive size, this mole creature has fangs powerful 
 D:enough to bore through solid rock. 
 
@@ -2520,12 +3689,25 @@ E:1:1:1:2:1:1
 O:30:40:30:0
 B:HIT:HURT:2d4
 B:HIT:HURT:2d4
-F:MALE | 
-F:FORCE_SLEEP | DROP_90 | WILD_TOO | 
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:CONF | BLIND | HOLD | SLOW | MIND_BLAST | S_MONSTER | BLINK
+F:BASH_DOOR
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
+S:1_IN_3
+S:BLIND
+S:BLINK
+S:CONF
+S:HOLD
+S:MIND_BLAST
+S:SLOW
+S:S_MONSTER
 D:A master of the mental arts, able to damage or dominate the 
 D:minds of others. 
 
@@ -2538,11 +3720,23 @@ O:0:0:0:0
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
 B:BITE:HURT:1d5
-F:FORCE_MAXHP | FORCE_SLEEP | DROP_CORPSE | 
-F:ONLY_GOLD | DROP_60 | DROP_1D2 | HAS_EGG | IMPRESED | 
-F:OPEN_DOOR | BASH_DOOR | CAN_FLY |
-F:EVIL | DRAGON | IM_ELEC | BASEANGBAND | ATTR_MULTI | ATTR_MULTI
-S:1_IN_12 | 
+F:ATTR_MULTI
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_EGG
+F:IMPRESED
+F:IM_ELEC
+F:ONLY_GOLD
+F:OPEN_DOOR
+S:1_IN_12
 S:BR_ELEC
 D:This newly-born dragon is still soft, its eyes unaccustomed to light and 
 D:its scales a pale blue. 
@@ -2556,12 +3750,23 @@ O:0:0:0:0
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
 B:BITE:HURT:1d5
-F:FORCE_MAXHP | FORCE_SLEEP | DROP_CORPSE | 
-F:ONLY_GOLD | DROP_60 | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | ATTR_MULTI
-F:EVIL | DRAGON | IM_COLD | SUSCEP_FIRE | HAS_EGG | IMPRESED | BASEANGBAND
 F:ATTR_MULTI
-S:1_IN_12 | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:DRAGON
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_EGG
+F:IMPRESED
+F:IM_COLD
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:SUSCEP_FIRE
+S:1_IN_12
 S:BR_COLD
 D:This newly-born dragon is still soft, its eyes unaccustomed to light and 
 D:its scales a pale white. 
@@ -2575,11 +3780,22 @@ O:0:0:0:0
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
 B:BITE:HURT:1d5
-F:FORCE_MAXHP | FORCE_SLEEP | 
-F:ONLY_GOLD | DROP_60 | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | CAN_FLY | DROP_CORPSE | 
-F:EVIL | DRAGON | IM_POIS | HAS_EGG | IMPRESED | BASEANGBAND | ATTR_MULTI
-S:1_IN_12 | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_EGG
+F:IMPRESED
+F:IM_POIS
+F:ONLY_GOLD
+F:OPEN_DOOR
+S:1_IN_12
 S:BR_POIS
 D:This newly-born dragon is still soft, its eyes unaccustomed to light and 
 D:its scales a sickly green. 
@@ -2593,11 +3809,22 @@ O:0:0:0:0
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
 B:BITE:HURT:1d5
-F:FORCE_MAXHP | FORCE_SLEEP | CAN_FLY | DROP_CORPSE | 
-F:ONLY_GOLD | DROP_60 | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DRAGON | IM_ACID | HAS_EGG | IMPRESED | BASEANGBAND | ATTR_MULTI
-S:1_IN_12 | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_EGG
+F:IMPRESED
+F:IM_ACID
+F:ONLY_GOLD
+F:OPEN_DOOR
+S:1_IN_12
 S:BR_ACID
 D:This newly-born dragon is still soft, its eyes unaccustomed to light and 
 D:its scales a dull black. 
@@ -2611,12 +3838,24 @@ O:0:0:0:0
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
 B:BITE:HURT:1d5
-F:FORCE_MAXHP | FORCE_SLEEP | CAN_FLY | DROP_CORPSE | SUSCEP_COLD |
-F:ONLY_GOLD | DROP_60 | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DRAGON | IM_FIRE | HAS_EGG | IMPRESED | BASEANGBAND | HAS_LITE
 F:ATTR_MULTI
-S:1_IN_11 | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_EGG
+F:HAS_LITE
+F:IMPRESED
+F:IM_FIRE
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:SUSCEP_COLD
+S:1_IN_11
 S:BR_FIRE
 D:This newly-born dragon is still soft, its eyes unaccustomed to light and 
 D:its scales a pale red. 
@@ -2629,8 +3868,13 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d4
 B:STING:LOSE_STR:1d4
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | DROP_SKELETON
-F:ANIMAL | MORTAL | BASEANGBAND | HAS_LITE
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:HAS_LITE
+F:MORTAL
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is large and has venomous mandibles. 
 
 N:169:Brodda, the Easterling
@@ -2643,11 +3887,21 @@ B:HIT:HURT:1d13
 B:HIT:HURT:1d13
 B:HIT:HURT:1d13
 B:HIT:HURT:1d13
-F:UNIQUE | MALE | EVIL
-F:FORCE_MAXHP | CAN_SPEAK | WILD_TOO | DROP_SKELETON | DROP_CORPSE
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNIQUE
+F:WILD_TOO
 D:A nasty piece of work, Brodda picks on defenceless women and children. 
 
 # New monster added for the Theme module
@@ -2661,9 +3915,21 @@ O:10:90:0:0
 B:HIT:HURT:1d10
 B:HIT:HURT:1d10
 B:HIT:HURT:1d10
-F:BASEANGBAND | UNIQUE | MALE | EVIL | ORC | FORCE_MAXHP | 
-F:CAN_SPEAK | DROP_CORPSE | WILD_TOO | OPEN_DOOR | BASH_DOOR | 
-F:HURT_LITE | ONLY_ITEM | DROP_1D2 | DROP_GOOD | ESCORT | 
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:HURT_LITE
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:ORC
+F:UNIQUE
+F:WILD_TOO
 D:Strong and powerful, for a goblin. 
 
 N:171:King cobra
@@ -2674,8 +3940,17 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:SPIT:BLIND:1d2
 B:BITE:POISON:3d4
-F:RAND_50 | WILD_TOO | WILD_WOOD | DROP_SKELETON | DROP_CORPSE | 
-F:BASH_DOOR | CAN_SWIM | ANIMAL | IM_POIS | HAS_EGG | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_EGG
+F:IM_POIS
+F:MORTAL
+F:RAND_50
+F:WILD_TOO
+F:WILD_WOOD
 D:It is a large snake with a hooded face. 
 
 N:172:Eagle
@@ -2687,8 +3962,19 @@ O:0:0:0:0
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
 B:BITE:HURT:1d6
-F:ANIMAL | CAN_FLY | WILD_ONLY | WILD_WASTE | WILD_MOUNTAIN | WILD_WOOD | 
-F:DROP_CORPSE | MORTAL | BASEANGBAND | NEUTRAL | NO_TARGET | IMPRESED | HAS_EGG | AQUATIC 
+F:ANIMAL
+F:AQUATIC
+F:CAN_FLY
+F:DROP_CORPSE
+F:HAS_EGG
+F:IMPRESED
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:WILD_MOUNTAIN
+F:WILD_ONLY
+F:WILD_WASTE
+F:WILD_WOOD
 D:A magnificent huge predatory bird. 
 
 N:173:War bear
@@ -2700,9 +3986,13 @@ O:0:0:0:0
 B:CLAW:HURT:1d4
 B:CLAW:HURT:1d4
 B:BITE:HURT:1d6
-F:WEIRD_MIND | BASH_DOOR | FRIENDS | DROP_SKELETON | DROP_CORPSE
 F:ANIMAL
-F:MORTAL | BASEANGBAND
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FRIENDS
+F:MORTAL
+F:WEIRD_MIND
 D:A bear with tusks, trained to kill. 
 
 N:174:Killer bee
@@ -2713,8 +4003,12 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:STING:POISON:1d4
 B:STING:LOSE_STR:1d4
-F:WEIRD_MIND | FRIENDS | CAN_FLY | WILD_TOO |
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:FRIENDS
+F:MORTAL
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is poisonous and aggressive. 
 
 N:175:Giant spider
@@ -2727,9 +4021,14 @@ B:BITE:HURT:1d10
 B:BITE:POISON:1d6
 B:BITE:POISON:1d6
 B:BITE:HURT:1d10
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | DROP_SKELETON | 
-F:ANIMAL | SPIDER | IM_POIS | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:IM_POIS
+F:MORTAL
+F:SPIDER
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is a large spider whose bulbous body is bloated with poison. 
 
 N:176:Giant white tick
@@ -2739,9 +4038,12 @@ W:10:2:200:27
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:POISON:2d6
-F:WEIRD_MIND | BASH_DOOR | CAN_FLY |
-F:ANIMAL | IM_POIS | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:IM_POIS
+F:MORTAL
+F:WEIRD_MIND
 D:It is moving slowly towards you. 
 
 # New monster added for the Theme module
@@ -2756,11 +4058,25 @@ B:TOUCH:EAT_FOOD
 B:TOUCH:EAT_ITEM
 B:BEG:EAT_GOLD
 B:INSULT:*
-F:UNIQUE | MALE | CAN_SPEAK | DROP_CORPSE |
-F:FORCE_MAXHP | FORCE_DEPTH | WILD_TOWN | WILD_ONLY |
-F:OPEN_DOOR | BASH_DOOR | DROP_GOOD | 
-F:RAND_25 | DROP_60 | DROP_2D2 | DROP_GREAT | ONLY_ITEM |
-F:MORTAL | JOKEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:FORCE_DEPTH
+F:FORCE_MAXHP
+F:HAS_LITE
+F:JOKEANGBAND
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RAND_25
+F:UNIQUE
+F:WILD_ONLY
+F:WILD_TOWN
 D:An obscenely lucky and very stealthy Halfling. You have an intense 
 D:desire to kill this creature.
 
@@ -2772,13 +4088,24 @@ E:1:1:1:2:1:1
 O:0:0:100:0
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
-F:MALE | 
-F:FORCE_SLEEP | 
-F:ONLY_ITEM | DROP_1D2 | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | IM_POIS | HURT_LITE | BASEANGBAND | HAS_LITE
-S:1_IN_5 | 
-S:BLIND | CONF | MISSILE | DARKNESS | BA_POIS
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:HURT_LITE
+F:IM_POIS
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+S:1_IN_5
+S:BA_POIS
+S:BLIND
+S:CONF
+S:DARKNESS
+S:MISSILE
 D:A dark elven figure, dressed all in black, hurling spells at you. 
 
 # New monster added for the Theme module
@@ -2791,10 +4118,14 @@ B:HIT:HURT:2d8
 B:HIT:HURT:2d8
 B:HIT:HURT:2d8
 B:HIT:HURT:2d8
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_GOOD
+F:FORCE_SLEEP
+F:FRIENDS
 F:MALE
-F:FORCE_SLEEP | FRIENDS
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD
-F:OPEN_DOOR | BASH_DOOR
+F:ONLY_ITEM
+F:OPEN_DOOR
 D:The dwarves of Nogrod were ever greedy, and through this Morgoth was able to 
 D:snare them. Now they act as slavemasters in his mines. 
 
@@ -2805,10 +4136,13 @@ G:k:w
 I:110:2d100:25:120:1
 W:22:1:0:175
 B:HIT:SHATTER:6d6
-F:MALE
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD
-F:OPEN_DOOR | BASH_DOOR
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_GOOD
 F:EVIL
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
 D:The dwarves of Nogrod were ever greedy, and through this Morgoth was able to 
 D:snare them. This smith has been forging blades for the Orcs. 
 
@@ -2822,13 +4156,23 @@ B:HIT:HURT:3d6
 B:HIT:HURT:3d6
 B:HIT:HURT:3d6
 B:HIT:HURT:3d6
-F:MALE | EVIL
-F:FORCE_SLEEP | FORCE_MAXHP
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD
-F:OPEN_DOOR | BASH_DOOR
-F:IM_FIRE | IM_COLD | NO_CONF | NO_SLEEP
-S:1_IN_8 
-S:HEAL | BO_FIRE | BO_ACID 
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_FIRE
+F:MALE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+S:1_IN_8
+S:BO_ACID
+S:BO_FIRE
+S:HEAL
 D:The dwarves of Nogrod were ever greedy, and through this Morgoth was able to 
 D:snare them. This is a lord among the dark dwarves. 
 
@@ -2843,13 +4187,26 @@ E:1:1:1:2:1:1
 O:0:10:90:0
 B:HIT:HURT:2d8
 B:HIT:HURT:2d8
-F:MALE | 
-F:FORCE_SLEEP | 
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
-F:SMART | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | HURT_LITE | BASEANGBAND | HAS_LITE
-S:1_IN_5 | 
-S:HEAL | BLIND | CONF | CAUSE_2 | DARKNESS | MISSILE
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:HURT_LITE
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+S:1_IN_5
+S:BLIND
+S:CAUSE_2
+S:CONF
+S:DARKNESS
+S:HEAL
+S:MISSILE
 D:The dwarves of Nogrod were ever greedy, and through this Morgoth was able to 
 D:snare them. This priest serves Melkor unquestioningly, and today it is your 
 D:turn to die.
@@ -2862,10 +4219,15 @@ E:1:1:1:2:1:1
 O:10:90:0:0
 B:HIT:HURT:1d8
 B:HIT:HURT:1d8
-F:MALE | 
-F:DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | HURT_LITE | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:HAS_LITE
+F:HURT_LITE
+F:MALE
+F:OPEN_DOOR
 S:1_IN_12
 S:MISSILE
 D:A dark elven figure in armour, ready with his sword. 
@@ -2877,10 +4239,17 @@ W:10:2:30:3
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:HURT:1d1
-F:ATTR_CLEAR | 
-F:NEVER_MOVE | INVISIBLE | COLD_BLOOD | 
-F:STUPID | EMPTY_MIND | CAN_SWIM |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:ATTR_CLEAR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:INVISIBLE
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 S:MULTIPLY
 D:Yum! It smells quite tasty.  If you could only see it.
 
@@ -2891,11 +4260,18 @@ W:10:2:60:3
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:CONFUSE:1d1
-F:NEVER_MOVE | COLD_BLOOD | 
-F:STUPID | EMPTY_MIND | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | JOKEANGBAND | NO_CUT
-S:MULTIPLY | 
-S:1_IN_5 | ARROW_1
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:JOKEANGBAND
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+S:1_IN_5
+S:ARROW_1
+S:MULTIPLY
 D:What looks like the remains of a quiver dropped by a past adventurer 
 D:has become overgrown with a strange mold intent on using the contents 
 D:of the quiver to grab prey. 
@@ -2910,13 +4286,25 @@ B:HIT:HURT:1d13
 B:HIT:HURT:1d11
 B:HIT:HURT:1d13
 B:HIT:HURT:1d11
-F:UNIQUE | MALE | CAN_SPEAK | 
-F:FORCE_MAXHP | SPECIAL_GENE | 
-F:ESCORT | WILD_TOO |
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:ORC
+F:SPECIAL_GENE
+F:UNIQUE
+F:WILD_TOO
 D:He is a cunning and devious orc. Short and broad, he has crooked 
 D:legs and arms that hang almost to the ground. 
 
@@ -2929,9 +4317,16 @@ O:0:0:0:0
 B:BITE:TERRIFY:1d3
 B:CLAW:HURT:1d2
 B:CLAW:HURT:1d2
-F:RAND_50 | CAN_FLY | WILD_TOO | WILD_MOUNTAIN | WILD_WOOD |
-F:FORCE_SLEEP | ANIMAL | DROP_CORPSE | AI_ANNOY | 
-F:MORTAL | BASEANGBAND
+F:AI_ANNOY
+F:ANIMAL
+F:CAN_FLY
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:MORTAL
+F:RAND_50
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:The beating of its wings produces a strangely unnerving noise. 
 
 N:188:Owlbear
@@ -2943,8 +4338,12 @@ O:0:0:0:0
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
 B:CRUSH:HURT:1d10
-F:EVIL | ANIMAL | OPEN_DOOR | BASH_DOOR | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:EVIL
+F:MORTAL
+F:OPEN_DOOR
 D:A bizarre bear with the claws and the face of an owl. 
 
 # New monster added by furiosity for the Theme module
@@ -2955,8 +4354,14 @@ W:1:1:0:2
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:HURT:1d2
-F:BASEANGBAND | EMPTY_MIND | STUPID | ATTR_CLEAR | 
-F:UNDEAD | RAND_50 | CAN_SWIM | INVISIBLE | EVIL | 
+F:ATTR_CLEAR
+F:CAN_SWIM
+F:EMPTY_MIND
+F:EVIL
+F:INVISIBLE
+F:RAND_50
+F:STUPID
+F:UNDEAD
 D:An evil cannibal spirit from the marshlands. 
 
 N:190:Hairy mold
@@ -2966,10 +4371,15 @@ W:10:1:50:32
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:POISON:1d3
-F:NEVER_MOVE | CAN_SWIM |
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:EMPTY_MIND
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:It is a strange hairy growth on the dungeon floor. 
 
 N:191:Grizzly bear
@@ -2982,9 +4392,13 @@ B:CLAW:HURT:1d8
 B:CLAW:HURT:1d8
 B:BITE:HURT:1d12
 B:CRUSH:HURT:1d10
-F:WILD_TOO | WILD_WOOD | WILD_MOUNTAIN | DROP_CORPSE | 
-F:ANIMAL | BASH_DOOR | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:MORTAL
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:A huge, beastly bear, more savage than most of its kind. 
 
 N:192:Disenchanter mold
@@ -2994,11 +4408,18 @@ W:10:1:40:40
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:UN_BONUS:1d6
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | RES_DISE |
-F:IM_POIS | ATTR_MULTI | CAN_SWIM |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_11 | 
+F:ATTR_MULTI
+F:CAN_SWIM
+F:EMPTY_MIND
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RES_DISE
+F:STUPID
+S:1_IN_11
 S:DRAIN_MANA
 D:It is a strange glowing growth on the dungeon floor. 
 
@@ -3011,11 +4432,22 @@ O:50:50:0:0
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
 B:BITE:HURT:1d5
-F:FORCE_MAXHP | FORCE_SLEEP | CAN_FLY | DROP_CORPSE | 
-F:DROP_60 | BASH_DOOR | HAS_EGG | 
-F:EVIL | DRAGON | BASEANGBAND | HAS_LITE | ATTR_MULTI
-S:1_IN_11 | 
-S:CONF | SCARE | BR_LITE | BR_DARK
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_EGG
+F:HAS_LITE
+S:1_IN_11
+S:BR_DARK
+S:BR_LITE
+S:CONF
+S:SCARE
 D:A small relative of the dragon that inhabits dark caves. 
 
 N:194:Limrog
@@ -3025,10 +4457,19 @@ W:10:1:600:40
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:1d8
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DEMON | IM_FIRE | NO_FEAR | RES_TELE | CAN_FLY | BASEANGBAND
-S:1_IN_3 | 
-S:BLINK | TELE_TO | TELE_AWAY | TPORT
+F:BASH_DOOR
+F:CAN_FLY
+F:DEMON
+F:EVIL
+F:IM_FIRE
+F:NO_FEAR
+F:OPEN_DOOR
+F:RES_TELE
+S:1_IN_3
+S:BLINK
+S:TELE_AWAY
+S:TELE_TO
+S:TPORT
 D:It is a fast-moving demon that blinks quickly in and out of existence; no 
 D:other demon matches its teleporting mastery. It resembles a fish - Limroeg 
 D:are actually fish that were corrupted by Morgoth.
@@ -3041,9 +4482,16 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:HURT:2d5
 B:TOUCH:POISON:3d5
-F:ONLY_GOLD | DROP_90 | DROP_1D2 | 
-F:COLD_BLOOD | BASH_DOOR | 
-F:IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_90
+F:IM_ELEC
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_GOLD
 D:It appears to be a pile of gold coins, until it starts crawling towards you 
 D:on tiny legs. 
 
@@ -3054,10 +4502,16 @@ W:10:1:600:30
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d6
-F:RAND_25 | FRIENDS | 
-F:BASH_DOOR | WILD_TOO | WILD_WOOD | WILD_WASTE | WILD_MOUNTAIN | 
-F:ANIMAL | DROP_CORPSE |
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:FRIENDS
+F:MORTAL
+F:RAND_25
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WASTE
+F:WILD_WOOD
 D:It howls and snaps at you. 
 
 N:197:Giant fruit fly
@@ -3067,8 +4521,12 @@ W:10:3:100:4
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:BITE:HURT:1d2
-F:RAND_50 | RAND_25 | CAN_FLY | WEIRD_MIND | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:MORTAL
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
 S:MULTIPLY
 D:A fast-breeding, annoying pest. 
 
@@ -3080,8 +4538,14 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:CLAW:HURT:1d8
 B:CLAW:HURT:1d8
-F:BASH_DOOR | WILD_TOO | WILD_WOOD | WILD_GRASS | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:MORTAL
+F:WILD_GRASS
+F:WILD_TOO
+F:WILD_WOOD
 D:A large black cat, stalking you with intent. It thinks you're its next 
 D:meal. 
 
@@ -3093,11 +4557,15 @@ E:1:1:1:2:1:1
 O:25:60:0:0
 B:HIT:HURT:2d4
 B:TOUCH:EAT_ITEM
-F:MALE | 
-F:DROP_1D2 | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DROP_SKELETON | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_SKELETON
+F:EVIL
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:TAKE_ITEM
 D:He is eyeing your backpack. 
 
 # New monster added by furiosity for the Theme module
@@ -3108,8 +4576,12 @@ W:3:1:0:5
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:HURT:2d4
-F:BASEANGBAND | EMPTY_MIND | STUPID | 
-F:UNDEAD | RAND_50 | CAN_SWIM | EVIL | 
+F:CAN_SWIM
+F:EMPTY_MIND
+F:EVIL
+F:RAND_50
+F:STUPID
+F:UNDEAD
 D:An evil cannibal spirit from the marshlands. It is 
 D:especially aggressive.
 
@@ -3121,8 +4593,13 @@ W:5:1:0:2
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:POISON:2d4
-F:BASEANGBAND | EMPTY_MIND | STUPID | IM_POIS
-F:UNDEAD | RAND_50 | CAN_SWIM | EVIL | 
+F:CAN_SWIM
+F:EMPTY_MIND
+F:EVIL
+F:IM_POIS
+F:RAND_50
+F:STUPID
+F:UNDEAD
 D:An evil cannibal spirit from the marshlands. It is 
 D:surrounded by a foul stench.
 
@@ -3134,8 +4611,18 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:DISEASE:1d6
 B:TOUCH:LOSE_CON:1d6
-F:UNDEAD | EMPTY_MIND | NO_CONF | NO_SLEEP | IM_POIS | IM_COLD | NO_FEAR |
-F:HURT_LITE | COLD_BLOOD | EVIL | NEVER_MOVE | BASEANGBAND | NO_CUT
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:UNDEAD
 S:MULTIPLY
 D:A sickening mound of decaying flesh, bones, hands and other body parts. 
 D:It seems to be growing. 
@@ -3148,8 +4635,13 @@ W:5:1:0:2
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:LOSE_STR:2d4
-F:BASEANGBAND | EMPTY_MIND | STUPID | IM_POIS
-F:UNDEAD | RAND_50 | CAN_SWIM | EVIL | 
+F:CAN_SWIM
+F:EMPTY_MIND
+F:EVIL
+F:IM_POIS
+F:RAND_50
+F:STUPID
+F:UNDEAD
 D:An evil cannibal spirit from the marshlands. Its form seems 
 D:infused with blood, surely that of its victims.
 
@@ -3162,15 +4654,32 @@ O:0:0:0:0
 B:CLAW:HURT:1d4
 B:CLAW:HURT:1d4
 B:BITE:HURT:1d6
-F:ATTR_MULTI | 
-F:FORCE_MAXHP | FORCE_SLEEP | 
-F:ONLY_GOLD | DROP_60 | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | 
-F:EVIL | DRAGON | CAN_FLY |
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | HAS_EGG | IMPRESED | 
-F:BASEANGBAND | HAS_LITE
-S:1_IN_12 | 
-S:BR_ACID | BR_FIRE | BR_COLD | BR_ELEC | BR_POIS
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_EGG
+F:HAS_LITE
+F:IMPRESED
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:ONLY_GOLD
+F:OPEN_DOOR
+S:1_IN_12
+S:BR_ACID
+S:BR_COLD
+S:BR_ELEC
+S:BR_FIRE
+S:BR_POIS
 D:This newly-born dragon is still soft, its eyes unaccustomed to light and 
 D:its scales shimmering with a hint of colour. 
 
@@ -3183,8 +4692,13 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:POISON:2d4
 B:TOUCH:CONFUSE:3d5
-F:BASEANGBAND | EMPTY_MIND | STUPID | IM_POIS
-F:UNDEAD | RAND_50 | CAN_SWIM | EVIL 
+F:CAN_SWIM
+F:EMPTY_MIND
+F:EVIL
+F:IM_POIS
+F:RAND_50
+F:STUPID
+F:UNDEAD
 D:An evil cannibal spirit from the marshlands. It is 
 D:surrounded by a foul stench and an aura of mystery.
 
@@ -3197,12 +4711,26 @@ O:0:50:50:0
 B:TOUCH:PARALYZE:1d14
 B:TOUCH:PARALYZE:1d14
 B:CRUSH:HURT:2d12
-F:ANIMAL | NEVER_MOVE | COLD_BLOOD | DROP_RANDART
-F:EMPTY_MIND | UNIQUE | FORCE_MAXHP | FORCE_SLEEP |
-F:RES_WATE | IM_POIS | IM_ACID | SUSCEP_FIRE | SPECIAL_GENE | 
-F:DROP_1D2 | DROP_GOOD | ONLY_ITEM | BASEANGBAND | NO_CUT
-S:1_IN_10 | 
-S:TELE_TO | HOLD | 
+F:ANIMAL
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_GOOD
+F:DROP_RANDART
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CUT
+F:ONLY_ITEM
+F:RES_WATE
+F:SPECIAL_GENE
+F:SUSCEP_FIRE
+F:UNIQUE
+S:1_IN_10
+S:HOLD
+S:TELE_TO
 D:The ancient grey willow tree, ruler of the Old Forest. He despises 
 D:trespassers in his territory.  "...a huge willow-tree, old and hoary. 
 D:Enormous it looked, its sprawling branches going up like racing arms 
@@ -3217,8 +4745,14 @@ W:5:1:0:2
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:ELEC:3d5
-F:BASEANGBAND | EMPTY_MIND | STUPID | IM_POIS | 
-F:UNDEAD | RAND_50 | CAN_SWIM | EVIL | IM_ELEC |
+F:CAN_SWIM
+F:EMPTY_MIND
+F:EVIL
+F:IM_ELEC
+F:IM_POIS
+F:RAND_50
+F:STUPID
+F:UNDEAD
 D:An evil cannibal spirit from the marshlands. It is 
 D:surrounded by a barely noticeable aura of sparks.
 
@@ -3231,10 +4765,19 @@ O:0:0:0:0
 B:HIT:HURT:1d4
 B:HIT:HURT:1d4
 B:HIT:HURT:1d4
-F:COLD_BLOOD | EMPTY_MIND | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | UNDEAD | 
-F:IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:ORC
+F:UNDEAD
 D:It is a shambling orcish corpse leaving behind a trail of flesh. 
 
 N:209:Hippogryph
@@ -3245,8 +4788,14 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:HIT:HURT:2d5
 B:BITE:HURT:2d5
-F:BASH_DOOR | CAN_FLY | WILD_TOO | WILD_MOUNTAIN | WILD_GRASS | 
-F:ANIMAL | DROP_CORPSE | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:MORTAL
+F:WILD_GRASS
+F:WILD_MOUNTAIN
+F:WILD_TOO
 D:A strange hybrid of eagle and horse. 
 
 N:210:Black mamba
@@ -3256,10 +4805,18 @@ W:12:3:300:40
 E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:POISON:4d4
-F:RAND_50 | BASH_DOOR | CAN_SWIM | 
-F:WILD_TOO | WILD_WOOD | WILD_GRASS | 
-F:ANIMAL | IM_POIS | DROP_SKELETON | DROP_CORPSE | HAS_EGG | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_EGG
+F:IM_POIS
+F:MORTAL
+F:RAND_50
+F:WILD_GRASS
+F:WILD_TOO
+F:WILD_WOOD
 D:It has glistening black skin, a sleek body, and highly venomous fangs. 
 
 N:211:White wolf
@@ -3270,11 +4827,17 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d3
 B:BITE:HURT:1d4
-F:RAND_25 | 
-F:FRIENDS | SUSCEP_FIRE |
-F:BASH_DOOR | WILD_TOO | WILD_WASTE |
-F:ANIMAL | IM_COLD | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FRIENDS
+F:IM_COLD
+F:MORTAL
+F:RAND_25
+F:SUSCEP_FIRE
+F:WILD_TOO
+F:WILD_WASTE
 D:A large and muscled wolf from the northern wastes. Its breath is cold and 
 D:icy and its fur is coated with frost. 
 
@@ -3285,11 +4848,17 @@ W:12:3:2600:60
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:EXP_10
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | HURT_LITE | CAN_SWIM |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_11 | 
+F:CAN_SWIM
+F:EMPTY_MIND
+F:HURT_LITE
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+S:1_IN_11
 S:DRAIN_MANA
 D:Yum! It looks quite tasty.  It is a pulsing mound of glowing flesh. 
 
@@ -3300,9 +4869,16 @@ W:12:4:200:6
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:EXP_10
-F:RAND_50 | RAND_25 | CAN_SWIM |
-F:STUPID | WEIRD_MIND | BASH_DOOR | 
-F:ANIMAL | HURT_LITE | NO_FEAR | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:HURT_LITE
+F:NO_CUT
+F:NO_FEAR
+F:RAND_25
+F:RAND_50
+F:STUPID
+F:WEIRD_MIND
 S:MULTIPLY
 D:It is a disgusting mass of dark worms, eating each other, the floor, 
 D:the air, you... 
@@ -3315,8 +4891,14 @@ W:5:1:0:2
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:LOSE_CHR:3d5
-F:BASEANGBAND | EMPTY_MIND | STUPID | IM_POIS | 
-F:UNDEAD | RAND_50 | CAN_SWIM | EVIL | NO_CUT |
+F:CAN_SWIM
+F:EMPTY_MIND
+F:EVIL
+F:IM_POIS
+F:NO_CUT
+F:RAND_50
+F:STUPID
+F:UNDEAD
 D:An evil cannibal spirit from the marshlands. It seems to 
 D:be rising straight from the earth to get you.
 
@@ -3330,13 +4912,28 @@ B:HIT:HURT:1d13
 B:HIT:HURT:1d13
 B:HIT:HURT:1d11
 B:HIT:HURT:1d11
-F:UNIQUE | MALE | 
-F:FORCE_MAXHP | WILD_TOO | SPECIAL_GENE | 
-F:ESCORT | DROP_SKELETON | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | CAN_SPEAK |
-F:EVIL | ORC | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:ORC
+F:SPECIAL_GENE
+F:UNIQUE
+F:WILD_TOO
 D:A leader of a band of raiding orcs from the Misty Mountains 
 D:He's been known to pick on Shire-folk. 
 
@@ -3348,10 +4945,15 @@ E:1:1:1:2:1:1
 O:0:100:0:0
 B:HIT:HURT:3d5
 B:HIT:HURT:3d5
-F:MALE | WILD_TOO |
-F:DROP_1D2 | DROP_SKELETON | DROP_CORPSE
-F:OPEN_DOOR | BASH_DOOR
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
 D:A warrior of considerable skill. 
 
 # New monster added by furiosity for the Theme module
@@ -3364,8 +4966,15 @@ O:0:0:0:0
 B:TOUCH:HURT:3d5
 B:TOUCH:SHATTER:1d1
 # Yes, I'm nasty. :P -furiosity
-F:BASEANGBAND | EMPTY_MIND | STUPID | IM_POIS | 
-F:UNDEAD | RAND_50 | CAN_SWIM | EVIL | NO_CUT | NO_STUN | 
+F:CAN_SWIM
+F:EMPTY_MIND
+F:EVIL
+F:IM_POIS
+F:NO_CUT
+F:NO_STUN
+F:RAND_50
+F:STUPID
+F:UNDEAD
 D:An evil cannibal spirit from the marshlands. It seems to 
 D:be coming from the walls.
 
@@ -3378,11 +4987,22 @@ O:0:0:0:0
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
 B:BITE:HURT:1d5
-F:FORCE_MAXHP | FORCE_SLEEP | CAN_FLY | DROP_CORPSE | 
-F:ONLY_GOLD | DROP_60 | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DRAGON | NO_CONF | HAS_EGG | IMPRESED | BASEANGBAND | ATTR_MULTI
-S:1_IN_12 | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_EGG
+F:IMPRESED
+F:NO_CONF
+F:ONLY_GOLD
+F:OPEN_DOOR
+S:1_IN_12
 S:BR_CONF
 D:This newly-born dragon is still soft, its eyes unaccustomed to light and 
 D:its scales a dull bronze. 
@@ -3396,12 +5016,23 @@ O:0:0:0:0
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
 B:BITE:HURT:1d5
-F:FORCE_MAXHP | FORCE_SLEEP | CAN_FLY | DROP_CORPSE | 
-F:ONLY_GOLD | DROP_60 | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DRAGON | NO_STUN | HAS_EGG | IMPRESED | BASEANGBAND | HAS_LITE
 F:ATTR_MULTI
-S:1_IN_12 | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_EGG
+F:HAS_LITE
+F:IMPRESED
+F:NO_STUN
+F:ONLY_GOLD
+F:OPEN_DOOR
+S:1_IN_12
 S:BR_SOUN
 D:This newly-born dragon is still soft, its eyes unaccustomed to light and 
 D:its scales a pale gold. 
@@ -3414,10 +5045,16 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:GAZE:EXP_10
 B:GAZE:EXP_10
-F:NEVER_MOVE | EVIL | CAN_FLY | DROP_CORPSE | 
-F:HURT_LITE | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_7 | 
-S:HOLD | TELE_TO 
+F:CAN_FLY
+F:DROP_CORPSE
+F:EVIL
+F:HURT_LITE
+F:NEVER_MOVE
+F:NO_CUT
+F:NO_FEAR
+S:1_IN_7
+S:HOLD
+S:TELE_TO
 D:A huge disembodied eye.  As you stare into the black nothingness of its pupil, 
 D:you feel your will and vitality draining away, and are unable to do anything 
 D:except approach it in horrified fascination. 
@@ -3430,8 +5067,14 @@ W:15:5:0:20
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:EAT_LITE:3d5
-F:BASEANGBAND | EMPTY_MIND | STUPID | IM_POIS | 
-F:UNDEAD | RAND_50 | CAN_SWIM | EVIL | NO_CUT | 
+F:CAN_SWIM
+F:EMPTY_MIND
+F:EVIL
+F:IM_POIS
+F:NO_CUT
+F:RAND_50
+F:STUPID
+F:UNDEAD
 D:An evil cannibal spirit from the marshlands. It seems to 
 D:be surrounded with a strange aura of dark light.
 
@@ -3443,8 +5086,14 @@ W:20:5:0:30
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:LOSE_STR:4d4
-F:BASEANGBAND | EMPTY_MIND | STUPID | IM_POIS | 
-F:UNDEAD | RAND_50 | CAN_SWIM | EVIL | NO_CUT | 
+F:CAN_SWIM
+F:EMPTY_MIND
+F:EVIL
+F:IM_POIS
+F:NO_CUT
+F:RAND_50
+F:STUPID
+F:UNDEAD
 D:An evil cannibal spirit from the marshlands. It glows 
 D:an eerily unnatural pink colour.
 
@@ -3457,8 +5106,14 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:POISON:5d5
 B:TOUCH:LOSE_DEX:5d5
-F:BASEANGBAND | EMPTY_MIND | STUPID | IM_POIS | 
-F:UNDEAD | RAND_50 | CAN_SWIM | EVIL | CAN_FLY | 
+F:CAN_FLY
+F:CAN_SWIM
+F:EMPTY_MIND
+F:EVIL
+F:IM_POIS
+F:RAND_50
+F:STUPID
+F:UNDEAD
 D:An evil cannibal spirit from the marshlands. It prefers 
 D:to dwell in the trees and is rather stealthy.
 
@@ -3471,8 +5126,14 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:POISON:6d6
 B:TOUCH:BLIND:6d6
-F:BASEANGBAND | EMPTY_MIND | STUPID | IM_POIS | 
-F:UNDEAD | RAND_50 | CAN_SWIM | EVIL | IM_ELEC | 
+F:CAN_SWIM
+F:EMPTY_MIND
+F:EVIL
+F:IM_ELEC
+F:IM_POIS
+F:RAND_50
+F:STUPID
+F:UNDEAD
 D:An evil cannibal spirit from the marshlands. It seems to 
 D:be materializing out of thin air.
 
@@ -3484,13 +5145,21 @@ E:1:1:1:2:1:1
 O:0:20:80:0
 B:HIT:HURT:2d3
 B:HIT:HURT:2d3
-F:MALE | GOOD |
-F:FORCE_SLEEP | 
-F:DROP_1D2 | 
-F:SMART | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_3 |
-S:HEAL | SCARE | CAUSE_2 |
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:SMART
+S:1_IN_3
+S:CAUSE_2
+S:HEAL
+S:SCARE
 S:S_MONSTER
 D:A robed man dedicated to his Vala. He believes you to be a 
 D:servant of the Shadow.
@@ -3503,13 +5172,25 @@ E:1:1:1:2:1:1
 O:0:10:90:0
 B:HIT:HURT:1d9
 B:HIT:HURT:1d10
-F:MALE | 
-F:FORCE_SLEEP | 
-F:ONLY_ITEM | DROP_1D2 | 
-F:SMART | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | HURT_LITE | BASEANGBAND | HAS_LITE
-S:1_IN_5 | 
-S:HEAL | BLIND | CONF | CAUSE_2 | DARKNESS | MISSILE
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:HURT_LITE
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+S:1_IN_5
+S:BLIND
+S:CAUSE_2
+S:CONF
+S:DARKNESS
+S:HEAL
+S:MISSILE
 D:A dark elven figure, dressed all in black, chanting curses and waiting to 
 D:deliver your soul to the Void. 
 
@@ -3520,10 +5201,20 @@ W:12:2:0:40
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:HURT:1d3
-F:RAND_50 | RAND_25 | IM_ELEC | IM_POIS | 
-F:EMPTY_MIND | INVISIBLE | COLD_BLOOD | BASH_DOOR | 
-F:IM_POIS | CAN_FLY |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:IM_ELEC
+F:IM_POIS
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RAND_25
+F:RAND_50
 D:A whirlwind of sentient air. 
 
 N:228:Skeleton human
@@ -3533,9 +5224,18 @@ W:12:1:1500:38
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:1d8
-F:EMPTY_MIND | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:UNDEAD
 D:It is an animated human skeleton. 
 
 N:229:Zombified human
@@ -3546,9 +5246,18 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:1d4
 B:HIT:HURT:1d4
-F:EMPTY_MIND | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:UNDEAD
 D:It is a shambling human corpse dropping chunks of flesh behind it. 
 
 N:230:Tiger
@@ -3560,9 +5269,15 @@ O:0:0:0:0
 B:CLAW:HURT:1d8
 B:CLAW:HURT:1d8
 B:BITE:HURT:1d6
-F:BASH_DOOR | WILD_TOO | WILD_GRASS | WILD_WOOD | WILD_MOUNTAIN | 
-F:ANIMAL | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:MORTAL
+F:WILD_GRASS
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:One of the largest of its species, a sleek orange and black shape creeps 
 D:towards you, ready to pounce. 
 
@@ -3574,12 +5289,23 @@ E:0:0:0:0:0:0
 O:45:15:25:0
 B:WAIL:TERRIFY
 B:TOUCH:LOSE_DEX:1d8
-F:FORCE_SLEEP | RAND_25 | 
-F:DROP_60 | DROP_90 | CAN_FLY |
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | 
-F:EVIL | UNDEAD | IM_COLD | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_15 | 
-S:TPORT | SCARE
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_60
+F:DROP_90
+F:EVIL
+F:FORCE_SLEEP
+F:IM_COLD
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
+F:RAND_25
+F:UNDEAD
+S:1_IN_15
+S:SCARE
+S:TPORT
 D:A ghostly apparition that shrieks horribly. 
 
 # New monster added by furiosity for the Theme module
@@ -3592,8 +5318,13 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:DISEASE:3d5
 B:TOUCH:PARASITE:6d5
-F:BASEANGBAND | EMPTY_MIND | STUPID | IM_POIS | 
-F:UNDEAD | RAND_50 | CAN_SWIM | EVIL |
+F:CAN_SWIM
+F:EMPTY_MIND
+F:EVIL
+F:IM_POIS
+F:RAND_50
+F:STUPID
+F:UNDEAD
 D:An evil cannibal spirit from the marshlands. Foul stench 
 D:of decay surrounds it, and you are afraid to let it get 
 D:near you.
@@ -3607,10 +5338,18 @@ O:0:0:0:0
 B:TOUCH:ACID:1d10
 B:TOUCH:ACID:2d6
 B:TOUCH:ACID:2d6
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | COLD_BLOOD | 
-F:IM_ACID | IM_POIS | HURT_LITE | CAN_SWIM |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:HURT_LITE
+F:IM_ACID
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:A strange pile of flesh, covered in discoloured blotches. 
 
 N:234:Drider
@@ -3622,12 +5361,19 @@ O:0:0:0:0
 B:HIT:HURT:1d12
 B:HIT:HURT:1d12
 B:BITE:POISON:1d6
-F:FORCE_SLEEP | 
-F:BASH_DOOR | DROP_SKELETON |
-F:EVIL | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_8 | 
-S:CONF | CAUSE_1 | DARKNESS | MISSILE | ARROW_2 
+F:BASH_DOOR
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_POIS
+F:MORTAL
+S:1_IN_8
+S:ARROW_2
+S:CAUSE_1
+S:CONF
+S:DARKNESS
+S:MISSILE
 D:A dark elven torso merged with the bloated form of a giant spider. 
 
 N:235:Mongbat
@@ -3639,9 +5385,17 @@ O:0:0:0:0
 B:CLAW:HURT:1d4
 B:CLAW:HURT:1d4
 B:BITE:POISON:1d8
-F:ANIMAL | EVIL | FRIENDS | CAN_FLY | FORCE_MAXHP |
-F:IM_COLD | IM_ELEC | IM_POIS | WEIRD_MIND | DROP_CORPSE
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FRIENDS
+F:IM_COLD
+F:IM_ELEC
+F:IM_POIS
+F:MORTAL
+F:WEIRD_MIND
 D:They say it is notoriously difficult to kill. 
 
 N:236:Killer brown beetle
@@ -3651,8 +5405,12 @@ W:13:1:500:38
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:3d4
-F:WEIRD_MIND | BASH_DOOR | CAN_FLY | DROP_CORPSE | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:MORTAL
+F:WEIRD_MIND
 D:It is a vicious insect with a tough carapace. 
 
 # New monster added by furiosity for the Theme module
@@ -3667,13 +5425,29 @@ B:TOUCH:EXP_20:7d5
 B:TOUCH:DISEASE:7d5
 B:TOUCH:PARASITE:14d10
 B:TOUCH:LOSE_ALL:7d5
-F:BASEANGBAND | EMPTY_MIND | STUPID | IM_POIS | 
-F:UNDEAD | RAND_50 | CAN_SWIM | EVIL | NO_FEAR | 
-F:FORCE_MAXHP | KILL_ITEM | KILL_BODY | NO_CONF | 
-F:NO_SLEEP | NO_CUT | NO_STUN | REGENERATE | IM_COLD | 
-F:RES_NETH | RES_PLAS | RES_WATE | RES_DISE | RES_NEXU | 
+F:CAN_SWIM
+F:EMPTY_MIND
+F:EVIL
+F:FORCE_MAXHP
+F:IM_COLD
+F:IM_POIS
+F:KILL_BODY
+F:KILL_ITEM
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:RAND_50
+F:REGENERATE
+F:RES_DISE
+F:RES_NETH
+F:RES_NEXU
+F:RES_PLAS
+F:RES_WATE
+F:STUPID
+F:UNDEAD
 S:1_IN_5
-S:ANIM_DEAD |
 D:An evil cannibal spirit from the marshlands. It has been given 
 D:additional power by necromantic magic, making it nearly invulnerable.
 # Wow, a dangerous icky thing :P
@@ -3685,11 +5459,18 @@ W:13:2:2100:50
 E:1:1:1:2:1:1
 O:10:85:0:0
 B:HIT:HURT:2d8
-F:FRIENDS | 
-F:DROP_60 | WILD_TOO | WILD_WOOD | WILD_MOUNTAIN | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | GIANT | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FRIENDS
+F:GIANT
+F:HAS_LITE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:A hideous, smallish giant that is often found near or with orcs. 
 
 N:239:Creeping mithril coins
@@ -3700,9 +5481,18 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:HURT:2d5
 B:TOUCH:POISON:3d5
-F:ONLY_GOLD | DROP_90 | DROP_2D2 | 
-F:COLD_BLOOD | BASH_DOOR | IM_ACID | CHAR_MULTI | 
-F:IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_90
+F:IM_ACID
+F:IM_ELEC
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_GOLD
 D:It appears to be a pile of sentient mithril coins that doesn't like being 
 D:picked up. 
 
@@ -3713,12 +5503,26 @@ W:13:2:1500:50
 E:1:1:1:2:1:1
 O:20:0:80:0
 B:HIT:HURT:2d2
-F:MALE | 
-F:FORCE_SLEEP | DROP_1D2 | DROP_SKELETON | DROP_CORPSE
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:HASTE | BLINK | TPORT | BLIND | HOLD | SLOW | CONF | DARKNESS
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:SMART
+S:1_IN_3
+S:BLIND
+S:BLINK
+S:CONF
+S:DARKNESS
+S:HASTE
+S:HOLD
+S:SLOW
+S:TPORT
 D:A deceptive spellcaster. 
 
 N:241:Druid
@@ -3729,12 +5533,27 @@ E:1:1:1:2:1:1
 O:20:0:80:0
 B:HIT:HURT:2d4
 B:HIT:HURT:2d4
-F:MALE | WILD_TOO | WILD_WOOD |
-F:FORCE_SLEEP | DROP_1D2 | DROP_SKELETON | DROP_CORPSE
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:HASTE | BLINK | BLIND | HOLD | SLOW | BO_FIRE | BO_ELEC | S_ANIMAL
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:SMART
+F:WILD_TOO
+F:WILD_WOOD
+S:1_IN_3
+S:BLIND
+S:BLINK
+S:BO_ELEC
+S:BO_FIRE
+S:HASTE
+S:HOLD
+S:SLOW
+S:S_ANIMAL
 D:A priest devoted to Yavanna Kementari. He thinks you want to 
 D:destroy the forests of Arda.
 
@@ -3748,14 +5567,38 @@ E:1:1:1:2:1:1
 O:0:40:60:0
 B:HIT:HURT:20d5
 B:HIT:EXP_80:20d5
-F:UNIQUE | MALE | MORTAL | BASEANGBAND | HAS_LITE | 
-F:FORCE_MAXHP | SMART | IM_FIRE | IM_ELEC | IM_POIS |
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_GREAT | 
-F:RES_NETH | RES_NEXU | RES_PLAS | RES_WATE | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | EVIL | SPECIAL_GENE | 
-S:1_IN_5 | 
-S:BLIND | SCARE | CAUSE_4 | BA_NETH | BA_FIRE | BO_PLAS
-S:S_HI_DEMON | S_HI_UNDEAD | HASTE | 
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_2D2
+F:DROP_GREAT
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_NETH
+F:RES_NEXU
+F:RES_PLAS
+F:RES_WATE
+F:SMART
+F:SPECIAL_GENE
+F:UNIQUE
+S:1_IN_5
+S:BA_FIRE
+S:BA_NETH
+S:BLIND
+S:BO_PLAS
+S:CAUSE_4
+S:HASTE
+S:SCARE
+S:S_HI_DEMON
+S:S_HI_UNDEAD
 D:A Man of Numenor who fell under the influence of Sauron during the time 
 D:the Dark Lord dwelt on that island. He sailed east to Middle-earth, with 
 D:a companion named Herumor, and settled in the southern region of Harad. 
@@ -3771,10 +5614,20 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:PARALYZE:5d5
 B:HIT:TERRIFY:5d5
-F:NEVER_MOVE | NO_FEAR |
-F:STUPID | EMPTY_MIND | COLD_BLOOD | CHAR_MULTI | NO_CONF | NO_SLEEP | 
-F:DROP_90 | IM_COLD | FORCE_MAXHP | IM_ELEC | IM_POIS | 
-F:BASEANGBAND | NO_CUT
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:DROP_90
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:IM_COLD
+F:IM_ELEC
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:It resembles a normal cloak until some poor fool ventures too close.  
 
 N:244:Black orc
@@ -3785,11 +5638,19 @@ E:1:1:1:2:1:1
 O:10:50:20:15
 B:HIT:HURT:3d4
 B:HIT:HURT:3d4
-F:MALE | WILD_TOO | DROP_SKELETON | DROP_CORPSE | 
-F:FRIENDS | DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | HURT_LITE | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HAS_LITE
+F:HURT_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:ORC
+F:WILD_TOO
 S:1_IN_9
 S:ARROW_2
 D:He is a large orc with powerful arms and deep black skin. 
@@ -3803,10 +5664,19 @@ O:0:0:0:0
 B:TOUCH:ACID:1d10
 B:TOUCH:ACID:2d6
 B:TOUCH:ACID:2d6
-F:STUPID | EMPTY_MIND | COLD_BLOOD |
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:IM_ACID | IM_POIS | CAN_SWIM |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:IM_ACID
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:STUPID
+F:TAKE_ITEM
 D:A fast moving highly acidic pile of flesh. It is 
 D:eating away the floor it rests on. 
 
@@ -3817,9 +5687,14 @@ W:14:1:0:4
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:BITE:HURT:1d2
-F:RAND_50 | RAND_25 | 
-F:WEIRD_MIND | BASH_DOOR | CAN_FLY |
-F:ANIMAL | MORTAL | JOKEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:JOKEANGBAND
+F:MORTAL
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
 S:MULTIPLY
 D:Oh no! They are everywhere! 
 
@@ -3831,10 +5706,17 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:HURT:1d8
 B:HIT:HURT:1d8
-F:CHAR_CLEAR | ATTR_CLEAR | CHAR_MULTI | 
-F:NEVER_MOVE | FORCE_MAXHP | 
-F:EMPTY_MIND | INVISIBLE | COLD_BLOOD | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND
+F:ATTR_CLEAR
+F:CHAR_CLEAR
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:INVISIBLE
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
 D:A strange creature that merges with the dungeon floor, trapping its 
 D:victims by enveloping them within its perfectly disguised form. 
 
@@ -3846,10 +5728,24 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:PARALYZE
 B:HIT:PARALYZE
-F:FORCE_SLEEP | NEVER_MOVE | STUPID | EMPTY_MIND | FRIENDS | 
-F:KILL_TREES | SUSCEP_FIRE | ANIMAL | 
-F:WILD_ONLY | COLD_BLOOD | WILD_WOOD | WILD_GRASS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | MORTAL | BASEANGBAND | DROP_60 | NO_CUT
+F:ANIMAL
+F:COLD_BLOOD
+F:DROP_60
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:FRIENDS
+F:KILL_TREES
+F:MORTAL
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+F:SUSCEP_FIRE
+F:WILD_GRASS
+F:WILD_ONLY
+F:WILD_WOOD
 D:A mass of vegetation.  As you pass near it, it reaches out tendrils to 
 D:ensnare you.  You can just make out skeletons of its previous victims 
 D:deep within the thickets. 
@@ -3864,13 +5760,31 @@ O:0:0:0:0
 B:HIT:HURT:10d8
 B:HIT:HURT:10d8
 B:HIT:HURT:10d8
-F:BASEANGBAND | WILD_TOO | WILD_WOOD | WILD_GRASS | 
-F:UNIQUE | MALE | FORCE_MAXHP | GOOD | CAN_SPEAK | 
-F:SMART | PET | HAS_LITE | OPEN_DOOR | BASH_DOOR | 
-F:DROP_CORPSE | DROP_SKELETON | MORTAL | CAN_SWIM | 
-F:RES_WATE | RES_NETH | IM_COLD | IM_ACID | IM_POIS | 
-S:1_IN_2 | 
-S:ARROW_4 | S_KIN | 
+F:BASH_DOOR
+F:CAN_SPEAK
+F:CAN_SWIM
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:PET
+F:RES_NETH
+F:RES_WATE
+F:SMART
+F:UNIQUE
+F:WILD_GRASS
+F:WILD_TOO
+F:WILD_WOOD
+S:1_IN_2
+S:ARROW_4
+S:S_KIN
 D:A fair Elf in a travel cloak, wielding a longbow and short sword. 
 D:Stately and graceful, he rides his steed Asfaloth with great speed. 
 D:It is rumoured that he is none other but Glorfindel of Gondolin, who 
@@ -3884,12 +5798,18 @@ W:14:2:150:60
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:COLD:1d6
-F:FORCE_SLEEP | WILD_TOO | WILD_WASTE |
-F:RAND_50 | CAN_FLY | SUSCEP_FIRE |
-F:WEIRD_MIND | BASH_DOOR | 
-F:ANIMAL | IM_COLD | 
-F:MORTAL | BASEANGBAND
-S:1_IN_10 | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:FORCE_SLEEP
+F:IM_COLD
+F:MORTAL
+F:RAND_50
+F:SUSCEP_FIRE
+F:WEIRD_MIND
+F:WILD_TOO
+F:WILD_WASTE
+S:1_IN_10
 S:BR_COLD
 D:It is a large dragonfly that drips frost. 
 
@@ -3901,11 +5821,16 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:1d8
 B:EXPLODE:HURT:20d2
-F:MALE | 
-F:WILD_TOO | SUSCEP_FIRE |
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | HURT_LITE | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:EVIL
+F:HAS_LITE
+F:HURT_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:ORC
+F:SUSCEP_FIRE
+F:WILD_TOO
 D:He is one of the many weaker 'slave' orcs, often mistakenly called a 
 D:goblin. He is equipped with an explosive charge. 
 
@@ -3921,11 +5846,22 @@ B:HIT:HURT:10d10
 B:HIT:HURT:10d10
 B:HIT:HURT:10d10
 B:HIT:HURT:10d10
-F:MALE | OPEN_DOOR | BASH_DOOR | UNIQUE | 
-F:GOOD | DROP_SKELETON | DROP_CORPSE | SMART | PET |
-F:IM_ACID | IM_COLD | RES_WATE | RES_NETH |
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_5 | 
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:PET
+F:RES_NETH
+F:RES_WATE
+F:SMART
+F:UNIQUE
+S:1_IN_5
 S:S_KIN
 D:The eldest son of Finarfin and brother to Galadriel, who founded 
 D:Minas Tirith in the Pass of Sirion, and delved his citadel at 
@@ -3941,11 +5877,18 @@ W:14:4:2600:20
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:CRAWL:POISON:1d4
-F:NEVER_MOVE | EVIL | CAN_SWIM |
-F:IM_POIS | EMPTY_MIND | NO_FEAR | BASEANGBAND | NO_CUT
-S:MULTIPLY | 
-S:1_IN_7 | 
-S:SCARE | CONF | BR_LITE
+F:CAN_SWIM
+F:EMPTY_MIND
+F:EVIL
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CUT
+F:NO_FEAR
+S:1_IN_7
+S:BR_LITE
+S:CONF
+S:MULTIPLY
+S:SCARE
 D:A chaotic mass of pulsating flesh, mouths and eyes. 
 
 # New monster added by furiosity for the Theme module
@@ -3959,10 +5902,25 @@ B:HIT:HURT:10d10
 B:HIT:HURT:10d10
 B:HIT:HURT:10d10
 B:HIT:HURT:10d10
-F:MALE | NO_FEAR | NO_STUN | BASH_DOOR | KILL_BODY | FORCE_MAXHP | 
-F:DROP_SKELETON | DROP_CORPSE | UNIQUE | SMART | DROP_4D2 | 
-F:MORTAL | BASEANGBAND | HAS_LITE | DROP_GREAT | WILD_TOO | WILD_GRASS | 
-S:1_IN_4 | HASTE | SCARE | 
+F:BASH_DOOR
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GREAT
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:HAS_LITE
+F:KILL_BODY
+F:MALE
+F:MORTAL
+F:NO_FEAR
+F:NO_STUN
+F:SMART
+F:UNIQUE
+F:WILD_GRASS
+F:WILD_TOO
+S:1_IN_4
+S:HASTE
+S:SCARE
 D:The eldest of the Seven Sons of Feanor, and considered to be their 
 D:leader. In Valinor he swore the Oath of Feanor, and followed his 
 D:father back to Middle-earth. After Feanor's death, Morgoth captured 
@@ -3978,10 +5936,18 @@ E:1:1:1:2:1:1
 O:20:50:20:5
 B:HIT:HURT:4d8
 B:HIT:HURT:4d8
-F:DROP_60 | WILD_TOO | WILD_MOUNTAIN | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | GIANT | MALE | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:GIANT
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_MOUNTAIN
+F:WILD_TOO
 D:A ten-foot-tall humanoid with powerful muscles. 
 
 N:256:Flesh golem
@@ -3992,10 +5958,17 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
-F:EMPTY_MIND | BASH_DOOR | CAN_SWIM |
-F:IM_ELEC | IM_COLD |
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | 
-F:MORTAL | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CAN_SWIM
+F:EMPTY_MIND
+F:IM_COLD
+F:IM_ELEC
+F:MORTAL
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
 D:A shambling humanoid monster with long scars. 
 
 N:257:Warg
@@ -4006,9 +5979,17 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d6
 B:BITE:HURT:1d6
-F:RAND_25 | BASH_DOOR | FRIENDS | 
-F:WILD_TOO | WILD_WOOD | WILD_MOUNTAIN | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | EVIL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:MORTAL
+F:RAND_25
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:It is a large wolf with eyes full of cunning. If you see 
 D:one, it usually means orcs are nearby. 
 
@@ -4020,11 +6001,17 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:TOUCH:EAT_GOLD
 B:TOUCH:EAT_FOOD
-F:DROP_60 | ONLY_GOLD | RAND_50 | OPEN_DOOR | MALE | 
-F:GOOD | MORTAL | BASEANGBAND | PET 
-S:MULTIPLY | 
-S:1_IN_6 | 
+F:DROP_60
+F:GOOD
+F:MALE
+F:MORTAL
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:PET
+F:RAND_50
+S:1_IN_6
 S:BLINK
+S:MULTIPLY
 D:A merry little gnome. 
 
 N:259:Giant flea
@@ -4034,8 +6021,11 @@ W:14:3:90:3
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:BITE:HURT:1d2
-F:RAND_50 | CAN_FLY | WEIRD_MIND | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:MORTAL
+F:RAND_50
+F:WEIRD_MIND
 S:MULTIPLY
 D:Just looking at it makes you itchy all over.  
 
@@ -4049,13 +6039,24 @@ B:HIT:HURT:3d5
 B:HIT:HURT:3d5
 B:HIT:HURT:3d5
 B:HIT:HURT:3d5
-F:UNIQUE | MALE | 
-F:FORCE_MAXHP | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE | 
-F:ESCORT | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | IM_COLD | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_COLD
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:ORC
+F:UNIQUE
 D:A strong orc guarding the pass of Cirith Ungol. He is mortally afraid of 
 D:spiders:  he was captured by Shelob once, but escaped when she forgot 
 D:completely about him. 
@@ -4068,10 +6069,18 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:1d8
 B:HIT:HURT:1d8
-F:EMPTY_MIND | COLD_BLOOD | BASH_DOOR | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:HURT_ROCK | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:HURT_ROCK
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
 D:It is a massive animated statue made out of hardened clay. 
 
 N:262:Black ogre
@@ -4082,11 +6091,18 @@ E:1:1:1:2:1:1
 O:0:70:0:15
 B:HIT:HURT:2d8
 B:HIT:HURT:2d8
-F:RAND_25 | WILD_TOO | WILD_MOUNTAIN | DROP_CORPSE | 
-F:FRIENDS | DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | GIANT | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FRIENDS
+F:GIANT
+F:HAS_LITE
+F:MORTAL
+F:OPEN_DOOR
+F:RAND_25
+F:WILD_MOUNTAIN
+F:WILD_TOO
 D:A massive orc-like figure with black skin and powerful arms. 
 
 # New monster added by furiosity for the Theme module
@@ -4100,11 +6116,29 @@ B:HIT:HURT:10d10
 B:HIT:HURT:10d10
 B:HIT:HURT:10d10
 B:HIT:HURT:10d10
-F:MALE | NO_FEAR | NO_STUN | BASH_DOOR | KILL_BODY | FORCE_MAXHP | 
-F:DROP_SKELETON | DROP_CORPSE | UNIQUE | SMART | DROP_4D2 | 
-F:MORTAL | BASEANGBAND | HAS_LITE | DROP_GREAT | WILD_TOO | WILD_GRASS | 
-S:1_IN_3 |
-S:HEAL | SCARE | CAUSE_2 | HOLD | CONF | S_ANIMALS | 
+F:BASH_DOOR
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GREAT
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:HAS_LITE
+F:KILL_BODY
+F:MALE
+F:MORTAL
+F:NO_FEAR
+F:NO_STUN
+F:SMART
+F:UNIQUE
+F:WILD_GRASS
+F:WILD_TOO
+S:1_IN_3
+S:CAUSE_2
+S:CONF
+S:HEAL
+S:HOLD
+S:SCARE
+S:S_ANIMALS
 D:The second son of Feanor, who inherited more of his mother Nerdanel's 
 D:gentle spirit than any of his brothers. Maglor was famed as a poet and 
 D:bard, but he took the Oath of Feanor in Tirion and shared in the woes 
@@ -4118,10 +6152,18 @@ E:1:1:1:2:1:1
 O:30:30:30:5
 B:HIT:HURT:3d4
 B:HIT:HURT:3d4
-F:MALE | WILD_TOO |
-F:FRIENDS | DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | ORC | MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:ORC
+F:WILD_TOO
 D:He is a hideous deformed cross-breed with man and orc, combining man's 
 D:strength and cunning with orcish evil. The Dunlendings fighting on 
 D:Saruman's side were first noted to mix their blood with the orcs. 
@@ -4134,12 +6176,26 @@ E:0:0:0:0:1:0
 O:0:0:80:20
 B:STING:HURT:1d10
 B:BITE:HURT:1d10
-F:FEMALE | 
-F:RAND_25 | DROP_60 | DROP_1D2 | IM_POIS | IM_COLD | RES_WATE |
-F:OPEN_DOOR | BASH_DOOR | EMPTY_MIND | CAN_SWIM | DROP_CORPSE | 
-F:EVIL | MORTAL | BASEANGBAND
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:EMPTY_MIND
+F:EVIL
+F:FEMALE
+F:IM_COLD
+F:IM_POIS
+F:MORTAL
+F:OPEN_DOOR
+F:RAND_25
+F:RES_WATE
 S:1_IN_8
-S:HOLD | CONF | BO_COLD | HEAL | DARKNESS
+S:BO_COLD
+S:CONF
+S:DARKNESS
+S:HEAL
+S:HOLD
 D:A giant snake-like figure with a woman's torso, talented in magic. 
 
 N:266:Poison ivy
@@ -4150,10 +6206,24 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:POISON:2d2
 B:HIT:POISON:2d2
-F:FORCE_SLEEP | NEVER_MOVE | STUPID | EMPTY_MIND | FRIENDS | 
-F:KILL_TREES | SUSCEP_FIRE | ANIMAL | 
-F:WILD_ONLY | COLD_BLOOD | WILD_WOOD | WILD_GRASS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | MORTAL | BASEANGBAND | DROP_60 | NO_CUT
+F:ANIMAL
+F:COLD_BLOOD
+F:DROP_60
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:FRIENDS
+F:KILL_TREES
+F:MORTAL
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+F:SUSCEP_FIRE
+F:WILD_GRASS
+F:WILD_ONLY
+F:WILD_WOOD
 S:MULTIPLY
 D:A mass of vegetation.  It seems to be growing.  
 
@@ -4167,11 +6237,20 @@ B:SPORE:CONFUSE
 B:SPORE:CONFUSE
 B:SPORE:HALLU
 B:SPORE:HALLU
-F:FORCE_SLEEP | NEVER_MOVE | 
-F:STUPID | RES_TELE | CAN_SWIM |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_2 | 
-S:BLINK | SLOW | SCARE | DARKNESS
+F:CAN_SWIM
+F:FORCE_SLEEP
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RES_TELE
+F:STUPID
+S:1_IN_2
+S:BLINK
+S:DARKNESS
+S:SCARE
+S:SLOW
 D:Yum!  It looks quite tasty. It seems to glow with an unusual light. 
 
 # New monster added by furiosity for the Theme module
@@ -4185,11 +6264,29 @@ B:HIT:HURT:10d10
 B:HIT:HURT:10d10
 B:HIT:HURT:10d10
 B:HIT:HURT:10d10
-F:MALE | NO_FEAR | NO_STUN | BASH_DOOR | KILL_BODY | FORCE_MAXHP | 
-F:DROP_SKELETON | DROP_CORPSE | UNIQUE | SMART | DROP_4D2 | 
-F:MORTAL | BASEANGBAND | HAS_LITE | DROP_GREAT | WILD_TOO | WILD_GRASS | 
-S:1_IN_3 | 
-S:S_MONSTER | S_ANIMAL | S_KIN | S_MONSTERS | S_ANIMALS | S_KIN | 
+F:BASH_DOOR
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GREAT
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:HAS_LITE
+F:KILL_BODY
+F:MALE
+F:MORTAL
+F:NO_FEAR
+F:NO_STUN
+F:SMART
+F:UNIQUE
+F:WILD_GRASS
+F:WILD_TOO
+S:1_IN_3
+S:S_ANIMAL
+S:S_ANIMALS
+S:S_KIN
+S:S_KIN
+S:S_MONSTER
+S:S_MONSTERS
 D:Celegorm the Fair was the third of the seven sons of Feanor. 
 D:The most ambitious of the seven, he followed the oath of his father 
 D:with the greatest ardour. He searches forever for the Silmarils.
@@ -4203,11 +6300,16 @@ O:0:0:80:20
 B:CRUSH:HURT:2d8
 B:BITE:HURT:1d8
 B:BITE:HURT:1d8
-F:FEMALE | 
-F:RAND_25 | DROP_60 | DROP_1D2 | DROP_CORPSE
-F:OPEN_DOOR | BASH_DOOR | CAN_SWIM |
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
 F:EVIL
-F:MORTAL | BASEANGBAND
+F:FEMALE
+F:MORTAL
+F:OPEN_DOOR
+F:RAND_25
 D:A giant snake-like figure with a woman's torso. 
 
 N:270:Wererat
@@ -4219,13 +6321,21 @@ O:0:0:0:0
 B:CLAW:HURT:1d8
 B:CLAW:HURT:1d8
 B:BITE:HURT:2d6
-F:FORCE_SLEEP | 
-F:ONLY_GOLD | DROP_60 | DROP_CORPSE
-F:OPEN_DOOR | BASH_DOOR | 
-F:ANIMAL | EVIL
-F:MORTAL | BASEANGBAND
-S:1_IN_9 | 
-S:BLINK | CAUSE_2 | BO_COLD | BA_POIS | S_KIN
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_SLEEP
+F:MORTAL
+F:ONLY_GOLD
+F:OPEN_DOOR
+S:1_IN_9
+S:BA_POIS
+S:BLINK
+S:BO_COLD
+S:CAUSE_2
+S:S_KIN
 D:A large rat with glowing red eyes, which can also assume human form. 
 D:It is a disgusting creature, relishing in filth and disease. 
 
@@ -4238,11 +6348,14 @@ O:0:0:0:0
 B:CLAW:HURT:1d4
 B:CLAW:HURT:1d4
 B:BITE:HURT:1d6
-F:FORCE_SLEEP | DROP_CORPSE | 
-F:FRIENDS | 
-F:BASH_DOOR | 
-F:ANIMAL | MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_5 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:FRIENDS
+F:HAS_LITE
+F:MORTAL
+S:1_IN_5
 S:BR_LITE
 D:A brilliant canine form whose light hurts your eyes, even at this distance. 
 
@@ -4255,11 +6368,14 @@ O:0:0:0:0
 B:CLAW:HURT:1d4
 B:CLAW:HURT:1d4
 B:BITE:HURT:1d6
-F:FORCE_SLEEP | DROP_CORPSE | 
-F:FRIENDS | 
-F:BASH_DOOR | HURT_LITE | 
-F:ANIMAL | MORTAL | BASEANGBAND
-S:1_IN_5 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:FRIENDS
+F:HURT_LITE
+F:MORTAL
+S:1_IN_5
 S:BR_DARK
 D:A hole in the air in the shape of a huge hound. No light falls upon its 
 D:form. 
@@ -4272,9 +6388,20 @@ E:0:0:0:0:1:0
 O:90:0:10:0
 B:BITE:POISON:1d3
 B:BITE:LOSE_STR:1d4
-F:UNDEAD | EVIL | IM_POIS | IM_COLD | WEIRD_MIND | NO_FEAR | CAN_FLY |
-F:NO_CONF | NO_SLEEP | DROP_60 | BASH_DOOR | FRIENDS | COLD_BLOOD | 
-F:BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_60
+F:EVIL
+F:FRIENDS
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:UNDEAD
+F:WEIRD_MIND
 D:A skull animated by necromantic spells. You'll seldom catch one alone. 
 
 # New monster added by furiosity for the Theme module
@@ -4288,11 +6415,25 @@ B:HIT:HURT:10d10
 B:HIT:HURT:10d10
 B:HIT:HURT:10d10
 B:TOUCH:EAT_ITEM:10d10
-F:MALE | NO_FEAR | NO_STUN | BASH_DOOR | KILL_BODY | FORCE_MAXHP | 
-F:DROP_SKELETON | DROP_CORPSE | UNIQUE | SMART | DROP_4D2 | 
-F:MORTAL | BASEANGBAND | HAS_LITE | DROP_GREAT | WILD_TOO | WILD_GRASS | 
-S:1_IN_3 | 
-S:TRAPS | CONF | SCARE | 
+F:BASH_DOOR
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GREAT
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:HAS_LITE
+F:KILL_BODY
+F:MALE
+F:MORTAL
+F:NO_FEAR
+F:NO_STUN
+F:SMART
+F:UNIQUE
+F:WILD_GRASS
+F:WILD_TOO
+S:1_IN_3
+S:CONF
+S:SCARE
 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.
 
@@ -4305,9 +6446,14 @@ O:0:0:0:0
 B:BITE:POISON:1d6
 B:BITE:POISON:1d6
 B:BITE:POISON:1d6
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO |
-F:ANIMAL | SPIDER | IM_POIS | DROP_SKELETON | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:IM_POIS
+F:MORTAL
+F:SPIDER
+F:WEIRD_MIND
+F:WILD_TOO
 D:A giant spider with hairy black and red legs. 
 
 # New monster added by furiosity for the Theme module
@@ -4321,11 +6467,27 @@ B:HIT:HURT:10d10
 B:HIT:EAT_ITEM:10d10
 B:HIT:EAT_ITEM:10d10
 B:HIT:EAT_ITEM:10d10
-F:MALE | NO_FEAR | NO_STUN | BASH_DOOR | KILL_BODY | FORCE_MAXHP | 
-F:DROP_SKELETON | DROP_CORPSE | UNIQUE | SMART | DROP_4D2 | 
-F:MORTAL | BASEANGBAND | HAS_LITE | DROP_GREAT | WILD_TOO | WILD_GRASS | 
-S:1_IN_3 | 
-S:TELE_TO | TELE_AWAY | TPORT | BLINK | TRAPS | 
+F:BASH_DOOR
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GREAT
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:HAS_LITE
+F:KILL_BODY
+F:MALE
+F:MORTAL
+F:NO_FEAR
+F:NO_STUN
+F:SMART
+F:UNIQUE
+F:WILD_GRASS
+F:WILD_TOO
+S:1_IN_3
+S:BLINK
+S:TELE_AWAY
+S:TELE_TO
+S:TPORT
 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.
@@ -4339,10 +6501,18 @@ O:0:0:0:0
 B:BITE:HURT:1d8
 B:BITE:POISON:1d6
 B:BITE:POISON:1d6
-F:FRIENDS | WILD_TOO | WILD_WOOD |
-F:WEIRD_MIND | BASH_DOOR | HURT_LITE |
-F:ANIMAL | SPIDER | EVIL | IM_POIS |  DROP_SKELETON | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HURT_LITE
+F:IM_POIS
+F:MORTAL
+F:SPIDER
+F:WEIRD_MIND
+F:WILD_TOO
+F:WILD_WOOD
 D:A strong and powerful spider from Mirkwood forest. Cunning and evil, it 
 D:seeks to taste your juicy insides. 
 
@@ -4354,10 +6524,22 @@ E:1:1:1:2:1:1
 O:20:80:0:0
 B:HIT:COLD:5d8
 B:HIT:COLD:5d8
-F:DROP_60 | WILD_TOO | WILD_WASTE | WILD_MOUNTAIN |
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | GIANT | MALE | AURA_COLD | SUSCEP_FIRE |
-F:IM_COLD | BASEANGBAND | HAS_LITE | MORTAL
+F:AURA_COLD
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:GIANT
+F:HAS_LITE
+F:IM_COLD
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:SUSCEP_FIRE
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WASTE
 D:A twelve-foot-tall giant covered in furs. 
 
 N:279:Griffon
@@ -4368,8 +6550,15 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:HIT:HURT:3d4
 B:BITE:HURT:2d6
-F:BASH_DOOR | CAN_FLY | WILD_TOO | WILD_WOOD | WILD_MOUNTAIN | WILD_GRASS |
-F:ANIMAL | DROP_CORPSE | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:MORTAL
+F:WILD_GRASS
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:It is half lion, half eagle. It flies menacingly towards you. 
 
 N:280:Aewrog
@@ -4380,9 +6569,16 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:PARALYZE:1d2
 B:HIT:HURT:1d10
-F:OPEN_DOOR | BASH_DOOR | NONLIVING | CAN_FLY |
-F:EVIL | DEMON | IM_FIRE | NO_FEAR | BASEANGBAND | HAS_LITE
-S:1_IN_50 | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DEMON
+F:EVIL
+F:HAS_LITE
+F:IM_FIRE
+F:NONLIVING
+F:NO_FEAR
+F:OPEN_DOOR
+S:1_IN_50
 S:BR_NETH
 D:A minor demonic servant of evil. It resembles a bird - in fact, 
 D:the Aewroeg are the result of the corruption of smaller birds by Morgoth.
@@ -4394,12 +6590,20 @@ W:15:2:900:40
 E:1:1:1:2:1:1
 O:20:0:80:0
 B:HIT:HURT:1d5
-F:MALE | 
-F:FORCE_SLEEP | FRIENDS | DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_4 | 
-S:BLINK | DARKNESS | BO_COLD | 
+F:BASH_DOOR
+F:DROP_60
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_SLEEP
+F:FRIENDS
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+S:1_IN_4
+S:BLINK
+S:BO_COLD
+S:DARKNESS
 S:S_MONSTER
 D:A mage of short stature. 
 
@@ -4412,10 +6616,14 @@ O:0:0:0:0
 B:CLAW:HURT:1d6
 B:CLAW:HURT:1d6
 B:BITE:HURT:1d8
-F:ATTR_CLEAR | 
-F:FRIENDS | DROP_SKELETON | DROP_CORPSE | 
-F:INVISIBLE | BASH_DOOR | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:ATTR_CLEAR
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FRIENDS
+F:INVISIBLE
+F:MORTAL
 D:A faint sense of motion in the air, hound-shaped, stands before you. 
 
 N:283:Umber hulk
@@ -4428,11 +6636,18 @@ B:GAZE:CONFUSE
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
 B:BITE:HURT:2d6
-F:EMPTY_MIND | COLD_BLOOD | 
-F:BASH_DOOR | KILL_WALL | DROP_SKELETON | 
-F:ANIMAL | EVIL | 
-F:IM_POIS | 
-F:HURT_ROCK | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_SKELETON
+F:EMPTY_MIND
+F:EVIL
+F:HURT_ROCK
+F:IM_POIS
+F:KILL_WALL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
 D:This bizarre creature has glaring eyes and large mandibles capable of 
 D:slicing through rock. 
 
@@ -4446,10 +6661,14 @@ B:TOUCH:ACID:1d10
 B:TOUCH:ACID:1d10
 B:TOUCH:ACID:1d10
 B:TOUCH:ACID:1d10
-F:STUPID | WEIRD_MIND | KILL_ITEM |
-F:IM_ACID | IM_POIS | DROP_CORPSE | 
-F:NO_CONF | 
-F:MORTAL | BASEANGBAND
+F:DROP_CORPSE
+F:IM_ACID
+F:IM_POIS
+F:KILL_ITEM
+F:MORTAL
+F:NO_CONF
+F:STUPID
+F:WEIRD_MIND
 D:It is a weird, small animal with two antennae popping forth from 
 D:its forehead. It looks hungry. 
 
@@ -4461,10 +6680,16 @@ E:1:1:1:2:1:1
 O:20:70:0:10
 B:HIT:HURT:2d10
 B:HIT:HURT:2d10
-F:FRIENDS | DROP_60 | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | GIANT | ORC | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FRIENDS
+F:GIANT
+F:HAS_LITE
+F:MORTAL
+F:OPEN_DOOR
+F:ORC
 D:An unnatural hybrid of ogre and orc. 
 
 N:286:Gelatinous cube
@@ -4476,12 +6701,25 @@ O:40:30:20:0
 B:TOUCH:ACID:1d10
 B:TOUCH:ACID:1d10
 B:TOUCH:ACID:1d10
-F:FORCE_MAXHP | 
-F:DROP_1D2 | DROP_4D2 | 
-F:STUPID | EMPTY_MIND | COLD_BLOOD |
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | CAN_SWIM |
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_4D2
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:STUPID
+F:TAKE_ITEM
 D:It is a strange, vast gelatinous structure that assumes cubic proportions 
 D:as it lines all four walls of the corridors it patrols. Through its 
 D:transparent jelly structure you can see treasures it has engulfed, and a 
@@ -4494,11 +6732,17 @@ W:16:2:150:65
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:POISON:1d6
-F:FORCE_SLEEP | RAND_50 | RAND_25 | WILD_TOO | WILD_SWAMP |
-F:WEIRD_MIND | BASH_DOOR | CAN_FLY |
-F:ANIMAL | IM_POIS | 
-F:MORTAL | BASEANGBAND
-S:1_IN_10 | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:FORCE_SLEEP
+F:IM_POIS
+F:MORTAL
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
+F:WILD_TOO
+S:1_IN_10
 S:BR_POIS
 D:A large, foul-smelling dragonfly. 
 
@@ -4510,10 +6754,21 @@ E:1:1:1:2:1:1
 O:20:80:0:0
 B:HIT:FIRE:6d8
 B:HIT:FIRE:6d8
-F:DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | WILD_TOO | WILD_VOLCANO | SUSCEP_COLD |
-F:EVIL | GIANT | MALE | AURA_FIRE | DROP_SKELETON | DROP_CORPSE | 
-F:IM_FIRE | BASEANGBAND | HAS_LITE | MORTAL
+F:AURA_FIRE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:GIANT
+F:HAS_LITE
+F:IM_FIRE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:SUSCEP_COLD
+F:WILD_TOO
+F:WILD_VOLCANO
 D:A glowing fourteen-foot-tall giant. Flames surround his red skin. 
 
 N:289:Hummerhorn
@@ -4523,8 +6778,12 @@ W:16:4:100:4
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:CONFUSE:2d2
-F:RAND_50 | RAND_25 | CAN_FLY | WILD_TOO | 
-F:WEIRD_MIND | ANIMAL | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
+F:WILD_TOO
 S:MULTIPLY
 D:A giant buzzing wasp, its stinger drips venom. 
 
@@ -4536,11 +6795,19 @@ E:1:1:1:2:1:1
 O:50:50:0:0
 B:HIT:HURT:4d4
 B:HIT:HURT:4d4
-F:MALE | CAN_SWIM | IM_ACID |
-F:FRIENDS | DROP_60 | WILD_TOO | WILD_SHORE |
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON
-F:EVIL 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_60
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HAS_LITE
+F:IM_ACID
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_SHORE
+F:WILD_TOO
 D:Intelligent lizard being from the depths. 
 
 N:291:Ulfast, Son of Ulfang
@@ -4553,12 +6820,21 @@ B:HIT:HURT:3d6
 B:HIT:HURT:3d6
 B:HIT:HURT:3d6
 B:HIT:HURT:3d6
-F:UNIQUE | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE | 
-F:MALE | 
-F:FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_90 | DROP_GOOD | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:TAKE_ITEM
+F:UNIQUE
 D:A short and swarthy Easterling. He professed to follow 
 D:Caranthir, but turned on the Sons of Feanor, and so 
 D:brought about their defeat. 
@@ -4571,10 +6847,24 @@ E:0:1:1:0:1:0
 O:0:0:0:0
 B:CLAW:HURT:1d4
 B:CLAW:HURT:1d4
-F:ANIMAL | EVIL | MORTAL | FRIENDS | BASEANGBAND | DROP_CORPSE | HAS_EGG | 
-F:WILD_TOO | WILD_WASTE | WILD_MOUNTAIN | WILD_WOOD | WILD_VOLCANO | 
-F:WILD_GRASS | WILD_SWAMP | WILD_SHORE | WILD_OCEAN | CAN_FLY | AQUATIC 
-S:1_IN_8 | SHRIEK
+F:ANIMAL
+F:AQUATIC
+F:CAN_FLY
+F:DROP_CORPSE
+F:EVIL
+F:FRIENDS
+F:HAS_EGG
+F:MORTAL
+F:WILD_GRASS
+F:WILD_MOUNTAIN
+F:WILD_OCEAN
+F:WILD_SHORE
+F:WILD_TOO
+F:WILD_VOLCANO
+F:WILD_WASTE
+F:WILD_WOOD
+S:1_IN_8
+S:SHRIEK
 D:A type of crow, specially bred by the forces of evil as spies; their 
 D:rudimentary intelligence guided by an evil mind has tracked you down, 
 D:and now they seek to alert other evil creatures to your presence. 
@@ -4588,10 +6878,19 @@ O:20:80:0:0
 B:HIT:HURT:7d7
 B:HIT:HURT:7d7
 B:HIT:HURT:7d7
-F:MALE | NO_FEAR | NO_STUN | BASH_DOOR | KILL_BODY | FORCE_MAXHP | 
-F:DROP_SKELETON | DROP_CORPSE
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_4 | HASTE | SCARE
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:HAS_LITE
+F:KILL_BODY
+F:MALE
+F:MORTAL
+F:NO_FEAR
+F:NO_STUN
+S:1_IN_4
+S:HASTE
+S:SCARE
 D:He can drive himself into such a terrible battle-frenzy that he 
 D:can survive blows which should kill him, and still apparently feel 
 D:no pain.  He tramples weaker creatures underfoot in his eagerness 
@@ -4607,13 +6906,26 @@ O:0:50:30:10
 B:BITE:LOSE_DEX:1d6
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
-F:FORCE_SLEEP |
-F:RAND_25 | 
-F:ONLY_ITEM | DROP_1D2 | 
-F:SMART | INVISIBLE | BASH_DOOR | 
-F:EVIL | DEMON | IM_FIRE | NONLIVING | BASEANGBAND | HAS_LITE
-S:1_IN_10 | 
-S:BLINK | TPORT | TELE_TO | TELE_LEVEL | BLIND | CONF | SCARE
+F:BASH_DOOR
+F:DEMON
+F:DROP_1D2
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:INVISIBLE
+F:NONLIVING
+F:ONLY_ITEM
+F:RAND_25
+F:SMART
+S:1_IN_10
+S:BLIND
+S:BLINK
+S:CONF
+S:SCARE
+S:TELE_LEVEL
+S:TELE_TO
+S:TPORT
 D:Draugroeg are doglike demons, dogs corrupted by Morgoth.
 
 N:295:Sphinx
@@ -4624,12 +6936,20 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:CLAW:HURT:2d6
 B:CLAW:HURT:2d6
-F:FORCE_SLEEP | 
-F:ONLY_GOLD | DROP_1D2 | CAN_FLY | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | WILD_TOO | WILD_MOUNTAIN | 
-F:ANIMAL | MORTAL | BASEANGBAND
-S:1_IN_11 | 
-S:SCARE | CONF
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_1D2
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:MORTAL
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:WILD_MOUNTAIN
+F:WILD_TOO
+S:1_IN_11
+S:CONF
+S:SCARE
 D:It will eat you if you cannot answer its riddle. 
 D:Unfortunately, you do not understand the language 
 D:it speaks.
@@ -4642,13 +6962,29 @@ E:0:1:1:0:1:0
 O:30:20:50:0
 B:HIT:POISON:3d4
 B:HIT:POISON:3d4
-F:FORCE_SLEEP | CAN_FLY |
-F:RAND_25 | 
-F:ONLY_ITEM | DROP_1D2 | 
-F:SMART | INVISIBLE | COLD_BLOOD | BASH_DOOR | 
-F:EVIL | DEMON | IM_FIRE | RES_TELE | BASEANGBAND | HAS_LITE
-S:1_IN_10 | 
-S:BLINK | TPORT | TELE_TO | TELE_LEVEL | BLIND | CONF | SCARE | BO_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DEMON
+F:DROP_1D2
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:INVISIBLE
+F:ONLY_ITEM
+F:RAND_25
+F:RES_TELE
+F:SMART
+S:1_IN_10
+S:BLIND
+S:BLINK
+S:BO_FIRE
+S:CONF
+S:SCARE
+S:TELE_LEVEL
+S:TELE_TO
+S:TPORT
 D:A minor demonic servant of evil. It resembles a rat - in fact, 
 D:the Narroeg are the result of the corruption of rats by Morgoth.
 
@@ -4661,10 +6997,20 @@ O:30:70:0:0
 B:HIT:HURT:1d4
 B:HIT:HURT:1d4
 B:BITE:HURT:1d6
-F:MALE | 
-F:FRIENDS | DROP_60 | WILD_TOO | WILD_WOOD | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | SUSCEP_FIRE | REGENERATE | 
-F:EVIL | TROLL | HURT_LITE | BASEANGBAND
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HURT_LITE
+F:MALE
+F:OPEN_DOOR
+F:REGENERATE
+F:SUSCEP_FIRE
+F:TROLL
+F:WILD_TOO
+F:WILD_WOOD
 D:Trolls were made by Melkor Bauglir in mockery of the Ents. This one 
 D:is green-skinned and very ugly. 
 
@@ -4675,9 +7021,20 @@ W:17:1:0:50
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:EXPLODE:COLD:8d8
-F:FORCE_SLEEP | CAN_FLY | SUSCEP_FIRE | RAND_50 | RAND_25 | 
-F:EMPTY_MIND | AURA_COLD |
-F:IM_COLD | NO_FEAR | NO_CONF | NO_SLEEP | NONLIVING | BASEANGBAND | HAS_LITE | NO_CUT
+F:AURA_COLD
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RAND_25
+F:RAND_50
+F:SUSCEP_FIRE
 D:A semi-sentient snowball, hurling itself at targets at random. 
 
 N:299:Jumping fireball
@@ -4687,9 +7044,20 @@ W:17:1:0:50
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:EXPLODE:FIRE:8d8
-F:FORCE_SLEEP | CAN_FLY | SUSCEP_COLD |
-F:EMPTY_MIND | AURA_FIRE | RAND_50 | RAND_25 | 
-F:IM_FIRE | NO_FEAR | NO_CONF | NO_SLEEP | NONLIVING | BASEANGBAND | HAS_LITE | NO_CUT
+F:AURA_FIRE
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RAND_25
+F:RAND_50
+F:SUSCEP_COLD
 D:A semi-sentient fireball that moves around randomly. 
 
 N:300:Ball lightning
@@ -4699,9 +7067,19 @@ W:17:1:0:50
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:EXPLODE:ELEC:8d8
-F:FORCE_SLEEP | CAN_FLY | RAND_25 | RAND_50 | 
-F:EMPTY_MIND | AURA_ELEC |
-F:IM_ELEC | NO_FEAR | NO_CONF | NO_SLEEP | NONLIVING | BASEANGBAND | HAS_LITE |NO_CUT
+F:AURA_ELEC
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ELEC
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RAND_25
+F:RAND_50
 D:A crackling ball of energy, zooming about seemingly at random. 
 
 N:301:2-headed hydra
@@ -4712,11 +7090,22 @@ E:0:1:0:2:2:0
 O:0:0:0:0
 B:BITE:HURT:2d6
 B:BITE:HURT:2d6
-F:FORCE_SLEEP | WILD_TOO | WILD_SHORE | WILD_SWAMP |
-F:ONLY_GOLD | DROP_1D2 | CAN_SWIM | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | MOVE_BODY | HAS_EGG | IMPRESED | 
-F:ANIMAL | MORTAL | BASEANGBAND
-S:1_IN_11 | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:HAS_EGG
+F:IMPRESED
+F:MORTAL
+F:MOVE_BODY
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:WILD_SHORE
+F:WILD_TOO
+S:1_IN_11
 S:SCARE
 D:A strange reptilian creature with two heads, guarding its hoard. 
 
@@ -4728,8 +7117,11 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:CLAW:TERRIFY:2d5
 B:CLAW:TERRIFY:5d2
-F:CAN_SWIM | OPEN_DOOR | BASH_DOOR | WILD_TOO | WILD_SWAMP
-F:MORTAL | BASEANGBAND
+F:BASH_DOOR
+F:CAN_SWIM
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
 D:A creature that was once human, but is now as green as moss. 
 
 N:303:Water spirit
@@ -4740,10 +7132,17 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:HURT:2d4
 B:HIT:HURT:2d4
-F:RAND_25 | 
-F:EMPTY_MIND | COLD_BLOOD | BASH_DOOR | 
-F:IM_POIS | IM_ACID | CAN_FLY |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:IM_ACID
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RAND_25
 D:A whirlpool of sentient liquid. 
 
 N:304:Giant red scorpion
@@ -4754,9 +7153,12 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:2d4
 B:STING:LOSE_STR:1d7
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO |
-F:ANIMAL | DROP_SKELETON | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:MORTAL
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is fast and poisonous. 
 
 N:305:Earth spirit
@@ -4767,11 +7169,20 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:HURT:1d8
 B:HIT:HURT:1d8
-F:RAND_25 | 
-F:EMPTY_MIND | COLD_BLOOD | 
-F:PASS_WALL | CAN_FLY |
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | HURT_ROCK | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_FLY
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:HURT_ROCK
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:PASS_WALL
+F:RAND_25
 D:A whirling form of sentient rock. 
 
 N:306:Fire spirit
@@ -4782,10 +7193,21 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:FIRE:2d6
 B:HIT:FIRE:2d6
-F:RAND_25 | 
-F:EMPTY_MIND | BASH_DOOR | CAN_FLY | SUSCEP_COLD | 
-F:IM_FIRE | IM_POIS | WILD_TOO | WILD_VOLCANO |
-F:NO_CONF | NO_SLEEP | NO_FEAR | AURA_FIRE | BASEANGBAND | HAS_LITE | NO_CUT
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:HAS_LITE
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RAND_25
+F:SUSCEP_COLD
+F:WILD_TOO
+F:WILD_VOLCANO
 D:A whirlwind of sentient flame. 
 
 N:307:Fire hound
@@ -4797,12 +7219,17 @@ O:0:0:0:0
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
 B:BITE:FIRE:2d6
-F:FORCE_SLEEP | 
-F:FRIENDS | 
-F:BASH_DOOR | SUSCEP_COLD |
-F:ANIMAL | IM_FIRE | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_10 |
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:HAS_LITE
+F:IM_FIRE
+F:MORTAL
+F:SUSCEP_COLD
+S:1_IN_10
 S:BR_FIRE
 D:Flames lick at its feet and its tongue is a blade of fire. You can feel a 
 D:furnace heat radiating from this creature. 
@@ -4816,12 +7243,16 @@ O:0:0:0:0
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
 B:BITE:COLD:2d6
-F:FORCE_SLEEP | 
-F:FRIENDS | 
-F:BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | IM_COLD | SUSCEP_FIRE |
-F:MORTAL | BASEANGBAND
-S:1_IN_10 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:IM_COLD
+F:MORTAL
+F:SUSCEP_FIRE
+S:1_IN_10
 S:BR_COLD
 D:A hound as tall as a man, this creature appears to be composed of angular 
 D:planes of ice. Cold radiates from it and freezes your breath in the air. 
@@ -4835,12 +7266,16 @@ O:0:0:0:0
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
 B:BITE:ELEC:2d6
-F:FORCE_SLEEP | 
-F:FRIENDS | DROP_SKELETON | DROP_CORPSE | 
-F:BASH_DOOR | 
-F:ANIMAL | IM_ELEC | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_10 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:HAS_LITE
+F:IM_ELEC
+F:MORTAL
+S:1_IN_10
 S:BR_ELEC
 D:An aura of lightning forms a ghostly halo around this hound, and 
 D:sparks sting your fingers as energy builds up in the air around you. 
@@ -4854,12 +7289,22 @@ O:10:10:10:10
 B:HIT:POISON:3d4
 B:HIT:HURT:2d3
 B:HIT:HURT:2d3
-F:MIMIC | 
-F:FORCE_SLEEP | NEVER_MOVE | SUSCEP_COLD |
-F:EMPTY_MIND | COLD_BLOOD | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_6 | 
-S:BLIND | CONF | SCARE | CAUSE_2 | BO_COLD
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:MIMIC
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:SUSCEP_COLD
+S:1_IN_6
+S:BLIND
+S:BO_COLD
+S:CAUSE_2
+S:CONF
+S:SCARE
 D:A strange creature that disguises itself as some object to lure 
 D:unsuspecting adventurers within reach of its venomous claws. 
 
@@ -4872,12 +7317,21 @@ O:0:0:0:0
 B:HIT:POISON:3d4
 B:HIT:CONFUSE:2d3
 B:HIT:PARALYZE:2d3
-F:CHAR_MULTI | 
-F:FORCE_SLEEP | NEVER_MOVE | 
-F:EMPTY_MIND | COLD_BLOOD | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_6 | 
-S:BLIND | CONF | SCARE | CAUSE_2 | BO_COLD
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+S:1_IN_6
+S:BLIND
+S:BO_COLD
+S:CAUSE_2
+S:CONF
+S:SCARE
 D:A strange creature that disguises itself as a door to lure 
 D:unsuspecting adventurers within reach of its venomous claws. 
 
@@ -4888,9 +7342,17 @@ W:18:2:400:50
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d8
-F:RAND_25 | FRIENDS | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | RES_TELE | MORTAL | BASEANGBAND
-S:1_IN_4 | BLINK | TELE_TO
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FRIENDS
+F:MORTAL
+F:RAND_25
+F:RES_TELE
+S:1_IN_4
+S:BLINK
+S:TELE_TO
 D:A strange magical member of the canine race, its form seems to shimmer and 
 D:fade in front of your very eyes. 
 
@@ -4902,12 +7364,20 @@ E:1:1:1:2:1:1
 O:20:80:0:0
 B:HIT:HURT:3d5
 B:HIT:HURT:3d5
-F:MALE | 
-F:FORCE_MAXHP | FRIENDS | DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | ORC | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_9 | 
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FRIENDS
+F:HAS_LITE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:ORC
+S:1_IN_9
 S:ARROW_2
 D:It is a cunning orc of power, as tall as a man, and stronger. It fears 
 D:little. His armour bears the mark of Saruman - a large white hand. 
@@ -4922,13 +7392,24 @@ B:HIT:HURT:3d9
 B:HIT:HURT:3d9
 B:HIT:HURT:3d6
 B:HIT:HURT:3d6
-F:UNIQUE | MALE | CAN_SPEAK |
-F:FORCE_MAXHP | SPECIAL_GENE
-F:ESCORT | DROP_SKELETON | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:ORC
+F:SPECIAL_GENE
+F:UNIQUE
 D:He has power and great cunning, as leader of the garrison at Cirith Ungol. 
 D:He is a large Uruk with an evil face, protruding fangs and long arms. 
 
@@ -4942,13 +7423,23 @@ B:HIT:HURT:3d9
 B:HIT:HURT:3d9
 B:HIT:HURT:3d6
 B:HIT:HURT:3d6
-F:UNIQUE | MALE | CAN_SPEAK |
-F:FORCE_MAXHP | 
-F:ESCORT | DROP_SKELETON | DROP_CORPSE
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | IM_POIS
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:ORC
+F:UNIQUE
 D:He is an orc of power and great cunning, leader of the garrison at Minas Morgul. 
 
 N:316:Shambling mound
@@ -4959,10 +7450,19 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:1d8
 B:HIT:HURT:1d8
-F:ONLY_GOLD | DROP_90 | WILD_TOO | WILD_SWAMP |
-F:STUPID | EMPTY_MIND | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_4 | 
+F:BASH_DOOR
+F:DROP_90
+F:EMPTY_MIND
+F:EVIL
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:STUPID
+F:WILD_TOO
+S:1_IN_4
 S:SHRIEK
 D:A pile of rotting vegetation that slides towards you with a disgusting 
 D:stench, waking all it nears. 
@@ -4976,8 +7476,16 @@ O:0:0:0:0
 B:HIT:PARALYZE:3d3
 B:HIT:PARALYZE:3d3
 B:HIT:PARALYZE:3d3
-F:NEVER_MOVE | EMPTY_MIND | STUPID | CHAR_CLEAR | CHAR_MULTI | BASEANGBAND | 
-F:WILD_ONLY | WILD_WOOD | WILD_SWAMP | ANIMAL | SUSCEP_FIRE | NO_CUT
+F:ANIMAL
+F:CHAR_CLEAR
+F:CHAR_MULTI
+F:EMPTY_MIND
+F:NEVER_MOVE
+F:NO_CUT
+F:STUPID
+F:SUSCEP_FIRE
+F:WILD_ONLY
+F:WILD_WOOD
 D:A carnivorous plant that is difficult to detect, until it suddenly snaps shut 
 D:around its prey and releases paralysing enzymes to stop its struggles. 
 
@@ -4992,11 +7500,28 @@ B:HIT:HURT:10d10
 B:HIT:HURT:10d10
 B:HIT:HURT:10d10
 B:HIT:HURT:10d10
-F:MALE | NO_FEAR | NO_STUN | BASH_DOOR | KILL_BODY | FORCE_MAXHP | 
-F:DROP_SKELETON | DROP_CORPSE | UNIQUE | SMART | DROP_4D2 | 
-F:MORTAL | BASEANGBAND | HAS_LITE | DROP_GREAT | WILD_TOO | WILD_GRASS | 
-S:1_IN_3 | 
-S:ARROW_1 | ARROW_2 | ARROW_3 | ARROW_4 | MISSILE 
+F:BASH_DOOR
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GREAT
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:HAS_LITE
+F:KILL_BODY
+F:MALE
+F:MORTAL
+F:NO_FEAR
+F:NO_STUN
+F:SMART
+F:UNIQUE
+F:WILD_GRASS
+F:WILD_TOO
+S:1_IN_3
+S:ARROW_1
+S:ARROW_2
+S:ARROW_3
+S:ARROW_4
+S:MISSILE
 D:The youngest son of Feanor along with his twin brother Amras. 
 D:He is bound by the Oath of Feanor and searches forever for the 
 D:Silmarils.
@@ -5012,12 +7537,33 @@ B:HIT:HURT:10d10
 B:HIT:HURT:10d10
 B:HIT:HURT:10d10
 B:HIT:HURT:10d10
-F:MALE | NO_FEAR | NO_STUN | BASH_DOOR | KILL_BODY | FORCE_MAXHP | 
-F:DROP_SKELETON | DROP_CORPSE | UNIQUE | SMART | DROP_4D2 | 
-F:MORTAL | BASEANGBAND | HAS_LITE | DROP_GREAT | WILD_TOO | WILD_GRASS | 
-S:1_IN_3 | 
-S:ARROW_1 | ARROW_2 | ARROW_3 | ARROW_4 | MISSILE | 
-S:TPORT | BLINK | TELE_TO | TELE_AWAY | S_MONSTER 
+F:BASH_DOOR
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GREAT
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:HAS_LITE
+F:KILL_BODY
+F:MALE
+F:MORTAL
+F:NO_FEAR
+F:NO_STUN
+F:SMART
+F:UNIQUE
+F:WILD_GRASS
+F:WILD_TOO
+S:1_IN_3
+S:ARROW_1
+S:ARROW_2
+S:ARROW_3
+S:ARROW_4
+S:BLINK
+S:MISSILE
+S:S_MONSTER
+S:TELE_AWAY
+S:TELE_TO
+S:TPORT
 D:The youngest son of Feanor along with his twin brother Amrod. 
 D:He is bound by the Oath of Feanor and searches forever for the 
 D:Silmarils.
@@ -5029,11 +7575,19 @@ W:18:2:150:80
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:CONFUSE:1d6
-F:FORCE_SLEEP | RAND_50 | RAND_25 | CAN_FLY |
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | WILD_MOUNTAIN |
-F:ANIMAL | NO_CONF | NO_SLEEP | 
-F:MORTAL | BASEANGBAND
-S:1_IN_10 | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:FORCE_SLEEP
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
+F:WILD_MOUNTAIN
+F:WILD_TOO
+S:1_IN_10
 S:BR_CONF
 D:This gleaming dragonfly's wings beat mesmerizingly fast. 
 
@@ -5045,9 +7599,18 @@ E:1:1:1:2:1:1
 O:10:90:0:0
 B:HIT:HURT:3d8
 B:HIT:HURT:3d8
-F:DROP_60 | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | GIANT | MALE | WILD_TOO | WILD_MOUNTAIN | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:GIANT
+F:HAS_LITE
+F:MALE
+F:OPEN_DOOR
+F:TAKE_ITEM
+F:WILD_MOUNTAIN
+F:WILD_TOO
 D:He is eighteen feet tall and looking at you. 
 
 N:322:Giant black dragonfly
@@ -5057,11 +7620,17 @@ W:20:2:150:70
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:ACID:1d6
-F:FORCE_SLEEP | RAND_50 | RAND_25 | 
-F:WEIRD_MIND | BASH_DOOR | CAN_FLY | WILD_TOO | WILD_SWAMP |
-F:ANIMAL | IM_ACID | 
-F:MORTAL | BASEANGBAND
-S:1_IN_10 | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:FORCE_SLEEP
+F:IM_ACID
+F:MORTAL
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
+F:WILD_TOO
+S:1_IN_10
 S:BR_ACID
 D:The size of a large bird, this dragonfly drips caustic acid. 
 
@@ -5073,10 +7642,19 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:1d10
 B:HIT:HURT:1d10
-F:COLD_BLOOD | EMPTY_MIND | BASH_DOOR | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:HURT_ROCK | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:HURT_ROCK
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
 D:It is a massive animated statue of hard stone. 
 
 N:324:Red mold
@@ -5086,10 +7664,17 @@ W:19:1:40:64
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:FIRE:4d4
-F:NEVER_MOVE | SUSCEP_COLD |
-F:STUPID | EMPTY_MIND | 
-F:IM_FIRE | IM_POIS | CAN_SWIM |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:EMPTY_MIND
+F:IM_FIRE
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+F:SUSCEP_COLD
 D:It is a strange growth on the dungeon floor, glowing red. 
 
 N:325:Giant gold dragonfly
@@ -5099,12 +7684,18 @@ W:22:2:150:75
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d6
-F:FORCE_SLEEP | 
-F:RAND_50 | RAND_25 | WILD_TOO | WILD_MOUNTAIN |
-F:WEIRD_MIND | BASH_DOOR | 
-F:ANIMAL | IM_FIRE | CAN_FLY | 
-F:MORTAL | BASEANGBAND
-S:1_IN_10 | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:FORCE_SLEEP
+F:IM_FIRE
+F:MORTAL
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
+F:WILD_MOUNTAIN
+F:WILD_TOO
+S:1_IN_10
 S:BR_SOUN
 D:Large beating wings support this dazzling insect. A loud buzzing noise 
 D:pervades the air. 
@@ -5119,11 +7710,24 @@ B:HIT:HURT:4d6
 B:HIT:HURT:4d6
 B:HIT:HURT:4d6
 B:HIT:HURT:4d6
-F:UNIQUE | MALE | CAN_SPEAK | 
-F:FORCE_MAXHP | SMART | PET | 
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | DROP_GREAT 
-F:OPEN_DOOR | BASH_DOOR 
-F:GOOD | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS 
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_GOOD
+F:DROP_GREAT
+F:FORCE_MAXHP
+F:GOOD
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:PET
+F:SMART
+F:UNIQUE
 D:A Dwarf of Nogrod in the Blue Mountains, and one of the 
 D:greatest smiths in the history of Middle-earth. Among his 
 D:works were Angrist, Narsil, and the Dragon-helm of Dor-lómin. 
@@ -5140,9 +7744,20 @@ B:CLAW:PARALYZE:2d4
 B:CLAW:PARALYZE:2d4
 B:BITE:LOSE_CON:2d4
 B:BITE:LOSE_CHR:2d4
-F:DROP_60 | OPEN_DOOR | BASH_DOOR | ESCORT | 
-F:NO_SLEEP | NO_CONF | UNDEAD | EVIL | IM_POIS | IM_COLD | 
-F:COLD_BLOOD | HURT_LITE | CAN_SWIM | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:DROP_60
+F:ESCORT
+F:EVIL
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:UNDEAD
 D:This vile abomination is a relative of ghouls, and often leads packs 
 D:of them. It smells foul, and its bite carries a rotting disease. 
 
@@ -5151,10 +7766,15 @@ G:I:g
 I:120:3d2:8:18:10
 W:19:4:100:4
 B:BITE:POISON:2d2
-F:RAND_50 | RAND_25 | CAN_FLY | WILD_SWAMP | WILD_TOO | 
-F:WEIRD_MIND | ANIMAL | EVIL | BASEANGBAND
-S:MULTIPLY | 
-S:1_IN_12 | 
+F:ANIMAL
+F:CAN_FLY
+F:EVIL
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
+F:WILD_TOO
+S:1_IN_12
+S:MULTIPLY
 S:SHRIEK
 D:Believed to be an evil relative of the cricket, this creature gets its name 
 D:from its incessant squeaking, which can best be described as "neek-breek, 
@@ -5171,11 +7791,21 @@ B:CRUSH:HURT:3d6
 B:CRUSH:HURT:3d6
 B:CRUSH:HURT:3d6
 B:CRUSH:HURT:3d6
-F:DROP_60 | NO_SLEEP | NO_CONF | ANIMAL | WEIRD_MIND | SUSCEP_FIRE | 
-F:RES_WATE | IM_COLD | NEVER_MOVE | WILD_ONLY | WILD_WOOD | 
-F:BASEANGBAND | NO_CUT
+F:ANIMAL
+F:DROP_60
+F:IM_COLD
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:RES_WATE
+F:SUSCEP_FIRE
+F:WEIRD_MIND
+F:WILD_ONLY
+F:WILD_WOOD
 S:1_IN_9
-S:BLINK | TELE_TO
+S:BLINK
+S:TELE_TO
 D:A very strong near-sentient tree, which has become hostile to other living things. 
 
 N:330:Bolg, Son of Azog
@@ -5188,13 +7818,24 @@ B:HIT:HURT:3d7
 B:HIT:HURT:3d7
 B:HIT:HURT:3d7
 B:HIT:HURT:3d7
-F:UNIQUE | MALE | CAN_SPEAK |
-F:FORCE_MAXHP | SPECIAL_GENE | 
-F:ESCORT | DROP_SKELETON | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:ORC
+F:SPECIAL_GENE
+F:UNIQUE
 D:A large and powerful orc, he looks just like his father. He is tall and 
 D:fast, and he hates all dwarves and their friends. 
 
@@ -5207,12 +7848,21 @@ O:0:0:0:0
 B:BITE:HURT:1d8
 B:BITE:POISON:1d6
 B:BITE:POISON:1d6
-F:FRIENDS | WILD_TOO | WILD_WOOD | DROP_SKELETON | 
-F:WEIRD_MIND | BASH_DOOR | CAN_SWIM |
-F:ANIMAL | SPIDER | IM_POIS | RES_TELE | 
-F:MORTAL | BASEANGBAND
-S:1_IN_5 | 
-S:BLINK | TELE_TO
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_SKELETON
+F:FRIENDS
+F:IM_POIS
+F:MORTAL
+F:RES_TELE
+F:SPIDER
+F:WEIRD_MIND
+F:WILD_TOO
+F:WILD_WOOD
+S:1_IN_5
+S:BLINK
+S:TELE_TO
 D:A spider that never seems quite there. Everywhere you look it is just 
 D:half-seen in the corner of one eye. 
 
@@ -5225,11 +7875,20 @@ O:50:50:0:0
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:WAIL:TERRIFY
-F:MALE | CAN_SWIM | IM_ACID | IM_POIS | WILD_SHORE |
-F:DROP_60 | DROP_1D2 | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | FORCE_MAXHP | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_ACID
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_SHORE
 D:A leader of lizard men, coming from the depths.
 
 N:333:Landmine
@@ -5239,10 +7898,19 @@ W:20:5:300:50
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:EXPLODE:HURT:25d2
-F:CHAR_CLEAR | ATTR_CLEAR | CHAR_MULTI | 
-F:NEVER_MOVE | FORCE_MAXHP | 
-F:EMPTY_MIND | INVISIBLE | COLD_BLOOD | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | JOKEANGBAND | NO_CUT
+F:ATTR_CLEAR
+F:CHAR_CLEAR
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:INVISIBLE
+F:JOKEANGBAND
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
 D:It was left here to be used against intruders. 
 
 # New monster added by furiosity for the Theme module
@@ -5254,11 +7922,25 @@ E:0:1:1:0:1:0
 O:0:0:0:0
 B:BITE:HURT:2d4
 B:BITE:HURT:2d4
-F:BASEANGBAND | UNIQUE | MALE | CAN_SPEAK | FORCE_MAXHP | PET | 
-F:WILD_ONLY | WILD_WOOD | WILD_MOUNTAIN | WILD_GRASS | WILD_WASTE | 
-F:ANIMAL | CAN_FLY | DROP_CORPSE | SMART | GOOD | MORTAL | 
+F:ANIMAL
+F:CAN_FLY
+F:CAN_SPEAK
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:GOOD
+F:MALE
+F:MORTAL
+F:PET
+F:SMART
+F:UNIQUE
+F:WILD_GRASS
+F:WILD_MOUNTAIN
+F:WILD_ONLY
+F:WILD_WASTE
+F:WILD_WOOD
 S:1_IN_2
-S:S_MONSTER | S_MONSTERS
+S:S_MONSTER
+S:S_MONSTERS
 D:One of the ravens who lived on Ravenhill, one of the foothills of Erebor, 
 D:the Lonely Mountain. Roac is a very ancient bird indeed: his father Carc 
 D:had seen Smaug descend on the mountain, and Roac was no less than 153 years 
@@ -5274,9 +7956,20 @@ O:0:0:0:0
 B:CLAW:HURT:6d3
 B:CLAW:HURT:6d3
 B:BITE:HURT:3d6
-F:CAN_FLY | NEUTRAL | NO_TARGET | 
-F:WILD_MOUNTAIN | WILD_VOLCANO | WILD_WASTE | WILD_WOOD | WILD_ONLY | 
-F:ANIMAL | GOOD | DROP_CORPSE | BASEANGBAND | IMPRESED | HAS_EGG | AQUATIC | 
+F:ANIMAL
+F:AQUATIC
+F:CAN_FLY
+F:DROP_CORPSE
+F:GOOD
+F:HAS_EGG
+F:IMPRESED
+F:NEUTRAL
+F:NO_TARGET
+F:WILD_MOUNTAIN
+F:WILD_ONLY
+F:WILD_VOLCANO
+F:WILD_WASTE
+F:WILD_WOOD
 D:Greater and more intelligent than most of its kind, this eagle is 
 D:a messenger between the forces of good. It answers to Manwe Sulimo. 
 
@@ -5288,9 +7981,20 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:HURT:2d5
 B:HIT:HURT:2d5
-F:NEVER_MOVE | IM_COLD | COLD_BLOOD | IM_ACID | IM_ELEC | NO_FEAR |
-F:IM_FIRE | IM_POIS | NO_CONF | NO_SLEEP | FRIENDS | CHAR_MULTI | HURT_ROCK | 
-F:BASEANGBAND | NO_CUT
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:FRIENDS
+F:HURT_ROCK
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
 S:MULTIPLY
 D:A sentient section of wall. 
 
@@ -5304,11 +8008,15 @@ B:BITE:HURT:1d8
 B:BITE:HURT:1d8
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
-F:FORCE_SLEEP | 
-F:FRIENDS | DROP_SKELETON | DROP_CORPSE | 
-F:BASH_DOOR |
-F:ANIMAL | MORTAL | BASEANGBAND | NO_CUT
-S:1_IN_10 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:MORTAL
+F:NO_CUT
+S:1_IN_10
 S:BR_SHAR
 D:A beautiful crystalline shape does not disguise the danger this hound 
 D:clearly presents. Your flesh tingles as it approaches. 
@@ -5323,11 +8031,16 @@ B:BITE:POISON:1d8
 B:BITE:POISON:1d8
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
-F:FORCE_SLEEP | 
-F:FRIENDS | CAN_FLY |
-F:BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | IM_POIS | MORTAL | BASEANGBAND
-S:1_IN_10 | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:IM_POIS
+F:MORTAL
+S:1_IN_10
 S:BR_POIS
 D:Swirling vapours surround this beast as it floats towards you, seemingly 
 D:walking on air. Noxious gases sting your throat. 
@@ -5342,9 +8055,14 @@ B:CLAW:HURT:1d10
 B:CLAW:HURT:1d10
 B:BITE:HURT:1d10
 B:BITE:HURT:1d10
-F:BASH_DOOR | WILD_WOOD | WILD_TOO | WILD_GRASS |
-F:ANIMAL | DROP_SKELETON | DROP_CORPSE
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:MORTAL
+F:WILD_GRASS
+F:WILD_TOO
+F:WILD_WOOD
 D:A fierce and dangerous cat, its huge tusks and sharp claws would lacerate 
 D:even the strongest armour.  
 
@@ -5358,11 +8076,16 @@ B:BITE:ACID:1d8
 B:BITE:ACID:1d8
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
-F:FORCE_SLEEP | 
-F:FRIENDS | 
-F:BASH_DOOR | CAN_SWIM | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | IM_ACID | MORTAL | BASEANGBAND
-S:1_IN_10 | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:IM_ACID
+F:MORTAL
+S:1_IN_10
 S:BR_ACID
 D:Footprints are burned in the ground behind this hound as it pads 
 D:around the dungeon. An acrid smell of acid rises from its pelt. 
@@ -5376,10 +8099,17 @@ O:0:0:0:0
 B:BUTT:HURT:2d8
 B:BITE:HURT:2d10
 B:BITE:FIRE:2d6
-F:FORCE_SLEEP | CAN_FLY | DROP_CORPSE | SUSCEP_COLD |
-F:BASH_DOOR | WILD_TOO | WILD_MOUNTAIN |
-F:IM_FIRE | MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_10 | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:MORTAL
+F:SUSCEP_COLD
+F:WILD_MOUNTAIN
+F:WILD_TOO
+S:1_IN_10
 S:BR_FIRE
 D:It is a strange hybrid of goat, lion and dragon, with the heads of all 
 D:three beasts. 
@@ -5390,11 +8120,17 @@ I:110:6d8:10:1:0
 W:20:1:3000:250
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:FORCE_SLEEP | NEVER_MOVE | NEVER_BLOW
-F:EMPTY_MIND | INVISIBLE | ANIMAL | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND
-S:1_IN_4 | 
-S:BLINK | 
+F:ANIMAL
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:INVISIBLE
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+S:1_IN_4
+S:BLINK
 S:S_MONSTER
 D:It is a strange pulsing mound of flesh. It looks harmless. 
 
@@ -5407,9 +8143,17 @@ O:0:0:0:0
 B:CLAW:HURT:1d10
 B:CLAW:HURT:1d10
 B:BITE:HURT:2d8
-F:OPEN_DOOR | BASH_DOOR | WILD_TOO | WILD_MOUNTAIN | WILD_WOOD | WILD_WASTE |
-F:ANIMAL | IM_COLD | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:IM_COLD
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WASTE
+F:WILD_WOOD
 D:A tall shaggy, furry humanoid, related to the yeti. 
 
 # New monster added by furiosity for the Theme module
@@ -5421,11 +8165,25 @@ E:0:1:1:0:1:0
 O:0:0:0:0
 B:BITE:HURT:4d8
 B:BITE:HURT:4d8
-F:BASEANGBAND | UNIQUE | MALE | CAN_SPEAK | FORCE_MAXHP | PET | 
-F:WILD_ONLY | WILD_WOOD | WILD_MOUNTAIN | WILD_GRASS | WILD_WASTE | 
-F:ANIMAL | CAN_FLY | DROP_CORPSE | SMART | GOOD | MORTAL | 
+F:ANIMAL
+F:CAN_FLY
+F:CAN_SPEAK
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:GOOD
+F:MALE
+F:MORTAL
+F:PET
+F:SMART
+F:UNIQUE
+F:WILD_GRASS
+F:WILD_MOUNTAIN
+F:WILD_ONLY
+F:WILD_WASTE
+F:WILD_WOOD
 S:1_IN_2
-S:S_ANIMAL | S_ANIMALS
+S:S_ANIMAL
+S:S_ANIMALS
 D:One of the ravens who lived on Ravenhill, one of the foothills of Erebor, 
 D:the Lonely Mountain. Carc seems to have been the chief of those birds, 
 D:and dwelt with his wife above the Dwarves' guard-chamber on the hill.
@@ -5439,12 +8197,22 @@ E:1:1:1:2:1:1
 O:20:50:20:0
 B:HIT:HURT:5d4
 B:HIT:HURT:5d4
-F:MALE | 
-F:DROP_1D2 | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:DROP_SKELETON | DROP_CORPSE | BASEANGBAND | MORTAL | HAS_LITE
-S:1_IN_4 |  
-S:ARROW_2 | MISSILE | BO_COLD | BO_ELEC | BLINK | S_ANIMAL
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:TAKE_ITEM
+S:1_IN_4
+S:ARROW_2
+S:BLINK
+S:BO_COLD
+S:BO_ELEC
+S:MISSILE
+S:S_ANIMAL
 D:A warrior who is at one with nature.  A master of both bow and sword, with 
 D:minor spellcasting skills. 
 
@@ -5456,12 +8224,22 @@ E:1:1:1:2:1:1
 O:20:60:0:10
 B:HIT:HURT:4d5
 B:HIT:HURT:4d5
-F:MALE | GOOD | DROP_SKELETON | DROP_CORPSE | 
-F:DROP_1D2 | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:BASEANGBAND | MORTAL | HAS_LITE
-S:1_IN_4 | 
-S:HEAL | CAUSE_2 | SLOW | SCARE | BLIND
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:GOOD
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:TAKE_ITEM
+S:1_IN_4
+S:BLIND
+S:CAUSE_2
+S:HEAL
+S:SCARE
+S:SLOW
 D:A warrior devoted to Tulkas Astaldo. He considers you to be an 
 D:agent of Morgoth. 
 
@@ -5474,9 +8252,14 @@ O:0:0:0:0
 B:CLAW:HURT:2d6
 B:CLAW:HURT:2d6
 B:BITE:HURT:2d10
-F:RAND_25 | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_SKELETON |
-F:ANIMAL | EVIL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:EVIL
+F:MORTAL
+F:OPEN_DOOR
+F:RAND_25
+F:TAKE_ITEM
 D:It is a huge wolf with eyes that glow with manly intelligence. 
 
 N:348:Dark elven lord
@@ -5487,12 +8270,25 @@ E:1:1:1:2:1:1
 O:0:80:20:0
 B:HIT:HURT:3d8
 B:HIT:HURT:3d5
-F:MALE | FORCE_SLEEP | 
-F:ONLY_ITEM | DROP_2D2 | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | HURT_LITE | BASEANGBAND | HAS_LITE
-S:1_IN_5 | 
-S:HASTE | BLIND | CONF | DARKNESS | BO_FIRE | BO_COLD | MISSILE
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:HURT_LITE
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+S:1_IN_5
+S:BLIND
+S:BO_COLD
+S:BO_FIRE
+S:CONF
+S:DARKNESS
+S:HASTE
+S:MISSILE
 D:A dark elven figure in armour, radiating evil power. 
 
 N:349:Cloud giant
@@ -5503,9 +8299,17 @@ E:1:1:1:2:1:1
 O:10:90:0:0
 B:HIT:ELEC:8d8
 B:HIT:ELEC:8d8
-F:DROP_90 | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | GIANT | IM_ELEC | MALE | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:GIANT
+F:HAS_LITE
+F:IM_ELEC
+F:MALE
+F:OPEN_DOOR
+F:TAKE_ITEM
 D:It is a twenty-foot-tall humanoid, wreathed in clouds. 
 
 N:350:Ugluk, the Uruk
@@ -5518,13 +8322,25 @@ B:HIT:HURT:3d8
 B:HIT:HURT:3d8
 B:HIT:HURT:3d5
 B:HIT:HURT:3d5
-F:UNIQUE | MALE | CAN_SPEAK |
-F:FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE | 
-F:ESCORT | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | IM_FIRE | IM_COLD | IM_POIS
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:ORC
+F:UNIQUE
 D:A strong and cunning orc warrior, the commander of Saruman's orcish horde. 
 D:He was raised on man-flesh at Isengard, and bears the mark of the White Hand. 
 
@@ -5535,12 +8351,15 @@ W:21:1:100:54
 E:0:1:1:0:1:0
 O:0:0:0:0
 B:BITE:ELEC:1d3
-F:FORCE_SLEEP | 
-F:RAND_50 | 
-F:BASH_DOOR | CAN_FLY |
-F:ANIMAL | IM_ELEC | AI_ANNOY
-F:MORTAL | BASEANGBAND
-S:1_IN_4 | 
+F:AI_ANNOY
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:FORCE_SLEEP
+F:IM_ELEC
+F:MORTAL
+F:RAND_50
+S:1_IN_4
 S:BR_ELEC
 D:It is a glowing blue bat with a sharp tail. 
 
@@ -5554,12 +8373,22 @@ B:HIT:POISON:3d4
 B:HIT:POISON:3d4
 B:HIT:HURT:2d3
 B:HIT:HURT:2d3
-F:MIMIC | 
-F:FORCE_SLEEP | NEVER_MOVE | 
-F:EMPTY_MIND | COLD_BLOOD | SUSCEP_FIRE |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_5 | 
-S:BLIND | CONF | SCARE | CAUSE_2 | BO_FIRE | 
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:MIMIC
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:SUSCEP_FIRE
+S:1_IN_5
+S:BLIND
+S:BO_FIRE
+S:CAUSE_2
+S:CONF
+S:SCARE
 S:S_MONSTER
 D:A strange creature that disguises itself as an object to lure 
 D:unsuspecting adventurers within reach of its venomous claws. 
@@ -5574,12 +8403,21 @@ B:BITE:POISON:4d4
 B:BITE:POISON:4d4
 B:BUTT:CONFUSE:4d4
 B:SPIT:BLIND:4d4
-F:MIMIC | 
-F:FORCE_SLEEP | NEVER_MOVE | 
-F:EMPTY_MIND | COLD_BLOOD
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_5 | 
-S:BLIND | CONF | SCARE | CAUSE_2 | BA_POIS |
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:MIMIC
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+S:1_IN_5
+S:BA_POIS
+S:BLIND
+S:CAUSE_2
+S:CONF
+S:SCARE
 S:S_MONSTER
 D:A strange creature that disguises itself as an object to lure 
 D:unsuspecting adventurers within reach of its venomous claws. 
@@ -5592,11 +8430,24 @@ W:21:1:0:100
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:ENGULF:FIRE:3d3
-F:FORCE_SLEEP | RAND_50 | CAN_FLY | WILD_VOLCANO | WILD_TOO | SUSCEP_COLD |
-F:EMPTY_MIND | BASH_DOOR | POWERFUL |  AURA_FIRE |
-F:IM_FIRE | NO_FEAR | NO_CONF | NO_SLEEP | NONLIVING | BASEANGBAND | HAS_LITE
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:NONLIVING
+F:NO_CONF
 F:NO_CUT
-S:1_IN_6 | 
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_50
+F:SUSCEP_COLD
+F:WILD_TOO
+F:WILD_VOLCANO
+S:1_IN_6
 S:BR_FIRE
 D:A whirling maelstrom of fire. 
 
@@ -5607,10 +8458,19 @@ W:21:1:0:100
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:ENGULF:ACID:3d3
-F:FORCE_SLEEP | RAND_50 | 
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | CAN_FLY |
-F:IM_ACID | NO_FEAR | NO_CONF | NO_SLEEP | NONLIVING | BASEANGBAND | NO_CUT
-S:1_IN_6 | 
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:IM_ACID
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_50
+S:1_IN_6
 S:BR_ACID
 D:A caustic spinning whirlpool of foaming, steaming water. 
 
@@ -5624,13 +8484,23 @@ B:HIT:HURT:3d6
 B:HIT:HURT:3d6
 B:HIT:HURT:3d6
 B:HIT:HURT:3d6
-F:UNIQUE | MALE | CAN_SPEAK |
-F:FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE | 
-F:ESCORT | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:ORC
+F:UNIQUE
 D:A large and powerful orc, captain of one of Saruman's orcish regiments. 
 
 # New monster added by furiosity for the Theme module
@@ -5642,18 +8512,58 @@ E:1:1:1:2:1:1
 O:0:0:100:0
 B:HIT:UN_BONUS:8d12
 B:HIT:TERRIFY:7d7
-F:BASEANGBAND | FORCE_DEPTH | FORCE_MAXHP | FORCE_SLEEP | 
-F:UNIQUE | MALE | CAN_SPEAK | PET | DROP_CORPSE | 
-F:REFLECTING | RES_TELE | SMART | GOOD | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GREAT | 
-F:OPEN_DOOR | BASH_DOOR | HAS_LITE | TAKE_ITEM | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_ACID | IM_POIS | 
-F:RES_NETH | NO_CONF | NO_SLEEP | NO_FEAR | 
-S:1_IN_2 | 
-S:HEAL | HASTE | TPORT | TELE_AWAY | BLIND | CONF | SCARE | 
-S:CAUSE_4 | BRAIN_SMASH | FORGET | TRAPS | CAUSE_4 | 
-S:BA_FIRE | BA_MANA | BO_FIRE | BO_MANA | BO_PLAS | BR_PLAS | 
-S:S_MONSTERS | S_HI_DRAGON | S_KIN | S_ANIMALS | 
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GREAT
+F:FORCE_DEPTH
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:PET
+F:REFLECTING
+F:RES_NETH
+F:RES_TELE
+F:SMART
+F:TAKE_ITEM
+F:UNIQUE
+S:1_IN_2
+S:BA_FIRE
+S:BA_MANA
+S:BLIND
+S:BO_FIRE
+S:BO_MANA
+S:BO_PLAS
+S:BRAIN_SMASH
+S:BR_PLAS
+S:CAUSE_4
+S:CAUSE_4
+S:CONF
+S:FORGET
+S:HASTE
+S:HEAL
+S:SCARE
+S:S_ANIMALS
+S:S_HI_DRAGON
+S:S_KIN
+S:S_MONSTERS
+S:TELE_AWAY
+S:TPORT
 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 
@@ -5668,10 +8578,22 @@ W:21:1:0:100
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:ENGULF:COLD:3d3
-F:FORCE_SLEEP | RAND_50 | AURA_COLD | COLD_BLOOD | SUSCEP_FIRE |
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | CAN_FLY |
-F:IM_COLD | NO_FEAR | NO_CONF | NO_SLEEP | NONLIVING | BASEANGBAND | NO_CUT
-S:1_IN_6 | 
+F:AURA_COLD
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:IM_COLD
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_50
+F:SUSCEP_FIRE
+S:1_IN_6
 S:BR_COLD
 D:A twisting whirlpool of frost. 
 
@@ -5682,10 +8604,21 @@ W:21:1:0:100
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:ENGULF:ELEC:3d3
-F:FORCE_SLEEP | RAND_50 | CAN_FLY | HAS_LITE | 
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | AURA_ELEC |
-F:IM_ELEC | NO_FEAR | NO_CONF | NO_SLEEP | NONLIVING | BASEANGBAND | NO_CUT
-S:1_IN_6 | 
+F:AURA_ELEC
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ELEC
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_50
+S:1_IN_6
 S:BR_ELEC
 D:A shimmering tornado of air; sparks crackle along its length. 
 
@@ -5697,10 +8630,17 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:POISON:10d5
 B:BITE:POISON:10d5
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | AQUATIC |
-F:IM_POIS | NO_STUN | WILD_TOO | COLD_BLOOD | 
-F:ANIMAL | MORTAL | BASEANGBAND
-S:1_IN_8 | 
+F:ANIMAL
+F:AQUATIC
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:IM_POIS
+F:MORTAL
+F:NO_STUN
+F:POWERFUL
+F:WILD_TOO
+S:1_IN_8
 S:BR_POIS
 D:This fish is among the most poisonous creatures there are. 
 
@@ -5709,8 +8649,12 @@ G:I:r
 I:120:3d2:8:18:10
 W:24:4:100:4
 B:BITE:BLIND:1d2
-F:RAND_50 | RAND_25 | CAN_FLY | HAS_LITE | 
-F:WEIRD_MIND | ANIMAL | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:HAS_LITE
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
 S:MULTIPLY
 D:Clouds of these monsters light up the dungeon - so brightly that you can 
 D:barely see through them. 
@@ -5723,11 +8667,20 @@ E:1:1:1:2:1:1
 O:10:70:0:10
 B:HIT:HURT:2d4
 B:HIT:HURT:2d4
-F:DROP_90 | 
-F:EMPTY_MIND | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | UNDEAD | 
-F:IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_90
+F:EMPTY_MIND
+F:EVIL
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:ORC
+F:UNDEAD
 D:It is an orc-like figure covered in wrappings. 
 
 N:363:Wolf chieftain
@@ -5738,10 +8691,21 @@ B:CLAW:HURT:2d6
 B:CLAW:HURT:2d6
 B:BITE:HURT:2d10
 B:WAIL:TERRIFY
-F:ESCORTS | FORCE_MAXHP | IM_COLD | IM_ACID | 
-F:SMART | ESCORT | ANIMAL | EVIL | MORTAL | BASEANGBAND | 
-F:OPEN_DOOR | BASH_DOOR | NO_FEAR | MALE
-S:1_IN_8 | DARKNESS
+F:ANIMAL
+F:BASH_DOOR
+F:ESCORT
+F:ESCORTS
+F:EVIL
+F:FORCE_MAXHP
+F:IM_ACID
+F:IM_COLD
+F:MALE
+F:MORTAL
+F:NO_FEAR
+F:OPEN_DOOR
+F:SMART
+S:1_IN_8
+S:DARKNESS
 D:A great Wolf leader whose pack is in the service of the Dark Lord, 
 D:and whose howls strike fear into the boldest hearts. 
 
@@ -5754,18 +8718,55 @@ E:1:1:1:2:1:1
 O:0:0:100:0
 B:HIT:UN_BONUS:10d14
 B:HIT:TERRIFY:9d9
-F:BASEANGBAND | FORCE_DEPTH | FORCE_MAXHP | FORCE_SLEEP | 
-F:UNIQUE | MALE | CAN_SPEAK | DROP_CORPSE | 
-F:REFLECTING | RES_TELE | SMART | EVIL | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GREAT | 
-F:OPEN_DOOR | BASH_DOOR | HAS_LITE | TAKE_ITEM | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_ACID | IM_POIS | 
-F:RES_NETH | NO_CONF | NO_SLEEP | NO_FEAR | 
-S:1_IN_2 | 
-S:HEAL | HASTE | TPORT | TELE_AWAY | BLIND | CONF | SCARE | 
-S:CAUSE_4 | BRAIN_SMASH | FORGET | TRAPS | 
-S:BA_FIRE | BA_MANA | BO_FIRE | BO_MANA | BO_PLAS | BR_PLAS | 
-S:S_HI_UNDEAD | S_HI_DRAGON | S_HI_DEMON | 
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GREAT
+F:EVIL
+F:FORCE_DEPTH
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REFLECTING
+F:RES_NETH
+F:RES_TELE
+F:SMART
+F:TAKE_ITEM
+F:UNIQUE
+S:1_IN_2
+S:BA_FIRE
+S:BA_MANA
+S:BLIND
+S:BO_FIRE
+S:BO_MANA
+S:BO_PLAS
+S:BRAIN_SMASH
+S:BR_PLAS
+S:CAUSE_4
+S:CONF
+S:FORGET
+S:HASTE
+S:HEAL
+S:SCARE
+S:S_HI_DEMON
+S:S_HI_DRAGON
+S:S_HI_UNDEAD
+S:TELE_AWAY
+S:TPORT
 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 
@@ -5781,9 +8782,19 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:ENGULF:EXP_20:1d6
 B:ENGULF:EXP_20:1d6
-F:RAND_25 | SUSCEP_ELEC | UNDEAD |
-F:IM_COLD | IM_POIS | IM_ACID | RES_NETH | WILD_TOO | WILD_SWAMP |
-F:EVIL | EMPTY_MIND | COLD_BLOOD | FRIENDS | BASEANGBAND | NO_CUT
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:FRIENDS
+F:IM_ACID
+F:IM_COLD
+F:IM_POIS
+F:NO_CUT
+F:RAND_25
+F:RES_NETH
+F:SUSCEP_ELEC
+F:UNDEAD
+F:WILD_TOO
 D:A cloud of evil, sentient mist. 
 
 N:366:Killer stag beetle
@@ -5794,9 +8805,14 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:CLAW:HURT:1d12
 B:CLAW:HURT:1d12
-F:RAND_25 | WILD_TOO | DROP_CORPSE |
-F:WEIRD_MIND | BASH_DOOR | 
-F:ANIMAL | CAN_FLY | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:MORTAL
+F:RAND_25
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is a giant beetle with vicious claws. 
 
 N:367:Iron golem
@@ -5806,11 +8822,21 @@ W:22:2:3800:160
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:1d12
-F:FORCE_SLEEP | SUSCEP_ACID |
-F:EMPTY_MIND | COLD_BLOOD | BASH_DOOR | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | BASEANGBAND | NO_CUT
-S:1_IN_7 | 
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:SUSCEP_ACID
+S:1_IN_7
 S:SLOW
 D:It is a massive metal statue that moves steadily towards you. 
 
@@ -5824,9 +8850,21 @@ B:CRUSH:HURT:1d8
 B:CRUSH:HURT:1d8
 B:CRUSH:HURT:1d8
 B:CRUSH:HURT:1d8
-F:FORCE_SLEEP | RES_TELE
-F:EMPTY_MIND | COLD_BLOOD | BASH_DOOR | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS
-F:NO_FEAR | NO_CONF | NO_SLEEP | NONLIVING | JOKEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:JOKEANGBAND
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RES_TELE
 D:It looks like a huge spiked roller, moving on its own towards you. 
 
 N:369:Giant yellow scorpion
@@ -5837,9 +8875,12 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d8
 B:STING:POISON:2d5
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO |
-F:ANIMAL | DROP_SKELETON | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:MORTAL
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is a giant scorpion with a sharp stinger. 
 
 # New monster added by furiosity for the Theme module
@@ -5854,10 +8895,24 @@ B:HIT:HURT:3d11
 B:HIT:HURT:3d11
 B:HIT:HURT:3d10
 B:HIT:HURT:3d10
-F:UNIQUE | MALE | EVIL | ORC | FORCE_MAXHP | ESCORT | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | SMART | CAN_SPEAK | 
-F:OPEN_DOOR | BASH_DOOR | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:ORC
+F:SMART
+F:UNIQUE
 D:A friend of Lagduf's, he is no less evil but more cunning. 
 
 N:371:Black ooze
@@ -5867,13 +8922,22 @@ W:23:1:400:7
 E:0:0:0:0:0:0
 O:30:0:40:15
 B:TOUCH:ACID:2d6
-F:RAND_50 | DROP_60 | STUPID | EMPTY_MIND | CAN_SWIM |
-F:TAKE_ITEM | KILL_BODY | OPEN_DOOR | BASH_DOOR | 
-F:IM_POIS | NO_FEAR | 
-F:MORTAL | BASEANGBAND | NO_CUT
-S:MULTIPLY
-S:1_IN_11 | 
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_60
+F:EMPTY_MIND
+F:IM_POIS
+F:KILL_BODY
+F:MORTAL
+F:NO_CUT
+F:NO_FEAR
+F:OPEN_DOOR
+F:RAND_50
+F:STUPID
+F:TAKE_ITEM
+S:1_IN_11
 S:DRAIN_MANA
+S:MULTIPLY
 D:It is a strangely moving puddle. 
 
 N:372:Hardened warrior
@@ -5884,10 +8948,16 @@ E:1:1:1:2:1:1
 O:0:100:0:0
 B:HIT:HURT:6d5
 B:HIT:HURT:6d5
-F:MALE | 
-F:DROP_1D2 | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:TAKE_ITEM
 D:A scarred warrior who moves with confidence. 
 
 N:373:Azog, King of the Uruk-Hai
@@ -5899,13 +8969,25 @@ O:10:90:0:0
 B:HIT:HURT:5d6
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
-F:UNIQUE | MALE | CAN_SPEAK |
-F:FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE | 
-F:ESCORT | ESCORTS | SPECIAL_GENE |
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:ESCORTS
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:ORC
+F:SPECIAL_GENE
+F:UNIQUE
 D:A large, strong and agile orc, the slayer of dwarven king Thror. 
 
 # New monster added for the Theme module
@@ -5919,9 +9001,18 @@ O:0:50:50:0
 B:HIT:HURT:1d8
 B:HIT:HURT:1d8
 B:HIT:EAT_GOLD:1d8
-F:BASEANGBAND | UNIQUE | MALE | FORCE_MAXHP | CAN_SPEAK |
-F:OPEN_DOOR | BASH_DOOR | HAS_LITE | SMART | EVIL | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | 
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:UNIQUE
 D:A swarthy man of Bree. He has heavy black brows and dark scornful 
 D:eyes; his large mouth is curled in a sneer. He sells anything to 
 D:anybody and enjoys making mischief for his personal amusement. 
@@ -5934,13 +9025,24 @@ E:1:1:1:2:1:1
 O:0:0:100:0
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
-F:MALE | 
-F:FORCE_SLEEP | 
-F:ONLY_ITEM | DROP_1D2 | DROP_SKELETON | DROP_CORPSE
-F:OPEN_DOOR | BASH_DOOR | FRIENDS
-F:EVIL | IM_POIS | HURT_LITE | BASEANGBAND | HAS_LITE
-S:1_IN_5 | 
-S:CONF | MISSILE | DARKNESS | BO_MANA
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_SLEEP
+F:FRIENDS
+F:HAS_LITE
+F:HURT_LITE
+F:IM_POIS
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+S:1_IN_5
+S:BO_MANA
+S:CONF
+S:DARKNESS
+S:MISSILE
 D:A dark elven mage with spells of frighteningly destructive power. 
 
 N:376:Master rogue
@@ -5952,10 +9054,17 @@ O:80:10:10:0
 B:HIT:HURT:2d8
 B:HIT:HURT:2d8
 B:HIT:EAT_GOLD:4d4
-F:MALE | DROP_SKELETON | DROP_CORPSE | 
-F:DROP_2D2 | SUSCEP_ELEC |
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:SUSCEP_ELEC
+F:TAKE_ITEM
 D:A thief of great power and shifty speed. 
 
 N:377:Red dragon bat
@@ -5965,10 +9074,16 @@ W:23:1:100:60
 E:0:1:1:0:1:0
 O:0:0:0:0
 B:BITE:FIRE:1d3
-F:FORCE_SLEEP | RAND_50 | SUSCEP_COLD |
-F:BASH_DOOR | CAN_FLY | DROP_CORPSE | AI_ANNOY
-F:ANIMAL | IM_FIRE | BASEANGBAND
-S:1_IN_4 | 
+F:AI_ANNOY
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:IM_FIRE
+F:RAND_50
+F:SUSCEP_COLD
+S:1_IN_4
 S:BR_FIRE
 D:It is a sharp-tailed bat, wreathed in fire. 
 
@@ -5979,9 +9094,14 @@ W:23:1:500:85
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:4d5
-F:RAND_25 | 
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | DROP_CORPSE | 
-F:ANIMAL | CAN_FLY | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:MORTAL
+F:RAND_25
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is looking for prey. 
 
 N:379:Ice skeleton
@@ -5992,10 +9112,20 @@ E:1:1:1:2:1:1
 O:20:0:80:0
 B:CLAW:COLD:2d3
 B:CLAW:COLD:2d3
-F:ONLY_ITEM | DROP_90 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | SUSCEP_FIRE |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_90
+F:EVIL
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SUSCEP_FIRE
+F:UNDEAD
 D:It is a skeleton covered in frost. 
 
 N:380:Angamaite of Umbar
@@ -6008,14 +9138,27 @@ B:HIT:HURT:4d7
 B:HIT:HURT:4d7
 B:HIT:HURT:4d6
 B:HIT:HURT:4d6
-F:UNIQUE | MALE | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_90 | DROP_1D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | IM_FIRE | IM_ELEC
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_4 | 
-S:SLOW | FORGET
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ELEC
+F:IM_FIRE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNIQUE
+S:1_IN_4
+S:FORGET
+S:SLOW
 D:A Black Numenorean who hates the men of the West. He is a descendant 
 D:of Castamir, the Usurper of Gondor. 
 
@@ -6028,13 +9171,25 @@ O:0:50:50:0
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
 B:TOUCH:EXP_20
-F:FORCE_SLEEP | RAND_25 | 
-F:DROP_60 | DROP_90 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | CAN_FLY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_10 |
-S:SCARE | DRAIN_MANA
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_60
+F:DROP_90
+F:EVIL
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:RAND_25
+F:UNDEAD
+S:1_IN_10
+S:DRAIN_MANA
+S:SCARE
 D:It is a ghostly apparition, arisen when a humanoid was killed violently 
 D:in a forest. It remembers its past life and wants revenge. 
 
@@ -6048,14 +9203,27 @@ B:HIT:HURT:3d8
 B:HIT:HURT:3d8
 B:HIT:HURT:3d7
 B:HIT:UN_BONUS
-F:UNIQUE | MALE | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE
-F:FORCE_SLEEP | FORCE_MAXHP | RES_TELE
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR |
-F:IM_FIRE | IM_COLD
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_8 | 
-S:HEAL | SLOW | BO_FIRE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:IM_FIRE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:UNIQUE
+S:1_IN_8
+S:BO_FIRE
+S:HEAL
+S:SLOW
 D:One of the last of the Petty-Dwarves. Khim is a tricky sorcerous little 
 D:being, full of mischief. 
 
@@ -6069,14 +9237,27 @@ B:HIT:HURT:3d8
 B:HIT:HURT:3d8
 B:HIT:HURT:3d7
 B:HIT:UN_BONUS
-F:UNIQUE | MALE | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE | 
-F:FORCE_SLEEP | FORCE_MAXHP | RES_TELE | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR |
-F:IM_FIRE | IM_COLD
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_8 | 
-S:HEAL | SLOW | BO_FIRE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:IM_FIRE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:UNIQUE
+S:1_IN_8
+S:BO_FIRE
+S:HEAL
+S:SLOW
 D:One of the last of the Petty-Dwarves. Ibun is a tricky sorcerous little 
 D:being, full of mischief. 
 
@@ -6089,9 +9270,17 @@ O:0:0:0:0
 B:CLAW:HURT:7d3
 B:CLAW:HURT:7d3
 B:BITE:HURT:3d7
-F:CAN_FLY | UNIQUE | FORCE_MAXHP | DROP_CORPSE | CAN_SPEAK |
-F:WILD_ONLY | WILD_MOUNTAIN | WILD_VOLCANO | PET | 
-F:ANIMAL | GOOD | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:CAN_SPEAK
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:GOOD
+F:PET
+F:UNIQUE
+F:WILD_MOUNTAIN
+F:WILD_ONLY
+F:WILD_VOLCANO
 D:Among all the eagles of Middle-earth he is the swiftest, and in his time 
 D:has borne messages between all of the Wise. It was Meneldor who bore the 
 D:Ring-bearer away from the destruction of Mount Doom. 
@@ -6104,8 +9293,16 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:HURT:2d33
 B:HIT:HURT:2d44
-F:PASS_WALL | NO_SLEEP | COLD_BLOOD | NONLIVING | NO_FEAR |
-F:FORCE_MAXHP | RES_TELE | EMPTY_MIND | CAN_FLY | BASEANGBAND | NO_CUT
+F:CAN_FLY
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:NONLIVING
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:PASS_WALL
+F:RES_TELE
 D:A creature that is half real, half illusion. 
 
 N:386:Giant silver ant
@@ -6115,9 +9312,14 @@ W:23:1:800:45
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:ACID:4d4
-F:RAND_25 | 
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | DROP_SKELETON | 
-F:ANIMAL | MORTAL | BASEANGBAND | HAS_LITE
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:HAS_LITE
+F:MORTAL
+F:RAND_25
+F:WEIRD_MIND
+F:WILD_TOO
 D:A giant silver ant with a caustic bite. 
 
 N:387:4-headed hydra
@@ -6130,11 +9332,19 @@ B:BITE:HURT:2d6
 B:BITE:HURT:2d6
 B:BITE:HURT:2d6
 B:BITE:HURT:2d6
-F:FORCE_SLEEP | 
-F:ONLY_GOLD | DROP_4D2 | WILD_TOO | WILD_SWAMP | WILD_SHORE |
-F:OPEN_DOOR | BASH_DOOR | MOVE_BODY | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | MORTAL | BASEANGBAND
-S:1_IN_7 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:MORTAL
+F:MOVE_BODY
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:WILD_SHORE
+F:WILD_TOO
+S:1_IN_7
 S:SCARE
 D:A strange reptilian creature with four heads, guarding its hoard. 
 
@@ -6148,12 +9358,34 @@ O:30:60:0:10
 B:CLAW:HURT:8d11
 B:CLAW:EAT_LITE:8d11
 B:CLAW:LOSE_INT:8d11
-F:BASEANGBAND | WILD_TOO | WILD_WOOD | WILD_GRASS | WILD_MOUNTAIN | 
-F:UNIQUE | FEMALE | CAN_SPEAK | SMART | FORCE_MAXHP | EVIL | MORTAL | 
-F:OPEN_DOOR | BASH_DOOR | MOVE_BODY | ANIMAL | FORCE_SLEEP | 
-F:HURT_LITE | IM_FIRE | IM_POIS | RES_NETH | NO_SLEEP | NO_CONF | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SPEAK
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:OPEN_DOOR
+F:RES_NETH
+F:SMART
+F:UNIQUE
+F:WILD_GRASS
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 S:1_IN_5
-S:S_KIN | SHRIEK | S_ANIMALS | BLINK | S_MONSTERS
+S:BLINK
+S:SHRIEK
+S:S_ANIMALS
+S:S_KIN
+S:S_MONSTERS
 D:The dark and mournful Queen to Tarannon Falastur, the twelfth King 
 D:of Gondor. She owned ten marvellous and magical cats, that she set 
 D:to spy on the doings of the people of Gondor. Her scheming was her 
@@ -6174,12 +9406,28 @@ B:HIT:UN_BONUS:5d10
 B:HIT:EXP_80:5d10
 B:HIT:ABOMINATION:5d10
 B:HIT:DISEASE:5d10
-F:BASEANGBAND | UNIQUE | FORCE_MAXHP | 
-F:ELDRITCH_HORROR | REFLECTING | 
-F:NO_SLEEP | NO_CUT | NO_STUN | NO_CONF | NO_FEAR | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GREAT | DROP_RANDART | 
-F:IM_FIRE | IM_COLD | IM_ACID | IM_POIS | SPECIAL_GENE | 
-F:RES_NETH | RES_PLAS | EVIL | EMPTY_MIND | 
+F:DROP_4D2
+F:DROP_GREAT
+F:DROP_RANDART
+F:ELDRITCH_HORROR
+F:EMPTY_MIND
+F:EVIL
+F:FORCE_MAXHP
+F:IM_ACID
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:REFLECTING
+F:RES_NETH
+F:RES_PLAS
+F:SPECIAL_GENE
+F:UNIQUE
 D:A shadowy creature of Elvish legend, said to have plagued the 
 D:newly-awakened Elves at Cuivienen. Those Elves captured by the 
 D:Hunter were thought to have been corrupted by Melkor to form 
@@ -6196,10 +9444,20 @@ E:1:1:1:2:1:1
 O:20:40:20:10
 B:HIT:HURT:2d4
 B:HIT:HURT:2d4
-F:ONLY_ITEM | DROP_90 | 
-F:EMPTY_MIND | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_90
+F:EMPTY_MIND
+F:EVIL
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNDEAD
 D:It is a human form encased in mouldy wrappings. 
 
 N:391:Vampire bat
@@ -6210,9 +9468,19 @@ E:0:1:1:0:1:0
 O:0:0:0:0
 B:BITE:EXP_40:1d4
 B:BITE:EXP_40:1d4
-F:RAND_50 | COLD_BLOOD | REGENERATE | CAN_FLY |
-F:EVIL | ANIMAL | UNDEAD | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:CAN_FLY
+F:COLD_BLOOD
+F:EVIL
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RAND_50
+F:REGENERATE
+F:UNDEAD
 D:A blood-sucking bat that flies at your neck hungrily. 
 
 N:392:Sangahyando of Umbar
@@ -6225,14 +9493,27 @@ B:HIT:HURT:4d7
 B:HIT:HURT:4d7
 B:HIT:HURT:4d7
 B:HIT:HURT:4d7
-F:UNIQUE | MALE | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_90 | DROP_1D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | IM_FIRE | IM_ELEC
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_4 | 
-S:SLOW | FORGET
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ELEC
+F:IM_FIRE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNIQUE
+S:1_IN_4
+S:FORGET
+S:SLOW
 D:A Black Numenorean with a blacker heart. He is a descendant 
 D:of Castamir, the usurper of Gondor's throne. 
 
@@ -6246,14 +9527,46 @@ B:GAZE:BLIND:8d8
 B:TOUCH:TERRIFY
 B:GAZE:EXP_40
 B:TOUCH:EAT_ITEM
-F:ONLY_ITEM | DROP_90 | DROP_1D2 | DROP_GOOD | DROP_GREAT | DROP_CORPSE | 
-F:CHAR_MULTI | CHAR_CLEAR | ATTR_CLEAR | INVISIBLE | COLD_BLOOD | 
-F:NO_CONF | UNIQUE | FORCE_MAXHP | NO_SLEEP | CAN_SPEAK | REFLECTING |
-F:IM_FIRE | IM_ELEC | EMPTY_MIND | EVIL | SMART | RES_TELE | CAN_FLY | 
+F:ATTR_CLEAR
+F:CAN_FLY
+F:CAN_SPEAK
+F:CHAR_CLEAR
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:EMPTY_MIND
+F:EVIL
+F:FORCE_MAXHP
+F:IM_ELEC
+F:IM_FIRE
+F:INVISIBLE
 F:JOKEANGBAND
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:REFLECTING
+F:RES_TELE
+F:SMART
+F:UNIQUE
 S:1_IN_4
-S:DRAIN_MANA | BLINK | BLIND | SCARE | CONF | S_UNDEAD | S_MONSTER |
-S:HEAL | TELE_AWAY | DARKNESS | S_HYDRA | TRAPS | FORGET | TELE_TO | SHRIEK
+S:BLIND
+S:BLINK
+S:CONF
+S:DARKNESS
+S:DRAIN_MANA
+S:FORGET
+S:HEAL
+S:SCARE
+S:SHRIEK
+S:S_HYDRA
+S:S_MONSTER
+S:S_UNDEAD
+S:TELE_AWAY
+S:TELE_TO
 D:Nobody has ever seen It. 
 
 N:394:Banshee
@@ -6264,13 +9577,24 @@ E:0:0:0:0:0:0
 O:80:0:0:15
 B:WAIL:TERRIFY
 B:TOUCH:EXP_20
-F:FEMALE | 
-F:RAND_50 | DROP_1D2 | 
-F:INVISIBLE | COLD_BLOOD | TAKE_ITEM | PASS_WALL | CAN_FLY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_1D2
+F:EVIL
+F:FEMALE
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
 F:NO_CUT
-S:1_IN_15 | 
-S:TPORT | DRAIN_MANA
+F:NO_SLEEP
+F:PASS_WALL
+F:RAND_50
+F:TAKE_ITEM
+F:UNDEAD
+S:1_IN_15
+S:DRAIN_MANA
+S:TPORT
 D:It is a ghostly woman's form that wails mournfully. 
 
 # New monster added by furiosity for the Theme module
@@ -6283,13 +9607,37 @@ E:1:1:1:2:1:1
 O:0:40:60:0
 B:HIT:HURT:10d5
 B:HIT:EXP_80:10d5
-F:UNIQUE | MALE | MORTAL | BASEANGBAND | HAS_LITE | CAN_SPEAK | 
-F:FORCE_MAXHP | SMART | IM_FIRE | IM_COLD | IM_POIS | IM_COLD | 
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | RES_NETH | RES_NEXU | RES_PLAS |
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | EVIL | SPECIAL_GENE | 
-S:1_IN_5 | 
-S:BLIND | SCARE | CAUSE_3 | BA_NETH | BA_FIRE | BO_PLAS
-S:S_MONSTERS | S_DEMON
+F:BASH_DOOR
+F:CAN_SPEAK
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_2D2
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_COLD
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_NETH
+F:RES_NEXU
+F:RES_PLAS
+F:SMART
+F:SPECIAL_GENE
+F:UNIQUE
+S:1_IN_5
+S:BA_FIRE
+S:BA_NETH
+S:BLIND
+S:BO_PLAS
+S:CAUSE_3
+S:SCARE
+S:S_DEMON
+S:S_MONSTERS
 D:One of the many Numenoreans who fell under the shadow of Sauron 
 D:after Ar-Pharazon brought the Dark Lord to Numenor. With another 
 D:named Fuinur, he settled among the Haradrim on Middle-Earth, and 
@@ -6308,12 +9656,33 @@ B:CRUSH:HURT:12d12
 B:CRUSH:HURT:12d12
 B:CRUSH:HURT:12d12
 B:CRUSH:HURT:12d12
-F:FORCE_SLEEP | FORCE_MAXHP | UNIQUE | SUSCEP_FIRE |
-F:WILD_ONLY | WILD_WOOD | WILD_GRASS | WILD_MOUNTAIN | WILD_SHORE | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | MOVE_BODY | DROP_CORPSE |
-F:SMART | TAKE_ITEM | BASH_DOOR | KILL_WALL | NO_SLEEP |
-F:GOOD | NEUTRAL | NO_TARGET | BASEANGBAND | NO_CUT | FEMALE | CAN_FLY | 
-F:DG_CURSE | WYRM_PROTECT | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DG_CURSE
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:FEMALE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:KILL_WALL
+F:MOVE_BODY
+F:NEUTRAL
+F:NO_CUT
+F:NO_SLEEP
+F:NO_TARGET
+F:ONLY_ITEM
+F:SMART
+F:SUSCEP_FIRE
+F:TAKE_ITEM
+F:UNIQUE
+F:WILD_GRASS
+F:WILD_MOUNTAIN
+F:WILD_ONLY
+F:WILD_SHORE
+F:WILD_WOOD
+F:WYRM_PROTECT
 D:She is one of the Ent-wives who disappeared into the East a 
 D:long time ago. She was the wife of Fangorn the Treebeard when 
 D:the separation occurred, and she seems to have taken it quite 
@@ -6330,12 +9699,33 @@ B:GAZE:TERRIFY
 B:GAZE:PARALYZE
 B:GAZE:LOSE_STR
 B:GAZE:HALLU
-F:EMPTY_MIND | COLD_BLOOD | NONLIVING | NEVER_MOVE |
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | EVIL |
-F:HURT_ROCK | COLD_BLOOD | HURT_LITE | NO_FEAR |
-F:NO_CONF | NO_SLEEP | NO_STUN | NONLIVING | RES_TELE | BASEANGBAND | NO_CUT
-S:1_IN_3 | 
-S:SHRIEK | S_MONSTER | S_MONSTERS | HOLD | CONF | MIND_BLAST | DRAIN_MANA
+F:COLD_BLOOD
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:HURT_LITE
+F:HURT_ROCK
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NEVER_MOVE
+F:NONLIVING
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:RES_TELE
+S:1_IN_3
+S:CONF
+S:DRAIN_MANA
+S:HOLD
+S:MIND_BLAST
+S:SHRIEK
+S:S_MONSTER
+S:S_MONSTERS
 D:A figure carved from stone, with three vulture faces whose eyes glow 
 D:with a malevolent light.  None escape its vigilance. 
 
@@ -6347,13 +9737,23 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:1d12
 B:HIT:HURT:3d6
-F:FORCE_SLEEP | 
-F:EMPTY_MIND | COLD_BLOOD | BASH_DOOR | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:HURT_ROCK | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_4 | 
-S:SLOW | CONF | BO_ACID
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HURT_ROCK
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+S:1_IN_4
+S:BO_ACID
+S:CONF
+S:SLOW
 D:A stumpy figure carved from stone, with glittering eyes. 
 
 # New monster added by furiosity for the Theme module
@@ -6368,13 +9768,23 @@ B:HIT:HURT:4d8
 B:HIT:HURT:4d8
 B:HIT:HURT:4d8
 B:HIT:HURT:4d8
-F:UNIQUE | MALE | CAN_SPEAK |
-F:FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE | 
-F:ESCORT | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:ORC
+F:UNIQUE
 D:A large and powerful orc, captain of one of Saruman's orcish regiments. 
 
 N:400:Dark elven druid
@@ -6386,14 +9796,27 @@ O:10:0:80:10
 B:HIT:HURT:1d7
 B:HIT:HURT:1d7
 B:HIT:HURT:3d8
-F:MALE | 
-F:FORCE_SLEEP | 
-F:ONLY_ITEM | DROP_1D2 | DROP_SKELETON | DROP_CORPSE
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
-S:1_IN_6 | 
-S:HEAL | CONF | DARKNESS | 
-S:S_MONSTER | S_SPIDER | S_ANIMAL
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:HURT_LITE
+F:IM_POIS
+F:MALE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+S:1_IN_6
+S:CONF
+S:DARKNESS
+S:HEAL
+S:S_ANIMAL
+S:S_MONSTER
+S:S_SPIDER
 D:A powerful dark elf, with mighty nature-controlling enchantments. 
 
 N:401:Stone troll
@@ -6405,10 +9828,19 @@ O:0:100:0:0
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
 B:BITE:HURT:3d4
-F:MALE | 
-F:FRIENDS | DROP_60 | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | REGENERATE | 
-F:EVIL | TROLL | HURT_LITE | HURT_ROCK | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HURT_LITE
+F:HURT_ROCK
+F:MALE
+F:NO_CUT
+F:OPEN_DOOR
+F:REGENERATE
+F:TROLL
 D:It is said that Melkor created trolls in mockery of the Ents. 
 D:This giant creature has scabby black skin and powerful fists. 
 
@@ -6423,12 +9855,31 @@ B:HIT:HURT
 B:HIT:HURT
 B:WAIL:TERRIFY
 B:INSULT:*
-F:BASEANGBAND | SPECIAL_GENE | UNIQUE | MALE | CAN_SPEAK | 
-F:OPEN_DOOR | BASH_DOOR | TAKE_ITEM | HAS_LITE | SUSCEP_POIS | 
-F:ONLY_ITEM | DROP_3D2 | DROP_GOOD | DROP_RANDART | FORCE_MAXHP | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_ACID | RES_NETH | RES_WATE | 
-S:1_IN_8 | 
-S:S_UNDEAD | S_KIN | S_DEMON | S_DRAGON | 
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_3D2
+F:DROP_GOOD
+F:DROP_RANDART
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_NETH
+F:RES_WATE
+F:SPECIAL_GENE
+F:SUSCEP_POIS
+F:TAKE_ITEM
+F:UNIQUE
+S:1_IN_8
+S:S_DEMON
+S:S_DRAGON
+S:S_KIN
+S:S_UNDEAD
 D:The proud ruler of the gray-eyed Men of Dol Amroth, Imrahil 
 D:had been aligned with the forces of good for most of his life. 
 D:However, Sauron has managed to sway Imrahil to the Shadow by 
@@ -6446,11 +9897,21 @@ O:30:70:0:0
 B:HIT:HURT:1d5
 B:HIT:HURT:1d5
 B:BITE:HURT:2d6
-F:MALE | 
-F:FRIENDS | DROP_60 | WILD_TOO | WILD_WASTE | WILD_MOUNTAIN | 
-F:DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | SUSCEP_FIRE | REGENERATE | 
-F:EVIL | TROLL | HURT_LITE | BASEANGBAND
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HURT_LITE
+F:MALE
+F:OPEN_DOOR
+F:REGENERATE
+F:SUSCEP_FIRE
+F:TROLL
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WASTE
 D:It is said that Melkor created trolls in mockery of the Ents. 
 D:This creature has an extremely tough hide, covered with warts. 
 
@@ -6464,9 +9925,14 @@ B:GAZE:EXP_20
 B:CRAWL:ACID:2d4
 B:BITE:HURT:1d10
 B:BITE:POISON:1d6
-F:BASH_DOOR | EVIL | CAN_SWIM | WILD_TOO | WILD_SWAMP | 
-F:ANIMAL | IM_ACID | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_CORPSE
+F:EVIL
+F:IM_ACID
+F:MORTAL
+F:WILD_TOO
 D:A huge wormlike shape dripping acid, twisted by evil sorcery into a foul 
 D:monster that breeds on death. 
 
@@ -6477,9 +9943,14 @@ W:25:1:600:90
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:LOSE_STR:4d4
-F:RAND_25 | WILD_TOO |
-F:WEIRD_MIND | BASH_DOOR | DROP_CORPSE | 
-F:ANIMAL | CAN_FLY | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:MORTAL
+F:RAND_25
+F:WEIRD_MIND
+F:WILD_TOO
 D:A giant beetle with poisonous mandibles. 
 
 N:406:Disenchanter bat
@@ -6490,8 +9961,15 @@ E:0:1:1:0:1:0
 O:0:0:0:0
 B:HIT:UN_BONUS
 B:HIT:UN_BONUS
-F:FORCE_SLEEP | RAND_50 | ANIMAL | MORTAL | ATTR_MULTI | 
-F:DROP_CORPSE | AI_ANNOY | CAN_FLY | BASEANGBAND | WEIRD_MIND
+F:AI_ANNOY
+F:ANIMAL
+F:ATTR_MULTI
+F:CAN_FLY
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:MORTAL
+F:RAND_50
+F:WEIRD_MIND
 D:A giant bat that feeds on raw magical energy. 
 
 # New monster added for the Theme module
@@ -6506,13 +9984,28 @@ B:HIT:CONFUSE:12d12
 B:TOUCH:LOSE_CHR:2d12
 B:HIT:BLIND:10d5
 B:HIT:TERRIFY:15d1
-F:UNIQUE | MALE | CAN_SPEAK | FORCE_MAXHP | 
-F:EVIL | OPEN_DOOR | BASH_DOOR | ANIMAL | 
-F:INVISIBLE | NO_SLEEP | NO_FEAR | MORTAL | 
-F:DROP_4D2 | DROP_GOOD | ONLY_ITEM | 
-F:IM_FIRE | IM_COLD | IM_POIS | NO_CONF | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:MALE
+F:MORTAL
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNIQUE
 S:1_IN_3
-S:TELE_AWAY | S_KIN | 
+S:S_KIN
+S:TELE_AWAY
 D:A giant cat, servant of Tevildo. His yellow eyes look 
 D:upon you with a baleful stare.
 
@@ -6523,9 +10016,12 @@ W:26:1:700:90
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:2d12
-F:RAND_25 | KILL_BODY | DROP_SKELETON
-F:WEIRD_MIND | BASH_DOOR | 
-F:ANIMAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:KILL_BODY
+F:RAND_25
+F:WEIRD_MIND
 D:It is an ant encased in shaggy grey fur. 
 
 # New monster added for the Theme module
@@ -6540,13 +10036,28 @@ B:HIT:CONFUSE:12d12
 B:TOUCH:LOSE_DEX:2d12
 B:HIT:BLIND:10d5
 B:HIT:PARALYZE:15d1
-F:UNIQUE | MALE | CAN_SPEAK | FORCE_MAXHP | 
-F:EVIL | OPEN_DOOR | BASH_DOOR | ANIMAL | 
-F:INVISIBLE | NO_STUN | NO_SLEEP | MORTAL | 
-F:DROP_4D2 | DROP_GOOD | ONLY_ITEM | 
-F:IM_FIRE | IM_COLD | IM_POIS | NO_CONF | 
-S:1_IN_3 | 
-S:TELE_TO | S_KIN | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:MALE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNIQUE
+S:1_IN_3
+S:S_KIN
+S:TELE_TO
 D:A fierce and warlike cat, serving as a bodyguard of Tevildo. 
 D:This giant cat looks down upon you with disdain. 
 
@@ -6559,9 +10070,17 @@ O:0:0:0:0
 B:CLAW:HURT:15d2
 B:CLAW:HURT:15d2
 B:BITE:HURT:3d10
-F:CAN_FLY | UNIQUE | FORCE_MAXHP | DROP_CORPSE | CAN_SPEAK |
-F:WILD_ONLY | WILD_MOUNTAIN | WILD_VOLCANO | PET | 
-F:ANIMAL | GOOD | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:CAN_SPEAK
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:GOOD
+F:PET
+F:UNIQUE
+F:WILD_MOUNTAIN
+F:WILD_ONLY
+F:WILD_VOLCANO
 D:The greatest of eagles in the Third Age of Middle-earth, Gwaihir rescued 
 D:Gandalf the Wizard from Orthanc, and has twice brought his flock to the 
 D:aid of Sauron's enemies in battle - first outside the gates of Erebor in 
@@ -6574,10 +10093,15 @@ W:26:2:200:90
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:FIRE:3d6
-F:RAND_25 | SUSCEP_COLD |
-F:WEIRD_MIND | BASH_DOOR | 
-F:ANIMAL | IM_FIRE | CAN_FLY | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:HAS_LITE
+F:IM_FIRE
+F:MORTAL
+F:RAND_25
+F:SUSCEP_COLD
+F:WEIRD_MIND
 D:It is smoking and burning with great heat. 
 
 # New monster added by furiosity for the Theme module
@@ -6590,11 +10114,22 @@ E:1:1:1:2:1:1
 O:40:60:0:0
 B:HIT:HURT:1d8
 B:HIT:HURT:1d8
-F:BASEANGBAND | WILD_TOO | WILD_TOWN | MORTAL | 
-F:UNIQUE | MALE | CAN_SPEAK | DROP_CORPSE | 
-F:HAS_LITE | OPEN_DOOR | BASH_DOOR | EVIL | 
-F:FORCE_MAXHP | FORCE_SLEEP |  
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNIQUE
+F:WILD_TOO
+F:WILD_TOWN
 D:The 'Chief Shiriff' of Bag End. Using money obtained from Isengard 
 D:and the sale of pipe-weed, he bought up much property in the Shire 
 D:and supported the ruffians known as `The Chief's Men'. After 
@@ -6610,12 +10145,22 @@ O:40:60:0:0
 B:HIT:HURT:4d6
 B:HIT:HURT:4d6
 B:HIT:HURT:4d6
-F:UNIQUE | MALE | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE | 
-F:FORCE_MAXHP | WILD_TOO |
-F:ONLY_ITEM | DROP_90 | DROP_GOOD | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
 F:EVIL
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:FORCE_MAXHP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:TAKE_ITEM
+F:UNIQUE
+F:WILD_TOO
 D:A short and swarthy Easterling, faithless and treacherous. 
 D:Along with  his brother, he brought about the fall of the 
 D:Sons of Feanor. 
@@ -6630,9 +10175,15 @@ B:CLAW:HURT:1d10
 B:CLAW:HURT:1d10
 B:BITE:HURT:2d8
 B:CRUSH:HURT:2d6
-F:BASH_DOOR | OPEN_DOOR | 
-F:WILD_TOO | WILD_WOOD | WILD_MOUNTAIN | DROP_CORPSE | 
-F:ANIMAL | EVIL | DROP_1D2 | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:EVIL
+F:OPEN_DOOR
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:In the eyes of this bear, there glimmers the faintest light of intelligence. 
 D:And then its form begins to change... The combination of animal cunning, 
 D:human intelligence and the great physical strength of the bear makes for 
@@ -6646,10 +10197,15 @@ E:1:1:1:2:1:1
 O:20:70:0:10
 B:HIT:HURT:3d8
 B:HIT:HURT:3d8
-F:FRIENDS | DROP_60 | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | GIANT | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FRIENDS
+F:GIANT
+F:HAS_LITE
+F:MORTAL
+F:OPEN_DOOR
 D:A giant orc-like figure with an awesomely muscled frame. 
 
 N:416:White wraith
@@ -6661,13 +10217,24 @@ O:0:50:50:0
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
 B:TOUCH:EXP_20
-F:FORCE_SLEEP | 
-F:DROP_1D2 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | CAN_FLY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_8 | 
-S:SCARE | CAUSE_2 | DARKNESS
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_1D2
+F:EVIL
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:UNDEAD
+S:1_IN_8
+S:CAUSE_2
+S:DARKNESS
+S:SCARE
 D:It is a tangible but ghostly form made of white fog. 
 
 # New monster added for the Theme module
@@ -6682,16 +10249,43 @@ B:HIT:HURT:3d8
 B:HIT:HURT:3d8
 B:HIT:HURT:3d8
 #Force him into Mirkwood:
-F:FORCE_DEPTH | ONLY_DEPTH | 
-F:BASEANGBAND | WILD_TOO | WILD_WOOD | WILD_GRASS | 
-F:UNIQUE | MALE | CAN_SPEAK | MORTAL | TAKE_ITEM | 
-F:CAN_SWIM | OPEN_DOOR | BASH_DOOR | HAS_LITE | 
-F:PET | NO_CONF | NO_SLEEP | GOOD | 
-F:ONLY_ITEM | DROP_2D2| DROP_GREAT | NO_FEAR | 
-F:IM_POIS | IM_COLD | RES_WATE | RES_TELE | 
+F:BASH_DOOR
+F:CAN_SPEAK
+F:CAN_SWIM
+F:DROP_2D2
+F:DROP_GREAT
+F:FORCE_DEPTH
+F:GOOD
+F:HAS_LITE
+F:IM_COLD
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_DEPTH
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:PET
+F:RES_TELE
+F:RES_WATE
+F:TAKE_ITEM
+F:UNIQUE
+F:WILD_GRASS
+F:WILD_TOO
+F:WILD_WOOD
 S:1_IN_5
-S:BO_FIRE | BO_COLD | BLIND | CONF | HASTE | S_KIN | 
-S:DARKNESS | S_MONSTER | S_ANIMALS | S_SPIDER | 
+S:BLIND
+S:BO_COLD
+S:BO_FIRE
+S:CONF
+S:DARKNESS
+S:HASTE
+S:S_ANIMALS
+S:S_KIN
+S:S_MONSTER
+S:S_SPIDER
 D:A strong wood-elf with a penchant for treasure. He is 
 D:wise and powerful, and it is said that even the independent 
 D:dark elves will rally to his side when he travels.
@@ -6705,11 +10299,23 @@ O:0:45:35:10
 B:CLAW:DISEASE:1d4
 B:CLAW:DISEASE:1d4
 B:BITE:PARALYZE:1d5
-F:DROP_60 | OPEN_DOOR | BASH_DOOR | CAN_SWIM |
-F:EVIL | UNDEAD | FRIENDS | IM_POIS | IM_COLD | NO_CONF | NO_SLEEP | 
-F:COLD_BLOOD | HURT_LITE | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:DROP_60
+F:EVIL
+F:FRIENDS
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:UNDEAD
 S:1_IN_9
-S:SCARE | HOLD
+S:HOLD
+S:SCARE
 D:Flesh is falling off in chunks from this decaying abomination. 
 
 N:419:Mim, Betrayer of Turin
@@ -6722,15 +10328,35 @@ B:HIT:HURT:3d9
 B:HIT:HURT:3d9
 B:HIT:HURT:3d9
 B:HIT:UN_BONUS:3d12
-F:UNIQUE | MALE | CAN_SPEAK | 
-F:FORCE_MAXHP | FORCE_SLEEP | DROP_SKELETON | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR |
-F:EVIL | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:RES_DISE | RES_TELE | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_6 | 
-S:HEAL | SCARE | BO_ACID | BA_ACID | TPORT | S_MONSTER 
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_DISE
+F:RES_TELE
+F:UNIQUE
+S:1_IN_6
+S:BA_ACID
+S:BO_ACID
+S:HEAL
+S:SCARE
+S:S_MONSTER
+S:TPORT
 D:A Petty-Dwarf, one of the last of his race. He betrayed Turin 
 D:Turambar and gave him up to Morgoth's forces. 
 
@@ -6742,10 +10368,22 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:EXP_20:2d13
 B:HIT:EXP_20:2d13
-F:CHAR_MULTI | EVIL | IM_POIS | IM_COLD | 
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | SUSCEP_ACID |
-F:COLD_BLOOD | BASH_DOOR | NONLIVING |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | HAS_LITE | NO_CUT
+F:BASH_DOOR
+F:CAN_FLY
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:IM_POIS
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:SUSCEP_ACID
 D:A deadly blade of chaos, moving of its own volition.
 
 N:421:Killer fire beetle
@@ -6756,9 +10394,17 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:3d4
 B:SPIT:FIRE:4d5
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | WILD_VOLCANO | DROP_CORPSE | 
-F:ANIMAL | IM_FIRE | CAN_FLY | SUSCEP_COLD |
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:HAS_LITE
+F:IM_FIRE
+F:MORTAL
+F:SUSCEP_COLD
+F:WEIRD_MIND
+F:WILD_TOO
+F:WILD_VOLCANO
 D:It is a giant beetle wreathed in flames. 
 
 # New monster added by furiosity for the Theme module
@@ -6771,16 +10417,46 @@ E:1:1:1:2:1:1
 O:20:50:10:5
 B:HIT:FIRE:9d12
 B:HIT:HURT:10d10
-F:UNIQUE | MALE | SMART | CAN_SPEAK | MORTAL | 
-F:BASEANGBAND | FORCE_MAXHP | WEIRD_MIND | EVIL | 
-F:HAS_LITE | ESCORT | ESCORTS | ONLY_ITEM | 
-F:DROP_4D2 | DROP_3D2 | DROP_GOOD | TAKE_ITEM | 
-F:OPEN_DOOR | BASH_DOOR | DROP_USEFUL | 
-F:IM_ACID | IM_ELEC | IM_FIRE | IM_POIS | RES_PLAS | 
-S:1_IN_2 | 
-S:BA_FIRE | BRAIN_SMASH | CAUSE_2 | BO_FIRE | BO_MANA | 
-S:BO_PLAS | SCARE | CONF | HASTE | HEAL | TPORT |
-S:TELE_TO | TELE_AWAY | TRAPS | FORGET | S_KIN | 
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_GOOD
+F:DROP_USEFUL
+F:ESCORT
+F:ESCORTS
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_ACID
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_PLAS
+F:SMART
+F:TAKE_ITEM
+F:UNIQUE
+F:WEIRD_MIND
+S:1_IN_2
+S:BA_FIRE
+S:BO_FIRE
+S:BO_MANA
+S:BO_PLAS
+S:BRAIN_SMASH
+S:CAUSE_2
+S:CONF
+S:FORGET
+S:HASTE
+S:HEAL
+S:SCARE
+S:S_KIN
+S:TELE_AWAY
+S:TELE_TO
+S:TPORT
 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. 
@@ -6795,9 +10471,18 @@ B:BITE:POISON:3d4
 B:TOUCH:POISON:3d5
 B:HIT:HURT:1d12
 B:HIT:HURT:1d12
-F:ONLY_GOLD | DROP_90 | DROP_2D2 | 
-F:COLD_BLOOD | BASH_DOOR | CHAR_MULTI | 
-F:IM_ELEC | IM_ACID | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_90
+F:IM_ACID
+F:IM_ELEC
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_GOLD
 D:It appears to be a pile of coins made of precious adamant, slithering toward 
 D:you on lots of tiny legs. 
 
@@ -6810,9 +10495,17 @@ O:10:80:0:10
 B:CLAW:POISON:3d3
 B:CLAW:POISON:3d3
 B:BITE:HURT:1d6
-F:FRIENDS | DROP_60 | WILD_WOOD | WILD_MOUNTAIN | WILD_TOO | WILD_SWAMP | 
-F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | REGENERATE | 
-F:EVIL | TROLL | BASEANGBAND
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FRIENDS
+F:OPEN_DOOR
+F:REGENERATE
+F:TROLL
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:Trolls were created by Melkor in mockery of the Ents. This one is 
 D:a powerful troll form. Venom drips from its needle-like claws. 
 
@@ -6828,13 +10521,25 @@ O:10:80:0:10
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
-F:BASEANGBAND | WILD_TOO | WILD_WOOD | 
-F:UNIQUE | MALE | CAN_SPEAK | SMART | 
-F:FORCE_MAXHP | MORTAL | HAS_LITE | PET | 
-F:OPEN_DOOR | BASH_DOOR | TAKE_ITEM | 
-F:DROP_2D2 | DROP_GOOD | ONLY_ITEM | 
-S:1_IN_10 | 
-S:ARROW_2 | S_KIN | 
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:PET
+F:SMART
+F:TAKE_ITEM
+F:UNIQUE
+F:WILD_TOO
+F:WILD_WOOD
+S:1_IN_10
+S:ARROW_2
+S:S_KIN
 D:A noble son of the Steward of Gondor.
 
 N:426:Roper
@@ -6847,13 +10552,30 @@ B:CRUSH:PARALYZE:3d5
 B:CRUSH:PARALYZE:3d5
 B:CRUSH:PARALYZE:3d5
 B:CRUSH:PARALYZE:3d5
-F:FORCE_MAXHP | FORCE_SLEEP | NO_FEAR | NEVER_MOVE |
-F:ONLY_GOLD | DROP_2D2 | DROP_60 | DROP_1D2 | EVIL | 
-F:IM_ACID | IM_POIS | NO_CONF | NO_SLEEP | IM_COLD | IM_FIRE | BASEANGBAND
+F:DROP_1D2
+F:DROP_2D2
+F:DROP_60
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
 F:NO_CUT
-S:1_IN_5 | 
-S:BA_FIRE | BA_ELEC | BA_POIS | HASTE | 
-S:TRAPS | SHRIEK | HOLD | CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_GOLD
+S:1_IN_5
+S:BA_ELEC
+S:BA_FIRE
+S:BA_POIS
+S:CONF
+S:HASTE
+S:HOLD
+S:SHRIEK
 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 
@@ -6867,9 +10589,16 @@ E:1:1:1:2:0:1
 O:0:100:0:0
 B:HIT:HURT:1d8
 B:HIT:HURT:1d8
-F:FRIENDS | DROP_60 | OPEN_DOOR | BASH_DOOR | WILD_TOO |
-F:WILD_MOUNTAIN | WILD_WASTE | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | BASEANGBAND
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:OPEN_DOOR
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WASTE
 S:1_IN_6
 S:SCARE
 D:Headless humanoid abomination, ever hungry for blood. 
@@ -6884,12 +10613,16 @@ B:BITE:HURT:2d8
 B:BITE:HURT:2d8
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
-F:FORCE_SLEEP | 
-F:FRIENDS | 
-F:BASH_DOOR | 
-F:ANIMAL | NO_CONF | NO_SLEEP | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND
-S:1_IN_5 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+S:1_IN_5
 S:BR_SOUN
 D:A blurry canine form which seems to be moving as fast as the eye can 
 D:follow. You can feel the earth resonating beneath your feet. 
@@ -6904,11 +10637,17 @@ B:BITE:HURT:2d8
 B:BITE:HURT:2d8
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
-F:FORCE_SLEEP | RES_NEXU | DROP_SKELETON | DROP_CORPSE | 
-F:FRIENDS | 
-F:BASH_DOOR | 
-F:ANIMAL | RES_TELE | NO_SLEEP | MORTAL | BASEANGBAND
-S:1_IN_5 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:MORTAL
+F:NO_SLEEP
+F:RES_NEXU
+F:RES_TELE
+S:1_IN_5
 S:BR_NEXU
 D:A locus of conflicting points coalesce to form the vague shape of a huge 
 D:hound. Or is it just your imagination? 
@@ -6921,10 +10660,16 @@ E:1:1:1:2:1:1
 O:20:70:0:10
 B:HIT:HURT:4d8
 B:HIT:HURT:4d8
-F:FRIENDS | DROP_60 | DROP_CORPSE | SMART | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | GIANT | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FRIENDS
+F:GIANT
+F:HAS_LITE
+F:MORTAL
+F:OPEN_DOOR
+F:SMART
 D:A giant, brutish figure, as ugly as an orc, but with some of the 
 D:intelligence of his half-human ancestry. 
 
@@ -6937,12 +10682,25 @@ O:5:85:0:5
 B:HIT:HURT:6d7
 B:HIT:HURT:6d7
 B:HIT:HURT:6d7
-F:UNIQUE | MALE | CAN_SPEAK | WILD_TOO | WILD_SWAMP | WILD_SHORE |
-F:FORCE_MAXHP | ESCORT | 
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | CAN_SWIM |
-F:EVIL | GIANT | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:CAN_SWIM
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:GIANT
+F:HAS_LITE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNIQUE
+F:WILD_SHORE
+F:WILD_TOO
 D:An ogre renowned for acts of surprising cruelty, Lokkak is the leader of a large 
 D:band of violent ogres. 
 
@@ -6956,13 +10714,31 @@ B:HIT:HURT:1d6
 B:HIT:HURT:1d6
 B:BITE:EXP_20:2d6
 B:BITE:EXP_20:2d6
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:COLD_BLOOD | DROP_60 | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | REGENERATE | CAN_FLY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP | 
-F:BASEANGBAND | NO_CUT
-S:1_IN_9 | 
-S:TELE_TO | HOLD | SCARE | CAUSE_2 | MIND_BLAST | FORGET | DARKNESS
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_60
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:REGENERATE
+F:UNDEAD
+S:1_IN_9
+S:CAUSE_2
+S:DARKNESS
+S:FORGET
+S:HOLD
+S:MIND_BLAST
+S:SCARE
+S:TELE_TO
 D:It is a humanoid with an aura of power. You notice a sharp set of front 
 D:teeth. 
 
@@ -6975,11 +10751,14 @@ O:0:0:0:0
 B:BUTT:HURT:2d10
 B:BITE:FIRE:2d10
 B:GAZE:PARALYZE:2d6
-F:FORCE_SLEEP | SUSCEP_COLD |
-F:BASH_DOOR | CAN_FLY | DROP_CORPSE | 
-F:IM_FIRE | BASEANGBAND
-S:1_IN_8 | 
-S:BR_FIRE 
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:IM_FIRE
+F:SUSCEP_COLD
+S:1_IN_8
+S:BR_FIRE
 D:It has three heads - goat, dragon and gorgon - all attached to a 
 D:lion's body. 
 
@@ -6995,12 +10774,24 @@ B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
-F:BASEANGBAND | UNIQUE | MALE | CAN_SPEAK | PET | 
-F:WILD_TOO | WILD_WOOD | FORCE_MAXHP | MORTAL | 
-F:OPEN_DOOR | BASH_DOOR | TAKE_ITEM | HAS_LITE | 
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
-S:1_IN_10 | 
-S:ARROW_2 | S_KIN 
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:PET
+F:TAKE_ITEM
+F:UNIQUE
+F:WILD_TOO
+F:WILD_WOOD
+S:1_IN_10
+S:ARROW_2
+S:S_KIN
 D:The noble son of the Steward of Gondor guards the depths 
 D:of Ithilien against the Enemy.
 
@@ -7012,11 +10803,21 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:ELEC:3d8
 B:HIT:ELEC:3d8
-F:FORCE_SLEEP | 
-F:EMPTY_MIND | COLD_BLOOD | BASH_DOOR | CAN_FLY |
-F:IM_ELEC | IM_POIS | AURA_ELEC | REFLECTING |
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | BASEANGBAND | NO_CUT
-S:1_IN_3 | 
+F:AURA_ELEC
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:IM_ELEC
+F:IM_POIS
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:REFLECTING
+S:1_IN_3
 S:BO_ELEC
 D:A man-shaped form of living lightning, sparks and shocks crackle all over 
 D:this madly capering figure, as it leaps and whirls around and about you. 
@@ -7031,13 +10832,25 @@ B:CRUSH:HURT:2d8
 B:CRUSH:HURT:2d8
 B:BITE:HURT:1d8
 B:BITE:HURT:1d8
-F:FEMALE | 
-F:FORCE_SLEEP | CAN_FLY |
-F:ONLY_ITEM | DROP_90 | DROP_2D2 | DROP_CORPSE | 
-F:INVISIBLE | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_4 | 
-S:HEAL | BLIND | MIND_BLAST | DARKNESS
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_2D2
+F:DROP_90
+F:DROP_CORPSE
+F:EVIL
+F:FEMALE
+F:FORCE_SLEEP
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+S:1_IN_4
+S:BLIND
+S:DARKNESS
+S:HEAL
+S:MIND_BLAST
 D:A wraithly snake-like form with the torso of a beautiful woman, it is the 
 D:most powerful of its kind. 
 
@@ -7053,10 +10866,20 @@ B:GAZE:*
 B:WAIL:*
 B:INSULT:*
 B:CHARGE:HURT:1d2
-F:BASEANGBAND | WILD_TOO | WILD_TOWN | WILD_WOOD | 
-F:UNIQUE | CAN_SPEAK | MALE | HAS_LITE | MORTAL | 
-F:OPEN_DOOR | BASH_DOOR | TAKE_ITEM |  
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_GOOD
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:TAKE_ITEM
+F:UNIQUE
+F:WILD_TOO
+F:WILD_TOWN
+F:WILD_WOOD
 D:The suspicious and gruff keeper of the West-gate of Bree. He betrayed his 
 D:people by letting Saruman's thugs into the city, and so has been turned out.
 
@@ -7073,14 +10896,36 @@ B:GAZE:TERRIFY:5d8
 B:GAZE:PARALYZE:5d8
 B:GAZE:LOSE_STR:5d8
 B:GAZE:HALLU:5d8
-F:UNIQUE | FORCE_MAXHP | INVISIBLE | WEIRD_MIND | 
-F:EMPTY_MIND | COLD_BLOOD | NONLIVING | NEVER_MOVE |
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | EVIL |
-F:HURT_ROCK | COLD_BLOOD | HURT_LITE | NO_FEAR |
-F:NO_CONF | NO_SLEEP | NO_STUN | NONLIVING | RES_TELE | 
-F:BASEANGBAND | NO_CUT | REGENERATE | 
-S:1_IN_3 | 
-S:SHRIEK | S_SPIDER | S_HI_UNDEAD | MIND_BLAST | DRAIN_MANA
+F:COLD_BLOOD
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:FORCE_MAXHP
+F:HURT_LITE
+F:HURT_ROCK
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:NEVER_MOVE
+F:NONLIVING
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:REGENERATE
+F:RES_TELE
+F:UNIQUE
+F:WEIRD_MIND
+S:1_IN_3
+S:DRAIN_MANA
+S:MIND_BLAST
+S:SHRIEK
+S:S_HI_UNDEAD
+S:S_SPIDER
 D:It looks like a great figure seated upon a throne, with three joined 
 D:bodies and three vulture-like heads. It seems to be carved out of huge 
 D:blocks of stone, immovable, and yet strangely aware of your presence. 
@@ -7097,11 +10942,27 @@ B:WAIL:UN_BONUS
 B:WAIL:EXP_20
 B:WAIL:EAT_GOLD
 B:WAIL:EAT_ITEM
-F:CHAR_MULTI | COLD_BLOOD | EVIL | NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING |
-F:UNDEAD | FORCE_MAXHP | IM_FIRE | IM_ELEC | IM_POIS | IM_ACID | EMPTY_MIND
-F:NEVER_MOVE | JOKEANGBAND | HAS_LITE | NO_CUT
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_ACID
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:JOKEANGBAND
+F:NEVER_MOVE
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:UNDEAD
 S:1_IN_15
-S:S_DEMON | SHRIEK
+S:SHRIEK
+S:S_DEMON
 D:Often found in graveyards. 
 
 N:440:5-headed hydra
@@ -7114,13 +10975,23 @@ B:BITE:POISON:4d4
 B:BITE:POISON:4d4
 B:BITE:POISON:4d4
 B:BITE:POISON:4d4
-F:FORCE_SLEEP | 
-F:ONLY_GOLD | DROP_1D2 | DROP_4D2 | DROP_SKELETON | DROP_CORPSE
-F:BASH_DOOR | MOVE_BODY | CAN_SWIM |
-F:ANIMAL | IM_POIS | WILD_TOO | WILD_SHORE | WILD_SWAMP |
-F:MORTAL | BASEANGBAND
-S:1_IN_5 | 
-S:SCARE | BA_POIS
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:IM_POIS
+F:MORTAL
+F:MOVE_BODY
+F:ONLY_GOLD
+F:WILD_SHORE
+F:WILD_TOO
+S:1_IN_5
+S:BA_POIS
+S:SCARE
 D:A strange reptilian creature with five heads dripping venom. 
 
 # New monster added for the Theme module
@@ -7132,18 +11003,65 @@ W:127:5:0:0
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:SHOW:*
-F:BASEANGBAND | WILD_ONLY | WILD_GRASS | WILD_WOOD | WILD_SHORE | 
-F:UNIQUE | MALE | FORCE_MAXHP | GOOD | HAS_LITE | CAN_SPEAK | 
-F:NO_THEFT | CAN_FLY | NO_CUT | DEATH_ORB | 
-F:WYRM_PROTECT | DG_CURSE | GOOD | OPEN_DOOR | BASH_DOOR | SMART | 
-F:RES_NETH | NEVER_BLOW | REFLECTING | WEIRD_MIND | 
-F:REGENERATE | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:RES_TELE | RES_WATE | RES_PLAS | RES_NEXU | RES_DISE | PET | 
-F:NO_FEAR | NO_STUN | NO_CONF | NO_SLEEP | CAN_SWIM | AQUATIC | 
-S:1_IN_5 | 
-S:CONF | MIND_BLAST | BRAIN_SMASH | 
-S:BA_MANA | CAUSE_4 | MISSILE | SCARE | SLOW | HOLD | BO_MANA | 
-S:HASTE | HAND_DOOM | HEAL | BLINK | BR_MANA | S_MONSTERS | 
+F:AQUATIC
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:CAN_SWIM
+F:DEATH_ORB
+F:DG_CURSE
+F:FORCE_MAXHP
+F:GOOD
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:NEVER_BLOW
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:NO_THEFT
+F:OPEN_DOOR
+F:PET
+F:REFLECTING
+F:REGENERATE
+F:RES_DISE
+F:RES_NETH
+F:RES_NEXU
+F:RES_PLAS
+F:RES_TELE
+F:RES_WATE
+F:SMART
+F:UNIQUE
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_ONLY
+F:WILD_SHORE
+F:WILD_WOOD
+F:WYRM_PROTECT
+S:1_IN_5
+S:BA_MANA
+S:BLINK
+S:BO_MANA
+S:BRAIN_SMASH
+S:BR_MANA
+S:CAUSE_4
+S:CONF
+S:HAND_DOOM
+S:HASTE
+S:HEAL
+S:HOLD
+S:MIND_BLAST
+S:MISSILE
+S:SCARE
+S:SLOW
+S:S_MONSTERS
 D:A mysterious figure in a blue coat, his face creased in laughter. 
 D:Legend has it that he is older than Arda itself, and will aid 
 D:the forces of good in any way he can.
@@ -7157,12 +11075,21 @@ O:0:90:10:0
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
-F:MALE | 
-F:FORCE_SLEEP | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_8 | 
-S:BLIND | SCARE | CAUSE_3 | DARKNESS
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+S:1_IN_8
+S:BLIND
+S:CAUSE_3
+S:DARKNESS
+S:SCARE
 D:He is a figure riding a majestic war chariot; he looks at you 
 D:menacingly. 
 
@@ -7175,11 +11102,24 @@ O:0:0:0:0
 B:BITE:PARALYZE:4d5
 B:BITE:LOSE_DEX:4d5
 B:BITE:LOSE_CON:4d5
-F:FORCE_SLEEP | AQUATIC | GOOD | ANIMAL | NEUTRAL | NO_TARGET | 
-F:IM_COLD | IM_POIS | IM_FIRE | IM_ELEC | WILD_ONLY | WILD_OCEAN 
-F:MORTAL | BASEANGBAND
-S:1_IN_5 | 
-S:BO_WATE | BO_COLD | BO_ICEE | BO_MANA
+F:ANIMAL
+F:AQUATIC
+F:FORCE_SLEEP
+F:GOOD
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:WILD_OCEAN
+F:WILD_ONLY
+S:1_IN_5
+S:BO_COLD
+S:BO_ICEE
+S:BO_MANA
+S:BO_WATE
 D:Your mind is filled with admiration as you view this wondrous, 
 D:magical seahorse. 
 
@@ -7191,12 +11131,25 @@ E:1:1:1:2:1:1
 O:0:100:0:0
 B:HIT:HURT:9d9
 B:HIT:HURT:9d9
-F:FORCE_SLEEP | 
-F:DROP_1D2 | TAKE_ITEM | WILD_TOO | WILD_SHORE | WILD_MOUNTAIN |
-F:BASH_DOOR | OPEN_DOOR | MOVE_BODY | DROP_CORPSE | 
-F:EVIL | IM_POIS | IM_ACID | IM_FIRE | IM_COLD | GIANT | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_8 | 
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_SLEEP
+F:GIANT
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:MOVE_BODY
+F:OPEN_DOOR
+F:TAKE_ITEM
+F:WILD_MOUNTAIN
+F:WILD_SHORE
+F:WILD_TOO
+S:1_IN_8
 S:ARROW_4
 D:A gigantic humanoid with only one eye. 
 
@@ -7208,12 +11161,24 @@ E:1:1:1:2:1:1
 O:0:0:90:10
 B:HIT:CONFUSE:5d5
 B:HIT:TERRIFY:5d5
-F:MALE | 
-F:FORCE_SLEEP | DROP_1D2 | DROP_SKELETON | DROP_CORPSE
-F:OPEN_DOOR | BASH_DOOR | SMART |
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_8 | 
-S:BLIND | MIND_BLAST | HOLD | CAUSE_3 | FORGET | S_MONSTER
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:SMART
+S:1_IN_8
+S:BLIND
+S:CAUSE_3
+S:FORGET
+S:HOLD
+S:MIND_BLAST
+S:S_MONSTER
 D:He is using his supernatural talents to bring about your 
 D:destruction. 
 
@@ -7226,9 +11191,13 @@ O:0:0:0:0
 B:HIT:HURT:1d8
 B:BITE:ACID:2d8
 B:STING:POISON:1d8
-F:BASH_DOOR | DROP_CORPSE | 
-F:ANIMAL | IM_ACID | IM_POIS | CAN_SWIM | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_CORPSE
+F:IM_ACID
+F:IM_POIS
+F:MORTAL
 D:It is a massive worm form, many feet in length. Its vast maw drips acid 
 D:and poison. 
 
@@ -7242,10 +11211,15 @@ B:GAZE:TERRIFY:2d4
 B:GAZE:BLIND:2d4
 B:BUTT:HURT:2d6
 B:BITE:HURT:2d12
-F:ONLY_GOLD | DROP_2D2 | DROP_CORPSE
-F:BASH_DOOR | CAN_SWIM | WILD_TOO |  WILD_SWAMP |
-F:ANIMAL | IM_POIS
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_2D2
+F:DROP_CORPSE
+F:IM_POIS
+F:MORTAL
+F:ONLY_GOLD
+F:WILD_TOO
 D:A strange ox-like form with a huge head but a thin, weak neck. 
 
 N:448:Lesser wall monster
@@ -7257,9 +11231,23 @@ O:0:0:0:0
 B:HIT:HURT:2d6
 B:HIT:HURT:2d6
 B:HIT:HURT:2d6
-F:FORCE_SLEEP | COLD_BLOOD | EMPTY_MIND | KILL_WALL | RAND_50 | 
-F:BASH_DOOR | IM_COLD | IM_ACID | IM_FIRE | IM_ELEC | IM_POIS | NONLIVING | 
-F:HURT_ROCK | NO_CONF | NO_SLEEP | CHAR_MULTI | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HURT_ROCK
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_WALL
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:RAND_50
 S:MULTIPLY
 D:A sentient, moving section of wall. 
 
@@ -7271,15 +11259,28 @@ E:1:1:1:2:1:1
 O:10:0:90:0
 B:HIT:HURT:2d5
 B:HIT:HURT:2d5
-F:MALE | 
-F:FORCE_SLEEP | 
-F:ONLY_ITEM | DROP_1D2 | DROP_SKELETON | DROP_CORPSE | 
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:HASTE | TPORT | TELE_TO | BLIND | CONF | 
-S:BO_FIRE | BO_COLD | BO_ELEC | 
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+S:1_IN_3
+S:BLIND
+S:BO_COLD
+S:BO_ELEC
+S:BO_FIRE
+S:CONF
+S:HASTE
 S:S_MONSTER
+S:TELE_TO
+S:TPORT
 D:A fat mage with glasses.  And considerable power, too - as you can 
 D:tell from the size of his hat. 
 
@@ -7291,13 +11292,25 @@ E:1:1:1:2:1:1
 O:0:10:90:0
 B:CRUSH:LOSE_INT:2d6
 B:GAZE:INSANITY:2d6
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE
-F:ONLY_ITEM | DROP_60 | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | NO_CONF | NO_SLEEP
-F:MORTAL | BASEANGBAND
-S:1_IN_8 | 
-S:BLIND | HOLD | SCARE | MIND_BLAST | BRAIN_SMASH | FORGET
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+S:1_IN_8
+S:BLIND
+S:BRAIN_SMASH
+S:FORGET
+S:HOLD
+S:MIND_BLAST
+S:SCARE
 D:A humanoid form with a gruesome head, tentacular mouth, and piercing 
 D:eyes. Claws reach out for you and you feel a presence invade your mind. 
 
@@ -7311,9 +11324,26 @@ B:CRUSH:HURT:2d10
 B:CRUSH:HURT:2d10
 B:CRUSH:HURT:2d10
 B:CRUSH:HURT:2d10
-F:FORCE_SLEEP | FORCE_MAXHP | KILL_BODY | KILL_ITEM | UNIQUE | REFLECTING |
-F:EMPTY_MIND | COLD_BLOOD | BASH_DOOR | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS
-F:NO_FEAR | NO_CONF | NO_SLEEP | NONLIVING | RES_TELE | JOKEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:JOKEANGBAND
+F:KILL_BODY
+F:KILL_ITEM
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:REFLECTING
+F:RES_TELE
+F:UNIQUE
 D:It looks like a huge spiked roller. It was designed to keep this dungeon 
 D:clean, and you are the biggest spot of dirt in sight. 
 
@@ -7327,12 +11357,25 @@ E:0:0:0:0:0:0
 O:40:30:10:10
 B:CRAWL:POISON:5d7
 B:CRAWL:EAT_FOOD:5d7
-F:BASEANGBAND | EMPTY_MIND | SMART | IM_POIS | 
-F:UNDEAD | RAND_50 | CAN_SWIM | EVIL | NO_FEAR | 
-F:FORCE_MAXHP | UNIQUE | FEMALE | REGENERATE | 
-F:ONLY_ITEM | DROP_2D2 | DROP_GREAT | ESCORT | ESCORTS | 
+F:CAN_SWIM
+F:DROP_2D2
+F:DROP_GREAT
+F:EMPTY_MIND
+F:ESCORT
+F:ESCORTS
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:IM_POIS
+F:NO_FEAR
+F:ONLY_ITEM
+F:RAND_50
+F:REGENERATE
+F:SMART
+F:UNDEAD
+F:UNIQUE
 S:1_IN_5
-S:ANIM_DEAD | S_KIN
+S:S_KIN
 D:A ruler of mewlips. She might not be the most powerful of 
 D:them all, but she is the smartest, and has her minions 
 D:at her beck and call.
@@ -7347,11 +11390,21 @@ B:GAZE:PARALYZE
 B:BITE:HURT:2d12
 B:BITE:HURT:2d12
 B:BITE:HURT:2d12
-F:ONLY_ITEM | DROP_1D2 | WILD_TOO | WILD_MOUNTAIN |
-F:OPEN_DOOR | BASH_DOOR | EVIL | IM_POIS | DROP_CORPSE | 
-F:ANIMAL | NO_CONF | NO_SLEEP | CAN_SWIM | 
-F:MORTAL | BASEANGBAND
-S:1_IN_8 | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_1D2
+F:DROP_CORPSE
+F:EVIL
+F:IM_POIS
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:WILD_MOUNTAIN
+F:WILD_TOO
+S:1_IN_8
 S:BR_POIS
 D:An evil reptile that preys on unsuspecting travellers.  Its eyes stare 
 D:deeply at you and your soul starts to wilt! 
@@ -7366,10 +11419,21 @@ B:HIT:HURT:1d5
 B:HIT:HURT:1d5
 B:BITE:COLD:2d6
 B:BITE:COLD:2d6
-F:MALE | 
-F:FRIENDS | DROP_60 | WILD_TOO | WILD_WASTE | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | SUSCEP_FIRE | REGENERATE | 
-F:EVIL | TROLL | IM_COLD | HURT_LITE | BASEANGBAND
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HURT_LITE
+F:IM_COLD
+F:MALE
+F:OPEN_DOOR
+F:REGENERATE
+F:SUSCEP_FIRE
+F:TROLL
+F:WILD_TOO
+F:WILD_WASTE
 D:Melkor created trolls in mockery of Yavanna's Ents. This 
 D:is a white troll with powerfully clawed hands. 
 
@@ -7384,13 +11448,28 @@ O:5:85:0:5
 B:HIT:HURT:11d10
 B:HIT:HURT:11d10
 B:HIT:SHATTER:11d10
-F:UNIQUE | CAN_SPEAK | FEMALE | 
-F:RAND_25 | EVIL | GIANT | FORCE_MAXHP | 
-F:DROP_GOOD | ONLY_ITEM | DROP_4D2 | 
-F:OPEN_DOOR | BASH_DOOR | MOVE_BODY | KILL_ITEM | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_POIS | 
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:GIANT
+F:IM_ACID
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:KILL_ITEM
+F:MOVE_BODY
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RAND_25
+F:UNIQUE
 S:1_IN_5
-S:BA_ACID | BA_WATE | BO_ICEE
+S:BA_ACID
+S:BA_WATE
+S:BO_ICEE
 D:A powerful, fierce ogress, consort to Morgoth, rumoured to 
 D:be the mother of Gothmog, high captain of Balrogs.
 
@@ -7406,12 +11485,24 @@ O:5:85:0:5
 B:HIT:HURT:8d8
 B:HIT:HURT:8d8
 B:HIT:POISON:8d8
-F:UNIQUE | FEMALE | CAN_SPEAK | 
-F:EVIL | GIANT | FORCE_MAXHP | 
-F:DROP_GOOD | DROP_2D2 | ONLY_ITEM | 
-F:OPEN_DOOR | ESCORTS | IM_POIS | 
-S:1_IN_9 | 
-S:CONF | SCARE | HEAL | SHRIEK | S_KIN
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_GOOD
+F:ESCORTS
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:GIANT
+F:IM_POIS
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNIQUE
+S:1_IN_9
+S:CONF
+S:HEAL
+S:SCARE
+S:SHRIEK
+S:S_KIN
 D:A powerful ogress, consort to Morgoth, rumoured to be 
 D:the mother of Gothmog, high captain of Balrogs, also 
 D:rumoured to be related to Lokkak, the Ogre Chieftain.
@@ -7426,11 +11517,26 @@ B:HIT:HURT:4d6
 B:HIT:HURT:4d6
 B:HIT:HURT:4d6
 B:HIT:HURT:4d6
-F:UNIQUE | MALE | ESCORT | ESCORTS | CAN_SPEAK | 
-F:FORCE_MAXHP | SMART | SPECIAL_GENE
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | DROP_GREAT 
-F:OPEN_DOOR | BASH_DOOR 
-F:EVIL | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS 
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_GOOD
+F:DROP_GREAT
+F:ESCORT
+F:ESCORTS
+F:EVIL
+F:FORCE_MAXHP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:SPECIAL_GENE
+F:UNIQUE
 D:The slayer of Thingol, and the thief of the Nauglamir. He leads the dark 
 D:dwarves who escaped from Nogrod.
 
@@ -7444,13 +11550,26 @@ B:HIT:POISON:3d4
 B:HIT:POISON:3d4
 B:HIT:POISON:3d4
 B:HIT:POISON:3d4
-F:MIMIC | 
-F:FORCE_SLEEP | NEVER_MOVE | SUSCEP_ACID |
-F:EMPTY_MIND | COLD_BLOOD | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_4 | 
-S:BLIND | CONF | SCARE | CAUSE_2 | FORGET | 
-S:BO_ACID | BO_FIRE | BO_COLD | BO_ELEC | 
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:MIMIC
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:SUSCEP_ACID
+S:1_IN_4
+S:BLIND
+S:BO_ACID
+S:BO_COLD
+S:BO_ELEC
+S:BO_FIRE
+S:CAUSE_2
+S:CONF
+S:FORGET
+S:SCARE
 S:S_MONSTER
 D:A strange creature that disguises itself as an object to lure 
 D:unsuspecting adventurers within reach of its venomous claws. 
@@ -7464,13 +11583,24 @@ O:50:50:0:0
 B:CLAW:HURT:2d4
 B:CLAW:HURT:2d4
 B:BITE:HURT:2d6
-F:FORCE_SLEEP | FORCE_MAXHP | WILD_TOO | WILD_MOUNTAIN | WILD_WOOD |
-F:DROP_2D2 | DROP_CORPSE | ATTR_MULTI
-F:OPEN_DOOR | BASH_DOOR | CAN_FLY |
-F:EVIL | DRAGON | IM_ELEC | BASEANGBAND | ATTR_MULTI
-S:1_IN_10 | 
-S:SCARE | 
+F:ATTR_MULTI
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ELEC
+F:OPEN_DOOR
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
+S:1_IN_10
 S:BR_ELEC
+S:SCARE
 D:It has a form that legends are made of. Its still-tender scales are a 
 D:deep blue in hue. Sparks crackle along its length. 
 
@@ -7483,13 +11613,24 @@ O:50:50:0:0
 B:CLAW:HURT:2d4
 B:CLAW:HURT:2d4
 B:BITE:HURT:2d6
-F:FORCE_SLEEP | FORCE_MAXHP | WILD_TOO | WILD_MOUNTAIN | WILD_WASTE |
-F:DROP_2D2 | DROP_CORPSE | ATTR_MULTI
-F:OPEN_DOOR | BASH_DOOR | SUSCEP_FIRE |
-F:EVIL | DRAGON | IM_COLD | BASEANGBAND | ATTR_MULTI
-S:1_IN_10 | 
-S:SCARE | 
+F:ATTR_MULTI
+F:ATTR_MULTI
+F:BASH_DOOR
+F:DRAGON
+F:DROP_2D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:OPEN_DOOR
+F:SUSCEP_FIRE
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WASTE
+S:1_IN_10
 S:BR_COLD
+S:SCARE
 D:It has a form that legends are made of. Its still-tender scales are a 
 D:frosty white in hue. Icy blasts of cold air come from it as it breathes. 
 
@@ -7502,13 +11643,22 @@ O:50:50:0:0
 B:CLAW:HURT:2d4
 B:CLAW:HURT:2d4
 B:BITE:HURT:2d6
-F:FORCE_SLEEP | FORCE_MAXHP | WILD_TOO | WILD_MOUNTAIN | WILD_SWAMP |
-F:DROP_2D2 | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | CAN_FLY |
-F:EVIL | DRAGON | IM_POIS | BASEANGBAND | ATTR_MULTI
-S:1_IN_10 | 
-S:SCARE | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_POIS
+F:OPEN_DOOR
+F:WILD_MOUNTAIN
+F:WILD_TOO
+S:1_IN_10
 S:BR_POIS
+S:SCARE
 D:It has a form that legends are made of. Its still-tender scales are a 
 D:deep green in hue. Foul gas seeps through its scales. 
 
@@ -7521,13 +11671,22 @@ O:50:50:0:0
 B:CLAW:HURT:2d4
 B:CLAW:HURT:2d4
 B:BITE:HURT:2d6
-F:FORCE_SLEEP | FORCE_MAXHP | WILD_TOO | WILD_MOUNTAIN | 
-F:DROP_2D2 | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | CAN_FLY |
-F:EVIL | DRAGON | NO_CONF | BASEANGBAND | ATTR_MULTI
-S:1_IN_10 | 
-S:SCARE | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:NO_CONF
+F:OPEN_DOOR
+F:WILD_MOUNTAIN
+F:WILD_TOO
+S:1_IN_10
 S:BR_CONF
+S:SCARE
 D:It has a form that legends are made of. Its still-tender scales are a 
 D:rich bronze hue, and its shape masks its true form. 
 
@@ -7543,13 +11702,24 @@ B:HIT:HURT:3d8
 B:HIT:HURT:3d8
 B:HIT:HURT:3d5
 B:HIT:HURT:3d5
-F:UNIQUE | MALE | CAN_SPEAK |
-F:FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE |
-F:ESCORT |
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD |
-F:OPEN_DOOR | BASH_DOOR |
-F:EVIL | IM_FIRE | IM_COLD | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE | 
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNIQUE
 D:A member of a band of outlaws, he was spared his life when 
 D:Neithan (that is, Turin) killed Forweg, the previous leader. 
 
@@ -7563,10 +11733,21 @@ B:HIT:HURT:3d8
 B:HIT:HURT:3d8
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
-F:ONLY_GOLD | DROP_2D2 | 
-F:EMPTY_MIND | COLD_BLOOD | BASH_DOOR | REFLECTING | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_2D2
+F:EMPTY_MIND
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_GOLD
+F:REFLECTING
 D:It is a massive statue of pure mithril. It looks expensive. 
 
 N:465:Skeleton troll
@@ -7578,10 +11759,19 @@ O:0:0:0:0
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
 B:BITE:HURT:3d4
-F:EMPTY_MIND | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | TROLL | UNDEAD | 
-F:IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:TROLL
+F:UNDEAD
 D:It is a troll skeleton animated by dark magic. 
 
 # New monster added for the Theme module
@@ -7597,14 +11787,28 @@ B:HIT:HURT:1d7
 B:HIT:HURT:1d7
 B:TOUCH:EAT_GOLD
 B:INSULT:*
-F:UNIQUE | MALE | CAN_SPEAK |
-F:FORCE_SLEEP | FORCE_MAXHP |
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | DROP_GREAT |
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_SKELETON |
-F:EVIL | RES_TELE |
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_5 |
-S:HEAL | SLOW | TRAPS | BO_COLD | BA_POIS
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_GOOD
+F:DROP_GREAT
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:TAKE_ITEM
+F:UNIQUE
+S:1_IN_5
+S:BA_POIS
+S:BO_COLD
+S:HEAL
+S:SLOW
 D:He's a trustworthy man... or is he? Morgoth seem's sending spies in 
 D:disguise, and perhaps this is one of them.
 
@@ -7618,11 +11822,25 @@ B:CLAW:HURT:2d10
 B:CLAW:HURT:2d10
 B:BITE:HURT:4d8
 B:CRUSH:HURT:3d6
-F:UNIQUE | MALE | FORCE_MAXHP | FORCE_SLEEP | 
-F:BASH_DOOR | ANIMAL | MOVE_BODY | SMART | PET | CAN_SPEAK | 
-F:WILD_TOO | WILD_WOOD | WILD_MOUNTAIN | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | BASEANGBAND
-S:1_IN_6 | S_ANIMAL
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:MALE
+F:MOVE_BODY
+F:ONLY_ITEM
+F:PET
+F:SMART
+F:UNIQUE
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
+S:1_IN_6
+S:S_ANIMAL
 D:Beorn is only occasionally seen in human form these days, preferring to 
 D:appear in the shape of a giant black bear:  he also prefers the company of 
 D:beasts to that of humans.  He has never taken kindly to strangers, even in 
@@ -7637,9 +11855,17 @@ O:0:0:0:0
 B:CLAW:HURT:16d2
 B:CLAW:HURT:16d2
 B:BITE:HURT:4d10
-F:CAN_FLY | UNIQUE | FORCE_MAXHP | DROP_CORPSE | CAN_SPEAK |
-F:WILD_ONLY | WILD_MOUNTAIN | WILD_VOLCANO | PET | 
-F:ANIMAL | GOOD | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:CAN_SPEAK
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:GOOD
+F:PET
+F:UNIQUE
+F:WILD_MOUNTAIN
+F:WILD_ONLY
+F:WILD_VOLCANO
 D:Among the mightiest of birds, Thorondor is the messenger of the Valar, and 
 D:brings news of Middle-earth to Valinor itself.  Nothing that can be seen 
 D:from the airs of the world is hidden from him. 
@@ -7651,10 +11877,14 @@ W:30:2:600:80
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:ELEC:5d5
-F:RAND_25 | WILD_TOO | DROP_SKELETON
-F:WEIRD_MIND | BASH_DOOR | 
-F:ANIMAL | IM_ELEC
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:IM_ELEC
+F:MORTAL
+F:RAND_25
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is a giant ant that crackles with energy. 
 
 N:470:Grave wight
@@ -7666,13 +11896,26 @@ O:0:50:50:0
 B:HIT:HURT:1d7
 B:HIT:HURT:1d7
 B:TOUCH:EXP_20
-F:FORCE_SLEEP | RAND_25 |
-F:ONLY_ITEM | DROP_1D2 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | CAN_FLY |
-F:IM_COLD | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_8 | 
-S:SCARE | CAUSE_3 | DARKNESS
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_1D2
+F:EVIL
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RAND_25
+F:UNDEAD
+S:1_IN_8
+S:CAUSE_3
+S:DARKNESS
+S:SCARE
 D:It is a ghostly form with eyes that haunt you. It appeared when a 
 D:humanoid creature died a violent death in a graveyard. It remembers 
 D:its past life and seeks revenge. 
@@ -7686,12 +11929,27 @@ O:50:50:0:0
 B:CLAW:HURT:2d4
 B:CLAW:HURT:2d4
 B:BITE:EXP_10:3d6
-F:FORCE_SLEEP | FORCE_MAXHP | PASS_WALL | 
-F:ONLY_ITEM | DROP_3D2 | CAN_FLY | DROP_CORPSE | 
-F:INVISIBLE | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DRAGON | NO_CONF | NO_SLEEP | BASEANGBAND | ATTR_MULTI
-S:1_IN_6 | 
-S:BR_NETH | SLOW | CONF | SCARE | DARKNESS
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:INVISIBLE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:PASS_WALL
+S:1_IN_6
+S:BR_NETH
+S:CONF
+S:DARKNESS
+S:SCARE
+S:SLOW
 D:It is a dragon-like form wrapped in shadow.  Glowing red eyes shine out in 
 D:the dark, and it is surrounded by an aura of unearthly cold that chills 
 D:the soul rather than the body. 
@@ -7706,10 +11964,16 @@ B:HIT:HURT:3d4
 B:HIT:HURT:3d4
 B:HIT:HURT:3d4
 B:HIT:HURT:3d4
-F:FORCE_SLEEP | FORCE_MAXHP |
-F:BASH_DOOR | CAN_FLY | WILD_TOO | WILD_WOOD | DROP_CORPSE | 
-F:EVIL | MORTAL | BASEANGBAND
-S:1_IN_5 | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:MORTAL
+F:WILD_TOO
+F:WILD_WOOD
+S:1_IN_5
 S:ARROW_4
 D:It is a winged lion's body with a human torso and a tail covered in 
 D:vicious spikes. 
@@ -7721,10 +11985,14 @@ W:30:3:600:90
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:2d12
-F:RAND_25 | KILL_BODY | FRIENDS | DROP_SKELETON
-F:WEIRD_MIND | BASH_DOOR | 
 F:ANIMAL
-F:MORTAL | BASEANGBAND
+F:BASH_DOOR
+F:DROP_SKELETON
+F:FRIENDS
+F:KILL_BODY
+F:MORTAL
+F:RAND_25
+F:WEIRD_MIND
 D:An armoured form moving with purpose. Powerful on its own, flee when 
 D:hordes of them march. 
 
@@ -7736,8 +12004,14 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:5d8
 B:BITE:HURT:5d8
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | WILD_GRASS | DROP_CORPSE
-F:ANIMAL | CAN_FLY | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:MORTAL
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_TOO
 D:It is a beetle with deadly sharp cutting mandibles and a rock-hard 
 D:carapace. 
 
@@ -7751,10 +12025,17 @@ B:BUTT:HURT:3d9
 B:BUTT:HURT:3d9
 B:BITE:POISON:1d10
 B:KICK:HURT:2d4
-F:FORCE_SLEEP | ANIMAL | MOVE_BODY | WILD_TOO | WILD_WOOD |
-F:BASH_DOOR | IM_POIS | IM_ACID | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND
-S:1_IN_8 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_POIS
+F:MORTAL
+F:MOVE_BODY
+F:WILD_TOO
+F:WILD_WOOD
+S:1_IN_8
 S:BR_POIS
 D:A bull-like creature whose skin is made of steel plates. 
 
@@ -7769,17 +12050,48 @@ E:1:1:1:2:1:1
 O:0:0:100:0
 B:HIT:HURT:6d4
 B:HIT:HURT:6d4
-F:UNIQUE | MALE | CAN_SPEAK | PET | DROP_CORPSE |
-F:FORCE_SLEEP | FORCE_MAXHP | REFLECTING | RES_TELE | CAN_FLY |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD |
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:GOOD | IM_COLD | IM_FIRE |
-F:IM_ELEC | IM_POIS | RES_WATE | BASEANGBAND | HAS_LITE
-S:1_IN_6 | 
-S:HEAL | HASTE | BLINK | TPORT | BLIND | CONF | SCARE | 
-S:CAUSE_2 | FORGET | TRAPS | 
-S:BA_ELEC | BA_COLD | BA_WATE | BO_WATE | BO_ICEE | BO_ELEC |
-S:S_ANIMAL |
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:PET
+F:REFLECTING
+F:RES_TELE
+F:RES_WATE
+F:SMART
+F:UNIQUE
+S:1_IN_6
+S:BA_COLD
+S:BA_ELEC
+S:BA_WATE
+S:BLIND
+S:BLINK
+S:BO_ELEC
+S:BO_ICEE
+S:BO_WATE
+S:CAUSE_2
+S:CONF
+S:FORGET
+S:HASTE
+S:HEAL
+S:SCARE
+S:S_ANIMAL
+S:TPORT
 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 
@@ -7795,12 +12107,26 @@ B:WAIL:TERRIFY
 B:TOUCH:EXP_20
 B:CLAW:LOSE_INT:1d6
 B:CLAW:LOSE_WIS:1d6
-F:FORCE_SLEEP | RAND_25 | DROP_60 | DROP_1D2 | 
-F:INVISIBLE | COLD_BLOOD | TAKE_ITEM | PASS_WALL | 
-F:EVIL | UNDEAD | IM_COLD | CAN_FLY |
-F:IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_15 | 
-S:BLIND | HOLD | DRAIN_MANA
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_60
+F:EVIL
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
+F:RAND_25
+F:TAKE_ITEM
+F:UNDEAD
+S:1_IN_15
+S:BLIND
+S:DRAIN_MANA
+S:HOLD
 D:An apparition from beyond. It does not seem friendly. 
 
 N:478:Death watch beetle
@@ -7811,8 +12137,13 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:5d4
 B:WAIL:TERRIFY:5d6
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | DROP_CORPSE | 
-F:ANIMAL | CAN_FLY | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:MORTAL
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is a giant beetle that produces a chilling sound. 
 
 N:479:Mountain ogre
@@ -7823,10 +12154,15 @@ E:1:1:1:2:1:1
 O:20:70:0:10
 B:HIT:HURT:5d8
 B:HIT:HURT:5d8
-F:FRIENDS | DROP_60 | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | GIANT | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FRIENDS
+F:GIANT
+F:HAS_LITE
+F:MORTAL
+F:OPEN_DOOR
 D:The largest breed of ogre, he is awesomely strong and awesomely ugly. 
 
 N:480:Nexus quylthulg
@@ -7835,11 +12171,20 @@ I:110:10d12:10:1:0
 W:32:1:3000:300
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:FORCE_SLEEP | NEVER_MOVE | NEVER_BLOW | 
-F:INVISIBLE | EMPTY_MIND | RES_NEXU | ANIMAL | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | RES_TELE | BASEANGBAND
-S:1_IN_1 | 
-S:BLINK | TELE_AWAY
+F:ANIMAL
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:INVISIBLE
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:RES_NEXU
+F:RES_TELE
+S:1_IN_1
+S:BLINK
+S:TELE_AWAY
 D:It is a very unstable, strange pulsing mound of flesh. 
 
 N:481:Shelob, Spider of Darkness
@@ -7852,15 +12197,38 @@ B:CLAW:POISON:5d6
 B:CLAW:POISON:5d6
 B:BITE:PARALYZE:5d10
 B:STING:LOSE_STR:5d4
-F:UNIQUE | FEMALE |
-F:FORCE_SLEEP | FORCE_MAXHP | SPECIAL_GENE | 
-F:ESCORT | ESCORTS | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_GOOD | DROP_RANDART
-F:SMART | BASH_DOOR | IM_POIS | IM_ACID | 
-F:ANIMAL | SPIDER | EVIL | HURT_LITE | NO_SLEEP | BASEANGBAND
-S:1_IN_4 | 
-S:HEAL | BLIND | SLOW | CONF | SCARE | CAUSE_3 | CAUSE_4 | 
-S:TRAPS | BR_DARK | BR_POIS | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_RANDART
+F:ESCORT
+F:ESCORTS
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_ACID
+F:IM_POIS
+F:NO_SLEEP
+F:ONLY_ITEM
+F:SMART
+F:SPECIAL_GENE
+F:SPIDER
+F:UNIQUE
+S:1_IN_4
+S:BLIND
+S:BR_DARK
+S:BR_POIS
+S:CAUSE_3
+S:CAUSE_4
+S:CONF
+S:HEAL
+S:SCARE
+S:SLOW
 S:S_SPIDER
 D:Shelob is an enormous bloated spider, the last daughter of Ungoliant the 
 D:Unlight.  She normally guards the pass through Cirith Ungol, but 
@@ -7875,10 +12243,20 @@ O:0:0:0:0
 B:CRUSH:HURT:8d4
 B:CRUSH:HURT:8d4
 B:CRUSH:HURT:8d4
-F:IM_ACID | RES_WATE | AQUATIC | ANIMAL | IM_COLD | MOVE_BODY
-F:FORCE_MAXHP | WILD_TOO | WILD_OCEAN | BASEANGBAND | COLD_BLOOD
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:FORCE_MAXHP
+F:IM_ACID
+F:IM_COLD
+F:MOVE_BODY
+F:RES_WATE
+F:WILD_OCEAN
+F:WILD_TOO
 S:1_IN_8
-S:BR_ELEC | BR_ACID | BR_POIS
+S:BR_ACID
+S:BR_ELEC
+S:BR_POIS
 D:Besides being capable of dragging whole ships underwater, 
 D:this creature can also reach you from a distance. 
 
@@ -7892,12 +12270,29 @@ B:CLAW:LOSE_STR:3d4
 B:CLAW:DISEASE:3d4
 B:CLAW:DISEASE:3d4
 B:BITE:PARALYZE:3d5
-F:DROP_60 | OPEN_DOOR | BASH_DOOR | CAN_SWIM |
-F:DROP_1D2 | FORCE_MAXHP | ESCORT | FORCE_SLEEP |
-F:EVIL | UNDEAD | IM_POIS | IM_COLD | NO_CONF | NO_SLEEP | 
-F:COLD_BLOOD | HURT_LITE | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_60
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:UNDEAD
 S:1_IN_7
-S:SCARE | HOLD | DARKNESS | SCARE | S_UNDEAD | ANIM_DEAD
+S:DARKNESS
+S:HOLD
+S:SCARE
+S:SCARE
+S:S_UNDEAD
 D:Flesh is falling off in chunks from this decaying abomination. 
 
 N:484:Doombat
@@ -7909,9 +12304,15 @@ O:0:0:0:0
 B:BITE:FIRE:5d4
 B:BITE:FIRE:5d4
 B:BITE:FIRE:5d4
-F:WEIRD_MIND | BASH_DOOR | AURA_FIRE | CAN_FLY | DROP_CORPSE | 
-F:IM_FIRE | AI_ANNOY | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:AI_ANNOY
+F:ANIMAL
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:IM_FIRE
+F:MORTAL
+F:WEIRD_MIND
 D:It is a fast moving creature of chaos, a gigantic black bat 
 D:surrounded by flickering bright red flames. 
 
@@ -7924,11 +12325,18 @@ O:0:100:0:0
 B:HIT:POISON:3d4
 B:HIT:LOSE_STR:3d4
 B:HIT:LOSE_STR:3d4
-F:MALE | 
-F:DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | NO_CONF | NO_SLEEP | FRIENDS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:OPEN_DOOR
 D:One of the Swarthy Men, allied with the Dark since time 
 D:immemorable.
 
@@ -7940,11 +12348,16 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:CONFUSE:1d4
 B:HIT:CONFUSE:1d4
-F:FORCE_SLEEP | NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | 
-F:MORTAL | BASEANGBAND | NO_CUT
-S:1_IN_6 | 
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:MORTAL
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+S:1_IN_6
 S:FORGET
 D:A mass of vegetation. You don't remember seeing anything like it 
 D:before. 
@@ -7957,11 +12370,30 @@ E:1:1:1:2:1:1
 O:10:90:0:0
 B:HIT:ELEC:10d8
 B:HIT:ELEC:10d8
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_1D2 | WILD_TOO | WILD_MOUNTAIN |
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | AURA_ELEC | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | GIANT | IM_COLD | IM_ELEC | MALE | BASEANGBAND | HAS_LITE
-S:1_IN_8 | 
-S:BLINK | TELE_TO | CONF | SCARE | BO_ELEC | BA_ELEC
+F:AURA_ELEC
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GIANT
+F:HAS_LITE
+F:IM_COLD
+F:IM_ELEC
+F:MALE
+F:OPEN_DOOR
+F:TAKE_ITEM
+F:WILD_MOUNTAIN
+F:WILD_TOO
+S:1_IN_8
+S:BA_ELEC
+S:BLINK
+S:BO_ELEC
+S:CONF
+S:SCARE
+S:TELE_TO
 D:It is a twenty-five-foot tall giant wreathed in lightning. 
 
 N:488:Spectator
@@ -7973,12 +12405,21 @@ O:0:0:0:0
 B:GAZE:PARALYZE:1d4
 B:GAZE:CONFUSE:1d4
 B:BITE:HURT:1d8
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:STUPID | EMPTY_MIND | CAN_FLY | DROP_CORPSE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | 
-F:MORTAL | BASEANGBAND
-S:1_IN_6 | 
-S:FORGET | CAUSE_2 | HOLD | SLOW
+F:CAN_FLY
+F:DROP_CORPSE
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:MORTAL
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+S:1_IN_6
+S:CAUSE_2
+S:FORGET
+S:HOLD
+S:SLOW
 D:A lesser relative of the beholder:  a globular body with a large toothy mouth, 
 D:a large central eye, and four smaller eyes on stalks protruding from the top 
 D:of its body. 
@@ -7994,13 +12435,38 @@ B:CLAW:HURT:2d10
 B:CLAW:HURT:2d10
 B:BITE:HURT:4d8
 B:CRUSH:HURT:3d6
-F:JOKEANGBAND | WILD_TOO | WILD_GRASS | WILD_WOOD | WILD_SHORE | 
-F:UNIQUE | MALE | FORCE_MAXHP | HAS_LITE | CAN_SPEAK | 
-F:ANIMAL | MOVE_BODY | GOOD | SMART | BASH_DOOR | ONLY_ITEM | 
-F:DROP_2D2 | DROP_GOOD | DROP_GREAT | FORCE_SLEEP | NO_CUT | 
-F:NO_SLEEP | IM_ACID | IM_ELEC | IM_COLD | SUSCEP_POIS | IM_FIRE | 
-S:1_IN_5 | 
-S:BLINK | TELE_TO | TELE_AWAY | TPORT
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_GOOD
+F:DROP_GREAT
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:JOKEANGBAND
+F:MALE
+F:MOVE_BODY
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:SMART
+F:SUSCEP_POIS
+F:UNIQUE
+F:WILD_GRASS
+F:WILD_SHORE
+F:WILD_TOO
+F:WILD_WOOD
+S:1_IN_5
+S:BLINK
+S:TELE_AWAY
+S:TELE_TO
+S:TPORT
 D:He is a descendant of Beorn to the 3.79th degree (his mother was 
 D:Swedish, hence his name). He has blue eyes, bleached blond hair, 
 D:and a tanned complexion.  He signed up at the Adventurer's Guild 
@@ -8014,17 +12480,58 @@ I:200:440d100:255:1000:0
 W:0:50:0:0
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:BASEANGBAND | WILD_ONLY | FORCE_DEPTH | WILD_TOWN | 
-F:WILD_GRASS | WILD_MOUNTAIN | WILD_WOOD | WILD_SHORE | 
-F:UNIQUE | FEMALE | FORCE_MAXHP | HAS_LITE | POWERFUL | 
-F:NO_THEFT | CAN_FLY | NO_CUT | DEATH_ORB | CAN_SPEAK | 
-F:WYRM_PROTECT | DG_CURSE | GOOD | SMART | NEUTRAL | NO_TARGET | NEVER_MOVE | 
-F:RES_NETH | NEVER_BLOW | REFLECTING | WEIRD_MIND | NO_DEATH | 
-F:REGENERATE | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:RES_TELE | RES_WATE | RES_PLAS | RES_NEXU | RES_DISE |
-F:NO_FEAR | NO_STUN | NO_CONF | NO_SLEEP | CAN_SWIM | AQUATIC | 
+F:AQUATIC
+F:CAN_FLY
+F:CAN_SPEAK
+F:CAN_SWIM
+F:DEATH_ORB
+F:DG_CURSE
+F:FEMALE
+F:FORCE_DEPTH
+F:FORCE_MAXHP
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NEUTRAL
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_DEATH
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:NO_TARGET
+F:NO_THEFT
+F:POWERFUL
+F:REFLECTING
+F:REGENERATE
+F:RES_DISE
+F:RES_NETH
+F:RES_NEXU
+F:RES_PLAS
+F:RES_TELE
+F:RES_WATE
+F:SMART
+F:UNIQUE
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_MOUNTAIN
+F:WILD_ONLY
+F:WILD_SHORE
+F:WILD_TOWN
+F:WILD_WOOD
+F:WYRM_PROTECT
 S:1_IN_1
-S:HAND_DOOM | BR_MANA | HAND_DOOM | BR_MANA | HAND_DOOM 
+S:BR_MANA
+S:BR_MANA
+S:HAND_DOOM
+S:HAND_DOOM
+S:HAND_DOOM
 D:A Queen of the Valar, the spouse of Mandos, who weaves the 
 D:tales of the history of Arda.
 
@@ -8038,11 +12545,18 @@ B:CLAW:HURT:1d5
 B:CLAW:HURT:1d5
 B:BITE:HURT:2d6
 B:BITE:HURT:2d6
-F:MALE | 
-F:FRIENDS | 
-F:ONLY_ITEM | DROP_90 | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | REGENERATE | 
-F:EVIL | TROLL | IM_POIS | BASEANGBAND
+F:BASH_DOOR
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:IM_POIS
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:TROLL
 D:An unwholesome breed between a human and a troll. It is 
 D:somewhat smarter than regular trolls. 
 
@@ -8053,17 +12567,58 @@ I:200:440d100:255:1000:0
 W:0:50:0:0
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:BASEANGBAND | WILD_ONLY | FORCE_DEPTH | WILD_TOWN | 
-F:WILD_GRASS | WILD_MOUNTAIN | WILD_WOOD | WILD_SHORE |  
-F:UNIQUE | MALE | FORCE_MAXHP | HAS_LITE | POWERFUL | 
-F:NO_THEFT | CAN_FLY | NO_CUT | DEATH_ORB | CAN_SPEAK | 
-F:WYRM_PROTECT | DG_CURSE | GOOD | SMART | NEUTRAL | NO_TARGET | NEVER_MOVE | 
-F:RES_NETH | NEVER_BLOW | REFLECTING | WEIRD_MIND | NO_DEATH | 
-F:REGENERATE | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:RES_TELE | RES_WATE | RES_PLAS | RES_NEXU | RES_DISE |
-F:NO_FEAR | NO_STUN | NO_CONF | NO_SLEEP | CAN_SWIM | AQUATIC | 
+F:AQUATIC
+F:CAN_FLY
+F:CAN_SPEAK
+F:CAN_SWIM
+F:DEATH_ORB
+F:DG_CURSE
+F:FORCE_DEPTH
+F:FORCE_MAXHP
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:NEUTRAL
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_DEATH
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:NO_TARGET
+F:NO_THEFT
+F:POWERFUL
+F:REFLECTING
+F:REGENERATE
+F:RES_DISE
+F:RES_NETH
+F:RES_NEXU
+F:RES_PLAS
+F:RES_TELE
+F:RES_WATE
+F:SMART
+F:UNIQUE
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_MOUNTAIN
+F:WILD_ONLY
+F:WILD_SHORE
+F:WILD_TOWN
+F:WILD_WOOD
+F:WYRM_PROTECT
 S:1_IN_1
-S:HAND_DOOM | BR_MANA | HAND_DOOM | BR_MANA | HAND_DOOM 
+S:BR_MANA
+S:BR_MANA
+S:HAND_DOOM
+S:HAND_DOOM
+S:HAND_DOOM
 D:A Vala more commonly called Lorien, from the gardens of 
 D:Lorien in Valinor.
 
@@ -8077,12 +12632,30 @@ O:0:100:0:0
 B:HIT:HURT:6d6
 B:HIT:HURT:6d6
 B:BITE:HURT:3d10
-F:UNIQUE | MALE | 
-F:FORCE_MAXHP | 
-F:ESCORT | SPECIAL_GENE | MOVE_BODY | REGENERATE | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | WILD_TOO | WILD_WOOD |
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | TROLL | IM_COLD | IM_POIS | HURT_LITE | HURT_ROCK | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:HURT_LITE
+F:HURT_ROCK
+F:IM_COLD
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:NO_CUT
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:SPECIAL_GENE
+F:TAKE_ITEM
+F:TROLL
+F:UNIQUE
+F:WILD_TOO
+F:WILD_WOOD
 D:Big, brawny, powerful and with a taste for hobbit. He has friends called 
 D:Bill and Tom. 
 
@@ -8095,12 +12668,30 @@ O:0:100:0:0
 B:HIT:HURT:6d6
 B:HIT:HURT:6d6
 B:BITE:HURT:3d10
-F:UNIQUE | MALE | 
-F:FORCE_MAXHP | 
-F:ESCORT | SPECIAL_GENE | MOVE_BODY | REGENERATE | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | WILD_TOO | WILD_WOOD |
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE
-F:EVIL | TROLL | IM_COLD | IM_POIS | HURT_LITE | HURT_ROCK | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:HURT_LITE
+F:HURT_ROCK
+F:IM_COLD
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:NO_CUT
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:SPECIAL_GENE
+F:TAKE_ITEM
+F:TROLL
+F:UNIQUE
+F:WILD_TOO
+F:WILD_WOOD
 D:Big, brawny, powerful and with a taste for hobbit. He has friends called 
 D:Bert and Tom. 
 
@@ -8113,12 +12704,30 @@ O:0:100:0:0
 B:HIT:HURT:6d6
 B:HIT:HURT:6d6
 B:BITE:HURT:3d10
-F:UNIQUE | MALE | 
-F:FORCE_MAXHP | 
-F:ESCORT | SPECIAL_GENE | MOVE_BODY | REGENERATE | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | WILD_TOO | WILD_WOOD |
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | TROLL | IM_COLD | IM_POIS | HURT_LITE | HURT_ROCK | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:HURT_LITE
+F:HURT_ROCK
+F:IM_COLD
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:NO_CUT
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:SPECIAL_GENE
+F:TAKE_ITEM
+F:TROLL
+F:UNIQUE
+F:WILD_TOO
+F:WILD_WOOD
 D:Big, brawny, powerful and with a taste for hobbit. He has friends called 
 D:Bert and Bill. 
 
@@ -8132,10 +12741,19 @@ B:HIT:HURT:3d5
 B:HIT:HURT:3d5
 B:BITE:HURT:1d8
 B:BITE:HURT:1d8
-F:MALE | 
-F:FRIENDS | DROP_60 | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | SUSCEP_FIRE | REGENERATE | 
-F:EVIL | TROLL | IM_POIS | HURT_LITE | BASEANGBAND
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FRIENDS
+F:HURT_LITE
+F:IM_POIS
+F:MALE
+F:OPEN_DOOR
+F:REGENERATE
+F:SUSCEP_FIRE
+F:TROLL
 D:Trolls were created by Morgoth in mockery of the Ents. 
 D:He is a vicious monster, feared for his ferocity. 
 
@@ -8146,17 +12764,58 @@ I:200:440d100:255:1000:0
 W:0:50:0:0
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:BASEANGBAND | WILD_ONLY | FORCE_DEPTH | WILD_TOWN | 
-F:WILD_GRASS | WILD_MOUNTAIN | WILD_WOOD | WILD_SHORE | 
-F:UNIQUE | FEMALE | FORCE_MAXHP | HAS_LITE | POWERFUL | 
-F:NO_THEFT | CAN_FLY | NO_CUT | DEATH_ORB | CAN_SPEAK | 
-F:WYRM_PROTECT | DG_CURSE | GOOD | SMART | NEUTRAL | NO_TARGET | NEVER_MOVE | 
-F:RES_NETH | NEVER_BLOW | REFLECTING | WEIRD_MIND | NO_DEATH | 
-F:REGENERATE | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:RES_TELE | RES_WATE | RES_PLAS | RES_NEXU | RES_DISE |
-F:NO_FEAR | NO_STUN | NO_CONF | NO_SLEEP | CAN_SWIM | AQUATIC | 
+F:AQUATIC
+F:CAN_FLY
+F:CAN_SPEAK
+F:CAN_SWIM
+F:DEATH_ORB
+F:DG_CURSE
+F:FEMALE
+F:FORCE_DEPTH
+F:FORCE_MAXHP
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NEUTRAL
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_DEATH
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:NO_TARGET
+F:NO_THEFT
+F:POWERFUL
+F:REFLECTING
+F:REGENERATE
+F:RES_DISE
+F:RES_NETH
+F:RES_NEXU
+F:RES_PLAS
+F:RES_TELE
+F:RES_WATE
+F:SMART
+F:UNIQUE
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_MOUNTAIN
+F:WILD_ONLY
+F:WILD_SHORE
+F:WILD_TOWN
+F:WILD_WOOD
+F:WYRM_PROTECT
 S:1_IN_1
-S:HAND_DOOM | BR_MANA | HAND_DOOM | BR_MANA | HAND_DOOM 
+S:BR_MANA
+S:BR_MANA
+S:HAND_DOOM
+S:HAND_DOOM
+S:HAND_DOOM
 D:A lady of the Valar, the spouse of Irmo.
 
 # New monster added by furiosity for the Theme module
@@ -8166,8 +12825,8 @@ D:A lady of the Valar, the spouse of Irmo.
 #W:0:50:0:0
 #E:0:0:0:0:0:0
 #O:0:0:0:0
-#F:BASEANGBAND | WILD_ONLY | FORCE_DEPTH | WILD_TOWN | 
-#F:WILD_GRASS | WILD_MOUNTAIN | WILD_WOOD | WILD_SHORE | 
+#F:WILD_ONLY | FORCE_DEPTH | WILD_TOWN |
+#F:WILD_GRASS | WILD_MOUNTAIN | WILD_WOOD | WILD_SHORE |
 #F:UNIQUE | FEMALE | FORCE_MAXHP | HAS_LITE | POWERFUL | 
 #F:NO_THEFT | CAN_FLY | NO_CUT | DEATH_ORB | CAN_SPEAK | 
 #F:WYRM_PROTECT | DG_CURSE | GOOD | SMART | NEUTRAL | NO_TARGET | NEVER_MOVE | 
@@ -8194,12 +12853,26 @@ O:0:50:50:0
 B:HIT:HURT:1d8
 B:HIT:HURT:1d8
 B:TOUCH:EXP_40
-F:FORCE_SLEEP | FRIENDS | DROP_60 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | CAN_FLY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_8 | 
-S:HOLD | SCARE | CAUSE_2 | DARKNESS
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_60
+F:EVIL
+F:FORCE_SLEEP
+F:FRIENDS
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:UNDEAD
+S:1_IN_8
+S:CAUSE_2
+S:DARKNESS
+S:HOLD
+S:SCARE
 D:An evil spirit sent to dwell in the Barrow-downs by the Witch-king
 D:of Angmar during his wars with Arnor. 
 
@@ -8213,11 +12886,20 @@ B:HIT:HURT:1d9
 B:HIT:HURT:1d9
 B:BITE:HURT:1d5
 B:BITE:HURT:1d5
-F:FORCE_MAXHP | 
-F:EMPTY_MIND | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | TROLL | UNDEAD | 
-F:IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:FORCE_MAXHP
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:TROLL
+F:UNDEAD
 D:It is the animated skeleton of a massive two-headed troll. 
 
 N:501:Chaos drake
@@ -8229,15 +12911,29 @@ O:50:50:0:0
 B:CLAW:HURT:2d4
 B:CLAW:HURT:2d4
 B:BITE:HURT:3d6
-F:ATTR_MULTI | ATTR_ANY | CAN_FLY |
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_3D2 | RES_DISE |
-F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | 
-F:EVIL | DRAGON | 
-F:IM_FIRE | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
-S:1_IN_6 | 
-S:SLOW | CONF | SCARE | 
-S:BR_DISE | BR_CHAO
+F:ATTR_ANY
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_DISE
+S:1_IN_6
+S:BR_CHAO
+S:BR_DISE
+S:CONF
+S:SCARE
+S:SLOW
 D:A dragon twisted by the forces of chaos. It seems first ugly, then fair, 
 D:as its form shimmers and changes in front of your eyes. 
 
@@ -8250,14 +12946,28 @@ O:50:50:0:0
 B:CLAW:HURT:2d4
 B:CLAW:HURT:2d4
 B:BITE:HURT:3d6
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_3D2 | CAN_FLY |
-F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | 
-F:DRAGON | EVIL | 
-F:IM_COLD | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE | NO_CUT | ATTR_MULTI
-S:1_IN_6 | 
-S:SLOW | CONF | SCARE | 
-S:BR_SOUN | BR_SHAR
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+S:1_IN_6
+S:BR_SHAR
+S:BR_SOUN
+S:CONF
+S:SCARE
+S:SLOW
 D:This dragon is clever and cunning. You hear strange humming and 
 D:rustling sounds as it approaches. 
 
@@ -8270,15 +12980,32 @@ O:50:50:0:0
 B:CLAW:HURT:2d4
 B:CLAW:HURT:2d4
 B:BITE:HURT:3d6
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_3D2 | RES_DISE |
-F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE
-F:EVIL | DRAGON | CAN_FLY |
-F:IM_FIRE | IM_COLD | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE | NO_CUT
 F:ATTR_MULTI
-S:1_IN_6 | 
-S:SLOW | CONF | SCARE | 
-S:BR_SOUN | BR_SHAR | BR_DISE | BR_CHAO
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:IM_FIRE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_DISE
+S:1_IN_6
+S:BR_CHAO
+S:BR_DISE
+S:BR_SHAR
+S:BR_SOUN
+S:CONF
+S:SCARE
+S:SLOW
 D:A mighty dragon, the balance drake seeks to maintain balance, 
 D:and despises your efforts to upset it. 
 
@@ -8291,13 +13018,25 @@ O:40:50:10:0
 B:CLAW:HURT:2d4
 B:CLAW:HURT:2d4
 B:BITE:HURT:3d6
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_3D2 | CAN_FLY |
-F:INVISIBLE | PASS_WALL |
-F:EVIL | DRAGON | NO_CONF | NO_SLEEP | BASEANGBAND | ATTR_MULTI
-S:1_IN_6 | 
-S:SLOW | CONF | SCARE | 
-S:BR_LITE | BR_DARK | BR_CONF
+F:ATTR_MULTI
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:INVISIBLE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PASS_WALL
+S:1_IN_6
+S:BR_CONF
+S:BR_DARK
+S:BR_LITE
+S:CONF
+S:SCARE
+S:SLOW
 D:A dragon of great power with control over light and dark, the 
 D:ethereal drake's eyes glare with white hatred from the shadows. 
 
@@ -8311,12 +13050,22 @@ B:HIT:HURT:9d1
 B:HIT:HURT:6d5
 B:HIT:HURT:25d1
 B:HIT:HURT:6d5
-F:UNIQUE | MALE | WEIRD_MIND | CAN_SPEAK |
-F:FORCE_MAXHP | WILD_TOO | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD |
-F:DROP_CHOSEN |
-F:OPEN_DOOR | BASH_DOOR | 
-F:IM_COLD | IM_POIS | JOKEANGBAND
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CHOSEN
+F:DROP_CORPSE
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:IM_COLD
+F:IM_POIS
+F:JOKEANGBAND
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNIQUE
+F:WEIRD_MIND
+F:WILD_TOO
 D:He who laughs at Groo's brains will find there is nothing to laugh 
 D:about... erm, nobody laughs at Groo and lives. 
 
@@ -8327,17 +13076,58 @@ I:200:440d100:255:1000:0
 W:0:50:0:0
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:BASEANGBAND | WILD_ONLY | FORCE_DEPTH | WILD_TOWN | 
-F:WILD_GRASS | WILD_MOUNTAIN | WILD_WOOD | WILD_SHORE | 
-F:UNIQUE | FEMALE | FORCE_MAXHP | HAS_LITE | POWERFUL | 
-F:NO_THEFT | CAN_FLY | NO_CUT | DEATH_ORB | CAN_SPEAK | 
-F:WYRM_PROTECT | DG_CURSE | GOOD | SMART | NEUTRAL | NO_TARGET | NEVER_MOVE | 
-F:RES_NETH | NEVER_BLOW | REFLECTING | WEIRD_MIND | NO_DEATH | 
-F:REGENERATE | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:RES_TELE | RES_WATE | RES_PLAS | RES_NEXU | RES_DISE |
-F:NO_FEAR | NO_STUN | NO_CONF | NO_SLEEP | CAN_SWIM | AQUATIC | 
+F:AQUATIC
+F:CAN_FLY
+F:CAN_SPEAK
+F:CAN_SWIM
+F:DEATH_ORB
+F:DG_CURSE
+F:FEMALE
+F:FORCE_DEPTH
+F:FORCE_MAXHP
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NEUTRAL
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_DEATH
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:NO_TARGET
+F:NO_THEFT
+F:POWERFUL
+F:REFLECTING
+F:REGENERATE
+F:RES_DISE
+F:RES_NETH
+F:RES_NEXU
+F:RES_PLAS
+F:RES_TELE
+F:RES_WATE
+F:SMART
+F:UNIQUE
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_MOUNTAIN
+F:WILD_ONLY
+F:WILD_SHORE
+F:WILD_TOWN
+F:WILD_WOOD
+F:WYRM_PROTECT
 S:1_IN_1
-S:HAND_DOOM | BR_MANA | HAND_DOOM | BR_MANA | HAND_DOOM 
+S:BR_MANA
+S:BR_MANA
+S:HAND_DOOM
+S:HAND_DOOM
+S:HAND_DOOM
 D:The spouse of Tulkas and sister to Orome, who delights in dancing 
 D:on the green lawns of Valimar.
 
@@ -8350,13 +13140,28 @@ O:0:0:100:0
 B:WAIL:TERRIFY
 B:TOUCH:EXP_40
 B:CLAW:LOSE_INT:1d10
-F:FORCE_SLEEP | RAND_25 | 
-F:ONLY_ITEM | DROP_90 | DROP_2D2 | 
-F:INVISIBLE | COLD_BLOOD | TAKE_ITEM | PASS_WALL | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | CAN_FLY |
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_15 | 
-S:BLIND | HOLD | DRAIN_MANA | FORGET
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_90
+F:EVIL
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PASS_WALL
+F:RAND_25
+F:TAKE_ITEM
+F:UNDEAD
+S:1_IN_15
+S:BLIND
+S:DRAIN_MANA
+S:FORGET
+S:HOLD
 D:A shadowy form clutches at you from the darkness. A powerful undead with 
 D:a deadly touch. 
 
@@ -8369,13 +13174,27 @@ O:0:0:100:0
 B:WAIL:TERRIFY
 B:TOUCH:EXP_40
 B:CLAW:LOSE_WIS:5d5
-F:FORCE_SLEEP | RAND_25 | 
-F:ONLY_ITEM | DROP_90 | DROP_2D2 | CAN_FLY |
-F:COLD_BLOOD | TAKE_ITEM | PASS_WALL |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_15 | 
-S:BLIND | HOLD | DRAIN_MANA | FORGET
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_90
+F:EVIL
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PASS_WALL
+F:RAND_25
+F:TAKE_ITEM
+F:UNDEAD
+S:1_IN_15
+S:BLIND
+S:DRAIN_MANA
+S:FORGET
+S:HOLD
 D:A phantasmal shrieking spirit. Its wail drives the intense cold of pure 
 D:evil deep within your body. 
 
@@ -8389,11 +13208,23 @@ B:HIT:HURT:1d9
 B:HIT:HURT:1d9
 B:HIT:HURT:2d2
 B:HIT:HURT:2d2
-F:MALE | WILD_TOO | WILD_SHORE | WILD_SWAMP |
-F:FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE | 
-F:FRIENDS | DROP_60 | REGENERATE | 
-F:OPEN_DOOR | BASH_DOOR | CAN_SWIM |
-F:EVIL | TROLL | IM_COLD | IM_POIS | HURT_LITE | BASEANGBAND
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FRIENDS
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:MALE
+F:OPEN_DOOR
+F:REGENERATE
+F:TROLL
+F:WILD_SHORE
+F:WILD_TOO
 D:Trolls are said to have been created by Melkor in mockery of 
 D:the Ents. He reeks of brackish water and mud. 
 
@@ -8405,12 +13236,27 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:FIRE:4d6
 B:HIT:FIRE:4d6
-F:FORCE_SLEEP | RAND_25 | 
-F:EMPTY_MIND | CAN_FLY | WILD_TOO | WILD_VOLCANO | 
-F:KILL_ITEM | KILL_BODY | BASH_DOOR | POWERFUL | AURA_FIRE |
-F:IM_FIRE | IM_POIS | IM_ELEC | IM_ACID | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | HAS_LITE | NO_CUT
-S:1_IN_6 | 
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:KILL_ITEM
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_25
+F:WILD_TOO
+F:WILD_VOLCANO
+S:1_IN_6
 S:BO_FIRE
 D:It is a towering inferno of flames. 
 
@@ -8421,8 +13267,8 @@ D:It is a towering inferno of flames.
 #W:0:50:0:0
 #E:0:0:0:0:0:0
 #O:0:0:0:0
-#F:BASEANGBAND | WILD_ONLY | FORCE_DEPTH | WILD_TOWN | 
-#F:WILD_GRASS | WILD_MOUNTAIN | WILD_WOOD | WILD_SHORE | 
+#F:WILD_ONLY | FORCE_DEPTH | WILD_TOWN |
+#F:WILD_GRASS | WILD_MOUNTAIN | WILD_WOOD | WILD_SHORE |
 #F:UNIQUE | MALE | FORCE_MAXHP | HAS_LITE | POWERFUL | 
 #F:NO_THEFT | CAN_FLY | NO_CUT | DEATH_ORB | CAN_SPEAK | 
 #F:WYRM_PROTECT | DG_CURSE | GOOD | SMART | NEUTRAL | NO_TARGET | NEVER_MOVE | 
@@ -8445,12 +13291,24 @@ O:0:0:0:0
 B:HIT:HURT:1d10
 B:HIT:HURT:1d10
 B:HIT:HURT:1d10
-F:FORCE_SLEEP | RAND_25 | 
-F:EMPTY_MIND | COLD_BLOOD | CAN_FLY |
-F:KILL_BODY | KILL_ITEM | BASH_DOOR | POWERFUL | 
-F:IM_POIS | IM_ACID | IM_FIRE | IM_COLD | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_6 | 
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:KILL_ITEM
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_25
+S:1_IN_6
 S:BO_COLD
 D:It is a towering tempest of water. 
 
@@ -8464,14 +13322,28 @@ B:CLAW:HURT:2d8
 B:CLAW:HURT:2d8
 B:BITE:HURT:4d4
 B:BITE:HURT:4d4
-F:FORCE_SLEEP | 
-F:FRIENDS | 
-F:BASH_DOOR | ATTR_MULTI | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | NO_CONF | NO_SLEEP | 
-F:IM_ELEC | IM_POIS | IM_ACID | IM_FIRE | IM_COLD | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_5 | 
-S:BR_ACID | BR_POIS | BR_COLD | BR_FIRE | BR_ELEC
+F:ANIMAL
+F:ATTR_MULTI
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+S:1_IN_5
+S:BR_ACID
+S:BR_COLD
+S:BR_ELEC
+S:BR_FIRE
+S:BR_POIS
 D:Shimmering in rainbow hues, this hound is beautiful and deadly. 
 
 N:514:Invisible stalker
@@ -8483,13 +13355,22 @@ O:0:0:0:0
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
-F:RAND_50 | 
-F:RES_TELE |
-F:EMPTY_MIND | INVISIBLE | COLD_BLOOD | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | 
-F:EVIL | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING
-F:BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:IM_ELEC
+F:IM_POIS
+F:INVISIBLE
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:POWERFUL
+F:RAND_50
+F:RES_TELE
 D:It is impossible to define its form but its violence is legendary. 
 
 # New monster added by furiosity for the Theme module
@@ -8499,17 +13380,58 @@ I:200:440d100:255:1000:0
 W:0:50:0:0
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:BASEANGBAND | WILD_ONLY | FORCE_DEPTH | WILD_TOWN | 
-F:WILD_GRASS | WILD_MOUNTAIN | WILD_WOOD | WILD_SHORE | 
-F:UNIQUE | FEMALE | FORCE_MAXHP | HAS_LITE | POWERFUL | 
-F:NO_THEFT | CAN_FLY | NO_CUT | DEATH_ORB | CAN_SPEAK | 
-F:WYRM_PROTECT | DG_CURSE | GOOD | SMART | NEUTRAL | NO_TARGET | NEVER_MOVE | 
-F:RES_NETH | NEVER_BLOW | REFLECTING | WEIRD_MIND | NO_DEATH | 
-F:REGENERATE | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:RES_TELE | RES_WATE | RES_PLAS | RES_NEXU | RES_DISE |
-F:NO_FEAR | NO_STUN | NO_CONF | NO_SLEEP | CAN_SWIM | AQUATIC | 
+F:AQUATIC
+F:CAN_FLY
+F:CAN_SPEAK
+F:CAN_SWIM
+F:DEATH_ORB
+F:DG_CURSE
+F:FEMALE
+F:FORCE_DEPTH
+F:FORCE_MAXHP
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NEUTRAL
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_DEATH
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:NO_TARGET
+F:NO_THEFT
+F:POWERFUL
+F:REFLECTING
+F:REGENERATE
+F:RES_DISE
+F:RES_NETH
+F:RES_NEXU
+F:RES_PLAS
+F:RES_TELE
+F:RES_WATE
+F:SMART
+F:UNIQUE
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_MOUNTAIN
+F:WILD_ONLY
+F:WILD_SHORE
+F:WILD_TOWN
+F:WILD_WOOD
+F:WYRM_PROTECT
 S:1_IN_1
-S:HAND_DOOM | BR_MANA | HAND_DOOM | BR_MANA | HAND_DOOM 
+S:BR_MANA
+S:BR_MANA
+S:HAND_DOOM
+S:HAND_DOOM
+S:HAND_DOOM
 D:The sister of Yavanna and spouse of Orome. 
 D:Flowers open and birds sing at her passing. 
 
@@ -8523,12 +13445,20 @@ B:HIT:HURT:2d8
 B:HIT:HURT:3d4
 B:HIT:EAT_GOLD:4d4
 B:HIT:EAT_ITEM:4d5
-F:MALE | 
-F:DROP_90 | DROP_2D2 | DROP_SKELETON | DROP_CORPSE | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:TAKE_ITEM
 S:1_IN_6
-S:TRAPS | ARROW_2 | BLINK
+S:ARROW_2
+S:BLINK
 D:Cool and confident, fast and lithe; protect your possessions quickly! 
 
 N:517:The Watcher in the Water
@@ -8540,11 +13470,35 @@ O:50:50:0:0
 B:CRUSH:ACID:8d8
 B:CRUSH:POISON:8d8
 B:CRUSH:PARALYZE:8d8
-F:UNIQUE | FORCE_SLEEP | FORCE_MAXHP | CAN_SWIM | AQUATIC | ANIMAL | 
-F:IM_ACID | IM_COLD | IM_POIS | RES_WATE | RES_TELE | DROP_CORPSE | 
-F:NO_CONF | NO_FEAR | EVIL | COLD_BLOOD | BASEANGBAND | 
-F:ONLY_ITEM | DROP_GOOD | DROP_4D2 | DROP_1D2 | SPECIAL_GENE | DROP_RANDART
-S:1_IN_5 | BA_WATE | BO_WATE | HOLD | BR_POIS | BO_ICEE | TELE_TO
+F:ANIMAL
+F:AQUATIC
+F:CAN_SWIM
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_RANDART
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_FEAR
+F:ONLY_ITEM
+F:RES_TELE
+F:RES_WATE
+F:SPECIAL_GENE
+F:UNIQUE
+S:1_IN_5
+S:BA_WATE
+S:BO_ICEE
+S:BO_WATE
+S:BR_POIS
+S:HOLD
+S:TELE_TO
 D:A vile creature which seems to consist mostly of tentacles, it seeks to 
 D:drag people to their doom in the water.  Few have ever escaped its grasp. 
 
@@ -8558,13 +13512,32 @@ B:TOUCH:EXP_40
 B:TOUCH:UN_POWER
 B:TOUCH:LOSE_DEX:2d8
 B:TOUCH:LOSE_DEX:2d8
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_1D2 | 
-F:SMART | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_4 | 
-S:BLINK | TELE_TO | TELE_AWAY | BLIND | HOLD | SLOW | SCARE | 
-S:CAUSE_3 | DRAIN_MANA | BRAIN_SMASH
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_1D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:SMART
+F:UNDEAD
+S:1_IN_4
+S:BLIND
+S:BLINK
+S:BRAIN_SMASH
+S:CAUSE_3
+S:DRAIN_MANA
+S:HOLD
+S:SCARE
+S:SLOW
+S:TELE_AWAY
+S:TELE_TO
 D:It is a skeletal form dressed in robes. It radiates vast evil power. 
 
 N:519:Gas spore
@@ -8574,9 +13547,14 @@ W:34:4:0:100
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:EXPLODE:DISEASE:30d2
-F:FORCE_SLEEP |
-F:STUPID | EMPTY_MIND | CAN_FLY | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:It does not look dangerous, yet you don't want to get 
 D:any closer. 
 
@@ -8590,14 +13568,32 @@ B:HIT:HURT:2d6
 B:HIT:HURT:2d6
 B:BITE:EXP_40:3d6
 B:BITE:EXP_40:3d6
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:DROP_4D2 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | REGENERATE | CAN_FLY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP | 
-F:BASEANGBAND | NO_CUT
-S:1_IN_6 | 
-S:TELE_TO | HOLD | CONF | SCARE | CAUSE_3 | MIND_BLAST | FORGET | 
-S:DARKNESS | BO_NETH
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_4D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:REGENERATE
+F:UNDEAD
+S:1_IN_6
+S:BO_NETH
+S:CAUSE_3
+S:CONF
+S:DARKNESS
+S:FORGET
+S:HOLD
+S:MIND_BLAST
+S:SCARE
+S:TELE_TO
 D:It is a humanoid form dressed in robes. Power emanates from its chilling 
 D:frame. 
 
@@ -8611,14 +13607,35 @@ B:HIT:HURT:3d6
 B:HIT:HURT:3d6
 B:BITE:EXP_40:3d6
 B:BITE:EXP_40:3d6
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:DROP_4D2 | CAN_FLY |
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | REGENERATE | INVISIBLE | PASS_WALL |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP | RES_TELE | 
-F:BASEANGBAND | NO_CUT
-S:1_IN_6 | 
-S:TELE_TO | HOLD | CONF | SCARE | CAUSE_3 | MIND_BLAST | FORGET | 
-S:DARKNESS | BO_NETH
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_4D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:PASS_WALL
+F:REGENERATE
+F:RES_TELE
+F:UNDEAD
+S:1_IN_6
+S:BO_NETH
+S:CAUSE_3
+S:CONF
+S:DARKNESS
+S:FORGET
+S:HOLD
+S:MIND_BLAST
+S:SCARE
+S:TELE_TO
 D:This ancient creature can transform into a mist at will. 
 
 N:522:Greater mummy
@@ -8631,15 +13648,44 @@ B:CLAW:LOSE_CON:3d6
 B:CLAW:DISEASE:3d6
 B:GAZE:EXP_40:3d4
 B:GAZE:TERRIFY:3d4
-F:FORCE_SLEEP | FORCE_MAXHP | NO_FEAR | EVIL | UNDEAD |COLD_BLOOD |
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | RES_TELE | 
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_3 | 
-S:HEAL | HASTE | BLIND | SCARE | S_UNDEAD | ANIM_DEAD | 
-S:BA_POIS | BA_NETH | BA_COLD | DRAIN_MANA |
-S:MIND_BLAST | CAUSE_3 | DARKNESS | FORGET
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_2D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MOVE_BODY
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:RES_TELE
+F:SMART
+F:TAKE_ITEM
+F:UNDEAD
+S:1_IN_3
+S:BA_COLD
+S:BA_NETH
+S:BA_POIS
+S:BLIND
+S:CAUSE_3
+S:DARKNESS
+S:DRAIN_MANA
+S:FORGET
+S:HASTE
+S:HEAL
+S:MIND_BLAST
+S:SCARE
+S:S_UNDEAD
 D:Once a powerful ruler, now an even more powerful undead menace. 
 
 # New monster added for the Theme module
@@ -8655,25 +13701,85 @@ B:GAZE:EAT_GOLD:10d10
 B:CRUSH:HURT:10d10
 B:TOUCH:UN_BONUS
 B:TOUCH:UN_POWER
-F:UNIQUE | CAN_SPEAK | ATTR_MULTI | ATTR_ANY | FEMALE |
-F:FORCE_MAXHP | WEIRD_MIND | DROP_CORPSE | DROP_SKELETON |
-F:REFLECTING | AURA_FIRE | AURA_ELEC | AURA_COLD |
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_3D2 | DROP_4D2 | 
-F:DROP_GOOD | DROP_GREAT | INVISIBLE | 
-F:SMART | MOVE_BODY | TAKE_ITEM | POWERFUL | RES_TELE | 
-F:REGENERATE | CAN_FLY | CAN_SWIM | DG_CURSE | WYRM_PROTECT | 
-F:GOOD | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:RES_PLAS | RES_DISE | RES_NETH | RES_NEXU | RES_WATE |
-F:NO_CONF | NO_FEAR | NO_SLEEP | NO_STUN | RES_TELE
-F:MORTAL | PET | JOKEANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:S_BUG | S_HI_DRAGON | S_KIN | S_RNG | S_UNIQUE |
-S:TELE_AWAY | TELE_LEVEL | TELE_TO | TPORT |
-S:HAND_DOOM | HEAL |
-S:BO_ICEE | BO_MANA | BO_PLAS |
-S:BA_COLD | BA_MANA | BA_WATE | ROCKET |
-S:BR_LITE | BR_DISE | BR_INER | BR_MANA | BR_NEXU | BR_SOUN | BR_TIME |
-S:BRAIN_SMASH | FORGET |
+F:ATTR_ANY
+F:ATTR_MULTI
+F:AURA_COLD
+F:AURA_ELEC
+F:AURA_FIRE
+F:CAN_FLY
+F:CAN_SPEAK
+F:CAN_SWIM
+F:DG_CURSE
+F:DROP_1D2
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:DROP_SKELETON
+F:FEMALE
+F:FORCE_MAXHP
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:JOKEANGBAND
+F:MORTAL
+F:MOVE_BODY
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:PET
+F:POWERFUL
+F:REFLECTING
+F:REGENERATE
+F:RES_DISE
+F:RES_NETH
+F:RES_NEXU
+F:RES_PLAS
+F:RES_TELE
+F:RES_TELE
+F:RES_WATE
+F:SMART
+F:TAKE_ITEM
+F:UNIQUE
+F:WEIRD_MIND
+F:WYRM_PROTECT
+S:1_IN_2
+S:BA_COLD
+S:BA_MANA
+S:BA_WATE
+S:BO_ICEE
+S:BO_MANA
+S:BO_PLAS
+S:BRAIN_SMASH
+S:BR_DISE
+S:BR_INER
+S:BR_LITE
+S:BR_MANA
+S:BR_NEXU
+S:BR_SOUN
+S:BR_TIME
+S:FORGET
+S:HAND_DOOM
+S:HEAL
+S:ROCKET
+S:S_BUG
+S:S_HI_DRAGON
+S:S_KIN
+S:S_RNG
+S:S_UNIQUE
+S:TELE_AWAY
+S:TELE_LEVEL
+S:TELE_TO
+S:TPORT
 D:A heavy-set, fair-haired figure who cruises through the dungeon in 
 D:a strangely made magical cart of some kind. Wherever she travels, 
 D:monsters and magical devices appear which no one on Arda has seen 
@@ -8689,9 +13795,12 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d6
 B:STING:POISON:1d4
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | DROP_SKELETON |
 F:ANIMAL
-F:MORTAL | BASEANGBAND
+F:BASH_DOOR
+F:DROP_SKELETON
+F:MORTAL
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is a giant grey scorpion. It looks poisonous. 
 
 N:525:Earth elemental
@@ -8703,12 +13812,23 @@ O:0:0:0:0
 B:HIT:HURT:4d6
 B:HIT:HURT:4d6
 B:HIT:HURT:4d6
-F:FORCE_SLEEP | 
-F:EMPTY_MIND | COLD_BLOOD | 
-F:KILL_ITEM | KILL_BODY | PASS_WALL | POWERFUL | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | HURT_ROCK | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_8 | 
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HURT_ROCK
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:KILL_ITEM
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:PASS_WALL
+F:POWERFUL
+S:1_IN_8
 S:BO_ACID
 D:It is a towering form composed of rock with fists of awesome power. 
 
@@ -8721,12 +13841,24 @@ O:0:0:0:0
 B:HIT:HURT:1d10
 B:HIT:CONFUSE:1d4
 B:HIT:HURT:1d10
-F:FORCE_SLEEP | RAND_25 | 
-F:EMPTY_MIND | COLD_BLOOD | CAN_FLY |
-F:KILL_BODY | KILL_ITEM | BASH_DOOR | POWERFUL | 
-F:IM_ACID | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_8 | 
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_POIS
+F:KILL_BODY
+F:KILL_ITEM
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_25
+S:1_IN_8
 S:BO_ELEC
 D:It is a towering tornado of winds. 
 
@@ -8736,10 +13868,16 @@ I:110:32d8:2:24:70
 W:27:1:0:140
 B:SPORE:ELEC:5d4
 B:SPORE:ELEC:5d4
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | 
-F:IM_ELEC | IM_POIS | CAN_SWIM | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:EMPTY_MIND
+F:IM_ELEC
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:It is a strange growth on the dungeon floor, glowing and crackling with sparks. 
 
 N:528:Sarnrog
@@ -8751,12 +13889,25 @@ O:0:0:0:0
 B:CLAW:HURT:2d6
 B:CLAW:HURT:2d6
 B:BITE:HURT:1d6
-F:DROP_60 | ONLY_GOLD | EVIL | DEMON | FRIENDS | HURT_LITE |
-F:WILD_TOO | WILD_MOUNTAIN | WILD_WASTE |
-F:IM_POIS | IM_FIRE | IM_COLD | IM_ELEC | HURT_ROCK | NONLIVING | 
-F:BASEANGBAND | NO_CUT
+F:DEMON
+F:DROP_60
+F:EVIL
+F:FRIENDS
+F:HURT_LITE
+F:HURT_ROCK
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NONLIVING
+F:NO_CUT
+F:ONLY_GOLD
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WASTE
 S:1_IN_12
-S:BR_ELEC | BR_FIRE
+S:BR_ELEC
+S:BR_FIRE
 D:A minor demonic servant of evil, it looks like it is made of stone. 
 
 N:529:Malicious leprawn
@@ -8767,12 +13918,21 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:TOUCH:EAT_GOLD
 B:TOUCH:EAT_ITEM
-F:INVISIBLE | RAND_25 | TAKE_ITEM | COLD_BLOOD |
-F:HURT_LITE | EVIL | OPEN_DOOR | MALE | 
-F:MORTAL | BASEANGBAND
-S:MULTIPLY | 
-S:1_IN_6 | 
-S:BLINK | TPORT | TELE_TO | CAUSE_1
+F:COLD_BLOOD
+F:EVIL
+F:HURT_LITE
+F:INVISIBLE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:RAND_25
+F:TAKE_ITEM
+S:1_IN_6
+S:BLINK
+S:CAUSE_1
+S:MULTIPLY
+S:TELE_TO
+S:TPORT
 D:This little gnome has a fiendish gleam in his eyes. 
 
 N:530:Eog golem
@@ -8785,10 +13945,21 @@ B:HIT:HURT:8d6
 B:HIT:HURT:8d6
 B:HIT:HURT:6d6
 B:HIT:HURT:6d6
-F:ONLY_GOLD | DROP_2D2 | 
-F:EMPTY_MIND | COLD_BLOOD | BASH_DOOR | REFLECTING |
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_2D2
+F:EMPTY_MIND
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_GOLD
+F:REFLECTING
 D:It is a massive deep brown statue, striding towards you with an 
 D:all-too-familiar purpose. 
 
@@ -8806,19 +13977,56 @@ B:HIT:HURT:10d8
 # Wearing a Greater Mimic for a symbiote
 B:HIT:POISON:3d4
 B:HIT:POISON:3d4
-F:JOKEANGBAND | WILD_TOO | WILD_WOOD | WILD_GRASS | 
-F:UNIQUE | MALE | GOOD | DROP_CORPSE | SMART | PET | 
-F:OPEN_DOOR | BASH_DOOR | MORTAL | HAS_LITE | CAN_SWIM | 
-F:CAN_SPEAK | DROP_4D2 | DROP_GREAT | FORCE_MAXHP | 
-F:NO_SLEEP | NO_CONF | NO_CUT | RES_NEXU | MOVE_BODY | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:RES_NETH | RES_DISE | AURA_FIRE | CAN_FLY | 
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:CAN_SWIM
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GREAT
+F:FORCE_MAXHP
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:JOKEANGBAND
+F:MALE
+F:MORTAL
+F:MOVE_BODY
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:PET
+F:RES_DISE
+F:RES_NETH
+F:RES_NEXU
+F:SMART
+F:UNIQUE
+F:WILD_GRASS
+F:WILD_TOO
+F:WILD_WOOD
 #Spells chez archery
 S:1_IN_3
-S:ARROW_1 | ARROW_2 | ARROW_3 | ARROW_4 | 
+S:ARROW_1
+S:ARROW_2
+S:ARROW_3
+S:ARROW_4
 #Spells chez a Greater Mimic named Glorp
-S:CAUSE_3 | BO_ACID | BO_ELEC | BO_FIRE | BO_COLD | 
-S:SCARE | BLIND | CONF | FORGET | S_MONSTER
+S:BLIND
+S:BO_ACID
+S:BO_COLD
+S:BO_ELEC
+S:BO_FIRE
+S:CAUSE_3
+S:CONF
+S:FORGET
+S:SCARE
+S:S_MONSTER
 D:An elf cloaked in green wielding a crossbow. He has sky blue 
 D:eyes, straight black hair, and a fair face. He is the only 
 D:child of a Telerin mage, and serves in King Thranduil's army. 
@@ -8835,11 +14043,17 @@ B:HIT:POISON:3d4
 B:HIT:LOSE_STR:3d4
 B:HIT:LOSE_STR:3d4
 B:HIT:POISON:3d4
-F:MALE | 
-F:DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | NO_CONF | NO_SLEEP | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:OPEN_DOOR
 D:A human warrior from Khand, moving with lightning speed. 
 
 N:533:Headless ghost
@@ -8852,13 +14066,28 @@ B:TOUCH:TERRIFY
 B:TOUCH:EXP_40
 B:CLAW:LOSE_INT:5d5
 B:CLAW:LOSE_WIS:5d5
-F:FORCE_SLEEP | RAND_25 | 
-F:ONLY_ITEM | DROP_90 | DROP_2D2 | CAN_FLY |
-F:COLD_BLOOD | TAKE_ITEM | PASS_WALL |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_15 | 
-S:BLIND | DRAIN_MANA | SCARE | BO_COLD | FORGET
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_90
+F:EVIL
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PASS_WALL
+F:RAND_25
+F:TAKE_ITEM
+F:UNDEAD
+S:1_IN_15
+S:BLIND
+S:BO_COLD
+S:DRAIN_MANA
+S:FORGET
+S:SCARE
 D:A phantasmal apparition with no head. 
 
 N:534:Dread
@@ -8870,13 +14099,29 @@ O:0:50:50:0
 B:HIT:HURT:6d6
 B:HIT:HURT:6d6
 B:HIT:LOSE_STR:3d4
-F:FORCE_SLEEP | RAND_25 | 
-F:ONLY_ITEM | DROP_60 | DROP_2D2 | 
-F:TAKE_ITEM | INVISIBLE | COLD_BLOOD | PASS_WALL | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | CAN_FLY |
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_15 | 
-S:BLIND | HOLD | CONF | DRAIN_MANA | BO_NETH
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_60
+F:EVIL
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PASS_WALL
+F:RAND_25
+F:TAKE_ITEM
+F:UNDEAD
+S:1_IN_15
+S:BLIND
+S:BO_NETH
+S:CONF
+S:DRAIN_MANA
+S:HOLD
 D:Death incarnate, its hideous black body seems to struggle 
 D:against reality as the universe itself struggles to banish it. 
 
@@ -8893,16 +14138,45 @@ O:50:0:50:0
 B:BITE:HURT:1d1
 B:INSULT:*
 B:WAIL:*
-F:JOKEANGBAND | WILD_TOO | WILD_WOOD | WILD_GRASS | 
-F:UNIQUE | MALE | GOOD | DROP_CORPSE | SMART | ANIMAL | 
-F:OPEN_DOOR | BASH_DOOR | MORTAL | HAS_LITE |  
-F:CAN_SPEAK | DROP_4D2 | DROP_GREAT | FORCE_MAXHP | 
-F:AI_ANNOY | WEIRD_MIND | TAKE_ITEM | IM_POIS | 
-F:IM_ACID | IM_ELEC | IM_FIRE | IM_COLD | POWERFUL | 
-S:1_IN_1 | 
+F:AI_ANNOY
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GREAT
+F:FORCE_MAXHP
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:JOKEANGBAND
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:POWERFUL
+F:SMART
+F:TAKE_ITEM
+F:UNIQUE
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_TOO
+F:WILD_WOOD
+S:1_IN_1
 # Good at sorcery:
-S:BO_MANA | BO_MANA | BR_ELEC | BR_ACID | BO_MANA | 
-S:BR_LITE | BR_WALL | BR_FIRE | BR_COLD | BR_POIS | 
+S:BO_MANA
+S:BO_MANA
+S:BO_MANA
+S:BR_ACID
+S:BR_COLD
+S:BR_ELEC
+S:BR_FIRE
+S:BR_LITE
+S:BR_POIS
+S:BR_WALL
 D:He is one of five children of a brown Yeek.  He is a credit to the 
 D:family. He has dark brown eyes, straight black hair, and a dark 
 D:complexion. He has an annoying habit of making strange "zizz" noises, 
@@ -8919,10 +14193,20 @@ B:GAZE:UN_BONUS:5d2
 B:GAZE:UN_BONUS:5d2
 B:GAZE:UN_POWER:5d2
 B:GAZE:UN_POWER:5d2
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | DROP_CORPSE | 
-F:BASH_DOOR | EVIL | BASEANGBAND | MORTAL
-S:1_IN_5 | 
-S:CAUSE_2 | TELE_AWAY | BA_COLD | BO_ELEC | HOLD | DRAIN_MANA
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:MORTAL
+S:1_IN_5
+S:BA_COLD
+S:BO_ELEC
+S:CAUSE_2
+S:DRAIN_MANA
+S:HOLD
+S:TELE_AWAY
 D:This six-eyed creature feeds on magic. 
 
 N:537:Smoke elemental
@@ -8933,13 +14217,24 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:ENGULF:HURT:2d6
 B:ENGULF:HURT:2d6
-F:FORCE_SLEEP | 
-F:EMPTY_MIND | 
-F:KILL_ITEM | KILL_BODY | BASH_DOOR | POWERFUL | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | CAN_FLY | BASEANGBAND | NO_CUT
-S:1_IN_5 | 
-S:DARKNESS | BO_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:KILL_ITEM
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+S:1_IN_5
+S:BO_FIRE
+S:DARKNESS
 D:It is a towering blackened form, crackling with heat. 
 
 N:538:Olog
@@ -8952,9 +14247,18 @@ B:HIT:HURT:1d12
 B:HIT:HURT:1d12
 B:BITE:HURT:2d3
 B:BITE:HURT:2d3
-F:FORCE_MAXHP | OPEN_DOOR | FRIENDS | DROP_60 | REGENERATE | 
-F:SMART | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | TROLL | IM_POIS | BASEANGBAND
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FRIENDS
+F:IM_POIS
+F:OPEN_DOOR
+F:REGENERATE
+F:SMART
+F:TROLL
 D:They say Melkor created trolls in mockery of the Ents. This is a 
 D:massive troll, more intelligent than most of its kind, with needle-
 D:sharp fangs. 
@@ -8967,9 +14271,19 @@ E:1:1:1:2:1:1
 O:100:0:0:0
 B:HIT:HURT:2d6
 B:HIT:HURT:2d6
-F:FORCE_MAXHP | OPEN_DOOR | FRIENDS | DROP_90 |
-F:SMART | EVIL | IM_POIS | IM_COLD | MALE | DROP_SKELETON | DROP_CORPSE
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FRIENDS
+F:HAS_LITE
+F:IM_COLD
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:SMART
 S:1_IN_3
 S:ARROW_4
 D:A rebel halfling who has rejected the tradition of archery. 
@@ -8984,11 +14298,16 @@ B:CLAW:HURT:2d8
 B:CLAW:HURT:2d8
 B:BITE:HURT:2d8
 B:BITE:HURT:2d8
-F:FORCE_SLEEP | FRIENDS | DROP_SKELETON | DROP_CORPSE | 
-F:BASH_DOOR | 
-F:ANIMAL | NO_CONF | NO_SLEEP | 
-F:MORTAL | BASEANGBAND
-S:1_IN_5 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+S:1_IN_5
 S:BR_GRAV
 D:Unfettered by the usual constraints of gravity, these unnatural creatures 
 D:are walking on the walls and even the ceiling!  The earth suddenly feels 
@@ -9004,11 +14323,25 @@ B:TOUCH:ACID:1d10
 B:TOUCH:ACID:1d10
 B:TOUCH:ACID:1d10
 B:TOUCH:ACID:1d10
-F:FORCE_MAXHP | TAKE_ITEM | COLD_BLOOD | 
-F:DROP_1D2 | DROP_4D2 | CAN_SWIM |
-F:STUPID | EMPTY_MIND | OPEN_DOOR | BASH_DOOR | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_FEAR | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_4D2
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:STUPID
+F:TAKE_ITEM
 D:A disgusting animated blob of destruction. 
 
 N:542:Inertia hound
@@ -9021,11 +14354,16 @@ B:CLAW:HURT:2d8
 B:CLAW:HURT:2d8
 B:BITE:HURT:2d8
 B:BITE:HURT:2d8
-F:FORCE_SLEEP | FRIENDS | DROP_SKELETON | DROP_CORPSE | 
-F:BASH_DOOR | 
-F:ANIMAL | NO_CONF | NO_SLEEP | 
-F:MORTAL | BASEANGBAND
-S:1_IN_5 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+S:1_IN_5
 S:BR_INER
 D:Bizarrely, this hound seems to be hardly moving at all, yet it approaches 
 D:you with deadly menace. It makes you tired just to look at it. 
@@ -9040,12 +14378,16 @@ B:CLAW:HURT:2d8
 B:CLAW:HURT:2d8
 B:BITE:HURT:2d8
 B:BITE:HURT:2d8
-F:FORCE_SLEEP | 
-F:FRIENDS | 
-F:BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | NO_CONF | NO_SLEEP
-F:MORTAL | BASEANGBAND
-S:1_IN_5 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+S:1_IN_5
 S:BR_WALL
 D:A deep brown shape is visible before you, its canine form strikes you with 
 D:an almost physical force. The dungeon floor buckles as if struck by a 
@@ -9058,10 +14400,18 @@ W:37:1:0:800
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:ENGULF:HURT:6d6
-F:FORCE_SLEEP | RAND_50 | NONLIVING | CAN_FLY | 
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | 
-F:NO_FEAR | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_4 | 
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_50
+S:1_IN_4
 S:BR_SHAR
 D:A howling blast of razor-sharp mountain fragments. 
 
@@ -9074,13 +14424,27 @@ O:0:0:0:0
 B:TOUCH:ACID:1d10
 B:TOUCH:ACID:1d10
 B:TOUCH:ACID:1d10
-F:FORCE_SLEEP | 
-F:EMPTY_MIND | COLD_BLOOD | WILD_TOO | WILD_SHORE | WILD_SWAMP |
-F:KILL_ITEM | KILL_BODY | BASH_DOOR | POWERFUL | 
-F:IM_ACID | IM_FIRE | CAN_SWIM | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_5 | 
-S:BO_ACID | BA_ACID
+F:BASH_DOOR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:KILL_ITEM
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:WILD_SHORE
+F:WILD_TOO
+S:1_IN_5
+S:BA_ACID
+S:BO_ACID
 D:It is a towering mass of filth and ooze. 
 
 N:546:Young black dragon
@@ -9092,13 +14456,21 @@ O:50:50:0:0
 B:CLAW:HURT:2d6
 B:CLAW:HURT:2d6
 B:BITE:HURT:2d8
-F:FORCE_SLEEP | FORCE_MAXHP | WILD_TOO | WILD_SWAMP |
-F:DROP_3D2 | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | CAN_FLY | 
-F:EVIL | DRAGON | IM_ACID | BASEANGBAND | ATTR_MULTI
-S:1_IN_10 | 
-S:SCARE | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:OPEN_DOOR
+F:WILD_TOO
+S:1_IN_10
 S:BR_ACID
+S:SCARE
 D:It has a form that legends are made of. Its still-tender scales are a 
 D:darkest black hue. Acid drips from its body. 
 
@@ -9111,8 +14483,10 @@ O:0:0:0:0
 B:BUTT:HURT:8d6
 B:BUTT:HURT:8d6
 B:CRUSH:HURT:8d4
-F:BASH_DOOR | DROP_CORPSE | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:MORTAL
 D:A massive elephantine form with eyes twisted by madness. 
 
 N:548:Giant fire ant
@@ -9123,10 +14497,16 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:FIRE:3d12
 B:BITE:FIRE:3d12
-F:FORCE_MAXHP | KILL_BODY | FRIENDS | DROP_SKELETON
-F:WEIRD_MIND | BASH_DOOR | SUSCEP_COLD |
-F:ANIMAL | IM_FIRE
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:FRIENDS
+F:IM_FIRE
+F:KILL_BODY
+F:MORTAL
+F:SUSCEP_COLD
+F:WEIRD_MIND
 D:A giant ant covered in shaggy fur. Its powerful jaws glow with heat. 
 
 N:549:Cold-drake
@@ -9138,13 +14518,27 @@ O:50:50:0:0
 B:CLAW:HURT:2d8
 B:CLAW:HURT:2d8
 B:BITE:HURT:4d8
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_4D2 | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | CAN_FLY | WILD_TOO | WILD_WASTE | WILD_MOUNTAIN | 
-F:EVIL | DRAGON | IM_COLD | NO_CONF | NO_SLEEP | SUSCEP_FIRE | BASEANGBAND | 
-F:HAS_LITE | ATTR_MULTI
-S:1_IN_9 |
-S:SCARE |
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:NO_CONF
+F:NO_SLEEP
+F:OPEN_DOOR
+F:SUSCEP_FIRE
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WASTE
+S:1_IN_9
 S:BR_COLD
+S:SCARE
 D:A large dragon, scales gleaming bright white. 
 
 N:550:Xorn
@@ -9157,11 +14551,19 @@ B:HIT:HURT:1d6
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
-F:FORCE_MAXHP | 
-F:EMPTY_MIND | COLD_BLOOD | 
-F:KILL_ITEM | PASS_WALL | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:HURT_ROCK | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:HURT_ROCK
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_ITEM
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
 D:A huge creature of the Earth. Able to merge with its element, it 
 D:has four huge arms protruding from its enormous torso. 
 
@@ -9175,12 +14577,23 @@ B:HIT:HURT:6d7
 B:HIT:HURT:6d7
 B:BITE:HURT:4d10
 B:SPIT:ACID:4d8
-F:UNIQUE | MALE | 
-F:FORCE_MAXHP | 
-F:ESCORT | MOVE_BODY | 
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | DROP_CORPSE | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | REGENERATE | 
-F:EVIL | TROLL | IM_COLD | IM_POIS | BASEANGBAND
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:IM_COLD
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:TAKE_ITEM
+F:TROLL
+F:UNIQUE
 D:Trolls are abominations created by Melkor in mockery of the Ents. 
 D:A massive and cruel troll of great power, drool slides caustically down 
 D:his muscular frame. Despite his bulk, he strikes with stunning speed. 
@@ -9197,20 +14610,57 @@ O:25:25:25:25
 B:HIT:HURT:5d12
 B:HIT:HURT:5d12
 B:HIT:SHATTER:5d12
-F:JOKEANGBAND | WILD_TOO | WILD_MOUNTAIN | WILD_WASTE | 
-F:UNIQUE | FEMALE | GOOD | DROP_CORPSE | SMART | 
-F:OPEN_DOOR | BASH_DOOR | HAS_LITE | CAN_SWIM | 
-F:CAN_SPEAK | DROP_4D2 | DROP_GREAT | FORCE_MAXHP | 
-F:NO_SLEEP | NO_CONF | NO_CUT | RES_NEXU | MOVE_BODY | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:RES_NETH | RES_DISE | CAN_FLY | NO_FEAR | PASS_WALL | 
-F:REFLECTING | REGENERATE | WEIRD_MIND | 
-F:KILL_BODY | RES_TELE | INVISIBLE | NO_STUN |
-S:1_IN_4 | 
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:CAN_SWIM
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GREAT
+F:FEMALE
+F:FORCE_MAXHP
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:JOKEANGBAND
+F:KILL_BODY
+F:MOVE_BODY
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:OPEN_DOOR
+F:PASS_WALL
+F:REFLECTING
+F:REGENERATE
+F:RES_DISE
+F:RES_NETH
+F:RES_NEXU
+F:RES_TELE
+F:SMART
+F:UNIQUE
+F:WEIRD_MIND
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WASTE
+S:1_IN_4
 # Spells chez Thaumaturgy, dead Morgy, and her being Maia:
-S:BR_POIS | ROCKET | SHRIEK | BR_WALL | BR_INER | 
+S:BR_INER
+S:BR_POIS
+S:BR_WALL
+S:ROCKET
+S:SHRIEK
 # Spells chez Master Q named 'Fear' (though not all, she *is* Maia):
-S:BLINK | TELE_TO | S_MONSTERS | S_ANIMALS | 
+S:BLINK
+S:S_ANIMALS
+S:S_MONSTERS
+S:TELE_TO
 D:A mighty Maia of legend, associated with Vana. In the past, she 
 D:dwelt on Middle-earth in the form of a beneficent but unseen force. 
 D:She looks like she is a wall. It is rumoured that she has once 
@@ -9228,13 +14678,23 @@ B:TOUCH:EXP_80
 B:TOUCH:EXP_40
 B:CLAW:LOSE_INT:1d10
 B:CLAW:LOSE_WIS:1d10
-F:FORCE_SLEEP | 
-F:ONLY_ITEM | DROP_1D2 | 
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | CAN_FLY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_1D2
+F:EVIL
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
 F:NO_CUT
-S:1_IN_5 | 
-S:FORGET | MIND_BLAST
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PASS_WALL
+F:UNDEAD
+S:1_IN_5
+S:FORGET
+S:MIND_BLAST
 D:An unholy creature of darkness. The aura emanating from this evil being 
 D:saps your very soul. 
 
@@ -9247,13 +14707,26 @@ O:0:50:50:0
 B:HIT:HURT:1d10
 B:HIT:HURT:1d10
 B:TOUCH:EXP_40
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:DROP_60 | DROP_90 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | HURT_LITE | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_7 |
-S:HOLD | SCARE | CAUSE_3 | DARKNESS
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_60
+F:DROP_90
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:UNDEAD
+S:1_IN_7
+S:CAUSE_3
+S:DARKNESS
+S:HOLD
+S:SCARE
 D:A tangible but ghostly form, made of grey fog. The air around it feels 
 D:deathly cold. 
 
@@ -9267,13 +14740,28 @@ B:GAZE:PARALYZE
 B:CLAW:LOSE_CON:1d10
 B:CLAW:LOSE_CON:1d10
 B:GAZE:EXP_40
-F:FORCE_SLEEP | FORCE_MAXHP | REGENERATE |
-F:DROP_60 | DROP_90 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | MOVE_BODY |
-F:EVIL | UNDEAD | HURT_LITE | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_7 |
-S:CONF | SCARE | CAUSE_3 | DARKNESS
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_60
+F:DROP_90
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:MOVE_BODY
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:REGENERATE
+F:UNDEAD
+S:1_IN_7
+S:CAUSE_3
+S:CONF
+S:DARKNESS
+S:SCARE
 D:Back from the grave, to wreak vengeance upon the living. A skeletal figure 
 D:wearing a black robe, with eyes that burn with undying hatred. 
 
@@ -9286,15 +14774,32 @@ O:50:50:0:0
 B:CLAW:HURT:2d6
 B:CLAW:HURT:2d6
 B:BITE:HURT:3d8
-F:ATTR_MULTI | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE
-F:DROP_1D2 | DROP_3D2 | CAN_FLY |
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DRAGON | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | 
-F:IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
-S:1_IN_8 | 
-S:SCARE | 
-S:BR_ACID | BR_FIRE | BR_COLD | BR_ELEC | BR_POIS
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_1D2
+F:DROP_3D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_SLEEP
+F:OPEN_DOOR
+S:1_IN_8
+S:BR_ACID
+S:BR_COLD
+S:BR_ELEC
+S:BR_FIRE
+S:BR_POIS
+S:SCARE
 D:It has a form that legends are made of. Beautiful scales of shimmering 
 D:and magical colours cover it. 
 
@@ -9310,14 +14815,41 @@ O:50:50:0:0
 B:CLAW:HURT:10d8
 B:CLAW:HURT:10d8
 B:CLAW:HURT:10d8
-F:JOKEANGBAND | WILD_TOO | WILD_WOOD | WILD_MOUNTAIN | 
-F:UNIQUE | FEMALE | CAN_SPEAK | GOOD | DROP_CORPSE | 
-F:SMART | PET | OPEN_DOOR | BASH_DOOR | HAS_LITE | 
-F:CAN_FLY | DROP_4D2 | DROP_GREAT | FORCE_MAXHP | DRAGON | 
-F:NO_SLEEP | NO_CONF | NO_FEAR | MOVE_BODY | POWERFUL | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-S:1_IN_4 | 
-S:BR_FIRE | BR_COLD | BR_ELEC | BR_ACID | BR_POIS | 
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:DRAGON
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GREAT
+F:FEMALE
+F:FORCE_MAXHP
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:JOKEANGBAND
+F:MOVE_BODY
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:PET
+F:POWERFUL
+F:SMART
+F:UNIQUE
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
+S:1_IN_4
+S:BR_ACID
+S:BR_COLD
+S:BR_ELEC
+S:BR_FIRE
+S:BR_POIS
 D:She is a small, but fierce dragon - so fierce that in her fury she 
 D:appears to be one of the Great Worms. She has turned away from 
 D:Morgoth and worships Tulkas Astaldo. She intensely dislikes vampires  
@@ -9334,12 +14866,21 @@ B:HIT:HURT:10d10
 B:HIT:HURT:10d10
 B:HIT:HURT:6d6
 B:HIT:HURT:6d6
-F:FORCE_MAXHP | 
-F:EMPTY_MIND | COLD_BLOOD | BASH_DOOR | 
-F:IM_FIRE | IM_COLD | IM_ELEC | 
-F:IM_POIS | NONLIVING | REFLECTING |
-F:NO_CONF | NO_SLEEP | NO_FEAR
-F:MORTAL | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:REFLECTING
 S:1_IN_8
 S:ARROW_4
 D:An enormous construct resembling a titan made from stone. It strides 
@@ -9355,13 +14896,23 @@ O:50:50:0:0
 B:CLAW:HURT:2d6
 B:CLAW:HURT:2d6
 B:BITE:HURT:2d8
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:DROP_3D2 | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | WILD_TOO | WILD_MOUNTAIN |
-F:EVIL | DRAGON | BASEANGBAND | NO_STUN | HAS_LITE | ATTR_MULTI
-S:1_IN_10 | 
-S:SCARE | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:NO_STUN
+F:OPEN_DOOR
+F:WILD_MOUNTAIN
+F:WILD_TOO
+S:1_IN_10
 S:BR_SOUN
+S:SCARE
 D:It has a form that legends are made of. Its still-tender scales are a 
 D:tarnished gold hue, and light is reflected from its form. 
 
@@ -9374,14 +14925,25 @@ O:50:50:0:0
 B:CLAW:HURT:2d8
 B:CLAW:HURT:2d8
 B:BITE:HURT:4d8
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:DROP_4D2 | DROP_CORPSE
-F:BASH_DOOR | WILD_TOO | WILD_MOUNTAIN | WILD_WOOD |
-F:EVIL | DRAGON | IM_ELEC | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
 F:ATTR_MULTI
-S:1_IN_9 | 
-S:SCARE | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ELEC
+F:NO_CONF
+F:NO_SLEEP
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
+S:1_IN_9
 S:BR_ELEC
+S:SCARE
 D:A large dragon, scales tinted deep blue. 
 
 N:561:Green drake
@@ -9393,14 +14955,25 @@ O:50:50:0:0
 B:CLAW:HURT:2d8
 B:CLAW:HURT:2d8
 B:BITE:HURT:4d8
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:DROP_4D2 | DROP_CORPSE | 
-F:BASH_DOOR | WILD_TOO | WILD_MOUNTAIN | WILD_WOOD |
-F:EVIL | DRAGON | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
 F:ATTR_MULTI
-S:1_IN_9 | 
-S:SCARE | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_POIS
+F:NO_CONF
+F:NO_SLEEP
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
+S:1_IN_9
 S:BR_POIS
+S:SCARE
 D:A large dragon, scales tinted deep green. 
 
 N:562:Bronze drake
@@ -9412,13 +14985,24 @@ O:50:50:0:0
 B:CLAW:HURT:2d8
 B:CLAW:HURT:2d8
 B:BITE:HURT:4d8
-F:FORCE_SLEEP | FORCE_MAXHP | WILD_TOO | WILD_MOUNTAIN |
-F:DROP_4D2 | CAN_FLY |
-F:BASH_DOOR | DROP_CORPSE | 
-F:EVIL | DRAGON | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE | ATTR_MULTI
-S:1_IN_9 | 
-S:CONF | SCARE | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:NO_CONF
+F:NO_SLEEP
+F:WILD_MOUNTAIN
+F:WILD_TOO
+S:1_IN_9
 S:BR_CONF
+S:CONF
+S:SCARE
 D:A large dragon with scales of rich bronze. 
 
 N:563:Young red dragon
@@ -9430,13 +15014,25 @@ O:50:50:0:0
 B:CLAW:HURT:2d6
 B:CLAW:HURT:2d6
 B:BITE:HURT:2d8
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | SUSCEP_COLD |
-F:DROP_3D2 | WILD_TOO | WILD_MOUNTAIN | WILD_VOLCANO |
-F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE
-F:EVIL | DRAGON | IM_FIRE | BASEANGBAND | HAS_LITE | ATTR_MULTI
-S:1_IN_10 | 
-S:SCARE | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:OPEN_DOOR
+F:SUSCEP_COLD
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_VOLCANO
+S:1_IN_10
 S:BR_FIRE
+S:SCARE
 D:It has a form that legends are made of. Its still-tender scales are a 
 D:deepest red hue. Heat radiates from its form. 
 
@@ -9454,20 +15050,58 @@ B:CHARGE:HURT:10d8
 B:BITE:POISON:4d4
 B:BUTT:CONFUSE:4d4
 B:SPIT:BLIND:4d4
-F:JOKEANGBAND | WILD_TOO | WILD_WOOD | WILD_GRASS | 
-F:WILD_WASTE | WILD_MOUNTAIN | WILD_SHORE | 
-F:UNIQUE | MALE | GOOD | SMART | UNDEAD | REFLECTING | 
-F:OPEN_DOOR | BASH_DOOR | HAS_LITE | CAN_SWIM | 
-F:CAN_SPEAK | DROP_4D2 | DROP_GREAT | FORCE_MAXHP | 
-F:NO_SLEEP | NO_CONF | NO_CUT | RES_NEXU | MOVE_BODY | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:RES_NETH | RES_DISE | AURA_FIRE | CAN_FLY | REGENERATE | 
-F:NO_STUN | KILL_BODY | NO_FEAR | WEIRD_MIND | 
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:CAN_SWIM
+F:DROP_4D2
+F:DROP_GREAT
+F:FORCE_MAXHP
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:JOKEANGBAND
+F:KILL_BODY
+F:MALE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:OPEN_DOOR
+F:REFLECTING
+F:REGENERATE
+F:RES_DISE
+F:RES_NETH
+F:RES_NEXU
+F:SMART
+F:UNDEAD
+F:UNIQUE
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_MOUNTAIN
+F:WILD_SHORE
+F:WILD_TOO
+F:WILD_WASTE
+F:WILD_WOOD
 #Spells chez Mindcraft
 S:1_IN_3
-S:BRAIN_SMASH | FORGET | MIND_BLAST | 
+S:BRAIN_SMASH
+S:FORGET
+S:MIND_BLAST
 #Spells chez an Ultimate Mimic:
-S:CAUSE_3 | BA_POIS | SCARE | BLIND | CONF | S_MONSTER 
+S:BA_POIS
+S:BLIND
+S:CAUSE_3
+S:CONF
+S:SCARE
+S:S_MONSTER
 D:He is the head of the unholy holy order of Nosferatu. His nephew 
 D:Sir Otilc played with swords and died as a result. Sir Physt is 
 D:out to rectify the situation with his fists and his mind. Tulkas 
@@ -9485,11 +15119,18 @@ B:HIT:HURT:3d8
 B:HIT:HURT:3d8
 B:HIT:PARALYZE:15d1
 B:HIT:PARALYZE:15d1
-F:CHAR_CLEAR | ATTR_CLEAR | CHAR_MULTI | 
-F:NEVER_MOVE | FORCE_MAXHP | 
-F:INVISIBLE | EMPTY_MIND | COLD_BLOOD | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | 
-F:MORTAL | BASEANGBAND
+F:ATTR_CLEAR
+F:CHAR_CLEAR
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:INVISIBLE
+F:MORTAL
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
 D:This creature traps unsuspecting victims 
 D:and paralyzes them, to be slowly digested later. 
 
@@ -9502,13 +15143,23 @@ O:0:0:0:0
 B:HIT:FIRE:4d6
 B:HIT:FIRE:4d6
 B:GAZE:EXP_20
-F:FORCE_SLEEP | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | AURA_FIRE | NONLIVING |
-F:EVIL | DEMON | IM_FIRE | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND
+F:AURA_FIRE
+F:BASH_DOOR
+F:DEMON
+F:EVIL
+F:FORCE_SLEEP
 F:HAS_LITE
-S:1_IN_4 | 
-S:BO_FIRE | BA_FIRE | 
-S:S_DEMON | 
+F:IM_FIRE
+F:IM_POIS
+F:NONLIVING
+F:NO_CONF
+F:NO_SLEEP
+F:OPEN_DOOR
+F:TAKE_ITEM
+S:1_IN_4
+S:BA_FIRE
+S:BO_FIRE
+S:S_DEMON
 D:It is a humanoid form composed of flames and hatred. Adanroeg are 
 D:humans corrupted by the evil forces of Morgoth into demonic slaves 
 D:to evil.
@@ -9520,10 +15171,19 @@ W:36:5:0:50
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:EXPLODE:TIME:30d2
-F:CHAR_CLEAR | ATTR_CLEAR | CHAR_MULTI | 
-F:NEVER_MOVE | FORCE_MAXHP | 
-F:EMPTY_MIND | INVISIBLE | COLD_BLOOD | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | JOKEANGBAND | NO_CUT
+F:ATTR_CLEAR
+F:CHAR_CLEAR
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:INVISIBLE
+F:JOKEANGBAND
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
 D:It was left here to be used against intruders. 
 
 N:568:Rawrog
@@ -9534,12 +15194,23 @@ E:1:1:1:0:1:1
 O:0:0:0:0
 B:CLAW:HURT:5d6
 B:CLAW:HURT:5d6
-F:FORCE_SLEEP | PASS_WALL | INVISIBLE |
-F:IM_POIS | IM_COLD | IM_ACID | IM_FIRE |
-F:NO_SLEEP | NO_CONF | NO_STUN | NONLIVING |
-F:EVIL | DEMON | BASEANGBAND
-S:1_IN_4 | 
-S:BLINK | DARKNESS | S_DEMON
+F:DEMON
+F:EVIL
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:NONLIVING
+F:NO_CONF
+F:NO_SLEEP
+F:NO_STUN
+F:PASS_WALL
+S:1_IN_4
+S:BLINK
+S:DARKNESS
+S:S_DEMON
 D:It resembles a lion standing on two feet. In fact, Rawroeg are 
 D:lions corrupted by Morgoth into demonic servants of evil. 
 
@@ -9556,20 +15227,57 @@ O:25:25:25:25
 B:HIT:HURT:1d1
 B:INSULT:*
 B:SHOW:*
-F:JOKEANGBAND | WILD_TOO | WILD_WOOD | WILD_GRASS | 
-F:UNIQUE | MALE | GOOD | DROP_CORPSE | SMART | ANIMAL | 
-F:OPEN_DOOR | BASH_DOOR | MORTAL | HAS_LITE | CAN_SWIM | 
-F:CAN_SPEAK | DROP_4D2 | DROP_GREAT | FORCE_MAXHP | 
-F:PASS_WALL | NO_SLEEP | REGENERATE | REFLECTING | 
-F:AURA_FIRE | IM_ACID | IM_ELEC | IM_FIRE | IM_COLD | 
-F:IM_POIS | NO_CONF | RES_PLAS | RES_DISE | RES_NEXU | 
-F:RES_NETH | RES_WATE | 
+F:ANIMAL
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:CAN_SWIM
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GREAT
+F:FORCE_MAXHP
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:JOKEANGBAND
+F:MALE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:OPEN_DOOR
+F:PASS_WALL
+F:REFLECTING
+F:REGENERATE
+F:RES_DISE
+F:RES_NETH
+F:RES_NEXU
+F:RES_PLAS
+F:RES_WATE
+F:SMART
+F:UNIQUE
+F:WILD_GRASS
+F:WILD_TOO
+F:WILD_WOOD
 S:1_IN_5
 # Spells chez symbiote skull druj:
-S:BA_WATE | MIND_BLAST | BRAIN_SMASH | CAUSE_2 |  
-S:BO_PLAS | SLOW | TRAPS | S_UNDEAD | BO_NETH | 
+S:BA_WATE
+S:BO_NETH
+S:BO_PLAS
+S:BRAIN_SMASH
+S:CAUSE_2
+S:MIND_BLAST
+S:SLOW
+S:S_UNDEAD
 # Spells chez thaumaturgy and having killed Morgy:
-S:BR_SOUN | BR_MANA | BR_NUKE | BR_DISI | ROCKET | 
+S:BR_DISI
+S:BR_MANA
+S:BR_NUKE
+S:BR_SOUN
+S:ROCKET
 D:A yeek bard more famous for his buff physique and marriage to the beautiful 
 D:but dumb Jessica Yeekson than his music. The dark forces of Morgoth killed 
 D:his friend Justin TimberYeek and kidnapped poor Jessica Yeekson, and Nick 
@@ -9587,13 +15295,26 @@ O:0:0:0:0
 B:TOUCH:COLD:4d3
 B:HIT:HURT:4d6
 B:TOUCH:COLD:4d3
-F:FORCE_SLEEP | 
-F:EMPTY_MIND | COLD_BLOOD | AURA_COLD |
-F:KILL_ITEM | KILL_BODY | BASH_DOOR | POWERFUL | 
-F:IM_COLD | IM_ELEC | CAN_SWIM | IM_POIS | IM_ACID | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_5 | 
-S:BO_ICEE | BA_COLD
+F:AURA_COLD
+F:BASH_DOOR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_POIS
+F:KILL_BODY
+F:KILL_ITEM
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+S:1_IN_5
+S:BA_COLD
+S:BO_ICEE
 D:It is a towering glacier. 
 
 N:571:Necromancer
@@ -9604,16 +15325,30 @@ E:1:1:1:2:1:1
 O:10:0:90:0
 B:HIT:HURT:2d6
 B:HIT:HURT:2d6
-F:MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_1D2 | DROP_SKELETON
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:EVIL
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:HASTE | TPORT | TELE_TO | BLIND | HOLD | SCARE | CAUSE_3 | 
-S:BO_NETH | MIND_BLAST | FORGET |
-S:S_UNDEAD | ANIM_DEAD
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+S:1_IN_3
+S:BLIND
+S:BO_NETH
+S:CAUSE_3
+S:FORGET
+S:HASTE
+S:HOLD
+S:MIND_BLAST
+S:SCARE
+S:S_UNDEAD
+S:TELE_TO
+S:TPORT
 D:A gaunt figure, clothed in black robes. 
 
 # New monster added by furiosity for the Theme module
@@ -9629,15 +15364,38 @@ B:HIT:HURT:10d8
 B:PUNCH:HURT:10d8
 B:KICK:HURT:10d8
 B:CHARGE:HURT:10d8
-F:JOKEANGBAND | WILD_TOO | WILD_WOOD | WILD_GRASS| 
-F:UNIQUE | FEMALE | GOOD | DROP_CORPSE | SMART | 
-F:CAN_SPEAK | DROP_4D2 | DROP_GREAT | FORCE_MAXHP | 
-F:OPEN_DOOR | BASH_DOOR | MORTAL | HAS_LITE | 
-F:NO_SLEEP | NO_CONF | CAN_SWIM | REGENERATE | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:RES_NEXU | MOVE_BODY | KILL_WALL | CAN_FLY | 
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:CAN_SWIM
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GREAT
+F:FEMALE
+F:FORCE_MAXHP
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:JOKEANGBAND
+F:KILL_WALL
+F:MORTAL
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:OPEN_DOOR
+F:REGENERATE
+F:RES_NEXU
+F:SMART
+F:UNIQUE
+F:WILD_GRASS
+F:WILD_TOO
+F:WILD_WOOD
 #Well, she has a boomerang:
-S:1_IN_4 |
+S:1_IN_4
 S:ARROW_2
 D:A lithe female wood-elf wearing no armour - she is 
 D:a monk of Manwe Sulimo, one of the most feared of her order.
@@ -9656,14 +15414,25 @@ B:HIT:HURT:6d6
 B:HIT:HURT:6d6
 B:HIT:HURT:3d8
 B:HIT:HURT:3d8
-F:UNIQUE | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:BASEANGBAND | HAS_LITE
-S:1_IN_4 | 
-S:TELE_TO | S_MONSTERS
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNIQUE
+S:1_IN_4
+S:S_MONSTERS
+S:TELE_TO
 D:A mighty warrior from the east, Lorgan hates everything that he cannot 
 D:control. 
 
@@ -9677,9 +15446,16 @@ O:0:0:0:0
 B:CLAW:HURT:1d8
 B:CLAW:HURT:1d8
 B:BITE:HURT:1d6
-F:BASH_DOOR | WILD_TOO | WILD_GRASS | WILD_WOOD | WILD_MOUNTAIN | 
-F:ANIMAL | DROP_SKELETON | DROP_CORPSE | IM_COLD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:IM_COLD
+F:MORTAL
+F:WILD_GRASS
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:A large feline that is well-adapted to extremely cold 
 D:environments. 
 
@@ -9691,11 +15467,22 @@ E:1:1:1:2:1:1
 O:0:100:0:0
 B:HIT:HURT:4d6
 B:HIT:HURT:4d6
-F:FORCE_MAXHP | 
-F:DROP_60 | 
-F:EMPTY_MIND | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | REGENERATE | 
-F:EVIL | TROLL | UNDEAD | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_60
+F:EMPTY_MIND
+F:EVIL
+F:FORCE_MAXHP
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:REGENERATE
+F:TROLL
+F:UNDEAD
 D:It is a massive figure clothed in wrappings. You are wary of its massive 
 D:fists. 
 
@@ -9707,13 +15494,23 @@ B:ENGULF:EXP_80:5d5
 B:ENGULF:UN_POWER:5d5
 B:ENGULF:UN_BONUS:5d5
 B:HIT:LOSE_ALL:5d5
-F:ATTR_MULTI | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:RAND_50 | RAND_25 | NONLIVING | CAN_FLY | 
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_6 | 
-S:BR_TIME | BR_DISE
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_25
+F:RAND_50
+S:1_IN_6
+S:BR_DISE
+S:BR_TIME
 D:Howling through the disintegrating dungeon, this awesome whirlpool of Unmagic 
 D:rips the enchantments from everything it touches. 
 
@@ -9727,13 +15524,30 @@ B:TOUCH:EXP_40
 B:TOUCH:UN_POWER
 B:TOUCH:LOSE_DEX:2d10
 B:TOUCH:LOSE_DEX:2d10
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_1D2 | RES_TELE | 
-F:SMART | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_3 | 
-S:BLINK | TELE_TO | TELE_AWAY | TELE_LEVEL |
-S:CAUSE_3 | DRAIN_MANA | BRAIN_SMASH
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_1D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:RES_TELE
+F:SMART
+F:UNDEAD
+S:1_IN_3
+S:BLINK
+S:BRAIN_SMASH
+S:CAUSE_3
+S:DRAIN_MANA
+S:TELE_AWAY
+S:TELE_LEVEL
+S:TELE_TO
 D:It is a skeletal form dressed in robes. It looks evil and devious. 
 
 N:578:Chaos butterfly
@@ -9745,12 +15559,19 @@ O:0:0:0:0
 B:CLAW:HURT:3d7
 B:CLAW:HURT:3d7
 B:CRUSH:HURT:10d5
-F:FORCE_SLEEP | 
-F:CAN_FLY |
-F:WEIRD_MIND | BASH_DOOR | ATTR_MULTI | ATTR_ANY |
-F:NO_CONF | NO_SLEEP | MORTAL | JOKEANGBAND
+F:ATTR_ANY
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:FORCE_SLEEP
+F:JOKEANGBAND
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:WEIRD_MIND
 S:1_IN_9
-S:BR_CONF | BR_CHAO
+S:BR_CHAO
+S:BR_CONF
 D:With fractal patterns on its wings, it is clearly one of those butterflies 
 D:that mathematicians keep talking about - the ones that flap their wings on the  
 D:other side of the world to cause storms here. Now's your chance to stop it. 
@@ -9763,11 +15584,22 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:TIME:3d4
 B:TOUCH:TIME:3d4
-F:PASS_WALL | IM_POIS | IM_FIRE | IM_ELEC | IM_FIRE | IM_ACID | CAN_FLY |
-F:NO_CONF | NO_SLEEP | EMPTY_MIND | KILL_ITEM | RAND_50 | 
-F:BASEANGBAND | NO_CUT
+F:CAN_FLY
+F:EMPTY_MIND
+F:IM_ACID
+F:IM_ELEC
+F:IM_FIRE
+F:IM_FIRE
+F:IM_POIS
+F:KILL_ITEM
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
+F:RAND_50
 S:1_IN_7
-S:SLOW | BR_TIME |
+S:BR_TIME
+S:SLOW
 D:You have not seen it yet. 
 
 N:580:Blue yeek
@@ -9777,10 +15609,13 @@ W:2:1:700:4
 E:1:1:1:2:1:1
 O:25:0:0:55
 B:HIT:HURT:1d5
-F:DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | 
-F:ANIMAL | IM_ACID | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:IM_ACID
+F:MORTAL
+F:OPEN_DOOR
 D:A small humanoid figure. 
 
 N:581:The Queen Ant
@@ -9793,14 +15628,24 @@ B:BITE:HURT:2d12
 B:BITE:HURT:2d12
 B:BITE:HURT:2d8
 B:BITE:HURT:2d8
-F:UNIQUE | FEMALE | GOOD | DROP_CORPSE
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ESCORT | ESCORTS | CAN_FLY |
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
-F:WEIRD_MIND | OPEN_DOOR | BASH_DOOR | 
-F:ANIMAL |
-F:MORTAL | BASEANGBAND
-S:1_IN_2 | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:ESCORT
+F:ESCORTS
+F:FEMALE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNIQUE
+F:WEIRD_MIND
+S:1_IN_2
 S:S_KIN
 D:She's upset because she thinks you hurt her children. 
 
@@ -9814,13 +15659,32 @@ B:HIT:HURT:1d9
 B:HIT:HURT:1d9
 B:HIT:HALLU:1d9
 B:HIT:HALLU:1d9
-F:FORCE_SLEEP | FORCE_MAXHP | RAND_50 | 
-F:SMART | EMPTY_MIND | INVISIBLE | 
-F:PASS_WALL | POWERFUL | CAN_FLY | WILD_TOO | WILD_SWAMP |
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | BASEANGBAND | HAS_LITE | NO_CUT
-S:1_IN_2 | 
-S:BLINK | TPORT | CONF | CAUSE_2
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:PASS_WALL
+F:POWERFUL
+F:RAND_50
+F:SMART
+F:WILD_TOO
+S:1_IN_2
+S:BLINK
+S:CAUSE_2
+S:CONF
+S:TPORT
 D:A strange ball of glowing light. It disappears and reappears and seems to 
 D:draw you to it. You seem somehow compelled to stand still and watch its 
 D:strange dancing motion. 
@@ -9832,10 +15696,13 @@ W:8:1:800:11
 E:1:1:1:2:1:1
 O:0:50:0:30
 B:HIT:HURT:1d6
-F:DROP_60 | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:ANIMAL | IM_ACID | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:IM_ACID
+F:MORTAL
+F:OPEN_DOOR
 D:It is a strange small humanoid. 
 
 N:584:Magma elemental
@@ -9847,13 +15714,27 @@ O:0:0:0:0
 B:HIT:FIRE:3d7
 B:HIT:HURT:4d6
 B:HIT:FIRE:3d7
-F:FORCE_SLEEP | 
-F:EMPTY_MIND | AURA_FIRE | WILD_TOO | WILD_VOLCANO |
-F:KILL_ITEM | KILL_BODY | PASS_WALL | POWERFUL | 
-F:IM_FIRE | IM_ELEC | IM_ACID | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | HAS_LITE | NO_CUT
-S:1_IN_7 | 
-S:BO_PLAS | BA_FIRE
+F:AURA_FIRE
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:KILL_ITEM
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:PASS_WALL
+F:POWERFUL
+F:WILD_TOO
+F:WILD_VOLCANO
+S:1_IN_7
+S:BA_FIRE
+S:BO_PLAS
 D:It is a towering glowing form of molten rock. 
 
 N:585:Black pudding
@@ -9866,13 +15747,27 @@ B:TOUCH:ACID:1d10
 B:TOUCH:ACID:1d10
 B:TOUCH:ACID:1d10
 B:TOUCH:ACID:1d10
-F:FORCE_MAXHP | 
-F:FRIENDS | 
-F:DROP_60 | DROP_90 | DROP_1D2 | 
-F:STUPID | EMPTY_MIND | COLD_BLOOD | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | CAN_SWIM | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_60
+F:DROP_90
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FRIENDS
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:STUPID
+F:TAKE_ITEM
 D:A lump of rotting black flesh that slurps across the dungeon floor. 
 
 N:586:Killer iridescent beetle
@@ -9884,10 +15779,17 @@ O:0:0:0:0
 B:CLAW:ELEC:1d12
 B:CLAW:ELEC:1d12
 B:GAZE:PARALYZE
-F:ATTR_MULTI | FORCE_MAXHP | 
-F:WEIRD_MIND | BASH_DOOR | AURA_ELEC | DROP_CORPSE | 
-F:ANIMAL | IM_ELEC | CAN_FLY | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:ANIMAL
+F:ATTR_MULTI
+F:AURA_ELEC
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_ELEC
+F:MORTAL
+F:WEIRD_MIND
 D:It is a giant beetle, whose carapace shimmers with vibrant energies. 
 
 N:587:Nexus vortex
@@ -9897,11 +15799,22 @@ W:37:1:0:800
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:ENGULF:HURT:5d5
-F:FORCE_SLEEP | 
-F:RAND_50 | RAND_25 | RES_NEXU | CAN_FLY |
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | RES_TELE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | BASEANGBAND | HAS_LITE | NO_CUT
-S:1_IN_6 | 
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HAS_LITE
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_25
+F:RAND_50
+F:RES_NEXU
+F:RES_TELE
+S:1_IN_6
 S:BR_NEXU
 D:A maelstrom of potent magical energy. 
 
@@ -9913,12 +15826,25 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:ENGULF:FIRE:4d8
 B:ENGULF:ELEC:4d8
-F:FORCE_SLEEP | SUSCEP_COLD |
-F:RAND_50 | RAND_25 | RES_PLAS | AURA_FIRE | AURA_ELEC |
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | 
-F:IM_FIRE | CAN_FLY |
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | BASEANGBAND | HAS_LITE | NO_CUT
-S:1_IN_6 | 
+F:AURA_ELEC
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_25
+F:RAND_50
+F:RES_PLAS
+F:SUSCEP_COLD
+S:1_IN_6
 S:BR_PLAS
 D:A whirlpool of intense flame, charring the stones at your feet. 
 
@@ -9931,14 +15857,28 @@ O:50:50:0:0
 B:CLAW:HURT:2d10
 B:CLAW:HURT:2d10
 B:BITE:HURT:4d10
-F:FORCE_SLEEP | FORCE_MAXHP | WILD_TOO | WILD_MOUNTAIN | WILD_VOLCANO |
-F:DROP_1D2 | DROP_4D2 | CAN_FLY | DROP_CORPSE | SUSCEP_COLD |
-F:BASH_DOOR | 
-F:EVIL | DRAGON | IM_FIRE | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
 F:ATTR_MULTI
-S:1_IN_9 | 
-S:CONF | SCARE | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:NO_CONF
+F:NO_SLEEP
+F:SUSCEP_COLD
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_VOLCANO
+S:1_IN_9
 S:BR_FIRE
+S:CONF
+S:SCARE
 D:A large dragon, scales tinted deep red. 
 
 N:590:Golden drake
@@ -9950,13 +15890,25 @@ O:50:50:0:0
 B:CLAW:HURT:2d10
 B:CLAW:HURT:2d10
 B:BITE:HURT:4d10
-F:FORCE_SLEEP | FORCE_MAXHP | WILD_TOO | WILD_MOUNTAIN |
-F:DROP_1D2 | DROP_4D2 | CAN_FLY | DROP_CORPSE | 
-F:BASH_DOOR | 
-F:EVIL | DRAGON | NO_STUN | NO_SLEEP | BASEANGBAND | HAS_LITE | ATTR_MULTI
-S:1_IN_9 | 
-S:CONF | SCARE | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:NO_SLEEP
+F:NO_STUN
+F:WILD_MOUNTAIN
+F:WILD_TOO
+S:1_IN_9
 S:BR_SOUN
+S:CONF
+S:SCARE
 D:A large dragon with scales of gleaming gold. 
 
 N:591:Crystal drake
@@ -9968,14 +15920,28 @@ O:50:50:0:0
 B:CLAW:HURT:2d4
 B:CLAW:HURT:2d4
 B:BITE:HURT:3d6
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_3D2 | REFLECTING |
-F:OPEN_DOOR | BASH_DOOR | CAN_FLY |
-F:EVIL | DRAGON | IM_COLD | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE | NO_CUT
 F:ATTR_MULTI
-S:1_IN_6 | 
-S:SLOW | CONF | SCARE | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REFLECTING
+S:1_IN_6
 S:BR_SHAR
+S:CONF
+S:SCARE
+S:SLOW
 D:A dragon of strange crystalline form. Light shines through it, dazzling 
 D:your eyes with spectra of colour. 
 
@@ -9988,13 +15954,24 @@ O:50:50:0:0
 B:CLAW:HURT:2d10
 B:CLAW:HURT:2d10
 B:BITE:HURT:4d10
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | DROP_CORPSE | 
-F:DROP_1D2 DROP_4D2 | WILD_TOO | WILD_SWAMP | WILD_MOUNTAIN |
-F:BASH_DOOR | 
-F:EVIL | DRAGON | IM_ACID | NO_CONF | NO_SLEEP | BASEANGBAND | ATTR_MULTI
-S:1_IN_9 | 
-S:SCARE | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:NO_CONF
+F:NO_SLEEP
+F:WILD_MOUNTAIN
+F:WILD_TOO
+S:1_IN_9
 S:BR_ACID
+S:SCARE
 D:A large dragon, with scales of deepest black. 
 
 N:593:Multi-hued drake
@@ -10006,15 +15983,34 @@ O:50:50:0:0
 B:CLAW:HURT:2d12
 B:CLAW:HURT:2d12
 B:BITE:HURT:4d12
-F:ATTR_MULTI | 
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:DROP_2D2 | DROP_4D2 | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DRAGON | IM_ACID | IM_FIRE | IM_COLD | 
-F:IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
-S:1_IN_7 | 
-S:BLIND | CONF | SCARE | 
-S:BR_ACID | BR_FIRE | BR_COLD | BR_ELEC | BR_POIS
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_SLEEP
+F:OPEN_DOOR
+S:1_IN_7
+S:BLIND
+S:BR_ACID
+S:BR_COLD
+S:BR_ELEC
+S:BR_FIRE
+S:BR_POIS
+S:CONF
+S:SCARE
 D:A large dragon, scales shimmering many colours. 
 
 N:594:Master yeek
@@ -10024,14 +16020,22 @@ W:12:2:600:28
 E:1:1:1:2:1:1
 O:0:0:100:0
 B:HIT:HURT:1d8
-F:FORCE_SLEEP | 
-F:DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:ANIMAL | EVIL | IM_ACID | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND
-S:1_IN_4 | 
-S:BLINK | TPORT | BLIND | SLOW | BA_POIS | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_SLEEP
+F:IM_ACID
+F:MORTAL
+F:OPEN_DOOR
+S:1_IN_4
+S:BA_POIS
+S:BLIND
+S:BLINK
+S:SLOW
 S:S_MONSTER
+S:TPORT
 D:A small humanoid that radiates some power. 
 
 N:595:Orfax, son of Boldor
@@ -10044,16 +16048,31 @@ B:HIT:HURT:1d10
 B:HIT:HURT:1d9
 B:INSULT:*
 B:INSULT:*
-F:UNIQUE | MALE | CAN_SPEAK | DROP_CORPSE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ESCORT | ESCORTS | 
-F:ONLY_ITEM | DROP_90 | DROP_GOOD | 
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:ANIMAL | EVIL | IM_ACID | 
-F:MORTAL | BASEANGBAND
-S:1_IN_4 | 
-S:HEAL | BLINK | TELE_TO | SLOW | CONF | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_GOOD
+F:ESCORT
+F:ESCORTS
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:UNIQUE
+S:1_IN_4
+S:BLINK
+S:CONF
+S:HEAL
+S:SLOW
 S:S_MONSTER
+S:TELE_TO
 D:The son of the yeek King, he has some power, but he's still a yeek.
 
 N:596:Boldor, King of the Yeeks
@@ -10065,16 +16084,33 @@ O:0:90:10:0
 B:HIT:HURT:1d10
 B:HIT:HURT:1d10
 B:HIT:HURT:1d9
-F:UNIQUE | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ESCORT | ESCORTS | 
-F:ONLY_ITEM | DROP_90 | DROP_1D2 | DROP_GOOD | 
-F:SMART | OPEN_DOOR | BASH_DOOR | CAN_SPEAK | DROP_CORPSE | 
-F:ANIMAL | EVIL | IM_ACID | 
-F:MORTAL | BASEANGBAND
-S:1_IN_2 | 
-S:HEAL | BLINK | TPORT | BLIND | SLOW | 
-S:S_KIN | S_MONSTER
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_GOOD
+F:ESCORT
+F:ESCORTS
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:UNIQUE
+S:1_IN_2
+S:BLIND
+S:BLINK
+S:HEAL
+S:SLOW
+S:S_KIN
+S:S_MONSTER
+S:TPORT
 D:A great yeek, powerful in magic and sorcery, but a yeek all the same. 
 
 N:597:Black Numenorean
@@ -10086,12 +16122,25 @@ O:0:90:0:10
 B:HIT:EXP_20:6d6
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | RES_NETH |
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | IM_COLD | BASEANGBAND | HAS_LITE | NO_CUT
-S:1_IN_5 | 
-S:BLIND | SCARE | CAUSE_3 | BO_NETH | 
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_2D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:NO_CUT
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_NETH
+F:SMART
+S:1_IN_5
+S:BLIND
+S:BO_NETH
+S:CAUSE_3
+S:SCARE
 S:S_MONSTERS
 D:It is a humanoid figure dressed in armour of an ancient form. From beneath 
 D:its helmet, eyes glow a baleful red and seem to pierce you like lances of 
@@ -10108,13 +16157,25 @@ B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
-F:UNIQUE | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
-F:SMART | OPEN_DOOR | TAKE_ITEM | BASH_DOOR | 
-F:EVIL | BASEANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:HEAL | TRAPS | BO_FIRE | BO_COLD | BO_ELEC | BO_ICEE
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:TAKE_ITEM
+F:UNIQUE
+S:1_IN_2
+S:BO_COLD
+S:BO_ELEC
+S:BO_FIRE
+S:BO_ICEE
+S:HEAL
 D:A Black Numenorean who usurped the throne of Gondor, he is treacherous and 
 D:evil. 
 
@@ -10125,11 +16186,19 @@ W:38:4:0:800
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:ENGULF:TIME:5d5
-F:FORCE_SLEEP | 
-F:RAND_50 | RAND_25 | 
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | CAN_FLY |
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | BASEANGBAND | NO_CUT
-S:1_IN_6 | 
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_25
+F:RAND_50
+S:1_IN_6
 S:BR_TIME
 D:You haven't seen it yet. 
 
@@ -10141,12 +16210,23 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:ENGULF:BLIND:4d4
 B:ENGULF:BLIND:4d4
-F:FORCE_SLEEP | 
-F:RAND_50 | RAND_25 | CAN_FLY |
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | RES_TELE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | BASEANGBAND | HAS_LITE | NO_CUT
-S:1_IN_4 | 
-S:BR_LITE | SHRIEK
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HAS_LITE
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_25
+F:RAND_50
+F:RES_TELE
+S:1_IN_4
+S:BR_LITE
+S:SHRIEK
 D:A strange pillar of shining light that hurts your eyes. Its shape changes 
 D:constantly as it cuts through the air towards you. It is like a beacon, 
 D:waking monsters from their slumber. 
@@ -10160,14 +16240,28 @@ O:50:50:0:0
 B:CLAW:HURT:4d8
 B:CLAW:HURT:4d8
 B:BITE:ELEC:7d8
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:DROP_3D2 | DROP_4D2 | DROP_CORPSE | 
-F:SMART | BASH_DOOR | POWERFUL | MOVE_BODY | CAN_FLY |
-F:EVIL | DRAGON | IM_ELEC | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
 F:ATTR_MULTI
-S:1_IN_6 | 
-S:BLIND | CONF | SCARE | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ELEC
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:POWERFUL
+F:SMART
+S:1_IN_6
+S:BLIND
 S:BR_ELEC
+S:CONF
+S:SCARE
 D:A huge draconic form. Lightning crackles along its length. 
 
 N:602:Ancient bronze dragon
@@ -10179,13 +16273,27 @@ O:50:50:0:0
 B:CLAW:HURT:4d8
 B:CLAW:HURT:4d8
 B:BITE:HURT:7d8
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE | 
-F:DROP_3D2 | DROP_4D2 | CAN_FLY |
-F:SMART | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DRAGON | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE | ATTR_MULTI
-S:1_IN_6 | 
-S:BLIND | CONF | SCARE | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:POWERFUL
+F:SMART
+S:1_IN_6
+S:BLIND
 S:BR_CONF
+S:CONF
+S:SCARE
 D:A huge draconic form enveloped in a cascade of colour. 
 
 N:603:Beholder
@@ -10198,12 +16306,29 @@ B:GAZE:EXP_20:2d6
 B:GAZE:UN_POWER:2d6
 B:GAZE:INSANITY:2d6
 B:BITE:HURT:6d6
-F:FORCE_SLEEP | FORCE_MAXHP  | RES_TELE | CAN_FLY |
-F:BASH_DOOR | DROP_CORPSE | 
-F:EVIL | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND
-S:1_IN_2 | 
-S:BLIND | SLOW | CONF | SCARE | DRAIN_MANA | MIND_BLAST | 
-S:FORGET | DARKNESS | BO_ACID | BO_FIRE | BO_COLD | BO_ELEC 
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_POIS
+F:NO_CONF
+F:NO_SLEEP
+F:RES_TELE
+S:1_IN_2
+S:BLIND
+S:BO_ACID
+S:BO_COLD
+S:BO_ELEC
+S:BO_FIRE
+S:CONF
+S:DARKNESS
+S:DRAIN_MANA
+S:FORGET
+S:MIND_BLAST
+S:SCARE
+S:SLOW
 D:A vile creature with one huge central eye, twelve smaller eyes on stalks, and 
 D:a huge mouth filled with sharp teeth. 
 
@@ -10217,13 +16342,28 @@ B:HIT:HURT:1d12
 B:HIT:HURT:1d12
 B:TOUCH:EXP_80
 B:TOUCH:EXP_80
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_90 | DROP_4D2 | CAN_FLY |
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_6 | 
-S:HOLD | SCARE | CAUSE_3 | BO_NETH
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_4D2
+F:DROP_90
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNDEAD
+S:1_IN_6
+S:BO_NETH
+S:CAUSE_3
+S:HOLD
+S:SCARE
 D:Your life force is torn from your body as this powerful unearthly being 
 D:approaches. 
 
@@ -10236,10 +16376,15 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:POISON:3d12
 B:BITE:POISON:3d12
-F:FORCE_MAXHP | KILL_BODY | FRIENDS | DROP_SKELETON
-F:WEIRD_MIND | BASH_DOOR | 
-F:ANIMAL | IM_POIS | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:FRIENDS
+F:IM_POIS
+F:KILL_BODY
+F:MORTAL
+F:WEIRD_MIND
 D:A giant ant covered in shaggy fur. Its powerful jaws drip venom. 
 
 N:606:Vargo, Tyrant of Fire
@@ -10252,14 +16397,32 @@ B:HIT:FIRE:6d6
 B:HIT:FIRE:6d6
 B:HIT:FIRE:6d6
 B:HIT:FIRE:6d6
-F:UNIQUE | SUSCEP_COLD |
-F:FORCE_SLEEP | FORCE_MAXHP | RAND_25 | CAN_SPEAK |
-F:EMPTY_MIND | CAN_SPEAK | MALE | AURA_FIRE |
-F:KILL_ITEM | KILL_BODY | BASH_DOOR | POWERFUL | 
-F:IM_FIRE | IM_ACID | IM_POIS | IM_ELEC | NO_STUN |
-F:NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE | NO_CUT
-S:1_IN_4 | 
-S:BO_PLAS | BA_FIRE
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:CAN_SPEAK
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:KILL_ITEM
+F:MALE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:NO_STUN
+F:POWERFUL
+F:RAND_25
+F:SUSCEP_COLD
+F:UNIQUE
+S:1_IN_4
+S:BA_FIRE
+S:BO_PLAS
 D:A towering fire elemental, Vargo burns everything beyond recognition. 
 
 N:607:Black wraith
@@ -10272,13 +16435,29 @@ B:HIT:HURT:1d12
 B:HIT:HURT:1d12
 B:TOUCH:EXP_40
 B:TOUCH:EXP_40
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP
-F:BASEANGBAND | NO_CUT
-S:1_IN_7 | 
-S:BLIND | HOLD | SCARE | CAUSE_3 | BO_NETH
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_2D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNDEAD
+S:1_IN_7
+S:BLIND
+S:BO_NETH
+S:CAUSE_3
+S:HOLD
+S:SCARE
 D:A figure that seems made of void, its strangely human shape is cloaked in 
 D:shadow. It reaches out at you. 
 
@@ -10291,9 +16470,14 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:BLIND:3d12
 B:BITE:BLIND:3d12
-F:FORCE_MAXHP | KILL_BODY | FRIENDS | DROP_SKELETON
-F:WEIRD_MIND | BASH_DOOR | ANIMAL | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:FRIENDS
+F:KILL_BODY
+F:MORTAL
+F:WEIRD_MIND
 D:A giant ant covered in shaggy fur. Its powerful jaws click with blinding speed. 
 
 # New monster added by furiosity for the Theme module
@@ -10305,9 +16489,15 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:CONFUSE:3d12
 B:BITE:CONFUSE:3d12
-F:FORCE_MAXHP | KILL_BODY | FRIENDS | DROP_SKELETON
-F:WEIRD_MIND | BASH_DOOR | ANIMAL | NO_CONF | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:FRIENDS
+F:KILL_BODY
+F:MORTAL
+F:NO_CONF
+F:WEIRD_MIND
 D:A giant ant covered in shaggy fur. Its powerful jaws make puzzling 
 D:noises as they snap shut. 
 
@@ -10320,10 +16510,17 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:3d12
 B:BITE:HURT:3d12
-F:FORCE_MAXHP | KILL_BODY | FRIENDS | DROP_SKELETON
-F:WEIRD_MIND | BASH_DOOR | CAN_SWIM | 
-F:ANIMAL | RES_WATE | AQUATIC | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:FRIENDS
+F:KILL_BODY
+F:MORTAL
+F:RES_WATE
+F:WEIRD_MIND
 S:1_IN_4
 S:BA_WATE
 D:A strange antlike creature, animated by a powerful wizard you 
@@ -10339,14 +16536,35 @@ B:KICK:HURT:24d1
 B:KICK:HURT:24d1
 B:CLAW:EXP_80:4d2
 B:CLAW:LOSE_DEX:4d2
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | RES_TELE | 
-F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | SMART |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND
-F:NO_CUT
-S:1_IN_3 | 
-S:BLINK | TELE_TO | BLIND | HOLD | CONF | SCARE | CAUSE_3 | CAUSE_4 | 
-S:DRAIN_MANA | BRAIN_SMASH | ANIM_DEAD 
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_4D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:SMART
+F:SMART
+F:UNDEAD
+S:1_IN_3
+S:BLIND
+S:BLINK
+S:BRAIN_SMASH
+S:CAUSE_3
+S:CAUSE_4
+S:CONF
+S:DRAIN_MANA
+S:HOLD
+S:SCARE
+S:TELE_TO
 D:A skeletal form wrapped in priestly robes. Before its un-death, it 
 D:was a monk in an evil order. 
 
@@ -10360,13 +16578,30 @@ B:HIT:HURT:1d12
 B:HIT:HURT:1d12
 B:TOUCH:EXP_80
 B:TOUCH:EXP_80
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:ONLY_ITEM | DROP_90 | DROP_4D2 | 
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | 
-F:HURT_LITE | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_6 | 
-S:BLIND | SCARE | CAUSE_3 | MIND_BLAST | DARKNESS | BO_NETH
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_4D2
+F:DROP_90
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PASS_WALL
+F:UNDEAD
+S:1_IN_6
+S:BLIND
+S:BO_NETH
+S:CAUSE_3
+S:DARKNESS
+S:MIND_BLAST
+S:SCARE
 D:A form that hurts the eye, death permeates the air around it. As it nears 
 D:you, a coldness saps your soul. 
 
@@ -10379,11 +16614,21 @@ O:0:0:0:0
 B:BITE:FIRE:3d12
 B:BITE:FIRE:3d12
 B:BITE:FIRE:3d12
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE 
-F:RAND_25 | FRIENDS | AURA_FIRE | SUSCEP_COLD |
-F:BASH_DOOR | MOVE_BODY | 
-F:ANIMAL | EVIL | IM_FIRE | BASEANGBAND | HAS_LITE | 
-S:1_IN_5 | BR_FIRE
+F:ANIMAL
+F:AURA_FIRE
+F:BASH_DOOR
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:FRIENDS
+F:HAS_LITE
+F:IM_FIRE
+F:MOVE_BODY
+F:RAND_25
+F:SUSCEP_COLD
+S:1_IN_5
+S:BR_FIRE
 D:It is a giant dog that glows with heat. Flames pour from its nostrils. 
 
 N:614:7-headed hydra
@@ -10396,13 +16641,23 @@ B:BITE:POISON:3d9
 B:BITE:POISON:3d9
 B:BITE:POISON:3d9
 B:SPIT:BLIND:1d2
-F:FORCE_SLEEP | WILD_TOO | WILD_SHORE | WILD_SWAMP |
-F:ONLY_GOLD | DROP_2D2 | DROP_4D2 | CAN_SWIM | DROP_CORPSE
-F:BASH_DOOR | MOVE_BODY | 
-F:ANIMAL | IM_POIS | MORTAL | BASEANGBAND
-S:1_IN_5 | 
-S:SCARE | BA_POIS | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:IM_POIS
+F:MORTAL
+F:MOVE_BODY
+F:ONLY_GOLD
+F:WILD_SHORE
+F:WILD_TOO
+S:1_IN_5
+S:BA_POIS
 S:BR_POIS
+S:SCARE
 D:A strange reptilian creature with seven heads dripping venom. 
 
 N:615:Waldern, King of Water
@@ -10415,14 +16670,28 @@ B:HIT:HURT:8d5
 B:HIT:HURT:8d5
 B:HIT:HURT:8d5
 B:HIT:HURT:8d5
-F:UNIQUE | 
-F:FORCE_SLEEP | FORCE_MAXHP |
-F:EMPTY_MIND | COLD_BLOOD | 
-F:KILL_ITEM | KILL_BODY | BASH_DOOR | POWERFUL | 
-F:IM_ACID | IM_FIRE | IM_POIS | IM_COLD |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_3 | 
-S:BO_ICEE | BO_WATE | BA_COLD | BA_WATE
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:KILL_ITEM
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:UNIQUE
+S:1_IN_3
+S:BA_COLD
+S:BA_WATE
+S:BO_ICEE
+S:BO_WATE
 D:A towering water elemental, Waldern is master of all things liquid. 
 D:Wave after wave drowns your frail body. 
 
@@ -10435,10 +16704,17 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d6
 B:BITE:HURT:1d6
-F:FORCE_MAXHP | KILL_BODY | FRIENDS | DROP_SKELETON
-F:WEIRD_MIND | BASH_DOOR | SUSCEP_FIRE |
-F:ANIMAL | AI_ANNOY | KILL_TREES |  
-F:MORTAL | BASEANGBAND
+F:AI_ANNOY
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:FRIENDS
+F:KILL_BODY
+F:KILL_TREES
+F:MORTAL
+F:SUSCEP_FIRE
+F:WEIRD_MIND
 S:MULTIPLY
 D:An extremely annoying antlike creature. Its bulbous eyes seem 
 D:almost covetous as they focus on your wooden paraphernalia.
@@ -10452,14 +16728,28 @@ O:50:50:0:0
 B:CLAW:HURT:4d8
 B:CLAW:HURT:4d8
 B:BITE:COLD:7d8
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:DROP_3D2 | DROP_4D2 | DROP_CORPSE | 
-F:SMART | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DRAGON | IM_COLD | NO_CONF | NO_SLEEP | SUSCEP_FIRE | BASEANGBAND
-F:HAS_LITE | ATTR_MULTI
-S:1_IN_6 | 
-S:BLIND | CONF | SCARE | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:DRAGON
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:POWERFUL
+F:SMART
+F:SUSCEP_FIRE
+S:1_IN_6
+S:BLIND
 S:BR_COLD
+S:CONF
+S:SCARE
 D:A huge draconic form. Frost covers it from head to tail. 
 
 N:618:Ancient green dragon
@@ -10471,14 +16761,28 @@ O:50:50:0:0
 B:CLAW:HURT:4d8
 B:CLAW:HURT:4d8
 B:BITE:POISON:7d8
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE | 
-F:DROP_3D2 | DROP_4D2 | CAN_FLY |
-F:SMART | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DRAGON | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
 F:ATTR_MULTI
-S:1_IN_6 | 
-S:BLIND | CONF | SCARE | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_POIS
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:POWERFUL
+F:SMART
+S:1_IN_6
+S:BLIND
 S:BR_POIS
+S:CONF
+S:SCARE
 D:A huge draconic form enveloped in clouds of poisonous vapour. 
 
 # New monster added by furiosity for the Theme module
@@ -10491,9 +16795,18 @@ O:0:0:0:0
 B:BITE:TERRIFY:1d3
 B:CLAW:COLD:1d2
 B:CLAW:COLD:1d2
-F:RAND_50 | CAN_FLY | WILD_TOO | WILD_MOUNTAIN | WILD_WOOD |
-F:FORCE_SLEEP | ANIMAL | DROP_CORPSE | AI_ANNOY | IM_COLD | 
-F:SUSCEP_FIRE | MORTAL | BASEANGBAND
+F:AI_ANNOY
+F:ANIMAL
+F:CAN_FLY
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:IM_COLD
+F:MORTAL
+F:RAND_50
+F:SUSCEP_FIRE
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:A giant bat adapted to extremely cold temperatures. 
 
 N:620:Eldrak
@@ -10506,10 +16819,22 @@ B:HIT:HURT:3d6
 B:HIT:HURT:3d6
 B:BITE:HURT:3d4
 B:BITE:HURT:3d4
-F:FORCE_MAXHP | MOVE_BODY | 
-F:ONLY_ITEM | DROP_2D2 | REGENERATE | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | WILD_SHORE | WILD_WOOD |
-F:EVIL | TROLL | IM_POIS | NO_CONF | NO_SLEEP | DROP_CORPSE | BASEANGBAND
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:IM_POIS
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:TAKE_ITEM
+F:TROLL
+F:WILD_SHORE
+F:WILD_WOOD
 D:Melkor created trolls in mockery of the Ents. A massive troll of 
 D:huge strength, extremely stupid and extremely violent. 
 
@@ -10523,10 +16848,22 @@ B:HIT:HURT:3d8
 B:HIT:HURT:3d8
 B:BITE:HURT:3d8
 B:BITE:HURT:3d8
-F:FORCE_MAXHP | REGENERATE | MOVE_BODY | 
-F:ONLY_ITEM | DROP_1D2 | WILD_TOO | WILD_MOUNTAIN | WILD_WOOD | WILD_SWAMP |
-F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | 
-F:EVIL | TROLL | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:IM_POIS
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:TROLL
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:Melkor created trolls in mockery of the Ents. A massive two-headed troll, 
 D:larger and stronger than many men together. 
 
@@ -10540,11 +16877,21 @@ B:BITE:EXP_80:2d6
 B:HIT:HURT:3d8
 B:HIT:HURT:3d8
 B:HIT:CONFUSE:6d6
-F:FORCE_MAXHP | 
-F:ONLY_GOLD | DROP_2D2 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | CAN_FLY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND
-F:HAS_LITE | NO_CUT
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_2D2
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:UNDEAD
 D:A fearsome skeletal horse with glowing eyes that watch you with little 
 D:more than hatred for all that lives. Its flying hooves do not touch the 
 D:ground. 
@@ -10559,14 +16906,34 @@ B:HIT:HURT:3d6
 B:HIT:HURT:3d6
 B:BITE:EXP_80:4d6
 B:BITE:EXP_80:4d6
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:DROP_60 | DROP_4D2 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | REGENERATE | RES_TELE | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_7 | 
-S:BLIND | HOLD | SCARE | CAUSE_3 | CAUSE_4 | DRAIN_MANA | 
-S:BRAIN_SMASH | DARKNESS | BO_NETH
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_4D2
+F:DROP_60
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:REGENERATE
+F:RES_TELE
+F:UNDEAD
+S:1_IN_7
+S:BLIND
+S:BO_NETH
+S:BRAIN_SMASH
+S:CAUSE_3
+S:CAUSE_4
+S:DARKNESS
+S:DRAIN_MANA
+S:HOLD
+S:SCARE
 D:A foul wind chills your bones as this ghastly figure approaches. 
 
 N:624:Ancient black dragon
@@ -10578,13 +16945,27 @@ O:50:50:0:0
 B:CLAW:HURT:4d9
 B:CLAW:HURT:4d9
 B:BITE:ACID:7d9
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:DROP_3D2 | DROP_4D2 | DROP_CORPSE | 
-F:SMART | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DRAGON | IM_ACID | NO_CONF | NO_SLEEP | BASEANGBAND | ATTR_MULTI
-S:1_IN_6 | 
-S:BLIND | CONF | SCARE | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:POWERFUL
+F:SMART
+S:1_IN_6
+S:BLIND
 S:BR_ACID
+S:CONF
+S:SCARE
 D:A huge draconic form. Pools of acid melt the floor around it. 
 
 N:625:Weird fume
@@ -10595,13 +16976,29 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:ENGULF:CONFUSE:8d4
 B:ENGULF:CONFUSE:8d4
-F:FORCE_SLEEP | 
-F:RAND_50 | RAND_25 | RES_NEXU |  AURA_ELEC | IM_FIRE | IM_ELEC |
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | 
-F:CAN_FLY | ATTR_MULTI | ATTR_ANY |
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | JOKEANGBAND | NO_CUT
-S:1_IN_6 | 
-S:BR_CHAO | BR_NEXU | BR_NUKE
+F:ATTR_ANY
+F:ATTR_MULTI
+F:AURA_ELEC
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:IM_ELEC
+F:IM_FIRE
+F:JOKEANGBAND
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_25
+F:RAND_50
+F:RES_NEXU
+S:1_IN_6
+S:BR_CHAO
+S:BR_NEXU
+S:BR_NUKE
 D:A swirling spiral of mist, constantly changing its appearance. 
 
 # New monster added by furiosity for the Theme module
@@ -10614,9 +17011,16 @@ O:0:0:0:0
 B:BITE:TERRIFY:1d3
 B:CLAW:PARALYZE:1d2
 B:CLAW:HURT:1d2
-F:RAND_50 | CAN_FLY | WILD_TOO | WILD_MOUNTAIN | WILD_WOOD |
-F:FORCE_SLEEP | ANIMAL | DROP_CORPSE | AI_ANNOY |
-F:MORTAL | BASEANGBAND
+F:AI_ANNOY
+F:ANIMAL
+F:CAN_FLY
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:MORTAL
+F:RAND_50
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:A giant bat whose very presence makes you feel weary. 
 
 # New monster added by furiosity for the Theme module
@@ -10629,9 +17033,16 @@ O:0:0:0:0
 B:BITE:LOSE_DEX:1d3
 B:CLAW:HALLU:1d2
 B:CLAW:HURT:1d2
-F:RAND_50 | CAN_FLY | WILD_TOO | WILD_MOUNTAIN | WILD_WOOD |
-F:FORCE_SLEEP | ANIMAL | DROP_CORPSE | AI_ANNOY | 
-F:MORTAL | BASEANGBAND
+F:AI_ANNOY
+F:ANIMAL
+F:CAN_FLY
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:MORTAL
+F:RAND_50
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:A giant bat, its wings shimmering a pale mesmerizing silver.
 
 # New monster added by furiosity for the Theme module
@@ -10644,9 +17055,16 @@ O:0:0:0:0
 B:BITE:LOSE_CHR:1d3
 B:CLAW:EAT_LITE:1d2
 B:CLAW:EAT_LITE:1d2
-F:RAND_50 | CAN_FLY | WILD_TOO | WILD_MOUNTAIN | WILD_WOOD |
-F:FORCE_SLEEP | ANIMAL | DROP_CORPSE | AI_ANNOY | 
-F:MORTAL | BASEANGBAND
+F:AI_ANNOY
+F:ANIMAL
+F:CAN_FLY
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:MORTAL
+F:RAND_50
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:A giant bat which seems to absorb all light as it passes. 
 
 N:629:Shadowfax, steed of Gandalf
@@ -10658,10 +17076,24 @@ O:0:0:0:0
 B:KICK:HURT:5d5
 B:KICK:HURT:5d5
 B:BITE:HURT:6d6
-F:FORCE_MAXHP | UNIQUE | ANIMAL | GOOD | NEUTRAL | NO_TARGET | 
-F:REGENERATE | BASH_DOOR | IM_FIRE | IM_COLD | IM_ELEC |
-F:IM_POIS | NO_FEAR | DROP_CORPSE | WILD_ONLY | WILD_WOOD | WILD_GRASS |
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:GOOD
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:NEUTRAL
+F:NO_FEAR
+F:NO_TARGET
+F:REGENERATE
+F:UNIQUE
+F:WILD_GRASS
+F:WILD_ONLY
+F:WILD_WOOD
 D:Shadowfax is the chief of the Mearas, the greatest of all horses that are 
 D:bred in the fields of Rohan.  Although the Mearas should technically be only 
 D:ridden by the royal family of Rohan, only Gandalf the Wizard has ever 
@@ -10677,11 +17109,19 @@ O:10:90:0:0
 B:HIT:HURT:3d6
 B:HIT:HURT:3d5
 B:HIT:HURT:3d5
-F:FORCE_MAXHP | 
-F:DROP_90 | 
-F:INVISIBLE | PASS_WALL | CAN_FLY |
-F:EVIL | TROLL | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:CAN_FLY
+F:DROP_90
+F:EVIL
+F:FORCE_MAXHP
+F:IM_COLD
+F:IM_ELEC
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
+F:TROLL
 D:A ghostly troll-like being from the ethereal plane. 
 
 N:631:War troll
@@ -10694,10 +17134,21 @@ B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:BITE:HURT:3d5
 B:BITE:HURT:3d5
-F:FORCE_MAXHP | SUSCEP_FIRE | REGENERATE | 
-F:DROP_90 | REGENERATE | FRIENDS |
-F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | 
-F:EVIL | TROLL | IM_POIS | NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND
+F:BASH_DOOR
+F:DROP_90
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FRIENDS
+F:IM_POIS
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:REGENERATE
+F:REGENERATE
+F:SUSCEP_FIRE
+F:TROLL
 D:An corruption of Morgoth, it was made in mockery of the Ents. 
 D:A massive troll, equipped with a scimitar and heavy armour. 
 
@@ -10708,9 +17159,17 @@ W:40:3:50:30
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:CRAWL:UN_BONUS:1d4
-F:RAND_50 | RES_DISE | ATTR_MULTI | CAN_SWIM |
-F:STUPID | WEIRD_MIND | BASH_DOOR | 
-F:ANIMAL | HURT_LITE | NO_FEAR | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_SWIM
+F:HURT_LITE
+F:NO_CUT
+F:NO_FEAR
+F:RAND_50
+F:RES_DISE
+F:STUPID
+F:WEIRD_MIND
 S:MULTIPLY
 D:It is a strange mass of squirming worms. Magical energy crackles 
 D:around its disgusting form. 
@@ -10721,12 +17180,20 @@ I:120:48d10:20:1:0
 W:45:1:3000:3000
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:FORCE_SLEEP | FORCE_MAXHP | NEVER_MOVE | NEVER_BLOW | 
-F:INVISIBLE | EMPTY_MIND | ANIMAL | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND
-S:1_IN_2 | 
-S:BLINK | TPORT | 
+F:ANIMAL
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:INVISIBLE
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+S:1_IN_2
+S:BLINK
 S:S_UNDEAD
+S:TPORT
 D:It is a pulsing flesh mound that reeks of death and putrefaction. 
 
 N:634:Lesser titan
@@ -10739,13 +17206,25 @@ B:HIT:CONFUSE:9d9
 B:HIT:CONFUSE:9d9
 B:HIT:CONFUSE:9d9
 B:HIT:CONFUSE:9d9
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:DROP_GOOD | DROP_4D2 | DROP_SKELETON | DROP_CORPSE | 
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR |
-F:EVIL | GIANT | MALE | BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:HEAL | TELE_TO | SCARE | 
+F:BASH_DOOR
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GIANT
+F:HAS_LITE
+F:MALE
+F:OPEN_DOOR
+F:SMART
+F:TAKE_ITEM
+S:1_IN_3
+S:HEAL
+S:SCARE
 S:S_MONSTERS
+S:TELE_TO
 D:It is a humanoid figure thirty feet tall that gives off an aura of power 
 D:and hate. 
 
@@ -10759,12 +17238,24 @@ B:BITE:FIRE:3d10
 B:BITE:FIRE:3d10
 B:BITE:FIRE:3d10
 B:BITE:FIRE:3d10
-F:FORCE_SLEEP | WILD_TOO | WILD_SHORE | WILD_SWAMP |
-F:ONLY_GOLD | DROP_3D2 | DROP_4D2 | CAN_SWIM | 
-F:OPEN_DOOR | BASH_DOOR | MOVE_BODY | DROP_CORPSE | 
-F:ANIMAL | IM_FIRE | MORTAL | BASEANGBAND
-S:1_IN_4 | 
-S:SCARE | BO_FIRE | BR_FIRE
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:IM_FIRE
+F:MORTAL
+F:MOVE_BODY
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:WILD_SHORE
+F:WILD_TOO
+S:1_IN_4
+S:BO_FIRE
+S:BR_FIRE
+S:SCARE
 D:A strange reptilian creature with nine smouldering heads. 
 
 N:636:Enchantress
@@ -10776,14 +17267,23 @@ O:0:0:100:0
 B:HIT:HURT:2d6
 B:HIT:HURT:2d6
 B:HIT:HURT:2d8
-F:FEMALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | NO_CONF | NO_SLEEP
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:BLIND | 
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+S:1_IN_2
+S:BLIND
 S:S_DRAGON
 D:This elusive female spellcaster has a special affinity for dragons, whom 
 D:she rarely fights without. 
@@ -10797,16 +17297,39 @@ O:30:50:20:0
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
-F:MALE | INVISIBLE | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE
-F:ONLY_ITEM | DROP_2D2 | TAKE_ITEM | 
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | NO_CONF | NO_SLEEP | IM_FIRE | IM_ELEC | IM_COLD | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_4 |
-S:S_MONSTERS |  
-S:ARROW_2 | ARROW_3 | ARROW_4 | MISSILE | BO_FIRE | BO_ELEC | BA_COLD | 
-S:HASTE | BLINK | S_ANIMALS
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:MALE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:TAKE_ITEM
+S:1_IN_4
+S:ARROW_2
+S:ARROW_3
+S:ARROW_4
+S:BA_COLD
+S:BLINK
+S:BO_ELEC
+S:BO_FIRE
+S:HASTE
+S:MISSILE
+S:S_ANIMALS
+S:S_MONSTERS
 D:A chieftain among the Rangers.  His understanding of nature gives him 
 D:powerful elemental spells to use against you, in addition to his skills 
 D:as an archer and a warrior.  Furthermore, he is a master of camouflage, so 
@@ -10821,16 +17344,33 @@ O:0:0:100:0
 B:HIT:HURT:2d8
 B:HIT:HURT:2d8
 B:HIT:HURT:2d8
-F:MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_90 | DROP_4D2 | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | NO_CONF | NO_SLEEP | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:BLINK | TELE_TO | BLIND | CONF | CAUSE_3 | TRAPS | 
-S:BO_ACID | BA_FIRE | BA_COLD | 
-S:S_MONSTER | S_UNDEAD | S_DRAGON
+F:BASH_DOOR
+F:DROP_4D2
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+S:1_IN_2
+S:BA_COLD
+S:BA_FIRE
+S:BLIND
+S:BLINK
+S:BO_ACID
+S:CAUSE_3
+S:CONF
+S:S_DRAGON
+S:S_MONSTER
+S:S_UNDEAD
+S:TELE_TO
 D:A human figure in robes, he moves with magically improved speed, and his 
 D:hands are ablur with spellcasting. 
 
@@ -10844,12 +17384,22 @@ B:HIT:HURT:3d4
 B:HIT:HURT:3d4
 B:HIT:HURT:3d4
 B:HIT:HURT:3d4
-F:FORCE_MAXHP | SUSCEP_ACID |
-F:EMPTY_MIND | COLD_BLOOD |
-F:ONLY_GOLD | DROP_2D2 |  
-F:KILL_ITEM | PASS_WALL | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:HURT_ROCK | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:COLD_BLOOD
+F:DROP_2D2
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:HURT_ROCK
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_ITEM
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_GOLD
+F:PASS_WALL
+F:SUSCEP_ACID
 D:It is a tougher relative of the Xorn. Its hide glitters with metal ores. 
 
 # New monster added by furiosity for the Theme module
@@ -10862,9 +17412,16 @@ O:0:0:0:0
 B:BITE:TERRIFY:1d3
 B:CLAW:LOSE_INT:1d2
 B:CLAW:DISEASE:1d2
-F:RAND_50 | CAN_FLY | WILD_TOO | WILD_MOUNTAIN | WILD_WOOD |
-F:FORCE_SLEEP | ANIMAL | DROP_CORPSE | AI_ANNOY | 
-F:MORTAL | BASEANGBAND
+F:AI_ANNOY
+F:ANIMAL
+F:CAN_FLY
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:MORTAL
+F:RAND_50
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:A giant bat which is an expert at disguise in a forest. 
 
 # New monster added by furiosity for the Theme module
@@ -10878,13 +17435,32 @@ B:ENGULF:LOSE_ALL:5d5
 B:ENGULF:EXP_80:5d5
 B:ENGULF:LOSE_ALL:5d5
 B:ENGULF:EXP_80:5d5
-F:FORCE_SLEEP | CAN_FLY |
-F:RAND_50 | RAND_25 | RES_DISE | RES_NETH | RES_NEXU |
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | BASEANGBAND | NO_CUT
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS |
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | RES_PLAS | 
-S:1_IN_6 | 
-S:ANIM_DEAD | BO_MANA | DARKNESS | BA_DARK | DRAIN_MANA | 
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_25
+F:RAND_50
+F:RES_DISE
+F:RES_NETH
+F:RES_NEXU
+F:RES_PLAS
+S:1_IN_6
+S:BA_DARK
+S:BO_MANA
+S:DARKNESS
+S:DRAIN_MANA
 D:A whirlpool of darkness that smells like death and decay. 
 
 # New monster added by furiosity for the Theme module
@@ -10895,12 +17471,23 @@ W:21:1:0:100
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:ENGULF:POISON:3d3
-F:FORCE_SLEEP | RAND_50 | CAN_FLY | WILD_WASTE |
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | WILD_TOO | 
-F:IM_FIRE | NO_FEAR | NO_CONF | NO_SLEEP | 
-F:NONLIVING | BASEANGBAND | HAS_LITE | NO_CUT | 
-S:1_IN_6 | 
-S:BR_POIS | 
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_50
+F:WILD_TOO
+F:WILD_WASTE
+S:1_IN_6
+S:BR_POIS
 D:A whirlpool of noxious gases. 
 
 N:643:Death drake
@@ -10912,14 +17499,30 @@ O:50:50:0:0
 B:CLAW:HURT:4d10
 B:CLAW:HURT:4d10
 B:BITE:EXP_80:7d10
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | RES_TELE
-F:INVISIBLE | TAKE_ITEM | CAN_FLY |
-F:PASS_WALL | POWERFUL | MOVE_BODY | RES_NETH |
-F:EVIL | DRAGON | IM_COLD | NO_CONF | NO_SLEEP | BASEANGBAND | ATTR_MULTI
-S:1_IN_6 | 
-S:SLOW | CONF | SCARE | 
+F:ATTR_MULTI
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_4D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:INVISIBLE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PASS_WALL
+F:POWERFUL
+F:RES_NETH
+F:RES_TELE
+F:TAKE_ITEM
+S:1_IN_6
 S:BR_NETH
+S:CONF
+S:SCARE
+S:SLOW
 D:It is a dragon-like form wrapped in darkness. You cannot make out its 
 D:true form but you sense its evil. 
 
@@ -10932,14 +17535,29 @@ O:50:50:0:0
 B:CLAW:HURT:4d9
 B:CLAW:HURT:4d9
 B:BITE:FIRE:7d9
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE
-F:DROP_3D2 | DROP_4D2 | CAN_FLY | SUSCEP_COLD |
-F:SMART | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DRAGON | IM_FIRE | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
 F:ATTR_MULTI
-S:1_IN_6 | 
-S:BLIND | CONF | SCARE | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:POWERFUL
+F:SMART
+F:SUSCEP_COLD
+S:1_IN_6
+S:BLIND
 S:BR_FIRE
+S:CONF
+S:SCARE
 D:A huge draconic form. Wisps of smoke steam from its nostrils and the 
 D:extreme heat surrounding it makes you gasp for breath. 
 
@@ -10952,13 +17570,27 @@ O:50:50:0:0
 B:CLAW:HURT:4d9
 B:CLAW:HURT:4d9
 B:BITE:HURT:7d9
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE
-F:DROP_3D2 | DROP_4D2 | CAN_FLY |
-F:SMART | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DRAGON | NO_STUN | NO_SLEEP | BASEANGBAND | HAS_LITE | ATTR_MULTI
-S:1_IN_6 | 
-S:BLIND | CONF | SCARE | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MOVE_BODY
+F:NO_SLEEP
+F:NO_STUN
+F:POWERFUL
+F:SMART
+S:1_IN_6
+S:BLIND
 S:BR_SOUN
+S:CONF
+S:SCARE
 D:A huge draconic form wreathed in a nimbus of light. Its roar stuns and 
 D:deafens you. 
 
@@ -10971,14 +17603,31 @@ O:50:50:0:0
 B:CLAW:HURT:4d10
 B:CLAW:HURT:4d10
 B:BITE:HURT:7d10
-F:FORCE_SLEEP | FORCE_MAXHP | REFLECTING | DROP_CORPSE
-F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | CAN_FLY |
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DRAGON | IM_COLD | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE | NO_CUT
 F:ATTR_MULTI
-S:1_IN_6 | 
-S:SLOW | CONF | SCARE | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:MOVE_BODY
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:REFLECTING
+S:1_IN_6
 S:BR_SHAR
+S:CONF
+S:SCARE
+S:SLOW
 D:A huge crystalline dragon. Its claws could cut you to shreds and its 
 D:teeth are razor sharp. Strange colours ripple through it as it moves in 
 D:the light. 
@@ -10991,12 +17640,23 @@ W:21:1:0:100
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:ENGULF:LOSE_ALL:3d3
-F:FORCE_SLEEP | RAND_50 | CAN_FLY | WILD_WASTE |
-F:EMPTY_MIND | BASH_DOOR | WILD_TOO | POWERFUL | 
-F:IM_FIRE | NO_FEAR | NO_CONF | NO_SLEEP | 
-F:NONLIVING | BASEANGBAND | HAS_LITE | NO_CUT | 
-S:1_IN_8 | 
-S:BR_MANA | 
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_50
+F:WILD_TOO
+F:WILD_WASTE
+S:1_IN_8
+S:BR_MANA
 D:A whirlpool of pure magical energy.
 
 N:648:Helcungol
@@ -11009,13 +17669,24 @@ B:STING:POISON:3d4
 B:SPIT:COLD:3d4
 B:HIT:HURT:3d4
 B:CRUSH:HURT:8d12
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:FRIENDS | 
-F:ONLY_ITEM | DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | IM_FIRE | 
-F:EVIL | DEMON | IM_COLD | NO_CONF | NO_SLEEP | BASEANGBAND
-S:1_IN_8 | 
-S:BLIND | CONF | SLOW
+F:BASH_DOOR
+F:DEMON
+F:DROP_60
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:FRIENDS
+F:IM_COLD
+F:IM_FIRE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+S:1_IN_8
+S:BLIND
+S:CONF
+S:SLOW
 D:One of the spider demons, spawn of Ungoliant. It looks like 
 D:a giant bloated spider and its claws are icy cold.
 
@@ -11028,13 +17699,31 @@ O:0:50:50:0
 B:BITE:LOSE_DEX:3d6
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_90 | DROP_2D2 | DROP_4D2 | NONLIVING |
-F:SMART | INVISIBLE | PASS_WALL | CAN_FLY |
-F:EVIL | DEMON | IM_FIRE | IM_POIS | RES_TELE
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND
-S:1_IN_10 | 
-S:BLIND | CONF | SCARE | CAUSE_3 | FORGET | 
+F:CAN_FLY
+F:DEMON
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_90
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:NONLIVING
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PASS_WALL
+F:RES_TELE
+F:SMART
+S:1_IN_10
+S:BLIND
+S:CAUSE_3
+S:CONF
+S:FORGET
+S:SCARE
 S:S_DEMON
 D:Lygroeg are corrupted demonic snakelike forms, an evil creation 
 D:of Morgoth. 
@@ -11047,12 +17736,23 @@ W:21:1:0:100
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:ENGULF:PARALYZE:3d3
-F:FORCE_SLEEP | RAND_50 | CAN_FLY | WILD_WASTE |
-F:EMPTY_MIND | BASH_DOOR | WILD_TOO | POWERFUL | 
-F:NO_FEAR | NO_CONF | NO_SLEEP | 
-F:NONLIVING | BASEANGBAND | HAS_LITE | NO_CUT | 
-S:1_IN_8 | 
-S:BR_INER | BR_GRAV | 
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HAS_LITE
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_50
+F:WILD_TOO
+F:WILD_WASTE
+S:1_IN_8
+S:BR_GRAV
+S:BR_INER
 D:A whirlpool of inertia and gravity, twisting slowly.
 
 # New monster added by furiosity for the Theme module
@@ -11063,12 +17763,23 @@ W:21:1:0:100
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:ENGULF:EXP_40:3d3
-F:FORCE_SLEEP | RAND_50 | CAN_FLY | WILD_WASTE |
-F:EMPTY_MIND | BASH_DOOR | WILD_TOO | POWERFUL | 
-F:IM_FIRE | NO_FEAR | NO_CONF | NO_SLEEP | 
-F:NONLIVING | BASEANGBAND | HAS_LITE | NO_CUT | 
-S:1_IN_8 | 
-S:BR_NETH | 
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_50
+F:WILD_TOO
+F:WILD_WASTE
+S:1_IN_8
+S:BR_NETH
 D:A whirlpool of nether forces.
 
 # New monster added by furiosity for the Theme module
@@ -11079,12 +17790,23 @@ W:21:1:0:100
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:ENGULF:CONFUSE:3d3
-F:FORCE_SLEEP | RAND_50 | CAN_FLY | WILD_WASTE |
-F:EMPTY_MIND | BASH_DOOR | WILD_TOO | POWERFUL | 
-F:IM_FIRE | NO_FEAR | NO_CONF | NO_SLEEP | 
-F:NONLIVING | BASEANGBAND | HAS_LITE | NO_CUT | 
-S:1_IN_8 | 
-S:BR_CONF | 
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_50
+F:WILD_TOO
+F:WILD_WASTE
+S:1_IN_8
+S:BR_CONF
 D:A whirlpool of something strange.
 
 # New monster added by furiosity for the Theme module
@@ -11095,12 +17817,16 @@ W:8:1:800:15
 E:1:1:1:2:1:1
 O:0:50:0:30
 B:HIT:HURT:3d6
-F:DROP_60 | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:ANIMAL | IM_ACID | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:IM_ACID
+F:MORTAL
+F:OPEN_DOOR
 S:1_IN_9
-S:S_KIN | CAUSE_1
+S:CAUSE_1
+S:S_KIN
 D:It is a strange small humanoid with a malevolent stare.
 
 N:654:Judge Fire
@@ -11113,15 +17839,44 @@ B:HIT:FIRE:5d5
 B:HIT:FIRE:5d5
 B:GAZE:EXP_80
 B:WAIL:TERRIFY
-F:UNIQUE | MALE | CAN_SPEAK | SUSCEP_COLD |
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | POWERFUL |
-F:OPEN_DOOR | BASH_DOOR | MOVE_BODY | 
-F:EVIL | UNDEAD | SUSCEP_COLD | IM_POIS | IM_FIRE | RES_PLAS | 
-F:NO_CONF | NO_SLEEP | JOKEANGBAND | HAS_LITE | NO_CUT | NO_STUN
-S:1_IN_3 | 
-S:CAUSE_3 | BO_FIRE | BA_FIRE | BR_FIRE | BO_PLAS
-S:DARKNESS | S_MONSTER | S_DEMON | S_UNDEAD | TPORT | BLINK | SCARE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:IM_POIS
+F:JOKEANGBAND
+F:MALE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:RES_PLAS
+F:SUSCEP_COLD
+F:SUSCEP_COLD
+F:UNDEAD
+F:UNIQUE
+S:1_IN_3
+S:BA_FIRE
+S:BLINK
+S:BO_FIRE
+S:BO_PLAS
+S:BR_FIRE
+S:CAUSE_3
+S:DARKNESS
+S:SCARE
+S:S_DEMON
+S:S_MONSTER
+S:S_UNDEAD
+S:TPORT
 D:One of the Dark Judges, he has come to punish your crime of living. 
 D:He looks like a skeleton enveloped in flames. 
 
@@ -11133,12 +17888,17 @@ W:8:1:800:11
 E:1:1:1:2:1:1
 O:0:50:0:30
 B:HIT:HURT:1d6
-F:DROP_60 | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:ANIMAL | IM_ACID | IM_COLD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:IM_ACID
+F:IM_COLD
+F:MORTAL
+F:OPEN_DOOR
 S:1_IN_10
-S:BO_COLD | BO_ICEE | 
+S:BO_COLD
+S:BO_ICEE
 D:It is a strange small humanoid adapted to cold environments.
 
 N:656:Judge Mortis
@@ -11151,16 +17911,41 @@ B:HIT:POISON:5d5
 B:HIT:DISEASE:5d5
 B:TOUCH:LOSE_ALL
 B:TOUCH:EXP_80
-F:UNIQUE | MALE | CAN_SPEAK | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | MOVE_BODY | 
-F:EVIL | UNDEAD | SUSCEP_FIRE | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | JOKEANGBAND | NO_CUT | NO_STUN
-S:1_IN_3 | 
-S:BLIND | SCARE | CAUSE_3 | BO_ACID | BO_NETH | BR_POIS |
-S:BR_NETH | BO_NETH | BLINK | TPORT | ANIM_DEAD
-S:BO_POIS | S_UNDEAD 
+F:BASH_DOOR
+F:CAN_SPEAK
+F:COLD_BLOOD
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:JOKEANGBAND
+F:MALE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SUSCEP_FIRE
+F:UNDEAD
+F:UNIQUE
+S:1_IN_3
+S:BLIND
+S:BLINK
+S:BO_ACID
+S:BO_NETH
+S:BO_NETH
+S:BO_POIS
+S:BR_NETH
+S:BR_POIS
+S:CAUSE_3
+S:SCARE
+S:S_UNDEAD
+S:TPORT
 D:Another Dark Judge, he is a rotting humanoid with a cow's skull as 
 D:his head. 
 
@@ -11173,15 +17958,37 @@ O:0:0:100:0
 B:HIT:HURT:2d8
 B:HIT:HURT:2d8
 B:HIT:HURT:2d8
-F:MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE
-F:ONLY_ITEM | DROP_90 | DROP_4D2 | 
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | HURT_LITE | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:HEAL | BLINK | TELE_TO | BLIND | CONF | CAUSE_3 | DARKNESS | 
-S:BO_ACID | BA_FIRE | BA_COLD | ANIM_DEAD 
-S:S_MONSTER | S_UNDEAD | S_DEMON | MISSILE
+F:BASH_DOOR
+F:DROP_4D2
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:HURT_LITE
+F:MALE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+S:1_IN_2
+S:BA_COLD
+S:BA_FIRE
+S:BLIND
+S:BLINK
+S:BO_ACID
+S:CAUSE_3
+S:CONF
+S:DARKNESS
+S:HEAL
+S:MISSILE
+S:S_DEMON
+S:S_MONSTER
+S:S_UNDEAD
+S:TELE_TO
 D:A dark elven figure, dressed in deepest black. Power seems to crackle 
 D:from his slender frame. 
 
@@ -11195,14 +18002,35 @@ B:TOUCH:EXP_80
 B:TOUCH:UN_POWER
 B:TOUCH:LOSE_DEX:2d12
 B:TOUCH:LOSE_DEX:2d12
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | RES_TELE | 
-F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND
-F:NO_CUT
-S:1_IN_3 | 
-S:BLINK | TELE_TO | BLIND | HOLD | CONF | SCARE | CAUSE_3 | CAUSE_4 | 
-S:DRAIN_MANA | BRAIN_SMASH | S_UNDEAD
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_4D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:SMART
+F:UNDEAD
+S:1_IN_3
+S:BLIND
+S:BLINK
+S:BRAIN_SMASH
+S:CAUSE_3
+S:CAUSE_4
+S:CONF
+S:DRAIN_MANA
+S:HOLD
+S:SCARE
+S:S_UNDEAD
+S:TELE_TO
 D:A skeletal form wrapped in robes. Powerful magic crackles along its 
 D:bony fingers. 
 
@@ -11214,12 +18042,15 @@ W:8:1:800:11
 E:1:1:1:2:1:1
 O:0:50:0:30
 B:HIT:HURT:1d6
-F:DROP_60 | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:ANIMAL | IM_ACID | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:IM_ACID
+F:MORTAL
+F:OPEN_DOOR
 S:1_IN_6
-S:BO_ACID | 
+S:BO_ACID
 D:It is a strange small humanoid cloaked in gray. You notice 
 D:some suspicious-looking vials in his pack.
 
@@ -11229,19 +18060,50 @@ I:130:80d30:20:100:60
 W:49:2:1400:25000
 E:1:1:1:2:1:1
 O:10:40:40:10
+A:84:50
 B:HIT:HURT:3d8
 B:HIT:HURT:3d8
 B:HIT:HURT:3d8
-F:UNIQUE | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE | CAN_SPEAK |
-F:ONLY_ITEM | DROP_4D2 | DROP_2D2 | DROP_GOOD | DROP_CHOSEN |
-F:SMART | IM_ELEC | IM_COLD | IM_POIS | IM_FIRE | 
-F:REFLECTING | OPEN_DOOR | BASH_DOOR | SPECIAL_GENE |
-F:HURT_LITE | BASEANGBAND | HAS_LITE
-S:1_IN_3 |
-S:HEAL | BLINK | TELE_TO | BLIND | CONF | CAUSE_4 | DARKNESS | 
-S:BA_NETH | BA_ELEC | BA_ACID | BA_FIRE | BA_COLD | BO_MANA |  
-S:S_MONSTERS | S_UNDEAD | S_DRAGON | S_DEMON
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_CHOSEN
+F:DROP_CORPSE
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:HURT_LITE
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REFLECTING
+F:SMART
+F:SPECIAL_GENE
+F:UNIQUE
+S:1_IN_3
+S:BA_ACID
+S:BA_COLD
+S:BA_ELEC
+S:BA_FIRE
+S:BA_NETH
+S:BLIND
+S:BLINK
+S:BO_MANA
+S:CAUSE_4
+S:CONF
+S:DARKNESS
+S:HEAL
+S:S_DEMON
+S:S_DRAGON
+S:S_MONSTERS
+S:S_UNDEAD
+S:TELE_TO
 D:A lord of the Teleri, Eol is a mighty metalsmith, the first 
 D:one to ever forge weapons of meteorite iron.  His dark 
 D:countenance glares at you in disdain. 
@@ -11254,11 +18116,15 @@ W:8:1:800:11
 E:1:1:1:2:1:1
 O:0:50:0:30
 B:HIT:HURT:1d6
-F:DROP_60 | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:ANIMAL | IM_ACID | IM_POIS | 
-F:MORTAL | BASEANGBAND
-S:1_IN_7 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:IM_ACID
+F:IM_POIS
+F:MORTAL
+F:OPEN_DOOR
+S:1_IN_7
 S:BA_POIS
 D:It is a strange small humanoid. He's strangely stinky.
 
@@ -11271,10 +18137,14 @@ W:8:1:800:11
 E:1:1:1:2:1:1
 O:0:50:0:30
 B:HIT:HURT:1d6
-F:DROP_60 | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:ANIMAL | IM_ACID | PET | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:IM_ACID
+F:MORTAL
+F:OPEN_DOOR
+F:PET
 D:It is a strange small humanoid, a fellow adventurer.
 
 # New monster added by furiosity for the Theme module
@@ -11285,11 +18155,16 @@ W:8:1:10:1
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:EXP_10:1d4
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | DROP_CORPSE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_10 | 
+F:DROP_CORPSE
+F:EMPTY_MIND
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+S:1_IN_10
 S:DARKNESS
 D:Yum! It looks quite tasty. 
 
@@ -11303,15 +18178,36 @@ B:GAZE:EXP_40:3d6
 B:GAZE:UN_POWER:3d6
 B:GAZE:INSANITY:3d6
 B:BITE:EXP_40:7d6
-F:FORCE_SLEEP | FORCE_MAXHP | RES_TELE | 
-F:COLD_BLOOD | BASH_DOOR | 
-F:EVIL | UNDEAD | CAN_FLY |
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_2 | 
-S:SLOW | CONF | CAUSE_4 | DRAIN_MANA | MIND_BLAST | FORGET | 
-S:BO_MANA | BO_NETH | BRAIN_SMASH | BA_FIRE | BA_COLD | BO_ACID |
-S:S_UNDEAD | ANIM_DEAD 
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:RES_TELE
+F:UNDEAD
+S:1_IN_2
+S:BA_COLD
+S:BA_FIRE
+S:BO_ACID
+S:BO_MANA
+S:BO_NETH
+S:BRAIN_SMASH
+S:CAUSE_4
+S:CONF
+S:DRAIN_MANA
+S:FORGET
+S:MIND_BLAST
+S:SLOW
+S:S_UNDEAD
 D:A beholder which has cheated death.  Black nether storms rage around the 
 D:bloodshot pupil of its central giant eye, and light seems to bend as it 
 D:sucks its power from the very air around it.  Your soul chills as it drains 
@@ -11327,13 +18223,28 @@ B:TOUCH:EXP_80
 B:TOUCH:EXP_40
 B:CLAW:LOSE_INT:1d10
 B:CLAW:LOSE_WIS:1d10
-F:FORCE_SLEEP | CAN_FLY |
-F:ONLY_ITEM | DROP_1D2 | POWERFUL | REGENERATE | HURT_LITE |
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | RES_NETH |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_1D2
+F:EVIL
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
 F:NO_CUT
-S:1_IN_8 | 
-S:BO_NETH | TELE_TO | SLOW
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PASS_WALL
+F:POWERFUL
+F:REGENERATE
+F:RES_NETH
+F:UNDEAD
+S:1_IN_8
+S:BO_NETH
+S:SLOW
+S:TELE_TO
 D:A mighty spirit of darkness of vaguely humanoid form. Razor-edged claws 
 D:reach out to end your life as it glides towards you, seeking to suck the 
 D:energy from your soul to feed its power. 
@@ -11347,15 +18258,38 @@ O:0:0:100:0
 B:BUTT:COLD:3d6
 B:BUTT:FIRE:3d6
 B:BUTT:ELEC:3d6
-F:FORCE_SLEEP | FORCE_MAXHP | REFLECTING |
-F:COLD_BLOOD | BASH_DOOR | CAN_FLY | SUSCEP_ACID |
-F:EVIL | UNDEAD | POWERFUL | SMART |
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | RES_TELE | 
-F:ONLY_ITEM | DROP_60 | DROP_GOOD |
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_2 |
-S:BA_WATE | BA_FIRE | BO_ICEE | BA_ELEC | BA_COLD |
-S:CAUSE_4 | DRAIN_MANA | BRAIN_SMASH | S_UNDEAD
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_60
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:POWERFUL
+F:REFLECTING
+F:RES_TELE
+F:SMART
+F:SUSCEP_ACID
+F:UNDEAD
+S:1_IN_2
+S:BA_COLD
+S:BA_ELEC
+S:BA_FIRE
+S:BA_WATE
+S:BO_ICEE
+S:BRAIN_SMASH
+S:CAUSE_4
+S:DRAIN_MANA
+S:S_UNDEAD
 D:It is a huge, twisted grey skull floating through the air. Its cold eyes 
 D:burn with hatred towards all who live. 
 
@@ -11368,14 +18302,29 @@ O:0:50:50:0
 B:HIT:HURT:6d6
 B:HIT:HURT:6d6
 B:HIT:LOSE_STR:3d4
-F:FORCE_SLEEP | 
-F:RAND_25 | FRIENDS | CAN_FLY |
-F:ONLY_ITEM | DROP_60 | 
-F:TAKE_ITEM | INVISIBLE | COLD_BLOOD | PASS_WALL | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_15 | 
-S:BLIND | HOLD | CONF | DRAIN_MANA | BO_NETH
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_60
+F:EVIL
+F:FORCE_SLEEP
+F:FRIENDS
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PASS_WALL
+F:RAND_25
+F:TAKE_ITEM
+F:UNDEAD
+S:1_IN_15
+S:BLIND
+S:BO_NETH
+S:CONF
+S:DRAIN_MANA
+S:HOLD
 D:Death incarnate, its hideous black body seems to struggle against 
 D:reality as the universe itself struggles to banish it. 
 
@@ -11389,12 +18338,24 @@ B:GAZE:PARALYZE:3d12
 B:GAZE:PARALYZE:3d12
 B:BITE:POISON:2d12
 B:BITE:POISON:2d12
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | POWERFUL |
-F:OPEN_DOOR | BASH_DOOR | EVIL | IM_POIS | DROP_CORPSE | 
-F:ANIMAL | NO_CONF | NO_SLEEP | CAN_SWIM | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:IM_POIS
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
 S:1_IN_8
-S:BR_POIS | BR_DARK | BR_NEXU
+S:BR_DARK
+S:BR_NEXU
+S:BR_POIS
 D:A large basilisk, whose shape resembles that of a great worm. 
 
 # New monster added by furiosity for the Theme module
@@ -11405,10 +18366,15 @@ W:1:1:10:1
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:COLD:1d4
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | DROP_CORPSE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:DROP_CORPSE
+F:EMPTY_MIND
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:Yum! It looks quite tasty. 
 
 # New monster added by furiosity for the Theme module
@@ -11419,10 +18385,15 @@ W:1:1:10:1
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:DISEASE:1d4
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | DROP_CORPSE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:DROP_CORPSE
+F:EMPTY_MIND
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:Yum! It looks quite tasty. 
 
 # New monster added by furiosity for the Theme module
@@ -11433,10 +18404,15 @@ W:1:1:10:1
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:EAT_LITE:1d4
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | DROP_CORPSE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:DROP_CORPSE
+F:EMPTY_MIND
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:Yum! It looks quite tasty. 
 
 # New monster added by furiosity for the Theme module
@@ -11447,10 +18423,15 @@ W:1:1:10:1
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:POISON:1d4
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | DROP_CORPSE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:DROP_CORPSE
+F:EMPTY_MIND
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:Yum! It looks quite tasty. 
 
 N:673:Mumak
@@ -11462,8 +18443,11 @@ O:0:0:0:0
 B:BUTT:HURT:8d6
 B:BUTT:HURT:8d6
 B:CRUSH:HURT:8d4
-F:FRIENDS | DROP_CORPSE | 
-F:BASH_DOOR | ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:FRIENDS
+F:MORTAL
 D:A massive elephantine form with eyes twisted by madness. 
 
 N:674:Judge Fear
@@ -11476,15 +18460,40 @@ B:GAZE:TERRIFY
 B:GAZE:EXP_40
 B:GAZE:EXP_40
 B:GAZE:HURT:2d20
-F:UNIQUE | MALE | CAN_SPEAK |
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | 
-F:INVISIBLE | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | MOVE_BODY | 
-F:EVIL | UNDEAD | IM_FIRE | IM_COLD | IM_POIS | 
-F:HURT_LITE | NO_CONF | NO_SLEEP | JOKEANGBAND | NO_CUT | NO_STUN
-S:1_IN_3 | 
-S:BLIND | HOLD | SCARE | CAUSE_3 | MIND_BLAST | BRAIN_SMASH | 
-S:S_UNDEAD | DRAIN_MANA | FORGET | ANIM_DEAD
+F:BASH_DOOR
+F:CAN_SPEAK
+F:COLD_BLOOD
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:JOKEANGBAND
+F:MALE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNDEAD
+F:UNIQUE
+S:1_IN_3
+S:BLIND
+S:BRAIN_SMASH
+S:CAUSE_3
+S:DRAIN_MANA
+S:FORGET
+S:HOLD
+S:MIND_BLAST
+S:SCARE
+S:S_UNDEAD
 D:A Dark Judge, reputedly so frightening that his gaze can kill. 
 
 N:675:Ancient multi-hued dragon
@@ -11496,15 +18505,39 @@ O:50:50:0:0
 B:CLAW:HURT:4d10
 B:CLAW:HURT:4d10
 B:BITE:HURT:7d10
-F:ATTR_MULTI | 
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | DROP_CORPSE
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | 
-F:SMART | OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DRAGON | IM_ACID | IM_FIRE | IM_COLD | 
-F:IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
-S:1_IN_5 | 
-S:BLIND | CONF | SCARE | 
-S:BR_ACID | BR_FIRE | BR_COLD | BR_ELEC | BR_POIS
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:SMART
+S:1_IN_5
+S:BLIND
+S:BR_ACID
+S:BR_COLD
+S:BR_ELEC
+S:BR_FIRE
+S:BR_POIS
+S:CONF
+S:SCARE
 D:A huge draconic form. Many colours ripple down its massive frame. Few 
 D:live to see another. 
 
@@ -11517,14 +18550,26 @@ O:50:50:0:0
 B:CLAW:HURT:4d10
 B:CLAW:HURT:4d10
 B:BITE:HURT:7d10
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | 
-F:INVISIBLE | CAN_FLY |
-F:PASS_WALL | POWERFUL | MOVE_BODY | 
-F:DRAGON | NO_CONF | NO_SLEEP | BASEANGBAND | ATTR_MULTI
-S:1_IN_6 | 
-S:BLIND | CONF | 
-S:BR_LITE | BR_DARK | BR_CONF
+F:ATTR_MULTI
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_4D2
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:INVISIBLE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PASS_WALL
+F:POWERFUL
+S:1_IN_6
+S:BLIND
+S:BR_CONF
+S:BR_DARK
+S:BR_LITE
+S:CONF
 D:A huge dragon emanating from the ethereal plane, this terrible dragon is 
 D:a master of light and dark. Its form disappears from sight as it cloaks 
 D:itself in unearthly shadows. 
@@ -11538,12 +18583,26 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:BLIND:4d6
 B:HIT:EAT_LITE:4d6
-F:FORCE_SLEEP | RAND_25 | 
-F:EMPTY_MIND | CAN_FLY | WILD_TOO | WILD_VOLCANO | 
-F:KILL_ITEM | KILL_BODY | BASH_DOOR | POWERFUL | 
-F:IM_FIRE | IM_POIS | IM_ELEC | IM_ACID | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | HAS_LITE | NO_CUT
-S:1_IN_6 | 
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:KILL_ITEM
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_25
+F:WILD_TOO
+F:WILD_VOLCANO
+S:1_IN_6
 S:BR_DARK
 D:It is a twisting pillar of pure darkness.
 
@@ -11556,12 +18615,26 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:PARALYZE:4d6
 B:HIT:PARALYZE:4d6
-F:FORCE_SLEEP | RAND_25 | 
-F:EMPTY_MIND | CAN_FLY | WILD_TOO | WILD_VOLCANO | 
-F:KILL_ITEM | KILL_BODY | BASH_DOOR | POWERFUL | 
-F:IM_FIRE | IM_POIS | IM_ELEC | IM_ACID | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | HAS_LITE | NO_CUT
-S:1_IN_6 | 
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:KILL_ITEM
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_25
+F:WILD_TOO
+F:WILD_VOLCANO
+S:1_IN_6
 S:BR_INER
 D:It is a slowly twisting pillar of energy. 
 
@@ -11575,15 +18648,31 @@ B:HIT:HURT:6d6
 B:HIT:HURT:6d6
 B:HIT:HURT:6d6
 B:HIT:SHATTER:10d10
-F:UNIQUE | MALE | CAN_SPEAK | 
-F:FORCE_SLEEP | FORCE_MAXHP |
-F:EMPTY_MIND | COLD_BLOOD | KILL_WALL | 
-F:KILL_ITEM | KILL_BODY | PASS_WALL | POWERFUL | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:HURT_ROCK | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT | NO_STUN
-S:1_IN_6 | 
-S:BO_ACID | BA_ACID
+F:CAN_SPEAK
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_ROCK
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:KILL_ITEM
+F:KILL_WALL
+F:MALE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:PASS_WALL
+F:POWERFUL
+F:UNIQUE
+S:1_IN_6
+S:BA_ACID
+S:BO_ACID
 D:A towering stone elemental stands before you. The walls and ceiling are 
 D:reduced to rubble as Quaker advances. 
 
@@ -11596,11 +18685,25 @@ O:0:0:0:0
 B:TOUCH:EXP_40:1d10
 B:TOUCH:EAT_GOLD
 B:TOUCH:EAT_ITEM
-F:INVISIBLE | RAND_25 | TAKE_ITEM | COLD_BLOOD | SMART |
-F:HURT_LITE | EVIL | OPEN_DOOR | MALE | UNDEAD | RES_NETH | JOKEANGBAND | NO_CUT
-S:MULTIPLY | 
-S:1_IN_6 | 
-S:BLINK | TPORT | TELE_TO | CAUSE_3 | ANIM_DEAD
+F:COLD_BLOOD
+F:EVIL
+F:HURT_LITE
+F:INVISIBLE
+F:JOKEANGBAND
+F:MALE
+F:NO_CUT
+F:OPEN_DOOR
+F:RAND_25
+F:RES_NETH
+F:SMART
+F:TAKE_ITEM
+F:UNDEAD
+S:1_IN_6
+S:BLINK
+S:CAUSE_3
+S:MULTIPLY
+S:TELE_TO
+S:TPORT
 D:Nasty undead little gnomes. 
 
 # New monster added by furiosity for the Theme module
@@ -11612,12 +18715,27 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:EXP_40:4d6
 B:HIT:INSANITY:4d6
-F:FORCE_SLEEP | RAND_25 | 
-F:EMPTY_MIND | CAN_FLY | WILD_TOO | WILD_VOLCANO | 
-F:KILL_ITEM | KILL_BODY | BASH_DOOR | POWERFUL | 
-F:IM_FIRE | IM_POIS | IM_ELEC | IM_ACID | ELDRITCH_HORROR | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | HAS_LITE | NO_CUT
-S:1_IN_6 | 
+F:BASH_DOOR
+F:CAN_FLY
+F:ELDRITCH_HORROR
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:KILL_ITEM
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_25
+F:WILD_TOO
+F:WILD_VOLCANO
+S:1_IN_6
 S:BR_CHAO
 D:It is a massive tornado of raw chaos. 
 
@@ -11630,12 +18748,26 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:HIT:CONFUSE:4d6
 B:HIT:CONFUSE:4d6
-F:FORCE_SLEEP | RAND_25 | 
-F:EMPTY_MIND | CAN_FLY | WILD_TOO | WILD_VOLCANO | 
-F:KILL_ITEM | KILL_BODY | BASH_DOOR | POWERFUL | 
-F:IM_FIRE | IM_POIS | IM_ELEC | IM_ACID | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | HAS_LITE | NO_CUT
-S:1_IN_6 | 
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:KILL_ITEM
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_25
+F:WILD_TOO
+F:WILD_VOLCANO
+S:1_IN_6
 S:BR_CONF
 D:It is confusing sight to behold. 
 
@@ -11648,8 +18780,16 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d4
 B:CRUSH:ELEC:1d6
-F:RAND_25 | CAN_SWIM | WILD_TOO | DROP_SKELETON | DROP_CORPSE
-F:BASH_DOOR | HAS_EGG | ANIMAL | MORTAL | BASEANGBAND | IM_ELEC | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_EGG
+F:IM_ELEC
+F:MORTAL
+F:RAND_25
+F:WILD_TOO
 D:It is about ten feet long, its lithe form crackling with sparks.
 
 # New monster added by furiosity for the Theme module
@@ -11661,8 +18801,15 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d4
 B:CRUSH:EAT_LITE:1d6
-F:RAND_25 | CAN_SWIM | WILD_TOO | DROP_SKELETON | DROP_CORPSE
-F:BASH_DOOR | HAS_EGG | ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_EGG
+F:MORTAL
+F:RAND_25
+F:WILD_TOO
 D:It is about ten feet long, and seems to feed on light. 
 
 # New monster added by furiosity for the Theme module
@@ -11674,8 +18821,15 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:LOSE_CON:1d4
 B:CRUSH:HURT:1d6
-F:RAND_25 | CAN_SWIM | WILD_TOO | DROP_SKELETON | DROP_CORPSE
-F:BASH_DOOR | HAS_EGG | ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_EGG
+F:MORTAL
+F:RAND_25
+F:WILD_TOO
 D:It is about ten feet long and looks diseased.
 
 N:686:Judge Death
@@ -11688,15 +18842,41 @@ B:CLAW:POISON:10d5
 B:CLAW:POISON:10d5
 B:CLAW:EXP_40:10d1
 B:GAZE:TERRIFY
-F:UNIQUE | MALE | CAN_SPEAK | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | 
-F:SMART | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | MOVE_BODY | 
-F:EVIL | UNDEAD | IM_ELEC | IM_COLD | SUSCEP_FIRE | 
-F:IM_POIS | NO_CONF | NO_SLEEP | JOKEANGBAND | NO_CUT | NO_STUN
-S:1_IN_3 | 
-S:BLIND | HOLD | SCARE | CAUSE_4 | BA_FIRE | BA_NETH | ANIM_DEAD 
-S:S_MONSTERS | S_UNDEAD | S_HI_UNDEAD | DRAIN_MANA | 
+F:BASH_DOOR
+F:CAN_SPEAK
+F:COLD_BLOOD
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_ELEC
+F:IM_POIS
+F:JOKEANGBAND
+F:MALE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:SUSCEP_FIRE
+F:UNDEAD
+F:UNIQUE
+S:1_IN_3
+S:BA_FIRE
+S:BA_NETH
+S:BLIND
+S:CAUSE_4
+S:DRAIN_MANA
+S:HOLD
+S:SCARE
+S:S_HI_UNDEAD
+S:S_MONSTERS
+S:S_UNDEAD
 D:The most powerful Dark Judge, whose touch means death. 
 
 N:687:Ariel, Queen of Air
@@ -11709,15 +18889,32 @@ B:HIT:HURT:4d6
 B:HIT:CONFUSE:4d4
 B:HIT:HURT:4d6
 B:HIT:CONFUSE:4d4
-F:UNIQUE | FEMALE | AURA_ELEC | CAN_SPEAK |
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:RAND_25 | CAN_FLY |
-F:EMPTY_MIND | COLD_BLOOD | 
-F:KILL_ITEM | KILL_BODY | BASH_DOOR | POWERFUL | 
-F:IM_ACID | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_5 | 
-S:BO_ELEC | BA_COLD | BA_ELEC
+F:AURA_ELEC
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FEMALE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_POIS
+F:KILL_BODY
+F:KILL_ITEM
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_25
+F:UNIQUE
+S:1_IN_5
+S:BA_COLD
+S:BA_ELEC
+S:BO_ELEC
 D:A towering air elemental, Ariel the sorceress avoids your blows 
 D:with her extreme speed. 
 
@@ -11731,13 +18928,26 @@ B:BITE:FIRE:3d12
 B:BITE:FIRE:3d12
 B:BITE:FIRE:3d12
 B:BITE:FIRE:3d12
-F:FORCE_SLEEP | WILD_TOO | WILD_SHORE | WILD_SWAMP | 
-F:ONLY_GOLD | DROP_2D2 | DROP_4D2 | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | MOVE_BODY | 
-F:ANIMAL | IM_FIRE | CAN_SWIM | 
-F:MORTAL | BASEANGBAND
-S:1_IN_4 | 
-S:SCARE | BO_FIRE | BO_PLAS | BA_FIRE | BR_FIRE
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:IM_FIRE
+F:MORTAL
+F:MOVE_BODY
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:WILD_SHORE
+F:WILD_TOO
+S:1_IN_4
+S:BA_FIRE
+S:BO_FIRE
+S:BO_PLAS
+S:BR_FIRE
+S:SCARE
 D:A strange reptilian hybrid with eleven smouldering heads. 
 
 N:689:Patriarch
@@ -11749,15 +18959,30 @@ O:0:10:90:0
 B:HIT:HURT:3d4
 B:HIT:HURT:3d4
 B:HIT:HURT:3d5
-F:MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_90 | DROP_2D2 | 
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | NO_CONF | NO_SLEEP | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:HEAL | BLIND | HOLD | CAUSE_4 | CAUSE_3 | ANIM_DEAD | 
-S:S_MONSTERS | S_UNDEAD
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+S:1_IN_2
+S:BLIND
+S:CAUSE_3
+S:CAUSE_4
+S:HEAL
+S:HOLD
+S:S_MONSTERS
+S:S_UNDEAD
 D:An evil priest, dressed all in black.  Deadly spells hit you at an 
 D:alarming rate as his black spiked mace rains down blow after blow on your 
 D:pitiful frame. 
@@ -11772,14 +18997,34 @@ B:HIT:HURT:6d6
 B:HIT:HURT:6d6
 B:HIT:LOSE_STR:3d4
 B:HIT:LOSE_STR:3d4
-F:FORCE_SLEEP | FORCE_MAXHP | RAND_25 | 
-F:ONLY_ITEM | DROP_1D2 | DROP_4D2 | CAN_FLY |
-F:SMART | TAKE_ITEM | INVISIBLE | COLD_BLOOD | PASS_WALL | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_4D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
 F:NO_CUT
-S:1_IN_9 | 
-S:TELE_LEVEL | BLIND | HOLD | CONF | CAUSE_4 | DRAIN_MANA | BO_NETH | 
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PASS_WALL
+F:RAND_25
+F:SMART
+F:TAKE_ITEM
+F:UNDEAD
+S:1_IN_9
+S:BLIND
+S:BO_NETH
+S:CAUSE_4
+S:CONF
+S:DRAIN_MANA
+S:HOLD
 S:S_UNDEAD
+S:TELE_LEVEL
 D:It is an unlife of power almost unequalled. An affront to existence, its 
 D:very touch abuses and disrupts the flow of life, and its unearthly limbs, 
 D:of purest black, crush rock and flesh with ease. 
@@ -11794,15 +19039,31 @@ B:CLAW:HURT:3d10
 B:CLAW:HURT:3d10
 B:BITE:POISON:5d10
 B:BITE:POISON:5d10
-F:FORCE_SLEEP | FORCE_MAXHP | RES_TELE | 
-F:EMPTY_MIND | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:DRAGON | IM_FIRE | IM_COLD | 
-F:IM_ELEC | IM_POIS | CAN_SWIM |
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | BASEANGBAND | NO_CUT
 F:ATTR_MULTI
-S:1_IN_6 | 
-S:BLIND | SLOW | CONF | ARROW_3 | 
+F:BASH_DOOR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:DRAGON
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:RES_TELE
+S:1_IN_6
+S:ARROW_3
+S:BLIND
 S:BR_POIS
+S:CONF
+S:SLOW
 D:A constructed dragon, the drolem has massive strength. Powerful spells 
 D:weaved during its creation make it a fearsome adversary. Its eyes show 
 D:little intelligence, but it has been instructed to destroy all it meets. 
@@ -11817,14 +19078,29 @@ B:CLAW:HURT:4d10
 B:CLAW:HURT:4d10
 B:BITE:COLD:4d14
 B:BITE:COLD:4d14
-F:UNIQUE | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | SUSCEP_FIRE |
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_CORPSE
-F:BASH_DOOR | POWERFUL | MOVE_BODY | CAN_FLY |
-F:EVIL | DRAGON | IM_COLD | NO_CONF | BASEANGBAND | HAS_LITE
-S:1_IN_4 | 
-S:CONF | CAUSE_3 | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:MALE
+F:MOVE_BODY
+F:NO_CONF
+F:ONLY_ITEM
+F:POWERFUL
+F:SUSCEP_FIRE
+F:UNIQUE
+S:1_IN_4
 S:BR_COLD
+S:CAUSE_3
+S:CONF
 D:An ancient and wise Dragon. Scatha has grown clever over the long years. 
 D:His scales are covered with frost, and his breath sends a shower of ice 
 D:into the air. 
@@ -11837,10 +19113,19 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
-F:IM_POIS | IM_FIRE | IM_ELEC | IM_ACID | IM_COLD |
-F:NO_SLEEP | NO_FEAR |
-F:FRIENDS |
-F:MALE | OPEN_DOOR | BASH_DOOR | JOKEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:FRIENDS
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:JOKEANGBAND
+F:MALE
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
 D:Fierce, barbaric warriors, armed with great spiked clubs, and surrounded 
 D:in an aura of scarlet. Whenever one of them is slain, another appears 
 D:out of nowhere to take his place. 
@@ -11855,15 +19140,35 @@ B:HIT:UN_BONUS:4d8
 B:HIT:UN_BONUS:4d8
 B:HIT:LOSE_STR:4d6
 B:HIT:LOSE_STR:4d6
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | 
-F:ONLY_ITEM  | DROP_2D2 | DROP_GOOD | CAN_SWIM |
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | RES_TELE
-F:NO_CONF | NO_SLEEP | KILL_WALL | NO_FEAR
-F:BASEANGBAND | NO_CUT
-S:1_IN_3 | 
-S:TELE_TO | BLIND | HOLD | CONF | CAUSE_3 | DRAIN_MANA | 
-S:MIND_BLAST | BA_NETH | ANIM_DEAD
+F:BASH_DOOR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:KILL_WALL
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:SMART
+F:UNDEAD
+S:1_IN_3
+S:BA_NETH
+S:BLIND
+S:CAUSE_3
+S:CONF
+S:DRAIN_MANA
+S:HOLD
+S:MIND_BLAST
+S:TELE_TO
 D:A humanoid form, black as night, advancing steadily and unstoppably. 
 
 # New monster added by furiosity for the Theme module
@@ -11875,8 +19180,15 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d4
 B:CRUSH:FIRE:1d6
-F:RAND_25 | CAN_SWIM | WILD_TOO | DROP_SKELETON | DROP_CORPSE
-F:BASH_DOOR | HAS_EGG | ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_EGG
+F:MORTAL
+F:RAND_25
+F:WILD_TOO
 D:It is about ten feet long, its form glowing with fire. 
 
 N:696:Grand master thief
@@ -11889,11 +19201,18 @@ B:HIT:EAT_ITEM:5d5
 B:HIT:EAT_ITEM:5d5
 B:HIT:EAT_GOLD:5d5
 B:HIT:EAT_GOLD:5d5
-F:MALE | DROP_2D2 |
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR |
-F:EVIL | BASEANGBAND
-S:1_IN_2 |
-S:BLINK | TPORT | TELE_TO | CONF | TRAPS | ARROW_2
+F:BASH_DOOR
+F:DROP_2D2
+F:EVIL
+F:MALE
+F:OPEN_DOOR
+F:TAKE_ITEM
+S:1_IN_2
+S:ARROW_2
+S:BLINK
+S:CONF
+S:TELE_TO
+S:TPORT
 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. 
 
@@ -11907,15 +19226,32 @@ B:CLAW:HURT:4d12
 B:CLAW:HURT:4d12
 B:BITE:FIRE:5d14
 B:BITE:FIRE:5d14
-F:UNIQUE | MALE | REFLECTING | CAN_FLY | DROP_CORPSE | 
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_SPEAK | SPECIAL_GENE |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | DROP_GREAT |
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:SMART | EVIL | DRAGON | IM_FIRE | BASEANGBAND
-F:HAS_LITE
-S:1_IN_4 | 
-S:CONF | CAUSE_3 | 
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:DRAGON
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:MALE
+F:MOVE_BODY
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:REFLECTING
+F:SMART
+F:SPECIAL_GENE
+F:UNIQUE
+S:1_IN_4
 S:BR_FIRE
+S:CAUSE_3
+S:CONF
 D:Smaug is one of the great dragons that still survive, a fire-drake of immense 
 D:cunning and intelligence.  His speed through air is matched by few other 
 D:dragons, his dragonfire is what legends are made of, and his hide is 
@@ -11932,10 +19268,26 @@ B:WAIL:TERRIFY
 B:HIT:EXP_80:64d1
 B:HIT:EXP_80:64d1
 B:HIT:EXP_80:8d8
-F:CHAR_MULTI | EVIL | IM_POIS | IM_COLD | IM_FIRE | RES_NETH |
-F:FORCE_SLEEP | UNIQUE | FORCE_MAXHP | CAN_FLY |
-F:COLD_BLOOD | BASH_DOOR | NONLIVING |
-F:NO_CONF | NO_SLEEP | NO_FEAR | JOKEANGBAND | HAS_LITE | NO_CUT | NO_STUN
+F:BASH_DOOR
+F:CAN_FLY
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:JOKEANGBAND
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:RES_NETH
+F:UNIQUE
 D:The mightiest of hellblades, a black runesword which thirsts for 
 D:your soul. 
 
@@ -11948,14 +19300,38 @@ O:0:100:0:0
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
-F:IM_POIS | IM_FIRE | IM_ELEC | IM_ACID | IM_COLD | GOOD |
-F:RES_NETH | RES_NEXU | RES_DISE | RES_TELE | DROP_SKELETON | DROP_CORPSE
-F:NO_SLEEP | NO_CONF | NO_FEAR | NO_STUN | 
-F:DROP_2D2 | DROP_90 | REFLECTING |
-F:MALE | OPEN_DOOR | BASH_DOOR | FORCE_MAXHP | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_4 | 
-S:HEAL | CAUSE_3 | CAUSE_4 | HASTE | SCARE | BLIND | 
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:OPEN_DOOR
+F:REFLECTING
+F:RES_DISE
+F:RES_NETH
+F:RES_NEXU
+F:RES_TELE
+S:1_IN_4
+S:BLIND
+S:CAUSE_3
+S:CAUSE_4
+S:HASTE
+S:HEAL
+S:SCARE
 D:It seems that the more devout the person, the more likely they are to cross 
 D:the boundary between piety and sanctimoniousness.  And such is the case with 
 D:the Order of the Knights Templar; they are among the most pious and 
@@ -11972,8 +19348,18 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d4
 B:CRUSH:TERRIFY:1d6
-F:RAND_25 | CAN_SWIM | WILD_ONLY | DROP_SKELETON | DROP_CORPSE | WILD_SHORE
-F:BASH_DOOR | HAS_EGG | ANIMAL | MORTAL | BASEANGBAND | NEUTRAL | NO_TARGET | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_EGG
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:RAND_25
+F:WILD_ONLY
+F:WILD_SHORE
 D:It is about ten feet long. Its survival depends on being 
 D:confused for a much more dangerous snake.
 
@@ -11986,15 +19372,33 @@ O:10:50:40:0
 B:CLAW:HURT:4d12
 B:CLAW:HURT:4d12
 B:BITE:EXP_80:7d14
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | RES_TELE | 
-F:COLD_BLOOD | CAN_FLY |
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DRAGON | UNDEAD | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT | ATTR_MULTI
-S:1_IN_6 | 
-S:CONF | SCARE | 
-S:BR_COLD | BR_NETH
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DRAGON
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:MOVE_BODY
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:RES_TELE
+F:TAKE_ITEM
+F:UNDEAD
+S:1_IN_6
+S:BR_COLD
+S:BR_NETH
+S:CONF
+S:SCARE
 D:The skeletal form of a once-great dragon, enchanted by magic most 
 D:perilous. Its animated form strikes with speed and drains life from its 
 D:prey to satisfy its hunger. 
@@ -12009,13 +19413,27 @@ B:HIT:CONFUSE:12d12
 B:HIT:CONFUSE:12d12
 B:HIT:CONFUSE:12d12
 B:HIT:CONFUSE:12d12
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_4D2 | DROP_1D2 | DROP_GOOD | MOVE_BODY |
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR |
-F:EVIL | GIANT | MALE | BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:HEAL | TELE_TO | 
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GIANT
+F:HAS_LITE
+F:MALE
+F:MOVE_BODY
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:TAKE_ITEM
+S:1_IN_3
+S:HEAL
 S:S_MONSTERS
+S:TELE_TO
 D:A forty foot tall humanoid that shakes the ground as it walks. The power 
 D:radiating from its frame shakes your courage, its hatred inspired by your 
 D:defiance. 
@@ -12030,14 +19448,30 @@ B:CLAW:HURT:4d12
 B:CLAW:HURT:4d12
 B:BITE:FIRE:7d14
 B:GAZE:PARALYZE
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | RES_NEXU | RES_TELE | 
-F:ANIMAL | EVIL | DRAGON | IM_ACID | IM_FIRE | NO_CONF | NO_SLEEP | 
-F:BASEANGBAND | ATTR_MULTI
-S:1_IN_6 | 
-S:HOLD | SCARE | 
-S:BR_FIRE | BR_NEXU
+F:ANIMAL
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_FIRE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_NEXU
+F:RES_TELE
+S:1_IN_6
+S:BR_FIRE
+S:BR_NEXU
+S:HOLD
+S:SCARE
 D:A mixture of dragon and basilisk, the dracolisk stares at you with deep 
 D:piercing eyes, its evil breath burning the ground where it stands. 
 
@@ -12049,10 +19483,20 @@ B:CLAW:HURT:3d8
 B:CLAW:HURT:3d8
 B:BITE:EXP_40:4d6
 B:BITE:EXP_40:4d6
-F:ANIMAL | MORTAL | EVIL | CAN_FLY | BASH_DOOR | IM_COLD | IM_POIS
-F:WILD_TOO | WILD_WASTE | WILD_WOOD | WILD_SWAMP | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:EVIL
+F:IM_COLD
+F:IM_POIS
+F:MORTAL
+F:WILD_TOO
+F:WILD_WASTE
+F:WILD_WOOD
 S:1_IN_6
-S:BR_NETH | BR_DARK | BR_POIS
+S:BR_DARK
+S:BR_NETH
+S:BR_POIS
 D:A terrifying sight:  a winged creature greater than any bird you have ever 
 D:seen, and with no feathers on its horrid black leathery wings.  Descended 
 D:from a creature of an older world perhaps, bred by Sauron to be a winged 
@@ -12067,9 +19511,15 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:3d4
 B:SPIT:ACID:4d5
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | DROP_CORPSE | 
-F:ANIMAL | IM_ACID | CAN_FLY | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:HAS_LITE
+F:IM_ACID
+F:MORTAL
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is a giant beetle surrounded by droplets of acid. 
 
 # New monster added by furiosity for the Theme module
@@ -12081,9 +19531,14 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:3d4
 B:SPIT:BLIND:4d5
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | DROP_CORPSE | 
-F:ANIMAL | CAN_FLY | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:HAS_LITE
+F:MORTAL
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is a giant beetle with a corrosive spit. 
 
 # New monster added by furiosity for the Theme module
@@ -12095,9 +19550,15 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:3d4
 B:SPIT:ELEC:4d5
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | DROP_CORPSE | 
-F:ANIMAL | IM_ELEC | CAN_FLY | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:HAS_LITE
+F:IM_ELEC
+F:MORTAL
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is a giant beetle surrounded by sparks. 
 
 N:708:Ent
@@ -12110,10 +19571,20 @@ B:CRUSH:HURT:12d13
 B:CRUSH:HURT:12d13
 B:CRUSH:HURT:12d13
 B:CRUSH:HURT:12d13
-F:FORCE_SLEEP | FORCE_MAXHP | PET | SUSCEP_FIRE | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | MOVE_BODY |
-F:SMART | TAKE_ITEM | KILL_WALL | BASH_DOOR |
-F:GOOD | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:DROP_4D2
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:KILL_WALL
+F:MOVE_BODY
+F:NO_CUT
+F:ONLY_ITEM
+F:PET
+F:SMART
+F:SUSCEP_FIRE
+F:TAKE_ITEM
 D:Ents are some of the oldest creatures that awoke on Arda. It is a
 D:tree-herd:  a sentient, moving tree. Its wrath is fearsome, and it could 
 D:split stones and even the very rock of Isengard with its roots. 
@@ -12128,10 +19599,22 @@ B:HIT:SHATTER:12d13
 B:HIT:SHATTER:12d13
 B:HIT:SHATTER:12d13
 B:HIT:SHATTER:12d13
-F:FORCE_SLEEP | FORCE_MAXHP | HURT_ROCK |
-F:ONLY_GOLD | DROP_4D2 | MOVE_BODY | KILL_WALL |
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR |
-F:EVIL | GIANT | MALE | HAS_LITE | NO_CUT
+F:BASH_DOOR
+F:DROP_4D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GIANT
+F:HAS_LITE
+F:HURT_ROCK
+F:KILL_WALL
+F:MALE
+F:MOVE_BODY
+F:NO_CUT
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:SMART
+F:TAKE_ITEM
 D:A being made of living stone. 
 
 N:710:Itangast the Fire Drake
@@ -12144,14 +19627,28 @@ B:CLAW:HURT:4d10
 B:CLAW:HURT:4d10
 B:BITE:FIRE:4d14
 B:BITE:FIRE:4d14
-F:UNIQUE | MALE |
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | DROP_CORPSE
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | SUSCEP_COLD |
-F:BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DRAGON | IM_FIRE | BASEANGBAND | HAS_LITE
-S:1_IN_4 | 
-S:CONF | CAUSE_3 | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:MALE
+F:MOVE_BODY
+F:ONLY_ITEM
+F:POWERFUL
+F:SUSCEP_COLD
+F:UNIQUE
+S:1_IN_4
 S:BR_FIRE
+S:CAUSE_3
+S:CONF
 D:A mighty ancient dragon, Itangast's form scorches your flesh. Wisps of 
 D:smoke curl up from his nostrils as he regards you with disdain. 
 
@@ -12165,9 +19662,19 @@ B:SPORE:UN_BONUS:7d7
 B:SPORE:UN_BONUS:7d7
 B:SPORE:UN_BONUS:7d7
 B:SPORE:EXP_80:5d5
-F:FORCE_SLEEP | NEVER_MOVE | CAN_SWIM |
-F:EVIL | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:EVIL
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
 D:It is the epitome of all that is evil, in a mold. Its lifeless form draws 
 D:power from sucking the souls of those that approach it, a nimbus of pure 
 D:evil surrounds it. Luckily for you, it can't move... 
@@ -12181,9 +19688,15 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:3d4
 B:SPIT:EAT_LITE:4d5
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | DROP_CORPSE | 
-F:ANIMAL | HURT_LITE | CAN_FLY | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:HAS_LITE
+F:HURT_LITE
+F:MORTAL
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is a giant beetle surrounded by a strange dark light. 
 
 # New monster added by furiosity for the Theme module
@@ -12195,9 +19708,15 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:3d4
 B:SPIT:CONFUSE:4d5
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | DROP_CORPSE | 
-F:ANIMAL | NO_CONF | CAN_FLY | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:HAS_LITE
+F:MORTAL
+F:NO_CONF
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is a giant beetle surrounded by a puzzling green aura. 
 
 N:714:Quickbeam, the Ent
@@ -12210,10 +19729,22 @@ B:CRUSH:HURT:12d13
 B:CRUSH:HURT:12d13
 B:CRUSH:HURT:12d13
 B:CRUSH:HURT:12d13
-F:FORCE_SLEEP | FORCE_MAXHP | UNIQUE | CAN_SPEAK | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | MOVE_BODY | SUSCEP_FIRE | 
-F:SMART | TAKE_ITEM | KILL_WALL | BASH_DOOR |
-F:GOOD | PET | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_4D2
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:KILL_WALL
+F:MOVE_BODY
+F:NO_CUT
+F:ONLY_ITEM
+F:PET
+F:SMART
+F:SUSCEP_FIRE
+F:TAKE_ITEM
+F:UNIQUE
 D:Also known as Bregalad. Unusually hasty, for an ent. He hates evil creatures, 
 D:orcs in particular, since the destruction of his beloved rowan-trees to feed the 
 D:fires of Orthanc. 
@@ -12228,15 +19759,38 @@ B:CLAW:HURT:5d12
 B:CLAW:HURT:5d12
 B:BITE:FIRE:8d14
 B:BITE:POISON:8d14
-F:UNIQUE | MALE | CAN_SPEAK | DROP_CORPSE |
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_RANDART | KILL_TREES | 
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:SMART | EVIL | DRAGON | IM_POIS | IM_FIRE | 
-F:BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:BLIND | CONF | SCARE | BRAIN_SMASH | 
-S:BR_FIRE | BR_POIS | BR_SOUN | S_HI_DRAGON
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DRAGON
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:DROP_RANDART
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:IM_POIS
+F:KILL_TREES
+F:MALE
+F:MOVE_BODY
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:SMART
+F:UNIQUE
+S:1_IN_3
+S:BLIND
+S:BRAIN_SMASH
+S:BR_FIRE
+S:BR_POIS
+S:BR_SOUN
+S:CONF
+S:SCARE
+S:S_HI_DRAGON
 D:Glaurung is the father of all dragons, and was for a long time the most 
 D:powerful.  Though this is no longer so, he still has full command over 
 D:his brood and can command them to appear whenever he so wishes.  He is 
@@ -12252,10 +19806,25 @@ B:BITE:HURT:5d8
 B:BITE:HURT:5d8
 B:CRUSH:HURT:3d15
 B:CRUSH:HURT:3d15
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_SWIM | ANIMAL | AQUATIC | 
-F:IM_FIRE | IM_ACID | IM_COLD | IM_POIS | DROP_CORPSE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | NEUTRAL | NO_TARGET | 
-F:WILD_ONLY | WILD_SHORE | WILD_OCEAN | MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:CAN_SWIM
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:NEUTRAL
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_TARGET
+F:WILD_OCEAN
+F:WILD_ONLY
+F:WILD_SHORE
 D:A great water-beast, with an almost unpenetrable skin. 
 
 # New monster added by furiosity for the Theme module
@@ -12267,9 +19836,17 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:3d4
 B:SPIT:COLD:4d5
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | DROP_CORPSE | 
-F:ANIMAL | RES_WATE | CAN_FLY | SUSCEP_FIRE |
-F:MORTAL | BASEANGBAND | HAS_LITE | AQUATIC | 
+F:ANIMAL
+F:AQUATIC
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:HAS_LITE
+F:MORTAL
+F:RES_WATE
+F:SUSCEP_FIRE
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is a giant beetle that prefers to live in water. 
 
 N:718:Greater wall monster
@@ -12281,11 +19858,25 @@ O:0:0:0:0
 B:HIT:HURT:3d6
 B:HIT:HURT:3d6
 B:HIT:HURT:3d6
-F:FORCE_SLEEP | COLD_BLOOD | EMPTY_MIND | PASS_WALL | RAND_50 | 
-F:BASH_DOOR | IM_COLD | IM_ACID | IM_FIRE | IM_ELEC | IM_POIS | NONLIVING | 
-F:HURT_ROCK | NO_CONF | NO_SLEEP | CHAR_MULTI | CAN_FLY | BASEANGBAND
+F:BASH_DOOR
+F:CAN_FLY
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:HURT_ROCK
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NONLIVING
+F:NO_CONF
 F:NO_CUT
-S:MULTIPLY | 
+F:NO_SLEEP
+F:PASS_WALL
+F:RAND_50
+S:MULTIPLY
 D:A sentient, moving section of wall. 
 
 N:719:Menelrog
@@ -12298,13 +19889,33 @@ B:GAZE:TERRIFY
 B:HIT:POISON:6d6
 B:SPIT:FIRE:6d6
 B:SPIT:ACID:6d6
-F:FORCE_SLEEP | FORCE_MAXHP | AURA_FIRE | NONLIVING | 
-F:REGENERATE | IM_ACID | IM_COLD | IM_FIRE | CAN_FLY |
-F:NO_SLEEP | NO_STUN | NO_CONF | EVIL | DEMON | SMART | 
-F:KILL_WALL | WILD_TOO | 
-F:ONLY_ITEM | DROP_GREAT | DROP_GOOD | BASEANGBAND
-S:1_IN_4 | 
-S:HOLD | BLINK | CONF | S_DEMON | BRAIN_SMASH | BO_PLAS
+F:AURA_FIRE
+F:CAN_FLY
+F:DEMON
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_FIRE
+F:KILL_WALL
+F:NONLIVING
+F:NO_CONF
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:REGENERATE
+F:SMART
+F:WILD_TOO
+S:1_IN_4
+S:BLINK
+S:BO_PLAS
+S:BRAIN_SMASH
+S:CONF
+S:HOLD
+S:S_DEMON
 D:Morgoth's horrific corruption of Manwe's Great Eagles, with the feathers 
 D:devolved into scales, and the talons so powerful they can tear down 
 D:stone walls. This demon is a power to be reckoned with; it is powerful 
@@ -12320,12 +19931,23 @@ B:HIT:HURT:4d10
 B:HIT:LOSE_CHR:10d2
 B:SPIT:ACID:4d10
 B:STING:POISON:5d5
-F:FORCE_SLEEP | FORCE_MAXHP | FRIENDS | 
-F:ONLY_ITEM | DROP_1D2 | NONLIVING | BASEANGBAND | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | 
-F:EVIL | DEMON | IM_POIS | NO_CONF | NO_SLEEP 
-S:1_IN_7 | 
-S:SCARE | CONF
+F:BASH_DOOR
+F:DEMON
+F:DROP_1D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:FRIENDS
+F:IM_POIS
+F:NONLIVING
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+S:1_IN_7
+S:CONF
+S:SCARE
 D:One of the spider demons, spawn of Ungoliant. It looks like 
 D:a giant bloated spider, and its claws are dripping with acid.
 
@@ -12338,9 +19960,16 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:3d4
 B:SPIT:HALLU:4d5
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | DROP_CORPSE | 
-F:ANIMAL | KILL_TREES | CAN_FLY | SUSCEP_COLD |
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:HAS_LITE
+F:KILL_TREES
+F:MORTAL
+F:SUSCEP_COLD
+F:WEIRD_MIND
+F:WILD_TOO
 D:It is a giant beetle, a relative of the termite. 
 
 N:722:Nightwing
@@ -12353,14 +19982,34 @@ B:TOUCH:POISON:6d5
 B:TOUCH:POISON:6d5
 B:HIT:UN_BONUS:6d8
 B:HIT:UN_BONUS:6d8
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
-F:SMART | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | RES_TELE | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_4 | 
-S:BLIND | SCARE | CAUSE_4 | BRAIN_SMASH | 
-S:BO_MANA | BO_NETH | BA_NETH | S_UNDEAD
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:SMART
+F:UNDEAD
+S:1_IN_4
+S:BA_NETH
+S:BLIND
+S:BO_MANA
+S:BO_NETH
+S:BRAIN_SMASH
+S:CAUSE_4
+S:SCARE
+S:S_UNDEAD
 D:Everywhere colours seem paler and the air chiller. At the centre of the 
 D:cold stands a mighty figure. Its wings envelop you in the chill of death 
 D:as the nightwing reaches out to draw you into oblivion. Your muscles sag 
@@ -12379,11 +20028,25 @@ B:BITE:POISON:4d4
 B:BITE:POISON:4d4
 B:BITE:POISON:4d4
 B:BITE:POISON:4d4
-F:BASEANGBAND | ANIMAL | MORTAL | WILD_TOO | WILD_SHORE | WILD_SWAMP | 
-F:FORCE_SLEEP | CAN_SWIM | FORCE_SLEEP | DROP_CORPSE | MOVE_BODY | 
-F:IM_POIS | SUSCEP_FIRE | ONLY_GOLD | DROP_4D2 | DROP_2D2 | IM_COLD | 
-S:1_IN_5 | 
-S:SCARE | BA_POIS | BR_POIS | 
+F:ANIMAL
+F:CAN_SWIM
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:MORTAL
+F:MOVE_BODY
+F:ONLY_GOLD
+F:SUSCEP_FIRE
+F:WILD_SHORE
+F:WILD_TOO
+S:1_IN_5
+S:BA_POIS
+S:BR_POIS
+S:SCARE
 D:A strange reptilian creature with 6 heads dripping venom. It has 
 D:adapted to living in cold environments.
 
@@ -12397,12 +20060,19 @@ B:CLAW:HURT:2d12
 B:CLAW:HURT:2d12
 B:BITE:HURT:2d12
 B:BITE:HURT:2d12
-F:FORCE_SLEEP | 
-F:FRIENDS | RES_NETH | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:ANIMAL | NO_CONF | NO_SLEEP | 
-F:MORTAL | BASEANGBAND | NO_CUT
-S:1_IN_5 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:MORTAL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:RES_NETH
+S:1_IN_5
 S:BR_NETH
 D:You feel a soul-tearing chill upon viewing this beast, a ghostly form of 
 D:darkness in the shape of a large dog. 
@@ -12417,12 +20087,17 @@ B:CLAW:HURT:2d12
 B:CLAW:HURT:2d12
 B:BITE:HURT:2d12
 B:BITE:HURT:2d12
-F:FORCE_SLEEP | 
-F:FRIENDS | 
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | NO_CONF | NO_SLEEP | 
-F:MORTAL | BASEANGBAND
-S:1_IN_5 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:OPEN_DOOR
+S:1_IN_5
 S:BR_TIME
 D:You get a terrible sense of deja vu, or is it a premonition?  All at once 
 D:you see a little puppy and a toothless old dog. Perhaps you should give 
@@ -12438,12 +20113,22 @@ B:CLAW:HURT:2d12
 B:CLAW:HURT:2d12
 B:BITE:HURT:2d12
 B:BITE:HURT:2d12
-F:FORCE_SLEEP | SUSCEP_COLD |
-F:FRIENDS | RES_PLAS |
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | IM_FIRE | NO_CONF | NO_SLEEP | 
-F:MORTAL | BASEANGBAND | HAS_LITE | NO_CUT
-S:1_IN_5 | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:HAS_LITE
+F:IM_FIRE
+F:MORTAL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:RES_PLAS
+F:SUSCEP_COLD
+S:1_IN_5
 S:BR_PLAS
 D:The very air warps as pure elemental energy stalks towards you in the 
 D:shape of a giant hound. Your hair stands on end and your palms itch as 
@@ -12455,12 +20140,20 @@ I:120:48d10:20:1:0
 W:45:1:3000:3000
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:FORCE_SLEEP | FORCE_MAXHP | NEVER_MOVE | NEVER_BLOW | 
-F:INVISIBLE | EMPTY_MIND | ANIMAL | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND
-S:1_IN_2 | 
-S:BLINK | TPORT | 
+F:ANIMAL
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:INVISIBLE
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+S:1_IN_2
+S:BLINK
 S:S_DEMON
+S:TPORT
 D:A pile of pulsing flesh that glows with an inner dark fire. The world 
 D:itself seems to cry out against it. 
 
@@ -12474,14 +20167,31 @@ B:CLAW:HURT:4d12
 B:CLAW:HURT:4d12
 B:BITE:ELEC:6d14
 B:BITE:ELEC:6d14
-F:FORCE_SLEEP | FORCE_MAXHP | AURA_ELEC | CAN_FLY |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:BASH_DOOR | POWERFUL | MOVE_BODY | DROP_CORPSE | 
-F:EVIL | DRAGON | IM_ELEC | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
 F:ATTR_MULTI
-S:1_IN_4 | 
-S:BLIND | CONF | SCARE | 
+F:AURA_ELEC
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ELEC
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:POWERFUL
+S:1_IN_4
+S:BLIND
 S:BR_ELEC
+S:CONF
+S:SCARE
 D:A vast dragon of power. Storms and lightning crash around its titanic 
 D:form. Deep blue scales reflect the flashes and highlight the creature's 
 D:great muscles. It regards you with contempt. 
@@ -12495,13 +20205,30 @@ O:0:100:0:0
 B:HIT:SHATTER:20d12
 B:HIT:SHATTER:20d12
 B:BITE:POISON:6d14
-F:UNIQUE | MALE | CAN_SPEAK |
-F:FORCE_SLEEP | FORCE_MAXHP | SPECIAL_GENE | 
-F:ONLY_ITEM | DROP_1D2 | DROP_4D2 | DROP_GOOD | 
-F:DROP_90 | REGENERATE | KILL_WALL | RES_TELE | KILL_BODY | 
-F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | 
-F:EVIL | TROLL | IM_POIS |
-F:IM_ELEC | IM_COLD | IM_FIRE | BASEANGBAND
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:KILL_WALL
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:RES_TELE
+F:SPECIAL_GENE
+F:TROLL
+F:UNIQUE
 D:Trolls are said to be corruptions of Morgoth, made in mockery of Ents. 
 D:Ulik is the strongest troll who has ever lived. He could challenge 
 D:the immortals and pound them to dust with his great strength. 
@@ -12518,11 +20245,24 @@ B:BITE:ACID:3d8
 B:BITE:ACID:3d8
 B:SPIT:ACID:3d4
 B:SPIT:ACID:3d4
-F:BASEANGBAND | ANIMAL | MORTAL | WILD_TOO | WILD_SHORE | WILD_SWAMP | 
-F:FORCE_SLEEP | CAN_SWIM | FORCE_SLEEP | DROP_CORPSE | MOVE_BODY | 
-F:IM_ACID | BASH_DOOR | ONLY_GOLD | DROP_4D2 | DROP_2D2 | 
-S:1_IN_5 | 
-S:SCARE | BR_ACID | BA_ACID 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:FORCE_SLEEP
+F:IM_ACID
+F:MORTAL
+F:MOVE_BODY
+F:ONLY_GOLD
+F:WILD_SHORE
+F:WILD_TOO
+S:1_IN_5
+S:BA_ACID
+S:BR_ACID
+S:SCARE
 D:A strange reptilian creature with eight heads spewing acid.
 
 N:731:Oathbreaker
@@ -12535,14 +20275,34 @@ B:HIT:HURT:10d5
 B:HIT:HURT:10d5
 B:HIT:EXP_80:10d5
 B:HIT:EXP_80:10d5
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | IM_FIRE | IM_COLD | IM_POIS |
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | RES_NETH | RES_NEXU | RES_PLAS |
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | IM_COLD | 
-F:UNDEAD | BASEANGBAND | HAS_LITE
-S:1_IN_5 | 
-S:BLIND | SCARE | CAUSE_3 | BA_NETH | BA_FIRE | BO_PLAS
-S:S_MONSTERS | S_DEMON
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_2D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_NETH
+F:RES_NEXU
+F:RES_PLAS
+F:SMART
+F:UNDEAD
+S:1_IN_5
+S:BA_FIRE
+S:BA_NETH
+S:BLIND
+S:BO_PLAS
+S:CAUSE_3
+S:SCARE
+S:S_DEMON
+S:S_MONSTERS
 D:He is one of the warriors of old who broke their promise to the 
 D:King of Gondor. A terrible curse now haunts all of them. 
 
@@ -12558,11 +20318,24 @@ B:BITE:FIRE:3d9
 B:BITE:ACID:3d9
 B:BITE:ELEC:3d9
 B:BITE:COLD:3d9
-F:BASEANGBAND | ANIMAL | MORTAL | WILD_TOO | WILD_SHORE | WILD_SWAMP | 
-F:FORCE_SLEEP | CAN_SWIM | FORCE_SLEEP | DROP_CORPSE | MOVE_BODY | 
-F:IM_ACID | IM_ELEC | IM_FIRE | IM_COLD | BASH_DOOR | 
-F:ONLY_GOLD | DROP_4D2 | DROP_2D2 | 
-S:1_IN_4 | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:MORTAL
+F:MOVE_BODY
+F:ONLY_GOLD
+F:WILD_SHORE
+F:WILD_TOO
+S:1_IN_4
 S:SCARE
 D:A strange reptilian creature with ten multicoloured heads.
 
@@ -12578,11 +20351,28 @@ B:BITE:FIRE:4d12
 B:BITE:FIRE:4d12
 B:BITE:POISON:4d12
 B:BITE:POISON:4d12
-F:BASEANGBAND | ANIMAL | MORTAL | WILD_TOO | WILD_SHORE | WILD_SWAMP | 
-F:FORCE_SLEEP | CAN_SWIM | FORCE_SLEEP | DROP_CORPSE | MOVE_BODY | 
-F:IM_FIRE | IM_POIS | RES_PLAS | BASH_DOOR | ONLY_GOLD | DROP_4D2 | DROP_2D2 | 
-S:1_IN_4 | 
-S:SCARE | BA_FIRE | BA_POIS | BO_FIRE | BO_PLAS | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:FORCE_SLEEP
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:MOVE_BODY
+F:ONLY_GOLD
+F:RES_PLAS
+F:WILD_SHORE
+F:WILD_TOO
+S:1_IN_4
+S:BA_FIRE
+S:BA_POIS
+S:BO_FIRE
+S:BO_PLAS
+S:SCARE
 D:A strange reptilian creature with twelve smouldering heads. 
 
 # New monster added by furiosity for the Theme module
@@ -12597,12 +20387,32 @@ B:BITE:POISON:8d6
 B:BITE:POISON:8d6
 B:BITE:FIRE:12d6
 B:BITE:FIRE:12d6
-F:BASEANGBAND | ANIMAL | MORTAL | WILD_TOO | WILD_SHORE | WILD_SWAMP | 
-F:FORCE_SLEEP | CAN_SWIM | FORCE_SLEEP | DROP_CORPSE | 
-F:IM_FIRE | IM_POIS | RES_PLAS | NO_CONF | NO_SLEEP | BASH_DOOR | 
-F:ONLY_GOLD | DROP_4D2 | DROP_2D2 | DROP_2D2 | SMART | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_2D2
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:FORCE_SLEEP
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_GOLD
+F:RES_PLAS
+F:SMART
+F:WILD_SHORE
+F:WILD_TOO
 S:1_IN_3
-S:SCARE | BA_FIRE | BA_POIS | BO_FIRE | BO_PLAS | S_KIN 
+S:BA_FIRE
+S:BA_POIS
+S:BO_FIRE
+S:BO_PLAS
+S:SCARE
+S:S_KIN
 D:A strange reptilian creature with thirteen smouldering heads dripping venom. 
 
 # New monster added by furiosity for the Theme module
@@ -12616,13 +20426,35 @@ B:BITE:FIRE:4d10
 B:BITE:ACID:4d10
 B:BITE:ELEC:4d10
 B:BITE:COLD:4d10
-F:BASEANGBAND | ANIMAL | MORTAL | WILD_TOO | WILD_SHORE | WILD_SWAMP | 
-F:FORCE_SLEEP | CAN_SWIM | FORCE_SLEEP | DROP_CORPSE | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_ACID | IM_POIS | RES_PLAS | SMART | 
-F:NO_CONF | NO_SLEEP | BASH_DOOR | ONLY_GOLD | DROP_4D2 | DROP_4D2 | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_4D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_GOLD
+F:RES_PLAS
+F:SMART
+F:WILD_SHORE
+F:WILD_TOO
 S:1_IN_3
-S:SCARE | BA_FIRE | BA_POIS | BA_COLD | BA_ELEC | BA_ACID 
-S:S_KIN | 
+S:BA_ACID
+S:BA_COLD
+S:BA_ELEC
+S:BA_FIRE
+S:BA_POIS
+S:SCARE
+S:S_KIN
 D:A cunning reptilian creature with fourteen multicoloured heads.
 
 # New monster added by furiosity for the Theme module
@@ -12636,13 +20468,41 @@ B:BITE:FIRE:5d11
 B:BITE:ACID:5d11
 B:BITE:COLD:5d11
 B:BITE:ELEC:5d11
-F:BASEANGBAND | ANIMAL | MORTAL | WILD_TOO | WILD_SHORE | WILD_SWAMP | 
-F:FORCE_SLEEP | CAN_SWIM | AQUATIC | DROP_CORPSE | WILD_OCEAN | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_ACID | IM_POIS | RES_PLAS | SMART | 
-F:NO_CONF | NO_SLEEP | BASH_DOOR | ONLY_GOLD | DROP_4D2 | DROP_4D2 | 
+F:ANIMAL
+F:AQUATIC
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_4D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_GOLD
+F:RES_PLAS
+F:SMART
+F:WILD_OCEAN
+F:WILD_SHORE
+F:WILD_TOO
 S:1_IN_3
-S:SCARE | BA_FIRE | BA_POIS | BA_COLD | BA_ELEC | BA_ACID | CONF | 
-S:BO_FIRE | BO_COLD | BO_ELEC | BO_ACID | S_KIN | 
+S:BA_ACID
+S:BA_COLD
+S:BA_ELEC
+S:BA_FIRE
+S:BA_POIS
+S:BO_ACID
+S:BO_COLD
+S:BO_ELEC
+S:BO_FIRE
+S:CONF
+S:SCARE
+S:S_KIN
 D:A cunning reptilian creature with fifteen multicoloured heads. 
 
 # New monster added by furiosity for the Theme module
@@ -12656,15 +20516,52 @@ B:BITE:FIRE:6d12
 B:BITE:ACID:6d12
 B:BITE:COLD:6d12
 B:BITE:ELEC:6d12
-F:BASEANGBAND | ANIMAL | MORTAL | WILD_TOO | WILD_SHORE | WILD_SWAMP | 
-F:FORCE_SLEEP | CAN_SWIM | AQUATIC | DROP_CORPSE | WILD_OCEAN | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_ACID | IM_POIS | RES_PLAS | RES_NETH | 
-F:RES_TELE | SMART | NO_CONF | NO_SLEEP | BASH_DOOR | ONLY_GOLD | DROP_4D2 | 
-F:RES_NEXU | DROP_4D2 | RES_WATE | NO_STUN | EVIL | 
-S:1_IN_3 | 
-S:SCARE | BA_FIRE | BA_POIS | BA_COLD | BA_ELEC | BA_ACID | CONF | 
-S:BO_FIRE | BO_COLD | BO_ICEE | BA_WATE | BO_ELEC | BO_ACID | BR_NETH |
-S:S_KIN | S_ANIMALS | S_MONSTERS | 
+F:ANIMAL
+F:AQUATIC
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_4D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_GOLD
+F:RES_NETH
+F:RES_NEXU
+F:RES_PLAS
+F:RES_TELE
+F:RES_WATE
+F:SMART
+F:WILD_OCEAN
+F:WILD_SHORE
+F:WILD_TOO
+S:1_IN_3
+S:BA_ACID
+S:BA_COLD
+S:BA_ELEC
+S:BA_FIRE
+S:BA_POIS
+S:BA_WATE
+S:BO_ACID
+S:BO_COLD
+S:BO_ELEC
+S:BO_FIRE
+S:BO_ICEE
+S:BR_NETH
+S:CONF
+S:SCARE
+S:S_ANIMALS
+S:S_KIN
+S:S_MONSTERS
 D:A cunning, evil reptile from the depths. It has so many heads that you 
 D:give up after losing count twice.
 
@@ -12677,15 +20574,33 @@ O:0:0:100:0
 B:HIT:HURT:6d8
 B:HIT:HURT:6d8
 B:HIT:HURT:6d8
-F:MALE |
-F:FORCE_SLEEP | FORCE_MAXHP |
-F:ONLY_ITEM | DROP_4D2 | 
-F:OPEN_DOOR | BASH_DOOR | TAKE_ITEM |
-F:EVIL | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
-S:1_IN_2 |
-S:BLINK | TELE_TO | BLIND | CONF | CAUSE_3 | CAUSE_4 | TRAPS |
-S:BO_ACID | BA_FIRE | BA_COLD | BA_POIS |
-S:S_MONSTER | S_DEMON | S_HI_DRAGON | S_UNDEAD
+F:BASH_DOOR
+F:DROP_4D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:TAKE_ITEM
+S:1_IN_2
+S:BA_COLD
+S:BA_FIRE
+S:BA_POIS
+S:BLIND
+S:BLINK
+S:BO_ACID
+S:CAUSE_3
+S:CAUSE_4
+S:CONF
+S:S_DEMON
+S:S_HI_DRAGON
+S:S_MONSTER
+S:S_UNDEAD
+S:TELE_TO
 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. 
@@ -12700,11 +20615,15 @@ B:BITE:HURT:2d12
 B:BITE:HURT:2d12
 B:BITE:HURT:2d12
 B:CLAW:HURT:2d12
-F:FORCE_SLEEP | FRIENDS | 
-F:INVISIBLE | PASS_WALL | 
-F:ANIMAL | NO_CONF | NO_SLEEP | 
-F:MORTAL | BASEANGBAND
-S:1_IN_5 | 
+F:ANIMAL
+F:FORCE_SLEEP
+F:FRIENDS
+F:INVISIBLE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:PASS_WALL
+S:1_IN_5
 S:BR_NETH
 D:A pale green hound. Pulsing red lines and strange fluorescent light 
 D:hints at internal organs best left to the imagination. 
@@ -12719,13 +20638,36 @@ B:CRUSH:HURT:16d12
 B:CRUSH:HURT:16d12
 B:CRUSH:HURT:16d12
 B:CRUSH:HURT:16d12
-F:FORCE_SLEEP | FORCE_MAXHP | AQUATIC | WILD_TOO | WILD_OCEAN |
-F:ONLY_ITEM | DROP_3D2 | DROP_GOOD | DROP_CORPSE | 
-F:BASH_DOOR | POWERFUL | MOVE_BODY | SMART | RES_WATE |
-F:EVIL | IM_ELEC | NO_CONF | NO_SLEEP | IM_POIS | IM_FIRE | BASEANGBAND
-S:1_IN_4 | 
-S:BLIND | CONF | SCARE | CAUSE_4 | CAUSE_3 |
-S:BA_WATE | DARKNESS | BR_DARK | TELE_TO 
+F:AQUATIC
+F:BASH_DOOR
+F:DROP_3D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:POWERFUL
+F:RES_WATE
+F:SMART
+F:WILD_OCEAN
+F:WILD_TOO
+S:1_IN_4
+S:BA_WATE
+S:BLIND
+S:BR_DARK
+S:CAUSE_3
+S:CAUSE_4
+S:CONF
+S:DARKNESS
+S:SCARE
+S:TELE_TO
 D:An enormously fearsome and powerful inhabitant of the depths. It 
 D:resembles a gargantuan octopus and its evil is almost tangible. 
 
@@ -12739,14 +20681,31 @@ B:CLAW:HURT:4d12
 B:CLAW:HURT:4d12
 B:BITE:COLD:6d14
 B:BITE:COLD:6d14
-F:FORCE_SLEEP | FORCE_MAXHP | AURA_COLD |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | SUSCEP_FIRE |
-F:BASH_DOOR | POWERFUL | MOVE_BODY | DROP_CORPSE
-F:EVIL | DRAGON | IM_COLD | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
 F:ATTR_MULTI
-S:1_IN_4 | 
-S:BLIND | CONF | SCARE | 
+F:AURA_COLD
+F:BASH_DOOR
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:POWERFUL
+F:SUSCEP_FIRE
+S:1_IN_4
+S:BLIND
 S:BR_COLD
+S:CONF
+S:SCARE
 D:An immense dragon capable of awesome destruction. You have never felt 
 D:such extreme cold, or witnessed such an icy stare. Begone quickly or feel 
 D:its wrath! 
@@ -12761,15 +20720,42 @@ B:TOUCH:EXP_80
 B:TOUCH:UN_POWER
 B:TOUCH:LOSE_DEX:4d12
 B:TOUCH:LOSE_DEX:4d12
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | RES_TELE | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 |  DROP_GOOD |
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | CAN_FLY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND
-F:NO_CUT
-S:1_IN_3 | 
-S:BLINK | TELE_TO | BLIND | HOLD | CONF | SCARE | CAUSE_3 | CAUSE_4 | 
-S:DRAIN_MANA | BRAIN_SMASH | S_HI_UNDEAD | S_UNDEAD | FORGET | S_DEMON | 
-S:TPORT | HEAL | ANIM_DEAD
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:SMART
+F:UNDEAD
+S:1_IN_3
+S:BLIND
+S:BLINK
+S:BRAIN_SMASH
+S:CAUSE_3
+S:CAUSE_4
+S:CONF
+S:DRAIN_MANA
+S:FORGET
+S:HEAL
+S:HOLD
+S:SCARE
+S:S_DEMON
+S:S_HI_UNDEAD
+S:S_UNDEAD
+S:TELE_TO
+S:TPORT
 D:A lich who is partially immaterial, on its way to a new, ethereal form. 
 
 N:743:The Phoenix
@@ -12782,15 +20768,36 @@ B:BITE:FIRE:12d6
 B:BITE:FIRE:12d6
 B:HIT:FIRE:9d12
 B:HIT:FIRE:9d12
-F:UNIQUE | CAN_SPEAK | RES_PLAS | AURA_FIRE |
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | SUSCEP_COLD |
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:ANIMAL | IM_ACID | IM_FIRE | IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP
-F:JOKEANGBAND | HAS_LITE | REGENERATE
-S:1_IN_3 | 
-S:BO_FIRE | BO_PLAS | BA_FIRE | 
-S:BR_FIRE | BR_LITE | BR_PLAS
+F:ANIMAL
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:JOKEANGBAND
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:RES_PLAS
+F:SUSCEP_COLD
+F:UNIQUE
+S:1_IN_3
+S:BA_FIRE
+S:BO_FIRE
+S:BO_PLAS
+S:BR_FIRE
+S:BR_LITE
+S:BR_PLAS
 D:A massive glowing eagle bathed in flames. The searing heat chars your 
 D:skin and melts your armour. 
 
@@ -12804,14 +20811,37 @@ B:STING:LOSE_CON:8d8
 B:STING:LOSE_CON:8d8
 B:BITE:ACID:10d10
 B:BITE:ACID:10d10
-F:FORCE_SLEEP | SMART | KILL_WALL | CAN_SWIM | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_GOOD | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_FIRE | IM_COLD | IM_POIS | RES_TELE | 
-F:HURT_LITE | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_4 | 
-S:BLIND | SCARE | BRAIN_SMASH | 
-S:BO_MANA | BO_NETH | BA_NETH | BR_NETH | S_UNDEAD
+F:BASH_DOOR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_2D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:KILL_WALL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:SMART
+F:UNDEAD
+S:1_IN_4
+S:BA_NETH
+S:BLIND
+S:BO_MANA
+S:BO_NETH
+S:BRAIN_SMASH
+S:BR_NETH
+S:SCARE
+S:S_UNDEAD
 D:This intensely evil creature bears the form of a gargantuan black worm. 
 D:Its gaping maw is a void of blackness, acid drips from its steely hide. 
 D:It is like nothing you have ever seen before, and a terrible chill runs 
@@ -12826,11 +20856,20 @@ E:1:1:1:2:1:1
 O:10:85:0:0
 B:HIT:HURT:3d9
 B:BITE:POISON:2d8
-F:FRIENDS | 
-F:DROP_60 | WILD_TOO | WILD_WOOD | WILD_MOUNTAIN | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | IM_POIS | CAN_FLY
-F:EVIL | GIANT | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FRIENDS
+F:GIANT
+F:HAS_LITE
+F:IM_POIS
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:A hideous, smallish giant that is often found near or with orcs. 
 D:This ogre prefers living in the forest and can pass through 
 D:thick forests with ease.
@@ -12844,10 +20883,18 @@ W:13:2:2100:50
 E:1:1:1:2:1:1
 O:10:85:0:0
 B:HIT:HURT:2d8
-F:DROP_60 | WILD_TOO | WILD_WOOD | WILD_MOUNTAIN | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | PET | 
-F:GOOD | GIANT | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:GIANT
+F:GOOD
+F:HAS_LITE
+F:MORTAL
+F:OPEN_DOOR
+F:PET
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:A rebel among ogres, who has joined the forces of the Light to 
 D:fight agains the Shadow. 
 
@@ -12861,10 +20908,19 @@ E:1:1:1:2:1:1
 O:20:50:20:5
 B:HIT:HURT:4d8
 B:HIT:HURT:4d8
-F:DROP_60 | WILD_TOO | WILD_MOUNTAIN | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | PET | 
-F:GOOD | GIANT | MALE | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:GIANT
+F:GOOD
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:PET
+F:WILD_MOUNTAIN
+F:WILD_TOO
 D:A ten foot tall humanoid with powerful muscles. This giant has 
 D:abandoned the Darkness in favour of the forces of good. Thus he 
 D:is a rebel and hated among his kind.
@@ -12875,13 +20931,34 @@ I:130:60d10:20:110:10
 W:57:2:10:18000
 E:0:0:0:1:0:0
 O:0:0:0:0
-F:FORCE_SLEEP | FORCE_MAXHP | NEVER_MOVE | NEVER_BLOW | RES_TELE | 
-F:SMART | COLD_BLOOD | CAN_SWIM |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_1 | 
-S:TELE_AWAY | BLIND | CONF | SCARE | CAUSE_3 | FORGET | DARKNESS | 
-S:BO_FIRE | BO_ACID | BO_COLD | BO_ELEC
+F:CAN_SWIM
+F:COLD_BLOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RES_TELE
+F:SMART
+F:UNDEAD
+S:1_IN_1
+S:BLIND
+S:BO_ACID
+S:BO_COLD
+S:BO_ELEC
+S:BO_FIRE
+S:CAUSE_3
+S:CONF
+S:DARKNESS
+S:FORGET
+S:SCARE
+S:TELE_AWAY
 D:A skeletal hand floating in the air, motionless except for its flexing 
 D:fingers. 
 
@@ -12891,13 +20968,29 @@ I:130:10d100:20:90:10
 W:58:2:2:21000
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:FORCE_SLEEP | FORCE_MAXHP | NEVER_MOVE | NEVER_BLOW | RES_TELE | 
-F:SMART | COLD_BLOOD |
-F:EVIL | UNDEAD | CAN_SWIM |
-F:IM_FIRE | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_1 | 
-S:BO_MANA | BO_NETH | BA_NETH | BRAIN_SMASH | S_UNDEAD 
+F:CAN_SWIM
+F:COLD_BLOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RES_TELE
+F:SMART
+F:UNDEAD
+S:1_IN_1
+S:BA_NETH
+S:BO_MANA
+S:BO_NETH
+S:BRAIN_SMASH
+S:S_UNDEAD
 D:A bloodshot eyeball floating in the air, you'd be forgiven for assuming it 
 D:harmless. 
 
@@ -12907,14 +21000,31 @@ I:130:14d100:20:120:10
 W:59:2:1000:24000
 E:0:0:0:0:1:0
 O:0:0:0:0
-F:FORCE_SLEEP | FORCE_MAXHP | NEVER_MOVE | RES_TELE | 
-F:SMART | COLD_BLOOD | 
-F:EVIL | UNDEAD | CAN_SWIM |
-F:IM_FIRE | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_1 | 
-S:SLOW | CAUSE_4 | MIND_BLAST | BRAIN_SMASH | TRAPS | BO_PLAS | 
-S:BO_NETH | BA_WATE | S_UNDEAD
+F:CAN_SWIM
+F:COLD_BLOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RES_TELE
+F:SMART
+F:UNDEAD
+S:1_IN_1
+S:BA_WATE
+S:BO_NETH
+S:BO_PLAS
+S:BRAIN_SMASH
+S:CAUSE_4
+S:MIND_BLAST
+S:SLOW
+S:S_UNDEAD
 D:A glowing skull possessed by sorcerous power. It need not move, but 
 D:merely blast you with mighty magic. 
 
@@ -12928,11 +21038,21 @@ B:ENGULF:CONFUSE:5d5
 B:ENGULF:CONFUSE:5d5
 B:ENGULF:HURT:5d5
 B:ENGULF:HURT:5d5
-F:ATTR_MULTI | ATTR_ANY | FORCE_SLEEP | 
-F:RAND_50 | RAND_25 | CAN_FLY |
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | BASEANGBAND | NO_CUT
-S:1_IN_6 | 
+F:ATTR_ANY
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_25
+F:RAND_50
+S:1_IN_6
 S:BR_CHAO
 D:Void, nothingness, spinning destructively. 
 
@@ -12946,15 +21066,52 @@ B:ENGULF:ELEC:5d5
 B:ENGULF:FIRE:5d5
 B:ENGULF:ACID:5d5
 B:ENGULF:COLD:5d5
-F:ATTR_MULTI | ATTR_ANY | FORCE_SLEEP | CAN_FLY |
-F:RAND_50 | RAND_25 | AURA_COLD | RES_WATE | RES_DISE | 
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | RES_NETH | RES_NEXU |
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | AURA_FIRE | AURA_ELEC |
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | RES_PLAS | BASEANGBAND | NO_CUT
-S:1_IN_6 | 
-S:BR_ACID | BR_FIRE | BR_COLD | BR_ELEC | BR_POIS | BR_LITE | 
-S:BR_DARK | BR_SOUN | BR_CONF | BR_CHAO | BR_SHAR | BR_NETH | 
-S:BR_WALL | BR_INER | BR_TIME | BR_GRAV | BR_PLAS | BR_NEXU
+F:ATTR_ANY
+F:ATTR_MULTI
+F:AURA_COLD
+F:AURA_ELEC
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RAND_25
+F:RAND_50
+F:RES_DISE
+F:RES_NETH
+F:RES_NEXU
+F:RES_PLAS
+F:RES_WATE
+S:1_IN_6
+S:BR_ACID
+S:BR_CHAO
+S:BR_COLD
+S:BR_CONF
+S:BR_DARK
+S:BR_ELEC
+S:BR_FIRE
+S:BR_GRAV
+S:BR_INER
+S:BR_LITE
+S:BR_NETH
+S:BR_NEXU
+S:BR_PLAS
+S:BR_POIS
+S:BR_SHAR
+S:BR_SOUN
+S:BR_TIME
+S:BR_WALL
 D:An awesome vortex of pure magic, power radiates from its frame. 
 
 # New monster added by furiosity for the Theme module
@@ -12964,12 +21121,20 @@ I:120:48d10:20:1:0
 W:45:1:3000:3000
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:FORCE_SLEEP | FORCE_MAXHP | NEVER_MOVE | NEVER_BLOW | 
-F:INVISIBLE | EMPTY_MIND | ANIMAL | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND
-S:1_IN_2 | 
-S:BLINK | TPORT | 
+F:ANIMAL
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:INVISIBLE
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+S:1_IN_2
+S:BLINK
 S:S_SPIDER
+S:TPORT
 D:It is a pulsing flesh mound that was once a spider. 
 
 # New monster added by furiosity for the Theme module
@@ -12979,12 +21144,20 @@ I:120:48d10:20:1:0
 W:45:1:3000:3000
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:FORCE_SLEEP | FORCE_MAXHP | NEVER_MOVE | NEVER_BLOW | 
-F:INVISIBLE | EMPTY_MIND | ANIMAL | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND
-S:1_IN_2 | 
-S:BLINK | TPORT | 
+F:ANIMAL
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:INVISIBLE
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+S:1_IN_2
+S:BLINK
 S:S_HOUND
+S:TPORT
 D:It is a pulsing flesh mound that was once a hound. 
 
 N:755:Thuringwethil, the Vampire Messenger
@@ -12997,15 +21170,44 @@ B:BITE:EXP_80:6d6
 B:BITE:EXP_80:6d6
 B:HIT:CONFUSE:6d6
 B:HIT:CONFUSE:6d6
-F:UNIQUE | FEMALE | SPECIAL_GENE | 
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | CAN_SPEAK | CAN_FLY |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | REGENERATE |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP | NO_STUN
-F:RES_TELE | BASEANGBAND | NO_CUT
-S:1_IN_3 | 
-S:BLIND | HOLD | SCARE | CAUSE_3 | CAUSE_4 | DRAIN_MANA | 
-S:BRAIN_SMASH | BA_NETH | S_KIN | S_HI_UNDEAD
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:RES_TELE
+F:SMART
+F:SPECIAL_GENE
+F:UNDEAD
+F:UNIQUE
+S:1_IN_3
+S:BA_NETH
+S:BLIND
+S:BRAIN_SMASH
+S:CAUSE_3
+S:CAUSE_4
+S:DRAIN_MANA
+S:HOLD
+S:SCARE
+S:S_HI_UNDEAD
+S:S_KIN
 D:Chief messenger between Sauron and Morgoth, she is the most deadly of the 
 D:vampire race on Middle-earth.  At first she is charming to meet, but her 
 D:wings and eyes give away her true form. 
@@ -13020,14 +21222,32 @@ B:CLAW:HURT:4d12
 B:CLAW:HURT:4d12
 B:BITE:FIRE:6d14
 B:BITE:FIRE:6d14
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | SUSCEP_COLD |
-F:BASH_DOOR | POWERFUL | MOVE_BODY | AURA_FIRE |
-F:EVIL | DRAGON | IM_FIRE | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
 F:ATTR_MULTI
-S:1_IN_4 | 
-S:BLIND | CONF | SCARE | 
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:POWERFUL
+F:SUSCEP_COLD
+S:1_IN_4
+S:BLIND
 S:BR_FIRE
+S:CONF
+S:SCARE
 D:A vast dragon of immense power. Fire leaps continuously from its huge 
 D:form. The air around it scalds you. Its slightest glance burns you, and 
 D:you realise how truly insignificant you are. 
@@ -13039,12 +21259,21 @@ I:120:48d10:20:1:0
 W:45:1:3000:3000
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:FORCE_SLEEP | FORCE_MAXHP | NEVER_MOVE | NEVER_BLOW | 
-F:INVISIBLE | EMPTY_MIND | ANIMAL | AQUATIC | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND
-S:1_IN_2 | 
-S:BLINK | TPORT | 
+F:ANIMAL
+F:AQUATIC
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:INVISIBLE
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+S:1_IN_2
+S:BLINK
 S:S_HYDRA
+S:TPORT
 D:It is a pulsing flesh mound that was once a many-headed reptile. 
 
 # New monster added by furiosity for the Theme module
@@ -13054,12 +21283,21 @@ I:120:48d10:20:1:0
 W:45:3:3000:3000
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:FORCE_SLEEP | FORCE_MAXHP | NEVER_MOVE | NEVER_BLOW | 
-F:INVISIBLE | EMPTY_MIND | ANIMAL | PET | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND
-S:1_IN_2 | 
-S:BLINK | TPORT | 
+F:ANIMAL
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:INVISIBLE
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:PET
+S:1_IN_2
+S:BLINK
 S:S_KIN
+S:TPORT
 D:It is a pulsing flesh mound that was once a fellow adventurer. 
 
 N:759:Draconic quylthulg
@@ -13068,12 +21306,20 @@ I:120:48d10:20:1:0
 W:45:1:3000:3000
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:FORCE_SLEEP | FORCE_MAXHP | NEVER_MOVE | NEVER_BLOW |
-F:INVISIBLE | EMPTY_MIND | ANIMAL | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND
-S:1_IN_2 | 
-S:BLINK | TPORT | 
+F:ANIMAL
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:INVISIBLE
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+S:1_IN_2
+S:BLINK
 S:S_DRAGON
+S:TPORT
 D:It looks like it was once a dragon corpse, now deeply infected with 
 D:bacteria that make it pulse in a foul way. 
 
@@ -13088,11 +21334,21 @@ B:GAZE:CONFUSE
 B:HIT:COLD:2d6
 B:HIT:HURT:2d6
 B:BITE:COLD:3d6
-F:EMPTY_MIND | COLD_BLOOD | IM_COLD | 
-F:BASH_DOOR | KILL_WALL | DROP_SKELETON | 
-F:ANIMAL | EVIL | SUSCEP_FIRE | AURA_COLD | 
-F:IM_POIS | 
-F:HURT_ROCK | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:AURA_COLD
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_SKELETON
+F:EMPTY_MIND
+F:EVIL
+F:HURT_ROCK
+F:IM_COLD
+F:IM_POIS
+F:KILL_WALL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:SUSCEP_FIRE
 D:This bizarre creature has glaring eyes and large mandibles capable of 
 D:slicing through rock. It is adapted to extreme cold environments.
 
@@ -13107,13 +21363,24 @@ B:GAZE:CONFUSE
 B:HIT:EXP_40:3d8
 B:HIT:HURT:3d8
 B:BITE:HURT:3d8
-F:EMPTY_MIND | COLD_BLOOD | SMART | 
-F:BASH_DOOR | KILL_WALL | DROP_SKELETON | 
-F:ANIMAL | EVIL | RES_NETH | HURT_LITE | 
-F:IM_POIS | 
-F:HURT_ROCK | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_8 | 
-S:DARKNESS | S_UNDEAD
+F:ANIMAL
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_SKELETON
+F:EMPTY_MIND
+F:EVIL
+F:HURT_LITE
+F:HURT_ROCK
+F:IM_POIS
+F:KILL_WALL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:RES_NETH
+F:SMART
+S:1_IN_8
+S:DARKNESS
+S:S_UNDEAD
 D:This bizarre creature has glaring eyes and large mandibles capable of 
 D:slicing through rock. It seems to be surrounded by an impenetrable 
 D:shadow.
@@ -13128,15 +21395,39 @@ B:HIT:HURT:10d10
 B:HIT:HURT:8d6
 B:HIT:HURT:8d6
 B:HIT:HURT:8d6
-F:UNIQUE | MALE | CAN_SPEAK | DROP_CORPSE
-F:FORCE_SLEEP | FORCE_MAXHP | PET |
-F:ONLY_ITEM | DROP_1D2 | DROP_4D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_4 | 
-S:HEAL | BLIND | CONF | SCARE | CAUSE_3 | CAUSE_4 | BRAIN_SMASH | 
-S:FORGET | S_MONSTERS | S_ANIMALS
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:PET
+F:UNIQUE
+S:1_IN_4
+S:BLIND
+S:BRAIN_SMASH
+S:CAUSE_3
+S:CAUSE_4
+S:CONF
+S:FORGET
+S:HEAL
+S:SCARE
+S:S_ANIMALS
+S:S_MONSTERS
 D:He is one of the greatest Dwarven priests to walk the earth. Fundin has 
 D:earned a high position in the church, and his skill with both weapon and 
 D:spell only justify his position further. His combination of Dwarven 
@@ -13152,14 +21443,30 @@ B:HIT:ACID:4d12
 B:HIT:ACID:4d12
 B:CRUSH:HURT:3d12
 B:TOUCH:UN_POWER
-F:FORCE_SLEEP | FORCE_MAXHP | KILL_WALL | 
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DEMON | IM_ACID | NO_CONF | NO_SLEEP | NONLIVING | 
-F:BASEANGBAND | HAS_LITE
-S:1_IN_4 | 
-S:BLIND | CONF | SCARE | HASTE | 
-S:BR_ACID | 
+F:BASH_DOOR
+F:DEMON
+F:DROP_1D2
+F:DROP_2D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:KILL_WALL
+F:MOVE_BODY
+F:NONLIVING
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+S:1_IN_4
+S:BLIND
+S:BR_ACID
+S:CONF
+S:HASTE
+S:SCARE
 S:S_DEMON
 D:The greatest of the demons, potent in both magical might 
 D:and sheer battle power. This corrupted Maia's form is 
@@ -13176,11 +21483,18 @@ B:GAZE:CONFUSE
 B:HIT:POISON:2d6
 B:HIT:HURT:2d6
 B:BITE:POISON:3d6
-F:EMPTY_MIND | COLD_BLOOD | 
-F:BASH_DOOR | KILL_WALL | DROP_SKELETON | 
-F:ANIMAL | EVIL | 
-F:IM_POIS | 
-F:HURT_ROCK | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_SKELETON
+F:EMPTY_MIND
+F:EVIL
+F:HURT_ROCK
+F:IM_POIS
+F:KILL_WALL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
 D:This bizarre creature has glaring eyes and large mandibles capable of 
 D:slicing through rock. It looks poisonous.
 
@@ -13195,11 +21509,21 @@ B:GAZE:CONFUSE
 B:HIT:FIRE:2d6
 B:HIT:HURT:2d6
 B:BITE:FIRE:3d6
-F:EMPTY_MIND | COLD_BLOOD | IM_FIRE | 
-F:BASH_DOOR | KILL_WALL | DROP_SKELETON | 
-F:ANIMAL | EVIL | SUSCEP_COLD | AURA_FIRE | 
-F:IM_POIS | 
-F:HURT_ROCK | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:AURA_FIRE
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_SKELETON
+F:EMPTY_MIND
+F:EVIL
+F:HURT_ROCK
+F:IM_FIRE
+F:IM_POIS
+F:KILL_WALL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:SUSCEP_COLD
 D:This bizarre creature has glaring eyes and large mandibles capable of 
 D:slicing through rock. It is surrounded by flames.
 
@@ -13213,17 +21537,40 @@ B:CLAW:HURT:10d12
 B:CLAW:HURT:10d12
 B:BITE:HURT:10d14
 B:BITE:HURT:10d14
-F:UNIQUE | MALE | CAN_FLY | DROP_CORPSE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ESCORT |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DRAGON | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | NO_CONF |
-F:BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:BR_ACID | BR_FIRE | BR_DISI | BR_WALL | BR_TIME | 
-S:S_HI_DRAGON | S_KIN
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:NO_CONF
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:UNIQUE
+S:1_IN_3
+S:BR_ACID
+S:BR_DISI
+S:BR_FIRE
+S:BR_TIME
+S:BR_WALL
+S:S_HI_DRAGON
+S:S_KIN
 D:"Rushing Jaws" is his name, and death is his game; the greatest and most 
 D:terrible of all dragonkind, his power dismayed even the Valar for a time. 
 
@@ -13238,11 +21585,17 @@ B:GAZE:CONFUSE
 B:HIT:POISON:2d6
 B:HIT:HURT:2d6
 B:BITE:PARALYZE:3d6
-F:EMPTY_MIND | COLD_BLOOD | 
-F:BASH_DOOR | KILL_WALL | DROP_SKELETON | 
-F:ANIMAL | EVIL | 
-F:IM_POIS | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_SKELETON
+F:EMPTY_MIND
+F:EVIL
+F:IM_POIS
+F:KILL_WALL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
 D:This bizarre creature has glaring eyes and large mandibles capable of 
 D:slicing through rock. Its preferred habitat is a forest, however.
 
@@ -13256,14 +21609,35 @@ B:HIT:UN_BONUS:10d10
 B:HIT:UN_BONUS:10d10
 B:HIT:UN_BONUS:7d7
 B:HIT:UN_BONUS:7d7
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | CAN_SWIM |
-F:SMART | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | RES_TELE | 
-F:EVIL | UNDEAD | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:HURT_LITE | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_4 | 
-S:BLIND | SCARE | BRAIN_SMASH | 
-S:BO_MANA | BO_NETH | BA_NETH | S_UNDEAD
+F:BASH_DOOR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:SMART
+F:UNDEAD
+S:1_IN_4
+S:BA_NETH
+S:BLIND
+S:BO_MANA
+S:BO_NETH
+S:BRAIN_SMASH
+S:SCARE
+S:S_UNDEAD
 D:A huge giant garbed in black, more massive than a titan and stronger than 
 D:a dragon. With terrible blows, it breaks your armour from your back, 
 D:leaving you defenceless against its evil wrath. It can smell your fear, 
@@ -13281,11 +21655,19 @@ B:GAZE:CONFUSE
 B:HIT:BLIND:2d6
 B:HIT:HURT:2d6
 B:BITE:EAT_LITE:3d6
-F:EMPTY_MIND | COLD_BLOOD | 
-F:BASH_DOOR | KILL_WALL | DROP_SKELETON | 
-F:ANIMAL | EVIL | HURT_LITE | 
-F:IM_POIS | 
-F:HURT_ROCK | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_SKELETON
+F:EMPTY_MIND
+F:EVIL
+F:HURT_LITE
+F:HURT_ROCK
+F:IM_POIS
+F:KILL_WALL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
 D:This bizarre creature has glaring eyes and large mandibles capable of 
 D:slicing through rock. It prefers to dwell in dark caves where there is 
 D:no sun.
@@ -13301,11 +21683,19 @@ B:GAZE:CONFUSE
 B:HIT:HALLU:2d6
 B:HIT:HURT:2d6
 B:BITE:INSANITY:3d6
-F:EMPTY_MIND | COLD_BLOOD | IM_COLD | 
-F:BASH_DOOR | KILL_WALL | DROP_SKELETON | 
-F:ANIMAL | EVIL | 
-F:IM_POIS | 
-F:HURT_ROCK | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_SKELETON
+F:EMPTY_MIND
+F:EVIL
+F:HURT_ROCK
+F:IM_COLD
+F:IM_POIS
+F:KILL_WALL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
 D:This bizarre creature has glaring eyes and large mandibles capable of 
 D:slicing through rock. It is an extremely confusing sight to behold.
 
@@ -13315,22 +21705,58 @@ I:120:70d100:100:100:0
 W:60:1:1600:35000
 E:1:1:1:2:1:1
 O:0:0:100:0
+A:202:30
 B:HIT:UN_BONUS:6d8
 B:HIT:UN_BONUS:6d8
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
-F:UNIQUE | MALE | ATTR_MULTI | CAN_SPEAK |
-F:FORCE_SLEEP | FORCE_MAXHP | REFLECTING | RES_TELE
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD |
-F:DROP_GREAT | DROP_CHOSEN | SPECIAL_GENE 
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | IM_FIRE | IM_COLD | 
-F:IM_ELEC | IM_POIS | BASEANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:HEAL | HASTE | TPORT | TELE_AWAY | BLIND | CONF | SCARE | 
-S:CAUSE_4 | MIND_BLAST | FORGET | TRAPS | ANIM_DEAD | BO_MANA | 
-S:BO_ICEE | BA_ACID | BA_FIRE | BA_COLD | BA_WATE | BA_CHAO | 
-S:S_UNDEAD | S_DEMON | S_HI_DRAGON | S_ANIMALS |  
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CHOSEN
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REFLECTING
+F:RES_TELE
+F:SMART
+F:SPECIAL_GENE
+F:UNIQUE
+S:1_IN_2
+S:BA_ACID
+S:BA_CHAO
+S:BA_COLD
+S:BA_FIRE
+S:BA_WATE
+S:BLIND
+S:BO_ICEE
+S:BO_MANA
+S:CAUSE_4
+S:CONF
+S:FORGET
+S:HASTE
+S:HEAL
+S:MIND_BLAST
+S:SCARE
+S:S_ANIMALS
+S:S_DEMON
+S:S_HI_DRAGON
+S:S_UNDEAD
+S:TELE_AWAY
+S:TPORT
 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. 
@@ -13345,13 +21771,23 @@ B:TOUCH:EAT_GOLD:5d5
 B:TOUCH:EAT_ITEM:5d5
 B:HIT:BLIND:10d5
 B:HIT:POISON:8d5
-F:UNIQUE | MALE | CAN_SPEAK | SMART | 
-F:FORCE_SLEEP | FORCE_MAXHP | MOVE_BODY | 
-F:ONLY_ITEM | DROP_1D2 | DROP_4D2 | DROP_GOOD | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:IM_POIS | BASEANGBAND
-S:1_IN_6 | 
-S:TELE_TO | TRAPS
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:TAKE_ITEM
+F:UNIQUE
+S:1_IN_6
+S:TELE_TO
 D:He is a master of disguise, an expert of stealth, a genius at traps, and 
 D:moves with blinding speed. 
 
@@ -13365,14 +21801,31 @@ B:HIT:ELEC:4d12
 B:HIT:ELEC:4d12
 B:CRUSH:HURT:3d12
 B:TOUCH:UN_POWER
-F:FORCE_SLEEP | FORCE_MAXHP | AURA_ELEC | KILL_WALL | 
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DEMON | IM_ELEC | NO_CONF | NO_SLEEP | NONLIVING | 
-F:BASEANGBAND | HAS_LITE
-S:1_IN_4 | 
-S:BLIND | CONF | SCARE | HASTE | 
-S:BR_ELEC | 
+F:AURA_ELEC
+F:BASH_DOOR
+F:DEMON
+F:DROP_1D2
+F:DROP_2D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ELEC
+F:KILL_WALL
+F:MOVE_BODY
+F:NONLIVING
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+S:1_IN_4
+S:BLIND
+S:BR_ELEC
+S:CONF
+S:HASTE
+S:SCARE
 S:S_DEMON
 D:The greatest of the demons, potent in both magical might 
 D:and sheer battle power. This corrupted Maia's form is 
@@ -13388,15 +21841,37 @@ B:HIT:EXP_40:6d6
 B:HIT:EXP_40:6d6
 B:HIT:LOSE_STR:4d6
 B:HIT:LOSE_STR:4d6
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | 
-F:INVISIBLE | COLD_BLOOD | TAKE_ITEM | PASS_WALL | 
-F:EVIL | UNDEAD | CAN_FLY |
-F:IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | RES_TELE | BASEANGBAND | NO_CUT
-S:1_IN_3 |
-S:HOLD | DRAIN_MANA | BLIND | S_UNDEAD | CONF |
-S:SCARE | TELE_TO | TPORT | BRAIN_SMASH | ANIM_DEAD
-S:BA_NETH | DARKNESS
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PASS_WALL
+F:RES_TELE
+F:TAKE_ITEM
+F:UNDEAD
+S:1_IN_3
+S:BA_NETH
+S:BLIND
+S:BRAIN_SMASH
+S:CONF
+S:DARKNESS
+S:DRAIN_MANA
+S:HOLD
+S:SCARE
+S:S_UNDEAD
+S:TELE_TO
+S:TPORT
 D:It is a massive form of animated death, its colour deeper than black.  It 
 D:drinks in light, and space around it is twisted and torn by the weight of 
 D:its evil.  It is unlife and it knows nothing but the stealing of souls and 
@@ -13412,13 +21887,39 @@ B:CRUSH:HURT:15d15
 B:CRUSH:HURT:15d15
 B:CRUSH:HURT:15d15
 B:CRUSH:HURT:15d15
-F:FORCE_SLEEP | FORCE_MAXHP | AQUATIC | WILD_TOO | WILD_OCEAN |
-F:ONLY_ITEM | DROP_3D2 | DROP_GOOD | DROP_CORPSE | 
-F:BASH_DOOR | POWERFUL | MOVE_BODY | SMART | RES_WATE |
-F:EVIL | IM_ELEC | NO_CONF | NO_SLEEP | IM_POIS | IM_FIRE | BASEANGBAND
-S:1_IN_3 | 
-S:BLIND | CONF | SCARE | CAUSE_4 | CAUSE_3 | TELE_TO | TELE_AWAY |
-S:BA_WATE | DARKNESS | BR_DARK | BR_ACID | BR_POIS
+F:AQUATIC
+F:BASH_DOOR
+F:DROP_3D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:POWERFUL
+F:RES_WATE
+F:SMART
+F:WILD_OCEAN
+F:WILD_TOO
+S:1_IN_3
+S:BA_WATE
+S:BLIND
+S:BR_ACID
+S:BR_DARK
+S:BR_POIS
+S:CAUSE_3
+S:CAUSE_4
+S:CONF
+S:DARKNESS
+S:SCARE
+S:TELE_AWAY
+S:TELE_TO
 D:An enormously fearsome and powerful inhabitant of the depths. It 
 D:resembles a gargantuan octopus and its evil is almost tangible. 
 
@@ -13432,15 +21933,41 @@ B:TOUCH:EXP_80
 B:TOUCH:UN_POWER
 B:TOUCH:LOSE_DEX:8d12
 B:TOUCH:LOSE_DEX:8d12
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | RES_TELE | CAN_FLY |
-F:ONLY_ITEM | DROP_4D2 |  DROP_2D2 | DROP_GOOD |
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | PASS_WALL |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND
-F:NO_CUT
-S:1_IN_3 | 
-S:BLINK | TELE_TO | BLIND | HOLD | SCARE | CAUSE_4 | 
-S:DRAIN_MANA | BRAIN_SMASH | S_HI_UNDEAD | FORGET |
-S:TPORT | HEAL | S_DEMON | BA_NETH | ANIM_DEAD
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:PASS_WALL
+F:RES_TELE
+F:SMART
+F:UNDEAD
+S:1_IN_3
+S:BA_NETH
+S:BLIND
+S:BLINK
+S:BRAIN_SMASH
+S:CAUSE_4
+S:DRAIN_MANA
+S:FORGET
+S:HEAL
+S:HOLD
+S:SCARE
+S:S_DEMON
+S:S_HI_UNDEAD
+S:TELE_TO
+S:TPORT
 D:A lich who has reached its ultimate evolutionary stage: a completely 
 D:immaterial state. 
 
@@ -13455,14 +21982,25 @@ B:CLAW:CONFUSE:12d12
 B:CLAW:LOSE_DEX:2d12
 B:CLAW:BLIND:10d5
 B:BITE:PARALYZE:15d1
-F:UNIQUE | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ESCORT | ESCORTS | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | 
-F:INVISIBLE | OPEN_DOOR | BASH_DOOR | 
-F:IM_FIRE | IM_COLD | IM_POIS | NO_CONF | BASEANGBAND
-S:1_IN_3 | 
-S:TELE_TO | S_KIN
+F:BASH_DOOR
+F:DROP_4D2
+F:DROP_GOOD
+F:ESCORT
+F:ESCORTS
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:MALE
+F:NO_CONF
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNIQUE
+S:1_IN_3
+S:S_KIN
+S:TELE_TO
 D:Master of all things feline and mighty servant of Morgoth. A great cat, coal-black and evil to look upon. His eyes are long and very narrow and slanted, and gleam both red and green. His great grey whiskers are as stout and sharp as needles. His purr is like the roll of drums and his growl like thunder. 
 
 N:778:Jabberwock
@@ -13475,14 +22013,22 @@ B:CLAW:HURT:10d10
 B:CLAW:HURT:10d10
 B:BITE:HURT:10d10
 B:BITE:HURT:10d10
-F:ATTR_MULTI | 
-F:FORCE_SLEEP | FORCE_MAXHP | RES_TELE | 
-F:ONLY_ITEM | DROP_60 | DROP_90 | 
-F:BASH_DOOR | CAN_FLY | DROP_CORPSE | 
-F:ANIMAL | MORTAL | JOKEANGBAND | 
-S:1_IN_5 | 
-S:CAUSE_4 | 
+F:ANIMAL
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_60
+F:DROP_90
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:JOKEANGBAND
+F:MORTAL
+F:ONLY_ITEM
+F:RES_TELE
+S:1_IN_5
 S:BR_CHAO
+S:CAUSE_4
 D:"Beware the Jabberwock, my son! The jaws that bite, the claws that catch!" 
 
 N:779:Chaos hound
@@ -13495,10 +22041,17 @@ B:BITE:HURT:2d12
 B:BITE:HURT:2d12
 B:BITE:HURT:2d12
 B:CLAW:HURT:2d12
-F:ATTR_MULTI | ATTR_ANY | DROP_SKELETON | DROP_CORPSE | 
-F:FORCE_SLEEP | FRIENDS | BASH_DOOR | 
-F:ANIMAL | NO_CONF | NO_SLEEP | BASEANGBAND
-S:1_IN_5 | 
+F:ANIMAL
+F:ATTR_ANY
+F:ATTR_MULTI
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:NO_CONF
+F:NO_SLEEP
+S:1_IN_5
 S:BR_CHAO
 D:A constantly changing canine form, this hound rushes towards you as if 
 D:expecting mayhem and chaos ahead. It appears to have an almost kamikaze 
@@ -13515,11 +22068,18 @@ B:GAZE:CONFUSE
 B:HIT:HALLU:2d6
 B:HIT:LOSE_ALL:2d6
 B:BITE:EXP_40:3d6
-F:EMPTY_MIND | COLD_BLOOD | 
-F:BASH_DOOR | KILL_WALL | DROP_SKELETON | 
-F:ANIMAL | EVIL | 
-F:IM_POIS | 
-F:HURT_ROCK | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:ANIMAL
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_SKELETON
+F:EMPTY_MIND
+F:EVIL
+F:HURT_ROCK
+F:IM_POIS
+F:KILL_WALL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
 D:This bizarre creature has glaring eyes and large mandibles capable of 
 D:slicing through rock. It is surrounded by an aura of chaotic forces.
 
@@ -13533,12 +22093,31 @@ B:BITE:EXP_80:6d6
 B:GAZE:PARALYZE:5d5
 B:GAZE:INSANITY:5d5
 B:GAZE:UN_POWER:5d5
-F:FORCE_SLEEP | FORCE_MAXHP  | RES_TELE | CAN_FLY |
-F:BASH_DOOR | FEMALE | SMART | DROP_CORPSE | 
-F:EVIL | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND
-S:1_IN_2 | 
-S:BLIND | CONF | FORGET | SCARE | DRAIN_MANA | BRAIN_SMASH | 
-S:BA_DARK | BO_MANA | BA_ACID | BA_FIRE | BA_COLD | BO_NETH | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_POIS
+F:NO_CONF
+F:NO_SLEEP
+F:RES_TELE
+F:SMART
+S:1_IN_2
+S:BA_ACID
+S:BA_COLD
+S:BA_DARK
+S:BA_FIRE
+S:BLIND
+S:BO_MANA
+S:BO_NETH
+S:BRAIN_SMASH
+S:CONF
+S:DRAIN_MANA
+S:FORGET
+S:SCARE
 S:S_KIN
 D:A mother of the race of beholders, she can summon her brood to her aid 
 D:whenever she wishes. 
@@ -13553,12 +22132,31 @@ B:BITE:FIRE:5d12
 B:BITE:FIRE:5d12
 B:CRUSH:HURT:6d15
 B:CRUSH:HURT:6d15
-F:FORCE_SLEEP | FORCE_MAXHP | AQUATIC | WILD_TOO | WILD_OCEAN |
-F:IM_FIRE | IM_ACID | IM_COLD | IM_POIS |
-F:ANIMAL | NO_CONF | NO_SLEEP | NO_FEAR | DROP_CORPSE | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:DROP_CORPSE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:WILD_OCEAN
+F:WILD_TOO
 S:1_IN_9
-S:BR_FIRE | BR_ACID | BR_DARK | BR_POIS | BA_WATE | 
-S:S_DRAGON | S_HYDRA | HEAL | CONF | DARKNESS
+S:BA_WATE
+S:BR_ACID
+S:BR_DARK
+S:BR_FIRE
+S:BR_POIS
+S:CONF
+S:DARKNESS
+S:HEAL
+S:S_DRAGON
+S:S_HYDRA
 D:An enormous, terrible sea-monster, the true master of the ocean. 
 
 N:783:Great Worm of Chaos
@@ -13571,15 +22169,34 @@ B:CLAW:HURT:5d12
 B:CLAW:HURT:5d12
 B:BITE:HURT:7d14
 B:BITE:HURT:7d14
-F:ATTR_MULTI | ATTR_ANY |
-F:FORCE_SLEEP | FORCE_MAXHP | RES_DISE | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:BASH_DOOR | POWERFUL | MOVE_BODY | CAN_FLY |
-F:EVIL | DRAGON | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
-S:1_IN_4 | 
-S:BLIND | CONF | SCARE | 
-S:BR_CHAO | BR_DISE | 
-S:S_DRAGON | S_HI_DRAGON
+F:ATTR_ANY
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:POWERFUL
+F:RES_DISE
+S:1_IN_4
+S:BLIND
+S:BR_CHAO
+S:BR_DISE
+S:CONF
+S:SCARE
+S:S_DRAGON
+S:S_HI_DRAGON
 D:A massive dragon of changing form. As you watch, it appears first fair 
 D:and then foul. Its body is twisted by chaotic forces as it strives to 
 D:stay real. Its very existence distorts the universe around it. 
@@ -13594,15 +22211,33 @@ B:CLAW:HURT:5d12
 B:CLAW:HURT:5d12
 B:BITE:HURT:7d14
 B:BITE:HURT:7d14
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:BASH_DOOR | POWERFUL | MOVE_BODY | CAN_FLY |
-F:EVIL | DRAGON | NO_STUN | NO_SLEEP | BASEANGBAND | HAS_LITE | NO_CUT
 F:ATTR_MULTI
-S:1_IN_4 | 
-S:BLIND | CONF | SCARE | 
-S:BR_SOUN | BR_SHAR | 
-S:S_DRAGON | S_HI_DRAGON
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MOVE_BODY
+F:NO_CUT
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:POWERFUL
+S:1_IN_4
+S:BLIND
+S:BR_SHAR
+S:BR_SOUN
+S:CONF
+S:SCARE
+S:S_DRAGON
+S:S_HI_DRAGON
 D:A massive dragon of powerful intellect. It seeks to dominate the universe 
 D:and despises all other life. It sees all who do not obey it as mere 
 D:insects to be crushed underfoot. 
@@ -13617,15 +22252,37 @@ B:CLAW:HURT:6d12
 B:CLAW:HURT:6d12
 B:BITE:HURT:8d14
 B:BITE:HURT:8d14
-F:DRAGON | EVIL | DROP_CORPSE | 
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:BASH_DOOR | POWERFUL | MOVE_BODY | RES_DISE |
-F:NO_STUN | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE | NO_CUT | ATTR_MULTI
-S:1_IN_4 | 
-S:BLIND | CONF | SCARE | 
-S:BR_SOUN | BR_CHAO | BR_SHAR | BR_DISE | 
-S:S_DRAGON | S_HI_DRAGON
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:POWERFUL
+F:RES_DISE
+S:1_IN_4
+S:BLIND
+S:BR_CHAO
+S:BR_DISE
+S:BR_SHAR
+S:BR_SOUN
+S:CONF
+S:SCARE
+S:S_DRAGON
+S:S_HI_DRAGON
 D:A massive dragon, it is thousands of 
 D:years old and seeks to maintain the Cosmic Balance. It sees you as an 
 D:upstart troublemaker without the wisdom to control your actions. 
@@ -13641,12 +22298,23 @@ B:HIT:ACID:3d4
 B:HIT:ACID:3d4
 B:HIT:ACID:3d4
 B:HIT:ACID:3d4
-F:FORCE_MAXHP | IM_ACID | HURT_LITE | 
-F:EMPTY_MIND | COLD_BLOOD |
-F:ONLY_GOLD | DROP_2D2 | 
-F:KILL_ITEM | PASS_WALL | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:HURT_ROCK | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:COLD_BLOOD
+F:DROP_2D2
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:HURT_LITE
+F:HURT_ROCK
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_ITEM
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_GOLD
+F:PASS_WALL
 D:It is a tougher relative of the Xorn. Its hide glitters with drops of acid. 
 
 N:787:White Balrog
@@ -13659,14 +22327,31 @@ B:HIT:COLD:4d12
 B:HIT:COLD:4d12
 B:CRUSH:HURT:3d12
 B:TOUCH:UN_POWER
-F:FORCE_SLEEP | FORCE_MAXHP | AURA_COLD | KILL_WALL | 
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DEMON | IM_COLD | NO_CONF | NO_SLEEP | NONLIVING | 
-F:BASEANGBAND | HAS_LITE
-S:1_IN_4 | 
-S:BLIND | CONF | SCARE | HASTE | 
-S:BR_COLD | 
+F:AURA_COLD
+F:BASH_DOOR
+F:DEMON
+F:DROP_1D2
+F:DROP_2D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:KILL_WALL
+F:MOVE_BODY
+F:NONLIVING
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+S:1_IN_4
+S:BLIND
+S:BR_COLD
+S:CONF
+S:HASTE
+S:SCARE
 S:S_DEMON
 D:The greatest of the demons, potent in both magical might 
 D:and sheer battle power. This corrupted Maia's form is 
@@ -13683,12 +22368,24 @@ B:HIT:FIRE:3d4
 B:HIT:FIRE:3d4
 B:HIT:FIRE:3d4
 B:HIT:FIRE:3d4
-F:FORCE_MAXHP | IM_ACID | SUSCEP_COLD | 
-F:EMPTY_MIND | COLD_BLOOD | HURT_LITE | 
-F:ONLY_GOLD | DROP_2D2 | AURA_FIRE | 
-F:KILL_ITEM | PASS_WALL | 
-F:IM_FIRE | IM_ELEC | IM_POIS | 
-F:HURT_ROCK | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:AURA_FIRE
+F:COLD_BLOOD
+F:DROP_2D2
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:HURT_LITE
+F:HURT_ROCK
+F:IM_ACID
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_ITEM
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_GOLD
+F:PASS_WALL
+F:SUSCEP_COLD
 D:It is a tougher relative of the Xorn. Its hide is wreathed in flames. 
 
 N:789:Trone, the Rebel Thunderlord
@@ -13696,20 +22393,42 @@ G:B:D
 I:130:80d100:20:120:80
 W:72:2:400000:45000
 E:1:1:1:2:1:1
-O:50:50:0:0
+O:0:0:0:0
 B:HIT:HURT:12d10
 B:HIT:HURT:12d10
 B:CHARGE:HURT:10d10
 B:CHARGE:HURT:10d10
-F:UNIQUE | MALE | CAN_SPEAK | RES_TELE | SPECIAL_GENE | 
-F:FORCE_MAXHP | REGENERATE | THUNDERLORD | CAN_FLY |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT |
-F:SMART | OPEN_DOOR | BASH_DOOR | DROP_CHOSEN |
-F:EVIL | IM_FIRE | IM_COLD | IM_POIS | 
-F:MORTAL | HAS_LITE
-S:1_IN_4 | 
-S:TELE_TO | SCARE | BR_TIME | BR_FIRE |
-S:BO_MANA | S_THUNDERLORD
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:RES_TELE
+F:SMART
+F:SPECIAL_GENE
+F:THUNDERLORD
+F:UNIQUE
+S:1_IN_4
+S:BO_MANA
+S:BR_FIRE
+S:BR_TIME
+S:SCARE
+S:S_THUNDERLORD
+S:TELE_TO
 D:As the Thunderlords came from afar to help the Elves, Trone and his rebel 
 D:wing came to defend Morgoth. He is an evil and powerful Thunderlord. 
 
@@ -13723,15 +22442,41 @@ B:CLAW:HURT:6d12
 B:CLAW:HURT:6d12
 B:CLAW:HURT:8d14
 B:BITE:HURT:8d14
-F:ATTR_MULTI | CAN_FLY |
-F:FORCE_SLEEP | FORCE_MAXHP | AURA_FIRE | AURA_ELEC | RES_TELE | 
-F:IM_FIRE | IM_ACID | IM_POIS | IM_COLD | IM_ELEC | AURA_COLD |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD |
-F:BASH_DOOR | POWERFUL | MOVE_BODY | DROP_CORPSE | 
-F:DRAGON | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
-S:1_IN_4 |
-S:BR_POIS | BR_ELEC | BR_ACID | BR_FIRE | BR_COLD |
-S:CONF | SCARE | BLIND
+F:ATTR_MULTI
+F:AURA_COLD
+F:AURA_ELEC
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:POWERFUL
+F:RES_TELE
+S:1_IN_4
+S:BLIND
+S:BR_ACID
+S:BR_COLD
+S:BR_ELEC
+S:BR_FIRE
+S:BR_POIS
+S:CONF
+S:SCARE
 D:A huge dragon whose scales shimmer in myriad hues. 
 
 N:791:Marda, rider of gold Laronth
@@ -13740,19 +22485,49 @@ I:130:100d85:100:100:50
 W:75:6:420000:35000
 E:1:1:1:2:1:1
 O:50:50:0:0
+A:26:50
 B:HIT:HURT:12d15
 B:HIT:HURT:12d15
 B:HIT:HURT:12d15
 B:HIT:HURT:12d15
-F:UNIQUE | FEMALE | CAN_SPEAK | THUNDERLORD | ONLY_ITEM | RES_TELE | 
-F:DROP_CHOSEN | DROP_CORPSE | DROP_SKELETON | CAN_FLY | 
-F:FORCE_SLEEP | FORCE_MAXHP | SPECIAL_GENE | 
-F:DROP_4D2 | DROP_1D2 | DROP_GOOD | DROP_60 | DROP_90 |
-F:EVIL | IM_POIS | IM_ELEC | SMART | REGENERATE | OPEN_DOOR | BASH_DOOR |
-F:MORTAL | HAS_LITE | AQUATIC | 
-S:1_IN_4 |
-S:SCARE | BLIND | TPORT | BLINK | TELE_AWAY | TELE_TO | 
-S:BR_FIRE | BA_MANA | S_THUNDERLORD
+F:AQUATIC
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_60
+F:DROP_90
+F:DROP_CHOSEN
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ELEC
+F:IM_POIS
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:RES_TELE
+F:SMART
+F:SPECIAL_GENE
+F:THUNDERLORD
+F:UNIQUE
+S:1_IN_4
+S:BA_MANA
+S:BLIND
+S:BLINK
+S:BR_FIRE
+S:SCARE
+S:S_THUNDERLORD
+S:TELE_AWAY
+S:TELE_TO
+S:TPORT
 D:Former leader among the Thunderlords, she and Trone have fallen under the 
 D:control of Morgoth. Laronth, her eagle, can summon Thunderlords to her aid. 
 D:She has somehow broken through to the Lonely Isle and is killing the swans 
@@ -13770,16 +22545,37 @@ B:HIT:HURT:10d10
 B:HIT:HURT:10d10
 B:HIT:LOSE_STR:4d6
 B:HIT:LOSE_STR:4d6
-F:UNIQUE | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_SPEAK | CAN_FLY |
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | 
-F:EVIL | UNDEAD | IM_COLD | AURA_COLD |
-F:IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT | NO_STUN
-S:1_IN_3 | 
-S:BLIND | HOLD | CONF | 
-S:BA_DARK | BA_NETH | 
-S:S_WRAITH | S_HI_UNDEAD | S_KIN
+F:AURA_COLD
+F:CAN_FLY
+F:CAN_SPEAK
+F:COLD_BLOOD
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:MALE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:PASS_WALL
+F:UNDEAD
+F:UNIQUE
+S:1_IN_3
+S:BA_DARK
+S:BA_NETH
+S:BLIND
+S:CONF
+S:HOLD
+S:S_HI_UNDEAD
+S:S_KIN
+S:S_WRAITH
 D:This huge affront to existence twists and tears at the fabric of space. 
 D:Darkness itself recoils from the touch of Tselakus as he leaves a trail 
 D:of death and destruction. Mighty claws rend reality as he 
@@ -13795,16 +22591,36 @@ B:CLAW:HURT:6d12
 B:CLAW:HURT:6d12
 B:BITE:ELEC:8d14
 B:BITE:ELEC:8d14
-F:FORCE_SLEEP | FORCE_MAXHP | AURA_ELEC | AURA_COLD | DROP_CORPSE | 
-F:IM_ELEC | EVIL | CAN_FLY |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:DRAGON | NO_CONF | NO_SLEEP | RES_TELE | BASEANGBAND | HAS_LITE
 F:ATTR_MULTI
-S:1_IN_4 |
-S:BR_ELEC | BR_GRAV | BR_LITE |
-S:S_DRAGON | S_HI_DRAGON |
-S:SCARE | BLIND
+F:AURA_COLD
+F:AURA_ELEC
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ELEC
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:POWERFUL
+F:RES_TELE
+S:1_IN_4
+S:BLIND
+S:BR_ELEC
+S:BR_GRAV
+S:BR_LITE
+S:SCARE
+S:S_DRAGON
+S:S_HI_DRAGON
 D:The mightiest elemental dragon of air, it can destroy you with ease. 
 
 N:794:Eilinel the Entrapped
@@ -13817,13 +22633,32 @@ B:HIT:HURT:3d5
 B:HIT:HURT:3d5
 B:TOUCH:UN_POWER:3d3
 B:TOUCH:UN_BONUS:3d3
-F:UNIQUE | FEMALE |
-F:FORCE_MAXHP |
-F:DROP_1D2 | DROP_2D2 | DROP_3D2 | DROP_GOOD |
-F:SMART | OPEN_DOOR | BASH_DOOR |
-F:EVIL | UNDEAD | IM_COLD | IM_FIRE | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT | NO_STUN
-S:1_IN_2 |
-S:BLINK | TELE_TO | HEAL | S_MONSTER | BO_ACID | BO_MANA | CAUSE_3
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_GOOD
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:IM_COLD
+F:IM_FIRE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:NO_STUN
+F:OPEN_DOOR
+F:SMART
+F:UNDEAD
+F:UNIQUE
+S:1_IN_2
+S:BLINK
+S:BO_ACID
+S:BO_MANA
+S:CAUSE_3
+S:HEAL
+S:S_MONSTER
+S:TELE_TO
 D:In life, she was the wife of Gorlim. In death, her shade was 
 D:entrapped by Morgoth and used to trick her husband into betraying 
 D:Barahir. Now she is totally entrapped by Morgoth's power, and uses 
@@ -13839,13 +22674,33 @@ B:HIT:HURT:11d11
 B:HIT:HURT:11d11
 B:HIT:HURT:11d11
 B:HIT:HURT:11d11
-F:FORCE_SLEEP | FORCE_MAXHP | REGENERATE | NONLIVING | 
-F:ONLY_ITEM | DROP_GOOD | DROP_4D2 | DROP_2D2 | BASEANGBAND | 
-F:OPEN_DOOR | BASH_DOOR | KILL_BODY | POWERFUL | 
-F:EVIL | DEMON | NO_CONF | NO_SLEEP | CAN_FLY | 
-F:IM_FIRE | IM_COLD | IM_POIS | IM_ACID | IM_ELEC
-S:1_IN_5 | 
-S:HASTE | SLOW | SCARE | S_HI_DEMON 
+F:BASH_DOOR
+F:CAN_FLY
+F:DEMON
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:NONLIVING
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:REGENERATE
+S:1_IN_5
+S:HASTE
+S:SCARE
+S:SLOW
+S:S_HI_DEMON
 D:Festooned with horns and fierce claws, these monstrous forms are the 
 D:shock troops of Morgoth, known for their strength and fierce weapons. 
 D:A giant humanoid demon wielding a massive, heavy and sharp scythe.  
@@ -13864,12 +22719,23 @@ B:HIT:POISON:3d4
 B:HIT:POISON:3d4
 B:HIT:POISON:3d4
 B:HIT:POISON:3d4
-F:FORCE_MAXHP | IM_ACID | HURT_LITE | 
-F:EMPTY_MIND | COLD_BLOOD |
-F:ONLY_GOLD | DROP_2D2 | 
-F:KILL_ITEM | KILL_WALL | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:HURT_ROCK | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:COLD_BLOOD
+F:DROP_2D2
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:HURT_LITE
+F:HURT_ROCK
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_ITEM
+F:KILL_WALL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_GOLD
 D:It is a tougher relative of the Xorn. Its hide glitters with drops of venom. 
 
 # New monster added by furiosity for the Theme module
@@ -13883,12 +22749,24 @@ B:HIT:ELEC:3d4
 B:HIT:ELEC:3d4
 B:HIT:ELEC:3d4
 B:HIT:ELEC:3d4
-F:FORCE_MAXHP | IM_ACID | HURT_LITE | 
-F:EMPTY_MIND | COLD_BLOOD |
-F:ONLY_GOLD | DROP_2D2 | AURA_ELEC | 
-F:KILL_ITEM | KILL_WALL | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:HURT_ROCK | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
+F:AURA_ELEC
+F:COLD_BLOOD
+F:DROP_2D2
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:HURT_LITE
+F:HURT_ROCK
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_ITEM
+F:KILL_WALL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_GOLD
 D:It is a tougher relative of the Xorn. It is surrounded by sparks. 
 
 N:798:Black reaver
@@ -13901,15 +22779,39 @@ B:HIT:UN_BONUS:6d8
 B:HIT:UN_BONUS:6d8
 B:HIT:LOSE_STR:4d6
 B:HIT:LOSE_STR:4d6
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | CAN_SWIM |
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_GOOD | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | RES_TELE | 
-F:NO_CONF | NO_SLEEP | KILL_WALL | NO_FEAR | 
-F:BASEANGBAND | NO_CUT
-S:1_IN_3 | 
-S:TELE_TO | BLIND | HOLD | CONF | CAUSE_3 | CAUSE_4 | DRAIN_MANA | 
-S:BRAIN_SMASH | BA_MANA | BA_NETH | S_UNDEAD
+F:BASH_DOOR
+F:CAN_SWIM
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_2D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:KILL_WALL
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:SMART
+F:UNDEAD
+S:1_IN_3
+S:BA_MANA
+S:BA_NETH
+S:BLIND
+S:BRAIN_SMASH
+S:CAUSE_3
+S:CAUSE_4
+S:CONF
+S:DRAIN_MANA
+S:HOLD
+S:S_UNDEAD
+S:TELE_TO
 D:A humanoid form,  black as night, advancing steadily and unstoppably, even 
 D:the very rock of the dungeon cannot prevent it reaching you. 
 
@@ -13922,13 +22824,38 @@ O:20:40:40:0
 B:HIT:HURT:4d5
 B:HIT:HURT:4d5
 B:HIT:HURT:4d5
-F:MALE | ONLY_ITEM | FORCE_SLEEP | FORCE_MAXHP | DROP_4D2 |
-F:SMART | BASH_DOOR | TAKE_ITEM | MOVE_BODY | 
-F:EVIL | IM_FIRE | IM_ELEC | IM_POIS | BASEANGBAND | 
-F:NO_CONF | NO_SLEEP | NO_STUN | NO_FEAR
-S:1_IN_2 | 
-S:HEAL | BLIND | HOLD | CONF | SCARE | TPORT | BA_COLD | BA_FIRE | 
-S:MIND_BLAST | BRAIN_SMASH | S_MONSTERS | TELE_AWAY | BLINK | BO_NETH
+F:BASH_DOOR
+F:DROP_4D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:SMART
+F:TAKE_ITEM
+S:1_IN_2
+S:BA_COLD
+S:BA_FIRE
+S:BLIND
+S:BLINK
+S:BO_NETH
+S:BRAIN_SMASH
+S:CONF
+S:HEAL
+S:HOLD
+S:MIND_BLAST
+S:SCARE
+S:S_MONSTERS
+S:TELE_AWAY
+S:TPORT
 D:A mindcrafter of the highest order.  Powerful and evil, and a dangerous 
 D:enemy: a master of mind over matter, of his own mind, and of the minds of 
 D:others, who slavishly follow him into battle when he calls them. 
@@ -13939,12 +22866,21 @@ I:120:15d100:20:1:0
 W:71:2:5000:10500
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:FORCE_SLEEP | FORCE_MAXHP | NEVER_MOVE | NEVER_BLOW | 
-F:INVISIBLE | EMPTY_MIND | ANIMAL | RES_TELE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND
-S:1_IN_2 | 
-S:BLINK | TELE_TO | 
+F:ANIMAL
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:INVISIBLE
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:RES_TELE
+S:1_IN_2
+S:BLINK
 S:S_HI_DEMON
+S:TELE_TO
 D:A massive pulsating mound of flesh, glowing with an inner hellish light. 
 
 N:801:Greater draconic quylthulg
@@ -13953,12 +22889,21 @@ I:120:15d100:20:1:0
 W:71:2:5000:10500
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:FORCE_SLEEP | FORCE_MAXHP | NEVER_MOVE | NEVER_BLOW | 
-F:INVISIBLE | EMPTY_MIND | ANIMAL | RES_TELE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND
-S:1_IN_2 | 
-S:BLINK | TELE_TO | 
+F:ANIMAL
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:INVISIBLE
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:RES_TELE
+S:1_IN_2
+S:BLINK
 S:S_HI_DRAGON
+S:TELE_TO
 D:A massive mound of scaled flesh, throbbing and pulsating with multi-hued 
 D:light. 
 
@@ -13968,12 +22913,22 @@ I:120:15d100:20:1:0
 W:71:2:5000:10500
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:FORCE_SLEEP | FORCE_MAXHP | NEVER_MOVE | NEVER_BLOW | 
-F:INVISIBLE | EMPTY_MIND | ANIMAL | RES_TELE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND |NO_CUT
-S:1_IN_2 | 
-S:BLINK | TELE_TO | 
+F:ANIMAL
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:INVISIBLE
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:RES_TELE
+S:1_IN_2
+S:BLINK
 S:S_HI_UNDEAD
+S:TELE_TO
 D:A massive pile of rotting flesh. A disgusting stench fills the air as it 
 D:throbs and writhes. 
 
@@ -13989,12 +22944,30 @@ B:CHARGE:TERRIFY
 B:CHARGE:TERRIFY
 B:CHARGE:TERRIFY
 B:CHARGE:TERRIFY
-F:CHAR_CLEAR | ATTR_CLEAR | FORCE_MAXHP | SMART | 
-F:INVISIBLE | COLD_BLOOD | EMPTY_MIND | WEIRD_MIND | 
-F:PASS_WALL | UNDEAD | EVIL | NONLIVING | HURT_LITE |
-F:IM_POIS | RES_TELE | NO_FEAR | NO_STUN | NO_SLEEP | 
-F:CAN_SWIM | NO_TARGET | AI_ANNOY | NO_CUT | CAN_SPEAK | 
+F:AI_ANNOY
+F:ATTR_CLEAR
+F:CAN_SPEAK
+F:CAN_SWIM
+F:CHAR_CLEAR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:FORCE_MAXHP
+F:HURT_LITE
+F:IM_POIS
+F:INVISIBLE
 F:JOKEANGBAND
+F:NONLIVING
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:NO_TARGET
+F:PASS_WALL
+F:RES_TELE
+F:SMART
+F:UNDEAD
+F:WEIRD_MIND
 S:1_IN_2
 S:SCARE
 D:You can't see it. 
@@ -14009,18 +22982,43 @@ B:TOUCH:EXP_80:6d12
 B:TOUCH:UN_POWER:6d12
 B:TOUCH:LOSE_DEX:6d12
 B:TOUCH:LOSE_DEX:6d12
-F:UNIQUE | MALE | CAN_SPEAK | RES_TELE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ESCORT | SPECIAL_GENE | 
-F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT | 
-F:SMART | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_COLD | 
-F:IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_2 | 
-S:BLINK | TELE_TO | HOLD | SCARE | CAUSE_4 | 
-S:BRAIN_SMASH | TRAPS | BA_MANA | 
-S:BO_MANA | BA_NETH | 
-S:S_MONSTERS | S_UNDEAD | S_KIN | ANIM_DEAD
+F:BASH_DOOR
+F:CAN_SPEAK
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_GOOD
+F:DROP_GREAT
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:MALE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:SMART
+F:SPECIAL_GENE
+F:UNDEAD
+F:UNIQUE
+S:1_IN_2
+S:BA_MANA
+S:BA_NETH
+S:BLINK
+S:BO_MANA
+S:BRAIN_SMASH
+S:CAUSE_4
+S:HOLD
+S:SCARE
+S:S_KIN
+S:S_MONSTERS
+S:S_UNDEAD
+S:TELE_TO
 D:A stench of corruption and decay surrounds this sorcerer, who has 
 D:risen from the dead to continue his foul plots and schemes. 
 
@@ -14034,12 +23032,24 @@ O:0:50:50:0
 B:HIT:HURT:1d8
 B:HIT:EAT_LITE:1d8
 B:TOUCH:EXP_40
-F:FORCE_SLEEP | DROP_60 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | CAN_FLY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS |
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_8 | 
-S:HOLD | SCARE | CAUSE_2 | DARKNESS
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_60
+F:EVIL
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:UNDEAD
+S:1_IN_8
+S:CAUSE_2
+S:DARKNESS
+S:HOLD
+S:SCARE
 D:An almost imperceptible silvery shimmer in the air. It 
 D:seems to absorb light wherever it goes.
 
@@ -14054,12 +23064,25 @@ O:0:50:50:0
 B:HIT:HURT:1d8
 B:HIT:HURT:1d8
 B:TOUCH:EXP_40
-F:FORCE_SLEEP | DROP_60 | PET | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | CAN_FLY |
-F:GOOD | UNDEAD | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_8 | 
-S:HOLD | SCARE | CAUSE_2 | DARKNESS
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_60
+F:FORCE_SLEEP
+F:GOOD
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:PET
+F:UNDEAD
+S:1_IN_8
+S:CAUSE_2
+S:DARKNESS
+S:HOLD
+S:SCARE
 D:A fellow adventurer wraith.
 
 N:807:Balrog Captain
@@ -14072,15 +23095,40 @@ B:HIT:FIRE:8d12
 B:HIT:FIRE:8d12
 B:CRUSH:HURT:7d12
 B:TOUCH:UN_POWER
-F:FORCE_SLEEP | FORCE_MAXHP | AURA_FIRE | CAN_FLY |
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | NONLIVING |
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | SMART | 
-F:EVIL | DEMON | IM_FIRE | NO_CONF | NO_SLEEP | KILL_WALL |
-F:RES_NETH | RES_PLAS | REGENERATE | BASEANGBAND | HAS_LITE
-S:1_IN_3 |
-S:BLIND | CONF | BRAIN_SMASH | 
-S:BR_FIRE | BA_NETH | BA_FIRE | BR_PLAS | BO_PLAS |
-S:S_HI_DEMON | S_DEMON | 
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:DEMON
+F:DROP_2D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:KILL_WALL
+F:MOVE_BODY
+F:NONLIVING
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:REGENERATE
+F:RES_NETH
+F:RES_PLAS
+F:SMART
+S:1_IN_3
+S:BA_FIRE
+S:BA_NETH
+S:BLIND
+S:BO_PLAS
+S:BRAIN_SMASH
+S:BR_FIRE
+S:BR_PLAS
+S:CONF
+S:S_DEMON
+S:S_HI_DEMON
 D:Originally of the semi-divine Maiar, this evil spirit swore allegiance 
 D:to Morgoth at the beginning of time and is now one of his most terrible 
 D:demonic servants.  With its flaming whip and sword it seeks to destroy you. 
@@ -14095,15 +23143,35 @@ B:CLAW:POISON:8d6
 B:CLAW:POISON:8d6
 B:BITE:PARALYZE:8d10
 B:STING:LOSE_STR:8d4
-F:UNIQUE | FEMALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | 
-F:SMART | BASH_DOOR | IM_ACID | 
-F:ANIMAL | SPIDER | EVIL | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP
-F:BASEANGBAND
-S:1_IN_3 | 
-S:HEAL | BLIND | SLOW | CONF | SCARE | DARKNESS | BA_DARK | 
-S:BR_POIS | BR_DARK | S_SPIDER
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_ACID
+F:IM_POIS
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:SMART
+F:SPIDER
+F:UNIQUE
+S:1_IN_3
+S:BA_DARK
+S:BLIND
+S:BR_DARK
+S:BR_POIS
+S:CONF
+S:DARKNESS
+S:HEAL
+S:SCARE
+S:SLOW
+S:S_SPIDER
 D:This enormous, hideous spirit of void is in the form of a spider of 
 D:immense proportions.  She is surrounded by a cloud of Unlight as she sucks 
 D:in all living light into her bloated body, and breathes out the blackest of 
@@ -14121,13 +23189,33 @@ B:HIT:HURT:1d6
 B:HIT:HURT:1d6
 B:BITE:EXP_20:2d6
 B:BITE:EXP_20:2d6
-F:FORCE_SLEEP | FORCE_MAXHP | FRIENDS | 
-F:COLD_BLOOD | DROP_60 | DROP_1D2 | ORC | 
-F:OPEN_DOOR | BASH_DOOR | REGENERATE | CAN_FLY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP | 
-F:BASEANGBAND | NO_CUT
-S:1_IN_9 | 
-S:TELE_TO | HOLD | SCARE | CAUSE_2 | MIND_BLAST | FORGET | DARKNESS
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_60
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:FRIENDS
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:ORC
+F:REGENERATE
+F:UNDEAD
+S:1_IN_9
+S:CAUSE_2
+S:DARKNESS
+S:FORGET
+S:HOLD
+S:MIND_BLAST
+S:SCARE
+S:TELE_TO
 D:It is an orc with an aura of power. You notice a sharp set of front 
 D:teeth. 
 
@@ -14142,13 +23230,32 @@ B:HIT:HURT:1d6
 B:HIT:HURT:1d6
 B:BITE:EXP_20:2d6
 B:BITE:EXP_20:2d6
-F:FORCE_SLEEP | FORCE_MAXHP | STUPID | 
-F:COLD_BLOOD | DROP_60 | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | REGENERATE | CAN_FLY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP | 
-F:BASEANGBAND | NO_CUT
-S:1_IN_9 | 
-S:TELE_TO | HOLD | SCARE | CAUSE_2 | MIND_BLAST | FORGET | DARKNESS
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_60
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:REGENERATE
+F:STUPID
+F:UNDEAD
+S:1_IN_9
+S:CAUSE_2
+S:DARKNESS
+S:FORGET
+S:HOLD
+S:MIND_BLAST
+S:SCARE
+S:TELE_TO
 D:It is a yeek with an aura of power. You notice a sharp set of front 
 D:teeth. 
 
@@ -14162,18 +23269,50 @@ B:BITE:HURT:3d12
 B:BITE:HURT:3d12
 B:CLAW:HURT:3d12
 B:CLAW:HURT:3d12
-F:ATTR_MULTI | ATTR_ANY |
-F:FORCE_SLEEP | CAN_FLY |
-F:FRIENDS | RES_NETH | RES_PLAS | RES_NEXU | RES_DISE |
-F:BASH_DOOR | AURA_FIRE | AURA_ELEC | AURA_COLD | 
-F:DROP_CORPSE | DROP_SKELETON |
-F:ANIMAL | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_5 | 
-S:BR_ACID | BR_FIRE | BR_COLD | BR_ELEC | BR_POIS | 
-S:BR_LITE | BR_DARK | BR_SOUN | BR_CONF | BR_CHAO | BR_SHAR | 
-S:BR_NETH | BR_DISE | BR_WALL | BR_INER | BR_TIME | 
-S:BR_GRAV | BR_PLAS | BR_NEXU
+F:ANIMAL
+F:ATTR_ANY
+F:ATTR_MULTI
+F:AURA_COLD
+F:AURA_ELEC
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:RES_DISE
+F:RES_NETH
+F:RES_NEXU
+F:RES_PLAS
+S:1_IN_5
+S:BR_ACID
+S:BR_CHAO
+S:BR_COLD
+S:BR_CONF
+S:BR_DARK
+S:BR_DISE
+S:BR_ELEC
+S:BR_FIRE
+S:BR_GRAV
+S:BR_INER
+S:BR_LITE
+S:BR_NETH
+S:BR_NEXU
+S:BR_PLAS
+S:BR_POIS
+S:BR_SHAR
+S:BR_SOUN
+S:BR_TIME
+S:BR_WALL
 D:A shifting, swirling form. It seems to be all colours and sizes and 
 D:shapes, though the dominant form is that of a huge dog. You feel very 
 D:uncertain all of a sudden. 
@@ -14188,13 +23327,38 @@ B:CLAW:FIRE:8d10
 B:CLAW:FIRE:8d10
 B:BITE:POISON:7d10
 B:BITE:LOSE_CON:7d10
-F:FORCE_SLEEP | FORCE_MAXHP | REGENERATE | NONLIVING | SMART | 
-F:ONLY_ITEM | DROP_GOOD | DROP_4D2 | DROP_2D2 | BASEANGBAND | 
-F:OPEN_DOOR | BASH_DOOR | MOVE_BODY | POWERFUL | CAN_FLY | 
-F:EVIL | DEMON | IM_FIRE | IM_POIS | NO_CONF | NO_SLEEP
-S:1_IN_5 | 
-S:S_HI_DEMON | S_HI_DRAGON | BR_FIRE | BR_POIS | BR_CHAO | BA_CHAO | 
-S:SCARE | BA_FIRE | CAUSE_4 | ARROW_4 | MISSILE
+F:BASH_DOOR
+F:CAN_FLY
+F:DEMON
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_FIRE
+F:IM_POIS
+F:MOVE_BODY
+F:NONLIVING
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:REGENERATE
+F:SMART
+S:1_IN_5
+S:ARROW_4
+S:BA_CHAO
+S:BA_FIRE
+S:BR_CHAO
+S:BR_FIRE
+S:BR_POIS
+S:CAUSE_4
+S:MISSILE
+S:SCARE
+S:S_HI_DEMON
+S:S_HI_DRAGON
 D:Appearing as a giant, clawed and winged humanoid with a scaly red body 
 D:and massive fangs dripping a foul green liquid, the Greater Balrog is a 
 D:dreadful enemy from the lowest depths of Morgoth's realm. They are often 
@@ -14211,13 +23375,34 @@ B:HIT:HURT:1d6
 B:HIT:HURT:1d6
 B:BITE:EXP_20:2d6
 B:BITE:EXP_20:2d6
-F:FORCE_SLEEP | FORCE_MAXHP | FRIENDS | STUPID | 
-F:COLD_BLOOD | DROP_60 | DROP_1D2 | GIANT | 
-F:OPEN_DOOR | BASH_DOOR | REGENERATE | CAN_FLY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP | 
-F:BASEANGBAND | NO_CUT
-S:1_IN_9 | 
-S:TELE_TO | HOLD | SCARE | CAUSE_2 | MIND_BLAST | FORGET | DARKNESS
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_60
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:FRIENDS
+F:GIANT
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:REGENERATE
+F:STUPID
+F:UNDEAD
+S:1_IN_9
+S:CAUSE_2
+S:DARKNESS
+S:FORGET
+S:HOLD
+S:MIND_BLAST
+S:SCARE
+S:TELE_TO
 D:It is an ogre with an aura of power. You notice a sharp set of front 
 D:teeth. 
 
@@ -14232,13 +23417,33 @@ B:HIT:HURT:1d6
 B:HIT:HURT:1d6
 B:BITE:EXP_20:2d6
 B:BITE:EXP_20:2d6
-F:FORCE_SLEEP | FORCE_MAXHP | TROLL | STUPID | 
-F:COLD_BLOOD | DROP_60 | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | REGENERATE | CAN_FLY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP | 
-F:BASEANGBAND | NO_CUT
-S:1_IN_9 | 
-S:TELE_TO | HOLD | SCARE | CAUSE_2 | MIND_BLAST | FORGET | DARKNESS
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_60
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:REGENERATE
+F:STUPID
+F:TROLL
+F:UNDEAD
+S:1_IN_9
+S:CAUSE_2
+S:DARKNESS
+S:FORGET
+S:HOLD
+S:MIND_BLAST
+S:SCARE
+S:TELE_TO
 D:It is a troll with an aura of power. You notice a sharp set of front 
 D:teeth. 
 
@@ -14253,13 +23458,31 @@ B:HIT:HURT:1d6
 B:HIT:HURT:1d6
 B:BITE:EXP_20:2d6
 B:BITE:EXP_20:2d6
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:COLD_BLOOD | DROP_60 | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | REGENERATE | CAN_FLY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP | 
-F:BASEANGBAND | NO_CUT
-S:1_IN_9 | 
-S:TELE_TO | HOLD | SCARE | CAUSE_2 | MIND_BLAST | FORGET | DARKNESS
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_60
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:REGENERATE
+F:UNDEAD
+S:1_IN_9
+S:CAUSE_2
+S:DARKNESS
+S:FORGET
+S:HOLD
+S:MIND_BLAST
+S:SCARE
+S:TELE_TO
 D:It is a dwarf with an aura of power. You notice a sharp set of front 
 D:teeth. 
 
@@ -14274,13 +23497,32 @@ B:HIT:HURT:1d6
 B:HIT:HURT:1d6
 B:BITE:EXP_20:2d6
 B:BITE:EXP_20:2d6
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | 
-F:COLD_BLOOD | DROP_60 | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | REGENERATE | CAN_FLY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP | 
-F:BASEANGBAND | NO_CUT
-S:1_IN_9 | 
-S:TELE_TO | HOLD | SCARE | CAUSE_2 | MIND_BLAST | FORGET | DARKNESS
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_60
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:REGENERATE
+F:SMART
+F:UNDEAD
+S:1_IN_9
+S:CAUSE_2
+S:DARKNESS
+S:FORGET
+S:HOLD
+S:MIND_BLAST
+S:SCARE
+S:TELE_TO
 D:It is an elf with an aura of power. You notice a sharp set of front 
 D:teeth. 
 
@@ -14295,13 +23537,32 @@ B:HIT:HURT:1d6
 B:HIT:HURT:1d6
 B:BITE:EXP_20:2d6
 B:BITE:EXP_20:2d6
-F:FORCE_SLEEP | FORCE_MAXHP | STUPID | 
-F:COLD_BLOOD | DROP_60 | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | REGENERATE | CAN_FLY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP | 
-F:BASEANGBAND | NO_CUT
-S:1_IN_9 | 
-S:TELE_TO | HOLD | SCARE | CAUSE_2 | MIND_BLAST | FORGET | DARKNESS
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_60
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:REGENERATE
+F:STUPID
+F:UNDEAD
+S:1_IN_9
+S:CAUSE_2
+S:DARKNESS
+S:FORGET
+S:HOLD
+S:MIND_BLAST
+S:SCARE
+S:TELE_TO
 D:It is a gnome with an aura of power. You notice a sharp set of front 
 D:teeth. 
 
@@ -14315,16 +23576,35 @@ B:HIT:UN_BONUS:6d8
 B:HIT:UN_BONUS:6d8
 B:TOUCH:UN_POWER
 B:TOUCH:UN_POWER
-F:UNIQUE | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | 
-F:ONLY_ITEM | DROP_1D2 | DROP_4D2 | DROP_GOOD | 
-F:INVISIBLE | OPEN_DOOR | BASH_DOOR |
-F:EVIL | IM_FIRE | IM_COLD | 
-F:IM_ELEC | BASEANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:TELE_TO | HOLD | CAUSE_3 | TRAPS | ANIM_DEAD |
-S:BO_PLAS | BA_DARK | BA_MANA | BA_FIRE | BA_WATE | BA_NETH
-S:S_HI_DEMON | S_HI_UNDEAD
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:INVISIBLE
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:UNIQUE
+S:1_IN_2
+S:BA_DARK
+S:BA_FIRE
+S:BA_MANA
+S:BA_NETH
+S:BA_WATE
+S:BO_PLAS
+S:CAUSE_3
+S:HOLD
+S:S_HI_DEMON
+S:S_HI_UNDEAD
+S:TELE_TO
 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 
@@ -14340,16 +23620,44 @@ B:HIT:UN_BONUS:6d8
 B:HIT:UN_POWER:6d8
 B:HIT:BLIND:6d8
 B:HIT:CONFUSE:6d8
-F:UNIQUE | MALE | CAN_SPEAK | POWERFUL | RES_TELE | 
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | DROP_CORPSE | DROP_SKELETON | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GREAT | DROP_GOOD | SPECIAL_GENE | 
-F:INVISIBLE | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | IM_FIRE | IM_COLD | 
-F:IM_ELEC | NO_CONF | NO_SLEEP | BASEANGBAND
-S:1_IN_2 | 
-S:CAUSE_3 | TELE_TO | BA_FIRE | DRAIN_MANA | HOLD |
-S:TRAPS | BA_WATE | BO_PLAS | BA_NETH |
-S:BA_MANA | BA_DARK | S_HI_UNDEAD | BA_CHAO | HAND_DOOM | ANIM_DEAD
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:INVISIBLE
+F:MALE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:RES_TELE
+F:SMART
+F:SPECIAL_GENE
+F:UNIQUE
+S:1_IN_2
+S:BA_CHAO
+S:BA_DARK
+S:BA_FIRE
+S:BA_MANA
+S:BA_NETH
+S:BA_WATE
+S:BO_PLAS
+S:CAUSE_3
+S:DRAIN_MANA
+S:HAND_DOOM
+S:HOLD
+S:S_HI_UNDEAD
+S:TELE_TO
 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 
@@ -14365,15 +23673,45 @@ B:HIT:HURT:10d15
 B:HIT:HURT:10d15
 B:HIT:HURT:10d15
 B:HIT:HURT:10d15
-F:UNIQUE | FEMALE | THUNDERLORD | RES_TELE | CAN_FLY | GOOD |
-F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | DROP_SKELETON | CAN_SPEAK |
-F:FORCE_SLEEP | FORCE_MAXHP | PET | AQUATIC | 
-F:DROP_4D2 | DROP_1D2 | DROP_GOOD | DROP_60 | DROP_90 | ONLY_ITEM |
-F:IM_COLD | IM_POIS | IM_ACID | IM_ELEC | REGENERATE | 
-F:MORTAL | HAS_LITE
-S:1_IN_4 |
-S:TPORT | TELE_TO | BR_FIRE | S_THUNDERLORD | 
-S:TELE_AWAY | HEAL | BA_NETH | BO_NETH | BA_FIRE | BO_FIRE
+F:AQUATIC
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_60
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:FEMALE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_POIS
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:PET
+F:REGENERATE
+F:RES_TELE
+F:THUNDERLORD
+F:UNIQUE
+S:1_IN_4
+S:BA_FIRE
+S:BA_NETH
+S:BO_FIRE
+S:BO_NETH
+S:BR_FIRE
+S:HEAL
+S:S_THUNDERLORD
+S:TELE_AWAY
+S:TELE_TO
+S:TPORT
 D:A leader among the Thunderlords of good, she came to help you. 
 
 N:821:Master quylthulg
@@ -14382,11 +23720,25 @@ I:120:30d100:20:1:0
 W:76:2:7000:15000
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:FORCE_SLEEP | FORCE_MAXHP | NEVER_MOVE | NEVER_BLOW | 
-F:INVISIBLE | EMPTY_MIND | ANIMAL | RES_TELE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND
-S:1_IN_2 | 
-S:S_MONSTERS | S_HI_UNDEAD | S_HI_DRAGON | S_HI_DEMON | S_ANIMALS | BLINK | TELE_TO
+F:ANIMAL
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:INVISIBLE
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:RES_TELE
+S:1_IN_2
+S:BLINK
+S:S_ANIMALS
+S:S_HI_DEMON
+S:S_HI_DRAGON
+S:S_HI_UNDEAD
+S:S_MONSTERS
+S:TELE_TO
 D:A giant seething mass of flesh, overwhelming you with monster after monster. 
 
 N:822:Qlzqqlzuup, the Lord of Flesh
@@ -14395,14 +23747,33 @@ I:130:50d100:30:1:0
 W:79:3:10000:20000
 E:0:0:0:0:0:0
 O:20:20:20:20
-F:UNIQUE | RES_TELE | 
-F:FORCE_SLEEP | FORCE_MAXHP | NEVER_MOVE | NEVER_BLOW | 
-F:ONLY_ITEM | DROP_4D2 | 
-F:INVISIBLE | EMPTY_MIND | ANIMAL | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND
-S:1_IN_1 | 
-S:S_MONSTERS | S_HOUND | S_HYDRA | S_SPIDER | S_ANT | S_ANIMALS | 
-S:S_HI_UNDEAD | S_HI_DRAGON | S_HI_DEMON | S_WRAITH | S_UNIQUE | S_KIN
+F:ANIMAL
+F:DROP_4D2
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:INVISIBLE
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:RES_TELE
+F:UNIQUE
+S:1_IN_1
+S:S_ANIMALS
+S:S_ANT
+S:S_HI_DEMON
+S:S_HI_DRAGON
+S:S_HI_UNDEAD
+S:S_HOUND
+S:S_HYDRA
+S:S_KIN
+S:S_MONSTERS
+S:S_SPIDER
+S:S_UNIQUE
+S:S_WRAITH
 D:A gigantic seething mass of flesh, Qlzqqlzuup changes colours in front 
 D:of your eyes.  Pulsating first one colour then the next, it knows only it 
 D:must bring help to protect itself. 
@@ -14418,13 +23789,32 @@ B:HIT:HURT:1d6
 B:HIT:HURT:1d6
 B:BITE:EXP_20:2d6
 B:BITE:EXP_20:2d6
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:COLD_BLOOD | DROP_60 | DROP_1D2 | PET | 
-F:OPEN_DOOR | BASH_DOOR | REGENERATE | CAN_FLY |
-F:GOOD | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP | 
-F:BASEANGBAND | NO_CUT
-S:1_IN_9 | 
-S:TELE_TO | HOLD | SCARE | CAUSE_2 | MIND_BLAST | FORGET | DARKNESS
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_1D2
+F:DROP_60
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:PET
+F:REGENERATE
+F:UNDEAD
+S:1_IN_9
+S:CAUSE_2
+S:DARKNESS
+S:FORGET
+S:HOLD
+S:MIND_BLAST
+S:SCARE
+S:TELE_TO
 D:It is an adventurer with an aura of power. You notice a sharp set 
 D:of front teeth. 
 
@@ -14438,15 +23828,45 @@ B:HIT:HURT:15d15
 B:HIT:HURT:15d15
 B:HIT:HURT:15d15
 B:HIT:HURT:15d15
-F:UNIQUE | MALE | THUNDERLORD | RES_TELE | CAN_FLY | CAN_SPEAK |
-F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | DROP_SKELETON |
-F:FORCE_SLEEP | FORCE_MAXHP | PET | GOOD | AQUATIC | 
-F:DROP_4D2 | DROP_1D2 | DROP_GOOD | DROP_60 | DROP_90 | ONLY_ITEM |
-F:IM_COLD | IM_POIS | IM_ACID | IM_ELEC | IM_FIRE | REGENERATE | 
-F:MORTAL | HAS_LITE
-S:1_IN_4 |
-S:SCARE | TPORT | TELE_TO | S_THUNDERLORD | 
-S:TELE_LEVEL | HEAL | BR_FIRE | BR_TIME | ROCKET
+F:AQUATIC
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_60
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:PET
+F:REGENERATE
+F:RES_TELE
+F:THUNDERLORD
+F:UNIQUE
+S:1_IN_4
+S:BR_FIRE
+S:BR_TIME
+S:HEAL
+S:ROCKET
+S:SCARE
+S:S_THUNDERLORD
+S:TELE_LEVEL
+S:TELE_TO
+S:TPORT
 D:A leader from afar, he has come with his eagle to help you in 
 D:your battle. Having already saved his home, he now wants to save Arda. 
 
@@ -14460,16 +23880,40 @@ B:HIT:HURT:8d8
 B:HIT:HURT:8d8
 B:HIT:HURT:8d8
 B:HIT:HURT:8d8
-F:UNIQUE | MALE | 
-F:FORCE_MAXHP | CAN_SPEAK | SMART | EVIL | AI_SPECIAL | 
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT | 
-F:OPEN_DOOR | BASH_DOOR | KILL_WALL | MOVE_BODY | TAKE_ITEM |
-F:IM_FIRE | IM_COLD | IM_POIS | SPECIAL_GENE | 
-F:REGENERATE | REFLECTING | DROP_SKELETON | DROP_CORPSE | BASEANGBAND
-F:HAS_LITE
-S:1_IN_6 | 
-S:S_MONSTERS | S_WRAITH | S_HI_UNDEAD | 
-S:S_HI_DRAGON | S_HI_DEMON | S_UNIQUE | S_ANIMALS
+F:AI_SPECIAL
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:KILL_WALL
+F:MALE
+F:MOVE_BODY
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REFLECTING
+F:REGENERATE
+F:SMART
+F:SPECIAL_GENE
+F:TAKE_ITEM
+F:UNIQUE
+S:1_IN_6
+S:S_ANIMALS
+S:S_HI_DEMON
+S:S_HI_DRAGON
+S:S_HI_UNDEAD
+S:S_MONSTERS
+S:S_UNIQUE
+S:S_WRAITH
 D:The son of Eol the Dark Elf, Maeglin is every bit as evil as his father 
 D:and more.  His greed for gold led him to betray the Hidden Kingdom of 
 D:Gondolin to Morgoth's forces.  He is a mighty warrior himself, and some 
@@ -14483,9 +23927,15 @@ W:7:1:200:16
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:COLD:2d4
-F:RAND_50 | WILD_TOO | WILD_SHORE | WILD_SWAMP |
-F:BASH_DOOR | DROP_CORPSE | IM_COLD | WILD_WASTE | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:IM_COLD
+F:MORTAL
+F:RAND_50
+F:WILD_SHORE
+F:WILD_TOO
+F:WILD_WASTE
 D:It is a strange frog adapted to cold environments. 
 
 # New monster added by furiosity for the Theme module
@@ -14497,9 +23947,15 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d2
 B:SPIT:POISON:2d4
-F:ANIMAL | CAN_SWIM | WILD_TOO | WILD_WOOD | WILD_SWAMP | 
-F:DROP_CORPSE | HAS_EGG | IMPRESED | IM_POIS | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_SWIM
+F:DROP_CORPSE
+F:HAS_EGG
+F:IMPRESED
+F:IM_POIS
+F:MORTAL
+F:WILD_TOO
+F:WILD_WOOD
 D:It is a small lizard that usually lives in the 
 D:marshlands. It looks poisonous.
 
@@ -14512,9 +23968,14 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d2
 B:SPIT:EAT_LITE:2d4
-F:ANIMAL | CAN_SWIM | WILD_TOO | WILD_WOOD | WILD_SWAMP | 
-F:DROP_CORPSE | IM_POIS | HURT_LITE | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_SWIM
+F:DROP_CORPSE
+F:HURT_LITE
+F:IM_POIS
+F:MORTAL
+F:WILD_TOO
+F:WILD_WOOD
 D:A frog that seems to emit a strange dark light.
 
 N:829:Greater Hellhound
@@ -14526,11 +23987,21 @@ O:0:0:0:0
 B:BITE:FIRE:5d12
 B:BITE:FIRE:5d12
 B:BITE:FIRE:5d12
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE 
-F:RAND_25 | FRIENDS | AURA_FIRE | SUSCEP_COLD |
-F:BASH_DOOR | MOVE_BODY | 
-F:ANIMAL | EVIL | IM_FIRE | BASEANGBAND | HAS_LITE | 
-S:1_IN_5 | BR_FIRE
+F:ANIMAL
+F:AURA_FIRE
+F:BASH_DOOR
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:FRIENDS
+F:HAS_LITE
+F:IM_FIRE
+F:MOVE_BODY
+F:RAND_25
+F:SUSCEP_COLD
+S:1_IN_5
+S:BR_FIRE
 D:It is a giant dog that glows with heat. Flames pour from its nostrils. 
 
 N:830:Cantoras, the Skeletal Lord
@@ -14543,16 +24014,42 @@ B:GAZE:EXP_80:5d5
 B:GAZE:EXP_80:5d5
 B:TOUCH:POISON:5d5
 B:TOUCH:POISON:5d5
-F:UNIQUE | MALE | CAN_SPEAK | RES_TELE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT |
-F:SMART | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_FIRE | IM_COLD | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_2 | 
-S:TELE_TO | SLOW | SCARE | CAUSE_4 | BRAIN_SMASH | 
-S:BO_ICEE | BO_MANA | BA_WATE | BA_NETH | 
-S:S_HI_UNDEAD | ANIM_DEAD
+F:BASH_DOOR
+F:CAN_SPEAK
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:SMART
+F:UNDEAD
+F:UNIQUE
+S:1_IN_2
+S:BA_NETH
+S:BA_WATE
+S:BO_ICEE
+S:BO_MANA
+S:BRAIN_SMASH
+S:CAUSE_4
+S:SCARE
+S:SLOW
+S:S_HI_UNDEAD
+S:TELE_TO
 D:A legion of evil undead druj animating the skeleton of a once mighty 
 D:sorcerer. His power is devastating and his speed unmatched in the 
 D:underworld. 
@@ -14566,9 +24063,15 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d2
 B:SPIT:ELEC:2d4
-F:ANIMAL | CAN_SWIM | WILD_TOO | WILD_WOOD | WILD_SWAMP | 
-F:DROP_CORPSE | HAS_EGG | IMPRESED | IM_ELEC | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_SWIM
+F:DROP_CORPSE
+F:HAS_EGG
+F:IMPRESED
+F:IM_ELEC
+F:MORTAL
+F:WILD_TOO
+F:WILD_WOOD
 D:It is a small lizard with powerful jaws which cause 
 D:sparks to fly as they snap shut.
 
@@ -14580,11 +24083,17 @@ W:20:2:150:70
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:EXP_40:1d6
-F:FORCE_SLEEP | RAND_50 | RAND_25 | 
-F:WEIRD_MIND | BASH_DOOR | CAN_FLY | WILD_TOO | WILD_SWAMP |
-F:ANIMAL | RES_NETH | 
-F:MORTAL | BASEANGBAND
-S:1_IN_10 | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:FORCE_SLEEP
+F:MORTAL
+F:RAND_25
+F:RAND_50
+F:RES_NETH
+F:WEIRD_MIND
+F:WILD_TOO
+S:1_IN_10
 S:BR_NETH
 D:The size of a large bird, this fly carries with it the 
 D:stench of decay. 
@@ -14597,11 +24106,16 @@ W:20:2:150:70
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:TERRIFY:1d6
-F:FORCE_SLEEP | RAND_50 | RAND_25 | 
-F:WEIRD_MIND | BASH_DOOR | CAN_FLY | WILD_TOO | WILD_SWAMP |
-F:ANIMAL | 
-F:MORTAL | BASEANGBAND
-S:1_IN_10 | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:FORCE_SLEEP
+F:MORTAL
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
+F:WILD_TOO
+S:1_IN_10
 S:BR_NUKE
 D:The size of a large bird, this fly comes from a dark swamp. 
 
@@ -14613,11 +24127,18 @@ W:20:2:150:70
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:ACID:1d6
-F:FORCE_SLEEP | RAND_50 | RAND_25 | AURA_FIRE | 
-F:WEIRD_MIND | BASH_DOOR | CAN_FLY | WILD_TOO | WILD_SWAMP |
-F:ANIMAL | IM_FIRE | 
-F:MORTAL | BASEANGBAND
-S:1_IN_10 | 
+F:ANIMAL
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:FORCE_SLEEP
+F:IM_FIRE
+F:MORTAL
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
+F:WILD_TOO
+S:1_IN_10
 S:BR_FIRE
 D:The size of a large bird, this fly is surrounded by flames. 
 
@@ -14629,11 +24150,18 @@ W:20:2:150:70
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:PARALYZE:1d6
-F:FORCE_SLEEP | RAND_50 | RAND_25 | 
-F:WEIRD_MIND | BASH_DOOR | CAN_FLY | WILD_TOO | WILD_SWAMP | 
-F:ANIMAL | IM_ACID | IM_POIS | 
-F:MORTAL | BASEANGBAND
-S:1_IN_10 | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_POIS
+F:MORTAL
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
+F:WILD_TOO
+S:1_IN_10
 S:BR_DARK
 D:The size of a large bird, this fly prefers to dwell in 
 D:the forest, and is rather stealthy.
@@ -14646,11 +24174,17 @@ W:20:2:150:70
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:ELEC:1d6
-F:FORCE_SLEEP | RAND_50 | RAND_25 | 
-F:WEIRD_MIND | BASH_DOOR | CAN_FLY | WILD_TOO | WILD_SWAMP | 
-F:ANIMAL | IM_ELEC | 
-F:MORTAL | BASEANGBAND
-S:1_IN_10 | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:FORCE_SLEEP
+F:IM_ELEC
+F:MORTAL
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
+F:WILD_TOO
+S:1_IN_10
 S:BR_ELEC
 D:The size of a large bird, this fly crackles with sparks.
 
@@ -14662,11 +24196,17 @@ W:20:2:150:70
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d6
-F:FORCE_SLEEP | RAND_50 | RAND_25 | 
-F:WEIRD_MIND | BASH_DOOR | CAN_FLY | WILD_TOO | WILD_SWAMP | 
-F:ANIMAL | NO_CUT | 
-F:MORTAL | BASEANGBAND
-S:1_IN_10 | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:FORCE_SLEEP
+F:MORTAL
+F:NO_CUT
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
+F:WILD_TOO
+S:1_IN_10
 S:BR_SHAR
 D:The size of a large bird, this fly dives from the earth 
 D:into the air, and back.
@@ -14681,13 +24221,27 @@ B:HIT:HURT:10d10
 B:HIT:HURT:10d10
 B:TOUCH:UN_POWER:10d10
 B:TOUCH:UN_POWER:10d10
-F:UNIQUE | ATTR_MULTI | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE | 
-F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | IM_FIRE | IM_COLD | NO_SLEEP | BASEANGBAND
-S:1_IN_2 | 
-S:BR_FIRE | BR_COLD | BR_DISE
+F:ATTR_MULTI
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_FIRE
+F:MOVE_BODY
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:UNIQUE
+S:1_IN_2
+S:BR_COLD
+S:BR_DISE
+S:BR_FIRE
 D:The Tarrasque is a massive reptile of legend, rumoured to be unkillable 
 D:and immune to magic. Fear its anger, for its devastation is unmatched. 
 
@@ -14701,17 +24255,36 @@ B:HIT:FIRE:8d12
 B:HIT:FIRE:8d12
 B:CRUSH:HURT:8d12
 B:TOUCH:UN_POWER
-F:UNIQUE | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ESCORT | ESCORTS | CAN_FLY |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DEMON | IM_FIRE | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
-S:1_IN_4 | 
-S:BLIND | CONF | SCARE | 
-S:BR_FIRE | BR_PLAS | 
-S:S_HI_DEMON | S_UNDEAD
+F:BASH_DOOR
+F:CAN_FLY
+F:DEMON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_GOOD
+F:ESCORT
+F:ESCORTS
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:MALE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:UNIQUE
+S:1_IN_4
+S:BLIND
+S:BR_FIRE
+S:BR_PLAS
+S:CONF
+S:SCARE
+S:S_HI_DEMON
+S:S_UNDEAD
 D:A massive form cloaked in flame. Lungorthin stares balefully at you with 
 D:eyes that smoulder red. The dungeon floor where he stands is scorched by 
 D:the heat of his body. 
@@ -14726,15 +24299,29 @@ B:CLAW:HURT:6d8
 B:CLAW:HURT:6d8
 B:BITE:POISON:6d6
 B:BITE:POISON:6d6
-F:UNIQUE | MALE | CAN_SPEAK |
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ESCORT | ESCORTS | DROP_CORPSE | 
-F:RAND_25 | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | MOVE_BODY | 
-F:ANIMAL | EVIL | IM_POIS | BASEANGBAND
-S:1_IN_3 | 
-S:SCARE | S_MONSTERS | S_HOUND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:ESCORT
+F:ESCORTS
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RAND_25
+F:TAKE_ITEM
+F:UNIQUE
+S:1_IN_3
+S:SCARE
+S:S_HOUND
+S:S_MONSTERS
 D:Draugluin provides Sauron with a fearsome personal guard. He is an 
 D:enormous wolf inhabited by a human spirit. He is chief of all his kind. 
 
@@ -14746,11 +24333,17 @@ W:20:2:150:70
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:EAT_LITE:1d6
-F:FORCE_SLEEP | RAND_50 | RAND_25 | 
-F:WEIRD_MIND | BASH_DOOR | CAN_FLY | WILD_TOO | WILD_SWAMP | 
-F:ANIMAL | NO_CUT | 
-F:MORTAL | BASEANGBAND
-S:1_IN_10 | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:FORCE_SLEEP
+F:MORTAL
+F:NO_CUT
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
+F:WILD_TOO
+S:1_IN_10
 S:BR_INER
 D:The size of a large bird, this fly moves slowly.
 
@@ -14762,11 +24355,17 @@ W:20:2:150:70
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:CONFUSE:1d6
-F:FORCE_SLEEP | RAND_50 | RAND_25 | 
-F:WEIRD_MIND | BASH_DOOR | CAN_FLY | WILD_TOO | WILD_SWAMP | 
-F:ANIMAL | NO_CUT | 
-F:MORTAL | BASEANGBAND
-S:1_IN_10 | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:FORCE_SLEEP
+F:MORTAL
+F:NO_CUT
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
+F:WILD_TOO
+S:1_IN_10
 S:BR_CHAO
 D:The size of a large bird, this fly is surrounded by an 
 D:aura of raw chaos.
@@ -14779,11 +24378,17 @@ W:20:2:150:70
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:LOSE_STR:1d6
-F:FORCE_SLEEP | RAND_50 | RAND_25 | 
-F:WEIRD_MIND | BASH_DOOR | CAN_FLY | WILD_TOO | WILD_SWAMP | 
-F:ANIMAL | NO_CUT | 
-F:MORTAL | BASEANGBAND
-S:1_IN_10 | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:FORCE_SLEEP
+F:MORTAL
+F:NO_CUT
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
+F:WILD_TOO
+S:1_IN_10
 S:BR_PLAS
 D:The size of a large bird, this fly seems to scorch the 
 D:very air around it.
@@ -14798,18 +24403,46 @@ B:HIT:EXP_80:7d12
 B:HIT:LOSE_DEX:7d12
 B:HIT:UN_POWER:7d12
 B:HIT:UN_POWER:7d12
-F:UNIQUE | MALE | CAN_SPEAK | RES_TELE
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ESCORT | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT | 
-F:SMART | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | NO_SLEEP | BASEANGBAND
-F:NO_CUT
-S:1_IN_3 | 
-S:TPORT | BLIND | SCARE | CAUSE_4 | BRAIN_SMASH | 
-S:BA_MANA | BO_MANA | BA_FIRE | BA_NETH | 
-S:S_MONSTERS | S_HI_DEMON | S_HI_UNDEAD | S_KIN | HAND_DOOM | ANIM_DEAD
+F:BASH_DOOR
+F:CAN_SPEAK
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_GOOD
+F:DROP_GREAT
+F:ESCORT
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:SMART
+F:UNDEAD
+F:UNIQUE
+S:1_IN_3
+S:BA_FIRE
+S:BA_MANA
+S:BA_NETH
+S:BLIND
+S:BO_MANA
+S:BRAIN_SMASH
+S:CAUSE_4
+S:HAND_DOOM
+S:SCARE
+S:S_HI_DEMON
+S:S_HI_UNDEAD
+S:S_KIN
+S:S_MONSTERS
+S:TPORT
 D:The greatest of all undead sorcerers, even the gods once feared him.  This
 D:ancient shadow of death wilts every living thing it passes. 
 
@@ -14821,11 +24454,19 @@ W:20:2:150:70
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:1d6
-F:FORCE_SLEEP | RAND_50 | RAND_25 | 
-F:WEIRD_MIND | BASH_DOOR | CAN_FLY | WILD_TOO | WILD_SWAMP | 
-F:ANIMAL | NO_CUT | AQUATIC | RES_WATE | 
-F:MORTAL | BASEANGBAND
-S:1_IN_10 | 
+F:ANIMAL
+F:AQUATIC
+F:BASH_DOOR
+F:CAN_FLY
+F:FORCE_SLEEP
+F:MORTAL
+F:NO_CUT
+F:RAND_25
+F:RAND_50
+F:RES_WATE
+F:WEIRD_MIND
+F:WILD_TOO
+S:1_IN_10
 S:BA_WATE
 D:The size of a large bird, this fly prefers watery regions.
 
@@ -14837,8 +24478,13 @@ W:4:1:200:3
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:FIRE:1d2
-F:RAND_25 | SUSCEP_COLD | ANIMAL | IM_FIRE | 
-F:DROP_CORPSE | MORTAL | BASEANGBAND | CAN_SWIM | 
+F:ANIMAL
+F:CAN_SWIM
+F:DROP_CORPSE
+F:IM_FIRE
+F:MORTAL
+F:RAND_25
+F:SUSCEP_COLD
 S:MULTIPLY
 D:It is about three feet long with large teeth and red fur. 
 D:It is a corrupted creature of Melkor.
@@ -14853,20 +24499,68 @@ B:CLAW:HURT:8d12
 B:CLAW:HURT:8d12
 B:BITE:HURT:10d14
 B:BITE:HURT:10d14
-F:FORCE_SLEEP | FORCE_MAXHP | MOVE_BODY | AURA_FIRE | REFLECTING | AURA_ELEC |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | AURA_COLD |
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | RES_NETH | RES_DISE |
-F:DRAGON | GOOD | RES_TELE | DROP_CORPSE | AQUATIC | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP |
-F:RES_NEXU | RES_PLAS | CAN_FLY | BASEANGBAND | HAS_LITE | NO_CUT
+F:AQUATIC
 F:ATTR_MULTI
-S:1_IN_4 |
-S:S_HI_DRAGON | S_DRAGON | S_KIN | 
-S:BR_NUKE | BR_ACID | BR_ELEC | BR_FIRE |
-S:BR_COLD | BR_POIS | BR_NETH | BR_LITE | BR_DARK |
-S:BR_CONF | BR_SOUN | BR_CHAO | BR_DISE | BR_NEXU |
-S:BR_TIME | BR_INER | BR_GRAV | BR_SHAR | BR_PLAS |
-S:BR_WALL | BR_MANA | BR_DISI
+F:AURA_COLD
+F:AURA_ELEC
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MOVE_BODY
+F:MOVE_BODY
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:REFLECTING
+F:RES_DISE
+F:RES_NETH
+F:RES_NEXU
+F:RES_PLAS
+F:RES_TELE
+S:1_IN_4
+S:BR_ACID
+S:BR_CHAO
+S:BR_COLD
+S:BR_CONF
+S:BR_DARK
+S:BR_DISE
+S:BR_DISI
+S:BR_ELEC
+S:BR_FIRE
+S:BR_GRAV
+S:BR_INER
+S:BR_LITE
+S:BR_MANA
+S:BR_NETH
+S:BR_NEXU
+S:BR_NUKE
+S:BR_PLAS
+S:BR_POIS
+S:BR_SHAR
+S:BR_SOUN
+S:BR_TIME
+S:BR_WALL
+S:S_DRAGON
+S:S_HI_DRAGON
+S:S_KIN
 D:The mightiest of all dragonkind, a great worm of power is seldom 
 D:encountered in our world. It can crush stars with its might. 
 
@@ -14878,8 +24572,12 @@ W:4:1:200:3
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:ELEC:1d2
-F:RAND_25 | ANIMAL | IM_ELEC | 
-F:DROP_CORPSE | MORTAL | BASEANGBAND | CAN_SWIM | 
+F:ANIMAL
+F:CAN_SWIM
+F:DROP_CORPSE
+F:IM_ELEC
+F:MORTAL
+F:RAND_25
 S:MULTIPLY
 D:It is about three feet long with large teeth and blue fur. 
 D:Its teeth produce sparks on impact.
@@ -14892,8 +24590,12 @@ W:4:1:200:3
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:ACID:1d2
-F:RAND_25 | ANIMAL | IM_ACID | 
-F:DROP_CORPSE | MORTAL | BASEANGBAND | CAN_SWIM | 
+F:ANIMAL
+F:CAN_SWIM
+F:DROP_CORPSE
+F:IM_ACID
+F:MORTAL
+F:RAND_25
 S:MULTIPLY
 D:It is about three feet long with large teeth and yellow fur. 
 D:Its teeth produce a corrosive substance.
@@ -14908,13 +24610,30 @@ B:CLAW:POISON:9d12
 B:CLAW:POISON:9d12
 B:BITE:FIRE:9d12
 B:BITE:FIRE:9d12
-F:UNIQUE | MALE | CAN_SPEAK | DROP_CORPSE
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | AURA_FIRE |
-F:SMART | OPEN_DOOR | BASH_DOOR | MOVE_BODY | 
-F:ANIMAL | EVIL | IM_FIRE | IM_POIS | BASEANGBAND
-S:1_IN_3 | 
-S:BR_DARK | BR_POIS | BR_FIRE | BR_NETH | S_HOUND
+F:ANIMAL
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:UNIQUE
+S:1_IN_3
+S:BR_DARK
+S:BR_FIRE
+S:BR_NETH
+S:BR_POIS
+S:S_HOUND
 D:The first guard of Angband, Carcharoth, also known as 'The Red Maw', is 
 D:the largest wolf to ever walk the earth. He is highly intelligent and a 
 D:deadly opponent in combat. 
@@ -14927,8 +24646,12 @@ W:9:1:250:2
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:LOSE_STR:1d4
-F:RAND_25 | ANIMAL | DROP_SKELETON | 
-F:DROP_CORPSE | MORTAL | BASEANGBAND | CAN_SWIM | 
+F:ANIMAL
+F:CAN_SWIM
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:MORTAL
+F:RAND_25
 S:MULTIPLY
 D:It is a rodent of unusual size with no fur covering it.
 
@@ -14941,8 +24664,14 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:POISON:1d4
 B:BITE:HURT:2d4
-F:RAND_25 | ANIMAL | DROP_SKELETON | IM_POIS | CAN_FLY | 
-F:DROP_CORPSE | MORTAL | BASEANGBAND | CAN_SWIM | 
+F:ANIMAL
+F:CAN_FLY
+F:CAN_SWIM
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:IM_POIS
+F:MORTAL
+F:RAND_25
 S:MULTIPLY
 D:A large rat that lives in the trees.
 
@@ -14956,15 +24685,38 @@ B:CLAW:COLD:9d12
 B:CLAW:COLD:9d12
 B:BITE:COLD:9d12
 B:BITE:COLD:9d12
-F:UNIQUE | MALE | CAN_SPEAK | DROP_CORPSE | 
-F:FORCE_SLEEP | FORCE_MAXHP | NEUTRAL | NO_TARGET | 
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | AURA_COLD | 
-F:SMART | OPEN_DOOR | BASH_DOOR | KILL_BODY | 
-F:ANIMAL | GOOD | WILD_ONLY | WILD_GRASS | WILD_GRASS |
-F:WILD_WASTE | WILD_WOOD | WILD_SHORE |
-F:IM_COLD | IM_ACID | IM_ELEC | BASEANGBAND
-S:1_IN_5 | 
-S:BR_COLD | BR_SHAR | BR_SOUN | BR_LITE | 
+F:ANIMAL
+F:AURA_COLD
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:KILL_BODY
+F:MALE
+F:NEUTRAL
+F:NO_TARGET
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:UNIQUE
+F:WILD_GRASS
+F:WILD_GRASS
+F:WILD_ONLY
+F:WILD_SHORE
+F:WILD_WASTE
+F:WILD_WOOD
+S:1_IN_5
+S:BR_COLD
+S:BR_LITE
+S:BR_SHAR
+S:BR_SOUN
 D:The wolfhound of the Valar, Huan has served many masters in his time, from 
 D:Celegorm son of Feanor to Beren son of Barahir: but now he runs wild and 
 D:acknowledges no master save himself, as he hunts alone for his nemesis - 
@@ -14980,8 +24732,14 @@ O:0:0:0:0
 B:CLAW:HURT:1d4
 B:CLAW:HURT:1d4
 B:BITE:HURT:1d6
-F:WEIRD_MIND | BASH_DOOR | DROP_SKELETON | DROP_CORPSE
-F:ANIMAL | MORTAL | BASEANGBAND | IM_COLD | WILD_TOO | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:IM_COLD
+F:MORTAL
+F:WEIRD_MIND
+F:WILD_TOO
 D:A huge white bear, accustomed to extremely cold temperatures.
 
 # New monster added by furiosity for the Theme module
@@ -14994,9 +24752,15 @@ O:0:0:0:0
 B:CLAW:HURT:2d4
 B:CLAW:HURT:2d4
 B:BITE:HURT:2d6
-F:WEIRD_MIND | BASH_DOOR | FRIENDS | DROP_SKELETON | DROP_CORPSE
-F:ANIMAL | HURT_LITE | IM_COLD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FRIENDS
+F:HURT_LITE
+F:IM_COLD
+F:MORTAL
+F:WEIRD_MIND
 D:A huge blue-black bear with thick fur. It can withstand 
 D:extremely cold temperatures and usually hunts at night, 
 D:and always in packs.
@@ -15007,21 +24771,46 @@ I:130:120d100:100:140:0
 W:95:1:17000:43000
 E:1:1:1:2:1:1
 O:0:100:0:0
+A:123:50
 B:HIT:FIRE:9d12
 B:HIT:FIRE:9d12
 B:CRUSH:HURT:8d12
 B:TOUCH:UN_POWER
-F:UNIQUE | MALE | CAN_SPEAK | CAN_FLY |
-F:FORCE_SLEEP | FORCE_MAXHP | ATTR_MULTI | 
-F:ESCORT | ESCORTS | KILL_WALL | AURA_FIRE | NONLIVING |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DEMON | 
-F:IM_FIRE | IM_ELEC | BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:BLIND | CONF | SCARE | 
-S:BR_FIRE | S_KIN |
-S:S_HI_DEMON | S_HI_UNDEAD
+F:ATTR_MULTI
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:DEMON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_GOOD
+F:DROP_GREAT
+F:ESCORT
+F:ESCORTS
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ELEC
+F:IM_FIRE
+F:KILL_WALL
+F:MALE
+F:MOVE_BODY
+F:NONLIVING
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:UNIQUE
+S:1_IN_3
+S:BLIND
+S:BR_FIRE
+S:CONF
+S:SCARE
+S:S_HI_DEMON
+S:S_HI_UNDEAD
+S:S_KIN
 D:Gothmog is the offspring of Morgoth and an ogress. He is renowned 
 D:for slaying three High Kings of the Noldor Elves, and he has never been 
 D:defeated in combat. With his whip of flame and awesome fiery breath he 
@@ -15037,9 +24826,18 @@ O:0:0:0:0
 B:CLAW:HURT:4d4
 B:CLAW:HURT:4d4
 B:BITE:HURT:4d6
-F:WEIRD_MIND | BASH_DOOR | DROP_SKELETON | DROP_CORPSE
-F:ANIMAL | NEUTRAL | NO_TARGET | WILD_ONLY | WILD_WOOD |
-F:WILD_GRASS | WILD_SHORE | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_ONLY
+F:WILD_SHORE
+F:WILD_WOOD
 D:An experienced bear whose fur is silvery white. It just 
 D:wants to eat its dinner in peace.
 
@@ -15053,16 +24851,48 @@ B:HIT:HURT:12d12
 B:HIT:HURT:12d12
 B:HIT:FIRE:12d12
 B:HIT:FIRE:12d12
-F:UNIQUE | FEMALE | DROP_CORPSE | 
-F:ATTR_MULTI | THUNDERLORD | RES_TELE | PET | CAN_SPEAK |
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | GOOD | AQUATIC | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT |
-F:DROP_CHOSEN | REFLECTING | AURA_FIRE | AURA_ELEC | 
-F:SMART | OPEN_DOOR | BASH_DOOR | MOVE_BODY | REGENERATE | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | POWERFUL |
-F:MORTAL | HAS_LITE
-S:1_IN_4 | 
-S:TPORT | TELE_TO | BR_FIRE | BR_TIME | S_THUNDERLORD | TELE_AWAY |
+F:AQUATIC
+F:ATTR_MULTI
+F:AURA_ELEC
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CHOSEN
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:FEMALE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:MOVE_BODY
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:PET
+F:POWERFUL
+F:REFLECTING
+F:REGENERATE
+F:RES_TELE
+F:SMART
+F:THUNDERLORD
+F:UNIQUE
+S:1_IN_4
+S:BR_FIRE
+S:BR_TIME
+S:S_THUNDERLORD
+S:TELE_AWAY
+S:TELE_TO
+S:TPORT
 D:Foronth is the first Eagle queen, and Sarko the first to discover 
 D:the Firebirds, the ancestors of the Thunderlord eagles. She will try to 
 D:help you. 
@@ -15074,10 +24904,20 @@ I:110:10d10:10:35:10
 W:9:1:2000:25
 E:0:1:0:2:1:0
 O:0:0:0:0
-F:WEIRD_MIND | BASH_DOOR | NONLIVING | JOKEANGBAND | NEVER_BLOW | 
-F:NO_CUT | NO_FEAR | NO_CONF | RES_TELE | NO_STUN | PET | 
+F:BASH_DOOR
+F:JOKEANGBAND
+F:NEVER_BLOW
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_STUN
+F:PET
+F:RES_TELE
+F:WEIRD_MIND
 S:1_IN_2
-S:CONF | BLINK | 
+S:BLINK
+S:CONF
 D:A cute cuddly creature made of a strange soft material. It has 
 D:been animated by a jokester wizard, and searches for a child to 
 D:play with.
@@ -15092,18 +24932,59 @@ B:HIT:UN_BONUS:10d12
 B:HIT:UN_BONUS:10d12
 B:HIT:UN_POWER:8d12
 B:HIT:UN_POWER:8d12
-F:UNIQUE | MALE | CAN_SPEAK | REFLECTING |
-F:FORCE_SLEEP | FORCE_MAXHP | FORCE_DEPTH |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT |
-F:SMART | OPEN_DOOR | BASH_DOOR | MOVE_BODY | REGENERATE | NO_SLEEP | NO_FEAR | NO_CONF |
-F:EVIL | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:RES_TELE | BASEANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:TPORT | TELE_LEVEL | BLIND | CONF | SCARE | CAUSE_4 | 
-S:BRAIN_SMASH | FORGET | BO_ICEE | BO_MANA | BO_PLAS | 
-S:BA_MANA | BA_FIRE | BA_WATE | BA_NETH | BA_DARK | BA_CHAO | 
-S:S_MONSTERS | S_HI_DEMON | S_HI_UNDEAD | S_HI_DRAGON | S_WRAITH | S_UNIQUE | 
-S:HAND_DOOM | ANIM_DEAD
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_DEPTH
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REFLECTING
+F:REGENERATE
+F:RES_TELE
+F:SMART
+F:UNIQUE
+S:1_IN_2
+S:BA_CHAO
+S:BA_DARK
+S:BA_FIRE
+S:BA_MANA
+S:BA_NETH
+S:BA_WATE
+S:BLIND
+S:BO_ICEE
+S:BO_MANA
+S:BO_PLAS
+S:BRAIN_SMASH
+S:CAUSE_4
+S:CONF
+S:FORGET
+S:HAND_DOOM
+S:SCARE
+S:S_HI_DEMON
+S:S_HI_DRAGON
+S:S_HI_UNDEAD
+S:S_MONSTERS
+S:S_UNIQUE
+S:S_WRAITH
+S:TELE_LEVEL
+S:TPORT
 D:Mighty in spells and enchantments, he created the One Ring. 
 D:His eyes glow with power and with his gaze he seeks to destroy 
 D:your soul. He has many servants, and rarely fights without them. 
@@ -15118,21 +24999,73 @@ B:GAZE:EAT_GOLD:20d10
 B:HIT:SHATTER:20d10
 B:BITE:LOSE_ALL:10d12
 B:TOUCH:UN_POWER
-F:UNIQUE | CAN_SPEAK | ATTR_MULTI | ATTR_ANY | MALE |
-F:FORCE_MAXHP | WEIRD_MIND | DROP_CORPSE | DROP_SKELETON |
-F:REFLECTING | AURA_FIRE | AURA_ELEC | AURA_COLD |
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_3D2 | DROP_4D2 | 
-F:DROP_GOOD | DROP_GREAT | RES_NETH | INVISIBLE | 
-F:SMART | KILL_WALL | KILL_BODY | POWERFUL | RES_TELE | 
-F:REGENERATE | CAN_FLY | CAN_SWIM | DG_CURSE | WYRM_PROTECT | 
-F:EVIL | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF |NO_FEAR | NO_STUN | RES_TELE
-F:MORTAL | JOKEANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:S_THUNDERLORD | BR_CHAO | BA_CHAO | ROCKET | BRAIN_SMASH | S_HI_DEMON | 
-S:BR_NETH | HASTE | BR_MANA | S_HI_UNDEAD | S_HI_DRAGON | TRAPS | FORGET | 
-S:BR_NUKE | BR_POIS | BR_DISI | HAND_DOOM | HEAL | TPORT | TELE_TO |
-S:S_BUG | S_RNG |
+F:ATTR_ANY
+F:ATTR_MULTI
+F:AURA_COLD
+F:AURA_ELEC
+F:AURA_FIRE
+F:CAN_FLY
+F:CAN_SPEAK
+F:CAN_SWIM
+F:DG_CURSE
+F:DROP_1D2
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:JOKEANGBAND
+F:KILL_BODY
+F:KILL_WALL
+F:MALE
+F:MORTAL
+F:NO_CONF
+F:NO_FEAR
+F:NO_STUN
+F:ONLY_ITEM
+F:POWERFUL
+F:REFLECTING
+F:REGENERATE
+F:RES_NETH
+F:RES_TELE
+F:RES_TELE
+F:SMART
+F:UNIQUE
+F:WEIRD_MIND
+F:WYRM_PROTECT
+S:1_IN_2
+S:BA_CHAO
+S:BRAIN_SMASH
+S:BR_CHAO
+S:BR_DISI
+S:BR_MANA
+S:BR_NETH
+S:BR_NUKE
+S:BR_POIS
+S:FORGET
+S:HAND_DOOM
+S:HASTE
+S:HEAL
+S:ROCKET
+S:S_BUG
+S:S_HI_DEMON
+S:S_HI_DRAGON
+S:S_HI_UNDEAD
+S:S_RNG
+S:S_THUNDERLORD
+S:TELE_TO
+S:TPORT
 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 
@@ -15150,19 +25083,56 @@ B:HIT:SHATTER:24d10
 B:HIT:SHATTER:24d10
 B:HIT:LOSE_ALL:10d12
 B:TOUCH:UN_POWER
-F:UNIQUE | CAN_SPEAK | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | FORCE_DEPTH | 
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_3D2 | DROP_4D2 | 
-F:DROP_GOOD | DROP_GREAT | DROP_CHOSEN | RES_NETH |
-F:SMART | KILL_WALL | MOVE_BODY | AURA_COLD |
-F:REGENERATE | POWERFUL |
-F:EVIL | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_STUN | NO_SLEEP | NO_FEAR | RES_TELE | BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:BRAIN_SMASH | 
-S:BA_MANA | BO_MANA | BA_NETH | BA_CHAO | BA_DARK | ANIM_DEAD | 
-S:S_MONSTERS | S_UNIQUE | S_HI_DEMON | S_HI_UNDEAD | S_HI_DRAGON | 
-S:ROCKET | BR_NETH | BR_DISI | HAND_DOOM | S_WRAITH
+F:AURA_COLD
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CHOSEN
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_DEPTH
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_WALL
+F:MALE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:POWERFUL
+F:REGENERATE
+F:RES_NETH
+F:RES_TELE
+F:SMART
+F:UNIQUE
+S:1_IN_3
+S:BA_CHAO
+S:BA_DARK
+S:BA_MANA
+S:BA_NETH
+S:BO_MANA
+S:BRAIN_SMASH
+S:BR_DISI
+S:BR_NETH
+S:HAND_DOOM
+S:ROCKET
+S:S_HI_DEMON
+S:S_HI_DRAGON
+S:S_HI_UNDEAD
+S:S_MONSTERS
+S:S_UNIQUE
+S:S_WRAITH
 D:He was the most powerful of the Valar, the equal of Manwe. 
 D:He is the Master of the Pits of Angband. His figure is like a black 
 D:mountain crowned with Lightning. He rages with everlasting anger, his 
@@ -15182,12 +25152,17 @@ W:0:20:1700:0
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:5d8
-F:MALE |
-F:PET | FRIENDS | WILD_ONLY |
-F:ONLY_GOLD | DROP_1D2 |
-F:OPEN_DOOR | BASH_DOOR
-F:DROP_CORPSE |
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:FRIENDS
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:PET
+F:WILD_ONLY
 D:They are used as the main assault force of the human kings. 
 
 N:864:Elven archer
@@ -15197,14 +25172,22 @@ W:0:20:1400:0
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:2d8
-F:MALE |
-F:PET | FRIENDS | WILD_ONLY |
-F:ONLY_GOLD | DROP_1D2 |
-F:OPEN_DOOR | BASH_DOOR
-F:DROP_CORPSE |
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_1 |
-S:ARROW_2 | ARROW_1 | ARROW_2 | ARROW_1 |
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:FRIENDS
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:PET
+F:WILD_ONLY
+S:1_IN_1
+S:ARROW_1
+S:ARROW_1
+S:ARROW_2
+S:ARROW_2
 D:They are used as the main assault force of the elven kings. 
 
 N:865:Dwarven warrior
@@ -15214,12 +25197,17 @@ W:0:20:1500:0
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:6d8
-F:MALE |
-F:PET | FRIENDS | WILD_ONLY |
-F:ONLY_GOLD | DROP_1D2 |
-F:OPEN_DOOR | BASH_DOOR
-F:DROP_CORPSE |
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:FRIENDS
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:PET
+F:WILD_ONLY
 D:They are used as the main assault force of the dwarven kings. 
 
 N:866:Elite uruk
@@ -15230,12 +25218,20 @@ E:1:1:1:2:1:1
 O:10:90:0:0
 B:HIT:HURT:8d5
 B:HIT:HURT:8d5
-F:MALE | 
-F:FORCE_MAXHP | FRIENDS | DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | ORC | IM_POIS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_8 |
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FRIENDS
+F:HAS_LITE
+F:IM_POIS
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:ORC
+S:1_IN_8
 S:ARROW_2
 D:It is a cunning orc of power, taller than a man, and stronger. It fears 
 D:little. 
@@ -15250,9 +25246,15 @@ O:0:0:0:0
 B:CLAW:HURT:1d4
 B:CLAW:FIRE:1d4
 B:BITE:HURT:3d6
-F:WEIRD_MIND | BASH_DOOR | FRIENDS | DROP_SKELETON | DROP_CORPSE
-F:ANIMAL | IM_FIRE | SUSCEP_COLD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FRIENDS
+F:IM_FIRE
+F:MORTAL
+F:SUSCEP_COLD
+F:WEIRD_MIND
 D:A fierce bear trained to withstand the hottest environments. 
 
 N:868:The Variant Maintainer
@@ -15264,12 +25266,24 @@ O:20:20:20:20
 B:INSULT:*
 B:HIT:INSANITY:1d8
 B:HIT:LOSE_WIS:1d8
-F:ONLY_ITEM | DROP_2D2 | UNIQUE | CAN_FLY |
-F:DROP_GOOD | WEIRD_MIND | CAN_SPEAK |
-F:RAND_50 | RAND_25 | INVISIBLE | EVIL |
-F:MORTAL | JOKEANGBAND | HAS_LITE
+F:CAN_FLY
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_GOOD
+F:EVIL
+F:HAS_LITE
+F:INVISIBLE
+F:JOKEANGBAND
+F:MORTAL
+F:ONLY_ITEM
+F:RAND_25
+F:RAND_50
+F:UNIQUE
+F:WEIRD_MIND
 S:1_IN_2
-S:S_BUG | S_RNG | BR_CONF
+S:BR_CONF
+S:S_BUG
+S:S_RNG
 D:A deranged programmer, scattering bizarre ideas and bad code everywhere. 
 
 N:869:Random Number Generator
@@ -15281,8 +25295,12 @@ O:20:20:20:20
 B:INSULT:*
 B:MOAN:*
 B:HIT:CONFUSE:1d6
-F:DROP_1D2 | EVIL |
-F:EMPTY_MIND | RAND_50 | RAND_25 | JOKEANGBAND
+F:DROP_1D2
+F:EMPTY_MIND
+F:EVIL
+F:JOKEANGBAND
+F:RAND_25
+F:RAND_50
 S:MULTIPLY
 D:A feared creation of the Variant Maintainer, it tries to generate Morgoth 
 D:in the town and the One Ring in the magic shop. 
@@ -15294,10 +25312,19 @@ W:50:10:0:100
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:POISON:10d5
-F:NEVER_MOVE | IM_POIS | NONLIVING | IM_ACID | STUPID |
-F:FORCE_MAXHP | UNDEAD | EVIL | JOKEANGBAND | NO_CUT
+F:EVIL
+F:FORCE_MAXHP
+F:IM_ACID
+F:IM_POIS
+F:JOKEANGBAND
+F:NEVER_MOVE
+F:NONLIVING
+F:NO_CUT
+F:STUPID
+F:UNDEAD
 S:1_IN_4
-S:ROCKET | ARROW_4
+S:ARROW_4
+S:ROCKET
 D:It was left here to be used against intruders. 
 
 N:871:Bouncing mine
@@ -15307,10 +25334,23 @@ W:70:10:0:200
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:POISON:10d5
-F:NEVER_MOVE | IM_POIS | NONLIVING | IM_ACID | STUPID |
-F:FORCE_MAXHP | UNDEAD | EVIL | JOKEANGBAND | NO_CUT
+F:EVIL
+F:FORCE_MAXHP
+F:IM_ACID
+F:IM_POIS
+F:JOKEANGBAND
+F:NEVER_MOVE
+F:NONLIVING
+F:NO_CUT
+F:STUPID
+F:UNDEAD
 S:1_IN_3
-S:ROCKET | ARROW_4 | BLINK | BR_POIS | BR_CHAO | BR_NEXU
+S:ARROW_4
+S:BLINK
+S:BR_CHAO
+S:BR_NEXU
+S:BR_POIS
+S:ROCKET
 D:It was left here to be used against intruders. 
 
 N:872:Durin's Bane
@@ -15319,21 +25359,43 @@ I:130:30d100:20:100:80
 W:50:3:13000:30000
 E:1:1:1:2:1:1
 O:0:50:50:0
+A:71:60
 B:HIT:FIRE:6d12
 B:HIT:FIRE:6d12
 B:CRUSH:HURT:5d12
 B:TOUCH:UN_POWER
-F:UNIQUE | MALE | SPECIAL_GENE | DROP_RANDART
-F:FORCE_SLEEP | FORCE_MAXHP | KILL_WALL | 
-F:ESCORT | ESCORTS | DROP_CORPSE | NONLIVING | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_CHOSEN | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DEMON | IM_FIRE | 
-F:NO_CONF | BASEANGBAND | HAS_LITE
-S:1_IN_4 | 
-S:CONF | SCARE | 
-S:BR_FIRE | 
-S:S_UNDEAD | S_DEMON
+F:BASH_DOOR
+F:DEMON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CHOSEN
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_RANDART
+F:ESCORT
+F:ESCORTS
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:KILL_WALL
+F:MALE
+F:MOVE_BODY
+F:NONLIVING
+F:NO_CONF
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:SPECIAL_GENE
+F:UNIQUE
+S:1_IN_4
+S:BR_FIRE
+S:CONF
+S:SCARE
+S:S_DEMON
+S:S_UNDEAD
 D:A huge Balrog surrounded by raging pillars of fire, this is indeed a 
 D:terrible opponent. Wielding a great whip of fire and a blazing sword, his 
 D:fury blisters your skin and melts your flesh.
@@ -15348,9 +25410,16 @@ O:0:0:0:0
 B:CLAW:HURT:1d4
 B:CLAW:CONFUSE:1d4
 B:BITE:PARALYZE:1d6
-F:WEIRD_MIND | BASH_DOOR | FRIENDS | DROP_SKELETON | DROP_CORPSE
-F:ANIMAL | RES_WATE | CAN_SWIM | AQUATIC | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FRIENDS
+F:MORTAL
+F:RES_WATE
+F:WEIRD_MIND
 D:A strange bear the prefers to live in the water. 
 
 N:874:Rot jelly
@@ -15361,10 +25430,16 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:EAT_FOOD:2d3
 B:TOUCH:LOSE_CHR:2d3
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | CAN_SWIM | 
-F:HURT_LITE | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:EMPTY_MIND
+F:HURT_LITE
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:It is a large pile of rotting flesh, whose touch spoils your food.  The terrible 
 D:smell it exudes is also very hard to get rid of... 
 
@@ -15378,11 +25453,23 @@ B:HIT:HURT:20d5
 B:HIT:HURT:20d5
 B:TOUCH:EXP_80:20d5
 B:TOUCH:EXP_80:20d5
-F:UNIQUE | 
-F:FORCE_MAXHP | DROP_CORPSE |
-F:DROP_GOOD | DROP_GREAT | DROP_60 | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | PASS_WALL | NO_SLEEP | NO_STUN | NO_CONF |
-F:EVIL | UNDEAD | JOKEANGBAND | NO_CUT
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_MAXHP
+F:JOKEANGBAND
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:NO_STUN
+F:OPEN_DOOR
+F:PASS_WALL
+F:UNDEAD
+F:UNIQUE
 D:The leader of the horsemen of the apocalypse, before you lies Death. 
 D:A bony skeleton in a huge dark robe wielding a great scythe, Death rides 
 D:a horse of purest black and comes to bring your death. 
@@ -15397,11 +25484,24 @@ B:TOUCH:EAT_FOOD:20d4
 B:GAZE:UN_BONUS:20d4
 B:WAIL:LOSE_INT:10d5
 B:WAIL:LOSE_DEX:10d5
-F:UNIQUE | MALE | 
-F:FORCE_MAXHP | DROP_CORPSE |
-F:DROP_GOOD | DROP_GREAT | DROP_60 | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | PASS_WALL | NO_STUN | NO_SLEEP | NO_CONF |
-F:EVIL | UNDEAD | JOKEANGBAND | NO_CUT
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_MAXHP
+F:JOKEANGBAND
+F:MALE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:NO_STUN
+F:OPEN_DOOR
+F:PASS_WALL
+F:UNDEAD
+F:UNIQUE
 D:One of the horsemen of the apocalypse, before you lies Famine. A 
 D:figure so gaunt that the shape of the bones beneath are revealed, 
 D:Famine rides a pale grey mare that appears near death. 
@@ -15416,13 +25516,27 @@ B:TOUCH:POISON:20d4
 B:TOUCH:POISON:20d4
 B:TOUCH:DISEASE:16d5
 B:TOUCH:DISEASE:16d5
-F:UNIQUE | MALE | 
-F:FORCE_MAXHP | DROP_CORPSE |
-F:DROP_GOOD | DROP_GREAT | DROP_60 | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | PASS_WALL | NO_SLEEP | NO_STUN | NO_CONF |
-F:EVIL | UNDEAD | JOKEANGBAND | NO_CUT
-S:1_IN_2 |
-S:S_ANT | S_SPIDER
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_MAXHP
+F:JOKEANGBAND
+F:MALE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:NO_STUN
+F:OPEN_DOOR
+F:PASS_WALL
+F:UNDEAD
+F:UNIQUE
+S:1_IN_2
+S:S_ANT
+S:S_SPIDER
 D:One of the horsemen of the apocalypse, before you lies Pestilence. 
 D:At first, it looks like a human, but then you notice ants, worms, and 
 D:worse peeking out of the flesh. Pestilence rides a purple horse with 
@@ -15438,12 +25552,26 @@ B:TOUCH:PARALYZE:20d4
 B:WAIL:CONFUSE:20d4
 B:GAZE:BLIND:20d4
 B:WAIL:TERRIFY:20d4
-F:UNIQUE | MALE | 
-F:FORCE_MAXHP | DROP_CORPSE |
-F:DROP_GOOD | DROP_GREAT | DROP_60 | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | PASS_WALL | NO_SLEEP | NO_STUN | NO_CONF | NO_FEAR |
-F:EVIL | UNDEAD | JOKEANGBAND | NO_CUT
-S:1_IN_2 |
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_MAXHP
+F:JOKEANGBAND
+F:MALE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:OPEN_DOOR
+F:PASS_WALL
+F:UNDEAD
+F:UNIQUE
+S:1_IN_2
 S:S_MONSTER
 D:One of the horsemen of the apocalypse, before you lies War. A healthy and 
 D:hearty warrior, War grins a little too wide at you as he prepares for 
@@ -15459,8 +25587,12 @@ W:2:1:100:7
 E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:2d3
-F:ANIMAL | AQUATIC  | STUPID | DROP_CORPSE | COLD_BLOOD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:DROP_CORPSE
+F:MORTAL
+F:STUPID
 D:It's a common fresh-water predatory fish. 
 
 N:880:Electric eel
@@ -15472,9 +25604,15 @@ O:0:0:0:0
 B:TOUCH:ELEC:2d7
 B:TOUCH:ELEC:2d7
 B:TOUCH:ELEC:2d7
-F:AQUATIC | ANIMAL | RAND_25 | IM_ELEC | RES_WATE | 
-F:WILD_TOO | WILD_OCEAN | COLD_BLOOD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:IM_ELEC
+F:MORTAL
+F:RAND_25
+F:RES_WATE
+F:WILD_OCEAN
+F:WILD_TOO
 D:This serpentine creature can create a deadly voltage.
 
 N:881:Giant crayfish
@@ -15485,8 +25623,13 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:CLAW:HURT:3d4
 B:CLAW:HURT:3d4
-F:ANIMAL | AQUATIC | STUPID | WEIRD_MIND | DROP_CORPSE | COLD_BLOOD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:DROP_CORPSE
+F:MORTAL
+F:STUPID
+F:WEIRD_MIND
 D:A man-sized, heavily armoured fresh-water relative of the lobster. 
 
 N:882:Mermaid
@@ -15498,8 +25641,14 @@ O:20:50:10:5
 B:TOUCH:LOSE_WIS
 B:TOUCH:INSANITY:2d3
 B:TOUCH:CONFUSE
-F:FEMALE | RAND_25 | DROP_60 | SMART | AQUATIC | NO_CONF | DROP_CORPSE |
-F:MORTAL | BASEANGBAND
+F:AQUATIC
+F:DROP_60
+F:DROP_CORPSE
+F:FEMALE
+F:MORTAL
+F:NO_CONF
+F:RAND_25
+F:SMART
 D:A green-skinned humanoid with a fishtail. Beware - there are rumours 
 D:of adventures losing their minds under the fearsome charms of mermaids. 
 
@@ -15511,8 +25660,12 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:PARALYZE:1d6
 B:TOUCH:PARALYZE:1d6
-F:ANIMAL | AQUATIC | IM_POIS | WILD_TOO | COLD_BLOOD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:IM_POIS
+F:MORTAL
+F:WILD_TOO
 D:A strange water creature whose touch can be deadly. 
 
 N:884:Giant piranha
@@ -15523,9 +25676,13 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:5d1
 B:BITE:HURT:5d1
-F:NO_SLEEP | WILD_TOO | COLD_BLOOD | 
-F:FRIENDS | AQUATIC | ANIMAL | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:FRIENDS
+F:MORTAL
+F:NO_SLEEP
+F:WILD_TOO
 D:A very large and bloodthirsty fish. 
 
 N:885:Piranha
@@ -15535,8 +25692,12 @@ W:3:1:200:8
 E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d6
-F:FRIENDS | AQUATIC | ANIMAL | WILD_TOO | COLD_BLOOD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:FRIENDS
+F:MORTAL
+F:WILD_TOO
 D:Bloodthirsty fish who can smell your blood from a great distance. 
 
 # New monster added by furiosity for the Theme module
@@ -15548,10 +25709,20 @@ E:0:0:0:0:1:0
 O:50:0:50:0
 B:CRUSH:HURT:2d10
 B:BITE:POISON:2d4
-F:FEMALE |  CAN_SWIM | WILD_TOO | WILD_SHORE |
-F:RAND_25 | DROP_90 | AQUATIC | IM_POIS | 
-F:TAKE_ITEM | BASH_DOOR | DROP_CORPSE | IM_ACID | 
-F:EVIL | MORTAL | BASEANGBAND
+F:AQUATIC
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_90
+F:DROP_CORPSE
+F:EVIL
+F:FEMALE
+F:IM_ACID
+F:IM_POIS
+F:MORTAL
+F:RAND_25
+F:TAKE_ITEM
+F:WILD_SHORE
+F:WILD_TOO
 D:A large orange snake with a woman's torso. She prefers to live 
 D:in the swamp and can withstand marshland elements.
 
@@ -15564,12 +25735,23 @@ E:0:0:0:0:1:0
 O:50:0:50:0
 B:CRUSH:HURT:4d10
 B:BITE:ACID:3d6
-F:FEMALE |  CAN_SWIM | WILD_TOO | WILD_SHORE |
-F:DROP_90 | AQUATIC | WILD_OCEAN | IM_ACID | 
-F:TAKE_ITEM | BASH_DOOR | DROP_CORPSE | RES_WATE | 
-F:EVIL | MORTAL | BASEANGBAND
+F:AQUATIC
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_90
+F:DROP_CORPSE
+F:EVIL
+F:FEMALE
+F:IM_ACID
+F:MORTAL
+F:RES_WATE
+F:TAKE_ITEM
+F:WILD_OCEAN
+F:WILD_SHORE
+F:WILD_TOO
 S:1_IN_8
-S:BA_WATE | BO_ICEE | 
+S:BA_WATE
+S:BO_ICEE
 D:A large dark blue snake with a woman's torso. She prefers to live 
 D:in deep water.
 
@@ -15581,8 +25763,15 @@ W:1:2:1:0
 E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:1d1
-F:ANIMAL | EMPTY_MIND | CAN_SWIM |  WILD_ONLY | WILD_GRASS |
-F:DROP_CORPSE | MORTAL | BASEANGBAND | NEUTRAL | NO_TARGET | 
+F:ANIMAL
+F:CAN_SWIM
+F:DROP_CORPSE
+F:EMPTY_MIND
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:WILD_GRASS
+F:WILD_ONLY
 D:A harmless shell-bearing gastropod mollusc 
 D:crawling slowly on the dungeon floor. 
 D:It is a favourite prey of birds.
@@ -15595,9 +25784,13 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:CRUSH:HURT:1d20
 B:CRUSH:HURT:1d20
-F:RAND_25 | FORCE_MAXHP | RES_WATE | 
-F:ANIMAL | AQUATIC | WILD_TOO |
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:FORCE_MAXHP
+F:MORTAL
+F:RAND_25
+F:RES_WATE
+F:WILD_TOO
 D:Although it looks like a fish and lives in water, it is in fact 
 D:a mammal. And it is huge. 
 
@@ -15609,9 +25802,15 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:BITE:POISON:3d6
 B:BITE:POISON:3d6
-F:AQUATIC | ANIMAL | IM_POIS | FRIENDS | 
-F:CHAR_CLEAR | ATTR_CLEAR | DROP_CORPSE | COLD_BLOOD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:ATTR_CLEAR
+F:CHAR_CLEAR
+F:COLD_BLOOD
+F:DROP_CORPSE
+F:FRIENDS
+F:IM_POIS
+F:MORTAL
 S:MULTIPLY
 D:A relative of crabs and shrimp, this is a tiny creature that inhabits sandy 
 D:bottoms. It has a pair of dangerous-looking claws. 
@@ -15626,8 +25825,14 @@ B:SPIT:BLIND:1d3
 B:CRUSH:HURT:6d3
 B:CRUSH:HURT:6d3
 B:CRUSH:HURT:6d3
-F:RAND_25 | IM_COLD | RES_WATE | AQUATIC | ANIMAL | WILD_TOO | COLD_BLOOD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:IM_COLD
+F:MORTAL
+F:RAND_25
+F:RES_WATE
+F:WILD_TOO
 D:It doesn't move very fast, but when it does - watch out. 
 
 N:892:Giant octopus
@@ -15640,11 +25845,23 @@ B:SPIT:BLIND:1d4
 B:CRUSH:HURT:8d4
 B:CRUSH:HURT:8d4
 B:CRUSH:PARALYZE:8d4
-F:AQUATIC | SMART | IM_POIS | ANIMAL | NO_CONF | NO_SLEEP | 
-F:NO_FEAR  | SMART  | WEIRD_MIND | DROP_CORPSE | COLD_BLOOD | 
-F:MORTAL | BASEANGBAND
-S:1_IN_15 |
-S:DARKNESS | SLOW | CONF | SCARE
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:DROP_CORPSE
+F:IM_POIS
+F:MORTAL
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:SMART
+F:SMART
+F:WEIRD_MIND
+S:1_IN_15
+S:CONF
+S:DARKNESS
+S:SCARE
+S:SLOW
 D:A cunning and dangerous undersea opponent. 
 
 N:893:Eye of the deep
@@ -15657,12 +25874,30 @@ B:GAZE:EXP_20:2d6
 B:GAZE:UN_POWER:2d6
 B:GAZE:INSANITY:2d6
 B:BITE:HURT:6d6
-F:EVIL | IM_POIS | NO_CONF | NO_SLEEP | AQUATIC | 
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | RES_TELE | 
-F:SMART | DROP_CORPSE | BASEANGBAND
-S:1_IN_2 |
-S:BLIND | SLOW | CONF | SCARE | DRAIN_MANA | MIND_BLAST | 
-S:FORGET | DARKNESS | BO_WATE | BO_ICEE | BO_MANA | BO_COLD
+F:AQUATIC
+F:CAN_FLY
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_POIS
+F:NO_CONF
+F:NO_SLEEP
+F:RES_TELE
+F:SMART
+S:1_IN_2
+S:BLIND
+S:BO_COLD
+S:BO_ICEE
+S:BO_MANA
+S:BO_WATE
+S:CONF
+S:DARKNESS
+S:DRAIN_MANA
+S:FORGET
+S:MIND_BLAST
+S:SCARE
+S:SLOW
 D:A beholder that inhabits the depths of the sea, sleeping and pondering 
 D:alien thoughts for centuries. Occasionally, it will float to the 
 D:surface to wreck the lives of surface dwellers. 
@@ -15677,12 +25912,27 @@ B:BITE:POISON:5d10
 B:CLAW:PARALYZE
 B:STING:INSANITY:5d10
 B:STING:UN_BONUS
-F:AQUATIC | ANIMAL | WEIRD_MIND | FORCE_MAXHP | HURT_LITE |
-F:EVIL | SMART   | NO_CONF | NO_SLEEP | DROP_CORPSE |
-F:MORTAL | BASEANGBAND
-S:1_IN_5 | 
-S:BA_POIS | BR_DARK | BLIND | BR_POIS | SLOW | CONF | MIND_BLAST |
-S:BRAIN_SMASH | DARKNESS
+F:ANIMAL
+F:AQUATIC
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:HURT_LITE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:SMART
+F:WEIRD_MIND
+S:1_IN_5
+S:BA_POIS
+S:BLIND
+S:BRAIN_SMASH
+S:BR_DARK
+S:BR_POIS
+S:CONF
+S:DARKNESS
+S:MIND_BLAST
+S:SLOW
 D:A gigantic aquatic monster, somewhat resembling a cross between a 
 D:lobster and a spider. It is coated in poisonous slime and noxious 
 D:parasites. This foul creature hides in the silt of the deep ocean floor, 
@@ -15697,10 +25947,22 @@ O:0:0:0:0
 B:TOUCH:BLIND:3d3
 B:TOUCH:POISON:2d4
 B:WAIL:TERRIFY
-F:COLD_BLOOD | EMPTY_MIND | EVIL | AQUATIC | UNDEAD | IM_COLD | INVISIBLE | 
-F:IM_POIS | NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:AQUATIC
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:UNDEAD
 S:1_IN_8
-S:BLIND | HOLD | CONF
+S:BLIND
+S:CONF
+S:HOLD
 D:A ghastly victim of drowning, forever doomed to wander the ocean waters 
 D:looking for revenge. 
 
@@ -15711,8 +25973,12 @@ W:12:1:3000:40
 E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:4d4
-F:RAND_25 | AQUATIC | ANIMAL | STUPID | DROP_CORPSE |
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:DROP_CORPSE
+F:MORTAL
+F:RAND_25
+F:STUPID
 D:A small species of shark, although the teeth are still as deadly. 
 
 N:897:Hammerhead shark
@@ -15724,8 +25990,11 @@ O:0:0:0:0
 B:BITE:HURT:3d4
 B:BUTT:HURT:3d4
 B:BITE:HURT:3d4
-F:ANIMAL | AQUATIC | WILD_TOO | COLD_BLOOD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:MORTAL
+F:WILD_TOO
 D:A hungry shark with a strange head. 
 
 N:898:Great white shark
@@ -15737,8 +26006,11 @@ O:0:0:0:0
 B:BITE:HURT:4d6
 B:BITE:HURT:4d6
 B:BITE:HURT:4d6
-F:FORCE_SLEEP | AQUATIC | COLD_BLOOD | 
-F:ANIMAL MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:FORCE_SLEEP
+F:MORTAL
 D:A very large carnivorous fish. 
 
 N:899:Aquatic golem
@@ -15749,9 +26021,17 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:3d10
 B:HIT:HURT:3d10
-F:COLD_BLOOD | EMPTY_MIND | AQUATIC | 
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:AQUATIC
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
 D:An ingenious gnomish invention -- a golem designed for underwater 
 D:usage. 
 
@@ -15764,10 +26044,19 @@ E:0:0:0:0:1:0
 O:50:0:50:0
 B:CRUSH:HURT:2d10
 B:BITE:LOSE_CHR:3d6
-F:FEMALE |  CAN_SWIM | WILD_TOO | WILD_SHORE |
-F:RAND_25 | DROP_60 | NO_CUT | WILD_GRASS | 
-F:TAKE_ITEM | BASH_DOOR | DROP_CORPSE | 
-F:EVIL | MORTAL | BASEANGBAND
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FEMALE
+F:MORTAL
+F:NO_CUT
+F:RAND_25
+F:TAKE_ITEM
+F:WILD_GRASS
+F:WILD_SHORE
+F:WILD_TOO
 S:1_IN_7
 S:BR_SHAR
 D:A large brown snake with a woman's torso. It burrows deep into 
@@ -15782,8 +26071,11 @@ O:0:0:0:0
 B:BITE:HURT:3d5
 B:BITE:HURT:3d5
 B:BITE:HURT:3d5
-F:ANIMAL | AQUATIC | WILD_TOO | COLD_BLOOD | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:COLD_BLOOD
+F:MORTAL
+F:WILD_TOO
 D:A fast-moving hunter of the depths. When this creature moves, 
 D:everybody in the water is in danger. 
 
@@ -15797,11 +26089,22 @@ B:HIT:HURT:1d10
 B:HIT:HURT:1d10
 B:HIT:HURT:3d2
 B:HIT:HURT:3d2
-F:MALE | 
-F:FORCE_MAXHP | AQUATIC | REGENERATE | 
-F:FRIENDS | DROP_60 | WILD_TOO | WILD_OCEAN |
-F:OPEN_DOOR | BASH_DOOR | RES_WATE | 
-F:EVIL | TROLL | IM_COLD | IM_POIS | HURT_LITE | BASEANGBAND
+F:AQUATIC
+F:BASH_DOOR
+F:DROP_60
+F:EVIL
+F:FORCE_MAXHP
+F:FRIENDS
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:MALE
+F:OPEN_DOOR
+F:REGENERATE
+F:RES_WATE
+F:TROLL
+F:WILD_OCEAN
+F:WILD_TOO
 D:It is said that Morgoth created trolls in mockery of the Ents. 
 D:A troll of the sea, he reeks of brine. 
 
@@ -15815,11 +26118,22 @@ B:BITE:HURT:11d2
 B:BITE:HURT:22d1
 B:BITE:HURT:11d2
 B:BITE:HURT:22d1
-F:FORCE_MAXHP | UNIQUE | MOVE_BODY | 
-F:WILD_OCEAN | WILD_TOO | COLD_BLOOD | 
-F:BASH_DOOR | IM_COLD | IM_ELEC | IM_POIS | ANIMAL | AQUATIC |
-F:NO_CONF | NO_SLEEP | 
-F:MORTAL | JOKEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:BASH_DOOR
+F:COLD_BLOOD
+F:FORCE_MAXHP
+F:IM_COLD
+F:IM_ELEC
+F:IM_POIS
+F:JOKEANGBAND
+F:MORTAL
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:UNIQUE
+F:WILD_OCEAN
+F:WILD_TOO
 D:The biggest white shark who has ever lived, it is hunting for you now. 
 
 # New monster added by furiosity for the Theme module
@@ -15832,12 +26146,21 @@ O:0:0:80:20
 B:CRUSH:HURT:2d8
 B:BITE:POISON:1d8
 B:BITE:COLD:1d8
-F:FEMALE | 
-F:RAND_25 | DROP_60 | DROP_1D2 | DROP_CORPSE
-F:OPEN_DOOR | BASH_DOOR | CAN_SWIM | IM_POIS | 
-F:EVIL | MORTAL | BASEANGBAND | IM_COLD | 
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FEMALE
+F:IM_COLD
+F:IM_POIS
+F:MORTAL
+F:OPEN_DOOR
+F:RAND_25
 S:1_IN_7
-S:BO_ICEE | BO_COLD | 
+S:BO_COLD
+S:BO_ICEE
 D:A giant snake-like figure with a woman's torso, partially covered 
 D:in silvery scales. 
 
@@ -15849,8 +26172,15 @@ E:1:1:1:2:1:0
 O:20:60:10:10
 B:HIT:HURT:4d4
 B:HIT:HURT:4d4
-F:MALE | AQUATIC | FRIENDS | SMART | DROP_60 | DROP_CORPSE | BASEANGBAND |
-F:HAS_LITE | PET | GOOD
+F:AQUATIC
+F:DROP_60
+F:DROP_CORPSE
+F:FRIENDS
+F:GOOD
+F:HAS_LITE
+F:MALE
+F:PET
+F:SMART
 D:An aquatic elf trained in all forms of combat. 
 
 N:906:Aquatic elven mage
@@ -15860,10 +26190,18 @@ W:10:1:1400:35
 E:1:1:1:2:1:0
 O:10:10:70:10
 B:TOUCH:UN_BONUS
-F:MALE | AQUATIC | SMART | DROP_2D2 | DROP_CORPSE | BASEANGBAND | 
-F:HAS_LITE | PET | GOOD
-S:1_IN_12 |
-S:BO_MANA | BO_COLD | S_MONSTERS
+F:AQUATIC
+F:DROP_2D2
+F:DROP_CORPSE
+F:GOOD
+F:HAS_LITE
+F:MALE
+F:PET
+F:SMART
+S:1_IN_12
+S:BO_COLD
+S:BO_MANA
+S:S_MONSTERS
 D:A wizened aquatic elf skilled in the magical arts. You can see an 
 D:iridescent film coating the water around him. 
 
@@ -15874,9 +26212,13 @@ W:21:1:800:60
 E:0:0:0:0:1:0
 O:0:0:0:0
 B:GAZE:PARALYZE
-F:AQUATIC | ANIMAL | SMART  | RAND_25 | DROP_CORPSE |
-F:MORTAL | BASEANGBAND
-S:1_IN_10 |
+F:ANIMAL
+F:AQUATIC
+F:DROP_CORPSE
+F:MORTAL
+F:RAND_25
+F:SMART
+S:1_IN_10
 S:S_MONSTER
 D:A giant fish shaped like a flounder. There are two enormous eyes 
 D:occupying half of the creature's body. 
@@ -15889,9 +26231,12 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:GAZE:PARALYZE
 B:GAZE:CONFUSE
-F:AQUATIC | ANIMAL | SMART | DROP_CORPSE |
-F:MORTAL | BASEANGBAND
-S:1_IN_10 |
+F:ANIMAL
+F:AQUATIC
+F:DROP_CORPSE
+F:MORTAL
+F:SMART
+S:1_IN_10
 S:S_MONSTERS
 D:A stargazer a bit larger than average, covered with barnacles. 
 
@@ -15902,8 +26247,13 @@ W:13:1:700:55
 E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:2d6
-F:AQUATIC | ANIMAL | RAND_25 | INVISIBLE | ATTR_CLEAR | DROP_CORPSE |
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:ATTR_CLEAR
+F:DROP_CORPSE
+F:INVISIBLE
+F:MORTAL
+F:RAND_25
 D:A flattened fish which is able to change body colouring for 
 D:camouflage. 
 
@@ -15915,8 +26265,10 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:HURT:2d2
 B:BITE:HURT:2d2
-F:ANIMAL | AQUATIC | DROP_CORPSE |
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:DROP_CORPSE
+F:MORTAL
 D:A giant turtle with flippers, adapted for life in the ocean. 
 
 N:911:Hatchling dragon turtle
@@ -15928,10 +26280,17 @@ O:0:0:0:0
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
 B:BITE:HURT:1d5
-F:FORCE_MAXHP | FORCE_SLEEP | DROP_CORPSE |
-F:ONLY_GOLD | DROP_60 | DROP_1D2 | 
-F:EVIL | DRAGON  | AQUATIC | BASEANGBAND | ATTR_MULTI
-S:1_IN_12 | 
+F:AQUATIC
+F:ATTR_MULTI
+F:DRAGON
+F:DROP_1D2
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:ONLY_GOLD
+S:1_IN_12
 S:BR_SOUN
 D:A newly-hatched dragon turtle. It still hasn't grown a proper shell. 
 
@@ -15944,12 +26303,17 @@ O:50:50:0:0
 B:CLAW:HURT:2d6
 B:CLAW:HURT:2d6
 B:BITE:HURT:2d8
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE |
-F:DROP_3D2 | 
-F:EVIL | DRAGON  | AQUATIC | BASEANGBAND | ATTR_MULTI
-S:1_IN_11 | 
-S:SCARE | 
+F:AQUATIC
+F:ATTR_MULTI
+F:DRAGON
+F:DROP_3D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+S:1_IN_11
 S:BR_SOUN
+S:SCARE
 D:A dragon-like creature inhabiting lightless reaches of ocean caves. It has 
 D:a long neck with a tiny head, and four massive flippers. It has a soft and 
 D:flexible shell. 
@@ -15963,13 +26327,20 @@ O:50:50:0:0
 B:CLAW:HURT:2d10
 B:CLAW:HURT:2d10
 B:BITE:HURT:4d10
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE |
-F:DROP_4D2 | 
-F:EVIL | DRAGON | NO_CONF | NO_SLEEP | AQUATIC | BASEANGBAND | HAS_LITE
+F:AQUATIC
 F:ATTR_MULTI
-S:1_IN_9 | 
-S:SCARE | 
+F:DRAGON
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:NO_CONF
+F:NO_SLEEP
+S:1_IN_9
 S:BR_SOUN
+S:SCARE
 D:A large dragon turtle, covered with a tough white shell. 
 
 N:914:Ancient dragon turtle
@@ -15981,13 +26352,26 @@ O:50:50:0:0
 B:CLAW:HURT:4d8
 B:CLAW:HURT:4d8
 B:BITE:HURT:7d8
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE |
-F:DROP_1D2 | DROP_4D2 |
-F:SMART | AQUATIC | POWERFUL | MOVE_BODY  |
-F:EVIL | DRAGON | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE | ATTR_MULTI
-S:1_IN_9 | 
-S:BLIND | CONF | SCARE | 
+F:AQUATIC
+F:ATTR_MULTI
+F:DRAGON
+F:DROP_1D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:POWERFUL
+F:SMART
+S:1_IN_9
+S:BLIND
 S:BR_SOUN
+S:CONF
+S:SCARE
 D:A huge dragon turtle. You can see many barnacles covering its body. 
 
 N:915:Fastitocalon
@@ -16000,11 +26384,26 @@ B:BITE:HURT:5d8
 B:BITE:HURT:5d8
 B:CRUSH:POISON:3d10
 B:CRUSH:POISON:3d10
-F:FORCE_SLEEP | FORCE_MAXHP | RES_TELE | AQUATIC | WILD_TOO | WILD_OCEAN |
-F:IM_FIRE | IM_ACID | IM_COLD | IM_POIS |
-F:DRAGON | NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | ATTR_MULTI
-S:1_IN_6 | 
-S:BR_FIRE | BR_ACID | BR_SOUN | BA_WATE
+F:AQUATIC
+F:ATTR_MULTI
+F:DRAGON
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:RES_TELE
+F:WILD_OCEAN
+F:WILD_TOO
+S:1_IN_6
+S:BA_WATE
+S:BR_ACID
+S:BR_FIRE
+S:BR_SOUN
 D:A huge aquatic dragon-turtle, its shell is as large as a small island. 
 
 N:916:Undead stargazer
@@ -16015,9 +26414,15 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:GAZE:PARALYZE
 B:GAZE:EXP_20
-F:AQUATIC | ANIMAL | SMART | INVISIBLE | UNDEAD | BASEANGBAND | NO_CUT
-S:1_IN_10 |
-S:S_UNDEAD | S_MONSTER
+F:ANIMAL
+F:AQUATIC
+F:INVISIBLE
+F:NO_CUT
+F:SMART
+F:UNDEAD
+S:1_IN_10
+S:S_MONSTER
+S:S_UNDEAD
 D:A stargazer brought back from the dead under control of some evil 
 D:sorceror. 
 
@@ -16029,8 +26434,11 @@ E:0:0:0:0:1:0
 O:0:0:0:0
 B:BITE:HURT:7d4
 B:BITE:HURT:7d4
-F:AQUATIC | WILD_TOO | WILD_OCEAN | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:AQUATIC
+F:MORTAL
+F:WILD_OCEAN
+F:WILD_TOO
 D:An almost beautiful, deadly beast. 
 
 N:918:Merrow
@@ -16041,10 +26449,21 @@ E:1:1:1:2:1:1
 O:20:70:0:10
 B:HIT:HURT:3d8
 B:HIT:HURT:3d8
-F:FRIENDS | DROP_60 | DROP_CORPSE | AQUATIC | WILD_TOO | WILD_OCEAN | 
-F:OPEN_DOOR | BASH_DOOR | RES_WATE | IM_COLD | IM_POIS | 
-F:EVIL | GIANT | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:AQUATIC
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FRIENDS
+F:GIANT
+F:HAS_LITE
+F:IM_COLD
+F:IM_POIS
+F:MORTAL
+F:OPEN_DOOR
+F:RES_WATE
+F:WILD_OCEAN
+F:WILD_TOO
 D:A great ogre of the sea, it is violent and stupid. 
 
 N:919:Water naga
@@ -16057,13 +26476,21 @@ B:CRUSH:HURT:2d8
 B:CRUSH:HURT:2d8
 B:BITE:POISON:1d8
 B:BITE:POISON:1d8
-F:FEMALE |
-F:AQUATIC | DROP_CORPSE |
-F:ONLY_ITEM | DROP_90 | DROP_2D2 | 
-F:EVIL | NO_CONF | NO_SLEEP | SMART | 
-F:MORTAL | BASEANGBAND
-S:1_IN_7 | 
-S:DARKNESS | CAUSE_3 | BO_ICEE
+F:AQUATIC
+F:DROP_2D2
+F:DROP_90
+F:DROP_CORPSE
+F:EVIL
+F:FEMALE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:SMART
+S:1_IN_7
+S:BO_ICEE
+S:CAUSE_3
+S:DARKNESS
 D:A naga adapted to underwater life. She has a fish-like tail and a pair 
 D:of gills. 
 
@@ -16078,13 +26505,24 @@ B:CRUSH:TERRIFY:2d8
 B:CRUSH:HURT:2d8
 B:BITE:BLIND:1d8
 B:BITE:HURT:1d8
-F:FEMALE | CAN_SWIM | 
-F:FORCE_SLEEP | CAN_FLY | HURT_LITE | 
-F:ONLY_ITEM | DROP_90 | DROP_2D2 | DROP_CORPSE | 
-F:INVISIBLE | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | NO_CONF | NO_SLEEP | BASEANGBAND | 
-S:1_IN_4 | 
-S:BLIND | DARKNESS
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SWIM
+F:DROP_2D2
+F:DROP_90
+F:DROP_CORPSE
+F:EVIL
+F:FEMALE
+F:FORCE_SLEEP
+F:HURT_LITE
+F:INVISIBLE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+S:1_IN_4
+S:BLIND
+S:DARKNESS
 D:A dark snake-like form with the torso of a beautiful woman, it 
 D:prefers to roam in the night.
 
@@ -16099,13 +26537,27 @@ B:CRUSH:HURT:2d8
 B:CRUSH:HURT:2d8
 B:BITE:HURT:1d8
 B:BITE:HURT:1d8
-F:FEMALE | 
-F:FORCE_SLEEP | CAN_FLY | CAN_SWIM | 
-F:ONLY_ITEM | DROP_90 | DROP_2D2 | DROP_CORPSE | 
-F:INVISIBLE | OPEN_DOOR | BASH_DOOR | IM_POIS | 
-F:EVIL | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_4 | 
-S:HEAL | BR_POIS | BA_POIS | DARKNESS
+F:BASH_DOOR
+F:CAN_FLY
+F:CAN_SWIM
+F:DROP_2D2
+F:DROP_90
+F:DROP_CORPSE
+F:EVIL
+F:FEMALE
+F:FORCE_SLEEP
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+S:1_IN_4
+S:BA_POIS
+S:BR_POIS
+S:DARKNESS
+S:HEAL
 D:A green snake-like form with the torso of a beautiful woman, it 
 D:dwells in the trees.
 
@@ -16119,11 +26571,22 @@ B:CRUSH:HURT:10d10
 B:CRUSH:HURT:10d10
 B:CRUSH:HURT:10d10
 B:CRUSH:HURT:10d10
-F:FORCE_MAXHP | UNIQUE | MOVE_BODY | 
-F:WILD_OCEAN | WILD_TOO | COLD_BLOOD | 
-F:BASH_DOOR | IM_COLD | IM_ELEC | IM_POIS | ANIMAL | AQUATIC |
-F:MORTAL | JOKEANGBAND
-S:1_IN_6 | BA_WATE
+F:ANIMAL
+F:AQUATIC
+F:BASH_DOOR
+F:COLD_BLOOD
+F:FORCE_MAXHP
+F:IM_COLD
+F:IM_ELEC
+F:IM_POIS
+F:JOKEANGBAND
+F:MORTAL
+F:MOVE_BODY
+F:UNIQUE
+F:WILD_OCEAN
+F:WILD_TOO
+S:1_IN_6
+S:BA_WATE
 D:The mightiest whale of the seas, he has sunk many ships in his time. With 
 D:a mere flick of his tail he can create a mighty whirlpool, to the ruin 
 D:of all who would travel the ocean. 
@@ -16137,11 +26600,14 @@ O:0:0:0:0
 B:BITE:CONFUSE:2d8
 B:BITE:HURT:2d8
 B:CLAW:POISON:2d8
-F:FRIENDS | DROP_CORPSE |
-F:ANIMAL | AQUATIC |
-F:MORTAL | BASEANGBAND
-S:1_IN_10 | 
-S:BO_ICEE | BO_WATE
+F:ANIMAL
+F:AQUATIC
+F:DROP_CORPSE
+F:FRIENDS
+F:MORTAL
+S:1_IN_10
+S:BO_ICEE
+S:BO_WATE
 D:A hound with a finned tail and large, muscular flippers for hind legs. 
 D:It has a rubbery skin instead of fur. 
 
@@ -16154,13 +26620,23 @@ O:20:60:20:0
 B:HIT:HURT:3d4
 B:GAZE:POISON:8d12
 B:CLAW:INSANITY:8d12
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:FRIENDS | SMART  |
-F:ONLY_ITEM | DROP_60 | 
-F:AQUATIC | POWERFUL | 
-F:EVIL | DEMON | IM_ACID | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
-S:1_IN_8 | 
-S:BO_ICEE | BA_WATE
+F:AQUATIC
+F:DEMON
+F:DROP_60
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:FRIENDS
+F:HAS_LITE
+F:IM_ACID
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:POWERFUL
+F:SMART
+S:1_IN_8
+S:BA_WATE
+S:BO_ICEE
 D:A hideous scaled demon, it is a sleek form with many fins but no visible 
 D:arms or legs. It has a toothed gaping maw, reminiscent of a caricature 
 D:of a shark's jaws. 
@@ -16176,13 +26652,27 @@ B:CRUSH:HURT:2d8
 B:CRUSH:HURT:2d8
 B:BITE:HURT:1d8
 B:BITE:HURT:1d8
-F:FEMALE | 
-F:FORCE_SLEEP | CAN_FLY |
-F:ONLY_ITEM | DROP_90 | DROP_2D2 | DROP_CORPSE | 
-F:INVISIBLE | OPEN_DOOR | BASH_DOOR | NO_STUN | PET |
-F:EVIL | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_4 | 
-S:HEAL | BLIND | CONF | DARKNESS
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_2D2
+F:DROP_90
+F:DROP_CORPSE
+F:EVIL
+F:FEMALE
+F:FORCE_SLEEP
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:PET
+S:1_IN_4
+S:BLIND
+S:CONF
+S:DARKNESS
+S:HEAL
 D:A large brown snake with a woman's torso. She is a fellow 
 D:adventurer.
 
@@ -16194,10 +26684,17 @@ W:19:1:40:64
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:COLD:4d4
-F:NEVER_MOVE | SUSCEP_FIRE |
-F:STUPID | EMPTY_MIND | 
-F:IM_COLD | IM_POIS | CAN_SWIM |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:EMPTY_MIND
+F:IM_COLD
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
+F:SUSCEP_FIRE
 D:It is a strange white growth on the dungeon floor; it seems to sparkle 
 D:with ice. 
 
@@ -16209,10 +26706,15 @@ W:19:1:40:64
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:EAT_LITE:4d4
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | CAN_SWIM |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:EMPTY_MIND
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:It is a strange silvery growth on the dungeon floor; it seems to glow with 
 D:a dark light. 
 
@@ -16222,11 +26724,23 @@ I:110:220d100:40:10:3
 W:0:4:1100:0
 E:0:1:1:2:1:1
 O:20:20:20:20
-F:UNIQUE | FEMALE | CAN_SPEAK | DROP_CORPSE | DROP_SKELETON |
-F:FORCE_MAXHP | WILD_TOWN | WILD_ONLY | RAND_25
-F:ONLY_ITEM | DROP_90 | DROP_GOOD | 
-F:OPEN_DOOR | DG_CURSE |
-F:MORTAL | JOKEANGBAND | HAS_LITE
+F:CAN_SPEAK
+F:DG_CURSE
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:FEMALE
+F:FORCE_MAXHP
+F:HAS_LITE
+F:JOKEANGBAND
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RAND_25
+F:UNIQUE
+F:WILD_ONLY
+F:WILD_TOWN
 D:She loves joking, and she's constantly giggling. A very happy girl. 
 D:Beware, it is rumoured that DarkGod has put a mighty curse on her. 
 
@@ -16238,9 +26752,19 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:TERRIFY
 B:TOUCH:HURT:3d4
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | UNDEAD | GOOD |
-F:IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | SMART | PET | UNDEAD | 
-F:BASEANGBAND | NO_CUT
+F:COLD_BLOOD
+F:GOOD
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
+F:PET
+F:SMART
+F:UNDEAD
+F:UNDEAD
 D:A helpful spirit from beyond the grave. 
 
 N:930:Young spirit
@@ -16251,9 +26775,19 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:TERRIFY
 B:TOUCH:HURT:9d4
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | UNDEAD | GOOD |
-F:IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | SMART | PET | UNDEAD | 
-F:BASEANGBAND | NO_CUT
+F:COLD_BLOOD
+F:GOOD
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
+F:PET
+F:SMART
+F:UNDEAD
+F:UNDEAD
 D:A helpful spirit from beyond the grave. 
 
 N:931:Mature spirit
@@ -16264,9 +26798,19 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:TERRIFY
 B:TOUCH:HURT:18d4
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | UNDEAD | GOOD |
-F:IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | SMART | PET | UNDEAD | 
-F:BASEANGBAND | NO_CUT
+F:COLD_BLOOD
+F:GOOD
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
+F:PET
+F:SMART
+F:UNDEAD
+F:UNDEAD
 D:A helpful spirit from beyond the grave. 
 
 N:932:Experienced spirit
@@ -16277,9 +26821,19 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:TERRIFY
 B:TOUCH:HURT:20d4
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | UNDEAD | GOOD |
-F:IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | SMART | PET | UNDEAD | 
-F:BASEANGBAND | NO_CUT
+F:COLD_BLOOD
+F:GOOD
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
+F:PET
+F:SMART
+F:UNDEAD
+F:UNDEAD
 D:A helpful spirit from beyond the grave. 
 
 N:933:Wise spirit
@@ -16290,9 +26844,19 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:TOUCH:TERRIFY
 B:TOUCH:HURT:30d4
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | UNDEAD | GOOD |
-F:IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | SMART | PET | UNDEAD | 
-F:BASEANGBAND | NO_CUT
+F:COLD_BLOOD
+F:GOOD
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
+F:PET
+F:SMART
+F:UNDEAD
+F:UNDEAD
 D:A helpful spirit from beyond the grave. 
 
 N:934:Fangorn the Treebeard, Lord of the Ents
@@ -16305,10 +26869,24 @@ B:CRUSH:HURT:13d13
 B:CRUSH:HURT:13d13
 B:CRUSH:HURT:13d13
 B:CRUSH:HURT:13d13
-F:FORCE_SLEEP | FORCE_MAXHP | UNIQUE | CAN_SPEAK | SUSCEP_FIRE |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | MOVE_BODY | DROP_CORPSE |
-F:SMART | TAKE_ITEM | BASH_DOOR | KILL_WALL | NO_SLEEP |
-F:GOOD | PET | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:KILL_WALL
+F:MOVE_BODY
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PET
+F:SMART
+F:SUSCEP_FIRE
+F:TAKE_ITEM
+F:UNIQUE
 D:The first being to awoke on Arda, apart from the Valar themselves.  He is the 
 D:first, oldest, greatest and most respected of all the Ents:  and though he is 
 D:slow to anger, he is a terrible foe when roused. 
@@ -16323,17 +26901,48 @@ B:HIT:UN_BONUS:6d8
 B:HIT:UN_BONUS:6d8
 B:HIT:TERRIFY:5d5
 B:HIT:TERRIFY:5d5
-F:UNIQUE | MALE | CAN_SPEAK | PET | DROP_CORPSE |
-F:FORCE_SLEEP | FORCE_MAXHP | REFLECTING | RES_TELE |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD |
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:GOOD | IM_FIRE | IM_COLD | 
-F:IM_ELEC | IM_POIS | BASEANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:HEAL | HASTE | TPORT | TELE_AWAY | BLIND | CONF | SCARE | 
-S:CAUSE_4 | BRAIN_SMASH | FORGET | TRAPS | 
-S:BA_FIRE | BO_FIRE | BO_PLAS | BO_MANA | CAUSE_4 |
-S:S_MONSTERS | S_DRAGON | S_KIN 
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:PET
+F:REFLECTING
+F:RES_TELE
+F:SMART
+F:UNIQUE
+S:1_IN_2
+S:BA_FIRE
+S:BLIND
+S:BO_FIRE
+S:BO_MANA
+S:BO_PLAS
+S:BRAIN_SMASH
+S:CAUSE_4
+S:CAUSE_4
+S:CONF
+S:FORGET
+S:HASTE
+S:HEAL
+S:SCARE
+S:S_DRAGON
+S:S_KIN
+S:S_MONSTERS
+S:TELE_AWAY
+S:TPORT
 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. 
@@ -16348,13 +26957,24 @@ B:HIT:HURT:3d5
 B:HIT:HURT:3d5
 B:HIT:HURT:3d5
 B:HIT:HURT:3d5
-F:UNIQUE | MALE |
-F:FORCE_MAXHP | FORCE_SLEEP |
-F:OPEN_DOOR | BASH_DOOR |
-F:IM_FIRE | IM_COLD | IM_POIS |
-F:DROP_CORPSE | DROP_SKELETON | BASEANGBAND | HAS_LITE
-S:1_IN_6 | 
-S:HEAL | BLIND | CONF | CAUSE_2 | MIND_BLAST 
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MALE
+F:OPEN_DOOR
+F:UNIQUE
+S:1_IN_6
+S:BLIND
+S:CAUSE_2
+S:CONF
+S:HEAL
+S:MIND_BLAST
 D:The friend and companion of the dwarven king Thror, he went mad with 
 D:grief after Thror's death at the hands of Azog the Orc.  With torn beard 
 D:and ragged clothes, he seems to have fixed on you as a convenient target 
@@ -16367,10 +26987,21 @@ W:8:1:900:18
 E:1:1:1:2:1:1
 O:0:50:0:30
 B:HIT:HURT:1d6
-F:DROP_60 | WILD_TOO | FRIENDS | 
-F:OPEN_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND | HAS_LITE | NO_CONF | NO_SLEEP
-S:1_IN_12 | BLIND | SLOW | CONF | SCARE
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FRIENDS
+F:HAS_LITE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:OPEN_DOOR
+F:WILD_TOO
+S:1_IN_12
+S:BLIND
+S:CONF
+S:SCARE
+S:SLOW
 D:A novice in the arts of mind over matter. 
 
 N:938:Great Swamp Worm
@@ -16383,14 +27014,30 @@ B:CLAW:HURT:4d12
 B:CLAW:HURT:4d12
 B:BITE:POISON:6d14
 B:BITE:POISON:6d14
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:BASH_DOOR | POWERFUL | MOVE_BODY | DROP_CORPSE | 
-F:EVIL | DRAGON | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
 F:ATTR_MULTI
-S:1_IN_4 | 
-S:BLIND | CONF | SCARE | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_POIS
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:POWERFUL
+S:1_IN_4
+S:BLIND
 S:BR_POIS
+S:CONF
+S:SCARE
 D:A truly enormous dragon with great powers.  The foul gases issuing 
 D:from the beast nearly make you vomit; and while you may try to hold 
 D:your breath as you fight it, it sees no reason to do likewise. 
@@ -16405,14 +27052,30 @@ B:CLAW:HURT:4d12
 B:CLAW:HURT:4d12
 B:BITE:ACID:6d14
 B:BITE:ACID:6d14
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:BASH_DOOR | POWERFUL | MOVE_BODY | DROP_CORPSE | 
-F:EVIL | DRAGON | IM_ACID | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE
 F:ATTR_MULTI
-S:1_IN_4 | 
-S:BLIND | CONF | SCARE | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:POWERFUL
+S:1_IN_4
+S:BLIND
 S:BR_ACID
+S:CONF
+S:SCARE
 D:A huge and very powerful dragon.  Great steaming pools of acid drip from 
 D:its form onto the ground.  You shudder when you see the acid eating away 
 D:the very stones of the dungeon - what could it do to you? 
@@ -16425,11 +27088,23 @@ E:0:1:0:6:1:0
 O:0:0:0:0
 B:CLAW:HURT:3d4
 B:CLAW:FIRE:5d4
-F:IM_COLD | IM_FIRE | IM_POIS | NO_CONF | NO_SLEEP | IMPRESED |
-F:CAN_FLY | SMART | PET | DROP_CORPSE | HAS_EGG | GOOD | AQUATIC | 
-F:MORTAL |  HAS_LITE
+F:AQUATIC
+F:CAN_FLY
+F:DROP_CORPSE
+F:GOOD
+F:HAS_EGG
+F:HAS_LITE
+F:IMPRESED
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:PET
+F:SMART
 S:1_IN_10
-S:TELE_TO |
+S:TELE_TO
 D:The ancestors of the Eagles of the Thunderlords, these are 
 D:friendly funny flying creatures with power. 
 
@@ -16441,11 +27116,23 @@ E:0:1:0:6:1:0
 O:0:0:0:0
 B:CLAW:HURT:4d4
 B:CLAW:FIRE:5d4
-F:IM_COLD | IM_FIRE | IM_POIS | NO_CONF | NO_SLEEP | IMPRESED |
-F:CAN_FLY | SMART | PET | DROP_CORPSE | HAS_EGG | GOOD | AQUATIC | 
-F:MORTAL | HAS_LITE
+F:AQUATIC
+F:CAN_FLY
+F:DROP_CORPSE
+F:GOOD
+F:HAS_EGG
+F:HAS_LITE
+F:IMPRESED
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:PET
+F:SMART
 S:1_IN_10
-S:TELE_TO |
+S:TELE_TO
 D:The ancestors of the Eagles of the Thunderlords, these are 
 D:friendly funny flying creatures with power. 
 
@@ -16457,11 +27144,23 @@ E:0:1:0:6:1:0
 O:0:0:0:0
 B:CLAW:HURT:5d4
 B:CLAW:FIRE:7d4
-F:IM_COLD | IM_FIRE | IM_POIS | NO_CONF | NO_SLEEP | IMPRESED |
-F:CAN_FLY | SMART | PET | DROP_CORPSE | HAS_EGG | GOOD | AQUATIC | 
-F:MORTAL | HAS_LITE
+F:AQUATIC
+F:CAN_FLY
+F:DROP_CORPSE
+F:GOOD
+F:HAS_EGG
+F:HAS_LITE
+F:IMPRESED
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:PET
+F:SMART
 S:1_IN_10
-S:TELE_TO |
+S:TELE_TO
 D:The ancestors of the Eagles of the Thunderlords, these are 
 D:friendly funny flying creatures with power. 
 
@@ -16473,11 +27172,23 @@ E:0:1:0:6:1:0
 O:0:0:0:0
 B:CLAW:HURT:6d4
 B:CLAW:FIRE:7d4
-F:IM_COLD | IM_FIRE | IM_POIS | NO_CONF | NO_SLEEP | IMPRESED |
-F:CAN_FLY | SMART | PET | DROP_CORPSE | HAS_EGG | GOOD | AQUATIC | 
-F:MORTAL | HAS_LITE
+F:AQUATIC
+F:CAN_FLY
+F:DROP_CORPSE
+F:GOOD
+F:HAS_EGG
+F:HAS_LITE
+F:IMPRESED
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:PET
+F:SMART
 S:1_IN_10
-S:TELE_TO |
+S:TELE_TO
 D:The ancestors of the Eagles of the Thunderlords, these are 
 D:friendly funny flying creatures with power. 
 
@@ -16489,11 +27200,23 @@ E:0:1:0:6:1:0
 O:0:0:0:0
 B:CLAW:HURT:6d4
 B:CLAW:FIRE:8d4
-F:IM_COLD | IM_FIRE | IM_POIS | NO_CONF | NO_SLEEP | IMPRESED |
-F:CAN_FLY | SMART | PET | DROP_CORPSE | HAS_EGG | GOOD | AQUATIC | 
-F:MORTAL | HAS_LITE
+F:AQUATIC
+F:CAN_FLY
+F:DROP_CORPSE
+F:GOOD
+F:HAS_EGG
+F:HAS_LITE
+F:IMPRESED
+F:IM_COLD
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:PET
+F:SMART
 S:1_IN_10
-S:TELE_TO |
+S:TELE_TO
 D:The ancestors of the Eagles of the Thunderlords, these are 
 D:friendly funny flying creatures with power. 
 
@@ -16505,11 +27228,22 @@ E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:10d8
 B:HIT:HURT:10d8
-F:MALE | FRIENDS | OPEN_DOOR | BASH_DOOR |
-F:GOOD | DROP_SKELETON | DROP_CORPSE | SMART | PET |
-F:IM_ACID | IM_COLD | RES_WATE | RES_NETH |
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_2 |
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FRIENDS
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:PET
+F:RES_NETH
+F:RES_WATE
+F:SMART
+S:1_IN_2
 S:ARROW_4
 D:An elf cloaked in green wielding a longbow. 
 
@@ -16523,12 +27257,28 @@ B:HIT:HURT:6d6
 B:HIT:HURT:6d6
 B:HIT:EXP_80:4d6
 B:HIT:EXP_80:4d6
-F:UNIQUE | MALE |
-F:FORCE_MAXHP |
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | NAZGUL | SUSCEP_FIRE | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | MOVE_BODY | DROP_CHOSEN |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP | 
-F:BASEANGBAND | SPECIAL_GENE | NO_CUT
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_CHOSEN
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:NAZGUL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SPECIAL_GENE
+F:SUSCEP_FIRE
+F:UNDEAD
+F:UNIQUE
 D:A tall black Ringwraith, he is a master of horsemanship. He longs 
 D:to taste your blood. 
 
@@ -16542,15 +27292,37 @@ B:HIT:HURT:6d6
 B:HIT:HURT:6d6
 B:TOUCH:EXP_80:5d6
 B:TOUCH:EXP_80:5d6
-F:UNIQUE | FEMALE |
-F:FORCE_SLEEP | FORCE_MAXHP | NAZGUL | DROP_CHOSEN |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD |  SUSCEP_FIRE | 
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | MOVE_BODY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP | 
-F:BASEANGBAND | NO_CUT
-S:1_IN_3 |
-S:BLIND | HOLD | SCARE | CAUSE_3 | FORGET |
-S:BO_ACID | BO_COLD | BO_NETH |
+F:COLD_BLOOD
+F:DROP_4D2
+F:DROP_CHOSEN
+F:DROP_GOOD
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:MOVE_BODY
+F:NAZGUL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:PASS_WALL
+F:SUSCEP_FIRE
+F:UNDEAD
+F:UNIQUE
+S:1_IN_3
+S:BLIND
+S:BO_ACID
+S:BO_COLD
+S:BO_NETH
+S:CAUSE_3
+S:FORGET
+S:HOLD
+S:SCARE
 S:S_MONSTER
 D:A sorceress in life, Adunaphel quickly fell under Sauron's sway and the 
 D:power of the Rings of Power. 
@@ -16565,15 +27337,36 @@ B:HIT:HURT:7d6
 B:HIT:HURT:7d6
 B:GAZE:EXP_80:6d6
 B:WAIL:TERRIFY:6d6
-F:UNIQUE | MALE |
-F:FORCE_SLEEP | FORCE_MAXHP | NAZGUL | DROP_CHOSEN |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD |  SUSCEP_FIRE |
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | MOVE_BODY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | 
-F:HURT_LITE | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_3 |
-S:BLIND | HOLD | SCARE | CAUSE_3 | DARKNESS |
-S:BO_COLD | BO_NETH |
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_4D2
+F:DROP_CHOSEN
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:NAZGUL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SUSCEP_FIRE
+F:UNDEAD
+F:UNIQUE
+S:1_IN_3
+S:BLIND
+S:BO_COLD
+S:BO_NETH
+S:CAUSE_3
+S:DARKNESS
+S:HOLD
+S:SCARE
 S:S_MONSTERS
 D:A mighty sorcerer king, Akhorahil was blind in life. With powerful 
 D:enchantments, he created jewelled eyes that enabled him to see better than 
@@ -16589,14 +27382,36 @@ B:HIT:HURT:7d7
 B:HIT:HURT:7d7
 B:TOUCH:EXP_80:6d7
 B:WAIL:TERRIFY:6d7
-F:UNIQUE | MALE |
-F:FORCE_SLEEP | FORCE_MAXHP | NAZGUL | DROP_CHOSEN |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | SUSCEP_FIRE |
-F:INVISIBLE | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | MOVE_BODY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | 
-F:HURT_LITE | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_3 |
-S:BLIND | HOLD | SCARE | CAUSE_3 | BO_FIRE | BO_NETH | 
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_4D2
+F:DROP_CHOSEN
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:MALE
+F:MOVE_BODY
+F:NAZGUL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SUSCEP_FIRE
+F:UNDEAD
+F:UNIQUE
+S:1_IN_3
+S:BLIND
+S:BO_FIRE
+S:BO_NETH
+S:CAUSE_3
+S:HOLD
+S:SCARE
 S:S_MONSTER
 D:Ren was an insane eastern king who believed himself to be the son of a 
 D:volcano god. At an early age his sanity was destroyed by a plague that 
@@ -16612,15 +27427,38 @@ B:HIT:HURT:8d7
 B:HIT:HURT:8d7
 B:TOUCH:EXP_40:6d7
 B:TOUCH:EXP_40:6d7
-F:UNIQUE | MALE |
-F:FORCE_SLEEP | FORCE_MAXHP |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | NAZGUL | DROP_CHOSEN |
-F:INVISIBLE | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | MOVE_BODY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS |  SUSCEP_FIRE |
-F:HURT_LITE | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_3 | 
-S:BLIND | HOLD | SCARE | CAUSE_3 | 
-S:BA_NETH | BA_COLD | BA_ELEC | BA_ACID | 
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_4D2
+F:DROP_CHOSEN
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:INVISIBLE
+F:MALE
+F:MOVE_BODY
+F:NAZGUL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SUSCEP_FIRE
+F:UNDEAD
+F:UNIQUE
+S:1_IN_3
+S:BA_ACID
+S:BA_COLD
+S:BA_ELEC
+S:BA_NETH
+S:BLIND
+S:CAUSE_3
+S:HOLD
+S:SCARE
 S:S_UNDEAD
 D:This Ringwraith was a weak-minded sorcerer-king who fell easily under 
 D:Sauron's power. 
@@ -16635,15 +27473,38 @@ B:HIT:HURT:8d8
 B:HIT:HURT:8d8
 B:BITE:EXP_40:6d7
 B:WAIL:TERRIFY:6d7
-F:UNIQUE | MALE |
-F:FORCE_SLEEP | FORCE_MAXHP | NAZGUL | DROP_CHOSEN |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | SUSCEP_FIRE |
-F:SMART | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | MOVE_BODY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | 
-F:HURT_LITE | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_3 |
-S:BLIND | HOLD | SCARE | CAUSE_3 | BA_NETH |
-S:S_MONSTERS | S_UNDEAD | S_HOUND
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_4D2
+F:DROP_CHOSEN
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:NAZGUL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:SUSCEP_FIRE
+F:UNDEAD
+F:UNIQUE
+S:1_IN_3
+S:BA_NETH
+S:BLIND
+S:CAUSE_3
+S:HOLD
+S:SCARE
+S:S_HOUND
+S:S_MONSTERS
+S:S_UNDEAD
 D:Dwar had a special affinity for dogs in life, and can still command them 
 D:at will. He howls manically as he reaches out to destroy you. 
 
@@ -16657,15 +27518,40 @@ B:HIT:HURT:9d9
 B:HIT:HURT:9d9
 B:TOUCH:EXP_80:6d7
 B:WAIL:TERRIFY:6d7
-F:UNIQUE | MALE |
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | SUSCEP_FIRE |
-F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | DROP_GOOD |
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | MOVE_BODY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | NAZGUL | DROP_CHOSEN |
-F:HURT_LITE | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_3 |
-S:BLIND | HOLD | SCARE | CAUSE_3 | CAUSE_4 | MIND_BLAST | 
-S:BO_COLD | BA_COLD | BA_NETH |
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_4D2
+F:DROP_CHOSEN
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:NAZGUL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:SUSCEP_FIRE
+F:UNDEAD
+F:UNIQUE
+S:1_IN_3
+S:BA_COLD
+S:BA_NETH
+S:BLIND
+S:BO_COLD
+S:CAUSE_3
+S:CAUSE_4
+S:HOLD
+S:MIND_BLAST
+S:SCARE
 S:S_UNDEAD
 D:A Ringwraith powerful in fell sorcery, he yearns for the life he has 
 D:exchanged for an unlife of everlasting torment. 
@@ -16680,16 +27566,45 @@ B:HIT:HURT:9d10
 B:HIT:HURT:9d10
 B:TOUCH:EXP_80:7d7
 B:TOUCH:EXP_80:7d7
-F:UNIQUE | MALE | CAN_SPEAK | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | NAZGUL | DROP_CHOSEN |
-F:SMART | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | MOVE_BODY | 
-F:EVIL | UNDEAD | IM_ACID | IM_COLD | IM_POIS |  SUSCEP_FIRE |
-F:HURT_LITE | NO_CONF | NO_SLEEP | RES_TELE | BASEANGBAND | NO_CUT
-S:1_IN_2 | 
-S:TELE_LEVEL | BLIND | HOLD | SCARE | CAUSE_3 | CAUSE_4 | BO_MANA | 
-S:BA_COLD | BA_NETH | ANIM_DEAD | 
-S:S_HI_UNDEAD | S_KIN
+F:BASH_DOOR
+F:CAN_SPEAK
+F:COLD_BLOOD
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CHOSEN
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:NAZGUL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:SMART
+F:SUSCEP_FIRE
+F:UNDEAD
+F:UNIQUE
+S:1_IN_2
+S:BA_COLD
+S:BA_NETH
+S:BLIND
+S:BO_MANA
+S:CAUSE_3
+S:CAUSE_4
+S:HOLD
+S:SCARE
+S:S_HI_UNDEAD
+S:S_KIN
+S:TELE_LEVEL
 D:He was the warrior-king of the East, now a ringwraith. Khamul is a powerful opponent, his skill in 
 D:combat awesome and his form twisted by evil cunning. 
 
@@ -16703,16 +27618,46 @@ B:HIT:HURT:10d10
 B:HIT:HURT:10d10
 B:HIT:EXP_80:7d7
 B:HIT:EXP_80:7d7
-F:UNIQUE | MALE | CAN_SPEAK | RES_TELE
-F:FORCE_SLEEP | FORCE_MAXHP | SMART |  SUSCEP_FIRE |
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | MOVE_BODY | NAZGUL |
-F:EVIL | UNDEAD | DROP_CHOSEN |
-F:IM_COLD | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_2 | 
-S:TELE_AWAY | BLIND | HOLD | SCARE | CAUSE_3 | BRAIN_SMASH | 
-S:BO_MANA | BA_NETH | S_WRAITH | 
-S:S_KIN | S_HI_UNDEAD | S_HI_DRAGON | S_MONSTERS | ANIM_DEAD
+F:BASH_DOOR
+F:CAN_SPEAK
+F:COLD_BLOOD
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CHOSEN
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:MALE
+F:MOVE_BODY
+F:NAZGUL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_TELE
+F:SMART
+F:SUSCEP_FIRE
+F:UNDEAD
+F:UNIQUE
+S:1_IN_2
+S:BA_NETH
+S:BLIND
+S:BO_MANA
+S:BRAIN_SMASH
+S:CAUSE_3
+S:HOLD
+S:SCARE
+S:S_HI_DRAGON
+S:S_HI_UNDEAD
+S:S_KIN
+S:S_MONSTERS
+S:S_WRAITH
+S:TELE_AWAY
 D:The Chief of the Ringwraiths. A fell being of devastating power. His 
 D:spells are lethal and his combat blows crushingly hard. He moves at 
 D:speed, and commands legions of evil to do his bidding. It is said that he 
@@ -16726,14 +27671,27 @@ E:1:1:1:2:1:1
 O:50:50:0:0
 B:HIT:HURT:8d6
 B:HIT:HURT:8d6
-F:FEMALE |
-F:THUNDERLORD | DROP_SKELETON | DROP_CORPSE |
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | AQUATIC | 
-F:IM_FIRE | REGENERATE | OPEN_DOOR | BASH_DOOR |
-F:RES_TELE | NO_CONF | NO_SLEEP | CAN_FLY | HAS_LITE
-S:1_IN_4 |
-S:BR_FIRE |
-S:BLINK | TELE_AWAY
+F:AQUATIC
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:FEMALE
+F:HAS_LITE
+F:IM_FIRE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:RES_TELE
+F:THUNDERLORD
+S:1_IN_4
+S:BLINK
+S:BR_FIRE
+S:TELE_AWAY
 D:A Thunderlord. Among the weaker breeds, but still dangerous. 
 
 N:956:Blue Thunderlord
@@ -16744,14 +27702,28 @@ E:1:1:1:2:1:1
 O:50:50:0:0
 B:HIT:HURT:8d7
 B:HIT:HURT:8d7
-F:MALE | SMART |
-F:THUNDERLORD | DROP_SKELETON | DROP_CORPSE |
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | AQUATIC | 
-F:IM_FIRE | REGENERATE | OPEN_DOOR | BASH_DOOR |
-F:RES_TELE | NO_CONF | NO_SLEEP | CAN_FLY | HAS_LITE
-S:1_IN_4 |
-S:BR_FIRE |
-S:TPORT | BLINK
+F:AQUATIC
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:HAS_LITE
+F:IM_FIRE
+F:MALE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:RES_TELE
+F:SMART
+F:THUNDERLORD
+S:1_IN_4
+S:BLINK
+S:BR_FIRE
+S:TPORT
 D:A Thunderlord. Among the weaker breeds, but still dangerous. 
 
 N:957:Brown Thunderlord
@@ -16762,14 +27734,28 @@ E:1:1:1:2:1:1
 O:50:50:0:0
 B:HIT:HURT:8d9
 B:HIT:HURT:8d9
-F:MALE | SMART |
-F:THUNDERLORD | DROP_SKELETON | DROP_CORPSE |
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | AQUATIC | 
-F:IM_FIRE | REGENERATE | OPEN_DOOR | BASH_DOOR |
-F:RES_TELE | NO_CONF | NO_SLEEP | CAN_FLY |  HAS_LITE
-S:1_IN_4 |
-S:BR_FIRE |
-S:TPORT | BLINK
+F:AQUATIC
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:HAS_LITE
+F:IM_FIRE
+F:MALE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:RES_TELE
+F:SMART
+F:THUNDERLORD
+S:1_IN_4
+S:BLINK
+S:BR_FIRE
+S:TPORT
 D:A Thunderlord. Beware its flame. 
 
 N:958:Bronze Thunderlord
@@ -16780,14 +27766,29 @@ E:1:1:1:2:1:1
 O:50:50:0:0
 B:HIT:HURT:10d9
 B:HIT:HURT:10d9
-F:MALE | SMART |
-F:THUNDERLORD | DROP_SKELETON | DROP_CORPSE |
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | AQUATIC | 
-F:IM_FIRE | REGENERATE | OPEN_DOOR | BASH_DOOR |
-F:RES_TELE | NO_CONF | NO_SLEEP | CAN_FLY | HAS_LITE
-S:1_IN_4 |
-S:BR_FIRE | BR_TIME |
-S:TPORT | BLINK
+F:AQUATIC
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:HAS_LITE
+F:IM_FIRE
+F:MALE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:RES_TELE
+F:SMART
+F:THUNDERLORD
+S:1_IN_4
+S:BLINK
+S:BR_FIRE
+S:BR_TIME
+S:TPORT
 D:A Thunderlord, mightiest among the males. 
 
 N:959:Gold Thunderlord
@@ -16800,15 +27801,32 @@ B:HIT:HURT:10d9
 B:HIT:HURT:10d9
 B:HIT:HURT:10d9
 B:HIT:HURT:10d9
-F:FEMALE | SMART |
-F:THUNDERLORD | DROP_SKELETON | DROP_CORPSE |
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | AQUATIC | 
-F:IM_FIRE | REGENERATE | OPEN_DOOR | BASH_DOOR |
-F:RES_TELE | NO_CONF | NO_SLEEP | CAN_FLY | HAS_LITE
-S:1_IN_4 |
-S:BR_FIRE | BR_TIME | 
-S:TPORT | BLINK | TELE_TO | TELE_AWAY |
+F:AQUATIC
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:FEMALE
+F:HAS_LITE
+F:IM_FIRE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:REGENERATE
+F:RES_TELE
+F:SMART
+F:THUNDERLORD
+S:1_IN_4
+S:BLINK
+S:BR_FIRE
+S:BR_TIME
 S:S_THUNDERLORD
+S:TELE_AWAY
+S:TELE_TO
+S:TPORT
 D:A Thunderlord, among the queens of their kind. 
 
 N:960:Blood Sprout
@@ -16821,10 +27839,17 @@ B:TOUCH:HURT:3d15
 B:TOUCH:HURT:3d15
 B:TOUCH:HURT:3d15
 B:TOUCH:HURT:3d15
-F:STUPID | EMPTY_MIND | KILL_TREES | 
-F:IM_POIS | IM_ELEC | IM_ACID | IM_COLD |
-F:NO_CONF | NO_SLEEP | NO_FEAR | 
+F:EMPTY_MIND
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_POIS
+F:KILL_TREES
 F:MORTAL
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 S:MULTIPLY
 D:A kind of giant mycorrhiza, corrupted into a carnivore by Morgoth. 
 
@@ -16838,14 +27863,29 @@ B:HIT:HURT:8d6
 B:HIT:HURT:8d6
 B:HIT:UN_BONUS:6d8
 B:HIT:UN_BONUS:6d8
-F:UNIQUE | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE | DROP_SKELETON | 
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:IM_ACID | IM_COLD | IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP | BASEANGBAND
-F:HAS_LITE
-S:1_IN_2 | 
-S:CAUSE_3 | BO_WATE | BO_MANA
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_POIS
+F:MALE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:UNIQUE
+S:1_IN_2
+S:BO_MANA
+S:BO_WATE
+S:CAUSE_3
 D:This sad creature - once a mighty warrior - betrayed his former friends to 
 D:Morgoth's army in return for, he thought, safety for himself and his wife.  
 D:And so he fell under Morgoth's power and became little more than a mindless 
@@ -16859,10 +27899,15 @@ W:19:1:40:64
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:LOSE_STR:4d4
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | CAN_SWIM |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:EMPTY_MIND
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:It is a strange red growth on the dungeon floor; it seems to glow with 
 D:an eerie pink aura. 
 
@@ -16876,11 +27921,22 @@ B:CLAW:POISON:2d8
 B:CLAW:POISON:2d8
 B:BITE:POISON:2d6
 B:BITE:POISON:2d6
-F:DROP_SKELETON | FORCE_MAXHP | FRIENDS |
-F:OPEN_DOOR | BASH_DOOR | HURT_LITE |
-F:ANIMAL | SPIDER | EVIL | IM_POIS | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FRIENDS
+F:HURT_LITE
+F:IM_POIS
+F:OPEN_DOOR
+F:SPIDER
 S:1_IN_4
-S:BO_FIRE | SLOW | HOLD | CAUSE_3 | MISSILE
+S:BO_FIRE
+S:CAUSE_3
+S:HOLD
+S:MISSILE
+S:SLOW
 D:A red arachnid with legs weaving spells in the air. 
 
 N:964:Elder aranea
@@ -16893,12 +27949,27 @@ B:CLAW:POISON:5d8
 B:CLAW:POISON:5d8
 B:BITE:HALLU:5d6
 B:BITE:HALLU:5d6
-F:DROP_SKELETON | FORCE_MAXHP |
-F:OPEN_DOOR | BASH_DOOR | HURT_LITE | SMART |
-F:ANIMAL | SPIDER | EVIL | IM_FIRE | IM_POIS | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:HURT_LITE
+F:IM_FIRE
+F:IM_POIS
+F:OPEN_DOOR
+F:SMART
+F:SPIDER
 S:1_IN_6
-S:SLOW | HOLD | DRAIN_MANA | MIND_BLAST | HEAL | 
-S:BA_FIRE | BO_FIRE | CAUSE_3 | S_SPIDER
+S:BA_FIRE
+S:BO_FIRE
+S:CAUSE_3
+S:DRAIN_MANA
+S:HEAL
+S:HOLD
+S:MIND_BLAST
+S:SLOW
+S:S_SPIDER
 D:A vast, bloated arachnid, master of its brood: among the more terrible of 
 D:Ungoliant's descendants, this is a monster such as those who haunted the dread 
 D:valley of Nan Dungortheb long ago. 
@@ -16911,8 +27982,12 @@ E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:POISON:2d6
 B:STING:BLIND:1d1
-F:WEIRD_MIND | BASH_DOOR | CAN_FLY | 
-F:ANIMAL | IM_POIS | MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:IM_POIS
+F:MORTAL
+F:WEIRD_MIND
 D:It is moving slowly towards you. 
 
 N:966:Wavelord
@@ -16925,13 +28000,34 @@ B:HIT:HURT:8d9
 B:HIT:COLD:8d9
 B:HIT:HURT:8d9
 B:HIT:COLD:8d9
-F:SMART | PET | DROP_CORPSE | FRIENDS | WILD_SHORE | WILD_OCEAN | WILD_TOO | 
-F:IM_POIS | AQUATIC | CAN_SWIM | DROP_USEFUL |
-F:NO_CONF | NO_SLEEP | NO_FEAR | DROP_GOOD | DROP_3D2 |
-F:MORTAL | REGENERATE | TAKE_ITEM | GOOD | SUSCEP_FIRE |
-F:RES_WATE | RES_NEXU | HAS_LITE
+F:AQUATIC
+F:CAN_SWIM
+F:DROP_3D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_USEFUL
+F:FRIENDS
+F:GOOD
+F:HAS_LITE
+F:IM_POIS
+F:MORTAL
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:PET
+F:REGENERATE
+F:RES_NEXU
+F:RES_WATE
+F:SMART
+F:SUSCEP_FIRE
+F:TAKE_ITEM
+F:WILD_OCEAN
+F:WILD_SHORE
+F:WILD_TOO
 S:1_IN_4
-S:BO_WATE | BA_WATE | BO_ICEE
+S:BA_WATE
+S:BO_ICEE
+S:BO_WATE
 D:The Dolphiners came with the Thunderlords from their far home. 
 D:These friendly beings ride their sharks into combat to assist you. 
 
@@ -16941,8 +28037,9 @@ I:110:1d1:30:1:10
 W:10:3:10:0
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:SMART | POSSESSOR | 
-F:BASEANGBAND | NO_CUT
+F:NO_CUT
+F:POSSESSOR
+F:SMART
 D:It does not look that powerful. 
 
 N:968:Bat of Gorgoroth
@@ -16953,11 +28050,23 @@ E:0:1:1:0:1:0
 O:0:0:0:0
 B:BITE:POISON:1d10
 B:CLAW:HURT:1d4
-F:DROP_60 | RAND_25 | MOVE_BODY | CAN_FLY | DROP_CORPSE | 
-F:BASH_DOOR | MOVE_BODY | FRIENDS | WEIRD_MIND | 
-F:ANIMAL | IM_POIS | AI_ANNOY | MORTAL | BASEANGBAND
-S:1_IN_8 | 
-S:SCARE | BR_POIS | BR_DARK
+F:AI_ANNOY
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_60
+F:DROP_CORPSE
+F:FRIENDS
+F:IM_POIS
+F:MORTAL
+F:MOVE_BODY
+F:MOVE_BODY
+F:RAND_25
+F:WEIRD_MIND
+S:1_IN_8
+S:BR_DARK
+S:BR_POIS
+S:SCARE
 D:Fed with horrid meats and grown to enormous size, this slavering creature 
 D:seeks livelier prey. 
 
@@ -16967,10 +28076,19 @@ I:110:1d1:40:250:3
 W:0:4:730:0
 E:0:1:1:2:1:1
 O:0:0:1:0
-F:FEMALE | CAN_SPEAK
-F:FORCE_MAXHP | SPECIAL_GENE | NO_TARGET
-F:NEVER_MOVE | NEVER_BLOW | GOOD | NO_DEATH | RES_TELE
-F:MORTAL | BASEANGBAND | UNIQUE | PET | 
+F:CAN_SPEAK
+F:FEMALE
+F:FORCE_MAXHP
+F:GOOD
+F:MORTAL
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_DEATH
+F:NO_TARGET
+F:PET
+F:RES_TELE
+F:SPECIAL_GENE
+F:UNIQUE
 D:The princess of an unknown kingdom, you need to save her.
 
 N:970:Merton Proudfoot, the lost hobbit
@@ -16979,10 +28097,20 @@ I:110:1d1:40:250:3
 W:0:0:730:0
 E:0:1:1:2:1:1
 O:0:0:0:1
-F:MALE | CAN_SPEAK
-F:FORCE_MAXHP | NEVER_GENE | WILD_ONLY | WILD_TOWN | 
-F:NEVER_MOVE | NEVER_BLOW | GOOD | NO_TARGET
-F:MORTAL | BASEANGBAND | UNIQUE | PET | NO_DEATH
+F:CAN_SPEAK
+F:FORCE_MAXHP
+F:GOOD
+F:MALE
+F:MORTAL
+F:NEVER_BLOW
+F:NEVER_GENE
+F:NEVER_MOVE
+F:NO_DEATH
+F:NO_TARGET
+F:PET
+F:UNIQUE
+F:WILD_ONLY
+F:WILD_TOWN
 D:The poor hobbit got lost in the dreadful maze. 
 
 N:971:The Wight-King of the Barrow-downs
@@ -16995,12 +28123,29 @@ B:HIT:HURT:2d10
 B:WAIL:PARALYZE:2d6
 B:TOUCH:EXP_80:4d8
 B:TOUCH:EXP_80:4d8
-F:SPECIAL_GENE | FORCE_MAXHP | SMART | CAN_SPEAK | 
-F:DROP_4D2 | DROP_2D2 | COLD_BLOOD | UNIQUE | 
-F:CAN_SWIM | CAN_FLY | EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_4 |
-S:HOLD | SCARE | CAUSE_3 | BA_NETH
+F:CAN_FLY
+F:CAN_SPEAK
+F:CAN_SWIM
+F:COLD_BLOOD
+F:DROP_2D2
+F:DROP_4D2
+F:EVIL
+F:FORCE_MAXHP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:SMART
+F:SPECIAL_GENE
+F:UNDEAD
+F:UNIQUE
+S:1_IN_4
+S:BA_NETH
+S:CAUSE_3
+S:HOLD
+S:SCARE
 D:He has lived in the Barrow-Downs for centuries after his first death at the 
 D:hands of the Witch-King of Angmar.  A once loyal captain under the 
 D:Witch-King's command, he now awaits a time when his undead forces shall 
@@ -17014,9 +28159,13 @@ O:50:50:0:0
 B:HIT:HURT:2d6
 B:PUNCH:HURT:1d7
 B:KICK:HURT:1d8
-F:SPECIAL_GENE | SMART | OPEN_DOOR
-F:FORCE_MAXHP | CAN_SWIM | BASEANGBAND | 
-F:NO_SLEEP | NO_CONF
+F:CAN_SWIM
+F:FORCE_MAXHP
+F:NO_CONF
+F:NO_SLEEP
+F:OPEN_DOOR
+F:SMART
+F:SPECIAL_GENE
 D:A great warrior who misplaces his sword once in a while. 
 
 N:973:Experienced possessor (soul)
@@ -17024,8 +28173,9 @@ G:G:D
 I:120:5d5:30:50:10
 W:30:3:10:0
 O:0:0:0:0
-F:SMART | POSSESSOR | 
-F:BASEANGBAND | NO_CUT
+F:NO_CUT
+F:POSSESSOR
+F:SMART
 S:1_IN_9
 S:S_KIN
 D:It does not look that powerful. 
@@ -17035,8 +28185,9 @@ G:G:D
 I:130:10d10:30:100:10
 W:95:3:10:0
 O:0:0:0:0
-F:SMART | POSSESSOR | 
-F:BASEANGBAND | NO_CUT
+F:NO_CUT
+F:POSSESSOR
+F:SMART
 S:1_IN_4
 S:S_KIN
 D:It does not look that powerful. 
@@ -17049,10 +28200,15 @@ W:19:1:40:64
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:POISON:4d4
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | CAN_SWIM |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:EMPTY_MIND
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:It is a strange green growth that likes to live in 
 D:the trees.
 
@@ -17065,13 +28221,21 @@ O:0:0:0:0
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
 B:BITE:HURT:3d5
-F:RAND_50 | RAND_25 |
-F:DROP_60 | ONLY_GOLD | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DRAGON | NO_CONF | 
-F:MORTAL | BASEANGBAND | ATTR_MULTI
-S:MULTIPLY | 
-S:1_IN_6 | BR_CONF
+F:ATTR_MULTI
+F:BASH_DOOR
+F:DRAGON
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:MORTAL
+F:NO_CONF
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:RAND_25
+F:RAND_50
+S:1_IN_6
+S:BR_CONF
+S:MULTIPLY
 D:You thought dragons used eggs, but this worm has the scales, and the bad 
 D:breath, and the fiery eyes, of a real dragon. Its scales glitter in 
 D:a multitude of perplexing and distracting ways. 
@@ -17085,13 +28249,21 @@ O:0:0:0:0
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
 B:BITE:HURT:3d5
-F:RAND_50 | RAND_25 |
-F:DROP_60 | ONLY_GOLD | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DRAGON | NO_STUN | 
-F:MORTAL | BASEANGBAND | ATTR_MULTI
-S:MULTIPLY | 
-S:1_IN_6 | BR_SOUN
+F:ATTR_MULTI
+F:BASH_DOOR
+F:DRAGON
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:MORTAL
+F:NO_STUN
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:RAND_25
+F:RAND_50
+S:1_IN_6
+S:BR_SOUN
+S:MULTIPLY
 D:You thought dragons used eggs, but this worm has the scales, and the bad 
 D:breath, and the fiery eyes, of a real dragon. You can feel the air itself 
 D:vibrating as you near it. 
@@ -17102,11 +28274,20 @@ I:100:1d1:1:1:0
 W:1:1:20:3
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:NEVER_MOVE | UNIQUE |
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | FORCE_DEPTH |
-F:NO_CONF | NO_SLEEP | NO_FEAR |
-F:MORTAL | WYRM_PROTECT | ONLY_DEPTH | JOKEANGBAND | NO_CUT
+F:EMPTY_MIND
+F:FORCE_DEPTH
+F:IM_POIS
+F:JOKEANGBAND
+F:MORTAL
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_DEPTH
+F:STUPID
+F:UNIQUE
+F:WYRM_PROTECT
 D:A small strange growth. It seems to be defenceless. 
 
 # New monster added by furiosity for the Theme module
@@ -17117,10 +28298,15 @@ W:19:1:40:64
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:HALLU:4d4
-F:NEVER_MOVE |
-F:STUPID | EMPTY_MIND | 
-F:IM_POIS | CAN_SWIM |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:EMPTY_MIND
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:STUPID
 D:It is a strange blue growth on the dungeon floor; it seems to glow with 
 D:a puzzling aura. 
 
@@ -17134,12 +28320,32 @@ B:HIT:HURT:8d12
 B:HIT:HURT:8d12
 B:HIT:HURT:8d12
 B:HIT:HURT:8d12
-F:FORCE_SLEEP | FORCE_MAXHP | UNIQUE | CAN_SPEAK | SPECIAL_GENE | AQUATIC | 
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_GOOD | DROP_SKELETON | DROP_CORPSE | 
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR | MOVE_BODY | BASEANGBAND | 
-F:HAS_LITE | CAN_SWIM | MALE | 
-S:1_IN_6 |
-S:HEAL | HASTE | TELE_AWAY | S_MONSTERS | S_KIN
+F:AQUATIC
+F:BASH_DOOR
+F:CAN_SPEAK
+F:CAN_SWIM
+F:DROP_1D2
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MOVE_BODY
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:SPECIAL_GENE
+F:TAKE_ITEM
+F:UNIQUE
+S:1_IN_6
+S:HASTE
+S:HEAL
+S:S_KIN
+S:S_MONSTERS
+S:TELE_AWAY
 D:Last and proudest king of ancient Numenor. Corrupted by power and 
 D:avarice, he fell victim to Sauron's wiles, tried to fight the immortals 
 D:themselves, and condemned Numenor to oblivion. 
@@ -17150,7 +28356,11 @@ I:110:1d1:1:1:1
 W:1:1:0:0
 E:0:0:0:0:0:0
 O:0:0:0:0
-F:AI_ANNOY | NEVER_BLOW | DOPPLEGANGER | JOKEANGBAND | HAS_LITE | 
+F:AI_ANNOY
+F:DOPPLEGANGER
+F:HAS_LITE
+F:JOKEANGBAND
+F:NEVER_BLOW
 D:It looks like you. 
 
 N:982:Marylene, Heartbreakeress of the Netherworld
@@ -17163,21 +28373,78 @@ B:GAZE:PARALYZE:20d15
 B:HIT:EXP_80:20d17
 B:BITE:LOSE_ALL:10d12
 B:TOUCH:INSANITY:12d9
-F:UNIQUE | CAN_SPEAK | ATTR_MULTI | ATTR_ANY | FEMALE |
-F:FORCE_MAXHP | WEIRD_MIND | DROP_CORPSE | DROP_SKELETON |
-F:REFLECTING | AURA_FIRE | AURA_ELEC | AURA_COLD |
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_3D2 | DROP_4D2 | 
-F:DROP_GOOD | DROP_GREAT | RES_NETH | INVISIBLE | 
-F:SMART | KILL_WALL | KILL_BODY | POWERFUL | RES_TELE |
-F:REGENERATE | CAN_FLY | CAN_SWIM | WYRM_PROTECT | 
-F:EVIL | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | NO_STUN | RES_TELE | DEMON |
-F:MORTAL | DG_CURSE | JOKEANGBAND | HAS_LITE
-S:1_IN_1 | 
-S:BR_CHAO | BA_CHAO | BRAIN_SMASH | SHRIEK | BR_CONF | BR_SOUN |
-S:BR_NETH | HASTE | TRAPS | FORGET | BR_DISE | BR_TIME | MIND_BLAST |
-S:HEAL | TPORT | TELE_TO | CAUSE_1 | CAUSE_2 | CAUSE_3 | CAUSE_4 | BLIND |
-S:CONF | SLOW | HOLD | S_UNIQUE
+F:ATTR_ANY
+F:ATTR_MULTI
+F:AURA_COLD
+F:AURA_ELEC
+F:AURA_FIRE
+F:CAN_FLY
+F:CAN_SPEAK
+F:CAN_SWIM
+F:DEMON
+F:DG_CURSE
+F:DROP_1D2
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:DROP_SKELETON
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:JOKEANGBAND
+F:KILL_BODY
+F:KILL_WALL
+F:MORTAL
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:POWERFUL
+F:REFLECTING
+F:REGENERATE
+F:RES_NETH
+F:RES_TELE
+F:RES_TELE
+F:SMART
+F:UNIQUE
+F:WEIRD_MIND
+F:WYRM_PROTECT
+S:1_IN_1
+S:BA_CHAO
+S:BLIND
+S:BRAIN_SMASH
+S:BR_CHAO
+S:BR_CONF
+S:BR_DISE
+S:BR_NETH
+S:BR_SOUN
+S:BR_TIME
+S:CAUSE_1
+S:CAUSE_2
+S:CAUSE_3
+S:CAUSE_4
+S:CONF
+S:FORGET
+S:HASTE
+S:HEAL
+S:HOLD
+S:MIND_BLAST
+S:SHRIEK
+S:SLOW
+S:S_UNIQUE
+S:TELE_TO
+S:TPORT
 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. 
@@ -17194,10 +28461,17 @@ E:0:0:0:0:0:0
 O:0:0:0:0
 B:SPORE:HURT:4d4
 B:SPORE:HURT:4d4
-F:NEVER_MOVE | 
-F:STUPID | EMPTY_MIND | PET | 
-F:IM_FIRE | IM_POIS | CAN_SWIM |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
+F:CAN_SWIM
+F:EMPTY_MIND
+F:IM_FIRE
+F:IM_POIS
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:PET
+F:STUPID
 D:It is a fellow adventurer, mold though it is.
 
 # New monster added by furiosity for the Theme module
@@ -17210,13 +28484,22 @@ E:1:1:1:2:1:1
 O:0:70:25:0
 B:HIT:HURT:1d7
 B:HIT:HURT:1d7
-F:MALE | GOOD | WILD_TOO | DROP_SKELETON | DROP_CORPSE | 
-F:FORCE_SLEEP | 
-F:DROP_60 |
-F:OPEN_DOOR | BASH_DOOR | FRIENDS | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_9 | 
-S:SCARE | CAUSE_2 | DARKNESS | 
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:FRIENDS
+F:GOOD
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
+S:1_IN_9
+S:CAUSE_2
+S:DARKNESS
+S:SCARE
 D:A paladin of short stature. He considers you a spy for Morgoth.
 
 N:985:Bandobras Took
@@ -17227,11 +28510,19 @@ E:1:1:1:2:1:1
 O:25:55:0:20
 B:HIT:HURT:1d8
 B:HIT:HURT:1d8
-F:UNIQUE | MALE | CAN_SPEAK | DROP_CORPSE | DROP_SKELETON | 
-F:FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:UNIQUE
 D:He is a sturdy hobbit who is renowned for his unusual strength and 
 D:vigour. He can prove a troublesome opponent. 
 
@@ -17244,11 +28535,20 @@ O:0:0:0:0
 B:BITE:HURT:2d6
 B:BITE:HURT:2d6
 B:BITE:HURT:2d6
-F:FORCE_SLEEP | WILD_TOO | WILD_SHORE | WILD_SWAMP | CAN_SWIM | 
-F:DROP_CORPSE | DROP_SKELETON | ONLY_GOLD | DROP_2D2 | 
-F:OPEN_DOOR | BASH_DOOR | MOVE_BODY | 
-F:ANIMAL | MORTAL | BASEANGBAND
-S:1_IN_9 | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:MORTAL
+F:MOVE_BODY
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:WILD_SHORE
+F:WILD_TOO
+S:1_IN_9
 S:SCARE
 D:A strange reptilian creature with three heads, guarding its hoard. 
 
@@ -17262,12 +28562,23 @@ B:HIT:HURT:4d6
 B:HIT:HURT:4d6
 B:HIT:HURT:4d6
 B:HIT:HURT:4d6
-F:UNIQUE | MALE | CAN_SPEAK | DROP_CORPSE | DROP_SKELETON | 
-F:FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_10 | S_KIN
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:TAKE_ITEM
+F:UNIQUE
+S:1_IN_10
+S:S_KIN
 D:An evil and cunning man from the East.  Having once sworn allegiance to the 
 D:sons of Feanor, it was Uldor's treachery that turned the tide of the Battle 
 D:of Unnumbered Tears in Morgoth's favour. 
@@ -17282,15 +28593,26 @@ B:KICK:HURT:10d2
 B:KICK:HURT:10d2
 B:KICK:HURT:10d2
 B:KICK:HURT:10d2
-F:MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE | DROP_SKELETON | 
-F:ONLY_ITEM | DROP_1D2 | 
-F:INVISIBLE | OPEN_DOOR | BASH_DOOR | 
-F:IM_ACID | IM_POIS | NO_CONF | NO_SLEEP | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_6 | 
-S:HEAL | 
-S:S_SPIDER | S_ANIMAL
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_POIS
+F:INVISIBLE
+F:MALE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+S:1_IN_6
+S:HEAL
+S:S_ANIMAL
+S:S_SPIDER
 D:An adept at unarmed combat, the mystic strikes with stunning power. He 
 D:can summon help from nature and is able to focus his power to ease any 
 D:pain. 
@@ -17305,14 +28627,36 @@ B:HIT:HURT:4d6
 B:HIT:HURT:4d6
 B:BITE:EXP_80:5d6
 B:BITE:EXP_80:5d6
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:DROP_60 | DROP_4D2 | DROP_GOOD | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | REGENERATE | RES_TELE | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_7 | 
-S:BLIND | HOLD | SCARE | CAUSE_3 | CAUSE_4 | DRAIN_MANA | 
-S:BRAIN_SMASH | DARKNESS | BO_NETH | S_UNDEAD
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_4D2
+F:DROP_60
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:REGENERATE
+F:RES_TELE
+F:UNDEAD
+S:1_IN_7
+S:BLIND
+S:BO_NETH
+S:BRAIN_SMASH
+S:CAUSE_3
+S:CAUSE_4
+S:DARKNESS
+S:DRAIN_MANA
+S:HOLD
+S:SCARE
+S:S_UNDEAD
 D:A terrible robed undead figure, this creature has existed in its 
 D:unlife for many centuries by stealing the life of others. It can 
 D:summon the very shades of its victims from beyond the grave to 
@@ -17328,12 +28672,29 @@ B:HIT:HURT:5d8
 B:HIT:HURT:5d8
 B:HIT:HURT:5d8
 B:HIT:HURT:5d8
-F:UNIQUE | MALE | CAN_SPEAK | DROP_CORPSE | DROP_SKELETON | 
-F:FORCE_MAXHP | IM_FIRE | IM_COLD | IM_ELEC | SPECIAL_GENE | 
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | DROP_RANDART
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_10 | S_KIN | S_MONSTERS
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_RANDART
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SPECIAL_GENE
+F:TAKE_ITEM
+F:UNIQUE
+S:1_IN_10
+S:S_KIN
+S:S_MONSTERS
 D:A short and swarthy Easterling dressed in black.  He and his three sons 
 D:once openly swore allegiance to the High Elves, but were secretly in the 
 D:pay of Morgoth. 
@@ -17347,15 +28708,26 @@ O:0:0:100:0
 B:HIT:HURT:2d6
 B:HIT:HURT:2d6
 B:HIT:HURT:2d6
-F:MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE | DROP_SKELETON
-F:RES_NETH | RES_NEXU | 
-F:ONLY_ITEM | DROP_1D2 | 
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:TPORT | HOLD | 
-S:S_DEMON | BO_FIRE
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RES_NETH
+F:RES_NEXU
+F:SMART
+S:1_IN_2
+S:BO_FIRE
+S:HOLD
+S:S_DEMON
+S:TPORT
 D:A figure twisted by evil standing in robes of deepest crimson. 
 
 N:992:Ungorrog
@@ -17368,14 +28740,30 @@ B:HIT:HURT:3d4
 B:STING:POISON:3d4
 B:SPIT:FIRE:3d4
 B:SPIT:ELEC:3d4
-F:FORCE_SLEEP | FORCE_MAXHP | ESCORTS | 
-F:ONLY_ITEM | DROP_GREAT | AURA_FIRE | AURA_ELEC | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | 
-F:EVIL | DEMON | IM_FIRE | NO_CONF | NO_SLEEP | NONLIVING 
-F:BASEANGBAND
-S:1_IN_9 | 
-S:BLIND | CONF | SCARE | HOLD 
-S:S_DEMON | BO_COLD | BO_ACID
+F:AURA_ELEC
+F:AURA_FIRE
+F:BASH_DOOR
+F:DEMON
+F:DROP_GREAT
+F:ESCORTS
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_FIRE
+F:NONLIVING
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+S:1_IN_9
+S:BLIND
+S:BO_ACID
+S:BO_COLD
+S:CONF
+S:HOLD
+S:SCARE
+S:S_DEMON
 D:The most powerful of the spider demons, Morgoth's corrupted 
 D:spiders. It looks like a huge bloated spider, with claws 
 D:that sparkle with all the elements. 
@@ -17390,13 +28778,24 @@ B:HIT:HURT:3d4
 B:STING:POISON:3d4
 B:SPIT:ELEC:3d4
 B:CRUSH:HURT:6d8
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_90 | AURA_ELEC | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | IM_ELEC | 
-F:EVIL | DEMON | IM_FIRE | NO_CONF | NO_SLEEP | NONLIVING | 
-F:BASEANGBAND
-S:1_IN_9 | 
-S:BLIND | CONF | 
+F:AURA_ELEC
+F:BASH_DOOR
+F:DEMON
+F:DROP_90
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ELEC
+F:IM_FIRE
+F:NONLIVING
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+S:1_IN_9
+S:BLIND
+S:CONF
 D:One of the spider demons, spawn of Ungoliant. It looks like 
 D:a giant bloated spider surrounded by blazing sparks.
 
@@ -17410,14 +28809,22 @@ B:HIT:HURT:3d4
 B:STING:POISON:3d4
 B:SPIT:FIRE:3d4
 B:HIT:LOSE_STR:3d4
-F:FORCE_SLEEP | FORCE_MAXHP | AURA_FIRE |
-F:ONLY_ITEM | DROP_1D2 | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | 
-F:EVIL | DEMON | 
-F:IM_FIRE | NO_CONF | NO_SLEEP | 
-F:BASEANGBAND
-S:1_IN_9 | 
-S:BLIND | CONF | 
+F:AURA_FIRE
+F:BASH_DOOR
+F:DEMON
+F:DROP_1D2
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_FIRE
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+S:1_IN_9
+S:BLIND
+S:CONF
 D:One of the spider demons, spawn of Ungoliant. It looks like 
 D:a giant bloated spider glowing with malevolent flames.
 
@@ -17431,14 +28838,25 @@ B:HIT:HURT:3d6
 B:HIT:HURT:3d6
 B:HIT:HURT:3d6
 B:HIT:HURT:3d6
-F:FEMALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_1D2 | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | 
-F:EVIL | DEMON | IM_FIRE | NO_CONF | NO_SLEEP | NONLIVING | 
-F:BASEANGBAND
-S:1_IN_9 | 
-S:BLIND | CAUSE_2 | SCARE | 
+F:BASH_DOOR
+F:DEMON
+F:DROP_1D2
+F:DROP_CORPSE
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_FIRE
+F:NONLIVING
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+S:1_IN_9
+S:BLIND
+S:CAUSE_2
+S:SCARE
 S:S_DEMON
 D:A corrupted Maia of female form, whose skin drips with blood. 
 D:It has several arms, and fights with three grim daggers.
@@ -17453,14 +28871,31 @@ B:HIT:FIRE:4d12
 B:HIT:FIRE:4d12
 B:CRUSH:HURT:3d12
 B:TOUCH:UN_POWER
-F:FORCE_SLEEP | FORCE_MAXHP | AURA_FIRE | KILL_WALL | 
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_GOOD | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DEMON | IM_FIRE | NO_CONF | NO_SLEEP | NONLIVING | 
-F:BASEANGBAND | HAS_LITE
-S:1_IN_4 | 
-S:BLIND | CONF | SCARE | HASTE | 
-S:BR_FIRE | 
+F:AURA_FIRE
+F:BASH_DOOR
+F:DEMON
+F:DROP_1D2
+F:DROP_2D2
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_FIRE
+F:KILL_WALL
+F:MOVE_BODY
+F:NONLIVING
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+S:1_IN_4
+S:BLIND
+S:BR_FIRE
+S:CONF
+S:HASTE
+S:SCARE
 S:S_DEMON
 D:The greatest of the demons, potent in both magical might 
 D:and sheer battle power. This corrupted Maia's form is 
@@ -17476,16 +28911,30 @@ B:KICK:HURT:10d2
 B:KICK:HURT:10d2
 B:HIT:POISON:20d1
 B:HIT:PARALYZE:15d1
-F:MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE | DROP_SKELETON | 
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | 
-F:INVISIBLE | OPEN_DOOR | BASH_DOOR | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:HEAL | 
-S:S_SPIDER | S_ANIMALS
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:MALE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+S:1_IN_3
+S:HEAL
+S:S_ANIMALS
+S:S_SPIDER
 D:A lord of all that is natural, skilled in the mystic ways. He is a master 
 D:of martial arts and is at one with nature, able to summon help from the 
 D:wild if need be.
@@ -17500,15 +28949,31 @@ B:KICK:HURT:20d2
 B:KICK:HURT:10d2
 B:HIT:POISON:20d1
 B:HIT:PARALYZE:15d1
-F:MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE | DROP_SKELETON | 
-F:ONLY_ITEM | DROP_4D2 | 
-F:INVISIBLE | OPEN_DOOR | BASH_DOOR | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:HEAL | MIND_BLAST | 
-S:S_SPIDER | S_HOUND | S_ANIMALS
+F:BASH_DOOR
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:MALE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+S:1_IN_2
+S:HEAL
+S:MIND_BLAST
+S:S_ANIMALS
+S:S_HOUND
+S:S_SPIDER
 D:He is one of the few true masters of the art, being extremely skillful in 
 D:all forms of unarmed combat and controlling the world's natural creatures 
 D:with disdainful ease. 
@@ -17522,15 +28987,32 @@ O:0:50:50:0
 B:HIT:HURT:3d4
 B:HIT:UN_BONUS:3d4
 B:HIT:UN_POWER:1d5
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | 
-F:EVIL | DEMON | NO_CONF | NO_SLEEP | 
-F:IM_FIRE | IM_POIS | IM_ELEC | IM_COLD | 
-F:BASEANGBAND
-S:1_IN_9 | 
-S:BLIND | CONF | SCARE | HASTE | HEAL | S_KIN
-S:TRAPS | SLOW | HOLD | SHRIEK | BLINK 
+F:BASH_DOOR
+F:DEMON
+F:DROP_60
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+S:1_IN_9
+S:BLIND
+S:BLINK
+S:CONF
+S:HASTE
+S:HEAL
+S:HOLD
+S:SCARE
+S:SHRIEK
+S:SLOW
+S:S_KIN
 D:A twisted elemental spirit, this creature serves the Dark with 
 D:perversions of the magics of nature. 
 
@@ -17541,10 +29023,20 @@ W:4:1:900:18
 E:1:1:1:2:1:1
 O:0:50:0:30
 B:HIT:HURT:1d6
-F:DROP_60 | WILD_TOO |
-F:OPEN_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND | HAS_LITE | NO_CONF | NO_SLEEP
-S:1_IN_9 | BLIND | SLOW | CONF | SCARE
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:OPEN_DOOR
+F:WILD_TOO
+S:1_IN_9
+S:BLIND
+S:CONF
+S:SCARE
+S:SLOW
 D:A novice in the arts of mind over matter.
 
 # New monster added by furiosity for the Theme module
@@ -17557,13 +29049,23 @@ E:1:1:1:2:1:1
 O:0:70:25:0
 B:HIT:HURT:3d8
 B:HIT:HURT:3d5
-F:MALE | EVIL | WILD_TOO | DROP_SKELETON | DROP_CORPSE | 
-F:FORCE_SLEEP | 
-F:DROP_60 |
-F:OPEN_DOOR | BASH_DOOR | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_5 | 
-S:HASTE | BLIND | CONF | DARKNESS | MISSILE
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:WILD_TOO
+S:1_IN_5
+S:BLIND
+S:CONF
+S:DARKNESS
+S:HASTE
+S:MISSILE
 D:A lord among gnomes.
 
 N:1002:Great Worm of Perplexity
@@ -17576,13 +29078,30 @@ B:CLAW:HURT:4d12
 B:CLAW:HURT:4d12
 B:BITE:CONFUSE:6d14
 B:BITE:CONFUSE:6d14
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:SMART | BASH_DOOR | POWERFUL | MOVE_BODY | DROP_CORPSE | 
-F:EVIL | DRAGON | NO_CONF | NO_SLEEP | BASEANGBAND | HAS_LITE | ATTR_MULTI
-S:1_IN_4 | 
-S:BLIND | CONF | SCARE | 
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:POWERFUL
+F:SMART
+S:1_IN_4
+S:BLIND
 S:BR_CONF
+S:CONF
+S:SCARE
 D:A dragon of great size and power.  Its polished bronze scales reflect the 
 D:light in strange and confusing patterns, and you find it hard to keep your 
 D:mind on the job of fighting for your life. 
@@ -17599,14 +29118,24 @@ B:KICK:HURT:8d2
 B:KICK:HURT:8d2
 B:KICK:HURT:8d2
 B:KICK:HURT:8d2
-F:MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE | DROP_SKELETON | 
-F:ONLY_ITEM | DROP_1D2 | 
-F:INVISIBLE | OPEN_DOOR | BASH_DOOR | 
-F:IM_ACID | IM_POIS | NO_CONF | NO_SLEEP | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_6 | 
-S:HEAL | 
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_POIS
+F:INVISIBLE
+F:MALE
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+S:1_IN_6
+S:HEAL
 S:S_ANIMAL
 D:A mystic of short stature. He is quite skilled at unarmed 
 D:combat and even has some control over the forces of nature.
@@ -17621,14 +29150,30 @@ B:CLAW:HURT:4d12
 B:CLAW:HURT:4d12
 B:BITE:HURT:6d14
 B:BITE:HURT:6d14
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
-F:BASH_DOOR | POWERFUL | MOVE_BODY | DROP_CORPSE | 
-F:EVIL | DRAGON | NO_CONF | NO_SLEEP | NO_STUN | BASEANGBAND | HAS_LITE
 F:ATTR_MULTI
-S:1_IN_4 | 
-S:BLIND | CONF | SCARE | 
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:POWERFUL
+S:1_IN_4
+S:BLIND
 S:BR_SOUN
+S:CONF
+S:SCARE
 D:A dragon of gigantic proportions, with destructive abilities to match.  The
 D:sheer loudness of its roar leaves you stunned and unable to think clearly 
 D:enough to defend yourself adequately. 
@@ -17640,8 +29185,11 @@ W:4:1:200:1
 E:0:1:0:2:1:0
 O:0:0:0:0
 B:BITE:EAT_LITE:1d2
-F:RAND_25 | CAN_SWIM | ANIMAL | 
-F:DROP_CORPSE | MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_SWIM
+F:DROP_CORPSE
+F:MORTAL
+F:RAND_25
 S:MULTIPLY
 D:It is about three feet long with large teeth.  As the light of your lamp falls 
 D:on it, it seems to grow stronger. 
@@ -17656,9 +29204,15 @@ B:CLAW:HURT:3d2
 B:CLAW:HURT:3d2
 B:BITE:DISEASE:4d2
 B:BITE:DISEASE:4d2
-F:UNIQUE | ESCORT | ESCORTS | FORCE_MAXHP |
-F:BASH_DOOR | ANIMAL | NO_CONF | NO_SLEEP
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:ESCORT
+F:ESCORTS
+F:FORCE_MAXHP
+F:MORTAL
+F:NO_CONF
+F:NO_SLEEP
+F:UNIQUE
 D:A massive rat. He's the leader of the pack. 
 
 # New monster added by furiosity for the Theme module
@@ -17671,13 +29225,21 @@ E:1:1:1:2:1:1
 O:0:20:80:0
 B:HIT:HURT:2d3
 B:HIT:HURT:2d3
-F:MALE | GOOD |
-F:FORCE_SLEEP | 
-F:DROP_1D2 | 
-F:SMART | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:HEAL | SCARE | CAUSE_2 |
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:SMART
+S:1_IN_3
+S:CAUSE_2
+S:HEAL
+S:SCARE
 S:S_MONSTER
 D:A priest of short stature. He looks comically solemn.
 
@@ -17688,8 +29250,12 @@ W:14:1:100:3
 E:0:0:0:0:0:0
 O:0:0:0:0
 B:BITE:HURT:1d2
-F:RAND_50 | RAND_25 | CAN_FLY | WEIRD_MIND | 
-F:ANIMAL | MORTAL | BASEANGBAND
+F:ANIMAL
+F:CAN_FLY
+F:MORTAL
+F:RAND_25
+F:RAND_50
+F:WEIRD_MIND
 S:MULTIPLY
 D:It is an evil relative of the moth, native to marshlands.
 
@@ -17700,13 +29266,32 @@ W:34:5:0:1200
 E:0:0:0:0:0:0
 O:0:0:100:0
 B:HIT:HURT:5d5
-F:UNIQUE | MALE | CAN_SPEAK
-F:FORCE_MAXHP | UNDEAD | NO_CONF | NO_SLEEP | REGENERATE | NO_STUN |
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | PASS_WALL | 
-F:MORTAL | JOKEANGBAND | HAS_LITE | NO_CUT
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:HAS_LITE
+F:JOKEANGBAND
+F:MALE
+F:MORTAL
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:PASS_WALL
+F:REGENERATE
+F:TAKE_ITEM
+F:UNDEAD
+F:UNIQUE
 S:1_IN_6
-S:BR_FIRE | HOLD | CONF | SCARE | MIND_BLAST
+S:BR_FIRE
+S:CONF
+S:HOLD
+S:MIND_BLAST
+S:SCARE
 D:He's back from the grave for vengeance on those who 
 D:burnt him. He has no mercy for those in his way. 
 
@@ -17717,15 +29302,33 @@ W:36:2:1500:1200
 E:1:1:1:2:1:1
 O:20:20:20:20
 B:HIT:HURT:3d8
-F:UNIQUE | MALE | CAN_SPEAK | ATTR_MULTI | 
-F:FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | DROP_SKELETON | DROP_CORPSE
-F:OPEN_DOOR | BASH_DOOR | RAND_25 |
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR
-F:JOKEANGBAND | HAS_LITE
-S:1_IN_4 | 
-S:TELE_TO | SHRIEK | SCARE
+F:ATTR_MULTI
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_2D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_SKELETON
+F:FORCE_MAXHP
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:JOKEANGBAND
+F:MALE
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:RAND_25
+F:UNIQUE
+S:1_IN_4
+S:SCARE
+S:SHRIEK
+S:TELE_TO
 D:Once a powerful adventurer, this poor fighter has seen a few too many 
 D:software bugs in his time. Any shred of lucidity is long gone, but 
 D:he still remains dangerous. He wanders aimlessly through the dungeon 
@@ -17744,12 +29347,20 @@ B:HIT:HURT:1d7
 B:HIT:HURT:2d3
 B:HIT:EAT_GOLD:5d5
 B:HIT:EAT_ITEM:5d6
-F:MALE | 
-F:DROP_90 | DROP_2D2 | DROP_SKELETON | DROP_CORPSE | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_2D2
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:TAKE_ITEM
 S:1_IN_6
-S:TRAPS | ARROW_2 | BLINK
+S:ARROW_2
+S:BLINK
 D:A little gnome, fast and stealthy. He is eyeing your backpack.
 
 N:1012:Vermicious Knid
@@ -17761,11 +29372,20 @@ O:40:30:20:10
 B:TOUCH:TERRIFY:4d6
 B:CRAWL:HURT:4d6
 B:ENGULF:HURT:4d6
-F:FRIENDS | EVIL | IM_COLD | SMART |
-F:COLD_BLOOD | NO_FEAR | WEIRD_MIND |
-F:OPEN_DOOR | ONLY_ITEM | DROP_2D2 | HURT_ROCK | 
-F:NONLIVING | 
-F:JOKEANGBAND | NO_CUT
+F:COLD_BLOOD
+F:DROP_2D2
+F:EVIL
+F:FRIENDS
+F:HURT_ROCK
+F:IM_COLD
+F:JOKEANGBAND
+F:NONLIVING
+F:NO_CUT
+F:NO_FEAR
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:SMART
+F:WEIRD_MIND
 D:An amorphous shape that looks like wet grey clay with two pale eyes. 
 D:It is totally silent as it oozes towards you.  
 
@@ -17779,13 +29399,31 @@ B:HIT:UN_BONUS:8d8
 B:HIT:UN_BONUS:8d8
 B:HIT:LOSE_STR:6d6
 B:HIT:LOSE_STR:6d6
-F:FORCE_SLEEP | FORCE_MAXHP | EMPTY_MIND | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | IM_FIRE | IM_ELEC | RES_TELE | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | BASEANGBAND | NO_CUT
-S:1_IN_3 | 
-S:TELE_TO | CAUSE_4 | DRAIN_MANA | 
-S:BRAIN_SMASH | BA_NETH | S_HI_UNDEAD
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:RES_TELE
+F:UNDEAD
+S:1_IN_3
+S:BA_NETH
+S:BRAIN_SMASH
+S:CAUSE_4
+S:DRAIN_MANA
+S:S_HI_UNDEAD
+S:TELE_TO
 D:A skeletal form, black as night, constructed from the bones of its 
 D:previous victims. 
 
@@ -17799,10 +29437,17 @@ E:1:1:1:2:1:1
 O:0:100:0:0
 B:HIT:HURT:4d3
 B:HIT:HURT:4d3
-F:MALE | 
-F:DROP_1D2 | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE | KILL_BODY | 
+F:BASH_DOOR
+F:DROP_1D2
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:HAS_LITE
+F:KILL_BODY
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:TAKE_ITEM
 D:A warrior of short stature but great ferocity. 
 
 N:1015:Bronze golem
@@ -17815,11 +29460,29 @@ B:HIT:HURT:10d10
 B:HIT:HURT:10d10
 B:HIT:HURT:10d10
 B:HIT:HURT:10d10
-F:FORCE_MAXHP | FORCE_SLEEP | EMPTY_MIND | COLD_BLOOD | 
-F:OPEN_DOOR | BASH_DOOR | IM_FIRE | IM_ELEC | IM_POIS | RES_TELE | 
-F:NO_CONF | NO_SLEEP | NO_STUN | NO_FEAR | NONLIVING | BASEANGBAND | NO_CUT
-S:1_IN_3 |
-S:BO_PLAS | BA_FIRE | BR_FIRE | BA_ELEC | S_HI_DEMON | TELE_TO
+F:BASH_DOOR
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:OPEN_DOOR
+F:RES_TELE
+S:1_IN_3
+S:BA_ELEC
+S:BA_FIRE
+S:BO_PLAS
+S:BR_FIRE
+S:S_HI_DEMON
+S:TELE_TO
 D:A gigantic four-armed animated bronze statue, glowing with great heat. 
 
 # New monster added by furiosity for the Theme module
@@ -17831,14 +29494,20 @@ W:14:2:900:50
 E:1:1:1:2:1:1
 O:20:0:80:0
 B:HIT:HURT:1d5
-F:MALE | 
-F:FORCE_SLEEP | DROP_60 | 
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | 
-F:EVIL | MORTAL | BASEANGBAND | HAS_LITE
-S:1_IN_4 | 
-S:DARKNESS | BO_COLD | 
-S:S_MONSTER
+F:BASH_DOOR
+F:DROP_60
+F:DROP_SKELETON
+F:EVIL
+F:FORCE_SLEEP
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+S:1_IN_4
+S:BO_COLD
+S:DARKNESS
 S:MULTIPLY
+S:S_MONSTER
 D:A short little gnome, waving his hands in the air.
 
 # New monster added by furiosity for the Theme module
@@ -17852,9 +29521,18 @@ B:TOUCH:EAT_ITEM:5d5
 B:TOUCH:EAT_ITEM:5d5
 B:TOUCH:EAT_ITEM:5d5
 B:TOUCH:EAT_ITEM:5d5
-F:JOKEANGBAND | WILD_TOO | WILD_GRASS | WILD_WOOD | 
-F:MORTAL | GOOD | HAS_LITE | FORCE_SLEEP | 
-F:DROP_60 | DROP_GREAT | OPEN_DOOR | RES_TELE | 
+F:DROP_60
+F:DROP_GREAT
+F:FORCE_SLEEP
+F:GOOD
+F:HAS_LITE
+F:JOKEANGBAND
+F:MORTAL
+F:OPEN_DOOR
+F:RES_TELE
+F:WILD_GRASS
+F:WILD_TOO
+F:WILD_WOOD
 D:A funny, smiling humanoid of short stature, with a pony-
 D:tail and an enormous pouch. He is very polite, but also 
 D:very curious. So curious, in fact, that the contents of 
@@ -17868,9 +29546,19 @@ I:110:9d8:10:10:3
 W:15:3:1000:0
 B:HIT:HURT:5d8
 B:HIT:HURT:5d8
-F:BASEANGBAND | WILD_TOO | WILD_GRASS | WILD_WOOD | 
-F:MORTAL | GOOD | HAS_LITE | FORCE_SLEEP | NO_FEAR | 
-F:PET | FRIENDS | DROP_60 | OPEN_DOOR | BASH_DOOR | 
+F:BASH_DOOR
+F:DROP_60
+F:FORCE_SLEEP
+F:FRIENDS
+F:GOOD
+F:HAS_LITE
+F:MORTAL
+F:NO_FEAR
+F:OPEN_DOOR
+F:PET
+F:WILD_GRASS
+F:WILD_TOO
+F:WILD_WOOD
 D:A fellow adventurer of rather short stature.
 
 # New monster added by furiosity for the Theme module
@@ -17884,9 +29572,17 @@ B:BITE:HURT:1d8
 B:CLAW:HURT:1d8
 B:CLAW:HURT:1d8
 B:BITE:HURT:1d6
-F:BASH_DOOR | WILD_TOO | WILD_GRASS | WILD_WOOD | WILD_MOUNTAIN | 
-F:ANIMAL | DROP_SKELETON | DROP_CORPSE | MORTAL | BASEANGBAND | 
-F:IM_POIS | CAN_FLY | 
+F:ANIMAL
+F:BASH_DOOR
+F:CAN_FLY
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:IM_POIS
+F:MORTAL
+F:WILD_GRASS
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:A large cat that prefers to dwell in the trees and is very 
 D:adept at navigating through the thickest forests while it 
 D:stalks its prey.
@@ -17901,9 +29597,18 @@ O:0:0:0:0
 B:CLAW:HURT:1d8
 B:CLAW:HURT:1d8
 B:BITE:HURT:1d6
-F:BASH_DOOR | WILD_TOO | WILD_GRASS | WILD_WOOD | WILD_MOUNTAIN | 
-F:ANIMAL | DROP_SKELETON | DROP_CORPSE | MORTAL | BASEANGBAND |
-F:EMPTY_MIND | KILL_BODY | HURT_LITE | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EMPTY_MIND
+F:HURT_LITE
+F:KILL_BODY
+F:MORTAL
+F:WILD_GRASS
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:A huge dark shape pouncing on you from the darkness, this cat 
 D:mostly hunts at night and is extremely good at evading detection. 
 
@@ -17917,9 +29622,15 @@ O:0:0:0:0
 B:CLAW:HURT:1d8
 B:CLAW:HURT:1d8
 B:BITE:HURT:1d6
-F:BASH_DOOR | WILD_TOO | WILD_GRASS | WILD_WOOD | WILD_MOUNTAIN | 
-F:ANIMAL | DROP_SKELETON | DROP_CORPSE | 
-F:MORTAL | BASEANGBAND
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:MORTAL
+F:WILD_GRASS
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:A large cat with sleek brown spotted fur. It is fast and lithe,
 D:and none escape its notice. 
 
@@ -17933,9 +29644,21 @@ O:0:0:0:0
 B:CLAW:HURT:1d8
 B:CLAW:HURT:1d8
 B:BITE:HURT:1d6
-F:BASH_DOOR | WILD_TOO | WILD_GRASS | WILD_WOOD | WILD_MOUNTAIN | 
-F:ANIMAL | DROP_SKELETON | DROP_CORPSE | SMART | PET | 
-F:MORTAL | JOKEANGBAND | IM_POIS | WEIRD_MIND | INVISIBLE | 
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:IM_POIS
+F:INVISIBLE
+F:JOKEANGBAND
+F:MORTAL
+F:PET
+F:SMART
+F:WEIRD_MIND
+F:WILD_GRASS
+F:WILD_MOUNTAIN
+F:WILD_TOO
+F:WILD_WOOD
 D:A large cat with a huge smile. In fact, sometimes the smile 
 D:is all you see of it.
 
@@ -17948,13 +29671,21 @@ O:0:0:0:0
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
 B:BITE:HURT:3d5
-F:RAND_50 | RAND_25 |
-F:DROP_60 | ONLY_GOLD | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DRAGON | IM_ELEC | 
-F:MORTAL | BASEANGBAND | ATTR_MULTI
-S:MULTIPLY | 
-S:1_IN_6 | BR_ELEC
+F:ATTR_MULTI
+F:BASH_DOOR
+F:DRAGON
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:IM_ELEC
+F:MORTAL
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:RAND_25
+F:RAND_50
+S:1_IN_6
+S:BR_ELEC
+S:MULTIPLY
 D:You thought dragons used eggs, but this worm has the scales, and the bad  
 D:breath, and the fiery eyes, of a real dragon. Sparks fly from its jaws.
 
@@ -17967,13 +29698,21 @@ O:0:0:0:0
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
 B:BITE:HURT:3d5
-F:RAND_50 | RAND_25 |
-F:DROP_60 | ONLY_GOLD | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DRAGON | IM_COLD | 
-F:MORTAL | BASEANGBAND | ATTR_MULTI
-S:MULTIPLY | 
-S:1_IN_6 | BR_COLD
+F:ATTR_MULTI
+F:BASH_DOOR
+F:DRAGON
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:IM_COLD
+F:MORTAL
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:RAND_25
+F:RAND_50
+S:1_IN_6
+S:BR_COLD
+S:MULTIPLY
 D:You thought dragons used eggs, but this worm has the scales, and the bad  
 D:breath, and the fiery eyes, of a real dragon. Its breath condenses in the air.
 
@@ -17986,13 +29725,21 @@ O:0:0:0:0
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
 B:BITE:HURT:3d5
-F:RAND_50 | RAND_25 |
-F:DROP_60 | ONLY_GOLD | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DRAGON | IM_POIS | 
-F:MORTAL | BASEANGBAND | ATTR_MULTI
-S:MULTIPLY | 
-S:1_IN_6 | BR_POIS
+F:ATTR_MULTI
+F:BASH_DOOR
+F:DRAGON
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:IM_POIS
+F:MORTAL
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:RAND_25
+F:RAND_50
+S:1_IN_6
+S:BR_POIS
+S:MULTIPLY
 D:You thought dragons used eggs, but this worm has the scales, and the bad 
 D:breath, and the fiery eyes, of a real dragon. You can smell foul gases 
 D:on its breath.
@@ -18006,13 +29753,21 @@ O:0:0:0:0
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
 B:BITE:HURT:3d5
-F:RAND_50 | RAND_25 |
-F:DROP_60 | ONLY_GOLD | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DRAGON | IM_ACID | 
-F:MORTAL | BASEANGBAND | ATTR_MULTI
-S:MULTIPLY | 
-S:1_IN_6 | BR_ACID
+F:ATTR_MULTI
+F:BASH_DOOR
+F:DRAGON
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:IM_ACID
+F:MORTAL
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:RAND_25
+F:RAND_50
+S:1_IN_6
+S:BR_ACID
+S:MULTIPLY
 D:You thought dragons used eggs, but this worm has the scales, and the bad  
 D:breath, and the fiery eyes, of a real dragon. Acidic drool drips from its jaws.
 
@@ -18025,13 +29780,21 @@ O:0:0:0:0
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
 B:BITE:HURT:3d5
-F:RAND_50 | RAND_25 |
-F:DROP_60 | ONLY_GOLD | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DRAGON | IM_FIRE | 
-F:MORTAL | BASEANGBAND | ATTR_MULTI
-S:MULTIPLY | 
-S:1_IN_6 | BR_FIRE
+F:ATTR_MULTI
+F:BASH_DOOR
+F:DRAGON
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:IM_FIRE
+F:MORTAL
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:RAND_25
+F:RAND_50
+S:1_IN_6
+S:BR_FIRE
+S:MULTIPLY
 D:You thought dragons used eggs, but this worm has the scales, and the bad  
 D:breath, and the fiery eyes, of a real dragon. Smoke comes from its mouth. 
 
@@ -18044,13 +29807,29 @@ O:0:0:0:0
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
 B:BITE:HURT:3d5
-F:RAND_50 | RAND_25 | ATTR_MULTI | 
-F:DROP_60 | ONLY_GOLD | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | DRAGON | IM_ELEC | IM_FIRE | IM_ACID | IM_COLD | IM_POIS | 
-F:MORTAL | BASEANGBAND
-S:MULTIPLY | 
-S:1_IN_6 | BR_ELEC | BR_COLD | BR_FIRE | BR_ACID | BR_POIS
+F:ATTR_MULTI
+F:BASH_DOOR
+F:DRAGON
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:RAND_25
+F:RAND_50
+S:1_IN_6
+S:BR_ACID
+S:BR_COLD
+S:BR_ELEC
+S:BR_FIRE
+S:BR_POIS
+S:MULTIPLY
 D:You thought dragons used eggs, but this worm has the scales, and the bad 
 D:breath, and the fiery eyes, of a real dragon. Its scales shimmer different 
 D:colours as you watch. 
@@ -18065,9 +29844,13 @@ B:BUTT:HURT:4d6
 B:BUTT:HURT:4d6
 B:BUTT:HURT:3d6
 B:BUTT:HURT:3d6
-F:BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:EVIL | UNIQUE | SPECIAL_GENE | 
-F:MORTAL | BASEANGBAND
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:EVIL
+F:MORTAL
+F:SPECIAL_GENE
+F:UNIQUE
 D:It is a cross between a human and a bull. The last of its kind, 
 D:it guards its treasure jealously. 
 
@@ -18081,11 +29864,32 @@ B:CLAW:ACID:5d4
 B:CLAW:POISON:5d4
 B:BITE:FIRE:5d4
 B:BITE:ELEC:5d4
-F:FORCE_MAXHP | DROP_60 | ONLY_ITEM | DROP_GREAT | DROP_GOOD | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | FEMALE | POWERFUL | SPECIAL_GENE | REFLECTING |
-F:EVIL | ANIMAL | IM_ELEC | IM_FIRE | IM_ACID | IM_POIS | ESCORT | 
-F:MORTAL | BASEANGBAND | EMPTY_MIND | UNIQUE | NO_CONF
-S:1_IN_2 | BR_POIS | S_KIN
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:EMPTY_MIND
+F:ESCORT
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:IM_ACID
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:NO_CONF
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:REFLECTING
+F:SPECIAL_GENE
+F:UNIQUE
+S:1_IN_2
+S:BR_POIS
+S:S_KIN
 D:Queen and Mother of the sandworms, fear her and her prolific children. 
 
 N:1031:Sandworm
@@ -18098,10 +29902,16 @@ B:CLAW:POISON:4d4
 B:CLAW:POISON:4d4
 B:CLAW:POISON:4d4
 B:BITE:HURT:5d5
-F:RAND_25 |
-F:FORCE_MAXHP | DROP_CORPSE | POWERFUL | 
-F:EVIL | IM_ELEC | IM_FIRE | IM_POIS | EMPTY_MIND | 
-F:MORTAL | BASEANGBAND
+F:DROP_CORPSE
+F:EMPTY_MIND
+F:EVIL
+F:FORCE_MAXHP
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MORTAL
+F:POWERFUL
+F:RAND_25
 S:MULTIPLY
 D:Offbreed of the Sandworm Queen, it is harmless alone. 
 
@@ -18115,17 +29925,41 @@ B:GAZE:UN_BONUS:10d10
 B:GAZE:TIME:10d10
 B:GAZE:INSANITY:10d10
 B:GAZE:INSANITY:10d5
-F:UNIQUE | SPECIAL_GENE | 
-F:FORCE_MAXHP | POWERFUL | 
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT | 
-F:INVISIBLE | COLD_BLOOD | PASS_WALL | WEIRD_MIND | 
-F:EVIL | UNDEAD | IM_COLD | IM_FIRE | IM_ACID | IM_ELEC | AURA_COLD |
-F:IM_POIS | RES_NETH | BASEANGBAND | NO_CUT
-S:1_IN_2 | 
-S:S_UNDEAD | S_DEMON | S_DRAGON | 
-S:S_UNIQUE | S_WRAITH | S_HI_DEMON | 
-S:S_HI_UNDEAD | S_HI_DRAGON | S_KIN | 
-S:BR_DISE | BA_NETH
+F:AURA_COLD
+F:COLD_BLOOD
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_MAXHP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:INVISIBLE
+F:NO_CUT
+F:ONLY_ITEM
+F:PASS_WALL
+F:POWERFUL
+F:RES_NETH
+F:SPECIAL_GENE
+F:UNDEAD
+F:UNIQUE
+F:WEIRD_MIND
+S:1_IN_2
+S:BA_NETH
+S:BR_DISE
+S:S_DEMON
+S:S_DRAGON
+S:S_HI_DEMON
+S:S_HI_DRAGON
+S:S_HI_UNDEAD
+S:S_KIN
+S:S_UNDEAD
+S:S_UNIQUE
+S:S_WRAITH
 D:A disembodied and barely sentient mind, Tik'srvzllat floated 
 D:through the void for eons before being awakened by sorcery, pulled 
 D:into the nether realm, and shaped into the being you see before you.  
@@ -18143,13 +29977,37 @@ B:HIT:INSANITY:5d6
 B:HIT:INSANITY:6d6
 B:HIT:INSANITY:7d6
 B:HIT:INSANITY:6d6
-F:COLD_BLOOD | EMPTY_MIND | KILL_WALL | FORCE_MAXHP | POWERFUL | SPECIAL_GENE | 
-F:BASH_DOOR | IM_COLD | IM_ACID | IM_FIRE | IM_ELEC | IM_POIS | NONLIVING | 
-F:ESCORTS | ESCORT | UNIQUE | NO_SLEEP | NO_CONF | NO_FEAR | NO_STUN
-F:CHAR_MULTI | CAN_FLY | BASEANGBAND | NO_CUT
+F:BASH_DOOR
+F:CAN_FLY
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:ESCORT
+F:ESCORTS
+F:FORCE_MAXHP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_WALL
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:POWERFUL
+F:SPECIAL_GENE
+F:UNIQUE
 S:1_IN_4
-S:BR_CONF | BR_LITE | BR_DARK | BR_WALL
-S:S_KIN | TELE_LEVEL | SHRIEK
+S:BR_CONF
+S:BR_DARK
+S:BR_LITE
+S:BR_WALL
+S:SHRIEK
+S:S_KIN
+S:TELE_LEVEL
 D:One of the last creations of the Petty-Dwarves of Ludarin, its existence 
 D:explains their destruction. A creation of finest glass, the body of this 
 D:creature bends and amplifies light in a way that makes you unsure of its 
@@ -18166,14 +30024,38 @@ B:HIT:COLD:4d12
 B:HIT:COLD:4d12
 B:CRUSH:HURT:3d12
 B:TOUCH:UN_POWER
-F:UNIQUE | FORCE_SLEEP | FORCE_MAXHP | AURA_COLD | CAN_FLY |
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | NONLIVING | DROP_RANDART
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | SMART | 
-F:EVIL | DEMON | IM_COLD | NO_CONF | KILL_WALL | BASEANGBAND | 
-F:HAS_LITE | FEMALE | SPECIAL_GENE
-S:1_IN_4 | 
-S:BLIND | CONF | BRAIN_SMASH | 
-S:BR_COLD | BO_COLD | BA_NETH | S_UNDEAD | S_DEMON
+F:AURA_COLD
+F:BASH_DOOR
+F:CAN_FLY
+F:DEMON
+F:DROP_2D2
+F:DROP_GOOD
+F:DROP_RANDART
+F:EVIL
+F:FEMALE
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_COLD
+F:KILL_WALL
+F:MOVE_BODY
+F:NONLIVING
+F:NO_CONF
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:SMART
+F:SPECIAL_GENE
+F:UNIQUE
+S:1_IN_4
+S:BA_NETH
+S:BLIND
+S:BO_COLD
+S:BRAIN_SMASH
+S:BR_COLD
+S:CONF
+S:S_DEMON
+S:S_UNDEAD
 D:She was once the wife of Turgon and mother of Idril Celebrindal. She was 
 D:lost when the Noldor crossed the Grinding Ice after Feanor and his sons 
 D:betrayed Fingolfin's host by burning the white ships of Alqualonde. 
@@ -18189,11 +30071,31 @@ O:60:0:40:0
 B:HIT:HURT:4d6
 B:HIT:HURT:4d6
 B:HIT:HURT:4d6
-F:FORCE_SLEEP | COLD_BLOOD | EMPTY_MIND | PASS_WALL | KILL_BODY | ESCORT | 
-F:BASH_DOOR | IM_COLD | IM_ACID | IM_ELEC | IM_POIS | NONLIVING | UNIQUE
-F:HURT_ROCK | NO_CONF | NO_SLEEP | NO_CUT | CHAR_MULTI | BASEANGBAND | SPECIAL_GENE
-F:NO_CUT | DROP_RANDART
-S:1_IN_10 | S_KIN | BO_ACID | BA_FIRE
+F:BASH_DOOR
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:DROP_RANDART
+F:EMPTY_MIND
+F:ESCORT
+F:FORCE_SLEEP
+F:HURT_ROCK
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_POIS
+F:KILL_BODY
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_CUT
+F:NO_SLEEP
+F:PASS_WALL
+F:SPECIAL_GENE
+F:UNIQUE
+S:1_IN_10
+S:BA_FIRE
+S:BO_ACID
+S:S_KIN
 D:Deep in the heart of the earth, even the rock itself is sentient 
 D:and has learned to despise intruders. 
 
@@ -18205,10 +30107,22 @@ W:0:1:1500:0
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:INSULT:*
-F:MALE | RAND_50 | CAN_SPEAK | NEUTRAL | NO_TARGET | 
-F:ONLY_GOLD | DROP_60 | DROP_SKELETON | DROP_CORPSE | 
-F:OPEN_DOOR | BASH_DOOR | WILD_TOWN | WILD_ONLY | 
-F:MORTAL | BASEANGBAND | HAS_LITE | AI_ANNOY | 
+F:AI_ANNOY
+F:BASH_DOOR
+F:CAN_SPEAK
+F:DROP_60
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:ONLY_GOLD
+F:OPEN_DOOR
+F:RAND_50
+F:WILD_ONLY
+F:WILD_TOWN
 D:He thinks you are not pious enough. He will try to 
 D:get you to change your ways.
 
@@ -18220,10 +30134,20 @@ W:0:1:1500:0
 E:1:1:1:2:1:1
 O:0:0:0:0
 B:HIT:HURT:1d3
-F:MALE | NEUTRAL | NO_TARGET | 
-F:ONLY_ITEM | DROP_90 | DROP_SKELETON | DROP_CORPSE | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | WILD_TOWN | WILD_ONLY | 
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_90
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:MALE
+F:MORTAL
+F:NEUTRAL
+F:NO_TARGET
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:TAKE_ITEM
+F:WILD_ONLY
+F:WILD_TOWN
 D:He's wearing fancy clothes of foreign make. He looks tired. 
 
 N:1038:Water hound
@@ -18235,9 +30159,17 @@ B:CLAW:HURT:1d4
 B:CLAW:HURT:1d4
 E:0:1:0:2:1:0
 O:0:0:0:0
-F:FORCE_SLEEP | BASH_DOOR | DROP_CORPSE | FRIENDS
-F:ANIMAL | IM_COLD | MORTAL | BASEANGBAND | RES_WATE | NO_CUT
-S:1_IN_5 | BA_WATE
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:FORCE_SLEEP
+F:FRIENDS
+F:IM_COLD
+F:MORTAL
+F:NO_CUT
+F:RES_WATE
+S:1_IN_5
+S:BA_WATE
 D:The sound of a hundred waterfalls rushes through your ears as 
 D:a huge wave of water, vaguely hound-shaped, rushes towards you. 
 
@@ -18251,18 +30183,49 @@ B:SPORE:UN_BONUS:10d10
 B:SPORE:EXP_80:10d10
 B:SPORE:TIME:10d10
 B:SPORE:TIME:10d10
-F:UNIQUE | NEVER_MOVE | CAN_SWIM | CAN_SPEAK | 
-F:FORCE_MAXHP | WEIRD_MIND | DROP_CORPSE |
-F:REFLECTING | AURA_ELEC | ONLY_ITEM | DROP_4D2 |
-F:DROP_GOOD | DROP_GREAT | FORCE_SLEEP | RES_NETH |
-F:SMART | POWERFUL | RES_TELE | REGENERATE | CAN_FLY |
-F:DG_CURSE | WYRM_PROTECT | EVIL |
-F:IM_ACID | IM_FIRE | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | NO_STUN |
-F:JOKEANGBAND | HAS_LITE | RES_WATE | NO_CUT
-S:1_IN_2 |
-S:S_HI_DRAGON | S_KIN | BR_DISI | HEAL | TPORT |
-S:TELE_LEVEL | TELE_TO
+F:AURA_ELEC
+F:CAN_FLY
+F:CAN_SPEAK
+F:CAN_SWIM
+F:DG_CURSE
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_MAXHP
+F:FORCE_SLEEP
+F:HAS_LITE
+F:IM_ACID
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:JOKEANGBAND
+F:NEVER_MOVE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:POWERFUL
+F:REFLECTING
+F:REGENERATE
+F:RES_NETH
+F:RES_TELE
+F:RES_WATE
+F:SMART
+F:UNIQUE
+F:WEIRD_MIND
+F:WYRM_PROTECT
+S:1_IN_2
+S:BR_DISI
+S:HEAL
+S:S_HI_DRAGON
+S:S_KIN
+S:TELE_LEVEL
+S:TELE_TO
+S:TPORT
 D:An assistant to DarkGod, Improv has chosen the form of a dense 
 D:purple smog for his incarnation into Middle-earth. It travels the 
 D:dungeons, killing software bugs and creating random artifacts for 
@@ -18278,15 +30241,35 @@ B:HIT:POISON:5d5
 B:HIT:POISON:5d5
 B:HIT:POISON:5d5
 B:HIT:POISON:5d5
-F:MIMIC | UNIQUE
-F:FORCE_SLEEP |
-F:EMPTY_MIND | COLD_BLOOD |
-F:IM_ACID | IM_FIRE | IM_ELEC | IM_COLD | IM_POIS |
-F:NO_CONF | NO_SLEEP | NO_FEAR | BASEANGBAND | NO_CUT
-S:1_IN_1 | 
-S:BLIND | CONF | SCARE | CAUSE_4 | CAUSE_3 | FORGET | 
-S:BA_ACID | BA_FIRE | BA_COLD | BA_ELEC | 
-S:S_MONSTER | S_KIN | SHRIEK | BRAIN_SMASH | TRAPS
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:FORCE_SLEEP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:MIMIC
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:UNIQUE
+S:1_IN_1
+S:BA_ACID
+S:BA_COLD
+S:BA_ELEC
+S:BA_FIRE
+S:BLIND
+S:BRAIN_SMASH
+S:CAUSE_3
+S:CAUSE_4
+S:CONF
+S:FORGET
+S:SCARE
+S:SHRIEK
+S:S_KIN
+S:S_MONSTER
 D:A strange creature that disguises itself as an object to lure 
 D:unsuspecting adventurers within reach of its venomous claws. 
 
@@ -18296,10 +30279,21 @@ I:110:1d1:40:250:3
 W:0:0:730:0
 E:0:1:1:2:1:1
 O:0:0:0:1
-F:FEMALE | CAN_SPEAK | WILD_ONLY | WILD_TOWN | 
-F:FORCE_MAXHP | NEVER_GENE
-F:NEVER_MOVE | NEVER_BLOW | GOOD | NO_TARGET
-F:MORTAL | BASEANGBAND | UNIQUE | NEUTRAL | NO_TARGET | NO_DEATH
+F:CAN_SPEAK
+F:FEMALE
+F:FORCE_MAXHP
+F:GOOD
+F:MORTAL
+F:NEUTRAL
+F:NEVER_BLOW
+F:NEVER_GENE
+F:NEVER_MOVE
+F:NO_DEATH
+F:NO_TARGET
+F:NO_TARGET
+F:UNIQUE
+F:WILD_ONLY
+F:WILD_TOWN
 D:She seems to seek someone, you may help. 
 
 N:1042:Thrain, the King Under the Mountain
@@ -18308,10 +30302,19 @@ I:110:1d1:40:250:3
 W:60:1:730:0
 E:0:1:1:2:1:1
 O:0:0:0:1
-F:MALE | CAN_SPEAK
-F:FORCE_MAXHP | SPECIAL_GENE
-F:NEVER_MOVE | NEVER_BLOW | GOOD | NO_TARGET
-F:MORTAL | BASEANGBAND | UNIQUE | NEUTRAL | NO_TARGET | NO_DEATH
+F:CAN_SPEAK
+F:FORCE_MAXHP
+F:GOOD
+F:MALE
+F:MORTAL
+F:NEUTRAL
+F:NEVER_BLOW
+F:NEVER_MOVE
+F:NO_DEATH
+F:NO_TARGET
+F:NO_TARGET
+F:SPECIAL_GENE
+F:UNIQUE
 D:He must have suffered horrible tortures. 
 
 N:1043:Fire golem
@@ -18324,11 +30327,20 @@ B:HIT:HURT:2d6
 B:HIT:HURT:2d6
 B:HIT:FIRE:3d6
 B:HIT:FIRE:3d6
-F:BASH_DOOR | AURA_FIRE | HAS_LITE
-F:IM_FIRE | SPECIAL_GENE
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | NO_STUN
-F:MORTAL | BASEANGBAND | NO_CUT | AI_PLAYER
-S:1_IN_10 | 
+F:AI_PLAYER
+F:AURA_FIRE
+F:BASH_DOOR
+F:HAS_LITE
+F:IM_FIRE
+F:MORTAL
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:SPECIAL_GENE
+S:1_IN_10
 S:BR_FIRE
 D:A sentient mass of pure fire. 
 
@@ -18342,20 +30354,63 @@ B:HIT:ABOMINATION:3d10
 B:HIT:TIME:24d10
 B:HIT:INSANITY:24d10
 B:HIT:LOSE_ALL:24d10
-F:UNIQUE | CAN_SPEAK | MALE |
-F:FORCE_MAXHP | SPIRIT
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_3D2 | DROP_4D2 | 
-F:DROP_GOOD | DROP_GREAT | DROP_CHOSEN | RES_NETH |
-F:SMART | KILL_WALL | MOVE_BODY | AURA_FIRE |
-F:REGENERATE | POWERFUL | SPECIAL_GENE | CAN_FLY | KILL_TREES
-F:EVIL | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_STUN | NO_SLEEP | NO_FEAR | RES_TELE | BASEANGBAND |
-S:1_IN_4 | 
-S:BRAIN_SMASH | 
-S:BA_MANA | BO_MANA | BA_NETH | BA_CHAO | BA_DARK | ANIM_DEAD | S_KIN |
-S:S_MONSTERS | S_UNIQUE | S_HI_DEMON | S_HI_UNDEAD | S_HI_DRAGON | 
-S:BR_NETH | BR_DISI | HAND_DOOM | S_WRAITH | HEAL | BRAIN_SMASH |
-S:DRAIN_MANA | TELE_TO | DARKNESS | SHRIEK
+F:AURA_FIRE
+F:CAN_FLY
+F:CAN_SPEAK
+F:DROP_1D2
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CHOSEN
+F:DROP_GOOD
+F:DROP_GREAT
+F:EVIL
+F:FORCE_MAXHP
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_TREES
+F:KILL_WALL
+F:MALE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_ITEM
+F:POWERFUL
+F:REGENERATE
+F:RES_NETH
+F:RES_TELE
+F:SMART
+F:SPECIAL_GENE
+F:SPIRIT
+F:UNIQUE
+S:1_IN_4
+S:BA_CHAO
+S:BA_DARK
+S:BA_MANA
+S:BA_NETH
+S:BO_MANA
+S:BRAIN_SMASH
+S:BRAIN_SMASH
+S:BR_DISI
+S:BR_NETH
+S:DARKNESS
+S:DRAIN_MANA
+S:HAND_DOOM
+S:HEAL
+S:SHRIEK
+S:S_HI_DEMON
+S:S_HI_DRAGON
+S:S_HI_UNDEAD
+S:S_KIN
+S:S_MONSTERS
+S:S_UNIQUE
+S:S_WRAITH
+S:TELE_TO
 D:He was the most powerful of the Valar, the equal of Manwe. 
 D:You banned him here, in the Void, and now you must destroy him 
 D:forever. However here in the Void, his spirit gained much power 
@@ -18375,9 +30430,13 @@ E:0:1:1:2:0:0
 O:25:0:75:0
 B:TOUCH:EXP_80:10d10
 B:TOUCH:EXP_80:10d10
-F:SPIRIT | BASEANGBAND | NEVER_MOVE | EMPTY_MIND | NO_CUT |
-F:COLD_BLOOD | INVISIBLE 
-S:1_IN_1 |
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:INVISIBLE
+F:NEVER_MOVE
+F:NO_CUT
+F:SPIRIT
+S:1_IN_1
 S:BA_NETH
 D:This strange, almost intangible spirit keeps assaulting you! 
 
@@ -18392,8 +30451,11 @@ B:TOUCH:POISON:10d10
 B:CRAWL:POISON:10d10
 B:CRAWL:EAT_ITEM:10d9
 B:BITE:UN_BONUS:9d9
-F:SPIRIT | BASEANGBAND | WEIRD_MIND | FRIENDS |
-F:AI_ANNOY | PASS_WALL
+F:AI_ANNOY
+F:FRIENDS
+F:PASS_WALL
+F:SPIRIT
+F:WEIRD_MIND
 S:MULTIPLY
 D:These things multiply at an apparently unstoppable rate! 
 
@@ -18407,9 +30469,15 @@ O:0:0:0:0
 B:TOUCH:LOSE_DEX:2d3
 B:TOUCH:PARALYZE:1d12
 B:TOUCH:PARALYZE:1d12
-F:SPIRIT | BASEANGBAND | NO_SLEEP | PASS_WALL | WEIRD_MIND 
-S:1_IN_2 |
-S:SLOW | BLINK | HOLD | HASTE
+F:NO_SLEEP
+F:PASS_WALL
+F:SPIRIT
+F:WEIRD_MIND
+S:1_IN_2
+S:BLINK
+S:HASTE
+S:HOLD
+S:SLOW
 D:Coming towards you quickly, it seems intent on moving faster than you. 
 
 # Spirit of confusion
@@ -18423,11 +30491,25 @@ B:ENGULF:HALLU:16d8
 B:ENGULF:HALLU:16d8
 B:ENGULF:CONFUSE:16d8
 B:ENGULF:CONFUSE:16d8
-F:SPIRIT | BASEANGBAND | RES_NEXU |  AURA_ELEC | IM_FIRE | IM_ELEC |
-F:EMPTY_MIND | BASH_DOOR | POWERFUL | CAN_FLY | ATTR_MULTI |
-F:NO_CONF | NO_SLEEP | NO_FEAR | NO_CUT
-S:1_IN_3 |
-S:BR_CHAO | BR_NEXU | BR_NUKE | BR_CONF
+F:ATTR_MULTI
+F:AURA_ELEC
+F:BASH_DOOR
+F:CAN_FLY
+F:EMPTY_MIND
+F:IM_ELEC
+F:IM_FIRE
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:POWERFUL
+F:RES_NEXU
+F:SPIRIT
+S:1_IN_3
+S:BR_CHAO
+S:BR_CONF
+S:BR_NEXU
+S:BR_NUKE
 D:A swirling mass, constantly changing its appearance. 
 
 # Spirit of brawn
@@ -18441,10 +30523,23 @@ B:HIT:SHATTER:18d18
 B:HIT:CONFUSE:18d18
 B:HIT:SHATTER:18d18
 B:HIT:CONFUSE:18d18
-F:SPIRIT | BASEANGBAND | DROP_4D2 | KILL_BODY | KILL_WALL |
-F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | KILL_TREES | 
-F:EVIL | GIANT | HURT_ROCK | BASEANGBAND | HAS_LITE | 
-F:IM_FIRE | IM_COLD | IM_ACID | IM_ELEC | IM_POIS
+F:BASH_DOOR
+F:DROP_4D2
+F:DROP_CORPSE
+F:EVIL
+F:GIANT
+F:HAS_LITE
+F:HURT_ROCK
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:KILL_TREES
+F:KILL_WALL
+F:OPEN_DOOR
+F:SPIRIT
 D:Strong and swarthy, this spirit could bend metal with his bare hands. 
 
 # Spirit of Wyrms
@@ -18458,19 +30553,66 @@ B:CLAW:HURT:10d15
 B:CLAW:HURT:10d15
 B:BITE:HURT:14d18
 B:BITE:HURT:14d18
-F:SPIRIT | FORCE_MAXHP | MOVE_BODY | AURA_FIRE | REFLECTING | AURA_ELEC |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | AURA_COLD |
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | RES_NETH | RES_DISE |
-F:DRAGON | GOOD | RES_TELE | DROP_CORPSE | KILL_TREES | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP |
-F:RES_NEXU | RES_PLAS | CAN_FLY | BASEANGBAND | HAS_LITE | NO_CUT
-S:1_IN_3 |
-S:S_HI_DRAGON | S_DRAGON | S_KIN | 
-S:BR_NUKE | BR_ACID | BR_ELEC | BR_FIRE |
-S:BR_COLD | BR_POIS | BR_NETH | BR_LITE | BR_DARK |
-S:BR_CONF | BR_SOUN | BR_CHAO | BR_DISE | BR_NEXU |
-S:BR_TIME | BR_INER | BR_GRAV | BR_SHAR | BR_PLAS |
-S:BR_WALL | BR_MANA | BR_DISI
+F:AURA_COLD
+F:AURA_ELEC
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:DRAGON
+F:DROP_2D2
+F:DROP_3D2
+F:DROP_4D2
+F:DROP_CORPSE
+F:DROP_GOOD
+F:FORCE_MAXHP
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_TREES
+F:MOVE_BODY
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:REFLECTING
+F:RES_DISE
+F:RES_NETH
+F:RES_NEXU
+F:RES_PLAS
+F:RES_TELE
+F:SPIRIT
+S:1_IN_3
+S:BR_ACID
+S:BR_CHAO
+S:BR_COLD
+S:BR_CONF
+S:BR_DARK
+S:BR_DISE
+S:BR_DISI
+S:BR_ELEC
+S:BR_FIRE
+S:BR_GRAV
+S:BR_INER
+S:BR_LITE
+S:BR_MANA
+S:BR_NETH
+S:BR_NEXU
+S:BR_NUKE
+S:BR_PLAS
+S:BR_POIS
+S:BR_SHAR
+S:BR_SOUN
+S:BR_TIME
+S:BR_WALL
+S:S_DRAGON
+S:S_HI_DRAGON
+S:S_KIN
 D:This spirit bears a remarkable similarity to some of the most powerful 
 D:types of dragonkind found in Middle-earth. It appears to be even more 
 D:fearsome, though! 
@@ -18485,11 +30627,22 @@ O:25:20:25:20
 B:BITE:POISON:15d15
 B:BITE:POISON:15d15
 B:BITE:LOSE_ALL:10d12
-F:SPIRIT | CAN_SWIM | IM_POIS | IM_ACID |
-F:DROP_60 | DROP_2D2 | FRIENDS | DROP_CORPSE |
-F:OPEN_DOOR | BASH_DOOR | EVIL | BASEANGBAND
-S:1_IN_4 |
-S:BA_POIS | S_MONSTER | SCARE | HOLD
+F:BASH_DOOR
+F:CAN_SWIM
+F:DROP_2D2
+F:DROP_60
+F:DROP_CORPSE
+F:EVIL
+F:FRIENDS
+F:IM_ACID
+F:IM_POIS
+F:OPEN_DOOR
+F:SPIRIT
+S:1_IN_4
+S:BA_POIS
+S:HOLD
+S:SCARE
+S:S_MONSTER
 D:It slides towards you, a horrible scaly, slidy thing. 
 
 # Spirit of seeing
@@ -18503,11 +30656,24 @@ B:GAZE:UN_BONUS:12d12
 B:GAZE:UN_POWER:12d10
 B:GAZE:INSANITY:12d14
 B:GAZE:LOSE_ALL:6d6
-F:SPIRIT | BASH_DOOR | EVIL | IM_POIS | 
-F:CAN_FLY | BASEANGBAND
-S:1_IN_2 | 
-S:BLIND | CONF | FORGET | SCARE | DRAIN_MANA | BRAIN_SMASH | 
-S:BA_DARK | BO_MANA | BA_NETH | BA_ACID | BA_FIRE | BA_COLD 
+F:BASH_DOOR
+F:CAN_FLY
+F:EVIL
+F:IM_POIS
+F:SPIRIT
+S:1_IN_2
+S:BA_ACID
+S:BA_COLD
+S:BA_DARK
+S:BA_FIRE
+S:BA_NETH
+S:BLIND
+S:BO_MANA
+S:BRAIN_SMASH
+S:CONF
+S:DRAIN_MANA
+S:FORGET
+S:SCARE
 D:You will find it difficult to avoid being seen by this spirit! And 
 D:once it has you in its sight, beware! 
 
@@ -18522,12 +30688,29 @@ B:TOUCH:UN_BONUS:12d12
 B:TOUCH:UN_POWER:12d10
 B:TOUCH:INSANITY:12d14
 B:TOUCH:LOSE_ALL:6d6
-F:SPIRIT | CAN_FLY | REFLECTING |
-F:SMART | BASH_DOOR | COLD_BLOOD | INVISIBLE | EMPTY_MIND |
-F:EVIL | BASEANGBAND | CHAR_MULTI | CHAR_CLEAR | ATTR_CLEAR
-S:1_IN_3 | 
-S:DRAIN_MANA | BLINK | BLIND | SCARE | CONF | 
-S:HEAL | TELE_AWAY | DARKNESS | TRAPS | FORGET | SHRIEK
+F:ATTR_CLEAR
+F:BASH_DOOR
+F:CAN_FLY
+F:CHAR_CLEAR
+F:CHAR_MULTI
+F:COLD_BLOOD
+F:EMPTY_MIND
+F:EVIL
+F:INVISIBLE
+F:REFLECTING
+F:SMART
+F:SPIRIT
+S:1_IN_3
+S:BLIND
+S:BLINK
+S:CONF
+S:DARKNESS
+S:DRAIN_MANA
+S:FORGET
+S:HEAL
+S:SCARE
+S:SHRIEK
+S:TELE_AWAY
 D:Hopefully you will kill this spirit before you realise it exists. 
 
 # Spirit of ickyness
@@ -18541,12 +30724,23 @@ B:CRAWL:POISON:12d14
 B:CRAWL:EAT_FOOD:12d14
 B:TOUCH:ACID:13d15
 B:HIT:HURT:13d15
-F:SPIRIT | BASEANGBAND |
-F:EMPTY_MIND | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | IM_ACID | IM_ELEC | IM_FIRE | IM_COLD | IM_POIS | 
-F:EMPTY_MIND 
-S:1_IN_4 | 
-S:DRAIN_MANA | BLIND | CONF | SCARE | S_KIN
+F:BASH_DOOR
+F:EMPTY_MIND
+F:EMPTY_MIND
+F:EVIL
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:OPEN_DOOR
+F:SPIRIT
+S:1_IN_4
+S:BLIND
+S:CONF
+S:DRAIN_MANA
+S:SCARE
+S:S_KIN
 D:A horrible slimy spirit, that seems to ooze evilness. I wouldn't get 
 D:too close to it if I were you. 
 
@@ -18561,10 +30755,12 @@ B:BITE:HURT:12d12
 B:BITE:HURT:12d12
 B:BITE:HURT:12d8
 B:BITE:HURT:12d8
-F:SPIRIT | BASEANGBAND |
-F:ESCORT | ESCORTS |
-F:OPEN_DOOR | BASH_DOOR 
-S:1_IN_2 | 
+F:BASH_DOOR
+F:ESCORT
+F:ESCORTS
+F:OPEN_DOOR
+F:SPIRIT
+S:1_IN_2
 S:S_KIN
 D:This spirit appears to have lots of friends! 
 
@@ -18579,11 +30775,21 @@ B:WAIL:TERRIFY:8d9
 B:HIT:HURT:10d10
 B:HIT:ABOMINATION:6d10
 B:HIT:ABOMINATION:6d10
-F:SPIRIT | BASEANGBAND |
-F:EVIL | UNDEAD | IM_POIS | IM_COLD | NO_CONF | NO_SLEEP | 
-F:COLD_BLOOD | HURT_LITE | NO_CUT 
-S:1_IN_3 |
-S:SCARE | HOLD | DARKNESS | SCARE 
+F:COLD_BLOOD
+F:EVIL
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:SPIRIT
+F:UNDEAD
+S:1_IN_3
+S:DARKNESS
+S:HOLD
+S:SCARE
+S:SCARE
 D:It seems to have been woken from the dead, this spirit. It lumbers 
 D:towards you, seeking to turn you into a form as hideous as its own! 
 
@@ -18599,9 +30805,19 @@ O:0:100:0:0
 B:HIT:LOSE_STR:4d8
 B:HIT:LOSE_STR:4d8
 B:HIT:LOSE_STR:4d8
-F:SPIRIT | BASEANGBAND | DROP_2D2 | KILL_BODY | KILL_WALL |
-F:BASH_DOOR | EVIL | GIANT | HURT_ROCK | 
-F:IM_FIRE | IM_COLD | IM_ACID | IM_ELEC | IM_POIS
+F:BASH_DOOR
+F:DROP_2D2
+F:EVIL
+F:GIANT
+F:HURT_ROCK
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:KILL_BODY
+F:KILL_WALL
+F:SPIRIT
 D:It is coming for you, this massive imposing tower of strength.
 D:It appears almost unstoppable! 
 
@@ -18615,12 +30831,26 @@ O:0:0:100:0
 B:HIT:LOSE_INT:4d8
 B:HIT:LOSE_INT:4d8
 B:HIT:LOSE_INT:4d8
-F:EVIL | SPIRIT | BASEANGBAND | DROP_2D2 | 
-F:OPEN_DOOR | SMART |
-F:IM_FIRE | IM_COLD | IM_ACID | IM_ELEC | IM_POIS
-S:1_IN_2 |
-S:HASTE | TPORT | TELE_TO | BLIND | CONF | 
-S:BO_MANA | BO_FIRE | BO_COLD | BO_ELEC | 
+F:DROP_2D2
+F:EVIL
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:OPEN_DOOR
+F:SMART
+F:SPIRIT
+S:1_IN_2
+S:BLIND
+S:BO_COLD
+S:BO_ELEC
+S:BO_FIRE
+S:BO_MANA
+S:CONF
+S:HASTE
+S:TELE_TO
+S:TPORT
 D:This spirit looks very clever, cunning almost. 
 
 # Spirit of wisdom
@@ -18633,12 +30863,23 @@ O:0:50:50:0
 B:HIT:LOSE_WIS:4d8
 B:HIT:LOSE_WIS:4d8
 B:HIT:LOSE_WIS:4d8
-F:EVIL | SPIRIT | BASEANGBAND | DROP_2D2 | 
-F:OPEN_DOOR | 
-F:IM_FIRE | IM_COLD | IM_ACID | IM_ELEC | IM_POIS
-S:1_IN_2 |
-S:HEAL | MIND_BLAST | CAUSE_4 | SCARE | 
-S:DRAIN_MANA | BRAIN_SMASH | FORGET |
+F:DROP_2D2
+F:EVIL
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:OPEN_DOOR
+F:SPIRIT
+S:1_IN_2
+S:BRAIN_SMASH
+S:CAUSE_4
+S:DRAIN_MANA
+S:FORGET
+S:HEAL
+S:MIND_BLAST
+S:SCARE
 D:This spirit has something of a priestly look about it. 
 
 # Spirit of dexterity
@@ -18651,10 +30892,17 @@ O:0:50:25:25
 B:HIT:LOSE_DEX:4d8
 B:HIT:LOSE_DEX:4d8
 B:HIT:LOSE_DEX:4d8
-F:EVIL | SPIRIT | BASEANGBAND | DROP_2D2 | 
-F:OPEN_DOOR | SMART |
-F:IM_FIRE | IM_COLD | IM_ACID | IM_ELEC | IM_POIS
-S:1_IN_1 |
+F:DROP_2D2
+F:EVIL
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:OPEN_DOOR
+F:SMART
+F:SPIRIT
+S:1_IN_1
 S:ARROW_4
 D:This spirit moves almost too quickly for you to see him. 
 
@@ -18668,8 +30916,15 @@ O:0:50:0:50
 B:HIT:LOSE_CON:4d8
 B:HIT:LOSE_CON:4d8
 B:HIT:LOSE_CON:4d8
-F:EVIL | SPIRIT | BASEANGBAND | DROP_2D2 | BASH_DOOR |
-F:IM_FIRE | IM_COLD | IM_ACID | IM_ELEC | IM_POIS
+F:BASH_DOOR
+F:DROP_2D2
+F:EVIL
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:SPIRIT
 D:This spirit moves slower than most, but thunders on and on 
 D:towards you. 
 
@@ -18683,11 +30938,21 @@ O:70:10:10:10
 B:HIT:LOSE_CHR:4d8
 B:HIT:LOSE_CHR:4d8
 B:HIT:LOSE_CHR:4d8
-F:SPIRIT | BASEANGBAND | DROP_2D2 | 
-F:OPEN_DOOR | EVIL | TAKE_ITEM |
-F:IM_FIRE | IM_COLD | IM_ACID | IM_ELEC | IM_POIS
-S:1_IN_2 |
-S:TRAPS | ARROW_3 | BLINK | TELE_TO | CONF 
+F:DROP_2D2
+F:EVIL
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:OPEN_DOOR
+F:SPIRIT
+F:TAKE_ITEM
+S:1_IN_2
+S:ARROW_3
+S:BLINK
+S:CONF
+S:TELE_TO
 D:There is something attractive about this spirit, and it seems 
 D:to have a full purse. 
 
@@ -18703,9 +30968,14 @@ O:25:60:0:15
 B:HIT:FIRE:10d8
 B:HIT:FIRE:10d8
 B:HIT:FIRE:10d8
-F:SPIRIT | BASEANGBAND | AI_ANNOY | IM_FIRE | AURA_FIRE | HAS_LITE
-S:1_IN_2 |
-S:BO_FIRE | BA_FIRE
+F:AI_ANNOY
+F:AURA_FIRE
+F:HAS_LITE
+F:IM_FIRE
+F:SPIRIT
+S:1_IN_2
+S:BA_FIRE
+S:BO_FIRE
 D:Flickering towards you, and then away, this spirit will burn you badly! 
 
 # Spirit of icy cold
@@ -18718,10 +30988,14 @@ O:25:60:0:15
 B:HIT:COLD:10d8
 B:HIT:COLD:10d8
 B:HIT:COLD:10d8
-F:SPIRIT | BASEANGBAND | IM_COLD | AURA_COLD | 
-F:COLD_BLOOD | BASH_DOOR 
-S:1_IN_2 |
-S:BO_COLD | BA_COLD
+F:AURA_COLD
+F:BASH_DOOR
+F:COLD_BLOOD
+F:IM_COLD
+F:SPIRIT
+S:1_IN_2
+S:BA_COLD
+S:BO_COLD
 D:The temperature around you drops as soon as you set eyes on this spirit. 
 
 # Spirit of corrosion (acid)
@@ -18734,9 +31008,13 @@ O:25:60:0:15
 B:HIT:ACID:10d8
 B:HIT:ACID:10d8
 B:HIT:ACID:10d8
-F:SPIRIT | BASEANGBAND | IM_ACID | BASH_DOOR | KILL_TREES 
-S:1_IN_2 |
-S:BO_ACID | BA_ACID
+F:BASH_DOOR
+F:IM_ACID
+F:KILL_TREES
+F:SPIRIT
+S:1_IN_2
+S:BA_ACID
+S:BO_ACID
 D:The very fabric of the void heals itself where this spirit walks. 
 
 # Spirit of shocking (electricity)
@@ -18749,9 +31027,13 @@ O:25:60:0:15
 B:HIT:ELEC:10d8
 B:HIT:ELEC:10d8
 B:HIT:ELEC:10d8
-F:SPIRIT | BASEANGBAND | IM_ELEC | AURA_ELEC | BASH_DOOR 
-S:1_IN_2 |
-S:BO_ELEC | BA_ELEC
+F:AURA_ELEC
+F:BASH_DOOR
+F:IM_ELEC
+F:SPIRIT
+S:1_IN_2
+S:BA_ELEC
+S:BO_ELEC
 D:The air crackles as this spirit approaches, and you smell singed flesh. 
 
 # Spirit of Valaraukar (Balrogs)
@@ -18765,12 +31047,27 @@ B:HIT:FIRE:11d12
 B:HIT:FIRE:11d12
 B:CRUSH:HURT:10d12
 B:TOUCH:UN_POWER
-F:SPIRIT | CAN_FLY | KILL_WALL | AURA_FIRE | NONLIVING |
-F:ONLY_ITEM | DROP_2D2 | EVIL | DEMON | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:IM_FIRE | IM_ELEC | BASEANGBAND | HAS_LITE
-S:1_IN_3 | 
-S:BLIND | CONF | SCARE | BR_FIRE 
+F:AURA_FIRE
+F:BASH_DOOR
+F:CAN_FLY
+F:DEMON
+F:DROP_2D2
+F:EVIL
+F:HAS_LITE
+F:IM_ELEC
+F:IM_FIRE
+F:KILL_WALL
+F:MOVE_BODY
+F:NONLIVING
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:POWERFUL
+F:SPIRIT
+S:1_IN_3
+S:BLIND
+S:BR_FIRE
+S:CONF
+S:SCARE
 D:Carrying a whip of fire, this spirit looks not dissimilar to a certain 
 D:Balrog. 
 
@@ -18785,11 +31082,26 @@ B:HIT:HURT:10d10
 B:HIT:HURT:10d10
 B:TOUCH:EXP_80:20d8
 B:TOUCH:EXP_40:20d8
-F:SPIRIT | BASEANGBAND | REFLECTING | REGENERATE |
-F:IM_ACID | IM_ELEC | IM_COLD | IM_FIRE | IM_POIS | RES_TELE |
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | SMART | POWERFUL 
-S:1_IN_3 |
-S:BLIND | HEAL | BA_DARK | HASTE | CONF 
+F:BASH_DOOR
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_FIRE
+F:IM_POIS
+F:OPEN_DOOR
+F:POWERFUL
+F:REFLECTING
+F:REGENERATE
+F:RES_TELE
+F:SMART
+F:SPIRIT
+F:TAKE_ITEM
+S:1_IN_3
+S:BA_DARK
+S:BLIND
+S:CONF
+S:HASTE
+S:HEAL
 D:Deriving his strength from the shadows, this spirit 
 D:steals only for the challenge. 
 
@@ -18804,14 +31116,35 @@ B:HIT:HURT:10d9
 B:HIT:HURT:9d9
 B:BITE:EXP_80:9d9
 B:BITE:EXP_80:9d9
-F:SPIRIT | FORCE_SLEEP | CAN_FLY |
-F:DROP_60 | DROP_4D2 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | REGENERATE | RES_TELE | 
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT | SPIRIT
-S:1_IN_3 | 
-S:BLIND | HOLD | SCARE | CAUSE_3 | CAUSE_4 | DRAIN_MANA | 
-S:BRAIN_SMASH | DARKNESS | BO_NETH 
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_4D2
+F:DROP_60
+F:EVIL
+F:FORCE_SLEEP
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:REGENERATE
+F:RES_TELE
+F:SPIRIT
+F:SPIRIT
+F:UNDEAD
+S:1_IN_3
+S:BLIND
+S:BO_NETH
+S:BRAIN_SMASH
+S:CAUSE_3
+S:CAUSE_4
+S:DARKNESS
+S:DRAIN_MANA
+S:HOLD
+S:SCARE
 D:Your blood curdles and your bones chill as this spirit approaches. 
 
 # Spirit of unresistability (hehehehe)
@@ -18825,13 +31158,28 @@ B:HIT:SHATTER:18d10
 B:HIT:SHATTER:18d10
 B:HIT:LOSE_ALL:8d8
 B:TOUCH:UN_POWER
-F:BASEANGBAND | SPIRIT | SMART | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL |
-F:RES_NEXU | RES_NETH | 
-F:NO_CONF | NO_SLEEP | NO_FEAR | 
-F:IM_POIS | IM_ELEC | IM_ACID | IM_COLD |
-S:1_IN_2 |
-S:BA_MANA | BR_PLAS | BR_TIME | ROCKET | HAND_DOOM | FORGET | BA_WATE
+F:BASH_DOOR
+F:IM_ACID
+F:IM_COLD
+F:IM_ELEC
+F:IM_POIS
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:OPEN_DOOR
+F:POWERFUL
+F:RES_NETH
+F:RES_NEXU
+F:SMART
+F:SPIRIT
+S:1_IN_2
+S:BA_MANA
+S:BA_WATE
+S:BR_PLAS
+S:BR_TIME
+S:FORGET
+S:HAND_DOOM
+S:ROCKET
 D:This spirit appears to be afraid of very little, and confident in its 
 D:ability to destroy you. 
 
@@ -18846,11 +31194,19 @@ B:TOUCH:TIME:6d12
 B:TOUCH:TIME:6d12
 B:TOUCH:TIME:6d12
 B:TOUCH:TIME:6d12
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
-F:ANIMAL | NO_CONF | NO_SLEEP | 
-F:SPIRIT | BASEANGBAND
-S:1_IN_2 | 
-S:BR_TIME | SLOW | HASTE | HOLD
+F:ANIMAL
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:NO_CONF
+F:NO_SLEEP
+F:OPEN_DOOR
+F:SPIRIT
+S:1_IN_2
+S:BR_TIME
+S:HASTE
+S:HOLD
+S:SLOW
 D:All at once you see that which is to come and that which has gone before. 
 
 # Spirit of Gold
@@ -18864,12 +31220,28 @@ B:TOUCH:EAT_GOLD:7d15
 B:TOUCH:EAT_GOLD:7d15
 B:HIT:POISON:6d12
 B:HIT:POISON:6d12
-F:ONLY_GOLD | SPIRIT | BASEANGBAND |
-F:DROP_4D2 | DROP_4D2 | DROP_4D2 | REFLECTING | COLD_BLOOD | REGENERATE | 
-F:BASH_DOOR | MOVE_BODY | IM_ELEC | IM_COLD | IM_POIS | 
-F:RES_TELE | NO_FEAR | NO_STUN | NO_CONF | NO_SLEEP
-S:1_IN_4 | 
-S:ARROW_4 | HEAL | FORGET 
+F:BASH_DOOR
+F:COLD_BLOOD
+F:DROP_4D2
+F:DROP_4D2
+F:DROP_4D2
+F:IM_COLD
+F:IM_ELEC
+F:IM_POIS
+F:MOVE_BODY
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:ONLY_GOLD
+F:REFLECTING
+F:REGENERATE
+F:RES_TELE
+F:SPIRIT
+S:1_IN_4
+S:ARROW_4
+S:FORGET
+S:HEAL
 D:It is the very essence of financial greed... 
 
 # Spirit of doom 
@@ -18882,11 +31254,18 @@ O:0:10:90:0
 B:HIT:HURT:14d14
 B:HIT:HURT:14d14
 B:HIT:HURT:14d14
-F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | NO_CONF | NO_SLEEP | 
-F:SPIRIT | BASEANGBAND | HAS_LITE
-S:1_IN_2 | 
-S:HAND_DOOM | CAUSE_4 | DARKNESS 
+F:BASH_DOOR
+F:EVIL
+F:HAS_LITE
+F:NO_CONF
+F:NO_SLEEP
+F:OPEN_DOOR
+F:SMART
+F:SPIRIT
+S:1_IN_2
+S:CAUSE_4
+S:DARKNESS
+S:HAND_DOOM
 D:The very presence of this creature fills the air with an aura of doom. 
 D:You feel waves of depression descending on you as it approaches. 
 
@@ -18899,12 +31278,23 @@ E:0:1:0:6:1:0
 B:CLAW:HURT:14d10
 B:CLAW:HURT:14d10
 B:BITE:HURT:17d10
-F:INVISIBLE | CAN_FLY | SPIRIT | WEIRD_MIND |
-F:PASS_WALL | POWERFUL | MOVE_BODY | 
-F:EVIL | NO_CONF | NO_SLEEP | BASEANGBAND | SPIRIT
-S:1_IN_2 | 
-S:BLIND | CONF | 
-S:BR_LITE | BR_DARK | BR_CONF
+F:CAN_FLY
+F:EVIL
+F:INVISIBLE
+F:MOVE_BODY
+F:NO_CONF
+F:NO_SLEEP
+F:PASS_WALL
+F:POWERFUL
+F:SPIRIT
+F:SPIRIT
+F:WEIRD_MIND
+S:1_IN_2
+S:BLIND
+S:BR_CONF
+S:BR_DARK
+S:BR_LITE
+S:CONF
 D:This sprit seems to flicker in and out of this plane, and is a master 
 D:of light and dark.
 
@@ -18918,9 +31308,15 @@ O:10:90:0:0
 B:HIT:HURT:10d10
 B:HIT:HURT:10d10
 B:HIT:HURT:10d10
-F:OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ORC | IM_POIS | ONLY_ITEM |
-F:MORTAL | BASEANGBAND | HAS_LITE | SPIRIT
+F:BASH_DOOR
+F:EVIL
+F:HAS_LITE
+F:IM_POIS
+F:MORTAL
+F:ONLY_ITEM
+F:OPEN_DOOR
+F:ORC
+F:SPIRIT
 D:Stupid but strong, this spirit has an orcish aura about him.
 
 ### Here endeth the Spirits ###
@@ -18936,23 +31332,42 @@ O:0:5:90:5
 # Sorceror, not warrior
 B:HIT:HURT:1d1
 B:HIT:HURT:1d1
-F:OPEN_DOOR | SMART | MALE | DROP_SKELETON | DROP_CORPSE
-F:MORTAL | HAS_LITE | JOKEANGBAND | UNIQUE
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:HAS_LITE
+F:JOKEANGBAND
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:SMART
+F:UNIQUE
 # Trone, of course
-F:CAN_FLY | REFLECTING | IM_FIRE
+F:CAN_FLY
+F:IM_FIRE
+F:REFLECTING
 # Thorin
-F:IM_ACID | FORCE_MAXHP
+F:FORCE_MAXHP
+F:IM_ACID
 # No cold or random gen... waiting on elven rings only at bottom of Erebor
 F:SPECIAL_GENE
 # Dig
 F:KILL_WALL
 # Obvious resistances
-F:NO_CONF | NO_SLEEP | NO_STUN | NO_FEAR
+F:NO_CONF
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
 # Well, he's been there a while
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | DROP_GREAT
+F:DROP_4D2
+F:DROP_GOOD
+F:DROP_GREAT
+F:ONLY_ITEM
 # Essence of speed, Manathrust, Noxious Cloud, and Fireflash
-S:1_IN_1 | 
-S:HASTE | BO_MANA | BA_POIS | BA_FIRE
+S:1_IN_1
+S:BA_FIRE
+S:BA_POIS
+S:BO_MANA
+S:HASTE
 D:He looks like he is looking for something, and the flecks of dragon 
 D:blood on his face tell you he means business! 
 
@@ -18967,12 +31382,26 @@ O:0:50:50:0
 B:HIT:HURT:1d8
 B:HIT:POISON:1d8
 B:TOUCH:EXP_40
-F:FORCE_SLEEP | FRIENDS | DROP_60 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | CAN_FLY |
-F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | 
-F:NO_CONF | NO_SLEEP | BASEANGBAND | NO_CUT
-S:1_IN_8 | 
-S:HOLD | SCARE | CAUSE_3 | DARKNESS
+F:BASH_DOOR
+F:CAN_FLY
+F:COLD_BLOOD
+F:DROP_60
+F:EVIL
+F:FORCE_SLEEP
+F:FRIENDS
+F:HURT_LITE
+F:IM_COLD
+F:IM_POIS
+F:NO_CONF
+F:NO_CUT
+F:NO_SLEEP
+F:OPEN_DOOR
+F:UNDEAD
+S:1_IN_8
+S:CAUSE_3
+S:DARKNESS
+S:HOLD
+S:SCARE
 D:An evil spirit from the marshlands, related to the mewlips. 
 
 N:1078:Knight of the Swan
@@ -18986,10 +31415,21 @@ B:HIT:HURT:10d8
 B:HIT:HURT:10d8
 B:HIT:HURT:10d8
 B:HIT:HURT:10d8
-F:MALE | FRIENDS | OPEN_DOOR | BASH_DOOR |
-F:GOOD | DROP_SKELETON | DROP_CORPSE | SMART | PET |
-F:IM_ACID | IM_COLD | RES_WATE | RES_NETH |
-F:MORTAL | BASEANGBAND | HAS_LITE
+F:BASH_DOOR
+F:DROP_CORPSE
+F:DROP_SKELETON
+F:FRIENDS
+F:GOOD
+F:HAS_LITE
+F:IM_ACID
+F:IM_COLD
+F:MALE
+F:MORTAL
+F:OPEN_DOOR
+F:PET
+F:RES_NETH
+F:RES_WATE
+F:SMART
 D:A stately man dressed in armour emblazoned with a picture of a beautiful 
 D:white swan, from Dol Amroth of old. 
 
@@ -19005,9 +31445,23 @@ B:EXPLODE:HURT:20d20
 B:EXPLODE:HURT:20d20
 B:EXPLODE:HURT:20d20
 B:EXPLODE:HURT:20d20
-F:FORCE_MAXHP | NEVER_MOVE | IM_FIRE | IM_POIS | BASEANGBAND
-F:NO_FEAR | NO_STUN | NO_CUT | NO_SLEEP | NO_CONF | RES_TELE
-F:RES_NETH | AURA_FIRE | STUPID | EMPTY_MIND | NONLIVING
-F:SPECIAL_GENE | FORCE_DEPTH | SUSCEP_COLD
+F:AURA_FIRE
+F:EMPTY_MIND
+F:FORCE_DEPTH
+F:FORCE_MAXHP
+F:IM_FIRE
+F:IM_POIS
+F:NEVER_MOVE
+F:NONLIVING
+F:NO_CONF
+F:NO_CUT
+F:NO_FEAR
+F:NO_SLEEP
+F:NO_STUN
+F:RES_NETH
+F:RES_TELE
+F:SPECIAL_GENE
+F:STUPID
+F:SUSCEP_COLD
 D:An ensorcelled machine of Saruman's creation, this gnarled 
-D:totem of blackened steel defends Orthanc from intruders.
\ No newline at end of file
+D:totem of blackened steel defends Orthanc from intruders.
diff --git a/lib/mods/theme/edit/ra_info.txt b/lib/mods/theme/edit/ra_info.txt
index 705db243..5add55b4 100644
--- a/lib/mods/theme/edit/ra_info.txt
+++ b/lib/mods/theme/edit/ra_info.txt
@@ -16,10 +16,6 @@
 # C:max to dam:max to hit:max to AC:max to pval
 # F:flags
 
-# Version stamp (required)
-
-V:2.0.0
-
 # General info, number of powers
 G:100:1d5:1
 G:14:0d0:1
@@ -1533,14 +1529,16 @@ X:20:1
 T:35:0:255
 W:10:1:17
 C:0:0:0:0
-F:SH_FIRE | RES_FIRE
+F:RES_FIRE
+F:SH_FIRE
 
 N:338
 X:22:1
 T:35:0:255
 W:10:1:20
 C:0:0:0:0
-F:SH_ELEC | RES_ELEC
+F:RES_ELEC
+F:SH_ELEC
 
 N:339
 X:18:1
@@ -1801,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
@@ -1883,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
@@ -1953,7 +1949,8 @@ T:40:0:255
 T:45:0:255
 W:5:1:15
 C:0:0:0:0
-F:SPELL_CONTAIN | WIELD_CAST
+F:SPELL_CONTAIN
+F:WIELD_CAST
 
 # High-level soft and hard armour and DSM can get nether immunity - Theme, adapted from FuryMod
 N:516
@@ -1982,4 +1979,4 @@ F:LEVELS
 # T:tval:min sval:max sval  (up to 20 T: lines)
 # W:mininum player level to create it:rarity1:rarity2
 # C:max to dam:max to hit:max to AC:max to pval
-# F:flags
\ No newline at end of file
+# F:flags
diff --git a/lib/mods/theme/edit/re_info.txt b/lib/mods/theme/edit/re_info.txt
index c0e36a92..f71da68d 100644
--- a/lib/mods/theme/edit/re_info.txt
+++ b/lib/mods/theme/edit/re_info.txt
@@ -6,8 +6,6 @@
 # Do not modify this file unless you know exactly what you are doing,
 # unless you wish to risk possible system crashes and broken savefiles.
 
-# Version stamp (required)
-
 # Most values can be used with the +, -, % and = operators, = will set the
 # monster value, + and - will modify it based on the normal monster
 # % will apply that percentage to the monster value
@@ -28,8 +26,6 @@
 # S:monster spells to add for the ego-type
 # T:monster spells to remove, use MF_ALL for all
 
-V:2.0.0
-
 # A few undeads, to be created by the ANIM_DEAD spell
 
 N:1:Skeleton
@@ -37,11 +33,35 @@ G:s:*
 I:%100:+1d+1:+0:+5:-5
 W:+5:13:%30:%95:B
 F:DROP_SKELETON
-H:UNDEAD | NONLIVING | R_CHAR_Z | R_CHAR_A | R_CHAR_E | R_CHAR_g
-M:DROP_SKELETON | UNDEAD | IM_COLD | IM_POIS | NO_FEAR | NO_CONF | 
-M:NO_SLEEP | EMPTY_MIND | COLD_BLOOD | STUPID | EVIL
-O:GOOD | DROP_CORPSE | FRIEND | FRIENDS | ESCORT | ESCORTS | SMART | 
-O:DROP_GREAT | DROP_GOOD | RAND_25 | RAND_50 | MORTAL
+H:NONLIVING
+H:R_CHAR_A
+H:R_CHAR_E
+H:R_CHAR_Z
+H:R_CHAR_g
+H:UNDEAD
+M:COLD_BLOOD
+M:DROP_SKELETON
+M:EMPTY_MIND
+M:EVIL
+M:IM_COLD
+M:IM_POIS
+M:NO_CONF
+M:NO_FEAR
+M:NO_SLEEP
+M:STUPID
+M:UNDEAD
+O:DROP_CORPSE
+O:DROP_GOOD
+O:DROP_GREAT
+O:ESCORT
+O:ESCORTS
+O:FRIEND
+O:FRIENDS
+O:GOOD
+O:MORTAL
+O:RAND_25
+O:RAND_50
+O:SMART
 T:MF_ALL
 
 N:2:Zombie
@@ -49,11 +69,36 @@ G:z:*
 I:%95:%110d%100:%90:+10:-5
 W:+10:14:%70:%100:B
 F:DROP_CORPSE
-H:UNDEAD | NONLIVING | R_CHAR_Z | R_CHAR_A | R_CHAR_E | R_CHAR_g
-M:DROP_CORPSE | UNDEAD | IM_COLD | IM_POIS | NO_FEAR | NO_CONF
-M:NO_SLEEP | EVIL | EMPTY_MIND | COLD_BLOOD | STUPID | EVIL
-O:GOOD | DROP_SKELETON | FRIEND | FRIENDS | ESCORT | ESCORTS | SMART
-O:DROP_GREAT | DROP_GOOD | RAND_25 | RAND_50 | MORTAL
+H:NONLIVING
+H:R_CHAR_A
+H:R_CHAR_E
+H:R_CHAR_Z
+H:R_CHAR_g
+H:UNDEAD
+M:COLD_BLOOD
+M:DROP_CORPSE
+M:EMPTY_MIND
+M:EVIL
+M:EVIL
+M:IM_COLD
+M:IM_POIS
+M:NO_CONF
+M:NO_FEAR
+M:NO_SLEEP
+M:STUPID
+M:UNDEAD
+O:DROP_GOOD
+O:DROP_GREAT
+O:DROP_SKELETON
+O:ESCORT
+O:ESCORTS
+O:FRIEND
+O:FRIENDS
+O:GOOD
+O:MORTAL
+O:RAND_25
+O:RAND_50
+O:SMART
 T:MF_ALL
 
 N:3:Lich
@@ -64,15 +109,49 @@ B:TOUCH:LOSE_DEX:+0d+0
 B:TOUCH:LOSE_DEX:+0d+0
 B:TOUCH:UN_POWER:+0d+0
 B:TOUCH:EXP_40:+0d+0
-F:DROP_SKELETON | SMART | R_CHAR_h | R_CHAR_p | R_CHAR_P | R_CHAR_O
-H:UNDEAD | NONLIVING | R_CHAR_Z | R_CHAR_A | R_CHAR_E | R_CHAR_g
-M:UNDEAD | IM_COLD | IM_POIS | NO_FEAR | NO_CONF
-M:NO_SLEEP | SMART | EVIL | COLD_BLOOD
-O:DROP_SKELETON | GOOD | DROP_CORPSE | FRIEND | FRIENDS | ESCORT | ESCORTS | 
-O:DROP_GREAT | RAND_25 | RAND_50 | MORTAL
-S:1_IN_4 | 
-S:BLINK | TELE_TO | TELE_AWAY | BRAIN_SMASH | DRAIN_MANA | CAUSE_3 | 
-S:BLIND | HOLD | SLOW | SCARE
+F:DROP_SKELETON
+F:R_CHAR_O
+F:R_CHAR_P
+F:R_CHAR_h
+F:R_CHAR_p
+F:SMART
+H:NONLIVING
+H:R_CHAR_A
+H:R_CHAR_E
+H:R_CHAR_Z
+H:R_CHAR_g
+H:UNDEAD
+M:COLD_BLOOD
+M:EVIL
+M:IM_COLD
+M:IM_POIS
+M:NO_CONF
+M:NO_FEAR
+M:NO_SLEEP
+M:SMART
+M:UNDEAD
+O:DROP_CORPSE
+O:DROP_GREAT
+O:DROP_SKELETON
+O:ESCORT
+O:ESCORTS
+O:FRIEND
+O:FRIENDS
+O:GOOD
+O:MORTAL
+O:RAND_25
+O:RAND_50
+S:1_IN_4
+S:BLIND
+S:BLINK
+S:BRAIN_SMASH
+S:CAUSE_3
+S:DRAIN_MANA
+S:HOLD
+S:SCARE
+S:SLOW
+S:TELE_AWAY
+S:TELE_TO
 
 N:4:Spectral
 G:G:*
@@ -81,12 +160,35 @@ W:+20:20:%10:%110:B
 B:*:EXP_20:+0d+0
 B:*:EXP_20:+0d+0
 F:DROP_CORPSE
-H:UNDEAD | NONLIVING | R_CHAR_Z | R_CHAR_A | R_CHAR_E | R_CHAR_g
-M:UNDEAD | IM_COLD | IM_POIS | NO_FEAR | NO_CONF
-M:NO_SLEEP | PASS_WALL | EVIL | COLD_BLOOD
-O:GOOD | DROP_CORPSE | FRIEND | FRIENDS | ESCORT | ESCORTS | 
-O:DROP_GREAT | EMPTY_MIND | RAND_50 | MORTAL
-S:1_IN_5 | BLIND | HOLD | SCARE
+H:NONLIVING
+H:R_CHAR_A
+H:R_CHAR_E
+H:R_CHAR_Z
+H:R_CHAR_g
+H:UNDEAD
+M:COLD_BLOOD
+M:EVIL
+M:IM_COLD
+M:IM_POIS
+M:NO_CONF
+M:NO_FEAR
+M:NO_SLEEP
+M:PASS_WALL
+M:UNDEAD
+O:DROP_CORPSE
+O:DROP_GREAT
+O:EMPTY_MIND
+O:ESCORT
+O:ESCORTS
+O:FRIEND
+O:FRIENDS
+O:GOOD
+O:MORTAL
+O:RAND_50
+S:1_IN_5
+S:BLIND
+S:HOLD
+S:SCARE
 T:MF_ALL
 
 N:5:Captain
@@ -97,8 +199,13 @@ B:*:*:+0d+1
 B:*:*:+0d+1
 B:*:*:+0d+1
 B:*:*:+0d+1
-F:R_CHAR_o | R_CHAR_y | R_CHAR_k | BASEANGBAND
-M:FORCE_MAXHP | FRIENDS | SMART | DROP_1D2
+F:R_CHAR_k
+F:R_CHAR_o
+F:R_CHAR_y
+M:DROP_1D2
+M:FORCE_MAXHP
+M:FRIENDS
+M:SMART
 
 N:6:Chieftain
 G:*:*
@@ -108,25 +215,49 @@ B:*:*:+1d+2
 B:*:*:+1d+2
 B:*:*:+1d+2
 B:*:*:+1d+2
-F:R_CHAR_T | R_CHAR_P | R_CHAR_O | BASEANGBAND
-M:FORCE_MAXHP | FRIENDS | SMART | DROP_1D2
+F:R_CHAR_O
+F:R_CHAR_P
+F:R_CHAR_T
+M:DROP_1D2
+M:FORCE_MAXHP
+M:FRIENDS
+M:SMART
 
 N:7:Shaman
 G:*:r
 I:+0:%90d%100:+10:%90:+0
 W:+2:1:%90:%120:A
-F:R_CHAR_o | R_CHAR_k | R_CHAR_n | BASEANGBAND
-M:SMART | FORCE_MAXHP | DROP_1D2
+F:R_CHAR_k
+F:R_CHAR_n
+F:R_CHAR_o
+M:DROP_1D2
+M:FORCE_MAXHP
+M:SMART
 O:FRIENDS
-S:1_IN_6 | MISSILE | CAUSE_1 | CONF | BLINK
+S:1_IN_6
+S:BLINK
+S:CAUSE_1
+S:CONF
+S:MISSILE
 
 N:8:Priest
 G:*:G
 I:+0:%90d%100:+10:%90:+0
 W:+3:2:%90:%120:A
-F:R_CHAR_T | R_CHAR_P | R_CHAR_O | BASEANGBAND
-M:FRIENDS | SMART | FORCE_MAXHP | DROP_1D2
-S:1_IN_6 | CAUSE_2 | MISSILE | DARKNESS | CONF | SCARE | BLINK
+F:R_CHAR_O
+F:R_CHAR_P
+F:R_CHAR_T
+M:DROP_1D2
+M:FORCE_MAXHP
+M:FRIENDS
+M:SMART
+S:1_IN_6
+S:BLINK
+S:CAUSE_2
+S:CONF
+S:DARKNESS
+S:MISSILE
+S:SCARE
 
 N:9:Mage
 G:*:r
@@ -136,24 +267,38 @@ B:*:*:+0d+0
 B:*:*:+0d+0
 B:HIT:HURT:=2d=8
 B:HIT:HURT:=2d=8
-F:R_CHAR_O | BASEANGBAND
-M:SMART | FORCE_MAXHP | DROP_1D2
+F:R_CHAR_O
+M:DROP_1D2
+M:FORCE_MAXHP
+M:SMART
 O:FRIENDS
-S:1_IN_6 | BA_COLD | BO_FIRE | TRAPS | HEAL | HOLD | S_MONSTER | TPORT
+S:1_IN_6
+S:BA_COLD
+S:BO_FIRE
+S:HEAL
+S:HOLD
+S:S_MONSTER
+S:TPORT
 
 N:10:Archer
 G:*:W
 I:+0:+0d+0:+0:+0:+0
 W:+1:1:%100:%110:A
-F:R_CHAR_y | R_CHAR_k | R_CHAR_O | R_CHAR_o | BASEANGBAND
-S:1_IN_4 | ARROW_2
+F:R_CHAR_O
+F:R_CHAR_k
+F:R_CHAR_o
+F:R_CHAR_y
+S:1_IN_4
+S:ARROW_2
 
 N:11:Rogue
 G:*:b
 I:+2:+0d+0:+0:+10:-30
 W:+1:2:%90:%100:A
 B:*:EAT_GOLD:+0d+0
-F:R_CHAR_y | R_CHAR_k | R_CHAR_o
+F:R_CHAR_k
+F:R_CHAR_o
+F:R_CHAR_y
 
 # For townpeople
 N:12:Elven
diff --git a/lib/mods/theme/edit/readme.txt b/lib/mods/theme/edit/readme.txt
index 4c0ecbe7..70cf126e 100644
--- a/lib/mods/theme/edit/readme.txt
+++ b/lib/mods/theme/edit/readme.txt
@@ -77,11 +77,6 @@
 # Defines the preferences for the town features
 # You will find there entries as in f_info.txt
 
-# File: tr_info.txt
-# This file comes from Angband64 written by Jurriaan Kalkman
-# and describes the traps items can have
-# You will find traps like 'Summon Fast Quylthulgs Trap' , 'Wisdom Trap' etc.
-
 # File: v_info.txt
 # This file is used to initialize the "vault template" information for the Angband game.
 # You will find vaults like 'The I in the Storm' , 'Greater vault (mortuary temple of sety)' , 
diff --git a/lib/mods/theme/edit/s_bilbo.map b/lib/mods/theme/edit/s_bilbo.map
index 12c857e2..4f080de0 100644
--- a/lib/mods/theme/edit/s_bilbo.map
+++ b/lib/mods/theme/edit/s_bilbo.map
@@ -16,9 +16,6 @@ F:1:89:0:0:0:0:209
 # Random monster and random object on grass
 F:2:89:0:*13:*15
 
-# Random trap on grass
-F:3:89:0:0:0:0:0:*
-
 ### Previous adventurers
 F:a:89:0:0:391
 F:b:89:0:0:392
@@ -33,26 +30,26 @@ F:h:89:0:0:398
 
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 D:XMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMX
-D:XMMMM,g*,,,,,,MMM2,,,,,,,,MMM,,3TMMM,,M,3,M,3,M,,,M+,,,,,,,,,,,,,MM,,,,,,,,,,,,,,,,,,,,T,MX
+D:XMMMM,g*,,,,,,MMM2,,,,,,,,MMM,,,TMMM,,M,,,M,,,M,,,M+,,,,,,,,,,,,,MM,,,,,,,,,,,,,,,,,,,,T,MX
 D:XMM,,,MMM,,,MMM,,,MMM,,,MMM,,,MMM,,M,,M,M,M,M,M,M,,MMMMMMMMMMMMM,,MM,,MMMMMMMMMMMMMMMMMMTMX
-D:XM,,MMM,,,MMM,,3MMM,,,MMM,,,MMM,,,,M,,M,M,M,M,M,M,,,MM,,,*,,,,,MM,3MM,,,,,a,,,,,,,c,,,*M,MX
-D:XMMMM,,,MMM,,,MMM,,,MMM,,,MMM,,,,,,M,,M,M,M,M,M,M,,,,M,a,b,c,,,,M,,,M,,,,,,,,,,3,3,,,,,M,MX
-D:XMM,,,MMM,3,MMM,,,MMM,,,MMM,,,,,,,,M,,M,M,M,M,M,M,,,,M,,33,,,,,MM,,MMMM,,,,,,,,,2,,,,,,M,MX
-D:XM,,MMM,3,MMM,,,MMM,,,MMM,,,,,,,,,,M,,,,M,3,M,3,M,,,MM,,,2,,,MMM,MMM,,MMM,,,,,,3,3,,,,,M,MX
-D:XM,MM,,,MMM,,,MMM,,,MMM,,,,,,,,,MM+MMMMMMMMMMMMMM,,MM,,,,33,MMM,MMMMMM,,MMM,,,,,,,,,,,,M,MX
-D:XM,,3,MMM,,,,,,,,,MMM,,,,,,,,,,MM,,M,,,,,3,,,,TM,,MM,,,,,,MMM,,MMM,,MTM,,,MM,,,,b,,,,,*M,MX
-D:XMMMM,MMMMMMMMMMMMM,,,,,,,3,,,,M,h,M,MMMMMMMMMM,,MM,,,,,MMM,,MMM,,h,,MMM,,,MMMMMMMMMMMMM,MX
-D:XM>1M,,,,,,3,,,,,,MMM,*g,323,,,M,23T,,,,,3h,,MMMMM,,,,MMT,,MMT,,,,*3,,MMM,,+,,,,,,,,,,,+,MX
-D:XMM,MMMMMMMMMMMM,MM,,,,,,,3,,,,M,*,M,MMMMMMMMMM,,MM,,,,,MMM,,MMM,,2,,MMM,,,MMMMMMMMMMMMM,MX
-D:XM,,,,MMM,,,,,,,,,MMM,,,,,,,,,,MM,,M,,,,,3,,,,TM,,MM,,,,,,MMM,,MMM,,MTM,,,MM,,,,e,,,,,*M,MX
-D:XM,MMM,,MMM,,,MMM,,,MMM,,,,,,,,,MM+MMMMMMMMMMMMMM,,MM,,,,33,MMM,MMMMMM,,MMM,,,,3,3,,,,,M,MX
-D:XM,,MMM,,,MMM,,,MMM,,,MMM,,,,,,,,,,M,,,,M,3,M,3,M,,,MM,,,2,,,MMM,MMM,,MMM,,,,,,,2,,,,,,M,MX
-D:XMM,3,MMM,,,MMM,,,MMM,,,MMM,,,,,,,,M,,M,M,M,M,M,M,,,,M,,33,,,,,MM,,MMMM,,,,,,,,3,3,,,,,M,MX
+D:XM,,MMM,,,MMM,,,MMM,,,MMM,,,MMM,,,,M,,M,M,M,M,M,M,,,MM,,,*,,,,,MM,,MM,,,,,a,,,,,,,c,,,*M,MX
+D:XMMMM,,,MMM,,,MMM,,,MMM,,,MMM,,,,,,M,,M,M,M,M,M,M,,,,M,a,b,c,,,,M,,,M,,,,,,,,,,,,,,,,,,M,MX
+D:XMM,,,MMM,,,MMM,,,MMM,,,MMM,,,,,,,,M,,M,M,M,M,M,M,,,,M,,,,,,,,,MM,,MMMM,,,,,,,,,2,,,,,,M,MX
+D:XM,,MMM,,,MMM,,,MMM,,,MMM,,,,,,,,,,M,,,,M,,,M,,,M,,,MM,,,2,,,MMM,MMM,,MMM,,,,,,,,,,,,,,M,MX
+D:XM,MM,,,MMM,,,MMM,,,MMM,,,,,,,,,MM+MMMMMMMMMMMMMM,,MM,,,,,,,MMM,MMMMMM,,MMM,,,,,,,,,,,,M,MX
+D:XM,,,,MMM,,,,,,,,,MMM,,,,,,,,,,MM,,M,,,,,,,,,,TM,,MM,,,,,,MMM,,MMM,,MTM,,,MM,,,,b,,,,,*M,MX
+D:XMMMM,MMMMMMMMMMMMM,,,,,,,,,,,,M,h,M,MMMMMMMMMM,,MM,,,,,MMM,,MMM,,h,,MMM,,,MMMMMMMMMMMMM,MX
+D:XM>1M,,,,,,,,,,,,,MMM,*g,,2,,,,M,2,T,,,,,,h,,MMMMM,,,,MMT,,MMT,,,,*,,,MMM,,+,,,,,,,,,,,+,MX
+D:XMM,MMMMMMMMMMMM,MM,,,,,,,,,,,,M,*,M,MMMMMMMMMM,,MM,,,,,MMM,,MMM,,2,,MMM,,,MMMMMMMMMMMMM,MX
+D:XM,,,,MMM,,,,,,,,,MMM,,,,,,,,,,MM,,M,,,,,,,,,,TM,,MM,,,,,,MMM,,MMM,,MTM,,,MM,,,,e,,,,,*M,MX
+D:XM,MMM,,MMM,,,MMM,,,MMM,,,,,,,,,MM+MMMMMMMMMMMMMM,,MM,,,,,,,MMM,MMMMMM,,MMM,,,,,,,,,,,,M,MX
+D:XM,,MMM,,,MMM,,,MMM,,,MMM,,,,,,,,,,M,,,,M,,,M,,,M,,,MM,,,2,,,MMM,MMM,,MMM,,,,,,,2,,,,,,M,MX
+D:XMM,,,MMM,,,MMM,,,MMM,,,MMM,,,,,,,,M,,M,M,M,M,M,M,,,,M,,,,,,,,,MM,,MMMM,,,,,,,,,,,,,,,,M,MX
 D:XMMMM,,,MMM,,,MMM,,,MMM,,,MMM,,,,,,M,,M,M,M,M,M,M,,,,M,d,e,f,,,,M,,,+,,,,,,,,,,,,,,,,,,M,MX
-D:XMg3MMM,3,MMM,,,MMM,,,MMM,,,MMM,,,,M,,M,M,M,M,M,M,,,MM,,,*,,,,,MM3,MM,,,,d,,,,,,,f,,,,*M,MX
+D:XMg,MMM,,,MMM,,,MMM,,,MMM,,,MMM,,,,M,,M,M,M,M,M,M,,,MM,,,*,,,,,MM,,MM,,,,d,,,,,,,f,,,,*M,MX
 D:XMM*,,MMM,,,MMM,,,MMM,,,MMM,,,MMM,,M,,M,M,M,M,M,M,,MMMMMMMMMMMMM,,MM,,MMMMMMMMMMMMMMMMMM,MX
-D:XMMMM2,,,,3,,,MMM,,,,,,,,,MMM,,3MMMM,,M,3,M,3,M,,,M+,,,,,,,,,,,,,MM,,,,,,,,,,,,,,,,,,,,M,MX
+D:XMMMM2,,,,,,,,MMM,,,,,,,,,MMM,,,MMMM,,M,,,M,,,M,,,M+,,,,,,,,,,,,,MM,,,,,,,,,,,,,,,,,,,,M,MX
 D:XMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMX
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 
-P:22:90
\ No newline at end of file
+P:22:90
diff --git a/lib/mods/theme/edit/s_crypt.map b/lib/mods/theme/edit/s_crypt.map
index 3d6ce71c..e6600cd6 100644
--- a/lib/mods/theme/edit/s_crypt.map
+++ b/lib/mods/theme/edit/s_crypt.map
@@ -67,30 +67,30 @@ D:X.%%@=-=-X99X.....X..XLL..X%X..LLX..XhVV..X99X=-=-..GGX
 D:X%%@@...XXX9XX....XX.XX...X.X...XX.XXVVVVXX9XXX=-=.XGGX
 D:X@@@....X8X-=XgggggX..X..dX4Xd..X..XWWWWWX-=X8X-=-.XGGX
 D:X......XX%XX=XXgddgXX.XX8GXXXG8XX.XXWWWWXX-XX%XX...XGGX
-D:XIXIXXIX*X=X-=XgddggX..X8G^.^G8X..XWWWWWX-=X.X.X&&&XGGX
-D:XXXIXIXX*X-XX=XXggggXX.XXG^.^GXX.XXWWWWXX-XX.X.XX&&XGGX
-D:XXXXXIX**X=-X=-XIIXXXX..XG^.^GX..XVWWWVX=-XX.XddX@@XGGX
-D:X^^^^XX**X=-XX=XXIXIIXX.XX^.^XX.XXVVVVXX-XX%.XedXX@XGGX
-D:X^^f^Xe**X%%.X=-XXIXXIXbbX^.^XbbX.VV.XX=-XbX.XXXIX@IIGX
-D:X^^^XXe..X...XX=-XXXIXXXbXX.XXbXX...XX=-XXbX.XaaaXXXIGX
-D:X^^XXbbb.XGGG.XX=-XXIIXXbbXDXbbX...XX=-XXbbX.XaaaaXXIGX
-D:X^XXcbab.XVdG.cXX=-XXXIXXabXbaXX.XXX=-XXbbbX.XaaaaaXXfX
+D:XIXIXXIX*X=X-=XgddggX..X8G...G8X..XWWWWWX-=X.X.X&&&XGGX
+D:XXXIXIXX*X-XX=XXggggXX.XXG...GXX.XXWWWWXX-XX.X.XX&&XGGX
+D:XXXXXIX**X=-X=-XIIXXXX..XG...GX..XVWWWVX=-XX.XddX@@XGGX
+D:X....XX**X=-XX=XXIXIIXX.XX...XX.XXVVVVXX-XX%.XedXX@XGGX
+D:X..f.Xe**X%%.X=-XXIXXIXbbX...XbbX.VV.XX=-XbX.XXXIX@IIGX
+D:X...XXe..X...XX=-XXXIXXXbXX.XXbXX...XX=-XXbX.XaaaXXXIGX
+D:X..XXbbb.XGGG.XX=-XXIIXXbbXDXbbX...XX=-XXbbX.XaaaaXXIGX
+D:X.XXcbab.XVdG.cXX=-XXXIXXabXbaXX.XXX=-XXbbbX.XaaaaaXXfX
 D:X%XbbbbbbXVWG.%.XX.DbXDXXXbXbXXXDXbD.XX....G.XGGGGGGX%X
 D:XX.bababa%eWG.%.BXXXbcbbbbX.XbbbbcbXXXC...fX.%.......XX
 D:X%XbbbbbbXVWG.%.XX.DbXDXXXbXbXXXDXbD.XX....G.XGGGGGGX%X
 D:X8XXcbab.XVdG.cXX=-XXX.XXabXbaXXLXXX=-XXbbbX.XaaaaaXX.X
 D:X88XXbbb.XGGG.XX=-XX...XbbXDXbbXLLLXX=-XXbbX.XaaaaXXX.X
 D:XXXIXXe..X...XX=-XX.GGXXbXX.XXbXXILIXX=-XXbX.XaaaXXXX.X
-D:X9889Xe**X%%.X=-XXG.GdXbbX^.^XbbXILLIXX=-XbX.XXXIXhGG.X
-D:XXIXXXX**X=-XX=XXdG.GXX.XX^.^XX.XXILIIXX-XX%.XedXXXXX.X
-D:X99999X**X=-X=-XGGG..X..XI^a^IX..XILLIIX=-XX.XddX..eeeX
-D:XXXXIXXX*X=XX-XX....XX.XXI^a^IXX.XXILLIXX=XX.X.XX.GGGGX
-D:X^^^^^cX*X-X=-X.....X..X.I^a^I.X..XIILLIX=-X.X.Xdddd..X
-D:XllllX^XX%XX=XXG.GGXX.XX.IXXXI.XX.XXIILIXX-XX%XXXXXXX.X
-D:X^^^cl^=X8X-=XeG.GeX..X...X4X...X..XILLLIX-=X8X.aaaaaaX
-D:XLLX^l^-XXX9XXGG.GXX.XX...X.X...XX.XXLLLLXX9XXX.GGGGGGX
-D:X..L^l^=-X99X.....X..XWW..X%X..WWX..XLLLL.X99XXbbbbb..X
-D:X7.L^l^=-X8XX5...XX.XXWWW..c..WWWXX.XXLL.AXX8XXbbbbb.6X
+D:X9889Xe**X%%.X=-XXG.GdXbbX...XbbXILLIXX=-XbX.XXXIXhGG.X
+D:XXIXXXX**X=-XX=XXdG.GXX.XX...XX.XXILIIXX-XX%.XedXXXXX.X
+D:X99999X**X=-X=-XGGG..X..XI.a.IX..XILLIIX=-XX.XddX..eeeX
+D:XXXXIXXX*X=XX-XX....XX.XXI.a.IXX.XXILLIXX=XX.X.XX.GGGGX
+D:X.....cX*X-X=-X.....X..X.I.a.I.X..XIILLIX=-X.X.Xdddd..X
+D:XllllX.XX%XX=XXG.GGXX.XX.IXXXI.XX.XXIILIXX-XX%XXXXXXX.X
+D:X...cl.=X8X-=XeG.GeX..X...X4X...X..XILLLIX-=X8X.aaaaaaX
+D:XLLX.l.-XXX9XXGG.GXX.XX...X.X...XX.XXLLLLXX9XXX.GGGGGGX
+D:X..L.l.=-X99X.....X..XWW..X%X..WWX..XLLLL.X99XXbbbbb..X
+D:X7.L.l.=-X8XX5...XX.XXWWW..c..WWWXX.XXLL.AXX8XXbbbbb.6X
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 D:XXXXXXXIIIIXIIIIXXIIIXIIIIXXIIIXXXXggggXc..cXaaaaXbb.CX
 D:XIIIIIXIXXIIIXXIIXIXIXIXXIXXIXIXXXXgddg%....%aaaa%bb..X
diff --git a/lib/mods/theme/edit/s_doom.map b/lib/mods/theme/edit/s_doom.map
index 5be3b67d..12ff7d06 100644
--- a/lib/mods/theme/edit/s_doom.map
+++ b/lib/mods/theme/edit/s_doom.map
@@ -15,7 +15,7 @@ F:$:178:0
 F:%:205:0
 
 # Hidden Door
-F:+:48:0:0:0:0:0:0:0:177
+F:+:48:0:0:0:0:0:0:177
 
 # Normal Door
 F:D:32:0
@@ -29,12 +29,6 @@ F:L:85:0
 # Treasure (random) on shallow lava
 F:*:86:0:0:*
 
-# Trap (random) on deep lava
-F:^:85:0:0:0:0:0:*
-
-# Trap (random) on shallow lava
-F:t:86:0:0:0:0:0:*
-
 # up staircase
 F:<:6:0
 
@@ -194,28 +188,28 @@ D:X          #%%NNLL...JJJ....LL#
 D:X #####    #NNNN...Ljjjjj..LLL#   #############################################..1!!!!...L###  X
 D:X##.LL##   #nNNN...LLJJj.LLLLL#   #L....&!&!&....L%%%%%%%L..mRR%R%%M%MML%LL...DL...!1&..@L%%#  X
 D:X#LL<..#   #nn.LL.LLLL...%%%LL#   #..##########################################LLL....LLL%%%#  X
-D:X##%LL##   #....LLL%%LLL..^LLL#   #.L#                                        #LL2.t..q.LLL##  X
+D:X##%LL##   #....LLL%%LLL..LLLL#   #.L#                                        #LL2....q.LLL##  X
 D:X ###+#    #D##############+#######.L#                                       ##%%.LLLL&L...#   X
-D:X   #!#    #.#            #.......L%%#                                      ##%%LL..2...t.##   X
-D:X   #^#    #.############ ##########+#             XXXXXXXXXX                ##.9.t.LLLLL##    X
+D:X   #!#    #.#            #.......L%%#                                      ##%%LL..2.....##   X
+D:X   #L#    #.############ ##########+#             XXXXXXXXXX                ##.9...LLLLL##    X
 D:X   #.#    #LL%%%%LL...p#      #11111#             X########X     ###############.2..LQ#+#     X
-D:X  ##.#    ############D##     #11211#             X#9....9#X     #o.....t...#  ###^L..#(#     X
+D:X  ##.#    ############D##     #11211#             X#9....9#X     #o.........#  ###LL..#(#     X
 D:X  #L##             ##%%V##    #12221#        XXXXXX#..$$..#XXXXXX#LLLLKkk...#    ###D####     X
-D:X  ##!#            ##.VH^%##   #12221#        X######t....m######X#LLLLkkk.LL#      #.#        X
-D:X   #.#           ##.iH%%hv##  #11211###      X#sSSSrrt%.mVVVLLe#X#.LL.kkk...#     ##.#        X
-D:X ###D#########   #tiI%HHhvL#  #11111+9#      X#rRssRr.%.mVvvm..#X#%...LLL...#    ##Lo######   X
-D:X #.^t^LLL...L##  #.LIH%Hc..#  #########      X#.MmmM..%..MMLLL.#X#%%......L&#   ##.L##EBBB#   X
-D:X #.jJ%%%L....L#  ##..ICCL.##                 X#.L..L..%ttL.....#X########D###   #.####LAAB##  X
+D:X  ##!#            ##.VHL%##   #12221#        X######.....m######X#LLLLkkk.LL#      #.#        X
+D:X   #.#           ##.iH%%hv##  #11211###      X#sSSSrr.%.mVVVLLe#X#.LL.kkk...#     ##.#        X
+D:X ###D#########   #.iI%HHhvL#  #11111+9#      X#rRssRr.%.mVvvm..#X#%...LLL...#    ##Lo######   X
+D:X #.L.LLLL...L##  #.LIH%Hc..#  #########      X#.MmmM..%..MMLLL.#X#%%......L&#   ##.L##EBBB#   X
+D:X #.jJ%%%L....L#  ##..ICCL.##                 X#.L..L..%..L.....#X########D###   #.####LAAB##  X
 D:X #JJJJL%LLL&..#   ##..L.L##                  X#9LLL...%..LL(LLq#X   #..L..#     #.LL..LB%%L#  X
-D:X #J%J..LLL%%LL##   ##.t.##                   X######......######X   #L.####     ###..LL%%%L## X
-D:X #jJJ^..bL%LL..##   ##D#################     XXXXXX#.LUUL.#XXXXXX   #.L#          #.PL%%%@(L# X
-D:X ##....BABLL..L.##   #.uLL^L..L%^^..L%%#          X#.L%%LL#X        #L.####       ###.L%LL..##X
-D:X  ##....B%%L.....##  #################L#          X#LLL..t#X        #..twW#        #L..LL...+pX
+D:X #J%J..LLL%%LL##   ##...##                   X######......######X   #L.####     ###..LL%%%L## X
+D:X #jJJL..bL%LL..##   ##D#################     XXXXXX#.LUUL.#XXXXXX   #.L#          #.PL%%%@(L# X
+D:X ##....BABLL..L.##   #.uLLLL..L%LL..L%%#          X#.L%%LL#X        #L.####       ###.L%LL..##X
+D:X  ##....B%%L.....##  #################L#          X#LLL...#X        #...wW#        #L..LL...+pX
 D:X  ###....LLL...LLL####################.#          X#%L..7.#X        #####L#      ###LL...1###oX
-D:X  #9+L%%L...LLL....D.+..%%oF.%%^..%%LL.#          X#LLLLt.#X            #p#      #%%%!@..## #tX
-D:X  ##################L###.L###..###.L####          X#7tt.LL#X            #.#      #########  #EX
+D:X  #9+L%%L...LLL....D.+..%%oF.%%L..%%LL.#          X#LLLL..#X            #p#      #%%%!@..## #.X
+D:X  ##################L###.L###..###.L####          X#7...LL#X            #.#      #########  #EX
 D:X  ##################.# ##############             X#.LLLL.#X       ######D###################LX
-D:X      ##11!!!&LL.+(#L#                            X#LL%%LL#X       #G..LLL.LL...D..LL....^LLL%X
+D:X      ##11!!!&LL.+(#L#                            X#LL%%LL#X       #G..LLL.LL...D..LL....LLLL%X
 D:X     ##1!!!%%%%Lp###L#                            X#L%%%%Q#X       #..LF....K...##############X
 D:X     ##!!%%%%%LLL..#.#                            XXXXDDXXXX########.LLLL..KKK..####          X
 D:X      ##.LLLLLLL...+.#                               #%%%%%%%%%%%%%+LL7..LL.k..L+o7#          X
diff --git a/lib/mods/theme/edit/s_factory.map b/lib/mods/theme/edit/s_factory.map
index 0cc3de1b..02d3e5f9 100644
--- a/lib/mods/theme/edit/s_factory.map
+++ b/lib/mods/theme/edit/s_factory.map
@@ -83,65 +83,62 @@ F:<:6:0
 F:>:7:0
 
 # between gate 1
-F:1:160:6:0:0:0:0:0:845
+F:1:160:6:0:0:0:0:845
 
 # between gate 2
-F:2:160:6:0:0:0:0:0:846
+F:2:160:6:0:0:0:0:846
 
 # between gate 3
-F:3:160:6:0:0:0:0:0:4370
+F:3:160:6:0:0:0:0:4370
 
 # between gate 4
-F:4:160:6:0:0:0:0:0:3339
+F:4:160:6:0:0:0:0:3339
 
 # between gate 5
-F:5:160:6:0:0:0:0:0:4119
+F:5:160:6:0:0:0:0:4119
 
 # between gate 6
-F:6:160:6:0:0:0:0:0:6659
+F:6:160:6:0:0:0:0:6659
 
 # between gate 7
-F:7:160:6:0:0:0:0:0:9257
+F:7:160:6:0:0:0:0:9257
 
 # between gate 8
-F:8:160:6:0:0:0:0:0:8018
+F:8:160:6:0:0:0:0:8018
 
 # between gate 9
-F:9:160:6:0:0:0:0:0:9298
+F:9:160:6:0:0:0:0:9298
 
 # between gate A
-F:A:160:6:0:0:0:0:0:805
+F:A:160:6:0:0:0:0:805
 
 # between gate B
-F:B:160:6:0:0:0:0:0:831
+F:B:160:6:0:0:0:0:831
 
 # between gate D
-F:D:160:6:0:0:0:0:0:809
+F:D:160:6:0:0:0:0:809
 
 # between gate E
-F:E:160:6:0:0:0:0:0:2826
+F:E:160:6:0:0:0:0:2826
 
 # between gate F
-F:F:160:6:0:0:0:0:0:2831
+F:F:160:6:0:0:0:0:2831
 
 # between gate H
-F:H:160:6:0:0:0:0:0:4631
+F:H:160:6:0:0:0:0:4631
 
 # between gate J
-F:J:160:6:0:0:0:0:0:7198
+F:J:160:6:0:0:0:0:7198
 
 # between gate K
-F:K:160:6:0:0:0:0:0:7990
+F:K:160:6:0:0:0:0:7990
 
 # between gate N
-F:N:160:6:0:0:0:0:0:9253
+F:N:160:6:0:0:0:0:9253
 
 # Treasure on floor
 F:$:1:0:0:*65
 
-# Trap (random) on floor
-F:^:1:0:0:0:0:0:*
-
 
 ### Monsters
 
@@ -203,9 +200,9 @@ D:X&XXXe.XX~XXeeeXX~XXe..XX~~~~~~ttttXX.....X,,,,Ll,ll,X..XII.X.X.i.XXG_XXXXL%%L
 D:X..&..XX~~~XXeXX~?~XX.&X~~~~t~ttttttX.;.;.X,lllll,ll,XX_..XX.XX#X..X#XXf.X_GG_X.fX
 D:XGXGXGX?~~~~_c_~~~~~X.&XX~~~~t~ttttXX.....X,L,,,,,lL,.X.#XXi..G.XXiX..XX.........X
 D:X.....XX~~?XXcXX~~~XXa..XXX__XX__XXXX.;.;.X,L,.XXX%L%XXXXcXX.XXX.X.X.X.XX.X.ff.X.X
-D:XXgXgXgXX~XXcccXX?XXXXX.a^^a.^^a...bXXXGXXX%L%XX.XX%XXa.aXIX.Xi#.XiXI.X.X........X
-D:XgXgXgXgXXX^^^^^XXX,ccXXXXXXXXXXXb.XX#...#XX%XX.XI_XX....X.X.#XXXIX.#GX.X.X....X.X
-D:X.......4X.^^5^^.X.c.c..c..c.c..c.XX.#...#.XXXIXX.X.a.c..XXi..I.X._.X.XXX...&&...X
+D:XXgXgXgXX~XXcccXX?XXXXX.a..a...a...bXXXGXXX%L%XX.XX%XXa.aXIX.Xi#.XiXI.X.X........X
+D:XgXgXgXgXXX.....XXX,ccXXXXXXXXXXXb.XX#...#XX%XX.XI_XX....X.X.#XXXIX.#GX.X.X....X.X
+D:X.......4X...5...X.c.c..c..c.c..c.XX.#...#.XXXIXX.X.a.c..XXi..I.X._.X.XXX...&&...X
 D:X..&&...XXXXXXXXXXc,c,c.XX_XX..ccXX..#...#..XX#iiX.X.a..a.XX.#XX._X.XX.XX.X....X.X
 D:X......XXEX,,,c,c,cc,ccXXMRMXXc.XX...#...#...XXX#iXXXXXc..IXGX.XXiX.....X........X
 D:XXXXXXXX..X,,,,,,,,,,,XXM..RMXXXX$$XXX...XXX$$XX..XX_GXXXXXX.Ii.X_X.X#XXX.X....X.X
@@ -217,20 +214,20 @@ D:Xs.s._..&.&.XlX_._XlX..gg....X$$$#....%%%....#$$$X.IIX.X..XIXX.X.G#X..dXLl#_._
 D:X.s.s_g....XXlXXGXXlXX.g..d&.XX$$XXXXX...XXXXX$$XXXX._XG#X.XX.X_X.XX.c.XXXX...XXXX
 D:XXXXXXXXXXIXLLLXGXLLLXgg.g.d..XX$$$XXX...XXX$$$XX<...XiXX.X.Xi.X.X.Xd..X.........X
 D:Xgg.gXg.gXIXL%LXGXL%LXGXXX__XXXXX$$XXX...XXX$$XXXXXXIXXiX#XX#XX#X_XX...XXXXXXXIXXX
-D:X^^X^X^X^X^XX_XXGXX_XXGXXg..g.%.XX...X...X...XX.GI.X._iXXG...I..I.GX..dIX#I#I#I#IX
-D:X^^X^X^X^X^Xhl,&c.a&g.l.XX.g.g%RRXX..X###X..XX..#_X..XXX_iXXIXiXi_.Xc..X.IX.XXXIXX
-D:X^^X^X^X^X^X&,,,l&,lac.&.__.g.%.R.XX...>...XX#X.X..XX#.._X.X.X.#.XGX.X.XX_XX.X#i.X
+D:X..X.X.X.X.XX_XXGXX_XXGXXg..g.%.XX...X...X...XX.GI.X._iXXG...I..I.GX..dIX#I#I#I#IX
+D:X..X.X.X.X.Xhl,&c.a&g.l.XX.g.g%RRXX..X###X..XX..#_X..XXX_iXXIXiXi_.Xc..X.IX.XXXIXX
+D:X..X.X.X.X.X&,,,l&,lac.&.__.g.%.R.XX...>...XX#X.X..XX#.._X.X.X.#.XGX.X.XX_XX.X#i.X
 D:XH.Xg.gXg.gXla,ca&,f.fl.leXX..%R.RRXX.....XX.G.XX#XXI.XX.#.XGXXXiX.#X.XX.i._X.XGX#
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXGXXXXXXXG.X..X#XXX.XX.XXI._XIX.XIXXI#.XXX.X
 D:X,.,G,&&,ee,ff,hgg,&&,,,.,,I7XXXc..aX.;.;.X&..XXXG#XX.G.XXX..XG######.G.#..##..iXX
-D:X^X,G.&&.ee,ff..gg,&&,.,,,,XXX..MRM.X.....X.....XXX.IIX.XGI.XX..IXXXXXXXXXXX._.X._
-D:X^X,XXXXXXXXXXX.XXXXXX,,.XXX..$.....X.;.;.Xh..&...GXXXGXi#IXX.IXX..#.....#.XX##XXX
-D:X^X,llL,LlLL,LXXXlll,XXXXX..aMR..$.cX.....X.....XXXX8XXXXXXXX#IX###..##.#..#XI.XKX
-D:X^XlLCCCCCCCCLllll%%l.R.R.R.R..M.R..X.;.;.X&..XXX.#X#.i.#.XXX#X...###.#.##.#.X#IXX
-D:X^X,lL,llL,Ll,XXX,lllXXXXXc.M..R.c..X.....XXXXX#.#.XIX#Xi.X...X###.#####.#...X#XXX
-D:X^X,XXXXXXXXXXX.XXXXXX,.,XXX...$.M..X.;.;.Xh.##i#.#XX_IX.#X.##I....#.#.###.##X#I.X
-D:X^X.G,&&,,gg.&.,ee,ff,,.,.,XXXa..R..X.....X..#.###.XIXX.X.X.##XX####..#..###II.X.X
-D:X,,,G,&&,,gg.&h.ee,ff,..,.,I^XXXM..9X.;J;.Xh.##.###..iiX#.X....II.....#....IX..XNX
+D:X.X,G.&&.ee,ff..gg,&&,.,,,,XXX..MRM.X.....X.....XXX.IIX.XGI.XX..IXXXXXXXXXXX._.X._
+D:X.X,XXXXXXXXXXX.XXXXXX,,.XXX..$.....X.;.;.Xh..&...GXXXGXi#IXX.IXX..#.....#.XX##XXX
+D:X.X,llL,LlLL,LXXXlll,XXXXX..aMR..$.cX.....X.....XXXX8XXXXXXXX#IX###..##.#..#XI.XKX
+D:X.XlLCCCCCCCCLllll%%l.R.R.R.R..M.R..X.;.;.X&..XXX.#X#.i.#.XXX#X...###.#.##.#.X#IXX
+D:X.X,lL,llL,Ll,XXX,lllXXXXXc.M..R.c..X.....XXXXX#.#.XIX#Xi.X...X###.#####.#...X#XXX
+D:X.X,XXXXXXXXXXX.XXXXXX,.,XXX...$.M..X.;.;.Xh.##i#.#XX_IX.#X.##I....#.#.###.##X#I.X
+D:X.X.G,&&,,gg.&.,ee,ff,,.,.,XXXa..R..X.....X..#.###.XIXX.X.X.##XX####..#..###II.X.X
+D:X,,,G,&&,,gg.&h.ee,ff,..,.,I.XXXM..9X.;J;.Xh.##.###..iiX#.X....II.....#....IX..XNX
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 
 
diff --git a/lib/mods/theme/edit/s_gates.map b/lib/mods/theme/edit/s_gates.map
index 3ac7ccbf..37d39f22 100644
--- a/lib/mods/theme/edit/s_gates.map
+++ b/lib/mods/theme/edit/s_gates.map
@@ -55,35 +55,35 @@ F:1:1:0:0:0:0:10
 
 ### Level design
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-D:X*****...@%...aX.X9@********%%%%%%X9.VV....Xd.............A^^.......dX
-D:X*****...@%...aX.X@@********%%%%%%X.VVVV.X.XX.............B^^........X
-D:X*****...@%...aX.X99*XXX****%%88%%XVVWWVVX..XX.............^^.......9X
-D:X*****...@%...aX.X@@XXdXX***%%88%%XVVWWVVX...XX............^^.......CX
-D:X*****...@%...aX.X@XX...XX**%%%%%%X.VVVV.X.X..XX..........5^^........X
-D:X........@%...aX.XXX.....XX*%%%%%%X9.VV..X.XX..XX.........F^^.......dX
+D:X*****...@%...aX.X9@********%%%%%%X9.VV....Xd.............A.........dX
+D:X*****...@%...aX.X@@********%%%%%%X.VVVV.X.XX.............B..........X
+D:X*****...@%...aX.X99*XXX****%%88%%XVVWWVVX..XX......................9X
+D:X*****...@%...aX.X@@XXdXX***%%88%%XVVWWVVX...XX.....................CX
+D:X*****...@%...aX.X@XX...XX**%%%%%%X.VVVV.X.X..XX..........5..........X
+D:X........@%...aX.XXX.....XX*%%%%%%X9.VV..X.XX..XX.........F.........dX
 D:X%X......@%...aX.X........XIXXXXXXXXXXX..X..XX..XXXXIXXXXXXXXXXXXXXXXX
 D:X.XXX....@%...aX.X..........XXX..>X...X..X...XX..XXXaXaXaXaXaXaXaXaXaX
 D:X...XXX..@%...aI.X..........XXX7..X...D..X.X..XX..XX.................X
 D:X.....XXX@%...aX.X..........XXXXXXXXXXX..X.XX..XX..XX................X
 D:X.......XXX...aX.X..........XXXXXXXaG....X..XX..XX..XX...............X
-D:X..X......XXX.XX%XX^^^^^X...XXXXXXXaG....X...XX..XX..XX..............X
-D:X^^XX.......XXX***X^^^^^X...XIIII7XXXXXXXXXX..XX..XX..XXXXXXXXXXXX+X8X
-D:X^^XX.........X.6.X^^^^^X...XIXXXXX&&&&&&&&XX..XX..XX...........cX.XXX
-D:X..XXX........X***X^^^^^X...XIXXXXX.........XX..XX..XXXXXXXXXXXXXX..XX
-D:X^^X8X........XXXXX^^^^^X...XIIIIIXVVV.......XX..XX.............bXX..X
+D:X..X......XXX.XX%XX.....X...XXXXXXXaG....X...XX..XX..XX..............X
+D:X..XX.......XXX***X.....X...XIIII7XXXXXXXXXX..XX..XX..XXXXXXXXXXXX+X8X
+D:X..XX.........X.6.X.....X...XIXXXXX&&&&&&&&XX..XX..XX...........cX.XXX
+D:X..XXX........X***X.....X...XIXXXXX.........XX..XX..XXXXXXXXXXXXXX..XX
+D:X..X8X........XXXXX.....X...XIIIIIXVVV.......XX..XX.............bXX..X
 D:X..X8XX................XX...XXXXXIXVVVV.......XX..XXXXXXXXXXXXXXXXXX+X
-D:X^^X88X................XX...XIIIIIXVVVVVV..@...XX.^^^^^^^^^^^^^a.....X
-D:X^^X99XX...............XX...XIXXXXX4..VVVV......XXXXXXXXXXXXXXXXXXXXXX
+D:X..X88X................XX...XIIIIIXVVVVVV..@...XX..............a.....X
+D:X..X99XX...............XX...XIXXXXX4..VVVV......XXXXXXXXXXXXXXXXXXXXXX
 D:X..X999X...............XX...XIXXXXXXXXX.VVVV....***********.........bX
-D:X^^XIIIXX..............XX...XIX...5..fX...VVVVV.@....................X
+D:X..XIIIXX..............XX...XIX...5..fX...VVVVV.@....................X
 D:X..X....X........d.....XX...XIXf......X...VVVVVVV...............@....X
-D:X^^X....XX............XXX...XIXXXXXXXXX.......VVVVVVV................X
-D:X^^X&&&&&X............XXX...XIIIIIXe...........VVVVVVVVVVVV..........X
+D:X..X....XX............XXX...XIXXXXXXXXX.......VVVVVVV................X
+D:X..X&&&&&X............XXX...XIIIIIXe...........VVVVVVVVVVVV..........X
 D:X..X%%%.%XX..........XXX....XXXXXIX.............@VVVVVVVVVVVV@.......X
-D:X^^X88%.%8X.........XXX.....XXXXXIX...................VVVVVVVVVV.....X
+D:X..X88%.%8X.........XXX.....XXXXXIX...................VVVVVVVVVV.....X
 D:X..X%%%.%%XX........XX......XXXXXIX@.....................VVVVVVVVVVVVX
-D:X^^X......cX......XXXX......XXXXXIX........@..........@....VVVVVVVVVVX
-D:X^^^......cXX888XXXXX......dIIIIIIX.........................b.VVV...6X
+D:X..X......cX......XXXX......XXXXXIX........@..........@....VVVVVVVVVVX
+D:X.........cXX888XXXXX......dIIIIIIX.........................b.VVV...6X
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
@@ -97,9 +97,9 @@ D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXLgXXXXXXXXXXXXXXXXXXXXXXXXLLLLXXXXXXXXXXXX
 D:XXXXXXXXXXXXXXXXXXXfXXXXXXXXLXXXXXXXXXXXXXXXXXXXXXXXXXgLLLLXXXXXXXXXXX
 D:XXXXXXXXXXXXXXXXXXX.XXXXXXXghgXXXXbXXXXXXXXaXXXXXXXXXXXXXXLLLLgXXXXXXX
 D:XXXXXXXXXXXXXXXXXXX.XXXXXXXg1gXXXX.XXXXXXXX.XXXXXXXXXXXXXXXXgLLXXXXXXX
-D:XXXXXXXXXXXXXXXXXXX^XXXXXXXXXXXXXX^XXXXXXXX^XXXXXXXXXXXXXXXXXXLXXXXXXX
-D:XXXXXXXXXXXXXXX4..^^^..^^^.......^^^......^^^.........EXXXXXXXLXXXXXXX
-D:XXXXXXXXXXXXXXXXXXXXXXXX^XXXXXXXXX^XXXXXXXX^XXXXXXXXXXXXXXXXXLLXXXXXXX
+D:XXXXXXXXXXXXXXXXXXX.XXXXXXXXXXXXXX.XXXXXXXX.XXXXXXXXXXXXXXXXXXLXXXXXXX
+D:XXXXXXXXXXXXXXX4......................................EXXXXXXXLXXXXXXX
+D:XXXXXXXXXXXXXXXXXXXXXXXX.XXXXXXXXX.XXXXXXXX.XXXXXXXXXXXXXXXXXLLXXXXXXX
 D:XXXXXXXXXXXXXXXXXXXXXXXX.XXXXXXXXX.XXXXXXXX.XXXXXXXXXXXXXXXXLLLXXXXXXX
 D:XXXXXXXXXXXXXXXXXXXXXXXX.XXXXXXXXXcXXXXXXXXaXXXXXXXXXXXXXXXLLXXXXXXXXX
 D:XXXXXXXXXXXXXXXXXXXXXXXXeXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXgLLLXXXXXXXXXX
diff --git a/lib/mods/theme/edit/s_info.txt b/lib/mods/theme/edit/s_info.txt
index 40c0d41e..0384f153 100644
--- a/lib/mods/theme/edit/s_info.txt
+++ b/lib/mods/theme/edit/s_info.txt
@@ -14,157 +14,124 @@
 # N:idx:name
 # D:desc
 # A:action mkey:action desc
-# I:rate
 
 # E:exclusive skill:exclusive skill
-# O:skill:opposing skill%percent
 # A:skill:friendly skill%percent
 
 # T:father:child
 
-# Version stamp (required)
-
-V:2.0.0
-
 ################################## MAGIC ##################################
 
 N:56:Magic-Device
 D:Eases the use of magical devices, such as wands, staves and rods
 D:It also helps pseudo-id of magic objects
-I:1000
 F:RANDOM_GAIN
 
 N:54:Spell-learning
 D:You should not see that ! that is a BUG!
 #A:18:Learn a spell from a realm
-I:1000
 F:HIDDEN
 
 N:41:Sorcery
 D:Ability to use all the magic schools as if their skill was sorcery
 D:But the price to channel that much magic is your health
 A:17:Cast a spell
-I:1000
 
 N:1:Conveyance
 D:Ability to learn and use spells from the Conveyance school
 D:Spells use the intelligence stat
 A:17:Cast a spell
-I:1000
 F:RANDOM_GAIN
 
 N:2:Mana
 D:Ability to learn and use spells from the Mana school
 D:Spells use the intelligence stat
 A:17:Cast a spell
-I:1000
 
 N:3:Fire
 D:Ability to learn and use spells from the Fire school
 D:Spells use the intelligence stat
 A:17:Cast a spell
-I:1000
 
 N:4:Air
 D:Ability to learn and use spells from the Air school
 D:Spells use the intelligence stat
 A:17:Cast a spell
-I:1000
 
 N:5:Water
 D:Ability to learn and use spells from the Water school
 D:Spells use the intelligence stat
 A:17:Cast a spell
-I:1000
 
 N:6:Nature
 D:Ability to learn and use spells from the Nature school
 D:Spells use the intelligence stat
 A:17:Cast a spell
-I:1000
 F:RANDOM_GAIN
 
 N:7:Earth
 D:Ability to learn and use spells from the Earth school
 D:Spells use the intelligence stat
 A:17:Cast a spell
-I:1000
 
 N:10:Divination
 D:Ability to learn and use spells from the Divination school
 D:Spells use the intelligence stat
 A:17:Cast a spell
-I:1000
 F:RANDOM_GAIN
 
 N:11:Temporal
 D:Ability to learn and use spells from the Temporal school
 D:Spells use the intelligence stat
 A:17:Cast a spell
-I:1000
 
 N:14:Meta
 D:Ability to learn and use spells from the Meta school
 D:Spells use the intelligence stat
 A:17:Cast a spell
-I:1000
 
 N:51:Mind
 D:Ability to learn and use spells from the Mind school
 D:Spells use the intelligence stat
 A:17:Cast a spell
-I:1000
 
 N:55:Udun
 D:Ability to learn and use spells from the Udun school
 D:Spells use the intelligence stat
 A:17:Cast a spell
-I:1000
 F:HIDDEN
 
 N:13:Demonology
 D:Ability to use incantations from the Demonblades
 D:Spells use the intelligence stat
 A:17:Cast a spell
-I:1000
 
 N:31:Necromancy
 D:Ability to harness the powers of the dead
 D:Spells use the intelligence stat
 A:7:Use Necromancy
-I:1000
 F:RANDOM_GAIN
 G:60
 
-N:34:Runecraft
-D:Ability to combine magic runes to create your own spells
-D:Runespells use the dexterity stat
-A:9:Use Runespells
-I:1000
-
 N:43:Thaumaturgy
 D:Ability to gain and cast innate spells
 D:Spells use the intelligence stat
 A:8:Cast a thaumaturgy spell
-I:1000
 F:RANDOM_GAIN
 
 N:15:Magic
 D:General ability to do magic, also affects mana reserves and
 D:magic device ability. Helps pseudo-id of magic objects
 A:19:Copy a spell
-I:1000
 F:RANDOM_GAIN
 
 N:45:Spell-power
 D:Ability to increase the power of spells
-I:1000
 
 N:59:Geomancy
 D:Ability to understand the raw elemental forces of nature and use
 D:them to your advantage. Most spells need Fire/Water/Earth/Air skills
 A:101:Use Geomancy
-I:1000
 
 # All magic skills affect magic skill
 f:Magic-Device:Magic%7
@@ -188,7 +155,6 @@ f:Mind:Magic%10
 f:Udun:Magic%10
 f:Demonology:Magic%10
 f:Necromancy:Magic%4
-f:Runecraft:Magic%12
 f:Thaumaturgy:Magic%6
 
 
@@ -198,82 +164,66 @@ f:Thaumaturgy:Magic%6
 N:16:Combat
 D:General ability to fight and to pseudo-id armour and weapons
 D:It also allows the use of heavier armour without penalties
-I:1000
 F:RANDOM_GAIN
 
 N:17:Weaponmastery
 D:General ability to use melee weapons
-I:1000
 F:RANDOM_GAIN
 
 N:18:Sword-mastery
 D:Ability to use swords
-I:1000
 
 N:19:Axe-mastery
 D:Ability to use axes
-I:1000
 
 N:20:Polearm-mastery
 D:Ability to use polearms
-I:1000
 
 N:21:Hafted-mastery
 D:Ability to use hafted weapons
-I:1000
 
 N:22:Backstab
 D:Ability to backstab fleeing and sleeping monsters to increase damage
-I:1000
 
 N:23:Archery
 D:General ability to use ranged weapons
-I:1000
 F:RANDOM_GAIN
 
 N:24:Sling-mastery
 D:Ability to use slings
 A:23:Fire piercing shots
-I:1000
 
 N:25:Bow-mastery
 D:Ability to use bows
 A:23:Fire piercing shots
-I:1000
 
 N:26:Crossbow-mastery
 D:Ability to use crossbows
 A:23:Fire piercing shots
-I:1000
 
 N:27:Boomerang-mastery
 D:Ability to use boomerangs
-I:1000
 
 N:58:Boulder-throwing
 D:Ability to make and throw boulders
 A:21:Tear down a wall to create boulders
-I:1000
 F:RANDOM_GAIN
 
 N:42:Barehand-combat
 D:Ability to fight barehanded
-I:1000
 F:RANDOM_GAIN
 G:70
 
 N:47:Bearform-combat
 D:Ability to fight in bear form
-I:1000
-F:HIDDEN | AUTO_HIDE
+F:AUTO_HIDE
+F:HIDDEN
 
 N:52:Critical-hits
 D:Ability to deal critical hits with swords < 5lb
-I:1000
 
 N:57:Stunning-blows
 D:Ability to stun opponents when doing critical hits with hafted weapons > 5 lb
-I:1000
 
 # List of combat friendly skills
 
@@ -305,41 +255,28 @@ f:Boomerang-mastery:Combat%7
 f:Barehand-combat:Combat%50
 f:Boulder-throwing:Combat%40
 
-# No more, let's see how it turns out
-# Sorcery and Weaponmastery aren't exactly friendly to each other
-#O:Sorcery:Weaponmastery%100
-#O:Sorcery:Archery%100
-#O:Sorcery:Barehand-combat%100
-#O:Weaponmastery:Sorcery%100
-#O:Archery:Sorcery%100
-#O:Barehand-combat:Sorcery%100
-
 
 
 ############################### SPIRITUALITY SKILLS ###########################
 
 N:28:Spirituality
 D:General ability to use spiritual skills and also influence your Saving Throw
-I:1000
 F:RANDOM_GAIN
 
 N:53:Prayer
 D:Ability to learn and use spells from the gods' schools
 D:Spells use the wisdom stat and cost piety instead of mana
 A:17:Cast a spell
-I:1000
 
 N:12:Druidistic
 D:Ability to learn and use prayers from the Druidistic realm
 D:Nature powers use the wisdom stat
 A:1:Cast a druidistic spell
-I:1000
 
 N:29:Mindcraft
 D:Ability to focus the powers of the mind
 D:Mindpowers use the wisdom stat
 A:2:Use Mindcraft
-I:1000
 F:RANDOM_GAIN
 G:50
 
@@ -347,7 +284,6 @@ N:9:Music
 D:Ability to learn and sing songs
 D:Songs use the charisma stat
 A:17:Cast a spell
-I:1000
 
 f:Prayer:Spirituality%10
 f:Druidistic:Spirituality%10
@@ -364,12 +300,10 @@ f:Music:Magic%10
 
 N:30:Misc
 D:Not a real skill, it is only used to regroup some skills
-I:0
 
 N:33:Antimagic
 D:Ability to generate an antimagic field
 A:3:Use antimagic
-I:1000
 F:RANDOM_GAIN
 G:80
 
@@ -390,7 +324,6 @@ E:Nature:Antimagic
 E:Udun:Antimagic
 E:Sorcery:Antimagic
 E:Demonology:Antimagic
-E:Runecraft:Antimagic
 E:Necromancy:Antimagic
 E:Mindcraft:Antimagic
 E:Music:Antimagic
@@ -400,37 +333,21 @@ E:Thaumaturgy:Antimagic
 
 ################################## SNEAKINESS SKILLS ###############################
 
-N:35:Sneakiness
-D:General ability at the sneakiness skills.
-D:It also affects the searching abilities
-I:0
-F:RANDOM_GAIN
-
 N:36:Stealth
 D:Ability to move unnoticed, silently
-I:0
-F:RANDOM_GAIN
-
-N:37:Disarming
-D:Ability to disarm the various traps
-I:0
 F:RANDOM_GAIN
 
 N:40:Stealing
 D:Ability to steal objects
 A:15:Steal object
-I:0
 
 N:46:Dodging
 D:Ability to dodge blows and bolts
 A:16:Check dodge chance
-I:0
 
-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 ################################
@@ -438,38 +355,32 @@ f:Dodging:Sneakiness%10
 N:48:Monster-lore
 D:General ability at the monster related skills, ability to gain experience
 D:from friendly kills. It also affects the number of companions you can have
-I:0
 A:22:Turn pet into companion
 F:RANDOM_GAIN
 
 N:44:Summoning
 D:Ability to create totems from monsters and use them to summon monsters
 A:13:Manipulate totems
-I:1000
 F:RANDOM_GAIN
 G:60
 
 N:49:Corpse-preservation
 D:Ability not to destroy the monsters' corpses when killing them
-I:0
 
 N:50:Possession
 D:Ability to incarnate into monsters
 A:11:Use the possession skill
-I:0
 
 N:8:Symbiosis
 D:Ability to enter in symbiosis with monsters unable to move by themselves
 D:Spells use the intelligence stat
 A:20:Use symbiotic powers
-I:1000
 F:RANDOM_GAIN
 G:70
 
 N:32:Mimicry
 D:Ability to use cloaks of mimicry to change form
 A:6:Use Mimicry
-I:1000
 F:RANDOM_GAIN
 G:80
 
@@ -499,12 +410,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
@@ -521,7 +430,6 @@ T:Magic:Nature
 T:Magic:Udun
 T:Magic:Demonology
 T:Magic:Necromancy
-T:Magic:Runecraft
 T:Magic:Thaumaturgy
 
 T:Geomancy:Fire
diff --git a/lib/mods/theme/edit/s_name.map b/lib/mods/theme/edit/s_name.map
index 795d8786..e1a352ef 100644
--- a/lib/mods/theme/edit/s_name.map
+++ b/lib/mods/theme/edit/s_name.map
@@ -62,46 +62,46 @@ F:1:1:0:0:0:0:16
 
 ### Level Design
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-D:X.....LLLLLLLLL.....XXX.G=-&&=-G^.........>X
-D:X.LLL...........LLLXX...G=-&.=-G^........1.X
-D:X.L9L.LLLLLLLLLLLLX%...EGE.=&.FG^..........X
-D:X.L99.L&..........X%....G..&-..G^....j.....X
-D:X.LLLLL&LLLLLLLLL.LXX...G=-=&-=G^..........X
-D:X....&&&L.......L.L*XXX.G-=&&-=G^^^^^^^^^^^X
+D:X.....LLLLLLLLL.....XXX.G=-&&=-G..........>X
+D:X.LLL...........LLLXX...G=-&.=-G.........1.X
+D:X.L9L.LLLLLLLLLLLLX%...EGE.=&.FG...........X
+D:X.L99.L&..........X%....G..&-..G.....j.....X
+D:X.LLLLL&LLLLLLLLL.LXX...G=-=&-=G...........X
+D:X....&&&L.......L.L*XXX.G-=&&-=G...........X
 D:XLLLLLLLL.LLLLL..&L**XXXXXXXGGGG%XXXXXXXXXXX
-D:XXXXXXLL..L***LLLLLLLX^^^^8Xi....%@@^^.^^@@X
-D:X5..8X.&.XXXXXX......D^^^^8XIIIIIXbb^^.^^ccX
-D:X...8X...XA...X.LLLLLX^^^^8X.....X..^^.^^..X
-D:X...8X.XXXC...X.LL...XXXIXXX^^^^^X..^^.^^..X
-D:XGXXXX.LfX7...X&LL.L.Xa^^^aXf...fX..^^.^^..X
-D:X.X5XL.L*XB...X&&..L.X^b^b^X^^^^^X..^^.^^..X
-D:X.X^XL.L*XXXXXXLLLLL.X^^7^^X.....X..^^.^^..X
-D:X.X^XL.L***fXL.....&&X^b^b^XIIIIIX..^^.^^..X
-D:X.X^XL.LLLLLXL.LLLLLLXa^^^aXi....X..^^.^^..X
-D:X.X^XL.........XXXXXXXXX%XXXXXXXXX..^^.^^..X
-D:X.X^XXXXXXXXXXLX^...^Xe-^=dX^^..&X..^^.^^..X
-D:X.X^^^^^^^^^^XLX.^^^.X-^^^=X^^..&X..^^.^^..X
-D:X.XXXXXXXXXX^X8Xf^B^.%^^6^^%^^C.&X..^^.^^..X
-D:X.LLLLLLLLL+^XXX.^^^.X-^^^=X^^..&X..^^.^^..X
-D:X.XXXXXXXXXXXXXX^...^Xd-^=eX^^..&X..^^.^^..X
-D:X.Xbbbbb......XXXXXXXXXX%XXXXXXXXX..^^.^^..X
-D:X.XbbbbXXXX^^^^XX....X^^^^^X...h.X..^^.^^..X
-D:X.XbbbXX^^XXX^^^XX...X^ccc^X....0X..^^.^^..X
-D:X.XbbXX.^X%bXX^^^XX..X^.A.^X.....X..^^0^^..X
-D:X.IbXX..XXbbbXX^^^XX.X^ccc^XIXXXXXXXXXXXXXXX
-D:X.XXX..XX.....X%^^^XXX^^^^^XlllllllllllllllX
-D:X.X99.XXW......XX^^^XXXXXXXXlllllllllllllllX
-D:X.X99XXWWW...a..XX^^.XXllllllLLLLLlXXXX%XXXX
-D:X.XXXX..WWW.....cXX^.XXXXXlllllllllXVVVVVVVX
-D:X.X8.....WWW....ccX^.X^^^XLLLlLLLLLXVVVVVVVX
-D:X.X%XXXXXXXWW...cXXX.X+X^XlllllllllXV%%%%%VX
-D:X.X.......XWWW..X%^X.XLX^XlLLLLLLLLXV%8^8%VX
-D:X.XXXXXX%.X.WWWXX^^X.XLX^XlllllllllXV%^a^%VX
-D:X.X.IIIIX.X..WXX..XXcXLX^XLLLlLLLLlXV%^^^%VX
-D:X.X%XXXIX.X..XX..XXccXLX^XlglllLgllXV%^^^%VX
-D:X.Xa.6XIX.X.XX..XXcccXLX^XlllllXXXXXV%^a^%VX
-D:X+XXX.XIX.X.X99XXccccXLX^XXXXXXX888XV%8^8%VX
-D:X%%%Xa%.X.%8X99XcccccXLX^^^^^^4X...XV%%%%%VX
+D:XXXXXXLL..L***LLLLLLLX....8Xi....%@@.....@@X
+D:X5..8X.&.XXXXXX......D....8XIIIIIXbb.....ccX
+D:X...8X...XA...X.LLLLLX....8X.....X.........X
+D:X...8X.XXXC...X.LL...XXXIXXX.....X.........X
+D:XGXXXX.LfX7...X&LL.L.Xa...aXf...fX.........X
+D:X.X5XL.L*XB...X&&..L.X.b.b.X.....X.........X
+D:X.X.XL.L*XXXXXXLLLLL.X..7..X.....X.........X
+D:X.X.XL.L***fXL.....&&X.b.b.XIIIIIX.........X
+D:X.X.XL.LLLLLXL.LLLLLLXa...aXi....X.........X
+D:X.X.XL.........XXXXXXXXX%XXXXXXXXX.........X
+D:X.X.XXXXXXXXXXLX.....Xe-.=dX....&X.........X
+D:X.X..........XLX.....X-...=X....&X.........X
+D:X.XXXXXXXXXX.X8Xf.B..%..6..%..C.&X.........X
+D:X.LLLLLLLLL+.XXX.....X-...=X....&X.........X
+D:X.XXXXXXXXXXXXXX.....Xd-.=eX....&X.........X
+D:X.Xbbbbb......XXXXXXXXXX%XXXXXXXXX.........X
+D:X.XbbbbXXXX....XX....X.....X...h.X.........X
+D:X.XbbbXX..XXX...XX...X.ccc.X....0X.........X
+D:X.XbbXX..X%bXX...XX..X..A..X.....X....0....X
+D:X.IbXX..XXbbbXX...XX.X.ccc.XIXXXXXXXXXXXXXXX
+D:X.XXX..XX.....X%...XXX.....XlllllllllllllllX
+D:X.X99.XXW......XX...XXXXXXXXlllllllllllllllX
+D:X.X99XXWWW...a..XX...XXllllllLLLLLlXXXX%XXXX
+D:X.XXXX..WWW.....cXX..XXXXXlllllllllXVVVVVVVX
+D:X.X8.....WWW....ccX..X...XLLLlLLLLLXVVVVVVVX
+D:X.X%XXXXXXXWW...cXXX.X+X.XlllllllllXV%%%%%VX
+D:X.X.......XWWW..X%.X.XLX.XlLLLLLLLLXV%8.8%VX
+D:X.XXXXXX%.X.WWWXX..X.XLX.XlllllllllXV%.a.%VX
+D:X.X.IIIIX.X..WXX..XXcXLX.XLLLlLLLLlXV%...%VX
+D:X.X%XXXIX.X..XX..XXccXLX.XlglllLgllXV%...%VX
+D:X.Xa.6XIX.X.XX..XXcccXLX.XlllllXXXXXV%.a.%VX
+D:X+XXX.XIX.X.X99XXccccXLX.XXXXXXX888XV%8.8%VX
+D:X%%%Xa%.X.%8X99XcccccXLX......4X...XV%%%%%VX
 D:X%.%XXXXXXXXXXXXIXXXXXLXXXXXXXXX...XVVVVVVVX
 D:X.%%+..........................G..4X...F...X
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
diff --git a/lib/mods/theme/edit/s_orthanc.map b/lib/mods/theme/edit/s_orthanc.map
index fd14d3d4..9b357c2d 100644
--- a/lib/mods/theme/edit/s_orthanc.map
+++ b/lib/mods/theme/edit/s_orthanc.map
@@ -52,48 +52,48 @@ D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 D:X;;;;;;;;;;;;;;;;;;;;;;;,,,,,,,,,,a,4,a,,,,,,,,,,,,,,,;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;a;&,a,,,,,~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,X
 D:X;;;;;;;;;;;;;;;;;,,,,,,,,,,,,,,,,,a,a,,,,,,,,,,,,,,,,,,,,,,,,;;;;;;;;;;;;;;;;;;;;;,,,a,a,,,,~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,,X
 D:X;;;;;;;;;;;;;;;,,,,,,,,XXXXXXXXXXXXXXXXXXXXXXXXXX,,,,,,,,,,,,,,,,,;;;;;;;;;;;;;,,,,,,,,,,,,~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,,,X
-D:X;;;;;;;;;;;;;,,,,,,XXXXX2^b^.^.^b^.^.^b^.^.^b^.2XXXXX,,,,,,,,,,,,,,,,,,;;;,,,,,,,,,,,,,,,~~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,,,,X
-D:X;;;;;;;;;;,,,,,,XXXX2.^.^.^.XX^.^.^.^.^.^.XX^.^.^.^2XXXX,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,~~~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,,,,,X
-D:X;;;;;;;a,a,,,,XXX2.^.^.^b^.^XX.^.^.^b^.^.^XX.^.^b^.^.^2XXX,,,,,,,,,,,,,a,a,,,,,,,,,,,~~~~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,,,,,,X
-D:X;;;;;;a,7,a,XXX2^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.2XXX~~~~~,,,,,a,&,a,,,,,,,,,~~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,,,,,,,,,X
-D:X;;;;;;,a,aXXX2.^.^XXXXXXXXXXXXXXXXXXDDDXXXXXXXXXXXXXXXGGGGGXXX~~~~,,,,,a,a,,,,,,,,,~~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,,,,,,,,,,X
-D:X;;;;;;,,XXX2^.^.XXX.^.^.^.^.^.XX^.^.^2^.^.^XX.^b^.^.^XXX.^.^.XXX~~~,,,,,,,,,,,,,,,~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,,,,,,,,,,,,,,X
-D:X;;;;;,,XX2.^.^bXX^.^b^.^.^.^.^XX.^!^.!^.!^.XX^.^.^.^b^.XX.^b^.^XX~~~~,,,,,,,,,,,,,~~~~~~~~~~~~~~~~~,,,,,,,,,,,,,,;;;;;,,,,,,,X
-D:X;;;;;,XX2.^.^.XX^.^.^.GGGG^.^.XX^.^.^.^.^.^XX.^.^GGGG.^.XX.^.^.^XX~~~~~~~~,,,,,,,~~~~~~~~~~~~~~~,,,,,,,,,,,,,,,;;;;;,,,,,,,,,X
-D:X;;;;,,XX.^b^.XX^.^.^.^G$$G.^.^XX.^.^b^.^b^.XX^.^.G$$G^.^.XX.^b^.XX~~~~~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,,,,,,,,,;;;;,,,,,,,,,,,X
-D:X;;;,,XX2^.^.XX^.^.^.^.G$$G^b^.XX^.^.^.^.^.^XX.^b^G$$G.^b^.XX.^.^.XX~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,,,,,,,,,,;;;;;,,,,,,,,,,,,X
-D:X;;;,,XX^.^.^XX.^.^b^.^GGGG.^.^XX^b!^.!b^!^.XX^.^.GGGG^.^.^XX^.^b^XX.~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,a,a,,,,,,;;;;;;,,,,,,,,,,,,X
-D:X;;,,XX2.^b^XX.^.^.^.^.^.^.^.^.XX^.^.^.^.^.^DD.^.^.^.^.^.^.^XX^.^.^XX,,~~~~~~~~~~~~~~~~~~,,,,,a,a,a,&,a,,,,;;;;;;;;,,,,,,,,,,,X
-D:X;;,,XX^.!.^XX^.^.^.^.^.^.^XXXXXXXXXXXXXXXXXXXXX^.^b^.^.^b^.XX.^!^.XX,,,~~~~~~~~~~~~~~~~~~~,,a,a,&,a,a,,,,,;;;;;;;;;,,,,,,,,,,X
-D:X;,,,XX.^.^.XX.^b^.^.^b^.^XG.^.^.^.^.^.^.^.^.^.XX^.^.^.^.^.^XX^.^b^XX,,,,~~~~~~~~~~~~~~~~~~~a,a,&,&,a,,,,,,;;;;;;;;;;,,,,,,,,,X
-D:X;,,,XX^b!.^XX^.^.^.^.^.^XG.^.lllllll2lllllll.^.XX^.^GGGGG^.GG.^!^.[[,,a,,~~~~~~~~~~~~~~~~~~,a,a,a,a,,,,,,;;;;;;;;;;;;,,,,,,,,X
-D:X;;,,XX.^.^.XX.^.!.^!^.^XG.^.l!^.^.^l^l^.^.^!l.^.XX^.G$$$G.^GG^.^b^[[,,,,,,~~~~~~~~~~~~~~~~~~,a,a,a,,,,,,;;;;;;;;;;;;;;,,,,,,,X
-D:X;;,,XX^.!b^XX^.^.^b^.!.XX^.ll^.^.^.^.^.^.^.^ll.^XX.^G$$$G^.XX.^!^.[[,,,a,,~~~~~~~~~~~~~~~~~~,,,,,,,,,,,;;;;;;;;;;;;;;,,,,,,,,X
-D:X;;,,XX.^.^.XX.^.^2^!^.2GG.^l$$ll.GGG^GGG.ll$$l^.XX^.G$$$G.^XX^.^b^[[,,,,,,~~~~~~~~~~~~~~~~~~~,,,,,,,,,,;;;;;;;;;;;;;,,,,,,,,,X
-D:X;;,,XX^.4.^XX^.^.^.^.^.DD^.ll^.^GG^$@$^GG^.^ll.^XX.^G$$$G^.XX.^.^.[[,,,a,,~~~~~~~~~~~~~~~~~~~,,,,,,,,,;;;;;;;;;;;;;,,,,,,,,,,X
-D:X;;,,XX.^5^.XX.^b^2^.^b^DD.^ll.^.GG^$1$^GG.^.ll^.XX^.G$$$G.^XX^.^b^[[,,,,,~~~~~~~~~~~~~~~~~~~,,,,,,,,,;;;;;;;;;;;;;;,,,,,,,,,,X
-D:X;;,,XX^.^.^XX^.^.^.!.^2GG^.l$$ll2GGG>GGG2ll$$l.^XX.^G$$$G^.XX.^.^.[[,,,a,~~~~~~~~~~~~~~~~~~,,,,,,,,,,,;;;;;;;;;;;;,,,,,,,,,,,X
-D:X;;,,XX.^!^.XX.^.^2^.^!^XX.^ll.^.^.^GGG^.^.^.ll^.XX^.G$$$G.^XX^.!b^[[,,,,~~~~~~~~~~~~~~~~~~,,,,,,,,,,,,;;;;;;;;;;;,,,,,,,,,,,,X
-D:X;,,,XX^b^.^XX^.^.^b^.^.XG^.^l!.^.^.lll.^.^.!l^.^XX.^G$$$G^.GG.^.^.[[,a,~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,;;;;;;;;;;;;,,,,,,,,,,,X
-D:X;;,,XX.^!^.XX.^.!.^!^.^.XG^.^lllllll$lllllll^.^XX.^.GGGGG.^GG^.!b^[[,~~~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,;;;;;;;;;;;;;,,,,,,,,,,X
-D:X;;,,XX^.^b^XX^.^.^.^.^.^.XG^.^.^.^.^.^.^.^.^.^XX.^b^.^.^b^.XX.^.^.XX~~~~~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,;;;;;;;;;;;;,,,,,,,,,,X
-D:X;;,,XX.^!^.XX.^b^.^.^b^.^.XXXXXXXXXXXXXXXXXXXXX.^.^.^.^.^.^XX^.!b^XX~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~,,,,,,,;;;;;;;;;;;,,,,,,,,;X
-D:X;,,,XX2.^.^XX^.^.^.^.^.^.^.^.^XX.^.^.^.^.^.XX6.^.^.^.^.^.^.XX.^.^.XX~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~,,,,,;;;;;;;;;;,,,,,,,,,;X
-D:X;;,,,XX^b^.^XX^.^.^.^.GGGG^.^.XX^.!.^!^.!.^XX7^b^GGGG.^b^.XX.^b^.XX~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~,,,,;;;;;;;;;;;,,,,,,,;;X
-D:X;;;,,XX2^.^.XX.^.^b^.^G$$G.^.^XX.^A2.^.26^.XXA.^.G$$G^.^.^XX^.^.^XX~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~,,,;;;;;;;;;;;,,,,,,;;X
-D:X;;;,,,XX.^.^.XX.^.^.^.G$$G^.^FXX^2^.^C^.^2^XXB^.^G$$G.^.^XX^b^.^XX~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~,,,;;;;;;;;;;;,,,,;;;X
-D:X;;;;,,XX2.^b^.XX.^.^.^GGGG.^.^XX.^52.^.2B^.XXC.^.GGGG^b^XX^.^.^.XX~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~,,,,,;;;;;;;;;;;;;;;X
-D:X;;;;,,,XX2.^.^.XX.^.^b^.^.^b^.XX^.!.^!^.!.^XXE^.^.^.^.^XX^b^.^.XX~~~~~~~~~~~~~~~,,,,,,,~~~~~~~~~~~~~~~~~~,,,,a,a;;;;;;;;;;;;;X
-D:X;;;;,,,,XXX2^.^.XXX^.^.^.^.^.^XX.^.^.^.^.^.XXF.^b^.^.XXX^.^.^XXX~~~~~~~~~,,,,,a,a,,,,,,,~~~~~~~~~~~~~~~~~~,,a,&,a;;;;;;;;;;;;X
-D:X;;;;;,,,,,XXX2^b^.XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.^b^.XXX~~~~~~~~~a,a,,,a,&,a,,,,,~~~~~~~~~~~~~~~~~~~~,,a,a,,,,,;;;;;;;;X
-D:X;;;;;;,,,,,,XXX2^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.2XXX~~~~~~~~,,a,&,a,,;a;a,,,,~~~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,;;;;;;;X
-D:X;;;;;;;;,,,a,aXXX2.^b^.^b^.^XX.^.^b^.^b^.^XX.^b^.^b^.^2XXX~~~~~~~~,,,,,a,a,;;;;;;,,,~~~~~~~~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,;;X
-D:X;;;;;;;;;;a,&,a,XXXX2.^.^.^.XX^.^.^.^.^.^.XX^.^.^.^2XXXX~~~~~~~~~~~~,,,,,,;;;;;;,,,~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~,,,,,,a,a,X
-D:X;;;;;;;;;;;a,a,,,,,XXXXX2^.^b^.^b^.^b^.^b^.^.^.2XXXXX~~~~~~~~~~~~~~~~~,,,;;;;;,,,,~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~,,,a,&,aX
+D:X;;;;;;;;;;;;;,,,,,,XXXXX2.b.....b.....b.....b..2XXXXX,,,,,,,,,,,,,,,,,,;;;,,,,,,,,,,,,,,,~~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,,,,X
+D:X;;;;;;;;;;,,,,,,XXXX2.......XX............XX.......2XXXX,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,~~~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,,,,,X
+D:X;;;;;;;a,a,,,,XXX2......b...XX......b.....XX....b.....2XXX,,,,,,,,,,,,,a,a,,,,,,,,,,,~~~~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,,,,,,X
+D:X;;;;;;a,7,a,XXX2........................................2XXX~~~~~,,,,,a,&,a,,,,,,,,,~~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,,,,,,,,,X
+D:X;;;;;;,a,aXXX2....XXXXXXXXXXXXXXXXXXDDDXXXXXXXXXXXXXXXGGGGGXXX~~~~,,,,,a,a,,,,,,,,,~~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,,,,,,,,,,X
+D:X;;;;;;,,XXX2....XXX...........XX.....2.....XX..b.....XXX.....XXX~~~,,,,,,,,,,,,,,,~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,,,,,,,,,,,,,,X
+D:X;;;;;,,XX2....bXX...b.........XX..!..!..!..XX.......b..XX..b...XX~~~~,,,,,,,,,,,,,~~~~~~~~~~~~~~~~~,,,,,,,,,,,,,,;;;;;,,,,,,,X
+D:X;;;;;,XX2.....XX......GGGG....XX...........XX....GGGG...XX......XX~~~~~~~~,,,,,,,~~~~~~~~~~~~~~~,,,,,,,,,,,,,,,;;;;;,,,,,,,,,X
+D:X;;;;,,XX..b..XX.......G$$G....XX....b...b..XX....G$$G....XX..b..XX~~~~~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,,,,,,,,,;;;;,,,,,,,,,,,X
+D:X;;;,,XX2....XX........G$$G.b..XX...........XX..b.G$$G..b..XX.....XX~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,,,,,,,,,,;;;;;,,,,,,,,,,,,X
+D:X;;;,,XX.....XX....b...GGGG....XX.b!..!b.!..XX....GGGG.....XX...b.XX.~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,a,a,,,,,,;;;;;;,,,,,,,,,,,,X
+D:X;;,,XX2..b.XX.................XX...........DD..............XX.....XX,,~~~~~~~~~~~~~~~~~~,,,,,a,a,a,&,a,,,,;;;;;;;;,,,,,,,,,,,X
+D:X;;,,XX..!..XX.............XXXXXXXXXXXXXXXXXXXXX...b.....b..XX..!..XX,,,~~~~~~~~~~~~~~~~~~~,,a,a,&,a,a,,,,,;;;;;;;;;,,,,,,,,,,X
+D:X;,,,XX.....XX..b.....b...XG...................XX...........XX...b.XX,,,,~~~~~~~~~~~~~~~~~~~a,a,&,&,a,,,,,,;;;;;;;;;;,,,,,,,,,X
+D:X;,,,XX.b!..XX...........XG...lllllll2lllllll...XX...GGGGG..GG..!..[[,,a,,~~~~~~~~~~~~~~~~~~,a,a,a,a,,,,,,;;;;;;;;;;;;,,,,,,,,X
+D:X;;,,XX.....XX...!..!...XG...l!.....l.l.....!l...XX..G$$$G..GG...b.[[,,,,,,~~~~~~~~~~~~~~~~~~,a,a,a,,,,,,;;;;;;;;;;;;;;,,,,,,,X
+D:X;;,,XX..!b.XX.....b..!.XX..ll...............ll..XX..G$$$G..XX..!..[[,,,a,,~~~~~~~~~~~~~~~~~~,,,,,,,,,,,;;;;;;;;;;;;;;,,,,,,,,X
+D:X;;,,XX.....XX....2.!..2GG..l$$ll.GGG.GGG.ll$$l..XX..G$$$G..XX...b.[[,,,,,,~~~~~~~~~~~~~~~~~~~,,,,,,,,,,;;;;;;;;;;;;;,,,,,,,,,X
+D:X;;,,XX..4..XX..........DD..ll...GG.$@$.GG...ll..XX..G$$$G..XX.....[[,,,a,,~~~~~~~~~~~~~~~~~~~,,,,,,,,,;;;;;;;;;;;;;,,,,,,,,,,X
+D:X;;,,XX..5..XX..b.2...b.DD..ll...GG.$1$.GG...ll..XX..G$$$G..XX...b.[[,,,,,~~~~~~~~~~~~~~~~~~~,,,,,,,,,;;;;;;;;;;;;;;,,,,,,,,,,X
+D:X;;,,XX.....XX......!..2GG..l$$ll2GGG>GGG2ll$$l..XX..G$$$G..XX.....[[,,,a,~~~~~~~~~~~~~~~~~~,,,,,,,,,,,;;;;;;;;;;;;,,,,,,,,,,,X
+D:X;;,,XX..!..XX....2...!.XX..ll......GGG......ll..XX..G$$$G..XX..!b.[[,,,,~~~~~~~~~~~~~~~~~~,,,,,,,,,,,,;;;;;;;;;;;,,,,,,,,,,,,X
+D:X;,,,XX.b...XX.....b....XG...l!.....lll.....!l...XX..G$$$G..GG.....[[,a,~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,;;;;;;;;;;;;,,,,,,,,,,,X
+D:X;;,,XX..!..XX...!..!....XG...lllllll$lllllll...XX...GGGGG..GG..!b.[[,~~~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,;;;;;;;;;;;;;,,,,,,,,,,X
+D:X;;,,XX...b.XX............XG...................XX..b.....b..XX.....XX~~~~~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,;;;;;;;;;;;;,,,,,,,,,,X
+D:X;;,,XX..!..XX..b.....b....XXXXXXXXXXXXXXXXXXXXX............XX..!b.XX~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~,,,,,,,;;;;;;;;;;;,,,,,,,,;X
+D:X;,,,XX2....XX.................XX...........XX6.............XX.....XX~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~,,,,,;;;;;;;;;;,,,,,,,,,;X
+D:X;;,,,XX.b...XX........GGGG....XX..!..!..!..XX7.b.GGGG..b..XX..b..XX~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~,,,,;;;;;;;;;;;,,,,,,,;;X
+D:X;;;,,XX2....XX....b...G$$G....XX..A2...26..XXA...G$$G.....XX.....XX~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~,,,;;;;;;;;;;;,,,,,,;;X
+D:X;;;,,,XX.....XX.......G$$G...FXX.2...C...2.XXB...G$$G....XX.b...XX~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~,,,;;;;;;;;;;;,,,,;;;X
+D:X;;;;,,XX2..b..XX......GGGG....XX..52...2B..XXC...GGGG.b.XX......XX~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~,,,,,;;;;;;;;;;;;;;;X
+D:X;;;;,,,XX2.....XX....b.....b..XX..!..!..!..XXE.........XX.b....XX~~~~~~~~~~~~~~~,,,,,,,~~~~~~~~~~~~~~~~~~,,,,a,a;;;;;;;;;;;;;X
+D:X;;;;,,,,XXX2....XXX...........XX...........XXF..b....XXX.....XXX~~~~~~~~~,,,,,a,a,,,,,,,~~~~~~~~~~~~~~~~~~,,a,&,a;;;;;;;;;;;;X
+D:X;;;;;,,,,,XXX2.b..XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX..b..XXX~~~~~~~~~a,a,,,a,&,a,,,,,~~~~~~~~~~~~~~~~~~~~,,a,a,,,,,;;;;;;;;X
+D:X;;;;;;,,,,,,XXX2........................................2XXX~~~~~~~~,,a,&,a,,;a;a,,,,~~~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,;;;;;;;X
+D:X;;;;;;;;,,,a,aXXX2..b...b...XX....b...b...XX..b...b...2XXX~~~~~~~~,,,,,a,a,;;;;;;,,,~~~~~~~~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,;;X
+D:X;;;;;;;;;;a,&,a,XXXX2.......XX............XX.......2XXXX~~~~~~~~~~~~,,,,,,;;;;;;,,,~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~,,,,,,a,a,X
+D:X;;;;;;;;;;;a,a,,,,,XXXXX2...b...b...b...b......2XXXXX~~~~~~~~~~~~~~~~~,,,;;;;;,,,,~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~,,,a,&,aX
 D:X;;;;;;;;;;;;;;,,,,,,,,,XXXXXXXXXXXXXXXXXXXXXXXXXX,,~~~~~~~~~~~~~~~~,,,,;;;;;;;;,,,~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~,,a,a,X
 D:X;;;;;;;;;;;;;;;;;,,,,,,,,,,,,,,,,,a,a,,,,,,,,,,~~~~~~~~~~~~~~~,,,,;;;;;;;;;;;;;,,,~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~,,,X
 D:X;;;;;;;;;;;;;;;;;;;;;,,,,,,,,,,,,a,E,a,,,,,~~~~~~~~~~~~~~~~~,,;;;;;;;;;;;;;;;;;,,~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~,X
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 
 ### Starting Location
-P:31:125
\ No newline at end of file
+P:31:125
diff --git a/lib/mods/theme/edit/s_ship.map b/lib/mods/theme/edit/s_ship.map
index dbbbe50d..6dcb239d 100644
--- a/lib/mods/theme/edit/s_ship.map
+++ b/lib/mods/theme/edit/s_ship.map
@@ -19,8 +19,6 @@
 # I'm not sure esp. about the correct exit of gate #3.
 
 
-#%:special.txt
-
 
 ### Terrain Features
 
@@ -157,15 +155,6 @@ F:$:90:0:0:*47
 # Treasure (good) on ice
 F:%:90:0:0:*60
 
-# Trap (random) on ice
-F:^:90:0:0:0:0:0:*
-
-# Trap (random) on shallow water
-F:t:84:0:0:0:0:0:*
-
-# Trap (random) on fog
-F:@:210:0:0:0:0:0:*
-
 # Human skeleton on ice
 F:x:90:0:0:395
 
@@ -173,16 +162,16 @@ F:x:90:0:0:395
 ### Between Gates
 
 # between gate 3: was 711
-F:3:160:6:0:0:0:0:0:1136
+F:3:160:6:0:0:0:0:1136
 
 # between gate A: was 6247
-F:A:160:6:0:0:0:0:0:6761
+F:A:160:6:0:0:0:0:6761
 
 # between gate 4: was 3339
-F:4:160:6:0:0:0:0:0:3853
+F:4:160:6:0:0:0:0:3853
 
 # between gate B: was 3085
-F:B:160:6:0:0:0:0:0:3599
+F:B:160:6:0:0:0:0:3599
 
 
 ### Guaranteed Items
@@ -197,33 +186,33 @@ D:XXXXXXXXXXXXXXXX                  XXXXXXXXXXXX
 D:X###############..~  .#. k    w ~.#XX######### .~~     s                                 G..#####..  w  .###.######X##~~ .GX.### 
 D:X####%####...~      ~.~      s .#.X#~~.#####  .~                             s       w G..#.##.#.XGG~XXk~.####A####.~X   ~~.X... 
 D:X##%#$#######...~ w       wXXXXXX#XXXX###XXX #~XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX..XX....~.XX  X#xX.#..#.#G. w ~X G~~ 
-D:X##$#########....     s   XXXTT^...~.~#####w~###~~~~8....**.tE.&E ^^.M^.xx.....x..ZZ..^XTTTT M...GG.~..  w G.###~XX~~#XX .  s X  
-D:X#########...~   w      XXXTTTT.^..x~.H####  ###~~D....8**.~M~.E..M^.MM^..xh.h...ZZZZ^~M.,.,.,.~~ .G...~~  ~###.   w  . w  M.d.  
-D:X#####.x.x~~~         XXXTTTXXXMxx.H.####### ~##~~~8...#.**.~tE&EE^^~%M^.h.x.E.xh.ZZ..^X.,.^....~ ...G.~  s ~#  XX ~~    w   X   
-D:X######...~~  MM~  w XXX^^XXX.MMMxx...G#####w  ~#~.~..&...**E.MEt.^^.MM^~..i.....ZZZZ^~M.,.,,.gM.~.,~.,G.G~~ G~.  G~.MM XX..~    
-D:X##.....~~        XXX^E=^XX$b.MMMMxH..HG#.##  w ~#~##~8....*E~.&EM^^.M^h..i..x.x..ZZ..^XTTTTX.,.,~........~.G~~..w . G~...G~X    
-D:X...~~~    K    XXX^^EXXXX$$$..MMXXXXXXX####   #####XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX..,.X..M~.........~G..G ~~.G...G~    
-D: ~~~   w      XXX^^EXXXdX%d$$b$$XXd~~~~#####  s   ###.,.W.**,.x.,.,.,.,.,.***,,....,x....,,.SX.,.,.,..,o.,.,.~~.G..~.G..G..~X k  
-D: w  MMM.  w XXX^E^XXX.,*XDDd$$$XXd$..~~~~####    ###.,.,.,.**..,.,i.,.,W,.,**..z.,.,.q...g.,......~.,.,.,.,.~.~..F.~M~......~    
-D:    MM.   XXX4EEXXXi^**.XX%%$dXX$d$.H#####~G~~####.~.,~..,.h*,,~,.,.,.,~,.,.,.H.,.~.,..~,.,,,.~,.,.~.,.,.X.~,g.~~..~.~..,..,X    
-D:   s    XXXBXXXXX^.**.W.,XDD%XXb$$b####..G~~~G###~.,,.,.,.,...,,.x,.~.,.,~..,.~.,.,~,.,.,,.,.,~,.,.,.~,.,..,X.,.***.~***,W.,X    
-D:      XXX.o..X.g***i.*.,.XX%XX######^^^^t      ##ttt^^^^^t^^^^^^t^^^^^t^^^^^^^t^^^^^^t^^^^t^^tt^^^tt^^^^t^tXo..x************X    
-D: k  XXX^E..o.XX8.****,.g..XXX..#........~~~~~ttt###~~.,.G~.......XXXXX..~,..,,..,,.~.,..,.,..,,..,.,x..,.ooX******W***g.*.g*X    
-D:  XXX%S^^E..ooX,*****,..,.X.....h........XXX~~~tt#tt   w ~~G~...XXXXXXX.,**.,..D.**.G.,~,..XXX...~~~.....o8X***.~.,.****$$..X    
-D: XX%%%^mm.E..oXH**.^.*i.....#.....i..*..XXXXX~~            G~~.XXXXXXXXX~.*..,.,*..~,..,.,XXXXX...~..,.XXXXXo.W.$$.g.x....o.X    
-D:  XXX%S^^E..ooX8.*~~...,~~##...,..,.***,.XXX~G~     k       ~~~~XXXXXXX.,.*. g...*..x..W.~.XXX.***.,,o..oO8X.o.,.o.xx$$$XXXXX    
-D:    XXX^E..o.XXH.###....###~~~.,h..,.*.,..~~.~~           s   ~~.XXXXX.~..**...i~**.....~.,,.,,.***~,,,.oXXXXXXXXXXXXXXXX.!.X    
-D: s    XXX.o..X&..w~##..##~~~X~^^^^^^^^^^t^ttt^tt   w   tt^tttt^^tt^^^^^ttt^^^^ttt@@^^^^ttt^^^^^ttt@^^ttXXXW ^^.M*.t^oo.^^...X  s 
-D:   ~~~  XXX>XXH~G..#####~G~~Gt..,.,..,.,xx..x ~~~     i~~xx.~...x....~.~..~..,~..***..~..~...,~.~*.~.XXXE.^^H..SM.~^.oo....JX    
-D: ~~....~~ XXX$8w~.^####G~G ~i.XX.,,.,...........G~~~s~~ iiF~...........~.......x.,.**~....,~....~.*XXX.EE.W.^^.M*.~^^^o^O^..X    
-D: ~.#..#..~~ XXX8##t..##~#.G.t..XX..,H...,.W...,...,~~...,...*,,.x...,.i.....g.....**.........XXXXXXX...EE.^^H..SM.~.^oo...^JX    
-D: ~.##.##..~   XXX###GG~~~*h~.^..XX.....,....,.W...,.G....W.***...,...,...,....,...,**..q....SX3tttW#...EE.W.^^.M*.t.oo.^.^.XX    
-D: ~~.###..~~     X##.##~~G^~~~~i*^XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX~~   
-D: ~~...###.~  k  ~###X.G~~@Gh~x*~^..^i.zX8~i.~..h....zzzXiX..^$.T.t$......F.t..XX..^TTT*..M..Y....^.Y.^*.^..~....X.x..x~.<XX~.    
-D: ~.....####.....#####XXXx@@~i~.z..z.it,#**t..h..Gzh.zzX@.@Xd*t.~...*~.t......^X..T.^T*@*TXMM...^....^**@.^.x*...+..~....XX..~    
-D:    ~~.#$%#########....XXX~h~i.HH...h,i^X*.H..h.^G..WX@.E.^X**8..Y.~*8...Y...^+XXXXXXXXXXXMF...~....^.*..x.***..X..x..~XX...~~w  
-D:   ~~.#$$######.~   ~w  XXX$~.x..~G^..,i.,.~.h.^~~..zzX@.@Xd*......F**..~....^XbM..^~ZZZZXMM..*.....~^......*.XXXXXXXIXX.~~#~w   
-D: L  ~~xx########.~~       XXX$$.G#GX#.i,,^ih.^W.zG^zzzXiX.$.t88.~..^**F..T...tXX~~.^^ZZZZM~..**@~~.Y~..^#^..xXI&X8&..XX ~~~## w  
+D:X##$#########....     s   XXXTT....~.~#####w~###~~~~8....**.~E.&E ...M..xx.....x..ZZ...XTTTT M...GG.~..  w G.###~XX~~#XX .  s X  
+D:X#########...~   w      XXXTTTT....x~.H####  ###~~D....8**.~M~.E..M..MM...xh.h...ZZZZ.~M.,.,.,.~~ .G...~~  ~###.   w  . w  M.d.  
+D:X#####.x.x~~~         XXXTTTXXXMxx.H.####### ~##~~~8...#.**.~~E&EE..~%M..h.x.E.xh.ZZ...X.,......~ ...G.~  s ~#  XX ~~    w   X   
+D:X######...~~  MM~  w XXX..XXX.MMMxx...G#####w  ~#~.~..&...**E.ME~....MM.~..i.....ZZZZ.~M.,.,,.gM.~.,~.,G.G~~ G~.  G~.MM XX..~    
+D:X##.....~~        XXX.E=.XX$b.MMMMxH..HG#.##  w ~#~##~8....*E~.&EM...M.h..i..x.x..ZZ...XTTTTX.,.,~........~.G~~..w . G~...G~X    
+D:X...~~~    K    XXX..EXXXX$$$..MMXXXXXXX####   #####XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX..,.X..M~.........~G..G ~~.G...G~    
+D: ~~~   w      XXX..EXXXdX%d$$b$$XXd~~~~#####  s   ###.,.W.**,.x.,.,.,.,.,.***,,....,x....,,.SX.,.,.,..,o.,.,.~~.G..~.G..G..~X k  
+D: w  MMM.  w XXX.E.XXX.,*XDDd$$$XXd$..~~~~####    ###.,.,.,.**..,.,i.,.,W,.,**..z.,.,.q...g.,......~.,.,.,.,.~.~..F.~M~......~    
+D:    MM.   XXX4EEXXXi.**.XX%%$dXX$d$.H#####~G~~####.~.,~..,.h*,,~,.,.,.,~,.,.,.H.,.~.,..~,.,,,.~,.,.~.,.,.X.~,g.~~..~.~..,..,X    
+D:   s    XXXBXXXXX..**.W.,XDD%XXb$$b####..G~~~G###~.,,.,.,.,...,,.x,.~.,.,~..,.~.,.,~,.,.,,.,.,~,.,.,.~,.,..,X.,.***.~***,W.,X    
+D:      XXX.o..X.g***i.*.,.XX%XX######....~      ##~~~.....~......~.....~.......~......~....~..~~...~~....~.~Xo..x************X    
+D: k  XXX.E..o.XX8.****,.g..XXX..#........~~~~~~~~###~~.,.G~.......XXXXX..~,..,,..,,.~.,..,.,..,,..,.,x..,.ooX******W***g.*.g*X    
+D:  XXX%S..E..ooX,*****,..,.X.....h........XXX~~~~~#~~   w ~~G~...XXXXXXX.,**.,..D.**.G.,~,..XXX...~~~.....o8X***.~.,.****$$..X    
+D: XX%%%.mm.E..oXH**...*i.....#.....i..*..XXXXX~~            G~~.XXXXXXXXX~.*..,.,*..~,..,.,XXXXX...~..,.XXXXXo.W.$$.g.x....o.X    
+D:  XXX%S..E..ooX8.*~~...,~~##...,..,.***,.XXX~G~     k       ~~~~XXXXXXX.,.*. g...*..x..W.~.XXX.***.,,o..oO8X.o.,.o.xx$$$XXXXX    
+D:    XXX.E..o.XXH.###....###~~~.,h..,.*.,..~~.~~           s   ~~.XXXXX.~..**...i~**.....~.,,.,,.***~,,,.oXXXXXXXXXXXXXXXX.!.X    
+D: s    XXX.o..X&..w~##..##~~~X~..........~.~~~.~~   w   ~~.~~~~..~~.....~~~....~~~**....~~~.....~~~*..~~XXXW ...M*.~.oo......X  s 
+D:   ~~~  XXX>XXH~G..#####~G~~G~..,.,..,.,xx..x ~~~     i~~xx.~...x....~.~..~..,~..***..~..~...,~.~*.~.XXXE...H..SM.~..oo....JX    
+D: ~~....~~ XXX$8w~..####G~G ~i.XX.,,.,...........G~~~s~~ iiF~...........~.......x.,.**~....,~....~.*XXX.EE.W....M*.~...o.O...X    
+D: ~.#..#..~~ XXX8##~..##~#.G.~..XX..,H...,.W...,...,~~...,...*,,.x...,.i.....g.....**.........XXXXXXX...EE...H..SM.~..oo....JX    
+D: ~.##.##..~   XXX###GG~~~*h~....XX.....,....,.W...,.G....W.***...,...,...,....,...,**..q....SX3~~~W#...EE.W....M*.~.oo.....XX    
+D: ~~.###..~~     X##.##~~G.~~~~i*.XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX~~   
+D: ~~...###.~  k  ~###X.G~~*Gh~x*~....i.zX8~i.~..h....zzzXiX...$.T.~$......F.~..XX...TTT*..M..Y......Y..*....~....X.x..x~.<XX~.    
+D: ~.....####.....#####XXXx**~i~.z..z.i~,#**~..h..Gzh.zzX*.*Xd*~.~...*~.~.......X..T..T***TXMM.........***...x*...+..~....XX..~    
+D:    ~~.#$%#########....XXX~h~i.HH...h,i.X*.H..h..G..WX*.E..X**8..Y.~*8...Y....+XXXXXXXXXXXMF...~......*..x.***..X..x..~XX...~~w  
+D:   ~~.#$$######.~   ~w  XXX$~.x..~G...,i.,.~.h..~~..zzX*.*Xd*......F**..~.....XbM...~ZZZZXMM..*.....~.......*.XXXXXXXIXX.~~#~w   
+D: L  ~~xx########.~~       XXX$$.G#GX#.i,,.ih..W.zG.zzzXiX.$.~88.~...**F..T...~XX~~...ZZZZM~..***~~.Y~...#...xXI&X8&..XX ~~~## w  
 D:     ~.########..~~        XXXXX~#X~X#XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX   ~###~w  
 D:  ~~.#########..~ w    K   w     ~#####    w  ~.M.~                    ~..####.~  s~~~~.~~              s  K            ~##..~   
 D:  ~..#########.~                  ~#####      ~...~             k     ~..###.~    ~~####~~~          w            w    ~###..~   
diff --git a/lib/mods/theme/edit/set_info.txt b/lib/mods/theme/edit/set_info.txt
index 4b745e4b..182618d4 100644
--- a/lib/mods/theme/edit/set_info.txt
+++ b/lib/mods/theme/edit/set_info.txt
@@ -7,25 +7,24 @@
 # Do not modify this file unless you know exactly what you are doing,
 # unless you wish to risk possible system crashes and broken savefiles.
 
-# Version stamp (required)
-
 # N:idx:name
 # D:description
 # P:artifact index:number of item needed:pval
 # F:flags
 
-V:2.0.0
-
 # The Elven Gifts, took from Oangband
 
 N:0:Elven Gifts
 D:It is one of two Elven items once entrusted to Hobbits.
 # Phial of Galadriel
 P:1:2:1
-F:WIS | CHR | RES_DARK
+F:CHR
+F:RES_DARK
+F:WIS
 # Sting
 P:88:2:2
-F:STEALTH | REGEN
+F:REGEN
+F:STEALTH
 
 
 # The Dragon Slayer
@@ -34,7 +33,9 @@ N:1:Dragon Slayer
 D:It is one of two items rumoured to be the bane of dragons.
 # Bow of bard
 P:125:2:3
-F:DEX | CON | RES_FIRE
+F:CON
+F:DEX
+F:RES_FIRE
 # Arrow of Bard
 P:63:2:5
 F:SPEED
@@ -46,13 +47,21 @@ N:2:The Trinity
 D:It is one of the 3 legendary daggers.
 # Dagger of Samwise
 P:66:3:1
-F:STR | KILL_DRAGON | REGEN | SH_FIRE
+F:KILL_DRAGON
+F:REGEN
+F:SH_FIRE
+F:STR
 # Dagger of Peregrin
 P:67:3:1
-F:KILL_DEMON | IM_COLD | CON
+F:CON
+F:IM_COLD
+F:KILL_DEMON
 # Dagger of Meriadoc
 P:68:3:1
-F:KILL_UNDEAD | SH_ELEC | FLY | DEX
+F:DEX
+F:FLY
+F:KILL_UNDEAD
+F:SH_ELEC
 
 
 # Gothmog's Armoury -- Demonologists' set
@@ -62,13 +71,20 @@ D:It is one of three items that once belonged to Gothmog,
 D:the High Captain of the Balrogs.
 # The demonblade of Gothmog
 P:181:3:7
-F:STR | CON | SPEED | VAMPIRIC
+F:CON
+F:SPEED
+F:STR
+F:VAMPIRIC
 # The demonshield of Gothmog
 P:182:3:0
-F:IM_FIRE | IM_COLD | SH_ELEC
+F:IM_COLD
+F:IM_FIRE
+F:SH_ELEC
 # The demonhorn of Gothmog
 P:183:3:0
-F:ESP_EVIL | ESP_GOOD | AUTO_ID
+F:AUTO_ID
+F:ESP_EVIL
+F:ESP_GOOD
 
 ### New sets added in Theme ###
 
@@ -79,13 +95,16 @@ D:It is one of three items that once belonged to
 D:Thorin Oakenshield, King under the Mountain.
 # The small metal shield of Thorin
 P:30:3:2
-F:CHR | ESP_TROLL
+F:CHR
+F:ESP_TROLL
 # The golden harp of Thorin
 P:135:3:4
-F:INT | SUST_INT
+F:INT
+F:SUST_INT
 # The mithril helm of Thorin
 P:136:3:4
-F:WIS | SUST_WIS
+F:SUST_WIS
+F:WIS
 
 # Peregrin Took's gear - adapted from T-Plus by Ingeborg S. Norden
 
@@ -94,10 +113,16 @@ D:It is one of two items that once belonged to the hobbit
 D:hero, Peregrin Took.
 # Chain Mail of Peregrin Took
 P:165:2:0
-F:RES_CONF | RES_NEXUS | SUST_STR
+F:RES_CONF
+F:RES_NEXUS
+F:SUST_STR
 # Elven Cloak of Peregrin Took
 P:184:2:2
-F:DEX | SUST_DEX | CHR | SUST_CHR | SLOW_DIGEST |
+F:CHR
+F:DEX
+F:SLOW_DIGEST
+F:SUST_CHR
+F:SUST_DEX
 
 # Ghan-buri-Ghan's Garb - suggested by ShinesmanOffWhite in the forums
 
@@ -106,7 +131,8 @@ D:It is one of two items that once belonged to
 D:the leader of the Druedain.
 # The Filthy Rag of Ghan-Buri-Ghan
 P:189:2:0
-F:IM_COLD | IM_ACID
+F:IM_ACID
+F:IM_COLD
 # The Cloak of Ghan-buri-Ghan 
 P:190:2:0
 F:ESP_ALL
@@ -118,7 +144,11 @@ D:It is one of three items belonging to the Kings of
 D:Gondor.
 # The Long Sword 'Anduril'
 P:83:3:0
-F:BRAND_ELEC | KILL_DEMON | KILL_DRAGON | SLAY_UNDEAD | IM_FIRE | 
+F:BRAND_ELEC
+F:IM_FIRE
+F:KILL_DEMON
+F:KILL_DRAGON
+F:SLAY_UNDEAD
 # The Black Banner of Gondor
 P:191:3:0
 F:LITE3
@@ -132,10 +162,16 @@ N:8:Saruman's Travel Gear
 D:It is one of three items belonging to the Istari wizard Saruman.
 # The Mage Staff of Saruman
 P:192:3:0
-F:REFLECT | FREE_ACT
+F:FREE_ACT
+F:REFLECT
 # The Robe of Curunir
 P:193:3:0
-F:RES_FIRE | RES_ACID | RES_POIS | RES_DARK | RES_BLIND | RES_SOUND | 
+F:RES_ACID
+F:RES_BLIND
+F:RES_DARK
+F:RES_FIRE
+F:RES_POIS
+F:RES_SOUND
 # The Palantir of Orthanc
 P:202:3:0
 F:AUTO_ID
@@ -146,13 +182,21 @@ N:9:Elendil's Heirlooms
 D:It is one of three items belonging to the House of Elendil.
 # The Ring of Barahir
 P:8:3:0
-F:RES_LITE | RES_BLIND | 
+F:RES_BLIND
+F:RES_LITE
 # The Star of Elendil
 P:2:3:1
-F:STR | INT | WIS | DEX | CON | CHR | LUCK | 
+F:CHR
+F:CON
+F:DEX
+F:INT
+F:LUCK
+F:STR
+F:WIS
 # The Rod of Annuminas
 P:199:3:0
-F:RES_FEAR | ESP_EVIL
+F:ESP_EVIL
+F:RES_FEAR
 
 # Flame of Wrath - from Oangband
 
@@ -160,10 +204,14 @@ N:10:Flame of Wrath
 D:It is one of two items infused with holy fire.
 # The Amulet of Annatar
 P:4:2:1
-F:WIS | IM_FIRE | RES_FEAR
+F:IM_FIRE
+F:RES_FEAR
+F:WIS
 # The Morning Star 'Naurgil'
 P:115:2:4
-F:STR | SLAY_EVIL | SLAY_UNDEAD
+F:SLAY_EVIL
+F:SLAY_UNDEAD
+F:STR
 
 # Light/Dark Set - from Oangband
 
@@ -171,10 +219,11 @@ N:11:Shadow Ward
 D:It is one of two items rumoured to defy the Shadow.
 # The Soft Leather Armour 'Hithlomir'
 P:168:2:2
-F:SEARCH | RES_BLIND
+F:RES_BLIND
 # The Set of Leather Gloves 'Cammithrim'
 P:53:2:2
-F:DEX | SUST_DEX
+F:DEX
+F:SUST_DEX
 
 # Eorl/Rohan Set - from Oangband
 
@@ -186,7 +235,8 @@ P:100:2:1
 F:FREE_ACT
 # The Metal Brigandine Armour of the Rohirrim
 P:21:2:0
-F:CON | REGEN
+F:CON
+F:REGEN
 
 # Gil-Galad's Set - from Oangband
 
@@ -195,10 +245,13 @@ D:It is one of three pieces of the battle gear of Gil-Galad,
 D:mighty Elven king of old.
 # The Shield of Deflection of Gil-Galad
 P:169:3:0
-F:RES_FIRE | RES_POIS | SUST_CON
+F:RES_FIRE
+F:RES_POIS
+F:SUST_CON
 # The Spear 'Aiglos'
 P:97:3:0
-F:SLAY_DEMON | RES_NETHER
+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?
@@ -211,13 +264,19 @@ N:14:Dwarven Heritage
 D:It is one of three Dwarven items of legend.
 # The Arkenstone of Thrain
 P:3:3:0
-F:SUST_STR | FREE_ACT | SUST_CON
+F:FREE_ACT
+F:SUST_CON
+F:SUST_STR
 # Mattock of Nain
 P:174:3:6
 F:CON
 # Lochaber Axe of the Dwarves
 P:105:3:0
-F:IM_ACID | RES_SHARDS | SUST_DEX | SUST_WIS | REFLECT
+F:IM_ACID
+F:REFLECT
+F:RES_SHARDS
+F:SUST_DEX
+F:SUST_WIS
 
 # Woodland Realm (bow of Legolas, staff of Thranduil, cap of Thranduil)  
 
@@ -225,10 +284,13 @@ N:15:Woodland Realm
 D:It is one of three items belonging to the Wood-elves of Mirkwood.
 # The Hard Leather Cap of Thranduil
 P:36:3:1
-F:SUST_INT | SUST_WIS | SPEED
+F:SPEED
+F:SUST_INT
+F:SUST_WIS
 # The Long Bow of Legolas
 P:224:3:2
-F:SUST_DEX | SPEED
+F:SPEED
+F:SUST_DEX
 # The Quarterstaff of Thranduil
 P:74:3:0
 # What can I say. I love archers. :P
@@ -240,10 +302,14 @@ N:16:Gimli's Gear
 D:It is one of three items belonging to Gimli the dwarf.
 # The Small Metal Shield of Gimli
 P:132:3:0
-F:SUST_STR | SUST_CON | SUST_INT
+F:SUST_CON
+F:SUST_INT
+F:SUST_STR
 # The Bearded Axe of Gimli
 P:133:3:0
-F:SLAY_EVIL | SLAY_GIANT | BRAND_FIRE
+F:BRAND_FIRE
+F:SLAY_EVIL
+F:SLAY_GIANT
 # The Pair of Metal Shod Boots of Gimli
 P:180:3:5
 F:LUCK
diff --git a/lib/mods/theme/edit/special.txt b/lib/mods/theme/edit/special.txt
index 8d1c94b9..4ac3f0ac 100644
--- a/lib/mods/theme/edit/special.txt
+++ b/lib/mods/theme/edit/special.txt
@@ -48,20 +48,17 @@ F:I:189:0
 # Treasure (random) on normal floor
 F:*:1:0:0:*
 
-# Trap (random) on normal floor
-F:^:1:0:0:0:0:0:*
-
 # down staircase
 F:>:7:0
 
 # between gates
-F:4:160:0:0:0:0:0:0:-1
-F:5:160:0:0:0:0:0:0:-1
-F:6:160:0:0:0:0:0:0:-1
-F:7:160:0:0:0:0:0:0:-1
-F:A:160:0:0:0:0:0:0:-1
-F:B:160:0:0:0:0:0:0:-1
-F:C:160:0:0:0:0:0:0:-1
-F:E:160:0:0:0:0:0:0:-1
-F:F:160:0:0:0:0:0:0:-1
-F:0:160:0:0:0:0:0:0:-1
+F:4:160:0:0:0:0:0:-1
+F:5:160:0:0:0:0:0:-1
+F:6:160:0:0:0:0:0:-1
+F:7:160:0:0:0:0:0:-1
+F:A:160:0:0:0:0:0:-1
+F:B:160:0:0:0:0:0:-1
+F:C:160:0:0:0:0:0:-1
+F:E:160:0:0:0:0:0:-1
+F:F:160:0:0:0:0:0:-1
+F:0:160:0:0:0:0:0:-1
diff --git a/lib/mods/theme/edit/spiders.map b/lib/mods/theme/edit/spiders.map
index 146c152c..f473cc31 100644
--- a/lib/mods/theme/edit/spiders.map
+++ b/lib/mods/theme/edit/spiders.map
@@ -20,10 +20,10 @@ F:b:89:3:275
 F:c:89:3:277
 
 # Grass with Aranea
-F:d:89:3:963:0:0:0:0:0:0:2
+F:d:89:3:963:0:0:0:0:0:2
 
 # Grass with Elder aranea
-F:e:89:3:964:0:0:0:0:0:0:2
+F:e:89:3:964:0:0:0:0:0:2
 
 # Dungeon layout
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
diff --git a/lib/mods/theme/edit/st_info.txt b/lib/mods/theme/edit/st_info.txt
index 29ca49fc..88303fff 100644
--- a/lib/mods/theme/edit/st_info.txt
+++ b/lib/mods/theme/edit/st_info.txt
@@ -1,13 +1,5 @@
 # File: st_info.txt
 
-# Fixed Potions of Cure Light/Serious Wounds in the Temple, Potions of 
-# Restore Str/Con in the Alchemist
-# Magic Shop - Amulet of Slow Digestion, Wand of Light, Staffs of Enlightenment,
-# Door/Stair Location, Detect Invis/Evil, and Remove Curse
-
-# This file is used to initialize the "lib/raw/st_info.raw" file, which is
-# used to initialize the "store info type" information for the Angband game.
-
 # Do not modify this file unless you know exactly what you are doing,
 # unless you wish to risk possible system crashes and broken savefiles.
 
@@ -22,10 +14,6 @@
 
 # proba is the chance(out of 100) of the item being generated
 
-# Version stamp (required)
-
-V:2.0.0
-
 N:0:General Store
 I:100:& Wooden Torch~
 I:95:& Brass Lantern~
@@ -175,7 +163,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
@@ -230,7 +217,6 @@ T:100:40:7
 I:100:Searching
 I:100:Cure Light Wounds
 # Rods
-I:100:Probing
 I:25:& Wooden Rod~ of#
 # Book
 T:100:111:50
@@ -259,14 +245,15 @@ N:6:Black Market
 A:30:0:1:2:3:4
 O:25:26:27:28
 G:7:D
-F:ALL_ITEM | MEDIUM_LEVEL
+F:ALL_ITEM
+F:MEDIUM_LEVEL
 W:24
 
 N:7:Home
 A:0:0:54:55:3:62
 O:0:0:0:0
 G:8:y
-W:24
+W:240
 
 N:8:Book Store
 # & Book~ of Beginner Cantrips
@@ -388,7 +375,7 @@ T:65:8:17
 T:60:8:18
 # Monstrous Compendium 11
 T:55:8:19
-A:18:2:21:22:3:0
+A:0:2:21:22:3:0
 O:94:95:96:97
 G:+:g
 W:24
@@ -595,7 +582,8 @@ T:100:24:256
 A:0:0:1:2:3:4
 O:118:119:120:121
 G:3:w
-F:RANDOM | MEDIUM_LEVEL
+F:MEDIUM_LEVEL
+F:RANDOM
 W:12
 
 N:39:Hafted Smith
@@ -603,7 +591,8 @@ T:100:21:256
 A:0:0:1:2:3:4
 O:122:123:124:125
 G:3:w
-F:RANDOM | MEDIUM_LEVEL
+F:MEDIUM_LEVEL
+F:RANDOM
 W:12
 
 N:40:Polearm Smith
@@ -611,7 +600,8 @@ T:100:22:256
 A:0:0:1:2:3:4
 O:126:127:128:129
 G:3:w
-F:RANDOM | MEDIUM_LEVEL
+F:MEDIUM_LEVEL
+F:RANDOM
 W:12
 
 N:41:Sword Smith
@@ -619,7 +609,8 @@ T:100:23:256
 A:0:0:1:2:3:4
 O:130:131:132:133
 G:3:w
-F:RANDOM | MEDIUM_LEVEL
+F:MEDIUM_LEVEL
+F:RANDOM
 W:12
 
 N:42:Rare Jewelry Shop
@@ -628,7 +619,10 @@ T:100:45:256
 A:0:0:1:2:3:4
 O:134:135:136:137
 G:6:v
-F:RANDOM | DEPEND_LEVEL | DEEP_LEVEL | FORCE_LEVEL
+F:DEEP_LEVEL
+F:DEPEND_LEVEL
+F:FORCE_LEVEL
+F:RANDOM
 F:VERY_RARE
 W:10
 
@@ -638,7 +632,10 @@ T:100:45:256
 A:0:0:1:2:3:4
 O:138:139:140:141
 G:6:y
-F:RANDOM | DEPEND_LEVEL | MEDIUM_LEVEL | FORCE_LEVEL
+F:DEPEND_LEVEL
+F:FORCE_LEVEL
+F:MEDIUM_LEVEL
+F:RANDOM
 F:RARE
 W:20
 
@@ -647,8 +644,9 @@ T:100:30:256
 A:0:0:1:2:3:4
 O:142:143:144:145
 G:2:r
-F:RANDOM | MEDIUM_LEVEL
 F:COMMON
+F:MEDIUM_LEVEL
+F:RANDOM
 W:12
 
 N:45:Rare Footwear Shop
@@ -656,7 +654,9 @@ T:100:30:256
 A:0:0:1:2:3:4
 O:146:147:148:149
 G:2:r
-F:RANDOM | DEEP_LEVEL | MEDIUM_LEVEL
+F:DEEP_LEVEL
+F:MEDIUM_LEVEL
+F:RANDOM
 F:VERY_RARE
 W:8
 
@@ -680,7 +680,9 @@ T:100:125:256
 A:27:0:1:2:3:4
 O:150:151:152:153
 G:9:y
-F:RANDOM | DEPEND_LEVEL | MEDIUM_LEVEL
+F:DEPEND_LEVEL
+F:MEDIUM_LEVEL
+F:RANDOM
 W:24
 
 N:47:Forbidden Library
@@ -703,7 +705,9 @@ T:100:125:256
 A:27:0:1:2:3:4
 O:150:151:152:153
 G:9:v
-F:RANDOM | DEPEND_LEVEL | DEEP_LEVEL
+F:DEEP_LEVEL
+F:DEPEND_LEVEL
+F:RANDOM
 F:RARE
 W:12
 
@@ -711,7 +715,11 @@ N:48:Expensive Black Market
 A:0:0:1:2:3:4
 O:154:155:156:157
 G:7:v
-F:RANDOM | ALL_ITEM | DEEP_LEVEL | DEPEND_LEVEL | MEDIUM_LEVEL
+F:ALL_ITEM
+F:DEEP_LEVEL
+F:DEPEND_LEVEL
+F:MEDIUM_LEVEL
+F:RANDOM
 W:12
 
 N:49:Common Shop
@@ -739,7 +747,9 @@ T:100:38:256
 A:0:0:1:2:3:4
 O:162:163:164:165
 G:2:v
-F:RANDOM | DEEP_LEVEL | DEPEND_LEVEL
+F:DEEP_LEVEL
+F:DEPEND_LEVEL
+F:RANDOM
 F:VERY_RARE
 W:12
 
@@ -748,7 +758,9 @@ T:100:45:31
 A:0:0:1:2:3:4
 O:166:167:168:169
 G:6:G
-F:RANDOM | SHALLOW_LEVEL | DEPEND_LEVEL
+F:DEPEND_LEVEL
+F:RANDOM
+F:SHALLOW_LEVEL
 F:VERY_RARE
 W:6
 
@@ -757,7 +769,9 @@ T:100:70:256
 A:0:0:1:2:3:4
 O:170:171:172:173
 G:5:B
-F:RANDOM | MEDIUM_LEVEL | DEPEND_LEVEL
+F:DEPEND_LEVEL
+F:MEDIUM_LEVEL
+F:RANDOM
 W:12
 
 N:53:Potion Store
@@ -766,7 +780,9 @@ T:100:72:256
 A:0:0:1:2:3:4
 O:174:175:176:177
 G:5:B
-F:RANDOM | MEDIUM_LEVEL | DEPEND_LEVEL
+F:DEPEND_LEVEL
+F:MEDIUM_LEVEL
+F:RANDOM
 W:12
 
 N:54:Recaller
@@ -774,7 +790,8 @@ I:100:Word of Recall
 A:33:0:1:2:3:0
 O:82:83:84:85
 G:+:b
-F:RANDOM | COMMON
+F:COMMON
+F:RANDOM
 W:2
 
 N:55:Master Archer
@@ -789,16 +806,12 @@ T:50:18:256
 A:0:0:1:2:3:4
 O:178:179:180:181
 G:3:g
-F:RANDOM | MEDIUM_LEVEL | DEPEND_LEVEL
+F:DEPEND_LEVEL
+F:MEDIUM_LEVEL
+F:RANDOM
 F:RARE
 W:24
 
-N:56:Merchants Guild
-A:0:0:56:57:58:0
-O:211:211:211:211
-G:+:g
-W:0
-
 N:57:The Museum
 A:0:0:59:0:3:0
 O:0:0:0:0
@@ -884,19 +897,6 @@ O:186:187:188:189
 G:*:w
 W:24
 
-# Rune Shop
-N:62:Runic Magic Shop
-T:100:104:256
-T:100:104:256
-T:100:104:256
-T:50:105:256
-T:50:105:256
-T:50:105:256
-A:0:0:1:2:3:4
-O:190:191:192:193
-G:6:w
-W:24
-
 # based on Mining Supply store in Khazad-Dum
 N:63:Construction Supply Store
 T:100:20:256
@@ -936,7 +936,9 @@ T:25:67:160
 T:5:67:200
 A:0:0:1:2:3:4
 O:198:199:200:201
-F:RANDOM | MEDIUM_LEVEL | DEPEND_LEVEL
+F:DEPEND_LEVEL
+F:MEDIUM_LEVEL
+F:RANDOM
 G:6:b
 W:12
 
@@ -1154,4 +1156,4 @@ N:88:Forge
 A:23:24:25:32:64:0
 O:43:43:43:43
 G:+:y
-W:0
\ No newline at end of file
+W:0
diff --git a/lib/mods/theme/edit/t_basic.txt b/lib/mods/theme/edit/t_basic.txt
deleted file mode 100644
index 8153f6fe..00000000
--- a/lib/mods/theme/edit/t_basic.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-D:######################################################################################################################################################################################################
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:#                                                                                                                                                                                                    #
-D:######################################################################################################################################################################################################
\ No newline at end of file
diff --git a/lib/mods/theme/edit/t_beorn.txt b/lib/mods/theme/edit/t_beorn.txt
index e60c5d29..57a15b01 100644
--- a/lib/mods/theme/edit/t_beorn.txt
+++ b/lib/mods/theme/edit/t_beorn.txt
@@ -32,13 +32,13 @@ F:]:236:3
 ### Buildings ###
 
 #The House of Beorn
-F:a:74:3:0:0:0:0:0:76
+F:a:74:3:0:0:0:0:76
 
 #The Farm
-F:f:74:3:0:0:0:0:0:67
+F:f:74:3:0:0:0:0:67
 
 #The Beastmaster
-F:r:74:3:0:0:0:0:0:16
+F:r:74:3:0:0:0:0:16
 
 D:######################################################################################################################################################################################################
 D:#                                                        ------TT-TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT--T-TTT------------------                                                       #
diff --git a/lib/mods/theme/edit/t_bree.txt b/lib/mods/theme/edit/t_bree.txt
index e5fe559a..c6b50340 100644
--- a/lib/mods/theme/edit/t_bree.txt
+++ b/lib/mods/theme/edit/t_bree.txt
@@ -5,7 +5,7 @@
 ############### Additional default terrain settings ###############
 
 # Default for Quest 1 = entrance is quest entrance
-F:z:8:3:0:0:0:0:0:4
+F:z:8:3:0:0:0:0:4
 
 # Default for Quest 18 = entrance is tree
 F:y:96:3
@@ -15,46 +15,46 @@ F:x:96:3
 
 ############### Quest 4 - Thieves Hideout finished = house ###############
 ?:[EQU $QUEST4 2]
-F:z:74:3:0:0:0:0:0:7
+F:z:74:3:0:0:0:0:7
 ?:[EQU $QUEST4 5]
-F:z:74:3:0:0:0:0:0:7
+F:z:74:3:0:0:0:0:7
 ?:1
 
 ############### Quest 8 - Troll Glade ###############
 ?:[AND [EQU $QUEST8 1] [EQU $DAYTIME 0] ]
-F:y:8:3:0:0:0:0:0:8
+F:y:8:3:0:0:0:0:8
 ?:1
 
 ############### Quest 9 - Wights Grave ###############
 ?:[EQU $QUEST9 1]
-F:x:8:3:0:0:0:0:0:9
+F:x:8:3:0:0:0:0:9
 ?:1
 
 ###### Additionnal buildings #######
 
 # Castle: Plot Bree
-F:B:75:3:0:0:0:0:0:1
+F:B:75:3:0:0:0:0:1
 
 # Mayor's house
-F:b:74:3:0:0:0:0:0:10
+F:b:74:3:0:0:0:0:10
 
 # The Prancing Pony
-F:a:74:3:0:0:0:0:0:58
+F:a:74:3:0:0:0:0:58
 
 # Soothsayer
-F:c:74:3:0:0:0:0:0:12
+F:c:74:3:0:0:0:0:12
 
 # Music Store
-F:d:74:3:0:0:0:0:0:64
+F:d:74:3:0:0:0:0:64
 
 # The Museum
-F:e:74:3:0:0:0:0:0:57
+F:e:74:3:0:0:0:0:57
 
 # Map store
-F:f:74:3:0:0:0:0:0:66
+F:f:74:3:0:0:0:0:66
 
 # The Library
-F:g:74:3:0:0:0:0:0:13
+F:g:74:3:0:0:0:0:13
 
 ############### Town Layout ###############
 
diff --git a/lib/mods/theme/edit/t_dale.txt b/lib/mods/theme/edit/t_dale.txt
index 5c2dcf6c..23d483cf 100644
--- a/lib/mods/theme/edit/t_dale.txt
+++ b/lib/mods/theme/edit/t_dale.txt
@@ -20,13 +20,13 @@ F:]:236:3
 ### Buildings ###
 
 # Bard's Hut
-F:b:74:3:0:0:0:0:0:77
+F:b:74:3:0:0:0:0:77
 
 # Construction Supply Store
-F:c:74:3:0:0:0:0:0:63
+F:c:74:3:0:0:0:0:63
 
 # Builder Barracks
-F:i:74:3:0:0:0:0:0:71
+F:i:74:3:0:0:0:0:71
 
 D:######################################################################################################################################################################################################
 D:#                                                                                                                                                                                                    #
diff --git a/lib/mods/theme/edit/t_edoras.txt b/lib/mods/theme/edit/t_edoras.txt
index a4257661..aa0b9641 100644
--- a/lib/mods/theme/edit/t_edoras.txt
+++ b/lib/mods/theme/edit/t_edoras.txt
@@ -14,40 +14,37 @@ F:m:240:3
 ### Buildings ###
 
 #Meduseld
-F:k:74:3:0:0:0:0:0:82
+F:k:74:3:0:0:0:0:82
 
 #Inn
-F:i:74:3:0:0:0:0:0:72
+F:i:74:3:0:0:0:0:72
 
 #Map store
-F:a:74:3:0:0:0:0:0:66
+F:a:74:3:0:0:0:0:66
 
 #Music store
-F:c:74:3:0:0:0:0:0:64
+F:c:74:3:0:0:0:0:64
 
 #The Library
-F:g:74:3:0:0:0:0:0:13
-
-#Rune shop
-F:r:74:3:0:0:0:0:0:62
+F:g:74:3:0:0:0:0:13
 
 #The Beastmaster
-F:b:74:3:0:0:0:0:0:16
+F:b:74:3:0:0:0:0:16
 
 #Fighters Hall
-F:d:74:3:0:0:0:0:0:17
+F:d:74:3:0:0:0:0:17
 
 #Tower of Magery
-F:h:74:3:0:0:0:0:0:18
+F:h:74:3:0:0:0:0:18
 
 #Inner Temple
-F:j:74:3:0:0:0:0:0:19
+F:j:74:3:0:0:0:0:19
 
 #Paladins Guild
-F:l:74:3:0:0:0:0:0:20
+F:l:74:3:0:0:0:0:20
 
 #Rangers Guild
-F:n:74:3:0:0:0:0:0:21
+F:n:74:3:0:0:0:0:21
 
 D:######################################################################################################################################################################################################
 D:#-----------------------------------------------------------------------------------------#####OOOOOOO#####,,,,,,,,----------------------------------------------------------------------------------#
@@ -74,7 +71,7 @@ D:#--------------------------------------------###-----------OOO--------O-------
 D:#-------------------------------------------###-----------OOO----------O-----------###----------OO-----------------OOOO##-----------OO--OO-######----##------------,---------------------------------#
 D:#-------------------------------------------##-----------OOO-OOOOOOOOOOOOO--------##------------OO-------------------OOO##----#####aOOO--O-######----##------------,---------------------------------#
 D:#------------------------------------------##-----------OOO--O###########O------###-------------OO---------------------OO##---######--OOOOOOO---------##-----------,---------------------------------#
-D:#------------------------------------------##----------OOOOOOOr#########rO-----##---------------OO----------------------OO##--######---#c##g#---------##-----------,---------------------------------#
+D:#------------------------------------------##----------OOOOOOO###########O-----##---------------OO----------------------OO##--######---#c##g#---------##-----------,---------------------------------#
 D:#------------------------------------------##----------OOO---O###########O----###---------------OO#########--------------OO##----------######---------##-----------,---------------------------------#
 D:#------------------------------------------##----------OOO---OOOOOOOOOOOOO---###----------------OO-----######-------------OO##---------######----------##----------,,--------------------------------#
 D:#------------------------------------------##---------OOOO-------------------##-----------------OO---------####------------OO##------------------------##-----------,--------------------------------#
@@ -114,4 +111,4 @@ D:#-----------------------------------------------------------------------#####-
 D:#--------------------------------------------------------------------------######--------------------------------#########---------------------------------------------------------------------------#
 D:#-----------------------------------------------------------------------------###########----------------############--------------------------------------------------------------------------------#
 D:#-----------------------------------------------------------------------------------########################-----------------------------------------------------------------------------------------#
-D:######################################################################################################################################################################################################
\ No newline at end of file
+D:######################################################################################################################################################################################################
diff --git a/lib/mods/theme/edit/t_esga.txt b/lib/mods/theme/edit/t_esga.txt
index 6665e914..36b97429 100644
--- a/lib/mods/theme/edit/t_esga.txt
+++ b/lib/mods/theme/edit/t_esga.txt
@@ -23,19 +23,19 @@ F:e:241
 ### Buildings ###
 
 #The Dancing Dragon
-F:i:74:3:0:0:0:0:0:73
+F:i:74:3:0:0:0:0:73
 
 #The Master's House
-F:k:74:3:0:0:0:0:0:83
+F:k:74:3:0:0:0:0:83
 
 #The Library
-F:l:74:3:0:0:0:0:0:13
+F:l:74:3:0:0:0:0:13
 
 #The Music Store
-F:m:74:3:0:0:0:0:0:64
+F:m:74:3:0:0:0:0:64
 
 #The Hunter store
-F:n:74:3:0:0:0:0:0:61
+F:n:74:3:0:0:0:0:61
 
 D:######################################################################################################################################################################################################
 D:#WWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWW#
diff --git a/lib/mods/theme/edit/t_gondol.txt b/lib/mods/theme/edit/t_gondol.txt
index 6b0a32cd..50f0d271 100644
--- a/lib/mods/theme/edit/t_gondol.txt
+++ b/lib/mods/theme/edit/t_gondol.txt
@@ -15,7 +15,7 @@ F:y:1:3
 F:x:1:3
 
 # Default for Quest 23 = entrance is quest entrance
-F:w:8:3:0:0:0:0:0:23
+F:w:8:3:0:0:0:0:23
 
 # Decoration = Straight Road (B)
 F:":66:3
@@ -33,7 +33,7 @@ F:Z:63:3
 
 # Quest 13 assigned, entrance is quest entrance
 ?:[EQU $QUEST13 1]
-F:z:8:3:0:0:0:0:0:13
+F:z:8:3:0:0:0:0:13
 
 ?:1
 
@@ -41,11 +41,11 @@ F:z:8:3:0:0:0:0:0:13
 
 # Quest 14 assigned, entrance is quest entrance
 ?:[EQU $QUEST14 1]
-F:y:8:3:0:0:0:0:0:14
+F:y:8:3:0:0:0:0:14
 
 # Quest 14 finished, reward is a rare jewelry shop
 ?:[EQU $QUEST14 5]
-F:!:74:3:0:0:0:0:0:42
+F:!:74:3:0:0:0:0:42
 
 ?:1
 
@@ -53,7 +53,7 @@ F:!:74:3:0:0:0:0:0:42
 
 # Quest 15 assigned, entrance is quest entrance
 ?:[EQU $QUEST15 1]
-F:x:8:3:0:0:0:0:0:15
+F:x:8:3:0:0:0:0:15
 
 ?:1
 
@@ -61,15 +61,15 @@ F:x:8:3:0:0:0:0:0:15
 
 # Quest 16 finished, reward is a between gate
 ?:[EQU $QUEST16 5]
-F:Z:176:3:0:0:0:0:0:1
+F:Z:176:3:0:0:0:0:1
 
 ?:1
 
 ############### Quest 23 - Wolves hut finished = house ###############
 ?:[EQU $QUEST23 2]
-F:w:74:3:0:0:0:0:0:7
+F:w:74:3:0:0:0:0:7
 ?:[EQU $QUEST23 5]
-F:w:74:3:0:0:0:0:0:7
+F:w:74:3:0:0:0:0:7
 ?:1
 
 #################### Buildings ####################
@@ -82,49 +82,46 @@ F:w:74:3:0:0:0:0:0:7
 # m: White (Paladin)
 
 # Tower of the King
-F:a:74:3:0:0:0:0:0:27
+F:a:74:3:0:0:0:0:27
 
 # Library
-F:b:74:3:0:0:0:0:0:28
+F:b:74:3:0:0:0:0:28
 
 # Castle: Gondolin Plot
-F:B:75:3:0:0:0:0:0:4
+F:B:75:3:0:0:0:0:4
 
 # The White Tree:Aerandir:High-Elf
-F:c:74:3:0:0:0:0:0:29
+F:c:74:3:0:0:0:0:29
 
 # Craftsmaster
-F:d:74:3:0:0:0:0:0:30
+F:d:74:3:0:0:0:0:30
 
 # Earth-Dome
-F:e:74:3:0:0:0:0:0:31
+F:e:74:3:0:0:0:0:31
 
 # Prophet
-F:f:74:3:0:0:0:0:0:12
+F:f:74:3:0:0:0:0:12
 
 # Minstrels Haven
-F:h:74:3:0:0:0:0:0:32
+F:h:74:3:0:0:0:0:32
 
 # Star-Dome:Sulraen:High-Elf
-F:i:74:3:0:0:0:0:0:33
+F:i:74:3:0:0:0:0:33
 
 # Valarin Temple
-F:j:74:3:0:0:0:0:0:34
+F:j:74:3:0:0:0:0:34
 
 # Sea-Dome
-F:k:74:3:0:0:0:0:0:35
+F:k:74:3:0:0:0:0:35
 
 # The Golden Flower
-F:l:74:3:0:0:0:0:0:36
+F:l:74:3:0:0:0:0:36
 
 # The Fountain
-F:m:74:3:0:0:0:0:0:37
+F:m:74:3:0:0:0:0:37
 
 # Thunderlord's Hide
-F:n:74:3:0:0:0:0:0:22
-
-# Merchant guild
-F:o:74:3:0:0:0:0:0:56
+F:n:74:3:0:0:0:0:22
 
 # Force elven monsters
 f:ELVEN
@@ -178,7 +175,7 @@ D:######$$$$$$$$$$$$$$$$$###                       ...
 D:######$$$$$$$$$$$$$$$$$$##                       ...                                OC##T.V#######V...........TTTT#######TTTT..................TT####CO---,--TTT##TTT----TTT##TTTTTT------,,,,,^^^^###
 D:#####$$$$$$$$$$$$$$$$$$$##           #########   ...   #############                OCC#T.VV#####VV.............................................TTT#CCO---,---TT#TT--------TT##T-T-TT------,,,,^^^^###
 D:#####$$$$$$$#####$$$$$$$##           #########   ...   #############                OOC#T..VV###VV.....TTTTTTTTTTT.......TTTTTTTTTTT..............T#COO---,,,,,,,,,,,,,,,,,,,e#TT-TTT------,,,,^^^^###
-D:####$$$$#############$$$$#           ########o.........7############                 OC#T...VVVVV....TTT#########TTT...TTT#########TTT............T#CO---------T#TT--------TT##TTT-------,,,,^^^^^^###
+D:####$$$$#############$$$$#           #########.........7############                 OC#T...VVVVV....TTT#########TTT...TTT#########TTT............T#CO---------T#TT--------TT##TTT-------,,,,^^^^^^###
 D:####$###################$#           #########   ...   #############                 OC#TT..........TT###VVVVVV####TT.TT####WWWWWW###TT..........TT#CO-------TTT##TTT----TTT##TTTTT-----,,,,^^^^^^^###
 D:##########################           #########   ...   #############                 OC##T..........T##VVV....VVV###TTT###WWW....WWW##T..........T##CO------TTTTT###TTTTTT###TTTTT-----,,,,,^^^^^^^###
 D:###########################                      ...                                 OCC#T..........T#VV........VV#######WW........WW#T..........T#CCO-----TTTT-TTT########TTTTTT------,,,,,,,^^^^^###
diff --git a/lib/mods/theme/edit/t_helm.txt b/lib/mods/theme/edit/t_helm.txt
index 0ecaf913..d2ff3536 100644
--- a/lib/mods/theme/edit/t_helm.txt
+++ b/lib/mods/theme/edit/t_helm.txt
@@ -3,7 +3,7 @@
 # Helm's Deep map by furiosity <furiosity@zionmainframe.net>
 
 #The Hornburg
-F:k:74:3:0:0:0:0:0:80
+F:k:74:3:0:0:0:0:80
 
 D:######################################################################################################################################################################################################
 D:#TT,,,,TTTTTTTTTTTTTTTTTTTTTTTT^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^#
diff --git a/lib/mods/theme/edit/t_henn.txt b/lib/mods/theme/edit/t_henn.txt
index 49e91867..a98de034 100644
--- a/lib/mods/theme/edit/t_henn.txt
+++ b/lib/mods/theme/edit/t_henn.txt
@@ -20,13 +20,13 @@ F:l:239:3
 ### Buildings ###
 
 # Ranger Conclave
-F:k:74:3:0:0:0:0:0:78
+F:k:74:3:0:0:0:0:78
 
 # Fighters Hall
-F:a:74:3:0:0:0:0:0:17
+F:a:74:3:0:0:0:0:17
 
 # Rangers Guild
-F:b:74:3:0:0:0:0:0:21
+F:b:74:3:0:0:0:0:21
 
 D:######################################################################################################################################################################################################
 D:#hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhWWWWWWWWWWhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh#
diff --git a/lib/mods/theme/edit/t_hobb.txt b/lib/mods/theme/edit/t_hobb.txt
index 6043f188..6de1143e 100644
--- a/lib/mods/theme/edit/t_hobb.txt
+++ b/lib/mods/theme/edit/t_hobb.txt
@@ -29,16 +29,16 @@ F:m:243:3
 ### Buildings ###
 
 # Farm
-F:f:74:3:0:0:0:0:0:67
+F:f:74:3:0:0:0:0:67
 
 # Green Dragon
-F:g:74:3:0:0:0:0:0:74
+F:g:74:3:0:0:0:0:74
 
 # Bag End
-F:i:74:3:0:0:0:0:0:84
+F:i:74:3:0:0:0:0:84
 
 # Beastmaster
-F:j:74:3:0:0:0:0:0:16
+F:j:74:3:0:0:0:0:16
 
 D:######################################################################################################################################################################################################
 D:#bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbhhhhhhhhhhhhhhhhhhhhhhhhhhihhhhhhhccccchhOOhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh#
diff --git a/lib/mods/theme/edit/t_imlad.txt b/lib/mods/theme/edit/t_imlad.txt
index af06a709..35270534 100644
--- a/lib/mods/theme/edit/t_imlad.txt
+++ b/lib/mods/theme/edit/t_imlad.txt
@@ -14,13 +14,13 @@ F:f:238:3
 ### Buildings ###
 
 # Imladris
-F:a:74:3:0:0:0:0:0:79
+F:a:74:3:0:0:0:0:79
 
 # Forge
-F:b:74:3:0:0:0:0:0:88
+F:b:74:3:0:0:0:0:88
 
 # Stable (Beastmaster)
-F:c:74:3:0:0:0:0:0:16
+F:c:74:3:0:0:0:0:16
 
 D:######################################################################################################################################################################################################
 D:#                                      @^^^@             @@WWWWWWWWWW^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^WWW^#
diff --git a/lib/mods/theme/edit/t_khazad.txt b/lib/mods/theme/edit/t_khazad.txt
index 73e93956..a707afbd 100644
--- a/lib/mods/theme/edit/t_khazad.txt
+++ b/lib/mods/theme/edit/t_khazad.txt
@@ -8,37 +8,37 @@ F:o:207:3
 ###################### Buildings ########################
 
 # Fighters Hall
-F:f:74:3:0:0:0:0:0:17
+F:f:74:3:0:0:0:0:17
 
 # Paladins Guild
-F:g:74:3:0:0:0:0:0:20
+F:g:74:3:0:0:0:0:20
 
 # Inner Temple
-F:h:74:3:0:0:0:0:0:19
+F:h:74:3:0:0:0:0:19
 
 # Mining Supplies
-F:i:74:3:0:0:0:0:0:59
+F:i:74:3:0:0:0:0:59
 
 # Default for Quest 25 = entrance is quest entrance
-F:w:8:3:0:0:0:0:0:25
+F:w:8:3:0:0:0:0:25
 
 # Seat of Durin
-F:k:74:3:0:0:0:0:0:87
+F:k:74:3:0:0:0:0:87
 
 # Inn
-F:n:74:3:0:0:0:0:0:70
+F:n:74:3:0:0:0:0:70
 
 # Eagles
-F:p:74:3:0:0:0:0:0:22
+F:p:74:3:0:0:0:0:22
 
 # Force dwarven monsters
 f:DWARVEN
 
 ############### Quest 25 - Evil cave finished = house ###############
 ?:[EQU $QUEST25 2]
-F:w:74:3:0:0:0:0:0:7
+F:w:74:3:0:0:0:0:7
 ?:[EQU $QUEST25 5]
-F:w:74:3:0:0:0:0:0:7
+F:w:74:3:0:0:0:0:7
 ?:1
 
 # Town Layout
diff --git a/lib/mods/theme/edit/t_lorien.txt b/lib/mods/theme/edit/t_lorien.txt
index a4a63172..efe4a4af 100644
--- a/lib/mods/theme/edit/t_lorien.txt
+++ b/lib/mods/theme/edit/t_lorien.txt
@@ -21,30 +21,30 @@ F:x:96:3
 F:v:88:3
 
 # Default for Quest 22 = entrance is quest entrance
-F:w:8:3:0:0:0:0:0:22
+F:w:8:3:0:0:0:0:22
 
 ############### Quest 22 - Wolves hut finished = house ###############
 ?:[EQU $QUEST22 2]
-F:w:74:3:0:0:0:0:0:7
+F:w:74:3:0:0:0:0:7
 ?:[EQU $QUEST22 5]
-F:w:74:3:0:0:0:0:0:7
+F:w:74:3:0:0:0:0:7
 ?:1
 
 ############### Entrance to the Void ###############
 ?:[EQU $QUEST20 1]
-F:v:7:3:0:0:0:0:0:11
+F:v:7:3:0:0:0:0:11
 ?:1
 
 ############### Quest 10 - Spiders of Mirkwood ###############
 # Quest 10 taken, entrance is quest entrance
 ?:[EQU $QUEST10 1]
-F:y:8:3:0:0:0:0:0:10
+F:y:8:3:0:0:0:0:10
 ?:1
 
 ############### Quest - Mage/Fireroof quest ###############
 # Mage/Fireproof Quest taken, entrance is quest entrance
 ?:[EQU $QUEST"Old Mages quest" 1]
-F:z:8:3:0:0:0:0:0:"Old Mages quest"
+F:z:8:3:0:0:0:0:"Old Mages quest"
 ?:1
 
 ### Additional terrain features ###
@@ -64,43 +64,43 @@ F:l:202:3
 ###################### Buildings ########################
 
 # The Mirror
-F:a:74:3:0:0:0:0:0:23
+F:a:74:3:0:0:0:0:23
 
 # Castle: Plot Lorien
-F:B:75:3:0:0:0:0:0:2
+F:B:75:3:0:0:0:0:2
 
 # Seat of Ruling
-F:b:74:3:0:0:0:0:0:24
+F:b:74:3:0:0:0:0:24
 
 # Inn
-F:c:74:3:0:0:0:0:0:69
+F:c:74:3:0:0:0:0:69
 
 # Beastmaster Shanty
-F:d:74:3:0:0:0:0:0:16
+F:d:74:3:0:0:0:0:16
 
 # Fighters Hall
-F:f:74:3:0:0:0:0:0:17
+F:f:74:3:0:0:0:0:17
 
 # Wizards Spire
-F:g:74:3:0:0:0:0:0:25
+F:g:74:3:0:0:0:0:25
 
 # Priests Circle
-F:h:74:3:0:0:0:0:0:26
+F:h:74:3:0:0:0:0:26
 
 # Rangers Guild 
-F:i:74:3:0:0:0:0:0:21
+F:i:74:3:0:0:0:0:21
 
 # Nest
-F:j:74:3:0:0:0:0:0:22
+F:j:74:3:0:0:0:0:22
 
 # Hunter store
-F:k:74:3:0:0:0:0:0:61
+F:k:74:3:0:0:0:0:61
 
 # Museum
-F:q:74:3:0:0:0:0:0:57
+F:q:74:3:0:0:0:0:57
 
 # Music shop
-F:r:74:3:0:0:0:0:0:64
+F:r:74:3:0:0:0:0:64
 
 # Force elven monsters
 f:ELVEN
diff --git a/lib/mods/theme/edit/t_minas.txt b/lib/mods/theme/edit/t_minas.txt
index b96481d8..ea5c0fe5 100644
--- a/lib/mods/theme/edit/t_minas.txt
+++ b/lib/mods/theme/edit/t_minas.txt
@@ -9,66 +9,66 @@
 F:Z:63:3
 
 # Default for Quest 24 = entrance is quest entrance
-F:w:8:3:0:0:0:0:0:24
+F:w:8:3:0:0:0:0:24
 
 #################### Quest 16 - The last Alliance ####################
 
 # Quest 16 finished, reward is a between gate
 ?:[EQU $QUEST16 5]
-F:Z:176:3:0:0:0:0:0:0
+F:Z:176:3:0:0:0:0:2
 
 ?:1
 
 ############### Quest 24 - Haunted House finished = house ###############
 ?:[EQU $QUEST24 2]
-F:w:74:3:0:0:0:0:0:7
+F:w:74:3:0:0:0:0:7
 ?:[EQU $QUEST24 5]
-F:w:74:3:0:0:0:0:0:7
+F:w:74:3:0:0:0:0:7
 ?:1
 
 #################### Buildings ####################
 
 # Library
-F:a:74:3:0:0:0:0:0:60
+F:a:74:3:0:0:0:0:60
 
 # Castle
-F:b:74:3:0:0:0:0:0:14
+F:b:74:3:0:0:0:0:14
 
 # Casino
-F:d:74:3:0:0:0:0:0:15
+F:d:74:3:0:0:0:0:15
 
 # Inn
-F:e:74:3:0:0:0:0:0:11
+F:e:74:3:0:0:0:0:11
 
 # Beastmaster Shanty
-F:f:74:3:0:0:0:0:0:16
+F:f:74:3:0:0:0:0:16
 
 # Fighters hall
-F:g:74:3:0:0:0:0:0:17
+F:g:74:3:0:0:0:0:17
 
 # Tower of Magery
-F:h:74:3:0:0:0:0:0:18
+F:h:74:3:0:0:0:0:18
 
 # Inner temple
-F:i:74:3:0:0:0:0:0:19
+F:i:74:3:0:0:0:0:19
 
 # Paladin guild
-F:j:74:3:0:0:0:0:0:20
+F:j:74:3:0:0:0:0:20
 
 # Ranger guild
-F:k:74:3:0:0:0:0:0:21
+F:k:74:3:0:0:0:0:21
 
 # Thunderlord's Hide
-F:l:74:3:0:0:0:0:0:22
+F:l:74:3:0:0:0:0:22
 
 # Castle: Plot Minas Anor
-F:B:75:3:0:0:0:0:0:5
+F:B:75:3:0:0:0:0:5
 
 # Library Quest
 F:x:63:3
 
 ?:[EQU $QUEST"Library quest" 1]
-F:x:8:3:0:0:0:0:0:"Library quest"
+F:x:8:3:0:0:0:0:"Library quest"
 ?:1
 
 ############### Town Layout ###############
diff --git a/lib/mods/theme/edit/t_osgili.txt b/lib/mods/theme/edit/t_osgili.txt
index ea74d660..7011cd16 100644
--- a/lib/mods/theme/edit/t_osgili.txt
+++ b/lib/mods/theme/edit/t_osgili.txt
@@ -33,40 +33,40 @@ F:z:169:3
 ### Buildings ###
 
 # The Twinkling Star inn
-F:e:74:3:0:0:0:0:0:68
+F:e:74:3:0:0:0:0:68
 
 # The Castle of Stars
-F:f:74:3:0:0:0:0:0:85
+F:f:74:3:0:0:0:0:85
 
 # Map store
-F:g:74:3:0:0:0:0:0:66
+F:g:74:3:0:0:0:0:66
 
 # Museum
-F:h:74:3:0:0:0:0:0:57
+F:h:74:3:0:0:0:0:57
 
 # Soothsayer
-F:i:74:3:0:0:0:0:0:12
+F:i:74:3:0:0:0:0:12
 
 # Library
-F:j:74:3:0:0:0:0:0:13
+F:j:74:3:0:0:0:0:13
 
 # Casino
-F:o:74:3:0:0:0:0:0:15
+F:o:74:3:0:0:0:0:15
 
 # Fighters Hall
-F:p:74:3:0:0:0:0:0:17
+F:p:74:3:0:0:0:0:17
 
 # Tower of Magery
-F:q:74:3:0:0:0:0:0:18
+F:q:74:3:0:0:0:0:18
 
 # Inner Temple
-F:r:74:3:0:0:0:0:0:19
+F:r:74:3:0:0:0:0:19
 
 # Paladins Guild
-F:u:74:3:0:0:0:0:0:20
+F:u:74:3:0:0:0:0:20
 
 # Rangers Guild
-F:v:74:3:0:0:0:0:0:21
+F:v:74:3:0:0:0:0:21
 
 D:######################################################################################################################################################################################################
 D:#---------------------------------------------------------#################@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@##########################---------------------------------------------------------#
diff --git a/lib/mods/theme/edit/t_pelar.txt b/lib/mods/theme/edit/t_pelar.txt
index 0057518b..08e9d7d2 100644
--- a/lib/mods/theme/edit/t_pelar.txt
+++ b/lib/mods/theme/edit/t_pelar.txt
@@ -14,28 +14,25 @@ F:a:227:3
 ### Buildings ###
 
 # The Grey Swan inn
-F:b:74:3:0:0:0:0:0:68
+F:b:74:3:0:0:0:0:68
 
 # The Prince's Tower
-F:c:74:3:0:0:0:0:0:86
+F:c:74:3:0:0:0:0:86
 
 # Music store
-F:d:74:3:0:0:0:0:0:64
-
-# Rune Shop
-F:e:74:3:0:0:0:0:0:62
+F:d:74:3:0:0:0:0:64
 
 # Hunting Store
-F:f:74:3:0:0:0:0:0:61
+F:f:74:3:0:0:0:0:61
 
 # Library
-F:i:74:3:0:0:0:0:0:13
+F:i:74:3:0:0:0:0:13
 
 # Casino
-F:j:74:3:0:0:0:0:0:15
+F:j:74:3:0:0:0:0:15
 
 # Beastmaster
-F:k:74:3:0:0:0:0:0:16
+F:k:74:3:0:0:0:0:16
 
 D:######################################################################################################################################################################################################
 D:#-------------------------------------------------@VVVVV@##VVVVV@@-----------------------------------------------------------------------------------------------------------------------------------#                                                                                                                                                                                      #
@@ -73,7 +70,7 @@ D:#-------------------------------------------------OVVVVVVVVVVVVVVVVVVVVVVVVVVV
 D:#-------------------------------------------------OVVVVVVVVVVVVVVVVVVVVVVVVVVV.......########................OOOO6###########9OOOOOOOOO#,,,,,,,,#####VVV@aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa#
 D:#-------------------------------------------------@VVVVVVVVVVVVVVVVVVVVVVVVVVV.........#cc#...............#####,O#############O,,,,,,#####,,,#####aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa#
 D:#-------------------------------------------------@VVVVV@#######################.......................####,,,,,,O,,#######,OO,,,,,,,,,,,,#####aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa#
-D:#-------------------------------------------------@VVVVV@####,,,,,,,,,,,,OOOOO##....................#####,,,,,,,,,O,###e###O,,,,,,,,,,,#####aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa#
+D:#-------------------------------------------------@VVVVV@####,,,,,,,,,,,,OOOOO##....................#####,,,,,,,,,O,#######O,,,,,,,,,,,#####aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa#
 D:#-------------------------------------------------@VVVVV@####,,#####,,,,O,,,,,##..................###,,,,,,,,,,,,,,OOOOOOOO,,,,,,,,#####aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa#
 D:#-------------------------------------------------@VVVVV@####,,####bOO,O,,,,,,##.................###,,,,,#######,,,,,,,,,,,,,,,,#####aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa#
 D:#-------------------------------------------------@VVVVV@####,,#####,,O,,####,##................aaa##,,,,#######,,,,,,,,,,,,,#####aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa#
@@ -102,4 +99,4 @@ D:#-------------------------------------------------@VVVVV@##########aaaaaaaaaaa
 D:#-------------------------------------------------@VVVVV@#######aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa#
 D:#-------------------------------------------------@VVVVV@####aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa#
 D:#-------------------------------------------------@VVVVV@##aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa#
-D:######################################################################################################################################################################################################
\ No newline at end of file
+D:######################################################################################################################################################################################################
diff --git a/lib/mods/theme/edit/t_pref.txt b/lib/mods/theme/edit/t_pref.txt
index 1159e817..e8a601bb 100644
--- a/lib/mods/theme/edit/t_pref.txt
+++ b/lib/mods/theme/edit/t_pref.txt
@@ -1,19 +1,19 @@
 # File: t_pref.txt
 
 # Defines the preferences for the town features
-# letter:feature:cave_info:monster:object:ego:artifact:trap:special
+# letter:feature:cave_info:monster:object:ego:artifact:special
 
 # Barrow-Downs entrance
-F:{:7:3:0:0:0:0:0:4
+F:{:7:3:0:0:0:0:4
 
 # Mirkwood Forest entrance
-F:~:7:3:0:0:0:0:0:1
+F:~:7:3:0:0:0:0:1
 
 # Land of Mordor entrance
-F:|:7:3:0:0:0:0:0:2
+F:|:7:3:0:0:0:0:2
 
 # Angband Dungeon entrance
-F:>:7:3:0:0:0:0:0:3
+F:>:7:3:0:0:0:0:3
 
 # Mountain chain
 F:^:97:3
@@ -72,34 +72,34 @@ F:Y:192:3
 F:O:200:3
 
 # General Store
-F:1:74:3:0:0:0:0:0:0
+F:1:74:3:0:0:0:0:0
 
 # Armoury
-F:2:74:3:0:0:0:0:0:1
+F:2:74:3:0:0:0:0:1
 
 # Weapons Smith
-F:3:74:3:0:0:0:0:0:2
+F:3:74:3:0:0:0:0:2
 
 # Temple
-F:4:74:3:0:0:0:0:0:3
+F:4:74:3:0:0:0:0:3
 
 # Alchemy Shop
-F:5:74:3:0:0:0:0:0:4
+F:5:74:3:0:0:0:0:4
 
 # Magic Shop
-F:6:74:3:0:0:0:0:0:5
+F:6:74:3:0:0:0:0:5
 
 # Black Market
-F:7:74:3:0:0:0:0:0:6
+F:7:74:3:0:0:0:0:6
 
 # Home
-F:8:74:3:0:0:0:0:0:7
+F:8:74:3:0:0:0:0:7
 
 # Bookstore
-F:9:74:3:0:0:0:0:0:8
+F:9:74:3:0:0:0:0:8
 
 # Pet Shop
-F:0:74:3:0:0:0:0:0:9
+F:0:74:3:0:0:0:0:9
 
 # Underground Tunnels -- used for tunnels in towns
 F:I:173:3
diff --git a/lib/mods/theme/edit/t_thrand.txt b/lib/mods/theme/edit/t_thrand.txt
index cce9d684..f8c17f9b 100644
--- a/lib/mods/theme/edit/t_thrand.txt
+++ b/lib/mods/theme/edit/t_thrand.txt
@@ -18,22 +18,22 @@ f:ELVEN
 ### Buildings ###
 
 # Thranduil's Hall
-F:b:74:3:0:0:0:0:0:81
+F:b:74:3:0:0:0:0:81
 
 # Beastmaster
-F:d:74:3:0:0:0:0:0:16
+F:d:74:3:0:0:0:0:16
 
 # Hunter
-F:e:74:3:0:0:0:0:0:61
+F:e:74:3:0:0:0:0:61
 
 # Music Store
-F:f:74:3:0:0:0:0:0:64
+F:f:74:3:0:0:0:0:64
 
 # Map store
-F:g:74:3:0:0:0:0:0:66
+F:g:74:3:0:0:0:0:66
 
 #The Library
-F:h:74:3:0:0:0:0:0:13
+F:h:74:3:0:0:0:0:13
 
 D:######################################################################################################################################################################################################
 D:#^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^#
diff --git a/lib/mods/theme/edit/thieves.map b/lib/mods/theme/edit/thieves.map
index ba025ff6..43b1a299 100644
--- a/lib/mods/theme/edit/thieves.map
+++ b/lib/mods/theme/edit/thieves.map
@@ -23,13 +23,13 @@ F:d:4:6
 F:<:6:8
 
 # Floor with Novice rogue
-F:a:1:6:44:0:0:0:0:0:0:2
+F:a:1:6:44:0:0:0:0:0:2
 
 # Floor with Bandit
-F:b:1:6:150:43:*:0:0:0:0:2
+F:b:1:6:150:43:*:0:0:0:2
 
 # Dark floor with novice rogue
-F:f:1:4:44:0:0:0:0:0:0:2
+F:f:1:4:44:0:0:0:0:0:2
 
 # Floor with human skeleton
 F:z:1:6:0:395
diff --git a/lib/mods/theme/edit/thrain.map b/lib/mods/theme/edit/thrain.map
index 8adc41be..7c60a839 100644
--- a/lib/mods/theme/edit/thrain.map
+++ b/lib/mods/theme/edit/thrain.map
@@ -1,25 +1,22 @@
 # Floor
-F:.:1:0:0:0:0:0:0:0:61
+F:.:1:0:0:0:0:0:0:61
 
 # Some Nazguls
-F:1:1:0:951:0:0:0:0:0:61:2
-F:2:1:0:952:0:0:0:0:0:61:2
-F:o:1:0:866:0:0:0:0:0:61
+F:1:1:0:951:0:0:0:0:61:2
+F:2:1:0:952:0:0:0:0:61:2
+F:o:1:0:866:0:0:0:0:61
 
 # Marker
-F:,:172:6:0:0:0:0:0:0:61
+F:,:172:6:0:0:0:0:0:61
 
 # Lit permanent wall
 F:x:61:6
 
 # Door
-F:D:48:0:0:0:0:0:0:0:61
-
-# Floor with Trap
-F:t:1:8:0:0:0:0:*
+F:D:48:0:0:0:0:0:0:61
 
 # Deep lava
-F:l:85:0:0:0:0:0:0:0:61
+F:l:85:0:0:0:0:0:0:61
 
 # Dungeon layout
 D:          
diff --git a/lib/mods/theme/edit/tr_info.txt b/lib/mods/theme/edit/tr_info.txt
deleted file mode 100644
index d181487a..00000000
--- a/lib/mods/theme/edit/tr_info.txt
+++ /dev/null
@@ -1,817 +0,0 @@
-# This file comes from Angband64 written by Jurriaan Kalkman
-# and describes the traps items can have
-#
-#  byte type;            /* this goes into sval */
-#  s16b probability;     /* probability of existence in 1000 */
-#  s16b another;         /* does this trap easily combine in 1000 */
-#  s16b pvalinc;         /* how much does this trap attribute to pval */
-#  byte difficulty;      /* how difficult to disarm */
-#  byte level;           /* minimum level - disenchantment trap at 200' is */
-#                        /* not so nice */
-#  byte color;
-#  cptr name;            /* what name does this trap have */
-#
-#  d TERM_DARK  |r TERM_RED  |D TERM_L_DARK |R TERM_L_RED
-#  w TERM_WHITE |g TERM_GREEN|W TERM_L_WHITE|G TERM_L_GREEN
-#  s TERM_SLATE |b TERM_BLUE |v TERM_VIOLET |B TERM_L_BLUE
-#  o TERM_ORANGE|u TERM_UMBER|y TERM_YELLOW |U TERM_L_UMBER
-#
-# b blue   for stat traps
-# w white  for teleport traps
-# o orange for dungeon rearrangement traps
-# v violet for summoning traps
-# y yellow for stealing/equipment traps
-# r red    for other character affecting traps
-# g green  for elemental bolt trap
-# B umber  for elemental ball trap
-# R l red  for arrow/dagger traps
-# W        for compound trap!!!
-# don't use U or you'll get trapped doors that are indistinguishable from untrapped doors!
-#
-#  an unknown character is multi-hued!
-#
-# N:type:name
-# I:diff:prob:another:pval:minlevel:damage:color
-# I:diff:prob:            :minlevel:      :color
-# D:description
-
-V:2.0.0
-
-#
-# stat traps
-#
-
-N:1:Weakness Trap
-I:2:100:5:5:2:0d0:b
-D:A poisoned needle weakens you!
-F:FLOOR | CHEST | DOOR
-
-N:2:Weakness Trap
-I:5:100:5:5:20:0d0:b
-D:A poisoned needle seriously weakens you!
-F:FLOOR | CHEST | DOOR
-
-N:3:Weakness Trap
-I:7:100:5:8:40:0d0:b
-D:A poisoned needle permanently weakens you!
-F:FLOOR | CHEST | DOOR
-
-N:4:Intelligence Trap
-I:2:100:5:2:2:0d0:b
-D:A poisoned needle makes you feel stupid!
-F:FLOOR | CHEST | DOOR
-
-N:5:Intelligence Trap
-I:5:100:5:5:20:0d0:b
-D:A poisoned needle makes you feel very stupid!
-F:FLOOR | CHEST | DOOR
-
-N:6:Intelligence Trap
-I:7:100:5:8:40:0d0:b
-D:A poisoned needle makes you feel permanently stupid!
-F:FLOOR | CHEST | DOOR
-
-N:7:Wisdom Trap
-I:2:100:5:2:2:0d0:b
-D:A poisoned needle makes you feel naive!
-F:FLOOR | CHEST | DOOR
-
-N:8:Wisdom Trap
-I:5:100:5:5:20:0d0:b
-D:A poisoned needle makes you feel very naive!
-F:FLOOR | CHEST | DOOR
-
-N:9:Wisdom Trap
-I:7:100:5:8:40:0d0:b
-D:A poisoned needle makes you feel permanently naive!
-F:FLOOR | CHEST | DOOR
-
-N:10:Fumbling Fingers Trap
-I:2:100:5:2:2:0d0:b
-D:A poisoned needle makes you feel clumsy!
-F:FLOOR | CHEST | DOOR
-
-N:11:Fumbling Fingers Trap
-I:5:100:5:5:20:0d0:b
-D:A poisoned needle makes you feel very clumsy!
-F:FLOOR | CHEST | DOOR
-
-N:12:Fumbling Fingers Trap
-I:7:100:5:8:40:0d0:b
-D:A poisoned needle makes you feel permanently clumsy!
-F:FLOOR | CHEST | DOOR
-
-N:13:Wasting Trap
-I:2:100:5:2:2:0d0:b
-D:A poisoned needle makes you feel sickly!
-F:FLOOR | CHEST | DOOR
-
-N:14:Wasting Trap
-I:5:100:5:5:20:0d0:b
-D:A poisoned needle makes you feel very sickly!
-F:FLOOR | CHEST | DOOR
-
-N:15:Wasting Trap
-I:7:100:5:8:40:0d0:b
-D:A poisoned needle makes you feel permanently sickly!
-F:FLOOR | CHEST | DOOR
-
-N:16:Beauty Trap
-I:2:100:5:2:2:0d0:b
-D:A poisoned needle scars you!
-F:FLOOR | CHEST | DOOR
-
-N:17:Beauty Trap
-I:5:100:5:5:20:0d0:b
-D:A poisoned needle scars you horribly!
-F:FLOOR | CHEST | DOOR
-
-N:18:Beauty Trap
-I:7:100:5:8:40:0d0:b
-D:A poisoned needle scars you permanently!
-F:FLOOR | CHEST | DOOR
-
-#
-# miscellaneous traps
-#
-
-N:20:Trap of Curse Weapon
-I:5:10:0:12:20:0d0:y
-D:Your weapon will never be the same...
-F:FLOOR | CHEST | DOOR
-
-N:21:Trap of Curse Armour
-I:5:15:0:12:20:0d0:y
-D:Your armour doesn't exactly get better by setting off this trap...
-F:FLOOR | CHEST | DOOR
-
-N:22:Earthquake Trap
-I:5:20:0:10:10:0d0:o
-D:The ceiling collapses around you!
-F:FLOOR | CHEST | DOOR
-
-N:23:Poison Needle Trap
-I:1:50:50:3:2:0d0:r
-D:A poisoned needle pricks you!
-F:FLOOR | CHEST | DOOR
-
-N:24:Summon Monster Trap
-I:2:50:40:4:2:0d0:v
-D:Monsters defend the memory of the owner...
-F:FLOOR | CHEST | DOOR
-
-N:25:Summon Undead Trap
-I:4:25:40:6:10:0d0:v
-D:Undead rise from the grave to defend this!
-F:FLOOR | CHEST | DOOR
-
-N:26:Summon Greater Undead Trap
-I:8:10:50:20:20:0d0:v
-D:Greater undead defend this!
-F:FLOOR | CHEST | DOOR
-
-N:27:Teleport Trap
-I:3:100:50:3:2:0d0:w
-D:Now you know why nobody ever got close enough to disarm this trap...
-F:FLOOR | CHEST | DOOR
-
-N:28:Paralysing Trap
-I:1:100:20:2:2:0d0:r
-D:You suddenly cannot move!
-F:FLOOR | CHEST | DOOR
-
-N:29:Explosive Device
-I:3:100:80:0:3:3d8:r
-D:Ha! It explodes before your hands can illegally touch it!
-F:FLOOR | CHEST | DOOR
-
-N:30:Teleport Item Trap
-I:3:50:50:3:5:0d0:w
-D:The item magically disappears from your greedy hands!
-F:FLOOR | CHEST
-
-N:31:Lose Memory Trap
-I:6:30:30:6:10:0d0:r
-D:You suddenly can't remember what you were doing here...
-F:FLOOR | CHEST | DOOR
-
-N:32:Bitter Regret Trap
-I:9:15:20:9:20:0d0:r
-D:You already regret trying this...
-F:FLOOR | CHEST | DOOR
-
-N:33:Bowel Cramps Trap
-I:1:90:20:1:6:0d0:r
-D:Your stomach twists with a sharp pang!
-F:FLOOR | CHEST | DOOR
-
-N:34:Blindness/Confusion Trap
-I:4:100:50:4:6:0d0:r
-D:You suddenly can't see, and thinking is difficult too....
-F:FLOOR | CHEST | DOOR
-
-N:35:Aggravation Trap
-I:2:100:50:2:3:0d0:o
-D:Your hear a high-pitched humming noise...
-F:FLOOR | CHEST | DOOR
-
-N:36:Multiplication Trap
-I:3:90:0:3:5:0d0:o
-D:The floor around you doesn't seem the same...
-F:FLOOR | CHEST | DOOR
-
-N:37:Steal Item Trap
-I:3:100:50:3:6:0d0:y
-D:The chest seems to swell, while your backpack feels lighter..
-F:FLOOR | CHEST
-
-N:38:Summon Fast Quylthulgs Trap
-I:8:50:10:10:25:0d0:v
-D:Parts of the owner seem to return from somewhere else, as you slow in awe.
-F:FLOOR | CHEST | DOOR
-
-N:39:Trap of Sinking
-I:2:50:0:0:3:0d0:w
-D:A trapdoor opens up under you!
-F:FLOOR | DOOR
-
-N:40:Trap of Mana Drain
-I:4:100:50:3:4:0d0:r
-D:You suddenly can't think so clearly any more...
-F:FLOOR | CHEST | DOOR
-
-N:41:Trap of Missing Money
-I:2:100:50:2:2:0d0:y
-D:Money isn't everything, they say...
-F:FLOOR | CHEST | DOOR
-
-N:42:Trap of No Return
-I:5:20:10:4:8:0d0:y
-D:Do stay a while!
-F:FLOOR | CHEST | DOOR
-
-N:43:Trap of Silent Switching
-I:4:100:50:3:6:0d0:y
-D:You suddenly are a different person!
-F:FLOOR | CHEST | DOOR
-
-N:44:Trap of Walls
-I:6:100:50:2:10:0d0:o
-D:The room seems to shrink!
-F:FLOOR | CHEST | DOOR
-
-N:45:Trap of Calling Out
-I:10:100:100:5:15:0d0:v
-D:You hear something coming closer, much closer.
-F:FLOOR | CHEST | DOOR
-
-N:46:Trap of Sliding
-I:8:50:50:4:8:0d0:r
-D:Your feet seem to have a life of their own!
-F:FLOOR | CHEST | DOOR
-
-N:47:Trap of Charges Drain
-I:6:100:70:2:3:0d0:y
-D:You feel as if you've just lost something...
-F:FLOOR | CHEST | DOOR
-
-N:48:Trap of Stair Movement
-I:6:100:50:3:4:0d0:o
-D:The dungeon seems different...
-F:FLOOR | CHEST | DOOR
-
-N:49:Trap of New Trap
-I:5:100:5:0:4:0d0:o
-D:Somehow, disarming isn't over, you feel...
-F:FLOOR | CHEST | DOOR
-
-N:50:Trap of Scatter Items
-I:10:50:50:6:12:0d0:w
-D:You hear crashing sounds from all over the dungeon!
-F:FLOOR | CHEST | DOOR
-
-N:51:Trap of Decay
-I:4:100:50:4:4:0d0:r
-D:Your stomach isn't empty, but suddenly you think of food.
-F:FLOOR | CHEST | DOOR
-
-N:52:Trap of Wasting Wands
-I:6:100:40:4:5:0d0:y
-D:Your wands seem different...
-F:FLOOR | CHEST | DOOR
-
-N:53:Trap of Filling
-I:10:100:0:10:25:0d0:o
-D:The whole room vibrates in a strange way...
-F:FLOOR | CHEST | DOOR
-
-N:54:Trap of Drain Speed
-I:8:50:10:25:80:0d0:y
-D:You suddenly seem to have more time to self-reflect...
-F:FLOOR | CHEST | DOOR
-
-#
-# bolt traps
-#
-
-N:60:Lightning Bolt Trap
-I:2:80:5:3:2:2d8:g
-D:You are jolted with electricity!
-F:FLOOR | CHEST | DOOR | LEVEL1
-
-N:61:Poison Bolt Trap
-I:2:80:5:3:2:2d8:g
-D:A blast of poison gas hits you!
-F:FLOOR | CHEST | DOOR | LEVEL1
-
-N:62:Acid Bolt Trap
-I:2:80:5:3:2:2d8:g
-D:A jet of acid shoots out at you!
-F:FLOOR | CHEST | DOOR | LEVEL1
-
-N:63:Cold Bolt Trap
-I:2:80:5:3:2:2d8:g
-D:You are suddenly very cold!
-F:FLOOR | CHEST | DOOR | LEVEL1
-
-N:64:Fire Bolt Trap
-I:2:80:5:3:2:2d8:g
-D:You are suddenly very hot!
-F:FLOOR | CHEST | DOOR | LEVEL1
-
-N:65:Plasma Bolt Trap
-I:6:80:5:6:15:10d12:g
-D:A bolt of plasma hits you!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:66:Water Bolt Trap
-I:4:80:5:5:8:5d10:g
-D:A gush of water hits you!
-F:FLOOR | CHEST | DOOR | LEVEL2
-
-N:67:Light Bolt Trap
-I:4:80:5:5:8:5d10:g
-D:There is a sudden flash of light around you!
-F:FLOOR | CHEST | DOOR | LEVEL2
-
-N:68:Dark Bolt Trap
-I:4:80:5:5:8:5d10:g
-D:A bolt of pure elemental darkness hits you!
-F:FLOOR | CHEST | DOOR | LEVEL2
-
-N:69:Shards Bolt Trap
-I:6:80:5:6:15:6d10:g
-D:A blast of crystal shards hits you!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:70:Sound Bolt Trap
-I:6:80:5:6:15:10d12:g
-D:A sudden roar of sound hurts your eardrums!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:71:Confusion Bolt Trap
-I:4:80:5:5:8:6d10:g
-D:A blast of confusion gas engulfs you!
-F:FLOOR | CHEST | DOOR | LEVEL2
-
-N:72:Force Bolt Trap
-I:6:80:5:6:15:10d12:g
-D:A bolt of pure force hits you!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:73:Inertia Bolt Trap
-I:6:80:5:6:15:10d12:g
-D:Your feet feel like lead!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:74:Mana Bolt Trap
-I:8:80:5:9:25:15d16:g
-D:A bolt of pure magic hits you!
-F:FLOOR | CHEST | DOOR | LEVEL4
-
-N:75:Ice Bolt Trap
-I:4:80:5:5:8:5d10:g
-D:A bolt of ice hits you!
-F:FLOOR | CHEST | DOOR | LEVEL2
-
-N:76:Chaos Bolt Trap
-I:6:80:5:6:15:10d12:g
-D:A blast of raw chaos hits you!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:77:Nether Bolt Trap
-I:8:80:5:9:25:15d16:g
-D:A bolt of negative energy hits you!
-F:FLOOR | CHEST | DOOR | LEVEL4
-
-N:78:Disenchantment Bolt Trap
-I:8:80:5:9:25:15d16:g
-D:There is a static feeling in the air...
-F:FLOOR | CHEST | DOOR | LEVEL4
-
-N:79:Nexus Bolt Trap
-I:6:80:5:6:15:10d12:g
-D:A bolt of nexus hits you!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:80:Time Bolt Trap
-I:8:80:5:9:25:15d16:g
-D:Suddenly, several months pass by in a second!
-F:FLOOR | CHEST | DOOR | LEVEL4
-
-N:81:Gravity Bolt Trap
-I:6:80:5:6:15:10d12:g
-D:Gravity suddenly warps around you!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-#
-# ball traps
-#
-
-N:82:Lightning Ball Trap
-I:3:60:5:5:8:3d10:B
-D:A massive electrical charge shoots through you!
-F:FLOOR | CHEST | DOOR | LEVEL1
-
-N:83:Poison Ball Trap
-I:3:60:5:5:8:3d10:B
-D:A large cloud of poison gas envelops you!
-F:FLOOR | CHEST | DOOR | LEVEL1
-
-N:84:Acid Ball Trap
-I:3:60:5:5:8:3d10:B
-D:You are suddenly drenched in acid!
-F:FLOOR | CHEST | DOOR | LEVEL1
-
-N:85:Cold Ball Trap
-I:3:60:5:5:8:3d10:B
-D:A blast of hideously cold air envelops you!
-F:FLOOR | CHEST | DOOR | LEVEL1
-
-N:86:Fire Ball Trap
-I:3:60:5:5:8:3d10:B
-D:You are suddenly in the centre of a raging inferno!
-F:FLOOR | CHEST | DOOR | LEVEL1
-
-N:87:Plasma Ball Trap
-I:8:60:5:8:20:12d18:B
-D:You are engulfed in plasma!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:88:Water Ball Trap
-I:5:60:5:6:15:8d12:B
-D:A whirlpool engulfs you!
-F:FLOOR | CHEST | DOOR | LEVEL2
-
-N:89:Light Ball Trap
-I:5:60:5:6:15:8d12:B
-D:A massive flash of light erupts around you!
-F:FLOOR | CHEST | DOOR | LEVEL2
-
-N:90:Darkness Ball Trap
-I:5:60:5:6:15:8d12:B
-D:A large patch of darkness erupts around you!
-F:FLOOR | CHEST | DOOR | LEVEL2
-
-N:91:Shards Ball Trap
-I:8:60:5:8:20:12d18:B
-D:A violent blast of crystal shards hits you!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:92:Sound Ball Trap
-I:8:60:5:8:20:12d18:B
-D:BOOM! Your eardrums nearly explode!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:93:Confusion Ball Trap
-I:5:60:5:6:15:8d12:B
-D:You are enveloped in a cloud of confusion gas!
-F:FLOOR | CHEST | DOOR | LEVEL2
-
-N:94:Force Ball Trap
-I:8:60:5:8:20:12d18:B
-D:A violent blast of pure force smashes down around you!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:95:Inertia Ball Trap
-I:8:60:5:8:20:12d18:B
-D:Suddenly, your entire body feels like lead!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:96:Mana Ball Trap
-I:10:60:5:10:30:16d20:B
-D:You are hit by a blast of pure magic!
-F:FLOOR | CHEST | DOOR | LEVEL4
-
-N:97:Ice Ball Trap
-I:5:60:5:6:15:8d12:B
-D:A massive blast of ice crystals engulfs you!
-F:FLOOR | CHEST | DOOR | LEVEL2
-
-N:98:Chaos Ball Trap
-I:8:60:5:8:20:12d18:B
-D:A violent blast of raw chaos engulfs you!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:99:Nether Ball Trap
-I:10:60:5:10:30:16d20:g
-D:A blast of energy from the netherworld engulfs you!
-F:FLOOR | CHEST | DOOR | LEVEL4
-
-# N:type:name
-# I:diff:prob:another:pval:minlevel:color
-# D:description
-
-N:100:Disenchantment Ball Trap
-I:10:60:5:10:30:16d20:B
-D:You are hit by a blast of pure anti-magic!
-F:FLOOR | CHEST | DOOR | LEVEL4
-
-N:101:Nexus Ball Trap
-I:8:60:5:8:20:12d18:B
-D:A ball of nexus hits you!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:102:Time Ball Trap
-I:10:60:5:10:30:16d20:B
-D:Suddenly, several years pass by in a second!
-F:FLOOR | CHEST | DOOR | LEVEL4
-
-N:103:Gravity Ball Trap
-I:8:60:5:8:20:12d18:B
-D:You suddenly feel gravity warp violently around you!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:110:Arrow Trap
-I:2:100:0:5:2:0d0:R
-D:An arrow shoots out at you.
-F:FLOOR | CHEST | DOOR
-
-N:111:Bolt Trap
-I:2:100:0:5:5:0d0:R
-D:A bolt shoots out at you.
-F:FLOOR | CHEST | DOOR
-
-N:112:Seeker Arrow Trap
-I:2:100:0:6:10:0d0:R
-D:A seeker arrow shoots out at you.
-F:FLOOR | CHEST | DOOR
-
-N:113:Seeker Bolt Trap
-I:2:100:0:6:12:0d0:R
-D:A seeker bolt shoots out at you.
-F:FLOOR | CHEST | DOOR
-
-N:114:Poison Arrow Trap
-I:2:100:0:5:4:0d0:R
-D:A poisoned arrow shoots out at you.
-F:FLOOR | CHEST | DOOR
-
-N:115:Poison Bolt Trap
-I:2:100:0:6:6:0d0:R
-D:A poisoned bolt shoots out at you.
-F:FLOOR | CHEST | DOOR
-
-N:116:Poison Seeker Arrow Trap
-I:2:100:0:7:12:0d0:R
-D:A poisoned seeker arrow shoots out at you.
-F:FLOOR | CHEST | DOOR
-
-N:117:Poison Seeker Bolt Trap
-I:2:100:0:7:15:0d0:R
-D:A poisoned seeker bolt shoots out at you.
-F:FLOOR | CHEST | DOOR
-
-N:118:Broken Dagger Trap
-I:2:100:0:5:2:0d0:R
-D:An broken dagger shoots out at you.
-F:FLOOR | CHEST | DOOR
-
-N:119:Dagger Trap
-I:2:100:0:5:5:0d0:R
-D:A dagger shoots out at you.
-F:FLOOR | CHEST | DOOR
-
-N:120:Poison Broken Dagger Trap
-I:2:100:0:5:4:0d0:R
-D:A poisoned broken dagger shoots out at you.
-F:FLOOR | CHEST | DOOR
-
-N:121:Poison Dagger Trap
-I:2:100:0:6:6:0d0:R
-D:A poisoned dagger shoots out at you.
-F:FLOOR | CHEST | DOOR
-
-#
-# multiple arrows/daggers traps
-#
-
-N:122:Arrows Trap
-I:4:100:0:7:16:0d0:R
-D:Some arrows shoot out at you.
-F:FLOOR | CHEST | DOOR
-
-N:123:Bolts Trap
-I:4:100:0:7:18:0d0:R
-D:Some bolts shoot out at you.
-F:FLOOR | CHEST | DOOR
-
-N:124:Seeker Arrow Trap
-I:5:100:0:8:20:0d0:R
-D:Some seeker arrows shoot out at you.
-F:FLOOR | CHEST | DOOR
-
-N:125:Seeker Bolt Trap
-I:5:100:0:8:24:0d0:R
-D:Some seeker bolts shoot out at you.
-F:FLOOR | CHEST | DOOR
-
-N:126:Poison Arrows Trap
-I:5:100:0:8:18:0d0:R
-D:Some poisoned arrows shoot out at you.
-F:FLOOR | CHEST | DOOR
-
-N:127:Poison Bolt Trap
-I:6:100:0:8:20:0d0:R
-D:Some poisoned bolts shoot out at you.
-F:FLOOR | CHEST | DOOR
-
-N:128:Poison Seeker Arrows Trap
-I:7:100:0:9:27:0d0:R
-D:Some poisoned seeker arrows shoot out at you.
-F:FLOOR | CHEST | DOOR
-
-N:129:Poison Seeker Bolts Trap
-I:9:100:0:9:30:0d0:R
-D:Some poisoned seeker bolts shoot out at you.
-F:FLOOR | CHEST | DOOR
-
-N:130:Broken Daggers Trap
-I:4:100:0:6:12:0d0:R
-D:Some broken daggers shoot out at you.
-F:FLOOR | CHEST | DOOR
-
-N:131:Dagger Trap
-I:4:100:0:6:15:0d0:R
-D:Some daggers shoot out at you.
-F:FLOOR | CHEST | DOOR
-
-N:132:Poison Broken Daggers Trap
-I:5:100:0:7:18:0d0:R
-D:Some poisoned broken daggers shoot out at you.
-F:FLOOR | CHEST | DOOR
-
-N:133:Poison Daggers Trap
-I:6:100:0:7:23:0d0:R
-D:Some poisoned daggers shoot out at you.
-F:FLOOR | CHEST | DOOR
-
-N:140:Trap of Drop Item
-I:3:50:0:2:5:0d0:y
-D:A sudden sound startles you and you drop something!
-F:FLOOR | CHEST | DOOR
-
-N:141:Trap of Drop Items
-I:5:50:0:5:12:0d0:y
-D:A sudden sound startles you and you drop several things!
-F:FLOOR | CHEST | DOOR
-
-N:142:Trap of Drop Everything
-I:8:50:0:8:20:0d0:y
-D:A sudden sound startles you and you drop everything!
-F:FLOOR | CHEST | DOOR
-
-#-SC-
-N:150:Trap of Femininity
-I:4:30:5:0:10:2d8:r
-D:You feel like a new woman!
-F:FLOOR | CHEST | DOOR
-
-N:151:Trap of Masculinity
-I:4:30:5:0:10:2d8:r
-D:You feel like a new man!
-F:FLOOR | CHEST | DOOR
-
-N:152:Trap of Neutrality
-I:4:30:5:0:10:2d8:r
-D:You feel like a new woman... erm, a new man... er, WHAT did you say???
-F:FLOOR | CHEST | DOOR
-
-N:153:Trap of Aging
-I:5:50:5:0:15:1d8:r
-D:You suddenly age very fast!
-F:CHEST | DOOR
-
-N:154:Trap of Growing
-I:3:75:5:0:5:1d8:r
-D:You begin to grow!
-F:FLOOR | CHEST | DOOR
-
-N:155:Trap of Shrinking
-I:3:75:5:0:5:1d8:r
-D:You begin to shrink!
-F:FLOOR | CHEST | DOOR
-
-#N:156: UNUSED
-
-#N:157: UNUSED
-
-N:158:Trap of Divine Anger
-I:6:100:5:0:15:0d0:G
-D:A voice booms out "Have a care, mortal!"
-F:FLOOR | CHEST | DOOR
-
-N:159:Trap of Divine Wrath
-I:9:50:5:0:30:0d0:G
-D:A voice booms out "Sacrilege!"
-F:FLOOR | CHEST | DOOR
-
-N:160:Hallucination Trap
-I:3:100:10:0:4:0d0:r
-D:Your vision is clouded by a blast of kaleidoscopic light!
-F:FLOOR | CHEST | DOOR
-
-# Bolt traps
-N:161:Greater Magic Missile Trap
-I:6:80:5:6:75:25d20:g
-D:A greater magic missile hits you!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-#N:162:Foulness Trap
-#I:6:80:5:6:15:10d12:g
-#D:You feel foul!
-#F:FLOOR | CHEST | DOOR | LEVEL3
-
-#N:163:Trap of Death Ray
-#I:8:80:5:9:25:15d16:g
-#D:A Ray of Death hits you!
-#F:FLOOR | CHEST | DOOR | LEVEL4
-
-N:164:Trap of Holy Fire
-I:6:80:5:6:15:10d12:g
-D:Holy fire rises around you!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:165:Trap of Hell Fire
-I:6:80:5:6:15:10d12:g
-D:Hellfire rises around you!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:166:Psi Bolt Trap
-I:6:80:5:6:15:10d12:g
-D:Your mind is suddenly blasted!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:167:Psi Drain Trap
-I:6:80:5:6:15:8d10:r
-D:You suddenly can't think clearly any more...
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-# Ball Traps
-
-### this one *ought* to be a Nuke Ball trap, not plasma ball, as trap 87 
-### is also plasma ball. I've put the description right in advance.
-
-#N:168:Plasma Ball Trap
-#I:8:60:5:8:20:12d18:B
-#D:A blast of radiation engulfs you!
-#F:FLOOR | CHEST | DOOR | LEVEL3
-
-N:169:Psi Ball Trap
-I:8:60:5:8:20:12d18:B
-D:Your brain is suddenly blasted!
-F:FLOOR | CHEST | DOOR | LEVEL3
-
-# Useful traps
-
-N:170:Acquirement Trap
-I:1:40:5:5:18:0d0:v
-D:Whoa!
-F:FLOOR | DOOR
-
-# More bolt traps
-
-N:171:Greater Lightning Bolt Trap
-I:3:60:5:3:6:6d6:g
-D:You are jolted with electricity!
-F:FLOOR | CHEST | DOOR | LEVEL1
-
-N:172:Greater Poison Bolt Trap
-I:3:60:5:3:6:6d6:g
-D:A blast of deadly poison gas hits you! 
-F:FLOOR | CHEST | DOOR | LEVEL1
-
-N:173:Greater Acid Bolt Trap
-I:3:60:5:3:6:6d6:g
-D:A jet of acid shoots out at you! It burns severely!
-F:FLOOR | CHEST | DOOR | LEVEL1
-
-N:174:Greater Cold Bolt Trap
-I:3:60:5:3:6:6d6:g
-D:You are suddenly extremely cold!
-F:FLOOR | CHEST | DOOR | LEVEL1
-
-N:175:Greater Fire Bolt Trap
-I:3:60:5:3:6:6d6:g
-D:You are suddenly extremely hot!
-F:FLOOR | CHEST | DOOR | LEVEL1
diff --git a/lib/mods/theme/edit/trolls.map b/lib/mods/theme/edit/trolls.map
index e5d104fd..c54a5418 100644
--- a/lib/mods/theme/edit/trolls.map
+++ b/lib/mods/theme/edit/trolls.map
@@ -17,19 +17,19 @@ F:.:88:3
 F:;:89:3
 
 # Floor with forest troll
-F:f:89:3:297:0:0:0:0:0:0:2
+F:f:89:3:297:0:0:0:0:0:2
 
 # Floor with stone troll
-F:s:89:3:401:0:0:0:0:0:0:2
+F:s:89:3:401:0:0:0:0:0:2
 
 # Floor with algroth
-F:a:89:3:424:0:0:0:0:0:0:2
+F:a:89:3:424:0:0:0:0:0:2
 
 # Floor with Bert
-F:b:89:3:493:0:0:0:0:0:0:2
+F:b:89:3:493:0:0:0:0:0:2
 
 # Floor with Bill
-F:i:89:3:494:0:0:0:0:0:0:2
+F:i:89:3:494:0:0:0:0:0:2
 
 # Floor with a Dwarven skeleton
 F:k:89:8:0:396
diff --git a/lib/mods/theme/edit/v_info.txt b/lib/mods/theme/edit/v_info.txt
index fb4a4d20..d5a92ee2 100644
--- a/lib/mods/theme/edit/v_info.txt
+++ b/lib/mods/theme/edit/v_info.txt
@@ -16,11 +16,6 @@
 
 # Quest vaults added - rr9
 
-# Version stamp (required)
-
-V:2.0.0
-
-
 ### Simple Vaults (type 7) -- maximum size 44x22 ###
 
 
@@ -233,7 +228,7 @@ D:%........XXXXXXXXXXX.%
 D:%%%%%%%%%%%%%%%%%%%%%%
 
 N:12:Lesser vault (prison)
-X:7:10:16:35
+X:7:10:15:35
 D:%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 D:%.+..&..+..&..+..&..+..&..+..&..+.%
 D:%.###.#####.#####.#####.#####.###.%
diff --git a/lib/mods/theme/edit/volcano.txt b/lib/mods/theme/edit/volcano.txt
index 1b89cf3d..c7e64dee 100644
--- a/lib/mods/theme/edit/volcano.txt
+++ b/lib/mods/theme/edit/volcano.txt
@@ -1,10 +1,10 @@
 # File: volcano.txt
 
 # Stairway to the Hell
-F:$:7:3:0:0:0:0:0:6
+F:$:7:3:0:0:0:0:6
 
 # Hole to the center of the Volcano
-F:>:7:3:0:0:0:0:0:5
+F:>:7:3:0:0:0:0:5
 
 ############### Town Layout ###############
 
diff --git a/lib/mods/theme/edit/w_info.txt b/lib/mods/theme/edit/w_info.txt
index 18cf7a0f..6ca43cfd 100644
--- a/lib/mods/theme/edit/w_info.txt
+++ b/lib/mods/theme/edit/w_info.txt
@@ -14,7 +14,7 @@ W:D:XWWWWAAAAAW%AAAA========WWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWW
 W:D:XWWWWWWAAWAAAWW===========WWWWWWW...WWWWWWWWWW..........WWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWW.EEEEEEEEEEEX
 W:D:XWWWWWWWWWWWWWW==========..WWW....WWWWWWWW................WWWWGGGGWWWWWWWW......WWWWW.EEEEEEEEEEEEEEX
 W:D:XTM.MMMMWWWW===...====...........HHHH..................GGGGGGGWWWDWWWW.........WWWW.EEEEEEEEEEEEEEEEX
-W:D:XT.2MMM=======.BB.=............HHHHHHHH..&&&&&...J..GGGGGGGGGGGGG.................tEEEEEtEEEEttEEEEEX
+W:D:XT.2MMM=======.BB.=............HHHHHHHH..&&&&&......GGGGGGGGGGGGG.................tEEEEEtEEEEttEEEEEX
 ?:[EQU $TOWN_DESTROY2 1]
 W:M:0:1
 W:D:XT.PMMM=======.BB.=............HHHHHHHH..&&&&&......GGGGGGGGGGGGG.................tEEEEEtEEEEttEEEEEX
diff --git a/lib/mods/theme/edit/wf_info.txt b/lib/mods/theme/edit/wf_info.txt
index acdba872..764462b7 100644
--- a/lib/mods/theme/edit/wf_info.txt
+++ b/lib/mods/theme/edit/wf_info.txt
@@ -55,10 +55,6 @@
 #    corresponding to that wilderness tile (like, lots of mountain, some  
 #    trees, a bit of water...)
 
-# Version stamp (required)
-
-V:2.0.0
-
 N:0:Ekkaia
 D:the Encircling Sea
 W:1:0:0:182:0:X
@@ -301,12 +297,6 @@ D:Anduin, the great river
 W:35:0:0:227:3:~
 X:187:227:187:84:84:227:84:84:222:227:84:84:227:84:84:227:88:94
 
-# Former location of Gondolin (to avoid silliness with Maeglin quest)
-N:48:Secret Valley
-D:the secret valley with directions to Gondolin
-W:0:0:12:89:1:J
-X:228:228:228:228:228:228:228:228:228:228:228:228:228:228:228:228:228:228
-
 ### New Towns ###
 
 # Beorn's Halls 
diff --git a/lib/mods/theme/edit/wights.map b/lib/mods/theme/edit/wights.map
index b67963ac..cc4bae88 100644
--- a/lib/mods/theme/edit/wights.map
+++ b/lib/mods/theme/edit/wights.map
@@ -17,13 +17,13 @@ F:;:88:3
 F:f:88:3:381
 
 # Floor with grave wight
-F:g:88:3:470:0:0:0:0:0:0:2
+F:g:88:3:470:0:0:0:0:0:2
 
 # Floor with barrow wight
-F:b:88:3:499:0:0:0:0:0:0:2
+F:b:88:3:499:0:0:0:0:0:2
 
 # Floor with Emperor Wight
-F:e:88:3:604:0:0:0:0:0:0:2
+F:e:88:3:604:0:0:0:0:0:2
 
 # Floor with a Human Skeleton
 F:k:88:8:0:395
@@ -32,31 +32,31 @@ F:k:88:8:0:395
 F:,:172:6
 
 # between gate 1
-F:1:160:6:0:0:0:0:0:2057
+F:1:160:6:0:0:0:0:2057
 
 # between gate 2
-F:2:160:6:0:0:0:0:0:1036
+F:2:160:6:0:0:0:0:1036
 
 # between gate 3
-F:3:160:6:0:0:0:0:0:3847
+F:3:160:6:0:0:0:0:3847
 
 # between gate 4
-F:4:160:6:0:0:0:0:0:2321
+F:4:160:6:0:0:0:0:2321
 
 # between gate 5
-F:5:160:6:0:0:0:0:0:1043
+F:5:160:6:0:0:0:0:1043
 
 # between gate 6
-F:6:160:6:0:0:0:0:0:3599
+F:6:160:6:0:0:0:0:3599
 
 # between gate 7
-F:7:160:6:0:0:0:0:0:2071
+F:7:160:6:0:0:0:0:2071
 
 # between gate 8
-F:8:160:6:0:0:0:0:0:3350
+F:8:160:6:0:0:0:0:3350
 
 # between gate 9
-F:9:160:6:0:0:0:0:0:771
+F:9:160:6:0:0:0:0:771
 
 # Dungeon layout
 D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
diff --git a/lib/mods/theme/file/elvish.txt b/lib/mods/theme/file/elvish.txt
deleted file mode 100644
index a00b5a22..00000000
--- a/lib/mods/theme/file/elvish.txt
+++ /dev/null
@@ -1,218 +0,0 @@
-216
-******** BUFFER LINE *********************************** DO NOT REMOVE *******
-adan
-ael
-in
-agl
-ar
-aina
-alda
-al
-qua
-am
-arth
-amon
-anca
-an
-dune
-anga
-anna
-ann
-on
-ar
-ien
-atar
-band
-bar
-ad
-bel
-eg
-brag
-ol
-breth
-il
-brith
-cal
-en
-gal
-en
-cam
-car
-ak
-cel
-eb
-cor
-on
-cu
-cui
-vie
-cul
-curu
-dae
-dag
-or
-del
-din
-dol
-dor
-draug
-du
-duin
-dur
-ear
-ech
-or
-edh
-el
-eith
-elen
-er
-ereg
-es
-gal
-fal
-as
-far
-oth
-faug
-fea
-fin
-for
-men
-fuin
-gaer
-gaur
-gil
-gir
-ith
-glin
-gol
-odh
-gond
-gor
-groth
-grod
-gul
-gurth
-gwaith
-gwath
-wath
-had
-hod
-haudh
-heru
-him
-hini
-hith
-hoth
-hyar
-men
-ia
-iant
-iath
-iaur
-ilm
-iluve
-kal
-gal
-kano
-kel
-kemen
-khel
-ek
-khil
-kir
-lad
-laure
-lhach
-lin
-lith
-lok
-lom
-lome
-londe
-los
-loth
-luin
-maeg
-mal
-man
-mel
-men
-menel
-mer
-eth
-min
-as
-mir
-mith
-mor
-moth
-nan
-nar
-naug
-dil
-dur
-nel
-dor
-nen
-nim
-orn
-orod
-os
-pal
-an
-pel
-quen
-quet
-ram
-ran
-rant
-ras
-rauko
-ril
-rim
-ring
-ris
-roch
-rom
-rond
-ros
-ruin
-ruth
-sarn
-ser
-eg
-sil
-sir
-sul
-tal
-dal
-tal
-ath
-tar
-tath
-ar
-taur
-tel
-thal
-thang
-thar
-thaur
-thin
-thol
-thon
-thor
-on
-til
-tin
-tir
-tol
-tum
-tur
-uial
-ur
-val
-wen
-wing
-yave
diff --git a/lib/mods/theme/help/ability.txt b/lib/mods/theme/help/ability.txt
index 175d6745..17d89dbc 100644
--- a/lib/mods/theme/help/ability.txt
+++ b/lib/mods/theme/help/ability.txt
@@ -27,11 +27,15 @@ playable, and maybe even powerful enough to win the game!
 
 Here follows a list of all the available abilities:
 
-*****ability.txt*02[Spread blows]               *****ability.txt*03[Tree walking]
-*****ability.txt*04[Perfect casting]            *****ability.txt*05[Extra Max Blow(1)]
-*****ability.txt*06[Extra Max Blow(2)]          *****ability.txt*07[Ammo creation]
-*****ability.txt*08[Touch of death]             *****ability.txt*09[Artifact Creation]
-*****ability.txt*10[Far reaching attack]        *****ability.txt*11[Trapping]
+*****ability.txt*02[Spread blows]
+*****ability.txt*03[Tree walking]
+*****ability.txt*04[Perfect casting]
+*****ability.txt*05[Extra Max Blow(1)]
+*****ability.txt*06[Extra Max Blow(2)]
+*****ability.txt*07[Ammo creation]
+*****ability.txt*08[Touch of death]
+*****ability.txt*10[Far reaching attack]
+*****ability.txt*11[Trapping]
 *****ability.txt*12[Undead Form]
 
 ~~~~~02|Abilities|Spread blows
@@ -84,12 +88,6 @@ for that kill.
 You must activate this from your 'm' menu.
 #####UPrereq: Necromancy skill@50, Combat skill@40, DEX@30, STR@30
 #####rCost: 15
-~~~~~09|Abilities|Artifact Creation
-[[[[[BArtifact Creation]
-In combination with a high alchemy skill this ability will let you
-design your very own artifacts.
-Prereq: Alchemy@40, INT@35, WIS@35
-#####rCost: 70
 ~~~~~10|Abilities|Far reaching attack
 [[[[[BFar reaching attack]
 You can attack an enemy one square far using a long polearm.
diff --git a/lib/mods/theme/help/advanced.hlp b/lib/mods/theme/help/advanced.hlp
index 3f6fe4bd..8595712b 100644
--- a/lib/mods/theme/help/advanced.hlp
+++ b/lib/mods/theme/help/advanced.hlp
@@ -7,9 +7,8 @@ Please choose one of the following help files:
      *****/aoption.txt*0[(a) Options] 
      *****/bmacrofaq.txt*0[(b) Macros]
      *****/cautomat.txt*0[(c) Automatizer help] 
-     (d) Lua scripting help - coming soon
-     *****/edebug.txt*0[(e) Debug commands] 
-     *****/fversion.txt*0[(f) Version information] A history of ToME's roots
+     *****/ddebug.txt*0[(d) Debug commands]
+     *****/eversion.txt*0[(e) Version information] A history of ToME's roots
 
      *****/zhelp.hlp*0[(z) Main Help menu]
 
diff --git a/lib/mods/theme/help/automat.txt b/lib/mods/theme/help/automat.txt
index bf6478f8..c09630a5 100644
--- a/lib/mods/theme/help/automat.txt
+++ b/lib/mods/theme/help/automat.txt
@@ -25,10 +25,9 @@ things providing you are of a certain level.
 #####GSounds quite cool, but wha...
 STOP RIGHT THERE! I haven't finished yet! Let's look at some other examples.
 Most of the time, scrolls of darkness are pretty useless. Unless you are a
-vampire, or an alchemist, right? So you might think it was no good to add
-auto-destroy of scrolls of darkness to the automatizer. But you'd be wrong, for
-you can add rules that are dependent on certain conditions, like that you are
-of a certain race, or class.
+vampire, right? So you might think it was no good to add auto-destroy of scrolls
+of darkness to the automatizer. But you'd be wrong, for you can add rules that
+are dependent on certain conditions, like that you are of a certain race, or class.
 
 #####GHey this is sounding good. What if it destroys my artifacts?
 It can't. Artifacts can never be destroyed, by the automatizer. However, watch
@@ -250,9 +249,8 @@ instead of <tval>23</tval> you could write <tval>TV_SWORD</tval>.
 
 #####GAh that would be better. But where can I find out what all the names, and
 #####Gnumbers of tvalues are?
-Well I've written a *****defines.txt*0[file] which lists tvalues and one which lists svalues for you
-to check on, and you may want to check the objects entry in k_info.txt in your
-lib/edit directory. If you look at the entry for dagger you'll see:
+Have a look at the object entry in k_info.txt in your lib/edit directory. If you
+check the entry for dagger you'll see:
 
 N:43:& Dagger~
 G:|:W
diff --git a/lib/mods/theme/help/birth.txt b/lib/mods/theme/help/birth.txt
index 9e7da8dd..28685c7d 100644
--- a/lib/mods/theme/help/birth.txt
+++ b/lib/mods/theme/help/birth.txt
@@ -260,7 +260,7 @@ or rogue. Spell casting generally requires a more experienced player that is
 familiar with survival techniques.
 
      *****c_archer.txt*0[Archer]           *****c_mimic.txt*0[Mimic]              *****c_rogue.txt*0[Rogue]
-     *****c_ascet.txt*0[Ascetic]          *****c_mindcr.txt*0[Mindcrafter]        *****c_runecr.txt*0[Runecrafter]
+     *****c_ascet.txt*0[Ascetic]          *****c_mindcr.txt*0[Mindcrafter]
      *****c_assass.txt*0[Assassin]         *****c_monk.txt*0[Monk]               *****c_sorcer.txt*0[Sorceror]
      *****c_axemas.txt*0[Axemaster]        *****c_necro.txt*0[Necromancer]        *****c_stonewr.txt*0[Stonewright]
      *****c_bard.txt*0[Bard]             *****c_palad.txt*0[Paladin]            *****c_swordm.txt*0[Swordmaster]
@@ -558,7 +558,6 @@ are listed in the following table.
            Geomancer     -5      +3       0      +1      -2      +1
            Mage          -5      +3       0      +1      -2      +1
            Necromancer   -5      +3       0      +1      -2      +1
-           Runecrafter   -5      +3       0      +1      -2      +1
            Sorceror      -5      +3       0      +1      -2      +1
            Thaumaturgist -5      +3       0      +1      -2      +1
            Warper        -5      +3       0      +1      -2      +1
@@ -656,4 +655,4 @@ are listed in the following table.
            (Lygrog)     +5   +5   +5   +10  +5   +50  +0   +0     +30 feet
            (Limrog)     +2   +2   +2   +2   +2   +30  +0   +0     +20 feet
            (Rawrog)     +0   +0   +4   -3   +0   +10  +10  +10    +0 feet
-           (Adanrog)    +1   +1   +1   +1   +1   +20  +15  +10    +20 feet
\ No newline at end of file
+           (Adanrog)    +1   +1   +1   +1   +1   +20  +15  +10    +20 feet
diff --git a/lib/mods/theme/help/c_alchem.txt b/lib/mods/theme/help/c_alchem.txt
deleted file mode 100644
index 2f7cd58c..00000000
--- a/lib/mods/theme/help/c_alchem.txt
+++ /dev/null
@@ -1,135 +0,0 @@
-|||||oy
-~~~~~01|Alchemist
-~~~~~02|Classes|Alchemist
-#####R=== Alchemists ===
-
-#####GDescription
-Alchemists are the only class that can harness the abilities of the 
-essences found in the dungeon. They can add these essences to staves, 
-rings, wands, rods, and sometimes weapons and armour to create new items
-or recharge old ones. They can also extract essences from magical items
-they find. Using these abilities, Alchemists can get very good items at
-low levels. The trouble is getting them to survive later on.
-
-Alchemists are extremely proficient with all kinds of magical devices,
-and have made a fine art of extracting, storing, and using these 
-objects' magical energies.  Because they neither fight well nor cast 
-powerful spells, Alchemists rely on their craftsmanship to cope with 
-the dangers of the dungeons.  They will quickly learn to create damage-
-dealing wands, rods, and staffs, forge powerful weapons and armour, 
-make highly useful objects of other kinds, and eventually, at great cost 
-to other knowledge, they can learn the perilous art of artifact creation 
-itself.
-
-#####GStarting Stat Modifiers
-Strength         -5
-Intelligence     +3
-Wisdom           +0
-Dexterity        +1
-Constitution     -2
-Charisma         +1
-Hit Die          +d0
-Spell Points     +0%
-Exp Penalty      30%
-
-#####GStarting Skills:
-#####BSkill                   Start Level     Skill Point Gains
-Combat                  1.000           [0.700]
-  Weaponmastery         0.700           [0.700]
-Sneakiness              1.000           [0.900]
-  Stealth               0.000           [0.400]
-Magic                   3.000           [0.900]
-  Magic-Device          1.000           [1.250]
-  Geomancy
-    Fire                0.000           [0.100]
-    Water               0.000           [0.100]
-    Air                 0.000           [0.100]
-    Earth               0.000           [0.100]
-  Meta                  0.000           [0.500]
-  Conveyance            0.000           [0.100]
-  Divination            0.000           [0.500]
-  Temporal              0.000           [0.100]
-  Mind                  0.000           [0.100]
-  Nature                0.000           [0.100]
-  Necromancy            0.000           [0.100]
-  Runecraft             0.000           [0.700]
-  Thaumaturgy           0.000           [0.100]
-  Alchemy               1.000           [0.800]
-Spirituality            1.000           [0.800]
-  Prayer                0.000           [0.500]
-Monster-lore            0.000           [0.500]
-
-*An Alchemist cannot learn the Geomancy skill, but it is shown in his skill 
-screen because the elemental schools are sub-skills of it.
-
-#####GInnate Abilities:
-#####BAbility              Character level
-Perfect casting             1
-
-#####GStarting Equipment
-An Alchemist begins the game with:
-    a Dagger
-    six Essences of Explosion
-    an Empty Bottle
-    a Set of Leather Gloves
-~~~~~03|Alchemist|Alchemy powers explained
-~~~~~05|Skills|Alchemy - Alchemy powers
-#####GAlchemy
-[[[[[BThe alchemical techniques are accessed using the 'm' key.]  
-Alchemists may then 'E'xtract essences or add 'P'owers. The Alchemist [[[[[vmust]
-be wearing GLOVES to use their alchemy powers.
-
-An Alchemist is also capable of [[[[[Bcreating their own artifacts], but
-this is a time-consuming, and costly, activity. To do so, he must first 
-learn the ability *****ability.txt*09[Artifact Creation], which costs a whopping 70 skill points
-to learn, and requires some high pre-requisites. Once he has done so, 
-he needs to imbue an ego item with a number of essences of magic (equal
-to their skill level) and then wield the item. While using the item, 
-it will gain experience (which reduces the amount of exp the wearer 
-gains during this time). When the Alchemist feels that the item is 
-powerful enough, he can finalise the artifact by "buying" powers using
-the experience the artifact has collected. He will also require exotic
-ingredients to add the abilities.
-
-Most (but not all) potions, scrolls, wands, staffs, rods, rings, and 
-amulets contain usable magical energies.  An Alchemist taps that 
-energy, using the technique "'E'xtract essences" to create one or more
-essences of a type appropriate to the original object.
-
-The drained object itself is now called "of nothing".  Unlike any
-other kind of object, it can have new magics added to it.
-
-An Alchemist can add power to such items by using essences he made or
-found.  He does this with the technique "'P'ower".  He can then select
-the object he wishes to enchant, and the kind of object he wishes to
-create. Only object types for which he knows the recipe will be displayed,
-and ones for which essences are lacking will be displayed in red. Objects
-whose level exceeds his own are sometimes difficult to create, though
-he can always add gold to improve the chances of his success.
-
-[[[[[BA few pointers:]
-     -Recipes are (usually) logical. Acid essences don't make Dragon 
-      Weapons. And you can always look at the recipes you know with
-      the "recipe 'B'ook" command.
-     -Not all objects or ego-item types can be made using alchemy.
-     -Alchemy is mostly reversible.  Most items that you can 
-      'E'xtract from, you can later re-create, if you learn about
-      them when extracting from them. You won't always get enough
-      essences from destroying an item to recreate it, though the 
-      chance of doing so will get higher as you increase in skill.
-     -*Identifying* an object that you can destroy will always teach
-      you how to create it (if creating it is possible).
-     -Since you can't create abilities in artifacts that you aren't
-      aware of, make sure to *identify* all the artifacts you can.
-     -You can't *identify* things you buy in shops, so you'll have
-      to extract from them and take your chances.
-
-[[[[[BSome Recipes:]
-Any Alchemist worth his salt knows lots of recipes.  By extracting from
-items in the dungeon, he learns to create more and more items. You can
-see the recipes you know using the "recipe 'B'ook" command. The Alchemist
-starts off knowing some basic recipes, and gains more recipes as time 
-goes on.
-
-More details can be found in the *****essences.txt*0[Essences SPOILER]).
-
diff --git a/lib/mods/theme/help/c_geoman.txt b/lib/mods/theme/help/c_geoman.txt
index 47855875..ba8eaa66 100644
--- a/lib/mods/theme/help/c_geoman.txt
+++ b/lib/mods/theme/help/c_geoman.txt
@@ -43,7 +43,6 @@ Magic                   1.000           [0.900]
   Mind                  0.000           [0.700]
   Nature                0.000           [0.700]
   Necromancy            0.000           [0.700]
-  Runecraft             0.000           [0.700]
   Thaumaturgy           0.000           [0.700]
 Spirituality            1.000           [0.550]
   Prayer                0.000           [0.500]
diff --git a/lib/mods/theme/help/c_mage.txt b/lib/mods/theme/help/c_mage.txt
index 949d3bcc..9bfd6a3c 100644
--- a/lib/mods/theme/help/c_mage.txt
+++ b/lib/mods/theme/help/c_mage.txt
@@ -48,7 +48,6 @@ Magic                   1.000           [0.900]
   Mind                  0.000           [0.900]
   Nature                0.000           [0.900]
   Necromancy            0.000           [0.700]
-  Runecraft             0.000           [0.700]
   Thaumaturgy           0.000           [0.700]
 Spirituality            1.000           [0.550]
   Prayer                0.000           [0.500]
diff --git a/lib/mods/theme/help/c_merch.txt b/lib/mods/theme/help/c_merch.txt
deleted file mode 100644
index 31fb60dd..00000000
--- a/lib/mods/theme/help/c_merch.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-#####R=== Merchants ===
-
-#####GDescription
-A Merchant is neither a warrior nor a spellcaster. They still have some great
-advantages, they can use chests to warp items into other items, they can
-indentify items, they soon learn to detect all objects in the area, and
-at higher level they can see all monsters carrying objects. They will also
-get the power to appraise items and to turn them into gold. A merchant will
-naturraly get better prices in shops and get access to the merchant guild
-services, loan and item request.
-
-#####GPrimary Stats
-Charisma
-Intelligence (Ability stat)
-
-#####GMagic Usage
-Merchants can use portable holes to carry more stuff than other classes but
-at the cost of an increased weight. To do that they must wear a portable hole
-and use it with 'm'.
-They also can use their merchants abilities and midas touch in the 'U' menu.
-
-#####GStarting Equipment
-A merchant begins the game with:
-    A portable hole
-    A small steel chest containing gold and items
-    A long sword
-    A wand of tame monsters
-
-
diff --git a/lib/mods/theme/help/c_necro.txt b/lib/mods/theme/help/c_necro.txt
index f3a5ad2c..c4b05e3c 100644
--- a/lib/mods/theme/help/c_necro.txt
+++ b/lib/mods/theme/help/c_necro.txt
@@ -42,7 +42,6 @@ Magic                   1.000           [0.900]
   Mind                  0.000           [0.900]
   Nature                0.000           [0.500]
   Necromancy            1.000           [1.000]
-  Runecraft             0.000           [0.700]
   Thaumaturgy           0.000           [0.700]
 Spirituality            1.000           [0.550]
   Prayer                0.000           [0.500]
diff --git a/lib/mods/theme/help/c_runecr.txt b/lib/mods/theme/help/c_runecr.txt
deleted file mode 100644
index 8388eff9..00000000
--- a/lib/mods/theme/help/c_runecr.txt
+++ /dev/null
@@ -1,110 +0,0 @@
-~~~~~01|Runecrafter
-~~~~~02|Classes|Runecrafter
-#####R=== Runecrafters ===
-
-#####GDescription
-Instead of using spellbooks like the other spellcasters they instead 
-use mystic runes. To cast a spell they select a primary rune of the 
-elements (fire, cold, etc.) and they also choose a set of secondary runes,
-which shape the effect of the first one. The secondary runes include 
-Self, Arrow, Ray, ... and Armageddon. After that they chose the amount 
-of mana to use and the spell is cast! But the more secondary runes they
-chose the more mana is used to cast the spell. They also are bad 
-fighters, but if they concentrate all their mana in one spell 
-(especially with a mage staff of mana) they could kill nearly anything.
-
-#####GStarting Stat Modifiers
-Strength         -5
-Intelligence     +3
-Wisdom           +0
-Dexterity        +1
-Constitution     -2
-Charisma         +1
-Hit Die          +d0
-Spell Points    +50%
-Exp Penalty      30%
-
-#####GStarting Skills:
-#####BSkill                   Start Level     Skill Point Gains
-Combat                  1.000           [0.200]
-  Weaponmastery         0.700           [0.400]
-Sneakiness              1.000           [0.900]
-  Stealth               0.000           [0.400]
-Magic                   2.000           [0.950]
-  Magic-Device          1.000           [1.200]
-  Spell-power           0.000           [0.600]
-  Mana                  1.000           [0.600]
-  Geomancy
-    Fire                0.000           [0.700]
-    Water               0.000           [0.700]
-    Air                 0.000           [0.700]
-    Earth               0.000           [0.700]
-  Meta                  0.000           [0.700]
-  Conveyance            0.000           [0.700]
-  Divination            0.000           [0.700]
-  Temporal              0.000           [0.700]
-  Mind                  0.000           [0.700]
-  Nature                0.000           [0.700]
-  Necromancy            0.000           [0.700]
-  Runecraft             1.000           [1.000]
-  Thaumaturgy           0.000           [0.700]
-Spirituality            1.000           [0.550]
-  Prayer                0.000           [0.500]
-Monster-lore            0.000           [0.500]
-
-*A Runecrafter cannot learn the Geomancy skill, but it is shown in his skill 
-screen because the elemental schools are sub-skills of it.
-
-#####GInnate Abilities:
-#####BAbility              Character level
-Perfect casting             1
-
-~~~~~03|Runecrafter|Runecrafter powers
-~~~~~04|Skills|Runecrafting - Runecrafter powers
-#####GRune Magic
-Runecrafters combine runes using the 'm' command.  They first select a 
-rune that controls magic type, then apply one or more runes to fine-tune
-effects, (pressing ESC when done), and then input the amount of mana 
-they wish to expend on the spell.
-
-Runecrafters can cast the spells from their runes in several ways:
-1. On-the-fly by combining runes when they need them.
-2. Memorise rune combinations for quick use when needed (and they don't
-   need to be able to see then!), and then later cast from memory.
-3. Carving them into a Runestone, then using the Runestone later (takes
-   less mana, but they have to be able to see).
-
-[[[[[BSpell Types:] 
-(Some kinds are not listed, and are left for the reader to discover...)
-     Knowledge:  Identify all objects in affected grids, Self-knowledge 
-          if Self rune is used.
-     Life:  Heals monsters in affected grids, heals player if Self rune 
-          is used.
-     Fire, Cold, Lightning, Acid:  Casts magics of that element.
-     Elements:  Irresistible damage.
-     Mind:  A mind blast that badly effects intelligent monsters.  
-          Temporary ESP if Self rune is used.
-     Gravity:  A gravity spell that both does damage and whisks affected 
-          creatures around.
-
-[[[[[BSpell Effects] (all are listed):
-     Self:  Effects the caster.  This rune can be used with any other;
-          if used alone, only the caster's grid is affected.
-     Arrow:  Spell will include a bolt effect.  This allows aiming.
-     Ray:  Spell will include a beam effect.  This allows aiming.  
-          Increases difficulty slightly.
-     Sphere:  Spell will end with a circular explosion.  Increases 
-          difficulty a bit.  Can be used alone, or with Self, Arrow, or 
-          Ray.
-     Power Surge:  Not currently recommended for use.  Increases
-          difficulty a lot.
-     Armageddon:  Hurls down meteors of the magical type in the vicinity
-          of the caster.  Increases difficulty noticeably, but can do a
-          great deal of damage.
-
-#####GStarting Equipment
-A Runecrafter begins the game with:
-    a Rune [Fire]
-    a Rune [Arrow]
-    a Dagger
-
diff --git a/lib/mods/theme/help/c_sorcer.txt b/lib/mods/theme/help/c_sorcer.txt
index 8a33184f..c2fbdbb0 100644
--- a/lib/mods/theme/help/c_sorcer.txt
+++ b/lib/mods/theme/help/c_sorcer.txt
@@ -48,7 +48,6 @@ Magic                   1.000           [1.000]
   Mind                  0.000           [1.000]
   Nature                0.000           [1.000]
   Necromancy            0.000           [1.000]
-  Runecraft             0.000           [0.900]
   Thaumaturgy           0.000           [0.900]
 Spirituality            1.000           [0.550]
   Prayer                0.000           [0.500]
diff --git a/lib/mods/theme/help/c_thaum.txt b/lib/mods/theme/help/c_thaum.txt
index 653e84fa..2680a1c4 100644
--- a/lib/mods/theme/help/c_thaum.txt
+++ b/lib/mods/theme/help/c_thaum.txt
@@ -46,7 +46,6 @@ Magic                   3.000           [0.950]
   Mind                  0.000           [0.700]
   Nature                0.000           [0.700]
   Necromancy            0.000           [0.700]
-  Runecraft             0.000           [0.700]
   Thaumaturgy           1.000           [1.000]
 Spirituality            1.000           [0.550]
   Prayer                0.000           [0.500]
diff --git a/lib/mods/theme/help/c_warper.txt b/lib/mods/theme/help/c_warper.txt
index 55d16be5..1c461049 100644
--- a/lib/mods/theme/help/c_warper.txt
+++ b/lib/mods/theme/help/c_warper.txt
@@ -41,7 +41,6 @@ Magic                   1.000           [0.900]
   Mind                  0.000           [0.700]
   Nature                0.000           [0.800]
   Necromancy            0.000           [0.700]
-  Runecraft             0.000           [0.700]
   Thaumaturgy           0.000           [0.700]
 Spirituality            1.000           [0.550]
   Prayer                0.000           [0.500]
diff --git a/lib/mods/theme/help/command.txt b/lib/mods/theme/help/command.txt
index 6616c252..11ed1df4 100644
--- a/lib/mods/theme/help/command.txt
+++ b/lib/mods/theme/help/command.txt
@@ -29,7 +29,7 @@ the game that you wish to do the command multiple times, unless you press a
 key or are otherwise disturbed.  To enter a "repeat count", type '0', followed
 by the numerical count, followed by the command.  You must type "space" before
 entering certain commands.  Skipping the numerical count yields a count of 99.
-An option allows certain commands (open, disarm, tunnel, etc) to auto-repeat.
+An option allows certain commands (open, tunnel, etc) to auto-repeat.
 
     Some commands will prompt for extra information, such as a direction, an
 inventory or equipment item, a spell, a textual inscription, the symbol of a
@@ -88,7 +88,7 @@ that you can always, for example, use "\" + "." + "6", to specify "run east".
  *****command.txt*1[a  Aim a wand]                           *****command.txt*2[A  Activate an artifact]
  *****command.txt*3[b  Browse a book]                        *****command.txt*4[B  Bash a door]
  *****command.txt*5[c  Close a door]                         *****command.txt*6[C  Character description]
- *****command.txt*7[d  Drop an item]                         *****command.txt*8[D  Disarm a trap]
+ *****command.txt*7[d  Drop an item]                         D  (unused)
  *****command.txt*9[e  Equipment list]                       *****command.txt*10[E  Eat some food]
  *****command.txt*11[f  Fire (shoot) an item]                 *****command.txt*12[F  Fuel your lantern/torch]
  *****command.txt*13[g  Stay still (flip pickup)]             *****command.txt*14[G  Gain new skills]
@@ -136,8 +136,8 @@ that you can always, for example, use "\" + "." + "6", to specify "run east".
  *****command.txt*72[,  Stay still (with pickup)]            ^W  (special - wizard mode)
  *****command.txt*74[<  Go up staircase]                     *****command.txt*75[^X  Save and quit]
  *****command.txt*76[.  Run]                                 ^Y  (unused)
- *****command.txt*77[>  Go down staircase]                   ^Z  (special - borg command)
- *****command.txt*79[\  (special - bypass keymap)]            *****command.txt*80[|  Do cmovies]
+ *****command.txt*77[>  Go down staircase]                   ^Z  (unused)
+ *****command.txt*79[\  (special - bypass keymap)]
  *****command.txt*81[`  (special - escape)]                   *****command.txt*82[~  Display current knowledge]
  *****command.txt*83[/  Identify symbol]                      *****command.txt*84[?  Help]
                                         *****command.txt*98[^\]  Take an html screenshot]
@@ -149,7 +149,7 @@ that you can always, for example, use "\" + "." + "6", to specify "run east".
  *****command.txt*45[a  Zap a rod (Activate)]                 *****command.txt*2[A  Activate an artifact]
  *****command.txt*95[b  (walk - south west)]                  *****command.txt*95[B  (run - south west)]
  *****command.txt*5[c  Close a door]                         *****command.txt*6[C  Character description]
- *****command.txt*7[d  Drop an item]                         *****command.txt*8[D  Disarm a trap or chest]
+ *****command.txt*7[d  Drop an item]                         D  (unused)
  *****command.txt*9[e  Equipment list]                       *****command.txt*10[E  Eat some food]
  *****command.txt*4[f  Bash a door (force)]                  *****command.txt*12[F  Fuel your lantern/torch]
  *****command.txt*13[g  Stay still (flip pickup)]             *****command.txt*14[G  Gain new skills]
@@ -197,14 +197,14 @@ that you can always, for example, use "\" + "." + "6", to specify "run east".
  *****command.txt*76[,  Run]                                 ^W  (special - wizard mode)
  *****command.txt*74[<  Go up staircase]                     *****command.txt*75[^X  Save and quit]
  *****command.txt*72[.  Stay still (with pickup)]            *****command.txt*95[^Y  (tunnel - north west)]
- *****command.txt*77[>  Go down staircase]                   ^Z  (special - borg command)
- *****command.txt*79[\  (special - bypass keymap)]            *****command.txt*80[|  Do cmovies]
+ *****command.txt*77[>  Go down staircase]                   ^Z  (unused)
+ *****command.txt*79[\  (special - bypass keymap)]
  *****command.txt*81[`  (special - escape)]                   *****command.txt*82[~  Display current knowledge]
  *****command.txt*83[/  Identify symbol]                      *****command.txt*84[?  Help]
 
 ~~~~~102|Commands|Special keys
 #####R=== Special Keys ===
- 
+
         Certain special keys may be intercepted by the operating system or
 the host machine, causing unexpected results.  In general, these special keys
 are control keys, and often, you can disable their special effects.
@@ -265,8 +265,8 @@ ESCAPE which are always ignored as commands in case you type the command
 just after the count expires.
 
         You can tell ToME to automatically use a repeat count of 99
-with commands you normally want to repeat (open, disarm, tunnel, bash,
-alter, etc) by setting the "always_repeat" option.
+with commands you normally want to repeat (open, tunnel, bash, alter,
+etc) by setting the "always_repeat" option.
  
  
 #####R===  Selection of Objects ===
@@ -471,7 +471,7 @@ plus the "underlying command" key.  This is followed by the command name
 and "roguelike" keyset key, if different from the underlying command key.
 Then comes a brief description of the command, including information about
 alternative methods of specifying the command in each keyset, when needed.
-Several commands (tunnel, disarm, bash, open) are repeated 99 times if the
+Several commands (tunnel, bash, open) are repeated 99 times if the
 "always_repeat" option is set and no repeat count is given.  Some commands
 use the "repeat count" to automatically repeat the command several times,
 while others use the "repeat count" as an "argument", for example, commands
@@ -498,12 +498,7 @@ for a quantity will convert any "letters" into the maximal legal value.
         each corresponding to a different location on the body, and each of
         which may contain only a single object at a time, and each of which
         may only contain objects of the proper "type".
-        If the option "show_labels" is set, the slots are labelled as follows:  
-        Wielding (weapon), Shooting (missile launcher or instruments),
-        On finger (ring), Around neck (amulet), Light source (light source),
-        On body (armor), About body (cloak), On arm (shield), On head (helmet),
-        On hands (gloves), On feet (boots), Carrying (symbiote), Quiver (ammo),
-        Using (tool). You must be using an object to receive any of its special
+        You must be using an object to receive any of its special
         powers.
 ~~~~~7
 [[[[[GDrop an item (d)]
@@ -518,8 +513,7 @@ for a quantity will convert any "letters" into the maximal legal value.
 [[[[[GDestroy an item (k) or Destroy an item (^D)]
         This destroys an item in your inventory or on the dungeon floor.
         If the selected pile contains multiple objects, you may specify
-        a quantity.  You must always verify this command, unless the item
-        is cursed or worthless and the option "auto_destroy" is set.
+        a quantity.  You must always verify this command.
 ~~~~~42
 [[[[[GWear/Wield equipment (w)]
         To wear or wield an object in your inventory, use this command.
@@ -657,11 +651,10 @@ for a quantity will convert any "letters" into the maximal legal value.
 [[[[[GOpen a door or chest (o)]
         To open an object such as a door or chest, you must use this
         command.  If the object is locked, you will attempt to pick the
-        lock based on your disarming ability.  If you open a trapped chest
-        without disarming the traps first, the trap will be set off.  Some
-        doors will be jammed shut and may have to be forced open.  You may
-        need several tries to open a door or chest.  Open can take a count,
-        requires a direction, and is affected by the "always_repeat" option.
+        lock based.  Some doors will be jammed shut and may have to be
+        forced open.  You may need several tries to open a door or chest.
+        Open can take a count, requires a direction, and is affected by
+        the "always_repeat" option.
 ~~~~~5
 [[[[[GClose a door (c)]
         Non-intelligent and some other creatures cannot open doors, so
@@ -687,19 +680,12 @@ for a quantity will convert any "letters" into the maximal legal value.
         may permanently break it so that it can never be closed.  Bash or
         Force can take a count, requires a direction, and is affected by
         the "always_repeat" option.
-~~~~~8
-[[[[[GDisarm a trap or chest (D)]
-        You can attempt to disarm traps on the floor or on chests.  If you
-        fail, there is a chance that you will blunder and set it off.  You
-        can only disarm a trap after you have found it (usually with the
-        Search command).  Disarm can take a count, requires a direction,
-        and is affected by the "always_repeat" option.
 ~~~~~63
 [[[[[GAlter (+)]
         This special command allows the use of a single keypress to select
         any of the "obvious" commands above (attack, tunnel, bash, open,
-        disarm, close), and, by using macros or keymaps, to combine this
-        keypress with directions.  In general, this allows the use of the
+        close), and, by using macros or keymaps, to combine this keypress
+        with directions.  In general, this allows the use of the
         "control" key plus the appropriate "direction" key (including the
         roguelike direction keys in roguelike mode) as a kind of generic
         "alter the terrain feature of an adjacent grid" command.  Alter
@@ -789,9 +775,9 @@ for a quantity will convert any "letters" into the maximal legal value.
         Use this command to read a scroll.  Scroll spells usually have an
         area effect, except for a few cases where they act on other objects.
         Reading a scroll causes the parchment to disintegrate as the scroll
-        takes effect, unless you are an Alchemist.  Most scrolls which prompt
-        for more information can be aborted (by pressing escape), which will
-        stop reading the scroll before it disintegrates.
+        takes effect.  Most scrolls which prompt for more information can
+        be aborted (by pressing escape), which will stop reading the scroll
+        before it disintegrates.
 ~~~~~58 
 [[[[[GInscribe an object ({)]
         This command inscribes a string on an object.  The inscription is
@@ -997,10 +983,8 @@ for a quantity will convert any "letters" into the maximal legal value.
 ~~~~~69
 [[[[[GTake notes (:)]
         This command allows you to take notes, which will then appear in your
-        note file, if the birth-option "take_notes" was set (the default), or
-        in your message list (prefixed with "Note:"), if the option was not set.
-        The note file can be displayed through the "Display Current Knowledge"
-        command (~ or |). This command takes no time.
+        note file. The note file can be displayed through the "Display Current
+        Knowledge" command (~ or |). This command takes no time.
 ~~~~~123|Commands|Game status
 #####R--- Game Status Commands ---
 ~~~~~6
@@ -1054,9 +1038,8 @@ for a quantity will convert any "letters" into the maximal legal value.
         Display known dungeon towns
         
         Display notes
-        If the option "take_notes" is set shows you your notes file, where all
-        remarkable events are noted. You can add notes yourself by using the
-        "Take notes" command (:).
+        Shows you your notes file, where all remarkable events are noted.
+        You can add notes yourself by using the "Take notes" command (:).
         
 ~~~~~70
 [[[[[GTime of the day (^T)]
@@ -1218,17 +1201,6 @@ for a quantity will convert any "letters" into the maximal legal value.
         command allows the player to force the game to finish the current song
         and move on to another one (i.e. if you are tired of hearing the current
         song, you can change it).
-~~~~~80
-[[[[[GDo cmovies (|)]
-        The cmovie command (press | key in both normal or roguelike set) allows
-        you to make a "movie" that you can send to people showing your movement
-        through a part of the dungeon (like clearing that GCV . . .)
-
-        It asks for a name (it will add the extension itself) and then if you wish
-        to play or record it.
-
-        The cmovie files (.cmv) are located in lib/cmov, note that they quickly
-        become huge and so you REALLY should compress them before sending to friends.
 ~~~~~97
 [[[[[GRecord macros ($)]
         This is an easier way to create macros. Activate it, press the key
diff --git a/lib/mods/theme/help/debug.txt b/lib/mods/theme/help/debug.txt
index 56d57098..8aea13ee 100644
--- a/lib/mods/theme/help/debug.txt
+++ b/lib/mods/theme/help/debug.txt
@@ -12,7 +12,7 @@ will not be scored if you use debug commands.
 ~~~~~100|Debug|Command List
 #####R=== Command List Summary ===
 
- *****debug.txt*1[a  Autorestore]                          *****debug.txt*2[A  Show all stats]
+ *****debug.txt*1[a  Autorestore]
  *****debug.txt*3[b  Teleport to target]                   *****debug.txt*4[B  HP to zero]
  *****debug.txt*5[c  Create object]                        *****debug.txt*6[C  Create artifact]
  *****debug.txt*7[d  Detect all]                           *****debug.txt*8[D  Teleport to the wilderness]
@@ -27,9 +27,9 @@ will not be scored if you use debug commands.
  *****debug.txt*25[m  Magic Mapping]                        *****debug.txt*26[M  Gain corruption]
  *****debug.txt*27[n  Summon named monster]                 *****debug.txt*28[N  Summon _friendly_ named monster]
  *****debug.txt*29[o  Edit object attributes]               O  (unused)
- *****debug.txt*31[p  Phase door]                           *****debug.txt*32[P  Panic save]
+ *****debug.txt*31[p  Phase door]                           P  (unused)
  *****debug.txt*33[q  Get a quest]                          Q  (unused)
- *****debug.txt*35[r  Gain reward]                          *****debug.txt*36[R  Create a trap]
+ r  (unused)                                                R  (unused)
  *****debug.txt*37[s  Summon monster]                       *****debug.txt*38[S  Change the feature of the map]
  *****debug.txt*39[t  Teleport]                             *****debug.txt*40[T  Teleport to a town]
  *****debug.txt*41[u  Complete map]                         *****debug.txt*42[U  Become undead]
@@ -53,17 +53,17 @@ will not be scored if you use debug commands.
  [  (unused)                            ^M  (unused)
  ]  (unused)                            ^N  (unused)
  *****debug.txt*67[-  Create object]                       ^O  (unused)
- *****debug.txt*69[_  The path to the god dark]            ^P  (unused)
+                                        ^P  (unused)
  *****debug.txt*71[+  Gain a fate]                         ^Q  (unused)
  *****debug.txt*73[=  Align monster]                       ^R  (unused)
  ;  (unused)                            ^S  (unused)
  :  (unused)                            ^T  (unused)
  '  (unused)                            ^U  (unused)
- *****debug.txt*75["  Create spoiler]                      ^V  (unused)
+                                        ^V  (unused)
  ,  (unused)                            ^W  (unused)
  <  (unused)                            ^X  (unused)
  .  (unused)                            ^Y  (unused)
- *****debug.txt*81[>  Lua script]                          ^Z  (unused)
+                                        ^Z  (unused)
  \  (unused)                             |  (unused)
  `  (unused)                             ~  (unused)
  *****debug.txt*91[/  Summon monster]                       *****debug.txt*92[?  Help]
@@ -85,10 +85,6 @@ maximal legal value.
 ~~~~~1
 [[[[[GAutorestore (a)]
         Restores all your stats.  This includes HP, SP, hunger, lost levels, etc.
-~~~~~2
-[[[[[GShow all stats (A)]
-        This brings up the Character status menu, where you can view
-        all the stats about your character.
 ~~~~~3
 [[[[[GTeleport to target (b)]
         You first need to have a monster targeted, then you can use
@@ -109,7 +105,7 @@ maximal legal value.
         For example : 03^AC will create the Arkenstone of Thrane (+3)
 ~~~~~7
 [[[[[GDetect all (d)]
-        Sense ways out/monsters/objects/traps.
+        Sense ways out/monsters/objects.
 ~~~~~8
 [[[[[GTeleport to the wilderness (D)]
         From a dungeon this will teleport you to the wilderness level
@@ -138,8 +134,7 @@ maximal legal value.
         Change your life rating.
 ~~~~~16
 [[[[[GHostile monster creation (H)]
-        Summons a Pack of Creatures of the same kind. Will only work
-        if MONSTER_HORDES has been defined at compile time.
+        Summons a Pack of Creatures of the same kind.
 ~~~~~17
 [[[[[GIdentify (i)]
         Like a Scroll of Identify.
@@ -175,9 +170,6 @@ maximal legal value.
 ~~~~~31
 [[[[[GPhase door (p)]
         Like a Scroll of Phase Door.
-~~~~~32
-[[[[[GPanic save (P)]
-        Save and quit the game, which is the same as doing a ^X.
 ~~~~~33
 [[[[[GGet a quest (q)]
         Get a quest.
@@ -187,11 +179,6 @@ maximal legal value.
 ~~~~~35
 [[[[[GGain reward (r)]
         Some high being grants you a reward.
-~~~~~36
-[[[[[GCreate a trap (R)]
-        Use the "Command count", aka 0, to specify a number from
-        tr_info.txt to put a trap on the ground where you are
-        standing.
 ~~~~~37
 [[[[[GSummon monster (s)]
         Summon a random monster, next to where you stand.
@@ -247,10 +234,6 @@ maximal legal value.
 [[[[[GCreate object (-)]
         Allows you to create a new object where you stand. You must
         specify an object number from k_info.txt.
-~~~~~69
-[[[[[GThe path to the god dark (_)]
-        Do not use this as it is used by DarkGod as a test for Lua
-        and will CRASH the game. You have been warned.
 ~~~~~71
 [[[[[GGain a fate (+)]
         Unearth more of your prophecy.
@@ -264,12 +247,6 @@ maximal legal value.
             3 monster becomes pet
             4 monster becomes companion
         You then point at an enemy and press space.
-~~~~~75
-[[[[[GCreate spoiler (")]
-        Brings up a menu that allows you to create a spoiler file.
-~~~~~81
-[[[[[GLua script (>)]
-        Allows you to run a Lua script.
 ~~~~~91
 [[[[[GSummon monster (/)]
         Summons a random monster next to you.
diff --git a/lib/mods/theme/help/def.aux b/lib/mods/theme/help/def.aux
deleted file mode 100644
index 983e9683..00000000
--- a/lib/mods/theme/help/def.aux
+++ /dev/null
@@ -1,3 +0,0 @@
-file_ext="html"
-link_prefix=""
-link_suffix=""
diff --git a/lib/mods/theme/help/defines.txt b/lib/mods/theme/help/defines.txt
deleted file mode 100644
index ac997501..00000000
--- a/lib/mods/theme/help/defines.txt
+++ /dev/null
@@ -1,639 +0,0 @@
-|||||oy
-~~~~~81|Defines
-~~~~~85|Defines|Tvals
-~~~~~82|Automatizer|Defines
-~~~~~83|Tvals
-#####R             /----------------------------------------\
-#####R            <             Tvals and svals              >
-#####R             \----------------------------------------/
-
-Some objects don't have svals as such. Spellbooks, wands, and staves for
-instance don't have svalues as they are defined in lua.
-
-TV_SKELETON      1      /* Skeletons ('s') */
-TV_BOTTLE        2      /* Empty bottles ('!') */
-*****defines.txt*04[TV_BATERIE]       4      /* For the Alchemists */
-TV_SPIKE         5      /* Spikes ('~') */
-TV_MSTAFF        6      /* Mage Staffs */
-TV_CHEST         7      /* Chests ('~') */
-TV_PARCHMENT     8      /* Parchments from Kamband */
-*****defines.txt*09[TV_CORPSE]        9      /* Monster corpses */
-TV_EGG          10      /* Monster Eggs */
-TV_JUNK         11      /* Sticks, Pottery, etc ('~') */
-*****defines.txt*12[TV_TOOL]         12      /* Tools */
-*****defines.txt*14[TV_INSTRUMENT]   14      /* Musical instruments */
-*****defines.txt*15[TV_BOOMERANG]    15      /* Boomerangs */
-*****defines.txt*16[TV_SHOT]         16      /* Ammo for slings */
-*****defines.txt*16[TV_ARROW]        17      /* Ammo for bows */
-*****defines.txt*16[TV_BOLT]         18      /* Ammo for x-bows */
-*****defines.txt*19[TV_BOW]          19      /* Slings/Bows/Xbows */
-*****defines.txt*20[TV_DIGGING]      20      /* Shovels/Picks */
-*****defines.txt*21[TV_HAFTED]       21      /* Priest Weapons */
-*****defines.txt*22[TV_POLEARM]      22      /* Pikes/Glaives/Spears/etc. */
-*****defines.txt*23[TV_SWORD]        23      /* Edged Weapons */
-*****defines.txt*24[TV_AXE]          24      /* Axes/Cleavers */
-*****defines.txt*30[TV_BOOTS]        30      /* Boots */
-*****defines.txt*31[TV_GLOVES]       31      /* Gloves */
-*****defines.txt*32[TV_HELM]         32      /* Helms */
-*****defines.txt*32[TV_CROWN]        33      /* Crowns */
-*****defines.txt*34[TV_SHIELD]       34      /* Shields */
-*****defines.txt*35[TV_CLOAK]        35      /* Cloaks */
-*****defines.txt*36[TV_SOFT_ARMOR]   36      /* Soft Armor */
-*****defines.txt*37[TV_HARD_ARMOR]   37      /* Hard Armor */
-*****defines.txt*38[TV_DRAG_ARMOR]   38      /* Dragon Scale Mail */
-*****defines.txt*39[TV_LITE]         39      /* Lites (including Specials) */
-*****defines.txt*40[TV_AMULET]       40      /* Amulets (including Specials) */
-*****defines.txt*45[TV_RING]         45      /* Rings (including Specials) */
-*****defines.txt*46[TV_TRAPKIT]      46      /* Trapkits */
-TV_TOTEM        54      /* Summoner totems */
-*****defines.txt*55[TV_STAFF]        55      /* Staffs */
-*****defines.txt*65[TV_WAND]         65      /* Wands */
-*****defines.txt*66[TV_ROD]          66      /* Rod tips */
-*****defines.txt*67[TV_ROD_MAIN]     67      /* Rod body's */
-*****defines.txt*70[TV_SCROLL]       70      /* Scrolls */
-*****defines.txt*71[TV_POTION]       71      /* potions */
-*****defines.txt*72[TV_POTION2]      72      /* Second set of potion */
-TV_FLASK        77      /* Flasks of oil */
-*****defines.txt*80[TV_FOOD]         80      /* Food, including mushrooms */
-TV_HYPNOS       99      /* To wield monsters !:) */
-TV_GOLD         100     /* Gold can only be picked up by players */
-TV_RANDART      102     /* Random Artifacts */
-TV_RUNE1        104     /* Base runes */
-TV_RUNE2        105     /* Modifier runes */
-TV_BOOK         111     /* spell books */
-*****defines.txt*115[TV_DAEMON_BOOK]  115     /* Demon blades, shields and horns */
-~~~~~84|Defines|Svals
-~~~~~12|Svals
-/* The "sval" codes for TV_TOOL */
- SV_TOOL_CLIMB 0
- SV_PORTABLE_HOLE 1
-~~~~~16
-/* The "sval" codes for TV_SHOT/TV_ARROW/TV_BOLT */
- SV_AMMO_LIGHT                    0	/* pebbles */
- SV_AMMO_NORMAL                   1	/* shots, arrows, bolts */
- SV_AMMO_HEAVY                    2	/* seeker arrows and bolts, mithril shots */
-~~~~~14
-/* The "sval" codes for TV_INSTRUMENT */
- SV_FLUTE                         1
- SV_BANJO                         2
- SV_LUTE                          3
- SV_MANDOLIN                      4
- SV_DRUM                          5
- SV_HARP                          6
- SV_HORN                          7
-~~~~~46
-/* The "sval" codes for TV_TRAPKIT */
- SV_TRAPKIT_SLING                 1
- SV_TRAPKIT_BOW                   2
- SV_TRAPKIT_XBOW                  3
- SV_TRAPKIT_POTION                4
- SV_TRAPKIT_SCROLL                5
- SV_TRAPKIT_DEVICE                6
-~~~~~15
-/* The "sval" codes for TV_BOOMERANG */
- SV_BOOM_S_WOOD                   1      /* 1d4  */
- SV_BOOM_WOOD                     2      /* 1d9  */
- SV_BOOM_S_METAL                  3      /* 1d8  */
- SV_BOOM_METAL                    4      /* 2d4  */
-~~~~~19
-/* The "sval" codes for TV_BOW (note information in "sval") */
- SV_SLING                         2	/* (x2) */
- SV_SHORT_BOW                    12	/* (x2) */
- SV_LONG_BOW                     13	/* (x3) */
- SV_LIGHT_XBOW                   23	/* (x3) */
- SV_HEAVY_XBOW                   24	/* (x4) */
-~~~~~20
-/* The "sval" codes for TV_DIGGING */
- SV_SHOVEL                        1
- SV_GNOMISH_SHOVEL                2
- SV_DWARVEN_SHOVEL                3
- SV_PICK                          4
- SV_ORCISH_PICK                   5
- SV_DWARVEN_PICK                  6
- SV_MATTOCK                       7
-~~~~~21
-/* The "sval" values for TV_HAFTED */
- SV_CLUB                          1	/* 1d4  */
- SV_WHIP                          2	/* 1d6  */
- SV_QUARTERSTAFF                  3	/* 1d9  */
- SV_NUNCHAKU                      4	/* 2d3  */
- SV_MACE                          5	/* 2d4  */
- SV_BALL_AND_CHAIN                6	/* 2d4  */
- SV_WAR_HAMMER                    8	/* 3d3  */
- SV_LUCERN_HAMMER                10	/* 2d5  */
- SV_THREE_PIECE_ROD              11	/* 3d3  */
- SV_MORNING_STAR                 12	/* 2d6  */
- SV_FLAIL                        13	/* 2d6  */
- SV_LEAD_FILLED_MACE             15	/* 3d4  */
- SV_TWO_HANDED_FLAIL             18	/* 3d6  */
- SV_GREAT_HAMMER                 19	/* 4d6  */
- SV_MACE_OF_DISRUPTION           20	/* 5d8  */
- SV_GROND                        50	/* 3d4  */
-~~~~~24
-/* The "sval" values for TV_AXE */
- SV_HATCHET                       1	/* 1d5 */
- SV_CLEAVER                       2      /* 2d4 */
- SV_LIGHT_WAR_AXE                 8      /* 2d5 */
- SV_BEAKED_AXE                   10	/* 2d6 */
- SV_BROAD_AXE                    11	/* 2d6 */
- SV_BATTLE_AXE                   22	/* 2d8 */
- SV_GREAT_AXE                    25	/* 4d4 */
- SV_LOCHABER_AXE                 28	/* 3d8 */
- SV_SLAUGHTER_AXE                30      /* 5d7 */
-~~~~~22
-/* The "sval" values for TV_POLEARM */
- SV_SPEAR                         2	/* 1d6 */
- SV_SICKLE                        3	/* 2d3 */
- SV_AWL_PIKE                      4	/* 1d8 */
- SV_TRIDENT                       5	/* 1d9 */
- SV_FAUCHARD                      6  /* 1d10 */
- SV_BROAD_SPEAR                   7	/* 1d9 */
- SV_PIKE                          8	/* 2d5 */
- SV_GLAIVE                       13	/* 2d6 */
- SV_HALBERD                      15	/* 3d4 */
- SV_GUISARME                     16  /* 2d5 */
- SV_SCYTHE                       17	/* 5d3 */
- SV_LANCE                        20	/* 2d8 */
- SV_TRIFURCATE_SPEAR             26	/* 2d9 */
- SV_HEAVY_LANCE                  29  /* 4d8 */
- SV_SCYTHE_OF_SLICING            30	/* 8d4 */
-~~~~~23
-/* The "sval" codes for TV_SWORD */
- SV_BROKEN_DAGGER                 1  /* 1d1 */
- SV_BROKEN_SWORD                  2  /* 1d2 */
- SV_DAGGER                        4  /* 1d4 */
- SV_MAIN_GAUCHE                   5  /* 1d5 */
- SV_RAPIER                        7  /* 1d6 */
- SV_SMALL_SWORD                   8  /* 1d6 */
- SV_BASILLARD                     9  /* 1d8 */
- SV_SHORT_SWORD                  10  /* 1d7 */
- SV_SABRE                        11  /* 1d7 */
- SV_CUTLASS                      12  /* 1d7 */
- SV_KHOPESH                      14  /* 2d4 */
- SV_TULWAR                       15  /* 2d4 */
- SV_BROAD_SWORD                  16  /* 2d5 */
- SV_LONG_SWORD                   17  /* 2d5 */
- SV_SCIMITAR                     18  /* 2d5 */
- SV_KATANA                       20  /* 3d4 */
- SV_BASTARD_SWORD                21  /* 3d4 */
- SV_GREAT_SCIMITAR               22  /* 4d5 */
- SV_CLAYMORE                     23  /* 2d8 */
- SV_ESPADON                      24  /* 2d9 */
- SV_TWO_HANDED_SWORD             25  /* 3d6 */
- SV_FLAMBERGE                    26  /* 3d7 */
- SV_EXECUTIONERS_SWORD           28  /* 4d5 */
- SV_ZWEIHANDER                   29  /* 4d6 */
- SV_BLADE_OF_CHAOS               30  /* 6d5 */
- SV_SHADOW_BLADE                 31  /* 4d4 */
- SV_BLUESTEEL_BLADE              32  /* 3d9 */
- SV_DARK_SWORD                   33  /* 3d7 */
-~~~~~34
-/* The "sval" codes for TV_SHIELD */
- SV_SMALL_LEATHER_SHIELD          2
- SV_SMALL_METAL_SHIELD            3
- SV_LARGE_LEATHER_SHIELD          4
- SV_LARGE_METAL_SHIELD            5
- SV_DRAGON_SHIELD                 6
- SV_SHIELD_OF_DEFLECTION         10
-~~~~~32
-/* The "sval" codes for TV_HELM */
- SV_HARD_LEATHER_CAP              2
- SV_METAL_CAP                     3
- SV_IRON_HELM                     5
- SV_STEEL_HELM                    6
- SV_DRAGON_HELM                   7
- SV_IRON_CROWN                   10
- SV_GOLDEN_CROWN                 11
- SV_JEWELED_CROWN                12
- SV_MORGOTH                      50
-~~~~~30
-/* The "sval" codes for TV_BOOTS */
- SV_PAIR_OF_SOFT_LEATHER_BOOTS    2
- SV_PAIR_OF_HARD_LEATHER_BOOTS    3
- SV_PAIR_OF_METAL_SHOD_BOOTS      6
-~~~~~35
-/* The "sval" codes for TV_CLOAK */
- SV_CLOAK                         1
- SV_ELVEN_CLOAK                   2
- SV_FUR_CLOAK                     3
- SV_SHADOW_CLOAK                  6
-~~~~~31
-/* The "sval" codes for TV_GLOVES */
- SV_SET_OF_LEATHER_GLOVES         1
- SV_SET_OF_GAUNTLETS              2
- SV_SET_OF_CESTI                  5
-~~~~~36
-/* The "sval" codes for TV_SOFT_ARMOR */
- SV_FILTHY_RAG                    1
- SV_ROBE                          2
- SV_PAPER_ARMOR                   3  /* 4 */
- SV_SOFT_LEATHER_ARMOR            4
- SV_SOFT_STUDDED_LEATHER          5
- SV_HARD_LEATHER_ARMOR            6
- SV_HARD_STUDDED_LEATHER          7
- SV_RHINO_HIDE_ARMOR              8
- SV_CORD_ARMOR                    9  /*  6 */
- SV_PADDED_ARMOR                 10  /*  4 */
- SV_LEATHER_SCALE_MAIL           11
- SV_LEATHER_JACK                 12
- SV_STONE_AND_HIDE_ARMOR         15  /* 15 */
- SV_THUNDERLORD_SUIT             16
-~~~~~37
-/* The "sval" codes for TV_HARD_ARMOR */
- SV_RUSTY_CHAIN_MAIL              1  /* 14- */
- SV_RING_MAIL                     2  /* 12  */
- SV_METAL_SCALE_MAIL              3  /* 13  */
- SV_CHAIN_MAIL                    4  /* 14  */
- SV_DOUBLE_RING_MAIL              5  /* 15  */
- SV_AUGMENTED_CHAIN_MAIL          6  /* 16  */
- SV_DOUBLE_CHAIN_MAIL             7  /* 16  */
- SV_BAR_CHAIN_MAIL                8  /* 18  */
- SV_METAL_BRIGANDINE_ARMOUR       9  /* 19  */
- SV_SPLINT_MAIL                  10  /* 19  */
- SV_PARTIAL_PLATE_ARMOUR         12  /* 22  */
- SV_METAL_LAMELLAR_ARMOUR        13  /* 23  */
- SV_FULL_PLATE_ARMOUR            15  /* 25  */
- SV_RIBBED_PLATE_ARMOUR          18  /* 28  */
- SV_MITHRIL_CHAIN_MAIL           20  /* 28+ */
- SV_MITHRIL_PLATE_MAIL           25  /* 35+ */
- SV_ADAMANTITE_PLATE_MAIL        30  /* 40+ */
-~~~~~38
-/* The "sval" codes for TV_DRAG_ARMOR */
- SV_DRAGON_BLACK                  1
- SV_DRAGON_BLUE                   2
- SV_DRAGON_WHITE                  3
- SV_DRAGON_RED                    4
- SV_DRAGON_GREEN                  5
- SV_DRAGON_MULTIHUED              6
- SV_DRAGON_SHINING               10
- SV_DRAGON_LAW                   12
- SV_DRAGON_BRONZE                14
- SV_DRAGON_GOLD                  16
- SV_DRAGON_CHAOS                 18
- SV_DRAGON_BALANCE               20
- SV_DRAGON_POWER                 30
-~~~~~39
-/* The sval codes for TV_LITE */
- SV_LITE_TORCH                    0
- SV_LITE_LANTERN                  1
- SV_LITE_TORCH_EVER               2
- SV_LITE_DWARVEN                  3
- SV_LITE_FEANORIAN                4
- SV_LITE_GALADRIEL                100
- SV_LITE_ELENDIL                  101
- SV_LITE_THRAIN                   102
- SV_LITE_UNDEATH                  103
- SV_LITE_PALANTIR                 104
- SV_ANCHOR_SPACETIME              105
- SV_STONE_LORE                    106
-~~~~~40
-/* The "sval" codes for TV_AMULET */
- SV_AMULET_DOOM                   0
- SV_AMULET_TELEPORT               1
- SV_AMULET_ADORNMENT              2
- SV_AMULET_SLOW_DIGEST            3
- SV_AMULET_RESIST_ACID            4
- SV_AMULET_SEARCHING              5
- SV_AMULET_BRILLANCE              6
- SV_AMULET_CHARISMA               7
- SV_AMULET_THE_MAGI               8
- SV_AMULET_REFLECTION             9
- SV_AMULET_CARLAMMAS             10
- SV_AMULET_INGWE                 11
- SV_AMULET_DWARVES               12
- SV_AMULET_NO_MAGIC              13
- SV_AMULET_NO_TELE               14
- SV_AMULET_RESISTANCE            15
- SV_AMULET_NOTHING               16
- SV_AMULET_SERPENT               17
- SV_AMULET_TORIS_MEJISTOS        18
- SV_AMULET_ELESSAR               19
- SV_AMULET_EVENSTAR              20
- SV_AMULET_SUSTENANCE            21
- SV_AMULET_TELEPATHY             22
- SV_AMULET_TRICKERY              23
- SV_AMULET_WEAPONMASTERY         24
- SV_AMULET_DEVOTION              25
- SV_AMULET_INFRA                 26
- SV_AMULET_SPELL                 27
- SV_AMULET_WISDOM                28
- SV_AMULET_RESIST_ELEC           29
- SV_AMULET_REGEN                 30
-~~~~~45
-/* The sval codes for TV_RING */
- SV_RING_WOE                      0
- SV_RING_AGGRAVATION              1
- SV_RING_WEAKNESS                 2
- SV_RING_STUPIDITY                3
- SV_RING_TELEPORTATION            4
- SV_RING_SPECIAL                  5
- SV_RING_SLOW_DIGESTION           6
- SV_RING_FEATHER_FALL             7
- SV_RING_RESIST_FIRE              8
- SV_RING_RESIST_COLD              9
- SV_RING_SUSTAIN_STR             10
- SV_RING_SUSTAIN_INT             11
- SV_RING_SUSTAIN_WIS             12
- SV_RING_SUSTAIN_CON             13
- SV_RING_SUSTAIN_DEX             14
- SV_RING_SUSTAIN_CHR             15
- SV_RING_PROTECTION              16
- SV_RING_ACID                    17
- SV_RING_FLAMES                  18
- SV_RING_ICE                     19
- SV_RING_RESIST_POIS             20
- SV_RING_FREE_ACTION             21
- SV_RING_SEE_INVIS               22
- SV_RING_SEARCHING               23
- SV_RING_STR                     24
- SV_RING_INT                     25
- SV_RING_DEX                     26
- SV_RING_CON                     27
- SV_RING_ACCURACY                28
- SV_RING_DAMAGE                  29
- SV_RING_SLAYING                 30
- SV_RING_SPEED                   31
- SV_RING_BARAHIR                 32
- SV_RING_TULKAS                  33
- SV_RING_NARYA                   34
- SV_RING_NENYA                   35
- SV_RING_VILYA                   36
- SV_RING_POWER                   37
- SV_RING_RES_FEAR                38
- SV_RING_RES_LD                  39
- SV_RING_RES_NETHER              40
- SV_RING_RES_NEXUS               41
- SV_RING_RES_SOUND               42
- SV_RING_RES_CONFUSION           43
- SV_RING_RES_SHARDS              44
- SV_RING_RES_DISENCHANT          45
- SV_RING_RES_CHAOS               46
- SV_RING_RES_BLINDNESS           47
- SV_RING_LORDLY                  48
- SV_RING_ATTACKS                 49
- SV_RING_NOTHING                 50
- SV_RING_PRECONITION             51
- SV_RING_FLAR                    52
- SV_RING_INVIS                   53
- SV_RING_FLYING                  54
- SV_RING_WRAITH                  55
- SV_RING_ELEC                    56
- SV_RING_DURIN                   57
- SV_RING_SPELL                   58
- SV_RING_CRIT                    59
-~~~~~55
-/* The "sval" codes for TV_STAFF */
- SV_STAFF_SCHOOL                 1
- SV_STAFF_NOTHING                2
-~~~~~65
-/* The "sval" codes for TV_WAND */
- SV_WAND_SCHOOL                  1
- SV_WAND_NOTHING                 2
-~~~~~66
-/* The "sval" codes for TV_ROD(Rod Tips) */
- SV_ROD_NOTHING                   0
- SV_ROD_DETECT_DOOR               1
- SV_ROD_IDENTIFY                  2
- SV_ROD_RECALL                    3
- SV_ROD_ILLUMINATION              4
- SV_ROD_MAPPING                   5
- SV_ROD_DETECTION                 6
- SV_ROD_PROBING                   7
- SV_ROD_CURING                    8
- SV_ROD_HEALING                   9
- SV_ROD_RESTORATION              10
- SV_ROD_SPEED                    11
- SV_ROD_TELEPORT_AWAY            13
- SV_ROD_DISARMING                14
- SV_ROD_LITE                     15
- SV_ROD_SLEEP_MONSTER            16
- SV_ROD_SLOW_MONSTER             17
- SV_ROD_DRAIN_LIFE               18
- SV_ROD_POLYMORPH                19
- SV_ROD_ACID_BOLT                20
- SV_ROD_ELEC_BOLT                21
- SV_ROD_FIRE_BOLT                22
- SV_ROD_COLD_BOLT                23
- SV_ROD_ACID_BALL                24
- SV_ROD_ELEC_BALL                25
- SV_ROD_FIRE_BALL                26
- SV_ROD_COLD_BALL                27
- SV_ROD_HAVOC                    28
- SV_ROD_DETECT_TRAP              29
- SV_ROD_HOME                     30
-~~~~~67
-/* The "sval" codes for TV_ROD_MAIN(Rods) */
- SV_ROD_WOODEN                   10
- SV_ROD_COPPER                   20
- SV_ROD_IRON                     50
- SV_ROD_ALUMINIUM                75
- SV_ROD_SILVER                   100
- SV_ROD_GOLDEN                   125
- SV_ROD_MITHRIL                  160
- SV_ROD_ADMANTITE                200
-~~~~~70
-/* The "sval" codes for TV_SCROLL */
- SV_SCROLL_DARKNESS               0
- SV_SCROLL_AGGRAVATE_MONSTER      1
- SV_SCROLL_CURSE_ARMOR            2
- SV_SCROLL_CURSE_WEAPON           3
- SV_SCROLL_SUMMON_MONSTER         4
- SV_SCROLL_SUMMON_UNDEAD          5
- SV_SCROLL_SUMMON_MINE            6
- SV_SCROLL_TRAP_CREATION          7
- SV_SCROLL_PHASE_DOOR             8
- SV_SCROLL_TELEPORT               9
- SV_SCROLL_TELEPORT_LEVEL        10
- SV_SCROLL_WORD_OF_RECALL        11
- SV_SCROLL_IDENTIFY              12
- SV_SCROLL_STAR_IDENTIFY         13
- SV_SCROLL_REMOVE_CURSE          14
- SV_SCROLL_STAR_REMOVE_CURSE     15
- SV_SCROLL_ENCHANT_ARMOR         16
- SV_SCROLL_ENCHANT_WEAPON_TO_HIT 17
- SV_SCROLL_ENCHANT_WEAPON_TO_DAM 18
- SV_SCROLL_ENCHANT_WEAPON_PVAL   19
- SV_SCROLL_STAR_ENCHANT_ARMOR    20
- SV_SCROLL_STAR_ENCHANT_WEAPON   21
- SV_SCROLL_RECHARGING            22
- SV_SCROLL_RESET_RECALL          23
- SV_SCROLL_LIGHT                 24
- SV_SCROLL_MAPPING               25
- SV_SCROLL_DETECT_GOLD           26
- SV_SCROLL_DETECT_ITEM           27
- SV_SCROLL_DETECT_TRAP           28
- SV_SCROLL_DETECT_DOOR           29
- SV_SCROLL_DETECT_INVIS          30
- SV_SCROLL_DIVINATION            31
- SV_SCROLL_SATISFY_HUNGER        32
- SV_SCROLL_BLESSING              33
- SV_SCROLL_HOLY_CHANT            34
- SV_SCROLL_HOLY_PRAYER           35
- SV_SCROLL_MONSTER_CONFUSION     36
- SV_SCROLL_PROTECTION_FROM_EVIL  37
- SV_SCROLL_RUNE_OF_PROTECTION    38
- SV_SCROLL_TRAP_DOOR_DESTRUCTION 39
- SV_SCROLL_DEINCARNATION         40
- SV_SCROLL_STAR_DESTRUCTION      41
- SV_SCROLL_DISPEL_UNDEAD         42
- SV_SCROLL_MASS_RESURECTION      43
- SV_SCROLL_GENOCIDE              44
- SV_SCROLL_MASS_GENOCIDE         45
- SV_SCROLL_ACQUIREMENT           46
- SV_SCROLL_STAR_ACQUIREMENT      47
- SV_SCROLL_FIRE                  48
- SV_SCROLL_ICE                   49
- SV_SCROLL_CHAOS                 50
- SV_SCROLL_RUMOR                 51
- SV_SCROLL_ARTIFACT              52
- SV_SCROLL_NOTHING               53
- SV_SCROLL_SPELL                 54
-~~~~~71
-/* The "sval" codes for TV_POTION */
- SV_POTION_WATER                  0
- SV_POTION_APPLE_JUICE            1
- SV_POTION_SLIME_MOLD             2
- SV_POTION_BLOOD                  3
- SV_POTION_SLOWNESS               4
- SV_POTION_SALT_WATER             5
- SV_POTION_POISON                 6
- SV_POTION_BLINDNESS              7
- SV_POTION_INVIS                  8
- SV_POTION_CONFUSION              9
- SV_POTION_MUTATION              10
- SV_POTION_SLEEP                 11
- SV_POTION_LEARNING              12
- SV_POTION_LOSE_MEMORIES         13
- SV_POTION_RUINATION             15
- SV_POTION_DEC_STR               16
- SV_POTION_DEC_INT               17
- SV_POTION_DEC_WIS               18
- SV_POTION_DEC_DEX               19
- SV_POTION_DEC_CON               20
- SV_POTION_DEC_CHR               21
- SV_POTION_DETONATIONS           22
- SV_POTION_DEATH                 23
- SV_POTION_INFRAVISION           24
- SV_POTION_DETECT_INVIS          25
- SV_POTION_SLOW_POISON           26
- SV_POTION_CURE_POISON           27
- SV_POTION_BOLDNESS              28
- SV_POTION_SPEED                 29
- SV_POTION_RESIST_HEAT           30
- SV_POTION_RESIST_COLD           31
- SV_POTION_HEROISM               32
- SV_POTION_BESERK_STRENGTH       33
- SV_POTION_CURE_LIGHT            34
- SV_POTION_CURE_SERIOUS          35
- SV_POTION_CURE_CRITICAL         36
- SV_POTION_HEALING               37
- SV_POTION_STAR_HEALING          38
- SV_POTION_LIFE                  39
- SV_POTION_RESTORE_MANA          40
- SV_POTION_RESTORE_EXP           41
- SV_POTION_RES_STR               42
- SV_POTION_RES_INT               43
- SV_POTION_RES_WIS               44
- SV_POTION_RES_DEX               45
- SV_POTION_RES_CON               46
- SV_POTION_RES_CHR               47
- SV_POTION_INC_STR               48
- SV_POTION_INC_INT               49
- SV_POTION_INC_WIS               50
- SV_POTION_INC_DEX               51
- SV_POTION_INC_CON               52
- SV_POTION_INC_CHR               53
- SV_POTION_AUGMENTATION          55
- SV_POTION_ENLIGHTENMENT         56
- SV_POTION_STAR_ENLIGHTENMENT    57
- SV_POTION_SELF_KNOWLEDGE        58
- SV_POTION_EXPERIENCE            59
- SV_POTION_RESISTANCE            60
- SV_POTION_CURING                61
- SV_POTION_INVULNERABILITY       62
- SV_POTION_NEW_LIFE              63
-~~~~~72
-/* The "sval" codes for TV_POTION2 */
- SV_POTION2_MIMIC_ABOMINATION     1
- SV_POTION2_MIMIC_WOLF            2
- SV_POTION2_MIMIC_APE             3
- SV_POTION2_MIMIC_GOAT            4
- SV_POTION2_MIMIC_INSECT          5
- SV_POTION2_MIMIC_SPARROW         6
- SV_POTION2_MIMIC_STATUE          7
- SV_POTION2_MIMIC_VAMPIRE         8
- SV_POTION2_MIMIC_SPIDER          9
- SV_POTION2_MIMIC_MANA_BALL       10
- SV_POTION2_MIMIC_FIRE_CLOUD      11
- SV_POTION2_MIMIC_COLD_CLOUD      12
- SV_POTION2_MIMIC_CHAOS_CLOUD     13
- SV_POTION2_CURE_LIGHT_SANITY     14
- SV_POTION2_CURE_SERIOUS_SANITY   15
- SV_POTION2_CURE_CRITICAL_SANITY  16
- SV_POTION2_CURE_SANITY           17
- SV_POTION2_CURE_WATER            18
-~~~~~80
-/* The "sval" codes for TV_FOOD */
- SV_FOOD_POISON                   0
- SV_FOOD_BLINDNESS                1
- SV_FOOD_PARANOIA                 2
- SV_FOOD_CONFUSION                3
- SV_FOOD_HALLUCINATION            4
- SV_FOOD_PARALYSIS                5
- SV_FOOD_WEAKNESS                 6
- SV_FOOD_SICKNESS                 7
- SV_FOOD_STUPIDITY                8
- SV_FOOD_NAIVETY                  9
- SV_FOOD_UNHEALTH                10
- SV_FOOD_DISEASE                 11
- SV_FOOD_CURE_POISON             12
- SV_FOOD_CURE_BLINDNESS          13
- SV_FOOD_CURE_PARANOIA           14
- SV_FOOD_CURE_CONFUSION          15
- SV_FOOD_CURE_SERIOUS            16
- SV_FOOD_RESTORE_STR             17
- SV_FOOD_RESTORE_CON             18
- SV_FOOD_RESTORING               19
- SV_FOOD_BISCUIT                 32
- SV_FOOD_JERKY                   33
- SV_FOOD_RATION                  35
- SV_FOOD_SLIME_MOLD              36
- SV_FOOD_WAYBREAD                37
- SV_FOOD_PINT_OF_ALE             38
- SV_FOOD_PINT_OF_WINE            39
- SV_FOOD_ATHELAS                 40
- SV_FOOD_GREAT_HEALTH            41
- SV_FOOD_FORTUNE_COOKIE          42
-~~~~~04
-/* The "sval" codes for TV_BATERIE */
- SV_BATERIE_POISON    1
- SV_BATERIE_EXPLOSION 2
- SV_BATERIE_TELEPORT  3
- SV_BATERIE_COLD      4
- SV_BATERIE_FIRE      5
- SV_BATERIE_ACID      6
- SV_BATERIE_LIFE      7
- SV_BATERIE_CONFUSION 8
- SV_BATERIE_LITE      9
- SV_BATERIE_CHAOS     10
- SV_BATERIE_TIME      11
- SV_BATERIE_MAGIC     12
- SV_BATERIE_XTRA_LIFE 13
- SV_BATERIE_DARKNESS  14
- SV_BATERIE_KNOWLEDGE 15
- SV_BATERIE_FORCE     16
- SV_BATERIE_LIGHTNING 17
- SV_BATERIE_MANA      18
- MAX_BATERIE_SVAL     18
-~~~~~09
-/* The "sval" codes for TV_CORPSE */
- SV_CORPSE_CORPSE     1
- SV_CORPSE_SKELETON   2
- SV_CORPSE_HEAD       3
- SV_CORPSE_SKULL      4
- SV_CORPSE_MEAT       5
-~~~~~115
-/* The "sval" codes for TV_DAEMON_BOOK */
- SV_DEMONBLADE  55
- SV_DEMONSHIELD 56
- SV_DEMONHORN   57
diff --git a/lib/mods/theme/help/dungeon.txt b/lib/mods/theme/help/dungeon.txt
index 21c9651e..20426e2a 100644
--- a/lib/mods/theme/help/dungeon.txt
+++ b/lib/mods/theme/help/dungeon.txt
@@ -98,7 +98,7 @@ something you are more comfortable with.
   ~   Lites, Tools, Chests, etc       )   A shield
   ~   Junk, Sticks, Skeletons, etc    `   Trapping kit, climbing set
   ~   Stone, random artifact          o   Egg
-  *   An essence                      &   (unused)
+                                      &   (unused)
 
 ~~~~~05|Monsters
 #####G                             Monsters
diff --git a/lib/mods/theme/help/essences.txt b/lib/mods/theme/help/essences.txt
deleted file mode 100644
index f329fa80..00000000
--- a/lib/mods/theme/help/essences.txt
+++ /dev/null
@@ -1,219 +0,0 @@
-|||||oy
-~~~~~01|Spoilers|Essences
-~~~~~02|Alchemist|Essence Spoiler
-#####REssence Spoiler for ToME 2.2.0
-#####R------------------------------
-
-Essences are the tools of the trade for Alchemists, and unfortunately are
-useless for any other class. Alchemists use essences to create magical
-items for them to use.
-
-They can be either found on the floor while exploring the dungeon, or
-extracted from other magical items the alchemist finds during his
-adventures.
-
-To create an artifact, the alchemist will first have to have learnt the 
-Artifact Creation ability. This ability costs 70 skill points (yes, 70, 
-it's a very powerful ability!). And you need an alchemy skill of at least 
-40, plus INT and WIS at 35 (thats 18/170 in non-linear form).
-To create the artifact, the alchemist will have to sacrifice 10 hit points,
-and an amount of magic essence similar to his skill in alchemy. The
-alchemist then allows the artifact to gain experience, and when it has
-enough, uses that experience to add abilities to the artifact. The
-alchemist can allow the artifact to continue to gain experience, thus
-keeping open the option to add more abilities later. This requires a
-similar amount of magic essence, but does not require the sacrifice of
-more hit points.
-
-Note that the experience you gain is divided among the artifacts that you
-have as well as going to yourself, so you will gain levels more slowly when
-empowering artifacts. Also, the artifact only gets 60% of the experience.
-So killing a creature worth 20xp would gain 10 for you, and 6 for the
-artifact.
-
-You can also modify existing artifacts when you attain skill level 50. Also
-at skill level 50 you will gain the ability to make temporary artifacts,
-which don't require the complex empowerments that regular items require,
-but also vanish after awhile.
-
-You cannot give an artifact an ability unless you have *Identified* an
-artifact which has that ability.
-
-For every four levels gained in the alchemy skill, the alchemist learns
-about objects of level (skill level)/4, starting by learning about level 1
-objects at skill level 0. (actually 1, but who's counting?)
-
-At skill level 5 you gain the ability to make ego items - but watch it!
-Your base failure rate will be 90%, and won't be 0% until you reach skill
-level 50. Adding gold will increase the chances of success in direct
-proportion to the value of the item you are trying to create. Note that
-this results in automatic success when the item you are trying to create
-happens to pick up a curse in the process.
-
-At skill level 5 you also gain knowledge of some basic ego item recipes.
-These are: Acidic, Shocking, Fiery, Frozen, Venomous, and Chaotic weapons,
-Resist Fire armour, and light sources of Fearlessness.
-
-At skill level 10 you will gain knowledge of digging ego items, if you have
-selected the option "always generate very unusual rooms" (ironman_rooms).
-
-At skill level 15 you can create ego wands, staves, rings, etc.
-
-At skill level 25 you gain the ability to empower double ego items.
-
-At skill level 50 you gain the ability to create temporary artifacts, which
-don't require any exotic ingredients beyond a single corpse of any type.
-
-Between skill levels 25 and 50, you will steadily gain the ability to set
-more and more flags.
-
-To finalise an artifact, you "P"ower it, and select the powers you want.
-Powers are divided into the following six categories:
-*****essences.txt*03[Stats, Sustains, Luck, Speed, Vision, etc.]
-*****essences.txt*04[Misc. (Auras, Light, See Invisibility, etc.)]
-*****essences.txt*05[Weapon Brands]
-*****essences.txt*06[Resistances and Immunities]
-*****essences.txt*07[ESP and Curses]
-*****essences.txt*08[Artifact Activations]
-
-~~~~~03
-#####GStats, Sustains, Luck, Speed, Vision, etc.
-lvl     xp   Power
-40     5000  Add to Strength          Ring of Strength
-43     5000  Add to Intelligence      Ring of Intelligence
-46     5000  Add to Wisdom            Amulet of Wisdom
-46     5000  Add to Dexterity         Ring of Dexterity
-42     5000  Add to Constitution      Ring of Constitution
-30     5000  Add to Charisma          Amulet of Adornment
-32     1000  Sustain Strength         Ring of Sustain Strength
-34     1000  Sustain Intelligence     Ring of Sustain Intelligence
-28     1000  Sustain Wisdom           Ring of Sustain Wisdom
-36     1000  Sustain Dexterity        Ring of Sustain Dexterity
-36     1000  Sustain Constitution     Ring of Sustain Constitution
-25     1000  Sustain Charisma         Ring of Sustain Charisma
-40    50000  Speed                    Ring of Speed
-38   150000  Extra Attacks            Ring of Extra Attacks
-32     5000  Stealthy                 Left Insole from a Used Soft Boot
-29     2000  Adds to Searching        Filthy Rag
- 6     1000  Helps Infravision        Brass Lantern
-30     1000  Lucky                    Rabbit's Left Forefoot
-25    30000  Aids in digging          Pick
-40    50000  Multiplies Life          Troll's Heart
-
-~~~~~04
-#####GMisc. (Auras, Light, See Invisibility, etc.)
-lvl     xp   Power
-20    15000  Invisibility             Potion of Invisibility
-20     4000  See Invisible            Potion of Invisibility
-20    30000  Free Action              Iron Spike
-38    90000  Reflection               Large Metal Shield
-20    30000  Aura of Fire             Lungs from an Ancient Red Dragon
-25    30000  Aura of Lightning        Lungs from an Ancient Blue Dragon
- 8     1000  Light                    Everburning Torch
-20    10000  Bright Light             Dwarven Lantern
-40   100000  Sunlight                 Feanorian Lamp
-40   200000  Flight                   Suit of Dragon Armour (any colour)
-50 10000000  Automatically IDs        Morgoth's Testicles
-29     2000  Anti-Teleportation       Teleport Inhibiting Amulet
-34     2000  Anti-Magic               Magic Inhibiting Amulet
-50   100000  Wraith Form              Potion of Invulnerability
-15     1000  Levitation               Potion of Berserk Strength
-20    10000  Slow Digestion           Lembas Wafer
-32    20000  Regenerate               Mushroom of Unhealth
-12    20000  Teleport                 Mushroom of Confusion
-
-~~~~~05
-#####GWeapon Brands
-lvl     xp   Power
-30    20000  Extra Critical Hits      Whip
-30    30000  Wounds Monsters          Blade of Chaos
-26     6000  Vampiric                 Rod Tip of Drain Life
-16     2000  Slay Animal              Dead Animal's Body
-25     2000  Slay Evil                Evil Dead Thing's Remains
-30     2000  Slay Undead              Remains of Undead Monster
-40     1500  Slay Demon               Demon's Corpse
-10      700  Slay Orc                 Dead Orc
-16      700  Slay Troll               Dead Troll
-25      900  Slay Giant               Dead Giant
-33     2000  Slay Dragon              Dead Dragon (any size will do)
-41     5000  *Slay* Dragon            Mature Multi-Hued Dragon's Remains
-41    90000  *Slay* Undead            Dead Summoner of Greater Undead
-41    90000  *Slay* Demon             Lesser Balrog's Corpse
-36    20000  Vorpal                   
-40    90000  Earthquakes              
- 3     2000  Poison Brand             
-12     2000  Acid Brand               
-10     2000  Lightning Brand          
- 6     2000  Fire Brand               
- 8     2000  Frost Brand              
-30     3000  Extra Might (Bows Only)  
-35     3000  Extra Shots (Bows Only)  
-
-~~~~~06
-#####GResistances and Immunities
-lvl     xp   Power
-49   500000  Immune to Acid           Ancient Black Dragon's Foreskin
-50   500000  Immune to Lightning      Ancient Blue Dragon's Foreskin
-49   500000  Immune to Fire           Ancient Red Dragon's Foreskin
-50   500000  Immune to Cold           Ancient White Dragon's Foreskin
-30    30000  Hold Life                Amulet of the Magi
-12    10000  Resist Acid              Ring of Acid
-15    10000  Resist Lightning         Ring of Lightning
-13    10000  Resist Fire              Potion of Resist Heat
-14    10000  Resist Cold              Potion of Resist Cold
-25    30000  Resist Poison            Potion of Cure Poison
-26    10000  Resist Fear              Ring of Fear Resistance
-31    60000  Resist Light             Ring of Light and Darkness Resistance
-31    60000  Resist Darkness          Ring of Light and Darkness Resistance
-30    30000  Resist Blindness         Ring of Blindness Resistance
-30    30000  Resist Confusion         Ring of Confusion Resistance
-30    60000  Resist Sound             Ring of Sound Resistance
-30    60000  Resist Shards            Ring of Shard Resistance
-30    60000  Resist Nether            Ring of Nether Resistance
-30    60000  Resist Nexus             Ring of Nexus Resistance
-30    60000  Resist Chaos             Ring of Chaos Resistance
-30    60000  Resist Disenchantment    Ring of Disenchantment Resistance
-
-~~~~~07
-#####GESP and Curses
-lvl     xp   Power
-50  -100000  Temporary Item           Corpse, any corpse
-10    -2000  Self-Cursing             Filthy Rag
-45   -10000  Causes the Black Breath  Sprig of Athelas
-40    -5000  Ancient Curse            Scroll of *Remove Curse*
-40    -5000  Drains your Experience   
-30    -5000  Aggravates Monsters      
-30     -500  Curse                    Scroll of Remove Curse
-50    -5000  Permanently Cursed       
-35    -2000  Can't be Dropped         
-45    -5000  Drains your Hit Points   
-20   -50000  Wielder Can't Move       
-40    20000  Telepathy                Formerly Floating Eye
-25     3000  Sense Orcs               
-25     3000  Sense Trolls             
-25     5000  Sense Dragons            
-25     5000  Sense Giants             
-25     5000  Sense Demons             
-25     5000  Sense Undead             
-25     5000  Sense Evil               
-25     5000  Sense Animals            
-25     5000  Sense Thunderlords       
-25     5000  Sense Good               
-25     5000  Sense Nonliving          
-25     5000  Sense Unique Monsters    
-25     2000  Sense Spiders            
-
-~~~~~08
-#####GArtifact Activations
-lvl     xp   Power
-40    40000  Sunlight                 Brass Lantern
-20     4000  Magic Missile (1)        
-30   300000  Magic Missile (2)        
-40   400000  Ball of Missiles         
-30   300000  Bolt of Lightning        
-30   300000  Ball of Lightning        
-35   350000  Ball of Lightning(2)     
-40   400000  Ball of Lightning(3)     
-40   400000  Ball of Lightning(4)     
-45   450000  Breath Lightning         
-50    40000  Fire a Rocket
diff --git a/lib/mods/theme/help/index.txt b/lib/mods/theme/help/index.txt
index c89a70b3..84bef517 100644
--- a/lib/mods/theme/help/index.txt
+++ b/lib/mods/theme/help/index.txt
@@ -56,7 +56,6 @@ Don't forget you can browse the help from the *****help.hlp*02[Main menu].
   *****automat.txt*03[Auto destroy]
   *****automat.txt*02[Auto pick-up]
   *****automat.txt*01[Automatizer]
-    *****defines.txt*82[Defines]
   *****automat.txt*04[Autosquelch]
   *****c_axemas.txt*01[Axemaster]
 ~~~~~66
@@ -117,7 +116,6 @@ Don't forget you can browse the help from the *****help.hlp*02[Main menu].
     *****c_pr_varda.txt*02[Priest - Varda]
     *****c_ranger.txt*02[Ranger]
     *****c_rogue.txt*02[Rogue]
-    *****c_runecr.txt*02[Runecrafter]
     *****c_sorcer.txt*02[Sorceror]
     *****c_sniper.txt*02[Sniper]
     *****birth.txt*77[Stat Bonuses]
@@ -173,9 +171,6 @@ Don't forget you can browse the help from the *****help.hlp*02[Main menu].
     *****debug.txt*100[Command List]
     *****debug.txt*111[Command descriptions ]
     *****debug.txt*112[General]
-  *****defines.txt*81[Defines]
-    *****defines.txt*84[Svals]
-    *****defines.txt*85[Tvals]
   *****r_demon.txt*01[Demon]
     *****rm_adanrog.txt*01[Adanrog]
     *****rm_aewrog.txt*01[Aewrog]
@@ -451,9 +446,6 @@ Don't forget you can browse the help from the *****help.hlp*02[Main menu].
   *****c_ranger.txt*01[Ranger]
   *****c_rogue.txt*01[Rogue]
   *****r_rohank.txt*01[RohanKnight]
-  *****c_runecr.txt*01[Runecrafter]
-    *****c_runecr.txt*03[Runecrafter powers]
-  *****tome_faq.txt*11[Runes]
 ~~~~~83
 *****/Sindex.txt*83[S]
   *****command.txt*125[Saving and Exiting]
@@ -520,8 +512,6 @@ Don't forget you can browse the help from the *****help.hlp*02[Main menu].
     *****skills.txt*45[Possession]
     *****c_posses.txt*04[Possession - Possessor powers ]
     *****skills.txt*39[Prayer]
-    *****skills.txt*36[Runecraft]
-    *****c_runecr.txt*04[Runecrafting - Runecrafter powers]
     *****skills.txt*56[Screen]
     *****skills.txt*09[Sling-mastery]
     *****skills.txt*14[Sneakiness]
@@ -576,7 +566,6 @@ Don't forget you can browse the help from the *****help.hlp*02[Main menu].
   *****birth.txt*34[Strength]
   *****c_summon.txt*01[Summoners]
     *****c_summon.txt*03[Summoning]
-  *****defines.txt*12[Svals]
   *****c_swordm.txt*01[Swordmasters]
   *****c_symbia.txt*01[Symbiant]
     *****c_symbia.txt*03[Naming your symbiote]
@@ -599,7 +588,6 @@ Don't forget you can browse the help from the *****help.hlp*02[Main menu].
   *****g_tulkas.txt*01[Tulkas]
     *****c_palad.txt*03[Paladin]
     *****g_tulkas.txt*03[Prayers]
-  *****defines.txt*83[Tvals]
 ~~~~~85
 *****/Uindex.txt*85[U]
   *****m_udun.txt*02[Udun Magic]
diff --git a/lib/mods/theme/help/lua.hlp b/lib/mods/theme/help/lua.hlp
deleted file mode 100644
index ba61676a..00000000
--- a/lib/mods/theme/help/lua.hlp
+++ /dev/null
@@ -1,34 +0,0 @@
-|||||oy
-~~~~~01|Help|Lua scripting for ToME
-#####R     Welcome to the ToME Lua Help System.
-#####R=============================================
-
-Please choose one of the following help files:
-
-     *****/alua_intr.txt*0[(a) An Introduction to scripting]
-     *****/blua_pow.txt*0[(b) Adding a racial power (the 'U' menu)]
-     *****/clua_skil.txt*0[(c) Adding new skills (the 'm' menu)]
-     *****/dlua_ques.txt*0[(d) Adding a quest]
-
-     
-     *****/elua_mon.txt*0[(e) Useful functions in monster.pkg]
-     *****/flua_play.txt*0[(f) Useful functions in player.pkg]
-     *****/glua_spel.txt*0[(g) Useful functions in spell.pkg]
-     *****/hlua_util.txt*0[(h) Useful functions in util.pkg]
-
-     *****/ilua_gf.txt*0[(g) A list of GF_FOO flags]
-
-
-     *****/zhelp.hlp*0[(z) Main Help menu]
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/mods/theme/help/lua_gf.txt b/lib/mods/theme/help/lua_gf.txt
deleted file mode 100644
index 000f4af5..00000000
--- a/lib/mods/theme/help/lua_gf.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-|||||oy
-#####R /--------------------------\
-#####R< A partial list of GF_FLAGS >
-#####R \--------------------------/
-
-GF_ARROW:       arrows 
-GF_MISSILE:     magic missiles
-GF_MANA:        mana
-GF_LITE_WEAK:   light
-GF_DARK_WEAK:   dark
-GF_WATER:       water
-GF_PLASMA:      plasma
-GF_METEOR:      meteors
-GF_ICE:         ice
-GF_GRAVITY:     gravity
-GF_INERTIA:     inertia
-GF_FORCE:       force
-GF_TIME:        pure time
-GF_ACID:        acid
-GF_ELEC:        lightning
-GF_FIRE:        flames
-GF_COLD:        cold
-GF_POIS:        poison
-GF_LITE:        pure light
-GF_DARK:        pure dark
-GF_CONFUSION:   confusion
-GF_SOUND:       sound
-GF_SHARDS:      shards
-GF_NEXUS:       nexus
-GF_NETHER:      nether
-GF_CHAOS:       chaos
-GF_DISENCHANT:  disenchantment
-GF_KILL_WALL:   wall destruction
-GF_KILL_DOOR:   door destruction
-GF_KILL_TRAP:   trap destruction
-GF_STONE_WALL:  wall creation
-GF_MAKE_DOOR:   door creation
-GF_MAKE_TRAP:   trap creation
-GF_DESTRUCTION: destruction
-
-Back to the *****lua.hlp*0[lua help index] .
-
-                             [[[[[gThis file by fearoffours (fearoffours@moppy.co.uk)]
-
-
diff --git a/lib/mods/theme/help/lua_intr.txt b/lib/mods/theme/help/lua_intr.txt
deleted file mode 100644
index ccb87067..00000000
--- a/lib/mods/theme/help/lua_intr.txt
+++ /dev/null
@@ -1,133 +0,0 @@
-|||||oy
-#####R             /----------------------------------------\
-#####R            <        Scripting for ToME with lua       >
-#####R             \----------------------------------------/
-
-So, you want to patch ToME eh? Maybe you've had a look at how the edit files 
-work, maybe even added your own race/class, but want to go further and add 
-new racial (U) or magic (m) powers. Well these help files will show a little 
-bit of how to do that.
-
-I am not a master at this kind of thing. I wrote a small script, with much 
-help from DarkGod, and he subsequently asked me to write these help files. I 
-was looking forward to when the lua help files came out so that I could look 
-at them myself. Little did I know I'd be asked to write them. Therefore I 
-apologise for any inaccuracies or errors that you find, and if you care to let 
-me know of any improvements which could be made (especially if you're an 
-experienced programmer/scripter), I'd love to know. Email me at
-[[[[[gfearoffours@moppy.co.uk].
-
-#####R=== The example scripts ===
-
-These help files take the form of a tutorial, adding a line at a time to a 
-script, and explaining important concepts along the way. To see it all in 
-action, I strongly suggest that you download my example script pack from
-[[[[[Ghttp://www.moppy.co.uk/angband.htm]. As well as including all the 
-scripts covered in these help files, they also include the addition of my
-"hina" race which has a Lua scripted racial power which you might like to look 
-at. There's also a quest which I will be including documentation for as a 
-tutorial soon. Plus there's all the other lua scripts in the lib\scpt 
-directory to look at. Most of what you see in these files has been learned from 
-those files anyway!
-
-The source code is invaluable as well. There's a searchable and browsable 
-version of the latest ToME source code available online at 
-[[[[[Ghttp://www.t-o-m-e.net/cvs.php]. Use it!
-
-If you don't want to download and install the example scripts, then just 
-follow the tutorials with a text editor open! But I'll say it again, it's a lot 
-easier if you download and install the example scripts.
-
-This file goes on to explain the concepts of scripting, programming, 
-variables and functions. If you're familiar with these concepts, you might 
-as well take a look at how to add a power to the U menu in the 
-*****lua_pow.txt*0[Scripting a racial power] file.
-
-
-#####R=== Defining some basic stuff ===
-
-Computers don't do anything that they're not told to do. When we script, or 
-program, we must assume they know nothing. We have to tell them each little 
-bit of information from the ground up.
-
-A program, or a script (we'll talk about exact differences later) is like a 
-set of instructions. Let's imagine that people responded to programs, and 
-that we had a program called "Housework". Its series of instructions might 
-look something like this:
-
-#####BDo the Washing up.
-#####BClean the kitchen.
-#####BDust the shelves.
-#####BHoover the lounge.
-
-Each step above could be called a function, as they are all actions that 
-need to be carried out. Now to you and me, we'd understand that program just 
-fine, but if someone didn't know HOW to wash, or what hoovering was, they'd 
-soon run into problems. For those people we'd need to define each function 
-clearly. Thus "do the washing up" might be - 
-
-#####BRun hot water into bowl.
-#####BAdd washing up liquid.
-#####BPut dirty plates into bowl
-#####BScrub plates till clean
-#####BPlace clean plates on rack to dry,
-
-There's still plenty of problems here though. We've not said to turn the tap
-off, or what the bowl is, or to wash any dirty cutlery, mugs, saucepans, etc.,
-etc. Whilst this might seem fairly obvious to a person, this is how we need
-to think when writing programs for computers.
-
-Lets look now at some of the terms we're going to be using, in the rest of 
-these help files, and what they mean...
-
-#####R=== Variables and Constants ===
-A variable is a way to store information in a computer.  Just as you store 
-things in your own memory, you can store things in the computer's memory. And 
-just as things change in your memory, so things can change in the computer's 
-memory. This factor of change is why they're called "variables" and not 
-"statics".
-
-For instance, you may have a friend's email address committed to memory, but 
-things change over time, they get a new ISP or domain, and so their email 
-address changes. You commit this new address to memory, and eventually 
-forget the old one. The thing you have stored in your memory is the same 
-(your friend's address) but the value (property) of what you have stored has 
-changed (from friend@old-address.com to friend@new-address.com). 
-
-Variables are the building blocks out of which you will create your patch.
-
-A variable which will *never* change its value is called a constant.
-
-#####R===Functions===
-
-A function is a series of steps or statements, grouped together and given 
-one name. When you want to carry out those steps, you simply ask the 
-computer to carry out that function. To go back to our original example, 
-rather than saying, "I'd like you to run some hot water into a bowl, add the 
-washing up liquid, put the dirty plates into it, and then scrub them till 
-they're clean", we just say "do the washing up".
-
-This is where we come to the difference between scripting and programming. 
-With scripting we can use the functions and variables that exist in the 
-ToME code. Maintainers like DarkGod have already made sure that the 
-computer knows how to "do the washing up", including turning the tap off and 
-what the bowl is. All we need to do in our script is say "do the washing 
-up". Or to look at it in a more relevant way, the game has been coded so 
-that when a magic missile is fired, a bolt or beam spell with a black line 
-of asterisks will be drawn in the direction indicated by the player, the 
-mana of that spell will be used up, the monster will take the appropriate 
-amount of damage, and so on. All we need to do in our script is say "fire a 
-magic missile".
-
-As you script, you will still be designing your own functions, and 
-variables, but the hardest parts have been done for you!
-
-Not every function and global variable in the source-code has been exported to 
-use in your scripting. But the ones that have are easily identifiable by 
-looking in any source files with the extension .pkg . Chris Hadgis has written 
-some excellent documentation which outline the use of the most important 
-functions in some of these files. They outline the functions from the 
-
-OK, the first tutorial proper is on *****lua_pow.txt*0[adding a racial power] .
-
-                             [[[[[gThis file by fearoffours (fearoffours@moppy.co.uk)]
diff --git a/lib/mods/theme/help/lua_mon.txt b/lib/mods/theme/help/lua_mon.txt
deleted file mode 100644
index 9bb363c0..00000000
--- a/lib/mods/theme/help/lua_mon.txt
+++ /dev/null
@@ -1,535 +0,0 @@
-|||||oy
-
-#####R             /----------------------------------------\
-#####R            <    monster.pkg functions helper file     >
-#####R             \----------------------------------------/
-
-
-----------------------------------------------------------------------
-
-#####R=== race_info_idx ===
-
-#####GDeclaration
-    extern monster_race* race_info_idx(int r_idx, int ego);
-
-#####GFile
-    monster2.c
-
-#####GComment
-/*
- * Return a (monster_race*) with the combinations of the monster
- * properties and the ego type
- */
-
-#####GDescription
-Get monster info and ego info for monster with monster index "r_idx"
-and monster ego "ego". The ego information is applied to the monster
-information and the new monster information is returned.
-
-For example, race_info_idx(141,7) will create a brown yeek (monster)
-shaman (ego).
-
-#####GParameters
-> "r_idx" is an entry from the "r_info.txt" file. Beware: there is no
-  range checking.
-> "ego" is an entry from the "re_info.txt". Beware: there is no range
-  checking.
-
-----------------------------------------------------------------------
-
-#####R=== delete_monster_idx ===
-
-#####GDeclaration
-    extern void delete_monster_idx(int i);
-
-#####GFile
-    monster2.c
-
-#####GComment
-/*
- * Delete a monster by index.
- *
- * When a monster is deleted, all of its objects are deleted.
- */
-
-#####GDescription
-Delete monster "i" from the monster array.
-
-#####GParameters
-> "i" is the index for the monster list (m_list[]). Beware: there is
-  no range checking.
-
-----------------------------------------------------------------------
-
-#####R=== m_pop ===
-
-#####GDeclaration
-    extern s16b m_pop(void);
-
-#####GFile
-    monsters2.c
-
-#####GComment
-/*
- * Acquires and returns the index of a "free" monster.
- *
- * This routine should almost never fail, but it *can* happen.
- */
-
-#####GDescription
-Get an empty slot in the monster list (m_list[]). If there are no
-empty slots, a slot will be reclaimed from a "dead" monster. If all
-slots are full, 0 is returned, which means the function has failed
-("Too many monsters!").
-
-----------------------------------------------------------------------
-
-#####R=== get_mon_num_prep ===
-
-#####GDeclaration
-    extern errr get_mon_num_prep(void);
-
-#####GFile
-    monster2.c
-
-#####GComment
-/*
- * Apply a "monster restriction function" to the "monster allocation table"
- */
-
-#####GDescription
-There are no parameters, but there are some other variables which will
-need to be set. They are get_mon_num_hook and get_mon_num2_hook. They
-are pointers to functions.
-
-For example, get_mon_num_hook = monster_volcano means when
-get_mon_num_hook is called (*get_mon_num_hook)(index), the actual
-function called is monster_volcano(index). This particular function
-returns TRUE if the monster indicated by "index" has the
-RF8_WILD_VOLCANO flag set.
-
-It is a good idea to store the old value of get_mon_num_hook before
-setting a new one, and restoring it when your function is finished.
-
-Following is a list of functions which can be assigned to
-get_mon_num_hook:
-
-create_molds_hook
-create_townpeople_hook
-mon_hook_bounty
-monster_dungeon
-monster_grass
-monster_mountain
-monster_ocean
-monster_quest
-monster_shore
-monster_town
-monster_volcano
-monster_waste
-monster_wood
-mutate_monster_okay
-place_monster_okay
-summon_specific_okay
-vault_aux_animal
-vault_aux_chapel
-vault_aux_clone
-vault_aux_demon
-vault_aux_dragon
-vault_aux_giant
-vault_aux_jelly
-vault_aux_kennel
-vault_aux_orc
-vault_aux_symbol
-vault_aux_treasure
-vault_aux_troll
-vault_aux_undead
-
-Or you can write your own. The function must take an integer (index)
-as a parameter and return boolean (TRUE if the monster is selected,
-or FALSE if it is not).
-
-----------------------------------------------------------------------
-
-#####R=== get_mon_num ===
-
-#####GDeclaration
-    extern s16b get_mon_num(int level);
-
-#####GFile
-    monster2.c
-
-#####GComment
-/*
- * Choose a monster race that seems "appropriate" to the given level
- *
- * This function uses the "prob2" field of the "monster allocation table",
- * and various local information, to calculate the "prob3" field of the
- * same table, which is then used to choose an "appropriate" monster, in
- * a relatively efficient manner.
- *
- * Note that "town" monsters will *only* be created in the town, and
- * "normal" monsters will *never* be created in the town, unless the
- * "level" is "modified", for example, by polymorph or summoning.
- *
- * There is a small chance (1/50) of "boosting" the given depth by
- * a small amount (up to four levels), except in the town.
- *
- * It is (slightly) more likely to acquire a monster of the given level
- * than one of a lower level.  This is done by choosing several monsters
- * appropriate to the given level and keeping the "hardest" one.
- *
- * Note that if no monsters are "appropriate", then this function will
- * fail, and return zero, but this should *almost* never happen.
- */
-
-Description:
-For the given level "level", return the index of an appropriate
-monster race.
-
-#####GParameters
-> "level" is a dungeon level
-
-----------------------------------------------------------------------
-
-#####R=== monster_desc ===
-
-#####GDeclaration
-    extern void monster_desc(char *desc, monster_type *m_ptr,
-    int mode);
-
-#####GFile
-    monster2.c
-
-#####GComment
-/*
- * Build a string describing a monster in some way.
- *
- * We can correctly describe monsters based on their visibility.
- * We can force all monsters to be treated as visible or invisible.
- * We can build nominatives, objectives, possessives, or reflexives.
- * We can selectively pronominalize hidden, visible, or all monsters.
- * We can use definite or indefinite descriptions for hidden monsters.
- * We can use definite or indefinite descriptions for visible monsters.
- *
- * Pronominalization involves the gender whenever possible and allowed,
- * so that by cleverly requesting pronominalization / visibility, you
- * can get messages like "You hit someone.  She screams in agony!".
- *
- * Reflexives are acquired by requesting Objective plus Possessive.
- *
- * If no m_ptr arg is given (?), the monster is assumed to be hidden,
- * unless the "Assume Visible" mode is requested.
- *
- * If no r_ptr arg is given, it is extracted from m_ptr and r_info
- * If neither m_ptr nor r_ptr is given, the monster is assumed to
- * be neuter, singular, and hidden (unless "Assume Visible" is set),
- * in which case you may be in trouble... :-)
- *
- * I am assuming that no monster name is more than 70 characters long,
- * so that "char desc[80];" is sufficiently large for any result.
- *
- * Mode Flags:
- *   0x01 --> Objective (or Reflexive)
- *   0x02 --> Possessive (or Reflexive)
- *   0x04 --> Use indefinites for hidden monsters ("something")
- *   0x08 --> Use indefinites for visible monsters ("a kobold")
- *   0x10 --> Pronominalize hidden monsters
- *   0x20 --> Pronominalize visible monsters
- *   0x40 --> Assume the monster is hidden
- *   0x80 --> Assume the monster is visible
- *
- * Useful Modes:
- *   0x00 --> Full nominative name ("the kobold") or "it"
- *   0x04 --> Full nominative name ("the kobold") or "something"
- *   0x80 --> Genocide resistance name ("the kobold")
- *   0x88 --> Killing name ("a kobold")
- *   0x22 --> Possessive, genderized if visible ("his") or "its"
- *   0x23 --> Reflexive, genderized if visible ("himself") or "itself"
- */
-
-#####GDescription
-Return a monster description "desc" for monster "monster_type" using
-flag "mode". The modes are described above.
-
-#####GParameters
-> "desc" is the returned description.
-> "monster type" is the monster (monster pointer).
-> "mode" is one of the modes described in the comments.
-
-----------------------------------------------------------------------
-
-#####R=== monster_race_desc ===
-
-#####GDeclaration
-    extern void monster_race_desc(char *desc, int r_idx,
-    int ego);
-
-#####GFile
-    monster2.c
-
-#####GComment
-(none)
-
-#####GDescription
-Return the monster description "desc" for monster with monster index
-"r_idx" and monster ego "ego". The monster description is made up of
-the ego name (if any) and monster name, or the unique name.
-
-#####GParameters
-> "desc" is the returned description.
-> "r_idx" is an entry from the "r_info.txt" file. Beware: there is no
-  range checking.
-> "ego" is an entry from the "re_info.txt". Beware: there is no range
-  checking.
-
-----------------------------------------------------------------------
-
-#####R=== place_monster_aux ===
-
-#####GDeclaration
-    extern bool place_monster_aux(int y, int x, int r_idx,
-    bool slp, bool grp, int status);
-
-#####GFile
-    monster2.c
-
-#####GComment
-/*
- * Attempt to place a monster of the given race at the given location
- *
- * Note that certain monsters are now marked as requiring "friends".
- * These monsters, if successfully placed, and if the "grp" parameter
- * is TRUE, will be surrounded by a "group" of identical monsters.
- *
- * Note that certain monsters are now marked as requiring an "escort",
- * which is a collection of monsters with similar "race" but lower
- * level.
- *
- * Some monsters induce a fake "group" flag on their escorts.
- *
- * Note the "bizarre" use of non-recursion to prevent annoying output
- * when running a code profiler.
- *
- * Note the use of the new "monster allocation table" code to restrict
- * the "get_mon_num()" function to "legal" escort types.
- */
-
-#####GDescription
-Attempt to place a monster at grid "y", "x". The monster has monster
-index "m_idx". The monster may be asleep ("slp"). The monster may be
-surrounded by a group of identical monsters ("grp"). The monster has
-a status of "status" (see below). The function returns TRUE if the
-monster is placed successfully, otherwise FALSE.
-
-#####GParameters
-> "y" is the y co-ordinate of the target grid.
-> "x" is the x co-ordinate of the target grid.
-> "r_idx" is an entry from the "r_info.txt" file. Beware: there is no
-  range checking.
-> "slp" is TRUE if the monster is asleep, otherwise FALSE.
-> "grp" is TRUE if the monster is surrounded by a group, otherwise
-  FALSE.
-> "status" is the status of the monster
-  *****fields.txt*0[status]
-
-----------------------------------------------------------------------
-
-#####R=== place_monster ===
-
-#####GDeclaration
-    extern bool place_monster(int y, int x, bool slp,
-    bool grp);
-
-#####GFile
-    monster2.c
-
-#####GComment
-/*
- * Hack -- attempt to place a monster at the given location
- *
- * Attempt to find a monster appropriate to the "monster_level"
- */
-
-#####GDescription
-Attempt to place a monster at grid "y", "x". The monster may be asleep
-("slp"). The monster may be surrounded by a group of identical
-monsters ("grp"). The monster is of the appropriate monster level. The
-function returns TRUE if the monster is placed successfully, otherwise
-FALSE.
-
-#####GParameters
-> "y" is the y co-ordinate of the target grid.
-> "x" is the x co-ordinate of the target grid.
-> "slp" is TRUE if the monster is asleep, otherwise FALSE.
-> "grp" is TRUE if the monster is surrounded by a group, otherwise
-  FALSE.
-
-----------------------------------------------------------------------
-
-#####R=== place_monster_one ===
-
-#####GDeclaration
-    extern s16b place_monster_one(int y, int x, int r_idx,
-    int ego, bool slp, int status);
-
-#####GFile
-    monster2.c
-
-#####GComment
-/*
- * Attempt to place a monster of the given race at the given location.
- *
- * To give the player a sporting chance, any monster that appears in
- * line-of-sight and is extremely dangerous can be marked as
- * "FORCE_SLEEP", which will cause them to be placed with low energy,
- * which often (but not always) lets the player move before they do.
- *
- * This routine refuses to place out-of-depth "FORCE_DEPTH" monsters.
- *
- * XXX XXX XXX Use special "here" and "dead" flags for unique monsters,
- * remove old "cur_num" and "max_num" fields.
- *
- * XXX XXX XXX Actually, do something similar for artifacts, to simplify
- * the "preserve" mode, and to make the "what artifacts" flag more useful.
- *
- * This is the only function which may place a monster in the dungeon,
- * except for the savefile loading code.
- */
-
-#####GDescription
-Attempt to place a monster at grid "y", "x". The monster has monster
-index "m_idx". The monster may be asleep ("slp"). The monster may have
-an ego type ("ego"). The monster has a status of "status" (see below).
-The function returns TRUE if the monster is placed successfully,
-otherwise FALSE.
-
-#####GParameters
-> "y" is the y co-ordinate of the target grid.
-> "x" is the x co-ordinate of the target grid.
-> "r_idx" is an entry from the "r_info.txt" file. Beware: there is no
-  range checking.
-> "slp" is TRUE if the monster is asleep, otherwise FALSE.
-> "ego" is an entry from the "re_info.txt". Beware: there is no range
-  checking.
-> "status" is the status of the monster
-  *****fields.txt*0[status]
-
-----------------------------------------------------------------------
-
-#####R=== is_friend ===
-
-#####GDeclaration
-    extern int is_friend(monster_type *m_ptr);
-
-#####GFile
-    monster3.c
-
-#####GComment
-/*
- * Is the monster in friendly state(pet, friend, ..)
- * -1 = enemy, 0 = neutral, 1 = friend
- */
-
-#####GDescription
-Return a value to indicate the status of monster "m_ptr".
-  *****fields.txt*0[status]
-
-#####GParameters
-> "m_ptr" is a pointer to a monster.
-
-----------------------------------------------------------------------
-
-#####R=== is_enemy ===
-
-#####GDeclaration
-    extern bool is_enemy(monster_type *m_ptr,
-    monster_type *t_ptr);
-
-#####GFile
-    monster3.c
-
-#####GComment
-/* Should they attack each others */
-
-#####GDescription
-Return TRUE if monster "m_ptr" should attack monster "t_ptr". If
-"m_ptr" is stupid and "r_ptr" is a different type of monster then the
-function will return TRUE. If "m_ptr" is not neutral and "r_ptr" is a
-breeder, and "r_ptr" is a different type of monster then the function
-will return TRUE (and vice versa). If both monsters are not neutral
-and one is friendly and the other isn't then the function will return
-TRUE. Otherwise the function returns FALSE.
-
-#####GParameters
-> "m_ptr" is a pointer to a monster.
-> "t_ptr" is a pointer to a monster (target).
-
-----------------------------------------------------------------------
-
-#####R=== change_side ===
-
-#####GDeclaration
-    extern bool change_side(monster_type *m_ptr);
-
-#####GFile
-    monster3.c
-
-#####GComment
-(none)
-
-#####GDescription
-Change the status of monster "m_ptr" from friendly to unfriendly and
-vice versa. Friends and pets become enemies. Neutral Ms become
-neutral Ps and vice versa. Companions are unaffected. The
-function returns TRUE if the status changed, otherwise FALSE.
-
-#####GParameters
-> "m_ptr" is a pointer to a monster.
-
-----------------------------------------------------------------------
-
-#####R=== find_position ===
-
-#####GDeclaration
-    extern void find_position(int y, int x, int *yy = 0,
-    int *xx = 0);
-
-#####GFile
-    lua_bind.c
-
-#####GComment
-(none)
-
-#####GDescription
-Find a new grid "yy", "xx" within 6 grids of target grid "y", "x".
-The new grid must be within line-of-sight of the target grid. A
-maximum of 5000 attempts is made.
-
-#####GParameters
-> "y" is the y co-ordinate of the target grid.
-> "x" is the x co-ordinate of the target grid.
-> "yy" is the y co-ordinate of the new grid.
-> "xx" is the x co-ordinate of the new grid.
-
-----------------------------------------------------------------------
-
-#####R=== can_create_companion ===
-
-#####GDeclaration
-    extern bool can_create_companion();
-
-#####GFile
-    monster3.c
-
-#####GComment
-/* Returns if a new companion is allowed */
-
-#####GDescription
-Return TRUE if a companion can be created, otherwise FALSE.
-
-----------------------------------------------------------------------
-
-Back to the *****lua.hlp*0[lua help index] .
-
-
-                                                     [[[[[gThis file by Chris Hadgis]
diff --git a/lib/mods/theme/help/lua_play.txt b/lib/mods/theme/help/lua_play.txt
deleted file mode 100644
index 6ab64ddb..00000000
--- a/lib/mods/theme/help/lua_play.txt
+++ /dev/null
@@ -1,1225 +0,0 @@
-|||||oy
-
-#####R             /----------------------------------------\
-#####R            <     player.pkg functions helper file     >
-#####R             \----------------------------------------/
-
-----------------------------------------------------------------------
-
-#####RFunction: set_parasite
-
-#####GDeclaration: bool set_parasite(int v, int r);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->parasite" and "p_ptr->parasite_r_idx"
-* notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until parasite with monster index "r" is created. The
-player gets the message "You feel something growing in you" if "v"
-is > 0. Otherwise the player gets the message "Your body convulse
-and spawn <monster name>" if the monster is created (80% chance) or
-"The hideous thing growing in you seems to die" if the monster dies.
-
-#####GParameters:
->v is the time until the parasite gestates (must be between 0 and
-  10000).
->r is the monster index of parasite to be created.
-
-----------------------------------------------------------------------
-
-#####RFunction: set_disrupt_shield
-
-#####GDeclaration: bool set_disrupt_shield(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->disrupt_shield"
-* notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until shield of invulnerability expires. The player gets
-the message "You feel invulnerable" if "v" is > 0. Otherwise the
-player gets the message "You are more vulnerable".
-
-#####GParameters:
->v is the time until the shield expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_prob_travel
-
-#####GDeclaration: bool set_prob_travel(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->prob_travel"
-* notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until random teleportation expires. The player gets
-the message "You feel instable" if "v" is > 0. Otherwise the
-player gets the message "You are more stable".
-
-#####GParameters:
->v is the time until random teleportation expires (must be between 0
-  and 10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_tim_deadly
-
-#####GDeclaration: bool set_tim_deadly(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->tim_deadly"
-*/
-
-#####GDescription:
-Set time "v" until deadly accuracy expires. The player gets the
-message "You feel extremely accurate" if "v" is > 0. Otherwise the
-player gets the message "You are suddenly much less accurate".
-
-#####GParameters:
->v is the time until deadly accuracy expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_tim_res_time
-
-#####GDeclaration: bool set_tim_res_time(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->tim_res_time"
-*/
-
-#####GDescription:
-Set time "v" until space-time distortions expire. The player gets the
-message "You are now protected against the space-time distortions" if
-"v" is > 0. Otherwise the player gets the message "You are no longer
-protected against the space-time distortions".
-
-#####GParameters:
->v is the time until space-time distortions expire (must be between
-  0 and 10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_tim_reflect
-
-#####GDeclaration: bool set_tim_reflect(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->tim_reflect"
-*/
-
-#####GDescription:
-Set time "v" until reflection expire. The player gets the message
-"You start reflecting the world around you" if "v" is > 0. Otherwise
-the player gets the message "You stop reflecting".
-
-#####GParameters:
->v is the time until reflection expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_meditation
-
-#####GDeclaration: bool set_meditation(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->meditation"
-*/
-
-#####GDescription:
-Set time "v" until meditation expire. The player gets the message
-"You start meditating on yourself" if "v" is > 0. Otherwise the
-player gets the message "You stop your self meditation".
-
-#####GParameters:
->v is the time until meditation expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_strike
-
-#####GDeclaration: bool set_strike(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->strike"
-*/
-
-#####GDescription:
-Set time "v" until accurate strikes expire. The player gets the
-message "You feel very accurate" if "v" is > 0. Otherwise the player
-gets the message "You are no longer very accurate".
-
-#####GParameters:
->v is the time until accurate strikes expire (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_walk_water
-
-#####GDeclaration: bool set_walk_water(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->walk_water", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until walking on water expires. The player gets the
-message "You feel strangely insubmersible" if "v" is > 0. Otherwise
-the player gets the message "You are no longer insubmersible".
-
-#####GParameters:
->v is the time until walking on water expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_tim_ffall
-
-#####GDeclaration: bool set_tim_ffall(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->tim_ffall"
-*/
-
-#####GDescription:
-Set time "v" until feather-fall expires. The player gets the message
-"You feel very light" if "v" is > 0. Otherwise the player gets the
-message "You are suddenly heavier".
-
-#####GParameters:
->v is the time until feather-fall expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_tim_fire_aura
-
-#####GDeclaration: bool set_tim_fire_aura(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->tim_fire_aura"
-*/
-
-#####GDescription:
-Set time "v" until fiery aura expires. The player gets the message
-"You are enveloped in flames" if "v" is > 0. Otherwise the player
-gets the message "You are no longer enveloped in flames".
-
-#####GParameters:
->v is the time until fiery aura expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_holy
-
-#####GDeclaration: bool set_holy(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->holy", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until holiness expires. The player gets the message
-"You feel a holy aura around you" if "v" is > 0. Otherwise the
-player gets the message "The holy aura vanishes".
-
-#####GParameters:
->v is the time until holiness expires (must be between 0 and 10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_grace
-
-#####GDeclaration: void set_grace(s32b v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->grace", notice observable changes
-*/
-
-#####GDescription:
-Set grace to value "v". Don't allow grace to fall below -30000 or
-rise above 30000.
-
-#####GParameters:
->v is the value of grace.
-
-----------------------------------------------------------------------
-
-#####RFunction: set_mimic
-
-#####GDeclaration: bool set_mimic(int v, int p);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->tim_mimic", and "p_ptr->mimic_form",
-* notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until morph into monster with monster index "p" expires.
-The player gets the message "You feel your body change" if "v" is > 0.
-Otherwise the player gets the message "You are no longer transformed".
-
-#####GParameters:
->v is the time until transformation expires (must be between 0 and
-  10000).
->p is the monster index of the monster the player wants to mimic.
-
-----------------------------------------------------------------------
-
-#####RFunction: set_no_breeders
-
-#####GDeclaration: bool set_no_breeders(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "no_breeds"
-*/
-
-#####GDescription:
-Set time "v" until breeders can breed again. The player gets the
-message "You feel an anti-sexual aura" if "v" is > 0. Otherwise the
-player gets the message "You no longer feel an anti-sexual aura".
-Okay...
-
-#####GParameters:
->v is the time until breeders can breed again (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_invis
-
-#####GDeclaration: bool set_invis(int v,int p);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->tim_invis", and "p_ptr->tim_inv_pow",
-* notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until invisibility expires. The player gets the message
-"You feel your body fade away" if "v" is > 0. Otherwise the player
-gets the message "You are no longer invisible".
-
-#####GParameters:
->v is the time until invisibility expires (must be between 0 and
-  10000).
->p is the power of timed invisibility.
-
-----------------------------------------------------------------------
-
-#####RFunction: set_lite
-
-#####GDeclaration: bool set_lite(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->tim_lite", notice observable changes
-*
-* Note the use of "PU_VIEW", which is needed to
-* memorise any terrain features which suddenly become "visible".
-* Note that blindness is currently the only thing which can affect
-* "player_can_see_bold()".
-*/
-
-#####GDescription:
-Set time "v" until brightness expires. The player gets the message
-"You suddenly seem brighter" if "v" is > 0. Otherwise the player
-gets the message "You are no longer bright".
-
-#####GParameters:
->v is the time until brightness expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_blind
-
-#####GDeclaration: bool set_blind(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->blind", notice observable changes
-*
-* Note the use of "PU_UN_VIEW", which is needed to memorise any terrain
-* features which suddenly become "visible".
-* Note that blindness is currently the only thing which can affect
-* "player_can_see_bold()".
-*/
-
-#####GDescription:
-Set time "v" until blindness expires. The player gets the message "You
-are blind" if "v" is > 0. Otherwise the player gets the message "You
-can see again".
-
-#####GParameters:
->v is the time until blindness expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_confused
-
-#####GDeclaration: bool set_confused(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->confused", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until confusion expires. The player gets the message "You
-are confused" if "v" is > 0. Otherwise the player gets the message
-"You feel less confused now".
-
-#####GParameters:
->v is the time until confusion expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_poisoned
-
-#####GDeclaration: bool set_poisoned(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->poisoned", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until poison expires. The player gets the message "You
-are poisoned" if "v" is > 0. Otherwise the player gets the message
-"You are no longer poisoned".
-
-#####GParameters:
->v is the time until poison expires (must be between 0 and 10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_afraid
-
-#####GDeclaration: bool set_afraid(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->afraid", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until fear expires. The player gets the message "You are
-terrified" if "v" is > 0. Otherwise the player gets the message "You
-feel bolder now".
-
-#####GParameters:
->v is the time until fear expires (must be between 0 and 10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_paralyzed
-
-#####GDeclaration: bool set_paralyzed(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->paralyzed", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until paralysis expires. The player gets the message "You
-are paralyzed" if "v" is > 0. Otherwise the player gets the message
-"You can move again".
-
-#####GParameters:
->v is the time until paralysis expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_image
-
-#####GDeclaration: bool set_image(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->image", notice observable changes
-*
-* Note that we must redraw the map when hallucination changes.
-*/
-
-#####GDescription:
-Set time "v" until hallucination expires. The player gets the message
-"Oh, wow! Everything looks so cosmic now" if "v" is > 0. Otherwise
-the player gets the message "You can see clearly again".
-
-#####GParameters:
->v is the time until hallucination expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_fast
-
-#####GDeclaration: bool set_fast(int v, int p);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-(none)
-
-#####GDescription:
-Set time "v" until speed of speed factor "p" expires. The player gets
-the message "You feel yourself moving faster" if "v" is > 0. Otherwise
-the player gets the message "You feel yourself slow down".
-
-#####GParameters:
->v is the time until speed expires (must be between 0 and 10000).
->p is the speed factor.
-
-----------------------------------------------------------------------
-
-#####RFunction: set_light_speed
-
-#####GDeclaration: bool set_light_speed(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->lightspeed", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until light-speed expires. The player gets the message
-"You feel as if time has stopped" if "v" is > 0. Otherwise the player
-gets the message "You feel time returning to its normal rate".
-
-#####GParameters:
->v is the time until light-speed expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_slow
-
-#####GDeclaration: bool set_slow(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->slow", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until slowness expires. The player gets the message "You
-feel yourself moving slower" if "v" is > 0. Otherwise the player gets
-the message "You feel yourself speed up".
-
-#####GParameters:
->v is the time until slowness expires (must be between 0 and 10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_shield
-
-#####GDeclaration: bool set_shield(int v, int p, s16b o, s16b d1, s16b d2);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->shield", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until stone-shield expires. The player gets the message
-"Your skin turns to stone" if "v" is > 0. Otherwise the player gets
-the message "Your skin returns to normal". Stone-shield has spell
-power "p", spell option "o", and power options "d1" and "d2".
-
-#####GParameters:
->v is the time until stone-shield expires (must be between 0 and
-  10000).
->p is the power of the stone-shield spell.
->o is the option of the stone-shield spell.
->d1 is the power for option 1 of the stone-shield spell.
->d2 is the power for option 2 of the stone-shield spell.
-
-----------------------------------------------------------------------
-
-#####RFunction: set_blessed
-
-#####GDeclaration: bool set_blessed(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->blessed", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until blessing expires. The player gets the message "You
-feel righteous" if "v" is > 0. Otherwise the player gets the message
-"The prayer has expired".
-
-#####GParameters:
->v is the time until blessing expires (must be between 0 and 10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_hero
-
-#####GDeclaration: bool set_hero(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->hero", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until heroism expires. The player gets the message "You
-feel like a hero" if "v" is > 0. Otherwise the player gets the
-message "The heroism wears off".
-
-#####GParameters:
->v is the time until heroism expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_shero
-
-#####GDeclaration: bool set_shero(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->shero", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until berserk expires. The player gets the message "You
-feel like a killing machine" if "v" is > 0. Otherwise the player gets
-the message "You feel less Berserk".
-
-#####GParameters:
->v is the time until berserk expires (must be between 0 and 10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_protevil
-
-#####GDeclaration: bool set_protevil(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->protevil", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until protection from evil expires. The player gets the
-message "You feel safe from evil" if "v" is > 0. Otherwise the player
-gets the message "You no longer feel safe from evil".
-
-#####GParameters:
->v is the time until protection from evil expires (must be between 0
-  and 10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_protgood
-
-#####GDeclaration: bool set_protgood(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->protgood", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until protection from good expires. The player gets the
-message "You feel safe from good" if "v" is > 0. Otherwise the player
-gets the message "You no longer feel safe from good".
-
-#####GParameters:
->v is the time until protection from evil expires (must be between 0
-  and 10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_protundead
-
-#####GDeclaration: bool set_protundead(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->protundead", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until protection from undead expires. The player gets the
-message "You feel safe from undead" if "v" is > 0. Otherwise the
-player gets the message "You no longer feel safe from undead".
-
-#####GParameters:
->v is the time until protection from undead expires (must be between
-  0 and 10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_invuln
-
-#####GDeclaration: bool set_invuln(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->invuln", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until invulnerability expires. The player gets the
-message "Invulnerability" if "v" is > 0. Otherwise the player gets
-the message "The invulnerability wears off".
-
-#####GParameters:
->v is the time until invulnerability expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_tim_invis
-
-#####GDeclaration: bool set_tim_invis(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->tim_invis", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until see invisible expires. The player gets the message
-"Your eyes feel very sensitive" if "v" is > 0. Otherwise the player
-gets the message "Your eyes feel less sensitive".
-
-#####GParameters:
->v is the time until see invisible expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_tim_infra
-
-#####GDeclaration: bool set_tim_infra(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->tim_infra", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until infravision expires. The player gets the message
-"Your eyes begin to tingle" if "v" is > 0. Otherwise the player gets
-the message "Your eyes stop tingling".
-
-#####GParameters:
->v is the time until infravision expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_mental_barrier
-
-#####GDeclaration: bool set_mental_barrier(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->tim_mental_barrier", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until mental barrier expires. The player gets the message
-"Your mind grows stronger" if "v" is > 0. Otherwise the player gets
-the message "Your mind is no longer especially strong".
-
-#####GParameters:
->v is the time until mental barrier expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_oppose_acid
-
-#####GDeclaration: bool set_oppose_acid(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-
-#####GDescription:
-Set time "v" until feather-fall expires. The player gets the message
-"You feel very light" if "v" is > 0. Otherwise the player gets the
-message "You are suddenly heavier".
-
-#####GParameters:
->v is the time until feather-fall expires (must be between 0 and
-  10000).
->v is the time until feather-fall expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_oppose_elec
-
-#####GDeclaration: bool set_oppose_elec(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->oppose_elec", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until electricity resistance expires. The player gets
-the message "You feel resistant to electricity" if "v" is > 0.
-Otherwise the player gets the message "You feel less resistant to
-electricity".
-
-#####GParameters:
->v is the time until electricity resistance expires (must be between
-  0 and 10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_oppose_fire
-
-#####GDeclaration: bool set_oppose_fire(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->oppose_fire", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until fire resistance expires. The player gets the
-message "You feel resistant to fire" if "v" is > 0. Otherwise the
-player gets the message "You feel less resistant to fire".
-
-#####GParameters:
->v is the time until fire resistance expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_oppose_cold
-
-#####GDeclaration: bool set_oppose_cold(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->oppose_cold", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until cold resistance expires. The player gets the
-message "You feel resistant to cold" if "v" is > 0. Otherwise the
-player gets the message "You feel less resistant to cold".
-
-#####GParameters:
->v is the time until cold resistance expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_oppose_pois
-
-#####GDeclaration: bool set_oppose_pois(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->oppose_pois", notice observable changes
-*/
-
-#####GDescription:
-Set time "v" until poison resistance expires. The player gets the
-message "You feel resistant to poison" if "v" is > 0. Otherwise the
-player gets the message "You feel less resistant to poison".
-
-#####GParameters:
->v is the time until poison resistance expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_oppose_ld
-
-#####GDeclaration: bool set_oppose_ld(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->oppose_ld"
-*/
-
-#####GDescription:
-Set time "v" until light and dark resistance expires. The player gets
-the message "You feel protected against the light's fluctuation" if
-"v" is > 0. Otherwise the player gets the message "You are no longer
-protected against the light's fluctuation".
-
-#####GParameters:
->v is the time until light and dark resistance expires (must be
-  between 0 and 10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_oppose_cc
-
-#####GDeclaration: bool set_oppose_cc(int v);
-
-#####GFile: xtra2.c
-/*
-* Set "p_ptr->oppose_cc"
-*/
-
-#####GComment: 
-
-#####GDescription:
-Set time "v" until chaos resistance expires. The player gets the
-message "You feel protected against raw chaos" if "v" is > 0.
-Otherwise the player gets the message "You are no longer protected
-against chaos".
-
-#####GParameters:
->v is the time until chaos resistance expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_oppose_ss
-
-#####GDeclaration: bool set_oppose_ss(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->oppose_ss"
-*/
-
-#####GDescription:
-Set time "v" until sound and shard resistance expires. The player gets
-the message "You feel protected against the ravages of sound and
-shards" if "v" is > 0. Otherwise the player gets the message "You are
-no longer protected against the ravages of sound and shards".
-
-#####GParameters:
->v is the time until sound and shard resistance expires (must be
-  between 0 and 10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_oppose_nex
-
-#####GDeclaration: bool set_oppose_nex(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->oppose_nex"
-*/
-
-#####GDescription:
-Set time "v" until nexus resistance expires. The player gets the
-message "You feel protected against the strange forces of nexus" if
-"v" is > 0. Otherwise the player gets the message "You are no longer
-protected against the strange forces of nexus".
-
-#####GParameters:
->v is the time until nexus resistance expires (must be between 0 and
-  10000).
-
-----------------------------------------------------------------------
-
-#####RFunction: set_stun
-
-#####GDeclaration: bool set_stun(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->stun", notice observable changes
-*
-* Note the special code to only notice "range" changes.
-*/
-
-#####GDescription:
-Set stun level "v". If the player race can't be stunned then the level
-is forced to 0. A value > 100 means the player is knocked out. A value
->50 is a heavy stun. A value > 0 is a stun. If the stun level has
-increased, a message is printed. There is a small chance of stun level
-in 1000, or a 1 in 16 chance of a vicious blow which decreases
-intelligence and/or wisdom for a while.
-
-#####GParameters:
->v is the stun level.
-
-----------------------------------------------------------------------
-
-#####RFunction: set_cut
-
-#####GDeclaration: bool set_cut(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->cut", notice observable changes
-*
-* Note the special code to only notice "range" changes.
-*/
-
-#####GDescription:
-Set cut level "v". If the player race can't be cut then the time is
-forced to 0. A value > 1000 is a mortal wound. A value > 200 is a deep
-gash. A value > 100 is a severe cut. A value > 50 is a nasty cut. A
-value > 25 is a bad cut. A value > 10 is a light cut. A value > 0 is a
-graze. If the cut level has increased, a message is printed. There is
-a small chance of stun level in 1000, or a 1 in 16 chance of scarring
-which decreases charisma for a while.
-
-#####GParameters:
->v is the cut level.
-
-----------------------------------------------------------------------
-
-#####RFunction: set_food
-
-#####GDeclaration: bool set_food(int v);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Set "p_ptr->food", notice observable changes
-*
-* The "p_ptr->food" variable can get as large as 20000, allowing the
-* addition of the most "filling" item, Elvish Waybread, which adds
-* 7500 food units, without overflowing the 32767 maximum limit.
-*
-* Perhaps we should disturb the player with various messages,
-* especially messages about hunger status changes.  XXX XXX XXX
-*
-* Digestion of food is handled in "dungeon.c", in which, normally,
-* the player digests about 20 food units per 100 game turns, more
-* when "fast", more when "regenerating", less with "slow digestion",
-* but when the player is "gorged", he digests 100 food units per 10
-* game turns, or a full 1000 food units per 100 game turns.
-*
-* Note that the player's speed is reduced by 10 units while gorged,
-* so if the player eats a single food ration (5000 food units) when
-* full (15000 food units), he will be gorged for (5000/100)*10 = 500
-* game turns, or 500/(100/5) = 25 player turns (if nothing else is
-* affecting the player speed).
-*/
-
-#####GDescription:
-Set hunger level "v". A value < 500 is fainting. A value < 1000 is
-weak. A value < 2000 is weak. A value < 10000 is full. A value
-< 15000 is bloated. A value < 20000 is gorged. If one of these
-levels is crossed a message is printed.
-
-#####GParameters:
->v is the hunger level (must be between 0 and 20000).
-
-----------------------------------------------------------------------
-
-#####RFunction: check_experience
-
-#####GDeclaration: void check_experience(void);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Advance experience levels and print experience
-*/
-
-#####GDescription:
-Check if player experience level has changed. If a player has achieved
-a level for the first time, give reward or corruption (1 chance in 3)
-if they apply, and increase skill points.
-
-----------------------------------------------------------------------
-
-#####RFunction: check_experience_obj
-
-#####GDeclaration: void check_experience_obj(object_type *o_ptr);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Advance experience levels and print experience
-*/
-
-#####GDescription:
-Check if object "o_ptr" experience level has changed. If an object has
-achieved a level for the first time, apply gains.
-
-#####GParameters:
->o_ptr is the pointer to the object gaining experience.
-
-----------------------------------------------------------------------
-
-#####RFunction: gain_exp
-
-#####GDeclaration: void gain_exp(s32b amount);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Gain experience (share it to objects if needed)
-*/
-
-#####GDescription:
-Gain "amount" of experience. Count the number of objects which will
-gain experience. The objects share equally 2/3 of "amount". Give
-corruption if it applies. Gain experience. If experience is less
-than maximum, then increase maximum experience by 20% of "amount".
-Check for level change and print experience (check_experience).
-
-#####GParameters:
->amount is the amount of experience to share.
-
-----------------------------------------------------------------------
-
-#####RFunction: lose_exp
-
-#####GDeclaration: void lose_exp(s32b amount);
-
-#####GFile: xtra2.c
-
-#####GComment: 
-/*
-* Lose experience
-*/
-
-#####GDescription:
-Decrease experience by "amount". Experience can not fall below zero.
-Check for level change and print experience (check_experience).
-
-#####GParameters:
->amount is the amount of experience to lose.
-
-----------------------------------------------------------------------
-
-
-Back to the *****lua.hlp*0[lua help index] .
-
-
-                                                     [[[[[gThis file by Chris Hadgis]
-
-
diff --git a/lib/mods/theme/help/lua_pow.txt b/lib/mods/theme/help/lua_pow.txt
deleted file mode 100644
index c221a664..00000000
--- a/lib/mods/theme/help/lua_pow.txt
+++ /dev/null
@@ -1,266 +0,0 @@
-|||||oy
-#####R             /----------------------------------------\
-#####R            <         Adding new racial powers         >
-#####R             \----------------------------------------/
-
-#####R=== Introduction ===
-
-You *must* download and install my lua example files from 
-[[[[[Ghttp://www.moppy.co.uk/angband.htm]. And also you should read the 
-*****lua_intr.txt*0[scripting introduction] file if you haven't already done 
-so.
-
-The (commented) accompanying script file for this tutorial is 
-lib\scpt\pheonix.lua. Open it in your text editor!
-
-#####R=== The Racial Power ===
-
-Let's start with something simple. Let's say you wanted your new race (let's 
-call it "Pheonix") to be able to cast fire balls as their racial power. 
-
-#####R=== Starting off ===
-
-If you have a look at pheonix.lua you'll note the first lines are comments.
-I'll talk a bit more about comments later, but it's worth pointing out that any
-lines of text preceded by a double hyphen ([[[[[B--]) will be ignored by the 
-scripting engine, and are therefore comments. 
-After the comments, the first 10 lines of code are as follows:
-
-#####BPHEONIX_POWER = add_power
-#####B{
-#####B        ["name"] =      "Fire Breath",
-#####B        ["desc"] =      "You are able to cast fireballs",
-#####B        ["desc_get"] =  "Your beak glows red",
-#####B        ["desc_lose"] = "Your beak goes cold again",
-#####B        ["level"] =     10,
-#####B        ["cost"] =      11,
-#####B        ["stat"] =      A_INT,
-#####B        ["fail"] =      14,
-
-So, [[[[[BPHEONIX_POWER = add_power] is registering our power. We're giving it 
-a name (PHEONIX_POWER) and saying that it is defined by calling the special 
-function [[[[[Badd_power]. This special function is only used to define lua-
-scripted 
-powers, and has attributes which are identified by their inclusion in square 
-brackets.
-Note the following:
-- Lua is case sensitive. The name of our power is a constant, will never change 
-so that's been named with capitals. variables and functions are named all in 
-lower case. Technically speaking, Lua does not support constants, but we can 
-emulate them by variables in this way. They don't have to be capitalised, but 
-if you capitalise all your constants, it makes things easier to read, and 
-you'll be following normal programming protocol. 
-- There are no spaces in the name of the power. Use an underscore for spaces 
-if you need to improve legibility. 
-
-[[[[[B"name" =      "Fire Breath",] This is the name of the power as it is 
-displayed in the 
-U menu, and as you will define it in p_info.txt (more about that later). 
-
-[[[[[B"desc" =      "You are able to cast fireballs",] This is what would 
-appear in the 
-information display list if you drank  a potion of self knowledge or 
-similar. 
-
-[[[[[B"desc_get" =  "Your beak glows red",] This is the information displayed 
-when you 
-gain this power. 
-
-[[[[[B"desc_lose" = "Your beak goes cold again",] This is the information 
-displayed when 
-you lose this power. Eg After a mutation/corruption.
-
-[[[[[B"level" =     10,] Character level which must be gained in order to use 
-power,
-
-[[[[[B"cost" =      11,] Amount of mana to cast this power.
-
-[[[[[B"stat" =      A_INT,] stat which will define whether it works or not, 
-
-[[[[[B"fail" =      14,] how high that stat must be. 
-
-So our Pheonix will be able to cast PHEONIX_POWER  from clvl 10, at a cost of 
-11 mana, providing that the player's intelligence is 14 and upwards. 
-
-#####R=== The function ===
-
-The next section is a lot longer, so we'll look at it line by line. I'll 
-strip the comments for the purpose of this helpfile.
-
-#####B["power"] =     function()
-#####B		local ret, dir, damage
-#####B		ret, dir = get_aim_dir();
-#####B		if (ret == FALSE) then 
-#####B			return 
-#####B		end
-#####B		damage = player.lev*3
-#####B		msg_print("You breathe fire.")
-#####B		fire_ball(GF_FIRE, dir, damage, 3)
-#####Bend,
-
-The [[[[[B"power"] bit is what actually happens when the player accesses this 
-power 
-from their 'U' menu. Every function must start with the word [[[[[Bfunction]. 
-Normally, we'd also declare its name at this point, but as this is contained 
-within the [[[[[Badd_power] function, we just use the word [[[[[Bfunction] The 
-empty 
-brackets after this denote that no arguments are passed to the function. 
-Lets look at the next line.
-
-#####B		local ret, dir, damage
-
-The [[[[[Blocal] bit is saying that  we're going to declare some local 
-variables. That 
-is, that there will be three variables used in this function , that apply 
-exclusively to this function, and to no others. Global variables are 
-variables that apply to the whole script, in multiple functions. The three 
-variables will be called [[[[[Bret] (return), [[[[[Bdir] (direction), and
-[[[[[Bdamage]. They will be used to determine the direction the ball 
-will fire in, and how much damage it will do. We'll see them in use when we add
-the third line:
-
-#####B		ret, dir = get_aim_dir();
-
-here we're saying that the variables will take their value from the result 
-of a function. The program performs the function [[[[[Bget_aim_dir] which 
-essentially asks the player to choose a direction or pick a target. 
-[[[[[Bget_aim_dir] 
-assigns the value [[[[[Bret] to either TRUE (if the player correctly selected a 
-direction) or FALSE (if the player failed to do so (maybe they changed their 
-mind, or hit the wrong key!)). The value [[[[[Bdir] is the direction which was 
-selected (or the path to the target if a target was selected). OK so let's add 
-the next line:
-
-#####B		if (ret == FALSE) then return end
-
-This introduces another fundamental scripting concept - [[[[[Bif] statements.
-They work just as you would expect them too. You say "if a certain condition is
-met, then do the following things."
-So in this function we're saying, "if the value of [[[[[Bret] is FALSE then 
-[[[[[Breturn]."
-As I mentioned above, [[[[[Bret] is false if the player aborted (either 
-deliberately or accidentally) the spell casting whilst choosing a direction 
-for the spell. The double equals sign are used to mean "is equal to" as a 
-single equals sign is used for defining variables remember? A single equals 
-sign is more of a "let x be equal to y" thing.
-[[[[[Breturn] means stop the current function. And [[[[[Bend] signifies the 
-close of the [[[[[Bif]
-statement. Every [[[[[Bif] statement must begin with an [[[[[Bif] and finish 
-with an [[[[[Bend].
-So, what our [[[[[Bif] statement is saying is; "if the player failed to specify 
-a direction or target for the spell, stop the function here."
-If the player has correctly specified a direction/target, the function 
-continues to the next line:
-
-#####B		damage = player.lev*3
-
-Here we're saying that the variable [[[[[Bdamage] has a value equal to the 
-players current character level, multiplied by 3.
-
-#####B		msg_print("You breathe fire.")
-
-Fairly easy to see what this does - displays the message "You breathe fire."
-I could have put anything there obviously, like [[[[[Bmsg_print("You open]
-[[[[[Byour mouth and everyone falls over with the smell of hot curry")] or
-some other such rubbish. But note that the message is enclosed within double 
-quotes. The quotes aren't displayed in the message on screen, but signify the 
-start and end of the message. 
-
-#####B		fire_ball(GF_FIRE, dir, damage, 3)
-
-This is the line that casts the spell. it says execute the function 
-[[[[[Bfire_ball]. Now, this doesn't mean a fireball, it means fire a ball. 
-There's an important distinction there! All it knows it is doing is firing a 
-ball, it doesn't know what kind of ball, or where, or how big, or how much 
-damage.
-The [[[[[BGF_FIRE,] bit is what tell us it is a fire ball. If it was 
-[[[[[BGF_COLD,]
- we'd have a cold ball, or [[[[[BGF_CHAOS,] it would be a chaos ball and 
-so on and so on. A full list of those types can be found in *****lua_gf.txt*0[lua_gf.txt].
-[[[[[B dir,] is the direction, from the [[[[[Bget_aim_dir()] bit.
-[[[[[B damage,] is the damage. As we've already said, this will be clvl*3.
-[[[[[B 3)] is the radius.
-and finally...
-
-#####B	end,
-#####B}
-
-[[[[[Bend,] tells it the function has ended. Every function must finish with 
-[[[[[Bend].
-You should have spotted that after the end of each attribute is a comma. Make 
-sure you include this, and don't forget the braces at the very very end to 
-close the [[[[[Badd_power] function.
-
-#####R=== Finishing the LUA file ===
-
-Save this as a text file 'pheonix.lua' Put it into the lib\scrpt directory 
-of ToME, and open the init.lua file which you'll find in the same 
-directory. 
-
-Add the following line and resave the init.lua file.
-
-#####Btome_dofile("pheonix.lua")
-
-This ensures that ToME loads your file on start-up. Because you've installed 
-the example scripts, this has all been done for you.
-
-#####R=== A quick word about comments ===
-
-One of the reasons Angband has so many variants is because the source code is 
-clearly commented. Almost every line of code has an accompanying comment, 
-explaining what that line does. It's good practice to add comments to any code 
-or script you write. It's helpful to others who are learning, anyone who takes 
-over your project, and also to yourself when you come back in a month's time 
-and can't remember what you did! So comment your code clearly, and well!
-
-You can also add multi line comments which should be enclosed by [[[[[B--[[] 
-and 
-#####B]]
-
-#####R=== Tying it all together ===
-
-You'll now need to link this 'U' power to the pheonix race via the 
-p_info.txt file. Simply add a line within the class definition file that has 
-the format [[[[[BR:Z:<name>]the name of the power as it appears in the 
-[[[[[B"name"] 
-section we did right at the beginning, remember? Seeing as there is no pheonix 
-race, I've gone ahead and made one up as a demonstration. If you've downloaded 
-and installed the example files from [[[[[Ghttp://www.moppy.co.uk/angband.htm/] 
-then 
-you'll notice you already have the pheonix race available. Printed below is 
-the p_info.txt entry for it.
-
-
-#####BR:N:23:Pheonix
-#####BR:D:Born from flame, these powerful bird like creatures gain fire related
-#####BR:D:abilities as they grow. 
-#####BR:S:1:0:2:1:-3:2:-5
-#####BR:K:-8:15:20:-10:5:-1:-5:-5
-#####BR:P:8:130:5:210
-#####BR:M:255:70:2:1:20:5:2:1:18:3
-#####BR:E:1:1:1:2:1:1
-#####BR:C:Warrior | Mage | Priest | Rogue | Ranger | Paladin | Blade | 
-#####BR:C:Warlock | Chaos-Warrior | Monk | Mindcrafter | High-Mage |
-#####BR:C:BeastMaster | Alchemist |  Power-Mage | Runecrafter | 
-#####BR:C:Sorceror | Archer | Illusionist | Druid | Necromancer | Black-Knight 
-| 
-#####BR:C:Daemonologist | Weaponmaster | Summoner | 
-#####BR:Z:Fire Ball
-#####BR:R:1:0
-#####BR:F:RES_FIRE | FEATHER |
-
-Note the [[[[[BR:Z:] line. 
-
-If all is well, you should be able to start ToME now and breathe fire! Once 
-you get to lvl 10 anyhow. Don't forget, this is the kind of thing wizard mode 
-was invented for! Ctrl-A and confirm at the prompt, and then 'e' will allow 
-you to alter stats, including experience. Approx 1000 exp should do to get you 
-to clvl 10.
-
-Ready for more? How about adding a new *****lua_skil.txt*0[skill] ?
-
-                             [[[[[gThis file by fearoffours (fearoffours@moppy.co.uk)]
-
-
-
-
diff --git a/lib/mods/theme/help/lua_ques.txt b/lib/mods/theme/help/lua_ques.txt
deleted file mode 100644
index 1d4b9c65..00000000
--- a/lib/mods/theme/help/lua_ques.txt
+++ /dev/null
@@ -1,299 +0,0 @@
-|||||oy
-#####R             /----------------------------------------\
-#####R            <            Adding a new quest            >
-#####R             \----------------------------------------/
-
-#####R=== Introduction ===
-
-Adding a quest involves a bit more work, and there is, in some ways, rather 
-more potential for things to go wrong! But it's a great way of showing just 
-WHAT can be done with lua scripting. It proves just how much a lua patch can 
-change the overall feel of the game. And it will give you a much better idea of 
-how lua interfaces with the game source. You should have read the 
-*****lua_intr.txt*0[scripting introduction], *****lua_pow.txt*0[racial power tutorial]
-and *****lua_skil.txt*0[adding new skills tutorial] before going much 
-further. All of the above files contain some fairly fundamental information 
-which you will find necessary for full understanding of this file.
-
-The script we're looking at is going to create a quest entrance in the middle 
-of Bree. Entering the quest you see a little girl who has had her necklace 
-stolen. Your job is to travel down a corridor, killing some monsters on the 
-way, pick up the amulet and return it to the girl. Once done, she'll reveal the 
-stairs back to Bree, and give you a (randomly generated) ring. If you feel the 
-monsters are too hard, the only thing to do is talk to the little girl who will 
-reveal the stairs again, failing the quest for you, and also block off the 
-entrance to the amulet so that you can't cheat and make off with the amulet!
-
-#####R=== Getting started ===
-
-Open amulet.lua (you have downloaded the example scripts from 
-[[[[[Ghttp://www.moppy.co.uk/angband.htm], haven't you?). The first thing you 
-should see is that yet again we're calling a function that takes its arguments 
-from a table, making it easy to read what's going on in the script.
-
-This time our function is add_quest and we have the following keys and values:
-
-#####B["global"] =    "AMULET_QUEST",
-#####B["name"] =      "Hannahs lost amulet",
-#####B["desc"] =      {
-#####B			"Retrieve an amulet for Hannah Cooke. It's guarded!"
-#####B 		     },
-#####B["level"] =     5,
-#####B["hooks"] =     {
-
-[[[[[B"global" = ]	is a constant that we set when we refer to this quest in 
-various places...
-[[[[[B"name" = ]	Obviously a long name for the quest. This will appear in the 
-quest screen (Ctrl-Q) and we may use in some map files too.
-[[[[[B"desc" = ]	This is a long description for the quest. Again this is what 
-will appear in the quest screen, and each line should be not more than 80 
-characters.
-[[[[[B"level" = ]	This is a rough indicator of how hard the quest is, and again, 
-appears in the quest screen
-[[[[[B"hooks" = ]	This is the real 'meat' of the quest. Like the [[[[[B"spell_list"] key 
-in the [[[[[Badd_magic] function, this is another sub-table.
-
-To understand fully the structure of the "hooks" key it's worth taking a bit of 
-a detour at this point and discussing how the scripting interface works in 
-general.
-
-#####R=== How the scripts work (ish) ===
-
-Essentially there's a list of events that happen in the game. As each of these 
-events happen they run a check to see if there's any functions that they need 
-to run at that event. When we ran the add_mkey part of adding a new skill 
-power, we essentially said "when the 'm' key is pressed in the game, perform 
-the [[[[[Bexecute_magic(constructor_powers)] function". Likewise we did a similar 
-thing with adding the racial power, only we hooked onto the pressing of the 
-'U' key.
-
-All of this was partly hidden because of the way that the [[[[[Badd_magic] and 
-[[[[[Badd_power] functions work. But here in the [[[[[Badd_quest] function it's a bit more 
-specific. We are going to specify what events we're going to hook onto, and 
-what functions we want to trigger at that event.
-
-A full list of hooks can be found in the source-file util.pkg.
-
-#####R=== The hooks ===
-
-#####B[HOOK_BIRTH_OBJECTS] = function()
-#####B	quest(AMULET_QUEST).status = QUEST_STATUS_TAKEN
-#####Bend,
-
-So here we are with our first hook. We've declared that we're adding it to the 
-birth of your character. That is, the function will be called when you create 
-your character. And what we're doing here is automatically declaring the quest 
-as being taken, like the Dol Guldur quest is. Each quest has 7 different 
-statuses:
-
-[[[[[BQUEST_STATUS_IGNORED         -1	]	This is unused, but the quest is 
-ignored (will not be taken and has not been taken).
-[[[[[BQUEST_STATUS_UNTAKEN         0	]	The quest has not been accepted yet
-[[[[[BQUEST_STATUS_TAKEN           1	]	You have accepted the quest
-[[[[[BQUEST_STATUS_COMPLETED       2	]	You have completed the quest 
-successfully but not been rewarded for it
-[[[[[BQUEST_STATUS_REWARDED        3	]	You've completed and rewarded the quest
-[[[[[BQUEST_STATUS_FAILED          4	]	You've failed the quest
-[[[[[BQUEST_STATUS_FINISHED        5	]	The quest is completely finished 
-successfully.
-[[[[[BQUEST_STATUS_FAILED_DONE     6	]	The quest is completely finished 
-unsuccessfully.
-
-You see that we've used the constant we defined in the "global" section is 
-passed as an argument to [[[[[Bquest.status].
-
-Next hook then:
-
-#####B[HOOK_GEN_QUEST] = function()
-#####B	if (player.inside_quest ~= AMULET_QUEST) then
-#####B		return FALSE
-#####B	else
-#####B		load_map("amulet.map", 2, 2)
-#####B		return TRUE
-#####B	end
-#####Bend,
-
-Ok, we're hooking onto the generation of the quest here. This is specifically 
-triggered in this instance by going down the quest entrance stairs in Bree.
-Once you've gone down the stairs, you are technically inside the quest, which 
-means we can say if the person is not inside the amulet quest, then ignore this 
-function, otherwise load the file 'amulet.map' at co-ordinates x=2 y=2. You'll 
-find the amulet.map file in the edit directory, make sure you check it out. The 
-syntax for map files is fairly simple, though I might get round to writing a 
-tutorial on them some day! In the mean time holler for me at the usual email 
-address if you're unsure.
-
-#####B[HOOK_FEELING] = function()
-#####B	if (player.inside_quest ~= AMULET_QUEST) then
-#####B		return FALSE
-#####B	else
-#####B		cmsg_print(TERM_L_BLUE, "Hannah speaks to you:")
-#####B		cmsg_print(TERM_YELLOW, "'Some nasty monsters stole my 
-#####B							favourite necklace.'")
-#####B		cmsg_print(TERM_YELLOW, "'It's hidden at the back of that 
-#####B						corridor! Please fetch it for me'")
-#####B		return TRUE
-#####B	end
-#####Bend,
-
-We're moving into some rather more obvious territory here, and getting into the 
-meat of the quest. The [[[[[BHOOK_FEELING] is triggered at the point when the level 
-feeling appears. It's important that this is run only if the player is inside 
-the amulet quest, as otherwise it will trigger EVERY time a level feeling 
-occurs, when you go down a level in the barrow-downs, whenever! Returning TRUE 
-will replace the level feeling with what's above, returning FALSE will still 
-perform the function but will amend the normal level feeling - so here if we'd 
-returned false we'd still get our custom messages, but they'd follow with 
-'looks like a typical quest level'. Of course returning false may cause you 
-other problems (see end of this file!) depending on what else you have in your 
-function.
-
-#####B[HOOK_GIVE] = function(m_idx, item)
-
-#####B	m_ptr = monster(m_idx)
-#####B	o_ptr = get_object(item)
-
-#####B	if (m_ptr.r_idx == test_monster_name("Hannah Cooke, a little girl")) 
-#####B			and (o_ptr.tval == TV_AMULET) and (o_ptr.sval == 2) then
-
-#####B		cmsg_print(TERM_YELLOW, "'Thank-you!'")
-
-#####B		inven_item_increase(item, -1)
-#####B		inven_item_optimize(item)
-
-#####B		quest(AMULET_QUEST).status = QUEST_STATUS_COMPLETED
-
-#####B		cave_set_feat(7, 6, 6)
-
-#####B		cmsg_print(TERM_YELLOW, "'Here, take this pretty ring I found 
-#####B							as a token of gratitude!'")
-#####B		random_type = randint(57)
-#####B		reward = create_object(TV_RING, random_type)
-#####B		drop_near(reward, -1, py, px)
-#####B		quest(AMULET_QUEST).status = QUEST_STATUS_REWARDED
-#####B		return TRUE
-#####B	else
-#####B		return FALSE
-#####B	end
-#####Bend,
-
-This is a fairly long function, but don't be intimidated. It's not really 
-difficult to understand. As you can see we're hooking into the giving of an 
-object to a monster (the 'y' key). Because of this, the function takes two 
-arguments - [[[[[Bm_idx] (the monster that you're giving to) and [[[[[Bitem] (the item that 
-you're giving).
-
-We then make it possible to work with the monster and item variables by 
-referencing them to two functions which identify them from the edit files: 
-[[[[[Bmonster()] and [[[[[Bget_object()]. This enables us to now say, 'if the name of the 
-monster is "Hannah Cooke, a little girl" and the type of item is an amulet and 
-that amulet is an amulet of adornment, then carry out the following commands'.
-
-We then say call the function [[[[[Binven_item_increase()] which places an object in 
-the inventory. It takes two arguments, the first being what object to put in 
-the inventory and the second being how many of that type of objects to put in 
-the inventory. You can see that by placing -1 as the second argument it fairly 
-obviously subtracts that item from the inventory. The [[[[[Binven_item_optimize()] 
-function checks that there are no empty inventory slots, and if there are, 
-erases them. 
-
-The quest is then completed, and the stairs are revealed using the 
-[[[[[Bcave_set_feat()] function. This function takes three arguments, the first is the 
-x co-ordinate of the cave square you wish to change (counted from top left) the 
-second is the y co-ordinate, and the third is the index number of the feature 
-you wish the square to become as defined in f_info.txt. 
-
-We then set about rewarding the player. As you can see we call [[[[[Bcreate_object()] 
-which takes two variables: the first is the type of object (these are all 
-listed in object.pkg) and the second is the sub-type of that object. I searched 
-k_info.txt to see how many different types of ring there were (57) and used a 
-randomly selected number with a maximum value of 57 as that specific sub-type.
-
-We then drop the object (although it's been created, it has only been created 
-in the game's memory, it's nowhere that the player can interact with it until 
-we drop it). The [[[[[Bdrop_near()] function takes 3 variables, the first being the 
-object that you wish to drop, the second being the chance that it disappears 
-(like an arrow, or mimicked creature) on drop. If you set it to -1, it won't
-ever disappear. The last two are the co-ordinates at which the object will be 
-dropped. py and px are the global variables defined by where the player is 
-standing, so in this case it will drop under the player. You could do 
-[[[[[Binven_item_increase(reward, 1)] if you wanted, but I wanted to show a variety of 
-ways of handling objects.
-
-OK, let's take a look at the next hook:
-
-#####B[HOOK_CHAT] = function(m_idx)
-#####B	m_ptr = monster(m_idx)
-#####B	if (m_ptr.r_idx == test_monster_name("Hannah Cooke, a little girl")) then 
-#####B		if (quest(AMULET_QUEST).status == QUEST_STATUS_REWARDED) then
-#####B			cmsg_print(TERM_YELLOW, "'Bye!'")
-#####B		else
-#####B			cmsg_print(TERM_YELLOW, "'Are the monsters too tough? 
-#####B							Do you want to leave?'")
-#####B			if (get_check("Really leave and fail the quest?") == 
-#####B									FALSE) 
-#####B				then 
-#####B					cmsg_print(TERM_YELLOW, "'Go and get my 
-#####B								amulet then!'")
-#####B				else
-#####B					cmsg_print(TERM_YELLOW, "'Awww. Never 
-#####B					mind. It was only a bit of rabbits foot'")
-#####B					quest(AMULET_QUEST).status = 
-#####B								QUEST_STATUS_FAILED
-#####B					cave_set_feat(7, 6, 6)
-#####B					cave_set_feat(12, 5, 60)
-#####B			end
-#####B		end
-#####B		return TRUE
-#####B	end
-#####B	return FALSE
-#####Bend,		
-
-This only looks complicated because of the nested 'if' statements. It's easy to 
-lose your way when doing this kind of thing, always make sure you close all the 
-statements and put the returns in the right place. [[[[[BHOOK_CHAT] functions have one 
-argument - the monster you are chatting to. As you can see, we perform a check 
-to make sure it's the right monster and then away we go.... If the player wants 
-to leave the quest without completion they talk to Hannah, who gives them a 
-chance to change their mind! If the player asks to leave the entrance to the 
-corridor is blocked off (the second cave_set_feat()) so that the user can't 
-then go and get the amulet. Gumband or Zangband players may at this point think 
-they've lost out on the rabbits foot of burglary! (they haven't though as it 
-doesn't exist in ToME).
-
-#####B[HOOK_CHAR_DUMP] = function()
-#####B	if (quest(AMULET_QUEST).status == QUEST_STATUS_FAILED) then
-#####B		print_hook("\n You chickened out of rescuing a necklace and 
-#####B							made a little girl sad. ")
-#####B	elseif (quest(AMULET_QUEST).status == QUEST_STATUS_COMPLETED) or 
-#####B		(quest(AMULET_QUEST).status == QUEST_STATUS_REWARDED) or 
-#####B		(quest(AMULET_QUEST).status == QUEST_STATUS_FINISHED) then
-#####B			print_hook("\n You rescued little Hannah Cooke's necklace from 
-#####B							the nasty monsters ")			
-#####B	end
-#####B	return FALSE
-#####Bend,
-
-This quite simply and obviously prints an appropriate line in the character 
-dump based on the status of the quest. The [[[[[B\n] bit ensures the text goes on a 
-new line, so make sure you include it! Also you should return FALSE as 
-returning TRUE will stop executing all the other character dump lines (and you 
-may get other quests not having their lines printed).
-
-=== A word about returning TRUE and FALSE ===
-
-As I mentioned above, you need to be careful what you return when dealing with 
-HOOKS as you can mess up the game a bit. Bear in mind that if you add a 
-function to [[[[[BHOOK_GEN_QUEST], every time a quest is generated, that function will 
-run. If you return TRUE, then no further functions attached to that hook will 
-run. If you return FALSE, it continues processing functions on that hook.
-
-That is pretty much it. Do take a look at the other included scripts that I 
-haven't gone into any detail about in the files, as you'll pick up some useful 
-techniques there too. Especially worthy of note is the hina.lua file which uses 
-hooks outside of the quest structure and also global variables and variables in 
-a table. If you have any questions, let me know at the email addy below.
-
-Back to the *****lua.hlp*0[lua help index] .
-
-                             [[[[[gThis file by fearoffours (fearoffours@moppy.co.uk)]
diff --git a/lib/mods/theme/help/lua_skil.txt b/lib/mods/theme/help/lua_skil.txt
deleted file mode 100644
index 87385e5d..00000000
--- a/lib/mods/theme/help/lua_skil.txt
+++ /dev/null
@@ -1,342 +0,0 @@
-|||||oy
-#####R             /----------------------------------------\
-#####R            <       Adding new skill-based powers      >
-#####R             \----------------------------------------/
-
-#####R=== Introduction ===
-
-This is very much in the same vein as adding a racial/extra power, but has to 
-be tied into skills, and we're defining more than one spell at once. You should 
-have read the *****lua_intr.txt*0[scripting introduction] and 
-*****lua_pow.txt*0[racial power tutorial] before going much further. Both of the above files 
-contain some fairly fundamental information which you will find necessary for 
-full understanding of this file.
-
-#####R=== Getting started ===
-
-Open construc.lua (you have downloaded the example scripts from 
-[[[[[Ghttp://www.moppy.co.uk/angband.htm], haven't you?). The idea behind this 
-script is that it adds a skill which affects you ability to build/knock down 
-stuff. It treats the equivalent of stone-to-mud and trap-door destruction 
-spells as if they were "building skills". It also adds quite a few high-level 
-'spells' which do funky things like carving out corridors and chambers in a 
-single turn, and building doors and stuff. Just think of it as if the person 
-who has plenty of skills in this area would be a builder-type with lots of 
-strength and constitution... 
-
-In order to add these powers we're going to edit the s_info.txt file which 
-lives in the edit folder, and add a new skill, underneath the 'misc' tree, 
-called construction.  The powers will then be accessed through the 'm' menu, in 
-a similar way to mindcraft or alchemy skills or such. (That is, no books are 
-needed to cast them, as we're treating them as a craft that has been learnt, 
-rather than spells.) Our fist line of the script file reads:
-
-#####BSKILL_CONSTRUCT = 57
-
-This merely links the skill index that we'll be defining in s_info.txt to this 
-file. We'll come back to this at the end of the tutorial.
-
-#####Bconstructor_powers = add_magic
-
-In a similar way to the [[[[[Badd_power] function we called when we added the 
-Phoenix racial ability, this line calls a special function which we use to 
-define new skills. It follows a very specific, but easy to understand form. It 
-starts with a brace, which indicates the add_magic function will be storing 
-these values in a table. Don't worry about this too much, but understand that a 
-table starts and ends with braces [[[[[B{] and [[[[[B}] respectively. Each key 
-(or field name) takes the format [[[[[B"key" = value,] (the comma is 
-important!). 
-
-#####B	["fail"] = 	function()
-#####B			msg_print("You decide now is a good time for a cuppa")
-#####B	end,
-#####B	["stat"] = 	A_STR,
-#####B	["get_level"] = 	function()
-#####B			return get_skill_scale(SKILL_CONSTRUCT, 50)
-#####B	end,
-#####B	["spell_list"] = 
-
-[[[[[B"fail"] is a function that is called whenever you ##fail to cast the 
-spells##. Here it does nothing spectacular.
-[[[[[B"stat"] defines the stat used to cast the spells. Here it is strength. 
-Any other stat can be used, prefix it with [[[[[BA_].
-[[[[[B"get_level"] is used to determine the level of the spell. It's associated 
-with spells that increase in power the more points that are invested in the 
-associated skill. I know that's not terribly clear, I'll come back to it in a 
-moment.
-[[[[[B"spell_list"] is just that, a list of all the spells. 
-Each of these four properties within the table must end with a comma. If a 
-function is defined in the property itself then we add the comma after the 
-closing [[[[[Bend]. Again compare with construct.lua to see it. Any line NOT 
-ending with a comma will cause a lua error on startup, probably of the type 
-[[[[[V'}' expected to close '{' at line <whatever>.] 
-
-#####R=== The spell list ===
-
-Each spell, within the [[[[[B"spell_list"] key has its own set of properties 
-that we need to define from a sub-table so we open another set of braces to 
-start the spell list, and then a third set of braces to start the first spell. 
-So with all this, our first spell looks like:
-
-#####B	["spell_list"] = 
-#####B	{
-#####B		{
-#####B			["name"] = 
-#####B			["desc"] = 
-#####B			["mana"] = 
-#####B			["level"] = 
-#####B			["fail"] = 
-#####B			["spell"] = 
-#####B			["info"] = 
-#####B		},
-
-[[[[[B"name"] is, as you would expect, the name of the spell, as you want it to 
-appear in the spell list when choosing a spell. The maximum number of 
-characters for this is 29.
-[[[[[B"desc"] is the description received when you hit the capital letter of 
-that spell in the menu. (i.e., press 'a' to cast the first spell, but press 'A' 
-to receive info about the first spell. 
-[[[[[B"mana"] is the amount of mana required to cast the spell.
-[[[[[B"level"] is the level required to use that spell (that's level of the (in 
-this case construction) skill, not character level!).
-[[[[[B"fail"] is base fail rate.
-[[[[[B"spell"] is the function that is executed when the spell is cast. Note 
-that it MUST take the form [[[[[Bfunction() blah end] even if you're calling
-a C function directly. If you have a look at the end of the file, you'll see
-the "rebuild dungeon" spell which is identical to the "alter_reality" spell. 
-However, rather than reading [[[[[B"spell" = alter_reality()], it reads:
-
-#####B["spell"] = function()
-#####B		alter_reality()
-#####Bend,
-
-which appears to be a long way round to do the same thing, but this is how it 
-must be done.
-
-In a similar way, the [[[[[B"info"] key must begin with a [[[[[Bfunction()] 
-and return the value of what is to be displayed alongside the spell name, 
-level and mana in the spell list. The maximum number of characters that can be 
-displayed here is dependent on the width of the user's screen, but try to keep 
-it under 12 if you can, as this will fit in a standard 80x24 terminal screen. 
-The first character will need to be a space otherwise you'll have the info line 
-squashed right up against the fail rate and it will look odd. If you wish to 
-have this part blank in the spell list, you still need to return a value, so 
-just a single space will do : [[[[[Breturn " "]
-
-All of these keys are repeated for each spell, with each spell in its own 
-table (therefore, it's own set of braces). Again, check the lua file for 
-clarification.
-
-When entering the spells in the "spell_list", you must take care to specify 
-them in the order which they are gained, otherwise they display incorrectly in 
-the spell list.
-
-You should by now be experienced enough to understand most of what's going on 
-in the actual spell functions (especially if you dig around in the source a 
-bit, and check out Chris Hadgis' excellent *****lua_spel.txt*0[spell.pkg] helper 
-files. I'm not going to go through the whole file line by line, as this is 
-something you should do yourself, figuring out what's going on. I'm going to 
-examine a few of the things we haven't covered before though, so pay attention.
-
-#####R=== The get_level() function ===
-
-Probably one of the most important functions that you see reappearing in the 
-file is the [[[[[Bget_level()] function. All this does is return the numerical 
-value of the power that is given as the first argument. So [[[[[Bget_level]
-[[[[[B(constructor_power)] will return the current level of the constructor power. 
-Given that the level of this is taken directly from the construction skill, (we 
-defined that in the [[[[[B"get_level"] key, by saying [[[[[Bget_skill_scale]
-[[[[[B(SKILL_CONSTRUCT, 50)] ) it will return the value of your construction skill. 
-[[[[[Bconstructor_power] is the name of the whole power, we named it thus on 
-the second line of the script!
-
-[[[[[Bget_level] takes the following arguments: [[[[[Bget_level(power, max, ]
-[[[[[Bmin)]. The power is obviously which power we're taking the value from, and the 
-max and min allow you to define boundaries for the spell. For instance the 
-current maximum value that [[[[[Bget_level(constructor_power)] can return is 
-50, as that is the maximum number of skill points you can have in that skill. 
-If you were using this as the basis for the damage of a low-level bolt spell, 
-you might decide that having a damage of 50 would be too much (unlikely, but 
-still possible). You could therefore define a maximum value of 20 so that when 
-the value of the construction skill was over 50, the maximum value for 
-damage of that spell would be 20. To achieve this you'd have: 
-[[[[[Bget_level(constructor_power, 20)]. In a similar way, you can force the 
-minimum value of the spell to be higher than the actual construction skill 
-level, with a [[[[[Bget_level(constructor_power, 50, 15)]. This would be useful 
-say for spells that you wanted to be available when the construction skill 
-level reaches 10, but for whom you wanted a (for example) base damage of 15 
-right from the word go. These re-scale values rather than capping them!
-
-You can leave out the minimum value as I have done above. You can also leave 
-the maximum value out (it will default to 50). If you want to specify a minimum 
-value though, you MUST specify a maximum value as well.
-
-As you have hopefully been able to tell, the [[[[[Bget_level()] function 
-enables us to have spells that increase in usefulness as you gain levels. Let's 
-take the "Dismantle" spell. The function in the [[[[[B"spell"] key is as 
-follows:
-
-#####Bfunction()
-#####B	local ret, dir, dam
-
-#####B	if (get_level(constructor_powers, 50) >= 11) then
-#####B		ret, dir = get_aim_dir();
-#####B		if (ret == FALSE) then return end
-#####B		fire_beam(GF_KILL_TRAP, dir, 1)
-#####B	else
-#####B		fire_ball(GF_KILL_TRAP, 0, 1, 1)
-#####B	end
-#####Bend,
-
-The [[[[[Bif] statement is obviously what really interests us here. You'll 
-notice that this has the amendment of an [[[[[Belse] clause, which the [[[[[Bif] 
-statement we used in the previous tutorial did not. As you would expect, if the 
-condition on the first line of this statement is met, then the instructions 
-immediately below it are carried out. If the condition is not met, then the 
-statements that follow the [[[[[Belse] are executed.
-
-Coming back to the [[[[[Bget_level] function, we learnt from above, that the 
-[[[[[Bget_level] part of this function translates as, "if the value of the 
-construction_power level (which happens to be identical to the construction 
-skill level) is greater than or equal to 11, cast a beam of trap disarming in 
-the specified direction. (The first part of this is all straightforward, 
-getting a direction, and cancelling correctly if the player presses 'ESC'.) 
-Otherwise, cast a ball of trap disarming with a radius of one, centred on the 
-player."
-
-In the same way, as you look at the construc.lua file, you will see that 
-[[[[[Bget_level()] is used many times in this way, to increase the power of 
-detection spells, to change bolt spells to ball spells, to keep a constantly 
-increasing damage going, and so on.
-
-#####R=== Elseif's and things ===
-
-If you want to provide more than one alternative condition, in an 
-[[[[[Bif-then-else] statement, you can use [[[[[Belseif]s which do what you 
-might expect. Take a look at the first spell, "Survey area", for an example of 
-this: 
-
-#####Bif (get_level(constructor_powers, 50) >= 28) then
-#####B	wiz_lite()
-#####Belseif (get_level(constructor_powers, 50) >= 15) then
-#####B	map_area()
-#####B	detect_traps(DEFAULT_RADIUS)
-#####Belseif (get_level(constructor_powers, 50) >= 5) then
-#####B	detect_traps(DEFAULT_RADIUS)
-#####B	detect_stairs(DEFAULT_RADIUS)
-#####B	detect_doors(DEFAULT_RADIUS)
-#####Belse 
-#####B	detect_stairs(DEFAULT_RADIUS)
-#####B	detect_doors(DEFAULT_RADIUS)
-#####Bend
-
-If the level of constructor powers is greater or equal to 28, then the function 
-[[[[[Bwiz_lite()] is performed, and no other part of the if statement is 
-executed. [[[[[Bwiz_lite()] is just the enlightenment spell. If it is less than 
-28, the next condition is examined: that if the level of constructor powers is 
-greater than or equal to 15, then [[[[[Bmap_area()](Magic mapping) and detect 
-traps are called. If the level of constructor power is less than 15, it moves 
-onto the next condition, which says that if the level of constructor power is 
-greater than 5, then detect stairs, traps and doors. If none of these 
-conditions are met,(that is, if the level of construction skill is less than 5) 
-then we just detect doors and stairs.
-
-You'll note that each of the detection spells includes a DEFAULT_RADIUS 
-constant. You could change this to a numerical value, or a variable defined 
-somewhere else in your script. eg [[[[[Bdetect_traps(2)] would detect traps 
-with a radius of 2 centred on the player. 
-
-#####R=== Registering the skill type ===
-
-This is what we do at the end of the file, and is what ties the powers we've 
-defined to the action of pressing the 'm' key in game. Once more we're calling 
-a special function [[[[[Badd_mkey()] which takes its arguments for a table. 
-There are only two keys in this table though which keeps things simple.
-
-#####Badd_mkey
-#####B{
-#####B        ["mkey"] =      MKEY_CONSTRUCT_POWERS,
-#####B        ["fct"] =       function()
-#####B         		execute_magic(constructor_powers)
-#####B                	energy_use = energy_use + 100;
-#####B        end
-#####B}
-
-[[[[[B"mkey"] must be a UNIQUE value > 1000 . Here I've defined it as a 
-constant, [[[[[BMKEY_CONSTRUCT_POWERS], which has the value 1004. This value 
-we'll call again in the s_info.txt file.
-[[[[[B"fct"] is the function that's called when the user presses the key in the 
-'m' menu. So here, it calls the [[[[[Bexecute_magic] function which actually 
-displays a list of powers for the user to choose from. The argument it takes is 
-the powers it will use (alchemy, mindcraft, etc., or in this case constructor), 
-and then the [[[[[Benergy_use] line tells the game to take one game turn to do 
-the action.
-
-#####R=== Adding the skill in s_info.txt ===
-
-Take a look in the s_info.txt file, under the Misc section. You'll see,
-
-#####BN:57:Construction
-#####BD:Ability to use constructor powers
-#####BD:Construction powers use strength
-#####BA:1004:Build or knock down stuff
-#####BI:1000
-
-The first line is the index of the skill; again this must be unique. The second 
-property is the name of the skill. The [[[[[BD] lines are the lines displayed 
-when the skill is highlighted in the skill screen.
-The first entry on the [[[[[BA] line  is the value of the [[[[[B"mkey"] we 
-defined in the [[[[[Badd_mkey] function in our script. The second entry is the 
-display for selecting the construction power in the 'm' menu.
-The [[[[[BI] line is currently unused, but add a 1000 there anyway. That's what 
-all the others have so when it's introduced, at least it will affect your 
-powers identically to how it affects all the other powers.
-
-If you scroll to the very bottom of the file now, you'll see I've placed the 
-skill at the bottom of the Misc branch of the skills tree. I then made a new 
-class, constructor, which you can see in p_info.txt. 
-
-That is all that is NEEDED when writing a script to add a skill - defining an 
-mkey using add_mkey, and defining any powers that are called in the 
-[[[[[B"fct"] (generally using [[[[[Badd_magic] ).
-
-And I've added the line
-
-#####Btome_dofile("construc.lua")
-
-in init.lua so the script is loaded on start-up!
-
-Below I'm going to talk in depth about a few other functions that you may find 
-useful in your scripting.
-
-#####R=== fire_bolt() and fire_beam() ===
-
-In the last help file we looked at the routine for firing a ball - 
-[[[[[Bfire_ball()]. Here's a quick note about beams and bolts...  
-[[[[[Bfire_beam()] and [[[[[Bfire_bolt()] take 2 arguments: 
-[[[[[B(type, direction, damage)]. So in the dismantle spell we have the 
-direction passed from [[[[[Bget_aim_dir()] (the function that asks the player 
-for a direction), the type of damage is [[[[[BGF_KILL_TRAP], which as you might 
-expect disarms traps. And the damage is only 1 because it's not going to hurt 
-monsters, just dismantle traps.
-
-#####R=== set_oppose_elec() ===
-
-OK here's another thing. Wander on down to the sparky_skills spell.  After the 
-appropriate bolt/ball is fired, we have the line:
-
-#####Bif player.oppose_elec == 0 then 
-#####B	set_oppose_elec(randint(10) + 20 + get_level(constructor_powers, 20)*3)
-#####Bend
-
-This is the bit that grants temporary resist electricity. We've called the 
-function [[[[[Bset_oppose_elec(turns)], which sets the player's resist
-electricity to "on" for the time specified in the argument "turns". We're only 
-calling this if the player is not already granted temporary resist electricity, 
-and we've linked the number of turns it is active to the level of the 
-construction skill. I've limited the maximum value of get_level to 20 in this 
-instance. A similar idea can be used for temporarily granting levitation, 
-extended infravision, protection against evil, resist fire, stuns, cuts and so 
-on and so on. Have a look in player.pkg in the source for a full list....
-
-                             [[[[[gThis file by fearoffours (fearoffours@moppy.co.uk)]
diff --git a/lib/mods/theme/help/lua_spel.txt b/lib/mods/theme/help/lua_spel.txt
deleted file mode 100644
index aa4a532b..00000000
--- a/lib/mods/theme/help/lua_spel.txt
+++ /dev/null
@@ -1,2150 +0,0 @@
-|||||oy
-
-#####R             /----------------------------------------\
-#####R            <      spell.pkg functions helper file     >
-#####R             \----------------------------------------/
-
-----------------------------------------------------------------------
-
-#####R=== teleport_player_directed ===
-
-#####GDeclaration
-    extern void teleport_player_directed(int rad, int dir);
-
-#####GFile
-    spells1.c
-
-#####GComment
-/*
- * Teleport player, using a distance and a direction as a rough guide.
- *
- * This function is not at all obsessive about correctness.
- * This function allows teleporting into vaults (!)
- */
-
-#####GDescription
-Teleport a player up to "rad" grids away roughly in "dir" direction.
-
-#####GParameters
-> "rad" must not exceed 200. The distance teleported is a minimum of a
-  quarter of "rad".
-> "dir" must be from 0 to 9.
-  *****fields.txt*0[direction]
-
-----------------------------------------------------------------------
-
-#####R=== teleport_away ===
-
-#####GDeclaration
-    extern void teleport_away(int m_idx, int dis);
-
-#####GFile
-    spells1.c
-
-#####GComment
-/*
- * Teleport a monster, normally up to "dis" grids away.
- *
- * Attempt to move the monster at least "dis/2" grids away.
- *
- * But allow variation to prevent infinite loops.
- */
-
-#####GDescription
-Teleport monster indicated by "m_idx" up to "dis" grids away.
-
-#####GParameters
-> "m_idx" is the index of the monster in m_list[].
-> "dis" must not exceed 200. The distance teleported is a minimum of a
-  quarter of "dis".
-
-----------------------------------------------------------------------
-
-#####R=== teleport_player ===
-
-#####GDeclaration
-    extern void teleport_player(int dis);
-
-#####GFile
-    spells1.c
-
-#####GComment
-/*
- * Teleport the player to a location up to "dis" grids away.
- *
- * If no such spaces are readily available, the distance may increase.
- * Try very hard to move the player at least a quarter that distance.
- */
-
-#####GDescription
-Teleport player up to "dis" grids away.
-
-#####GParameters
-> "dis" must not exceed 200. The distance teleported is a minimum of a
-  quarter of "dis".
-
-----------------------------------------------------------------------
-
-#####R=== teleport_player_to ===
-
-#####GDeclaration
-    extern void teleport_player_to(int ny, int nx);
-
-#####GFile
-    spells1.c
-
-#####GComment
-/*
- * Teleport player to a grid near the given location
- *
- * This function is slightly obsessive about correctness.
- * This function allows teleporting into vaults (!)
- */
-
-#####GDescription
-Teleport player to a grid near the given location ("ny", "nx"). If
-the location is empty, the player goes there, otherwise they go to
-a grid as close as possible to the location.
-
-#####GParameters
-> "ny" is the y co-ordinate of the location.
-> "nx" is the x co-ordinate of the location.
-
-----------------------------------------------------------------------
-
-#####R=== teleport_monster_to ===
-
-#####GDeclaration
-    extern void teleport_monster_to(int m_idx, int ny,
-        int nx);
-
-#####GFile
-    spells1.c
-
-#####GComment
-/*
- * Teleport a monster to a grid near the given location
- *
- * This function is slightly obsessive about correctness.
- */
-
-#####GDescription
-Teleport monster indicated by "m_idx" to a grid near the given
-location ("ny", "nx"). If the location is empty, the monster goes
-there, otherwise they go to a grid as close as possible to the
-location.
-
-#####GParameters
-> "m_idx" is the index of the monster in m_list[].
-> "ny" is the y co-ordinate of the location.
-> "nx" is the x co-ordinate of the location.
-
-----------------------------------------------------------------------
-
-#####R=== teleport_player_level ===
-
-#####GDeclaration
-    extern void teleport_player_level(void);
-
-#####GFile
-    spells1.c
-
-#####GComment
-/*
- * Teleport the player one level up or down (random when legal)
- */
-
-#####GDescription
-Teleport the player one level up or down at random.
-
-----------------------------------------------------------------------
-
-#####R=== recall_player ===
-
-#####GDeclaration
-    extern void recall_player(void);
-
-#####GFile
-    spells1.c
-
-#####GComment
-/*
- * Recall the player to town or dungeon
- */
-
-#####GDescription
-Recall the player to town (if in dungeon) or dungeon (if in town).
-
-----------------------------------------------------------------------
-
-#####R=== take_hit ===
-
-#####GDeclaration
-    extern void take_hit(int damage, cptr kb_str);
-
-#####GFile
-    spells1.c
-
-#####GComment
-/*
- * Decreases players hit points and sets death flag if necessary
- *
- * XXX XXX XXX Invulnerability needs to be changed into a "shield"
- *
- * XXX XXX XXX Hack -- this function allows the user to save (or quit)
- * the game when he dies, since the "You die." message is shown before
- * setting the player to "dead".
- */
-
-#####GDescription
-Reduce the player's current hit points by "damage" points. If the
-player dies, "kb_str" is used to record what the player was killed by
-(see high-score table).
-
-#####GParameters
-> "damage" is the amount of damage.
-> "kb_str" is a string describing what killed the player.
-
-----------------------------------------------------------------------
-
-#####R=== take_sanity_hit ===
-
-#####GDeclaration
-    extern void take_sanity_hit(int damage, cptr hit_from);
-
-#####GFile
-    spells1.c
-
-#####GComment
-/* Decrease player's sanity. This is a copy of the function above. */
-
-#####GDescription
-Reduce the player's current sanity points by "damage" points. If the
-player dies, "hit_from" is used to record what the player was killed
-by (see high-score table).
-
-#####GParameters
-> "damage" is the amount of damage.
-> "hit_from" is a string describing what killed the player.
-
-----------------------------------------------------------------------
-
-#####R=== project ===
-
-#####GDeclaration
-    extern bool project(int who, int rad, int y, int x,
-        int dam, int typ, int flg);
-
-#####GFile
-    spells1.c
-
-#####GComment
-/*
- * Generic "beam"/"bolt"/"ball" projection routine.
- *
- * Input:
- *   who: Index of "source" monster (negative for "player")
- *        jk -- -2 for traps, only used with project_jump
- *   rad: Radius of explosion (0 = beam/bolt, 1 to 9 = ball)
- *   y,x: Target location (or location to travel "towards")
- *   dam: Base damage roll to apply to affected monsters (or player)
- *   typ: Type of damage to apply to monsters (and objects)
- *   flg: Extra bit flags (see PROJECT_xxxx in "defines.h")
- *
- * Return:
- *   TRUE if any "effects" of the projection were observed, else FALSE
- *
- * Allows a monster (or player) to project a beam/bolt/ball of a given kind
- * towards a given location (optionally passing over the heads of interposing
- * monsters), and have it do a given amount of damage to the monsters (and
- * optionally objects) within the given radius of the final location.
- *
- * A "bolt" travels from source to target and affects only the target grid.
- * A "beam" travels from source to target, affecting all grids passed through.
- * A "ball" travels from source to the target, exploding at the target, and
- *   affecting everything within the given radius of the target location.
- *
- * Traditionally, a "bolt" does not affect anything on the ground, and does
- * not pass over the heads of interposing monsters, much like a traditional
- * missile, and will "stop" abruptly at the "target" even if no monster is
- * positioned there, while a "ball", on the other hand, passes over the heads
- * of monsters between the source and target, and affects everything except
- * the source monster which lies within the final radius, while a "beam"
- * affects every monster between the source and target, except for the casting
- * monster (or player), and rarely affects things on the ground.
- *
- * Two special flags allow us to use this function in special ways, the
- * "PROJECT_HIDE" flag allows us to perform "invisible" projections, while
- * the "PROJECT_JUMP" flag allows us to affect a specific grid, without
- * actually projecting from the source monster (or player).
- *
- * The player will only get "experience" for monsters killed by himself
- * Unique monsters can only be destroyed by attacks from the player
- *
- * Only 256 grids can be affected per projection, limiting the effective
- * "radius" of standard ball attacks to nine units (diameter nineteen).
- *
- * One can project in a given "direction" by combining PROJECT_THRU with small
- * offsets to the initial location (see "line_spell()"), or by calculating
- * "virtual targets" far away from the player.
- *
- * One can also use PROJECT_THRU to send a beam/bolt along an angled path,
- * continuing until it actually hits something (useful for "stone to mud").
- *
- * Bolts and Beams explode INSIDE walls, so that they can destroy doors.
- *
- * Balls must explode BEFORE hitting walls, or they would affect monsters
- * on both sides of a wall.  Some bug reports indicate that this is still
- * happening in 2.7.8 for Windows, though it appears to be impossible.
- *
- * We "pre-calculate" the blast area only in part for efficiency.
- * More importantly, this lets us do "explosions" from the "inside" out.
- * This results in a more logical distribution of "blast" treasure.
- * It also produces a better (in my opinion) animation of the explosion.
- * It could be (but is not) used to have the treasure dropped by monsters
- * in the middle of the explosion fall "outwards", and then be damaged by
- * the blast as it spreads outwards towards the treasure drop location.
- *
- * Walls and doors are included in the blast area, so that they can be
- * "burned" or "melted" in later versions.
- *
- * This algorithm is intended to maximise simplicity, not necessarily
- * efficiency, since this function is not a bottleneck in the code.
- *
- * We apply the blast effect from ground zero outwards, in several passes,
- * first affecting features, then objects, then monsters, then the player.
- * This allows walls to be removed before checking the object or monster
- * in the wall, and protects objects which are dropped by monsters killed
- * in the blast, and allows the player to see all affects before he is
- * killed or teleported away.  The semantics of this method are open to
- * various interpretations, but they seem to work well in practice.
- *
- * We process the blast area from ground-zero outwards to allow for better
- * distribution of treasure dropped by monsters, and because it provides a
- * pleasing visual effect at low cost.
- *
- * Note that the damage done by "ball" explosions decreases with distance.
- * This decrease is rapid, grids at radius "dist" take "1/dist" damage.
- *
- * Notice the "napalm" effect of "beam" weapons.  First they "project" to
- * the target, and then the damage "flows" along this beam of destruction.
- * The damage at every grid is the same as at the "centre" of a "ball"
- * explosion, since the "beam" grids are treated as if they ARE at the
- * centre of a "ball" explosion.
- *
- * Currently, specifying "beam" plus "ball" means that locations which are
- * covered by the initial "beam", and also covered by the final "ball", except
- * for the final grid (the epicentre of the ball), will be "hit twice", once
- * by the initial beam, and once by the exploding ball.  For the grid right
- * next to the epicentre, this results in 150% damage being done.  The centre
- * does not have this problem, for the same reason the final grid in a "beam"
- * plus "bolt" does not -- it is explicitly removed.  Simply removing "beam"
- * grids which are covered by the "ball" will NOT work, as then they will
- * receive LESS damage than they should.  Do not combine "beam" with "ball".
- *
- * The array "gy[],gx[]" with current size "grids" is used to hold the
- * collected locations of all grids in the "blast area" plus "beam path".
- *
- * Note the rather complex usage of the "gm[]" array.  First, gm[0] is always
- * zero.  Second, for N>1, gm[N] is always the index (in gy[],gx[]) of the
- * first blast grid (see above) with radius "N" from the blast centre.  Note
- * that only the first gm[1] grids in the blast area thus take full damage.
- * Also, note that gm[rad+1] is always equal to "grids", which is the total
- * number of blast grids.
- *
- * Note that once the projection is complete, (y2,x2) holds the final location
- * of bolts/beams, and the "epicentre" of balls.
- *
- * Note also that "rad" specifies the "inclusive" radius of projection blast,
- * so that a "rad" of "one" actually covers 5 or 9 grids, depending on the
- * implementation of the "distance" function.  Also, a bolt can be properly
- * viewed as a "ball" with a "rad" of "zero".
- *
- * Note that if no "target" is reached before the beam/bolt/ball travels the
- * maximum distance allowed (MAX_RANGE), no "blast" will be induced.  This
- * may be relevant even for bolts, since they have a "1x1" mini-blast.
- *
- * Note that for consistency, we "pretend" that the bolt actually takes "time"
- * to move from point A to point B, even if the player cannot see part of the
- * projection path.  Note that in general, the player will *always* see part
- * of the path, since it either starts at the player or ends on the player.
- *
- * Hack -- we assume that every "projection" is "self-illuminating".
- *
- * Hack -- when only a single monster is affected, we automatically track
- * (and recall) that monster, unless "PROJECT_JUMP" is used.
- *
- * Note that all projections now "explode" at their final destination, even
- * if they were being projected at a more distant destination.  This means
- * that "ball" spells will *always* explode.
- *
- * Note that we must call "handle_stuff()" after affecting terrain features
- * in the blast radius, in case the "illumination" of the grid was changed,
- * and "update_view()" and "update_monsters()" need to be called.
- */
-
-#####GDescription
-Generate a beam/bolt/ball starting from "who" with a radius of "rad"
-at target grid "y,x" for "damage" points of "typ" damage. The beam/
-bolt/ball can have various properties as denoted by "flg".
-
-#####GParameters
-> "who" is > 0 (index of monster in m_list[]), < 0 and
-  not -100 or -101 (player), -100 or -101 (trap).
-> "rad" is 0 for a beam/bolt and 1-9 for a ball.
-> "y" is the y co-ordinate of the target grid.
-> "x" is the x co-ordinate of the target grid.
-> "dam" is the number of points of damage.
-> "typ" is the type of damage
-  *****fields.txt*0[GF_fields]
-> "flg" is the projection effect
-  *****fields.txt*0[PROJECT_fields]
-
-----------------------------------------------------------------------
-
-#####R=== corrupt_player ===
-
-#####GDeclaration
-    extern void corrupt_player(void);
-
-#####GFile
-    spells1.c
-
-#####GComment
-(none)
-
-#####GDescription
-Swap two of the players stats at random.
-
-----------------------------------------------------------------------
-
-#####R=== grow_trees ===
-
-#####GDeclaration
-    extern void grow_trees(int rad);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Grow trees
- */
-
-#####GDescription
-Grow up to (("rad" x "rad") + 11) trees around the player.
-
-#####GParameters
-> "rad" is the radius of the area where trees may grow.
-
-----------------------------------------------------------------------
-
-#####R=== hp_player ===
-
-#####GDeclaration
-    extern bool hp_player(int num);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Increase players hit points, notice effects
- */
-
-#####GDescription
-Add "num" points to the player's current hit points. The total can
-not exceed the maximum.
-
-#####GParameters
-> "num" is the number of points to add.
-
-----------------------------------------------------------------------
-
-#####R=== heal_insanity ===
-
-#####GDeclaration
-    extern bool heal_insanity(int val);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/* Heal insanity. */
-
-#####GDescription
-Add "val" points to the player's current sanity points. The total can
-not exceed the maximum.
-
-#####GParameters
-> "val" is the number of points to add.
-
-----------------------------------------------------------------------
-
-#####R=== warding_glyph ===
-
-#####GDeclaration
-    extern void warding_glyph(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Leave a "glyph of warding" which prevents monster movement
- */
-
-#####GDescription
-Place a glyph at the player's location. The location must be bare.
-
-----------------------------------------------------------------------
-
-#####R=== explosive_rune ===
-
-#####GDeclaration
-    extern void explosive_rune(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-(none)
-
-#####GDescription
-Place a minor glyph (explosive rune) at the player's location. The
-location must be bare.
-
-----------------------------------------------------------------------
-
-#####R=== do_dec_stat ===
-
-#####GDeclaration
-    extern bool do_dec_stat(int stat, int mode);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Lose a "point"
- */
-
-#####GDescription
-Attempt to reduce the player's "stat" statistic by a point.
-
-#####GParameters
-> "stat" is the statistic
-  *****fields.txt*0[A_fields]
-> "mode" is the type of decrease: temporary, normal, or permanent
-  *****fields.txt*0[STAT_DEC_fields]
-
-----------------------------------------------------------------------
-
-#####R=== do_res_stat ===
-
-#####GDeclaration
-    extern bool do_res_stat(int stat);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Restore lost "points" in a stat
- */
-
-#####GDescription
-Restore the player's "stat" statistic.
-
-#####GParameters
-> "stat" is the statistic
-  *****fields.txt*0[A_fields]
-
-----------------------------------------------------------------------
-
-#####R=== do_inc_stat ===
-
-#####GDeclaration
-    extern bool do_inc_stat(int stat);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Gain a "point" in a stat
- */
-
-#####GDescription
-Increase the player's "stat" statistic by a point.
-
-#####GParameters
-> "stat" is the statistic
-  *****fields.txt*0[A_fields]
-
-----------------------------------------------------------------------
-
-#####R=== identify_pack ===
-
-#####GDeclaration
-    extern void identify_pack(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Identify everything being carried.
- * Done by a potion of "self knowledge".
- */
-
-#####GDescription
-Identify all items in the inventory.
-
-----------------------------------------------------------------------
-
-#####R=== remove_curse ===
-
-#####GDeclaration
-    extern bool remove_curse(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Remove most curses
- */
-
-#####GDescription
-Remove all curses except for heavy curses.
-
-----------------------------------------------------------------------
-
-#####R=== remove_all_curse ===
-
-#####GDeclaration
-    extern bool remove_all_curse(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Remove all curses
- */
-
-#####GDescription
-Remove all curses including heavy curses.
-
-----------------------------------------------------------------------
-
-#####R=== restore_level ===
-
-#####GDeclaration
-    extern bool restore_level(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Restores any drained experience
- */
-
-#####GDescription
-Restore all drained experience points (if any).
-
-----------------------------------------------------------------------
-
-#####R=== self_knowledge ===
-
-#####GDeclaration
-    extern void self_knowledge(FILE *fff);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * self-knowledge... idea from nethack.  Useful for determining powers and
- * resistances of items.  It saves the screen, clears it, then starts listing
- * attributes, a screenful at a time.  (There are a LOT of attributes to
- * list.  It will probably take 2 or 3 screens for a powerful character whose
- * using several artifacts...) -CFT
- *
- * It is now a lot more efficient. -BEN-
- *
- * See also "identify_fully()".
- *
- * XXX XXX XXX Use the "show_file()" method, perhaps.
- */
-
-#####GDescription
-Show all attributes including racial powers, mutations, and equipment
-effects.
-
-#####GParameters
-> "*ffff" points to a file (write info to file) or is NULL (write info
-  to screen).
-
-----------------------------------------------------------------------
-
-#####R=== lose_all_info ===
-
-#####GDeclaration
-    extern bool lose_all_info(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Forget everything
- */
-
-#####GDescription
-Forget about objects and the map.
-
-----------------------------------------------------------------------
-
-#####R=== detect_traps ===
-
-#####GDeclaration
-    extern bool detect_traps(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Detect all traps on current panel
- */
-
-#####GDescription
-Detect all traps on current panel.
-
-----------------------------------------------------------------------
-
-#####R=== detect_doors ===
-
-#####GDeclaration
-    extern bool detect_doors(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Detect all doors on current panel
- */
-
-#####GDescription
-Detect all doors on current panel.
-
-----------------------------------------------------------------------
-
-#####R=== detect_stairs ===
-
-#####GDeclaration
-    extern bool detect_stairs(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Detect all stairs on current panel
- */
-
-#####GDescription
-Detect all stairs on current panel.
-
-----------------------------------------------------------------------
-
-#####R=== detect_treasure ===
-
-#####GDeclaration
-    extern bool detect_treasure(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Detect any treasure on the current panel
- */
-
-#####GDescription
-Detect any treasure on the current panel.
-
-----------------------------------------------------------------------
-
-Field: hack_no_detect_message
-Value: FALSE
-
-----------------------------------------------------------------------
-
-#####R=== detect_objects_gold ===
-
-#####GDeclaration
-    extern bool detect_objects_gold(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Detect all "gold" objects on the current panel
- */
-
-#####GDescription
-Detect all objects with the TV_GOLD flag.
-
-----------------------------------------------------------------------
-
-#####R=== detect_objects_normal ===
-
-#####GDeclaration
-    extern bool detect_objects_normal(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Detect all "normal" objects on the current panel
- */
-
-#####GDescription
-Detect all objects without the TV_GOLD flag.
-
-----------------------------------------------------------------------
-
-#####R=== detect_objects_magic ===
-
-#####GDeclaration
-    extern bool detect_objects_magic(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Detect all "magic" objects on the current panel.
- *
- * This will light up all spaces with "magic" items, including artifacts,
- * ego-items, potions, scrolls, books, rods, wands, staves, amulets, rings,
- * and "enchanted" items of the "good" variety.
- *
- * It can probably be argued that this function is now too powerful.
- */
-
-#####GDescription
-Detect all "magic" objects which are artefacts, ego items, or have one
-of the following flags - TV_AMULET, TV_RING, TV_BATERIE, TV_STAFF,
-TV_WAND, TV_ROD, TV_ROD_MAIN, TV_SCROLL, TV_POTION, TV_POTION2,
-TV_VALARIN_BOOK, TV_MAGERY_BOOK, TV_SHADOW_BOOK, TV_CHAOS_BOOK,
-TV_SPIRIT_BOOK, TV_NETHER_BOOK, TV_DAEMON_BOOK, TV_CRUSADE_BOOK,
-TV_SIGALDRY_BOOK, TV_SYMBIOTIC_BOOK, TV_MUSIC_BOOK.
-
-----------------------------------------------------------------------
-
-#####R=== detect_monsters_normal ===
-
-#####GDeclaration
-    extern bool detect_monsters_normal(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Detect all "normal" monsters on the current panel
- */
-
-#####GDescription
-Detect all non-invisible monsters (without RF2_INVISIBLE).
-
-----------------------------------------------------------------------
-
-#####R=== detect_monsters_invis ===
-
-#####GDeclaration
-    extern bool detect_monsters_invis(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Detect all "invisible" monsters on current panel
- */
-
-#####GDescription
-Detect all invisible monsters (with RF2_INVISIBLE).
-
-----------------------------------------------------------------------
-
-#####R=== detect_monsters_evil ===
-
-#####GDeclaration
-    extern bool detect_monsters_evil(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Detect all "evil" monsters on current panel
- */
-
-#####GDescription
-Detect all evil monsters (with RF3_EVIL).
-
-----------------------------------------------------------------------
-
-#####R=== detect_monsters_good ===
-
-#####GDeclaration
-    extern bool detect_monsters_good(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/* Detect good monsters */
-
-#####GDescription
-Detect all good monsters (with RF3_GOOD).
-
-----------------------------------------------------------------------
-
-#####R=== detect_monsters_xxx ===
-
-#####GDeclaration
-    extern bool detect_monsters_xxx(u32b match_flag);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * A "generic" detect monsters routine, tagged to flags3
- */
-
-#####GDescription
-Detect all monsters with "match_flag" flag.
-
-#####GParameters
-> "match_flag" can be any RF3_ flag (see defines.h) but only
-  RF3_DEMON, RF3_UNDEAD, RF3_GOOD work.
-
-----------------------------------------------------------------------
-
-#####R=== detect_monsters_string ===
-
-#####GDeclaration
-    extern bool detect_monsters_string(cptr);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Detect all (string) monsters on current panel
- */
-
-#####GDescription
-Detect all monsters whose default monster character matches a
-character pointed to by "cptr".
-
-#####GParameters
-> "cptr" is a pointer to a single character, eg 'Z' for hounds. For
-  available characters, see the "symbol" field of the graphics (G)
-  line of r_info.txt.
-
-----------------------------------------------------------------------
-
-#####R=== detect_monsters_nonliving ===
-
-#####GDeclaration
-    extern bool detect_monsters_nonliving(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Detect all "nonliving", "undead" or "demonic" monsters on current panel
- */
-
-#####GDescription
-Detect all non-living monsters (with RF3_NONLIVING, RF3_UNDEAD, or
-RF3_DEMON).
-
-----------------------------------------------------------------------
-
-#####R=== detect_all ===
-
-#####GDeclaration
-    extern bool detect_all(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Detect everything
- */
-
-#####GDescription
-Detects traps, doors, stairs, treasure, gold objects, normal objects,
-invisible monsters, normal (visible) monsters.
-
-----------------------------------------------------------------------
-
-#####R=== stair_creation ===
-
-#####GDeclaration
-    extern void stair_creation(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Create stairs at the player location
- */
-
-#####GDescription
-Create stairs at the player location. This is not allowed if the grid
-is not empty, the player is not in a dungeon, the player is on a
-special level, the player is in an arena or quest. If the player is
-in the town or wilderness the stairs will go down. If the player is
-on a quest level or at the bottom of a dungeon, the stairs will go up.
-Otherwise there is an even chance the stairs will go up or down.
-
-----------------------------------------------------------------------
-
-#####R=== wall_stone ===
-
-#####GDeclaration
-    extern bool wall_stone(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-(none)
-
-#####GDescription
-Create a stone wall on the player's grid. This function uses the
-project() function to create the stone wall. Apparently zero can be
-used as the "who" parameter for the player. See details for the
-project() function elsewhere in this document.
-
-----------------------------------------------------------------------
-
-#####R=== create_artifact ===
-
-#####GDeclaration
-    extern bool create_artifact(object_type *o_ptr,
-        bool a_scroll, bool get_name);
-
-#####GFile
-    randart.c
-
-#####GComment
-(none)
-
-#####GDescription
-Create an artifact from object "*optr".
-
-#####GParameters
-> "*optr* is a pointer to an object
-> "a_scroll" is true if the artifact is created by reading a scroll
-> "get_name" is true if the artifact is to be named by the player (if
-  a_scroll is true) or created randomly (a_scroll is false), or false
-  if an inscription is used.
-
-----------------------------------------------------------------------
-
-#####R=== ident_spell ===
-
-#####GDeclaration
-    extern bool ident_spell(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Identify an object in the inventory (or on the floor)
- * This routine does *not* automatically combine objects.
- * Returns TRUE if something was identified, else FALSE.
- */
-
-#####GDescription
-Identify an object in the inventory (or on the floor).
-
-----------------------------------------------------------------------
-
-#####R=== identify_fully ===
-
-#####GDeclaration
-    extern bool identify_fully(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Fully "identify" an object in the inventory  -BEN-
- * This routine returns TRUE if an item was identified.
- */
-
-#####GDescription
-Fully "identify" an object in the inventory (or on the floor).
-
-----------------------------------------------------------------------
-
-#####R=== recharge ===
-
-#####GDeclaration
-    extern bool recharge(int num);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Recharge a wand/staff/rod from the pack or on the floor.
- * This function has been rewritten in Oangband. -LM-
- *
- * Mage -- Recharge I --> recharge(90)
- * Mage -- Recharge II --> recharge(150)
- * Mage -- Recharge III --> recharge(220)
- *
- * Priest or Necromancer -- Recharge --> recharge(140)
- *
- * Scroll of recharging --> recharge(130)
- * Scroll of *recharging* --> recharge(200)
- *
- * It is harder to recharge high level, and highly charged wands,
- * staffs, and rods.  The more wands in a stack, the more easily and
- * strongly they recharge.  Staffs, however, each get fewer charges if
- * stacked.
- *
- * XXX XXX XXX Beware of "sliding index errors".
- */
-
-#####GDescription
-Recharge an object in the inventory (or on the floor) with "num"
-power.
-
-#####GParameters
-> "num" is the power used in recharging. It is compared to the
-  object's level to determine whether the item is recharged
-  successfully or destroyed. If it is recharged, it also determines
-  how many charges are added, or how much recharge time is reduced.
-
-----------------------------------------------------------------------
-
-#####R=== aggravate_monsters ===
-
-#####GDeclaration
-    extern void aggravate_monsters(int who);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Wake up all monsters, and speed up "los" monsters.
- */
-
-#####GDescription
-Aggravate monsters, originating from "who".
-
-#####GParameters
-> "who" is the index of monster in m_list[] (1 if it is the player)
-  which triggers the aggravation;
-
-----------------------------------------------------------------------
-
-#####R=== genocide ===
-
-#####GDeclaration
-    extern bool genocide(bool player_cast);
-
-#####GFile
-    spells2.c
-
-#####GComment
-(none)
-
-#####GDescription
-Genocide a monster race.
-
-#####GParameters
-> "player_cast" is true if the player cast the spell so the player can
-  take damage.
-
-----------------------------------------------------------------------
-
-#####R=== mass_genocide ===
-
-#####GDeclaration
-    extern bool mass_genocide(bool player_cast);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Delete all nearby (non-unique) monsters
- */
-
-#####GDescription
-Delete all nearby (non-unique) monsters.
-
-#####GParameters
-> "player_cast" is true if the player cast the spell so the player can
-  take damage.
-
-----------------------------------------------------------------------
-
-#####R=== probing ===
-
-#####GDeclaration
-    extern bool probing(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Probe nearby monsters
- */
-
-#####GDescription
-Probe all nearby monsters.
-
-----------------------------------------------------------------------
-
-#####R=== banish_evil ===
-
-#####GDeclaration
-    extern bool banish_evil(int dist);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Banish evil monsters
- */
-
-#####GDescription
-Banish nearby evil monsters doing "dist" points of GF_AWAY_EVIL
-damage.
-
-#####GParameters
-> "dist" is the amount of damage done to each monster.
-
-----------------------------------------------------------------------
-
-#####R=== dispel_evil ===
-
-#####GDeclaration
-    extern bool dispel_evil(int dam);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Dispel evil monsters
- */
-
-#####GDescription
-Dispel nearby evil monsters doing "dam" points of GF_DISP_EVIL
-damage.
-
-#####GParameters
-> "dam" is the number of points of damage.
-
-----------------------------------------------------------------------
-
-#####R=== dispel_good ===
-
-#####GDeclaration
-    extern bool dispel_good(int dam);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Dispel good monsters
- */
-
-#####GDescription
-Dispel nearby good monsters doing "dam" points of GF_DISP_GOOD
-damage.
-
-#####GParameters
-> "dam" is the number of points of damage.
-
-----------------------------------------------------------------------
-
-#####R=== dispel_undead ===
-
-#####GDeclaration
-    extern bool dispel_undead(int dam);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Dispel undead monsters
- */
-
-#####GDescription
-Dispel nearby undead monsters doing "dam" points of GF_DISP_UNDEAD
-damage.
-
-#####GParameters
-> "dam" is the number of points of damage.
-
-----------------------------------------------------------------------
-
-#####R=== dispel_monsters ===
-
-#####GDeclaration
-    extern bool dispel_monsters(int dam);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Dispel all monsters
- */
-
-#####GDescription
-Dispel all nearby monsters doing "dam" points of GF_DISP_ALL
-damage.
-
-#####GParameters
-> "dam" is the number of points of damage.
-
-----------------------------------------------------------------------
-
-#####R=== dispel_living ===
-
-#####GDeclaration
-    extern bool dispel_living(int dam);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Dispel 'living' monsters
- */
-
-#####GDescription
-Dispel nearby living monsters doing "dam" points of GF_DISP_LIVING
-damage.
-
-#####GParameters
-> "dam" is the number of points of damage.
-
-----------------------------------------------------------------------
-
-#####R=== dispel_demons ===
-
-#####GDeclaration
-    extern bool dispel_demons(int dam);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Dispel demons
- */
-
-#####GDescription
-Dispel nearby demon monsters doing "dam" points of GF_DISP_DEMON
-damage.
-
-#####GParameters
-> "dam" is the number of points of damage.
-
-----------------------------------------------------------------------
-
-#####R=== turn_undead ===
-
-#####GDeclaration
-    extern bool turn_undead(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Turn undead
- */
-
-#####GDescription
-Turn nearby undead monsters doing a point of GF_TURN_UNDEAD damage for
-each player level.
-
-----------------------------------------------------------------------
-
-#####R=== wipe ===
-
-#####GDeclaration
-    extern void wipe(int y1, int x1, int r);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Wipe -- Empties a part of the dungeon
- */
-
-#####GDescription
-Delete monsters and objects from an area of the dungeon centred at
-grid "y1,x1" for a radius "r". This does not work on special levels or
-quests. The player may be blinded. The player forgets the affected
-area and it becomes dark. All grids become floor.
-
-#####GParameters
-> "y1" is the y-coordinate of the wipe's origin.
-> "x1" is the x-coordinate of the wipe's origin.
-> "r" is the radius of the wipe.
-
-----------------------------------------------------------------------
-
-#####R=== destroy_area ===
-
-#####GDeclaration
-    extern void destroy_area(int y1, int x1, int r,
-        bool full);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * The spell of destruction
- *
- * This spell "deletes" monsters (instead of "killing" them).
- *
- * Later we may use one function for both "destruction" and
- * "earthquake" by using the "full" to select "destruction".
- */
-
-#####GDescription
-Delete monsters and objects from an area of the dungeon centred at
-grid "y1,x1" for a radius "r". This does not work on special levels or
-quests. The epicentre is NOT affected. The player may be blinded. The
-player forgets the affected area and it becomes dark. The grids can
-become granite, quartz, magma, or floor.
-
-#####GParameters
-> "y1" is the y-coordinate of the destruction's origin.
-> "x1" is the x-coordinate of the destruction's origin.
-> "r" is the radius of the destruction.
-> "full" is currently unused.
-
-----------------------------------------------------------------------
-
-#####R=== earthquake ===
-
-#####GDeclaration
-    extern void earthquake(int cy, int cx, int r);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Induce an "earthquake" of the given radius at the given location.
- *
- * This will turn some walls into floors and some floors into walls.
- *
- * The player will take damage and "jump" into a safe grid if possible,
- * otherwise, he will "tunnel" through the rubble instantaneously.
- *
- * Monsters will take damage, and "jump" into a safe grid if possible,
- * otherwise they will be "buried" in the rubble, disappearing from
- * the level in the same way that they do when genocided.
- *
- * Note that thus the player and monsters (except eaters of walls and
- * passers through walls) will never occupy the same grid as a wall.
- * Note that as of now (2.7.8) no monster may occupy a "wall" grid, even
- * for a single turn, unless that monster can pass_walls or kill_walls.
- * This has allowed massive simplification of the "monster" code.
- */
-
-#####GDescription
-Create an earthquake centred on grid "cy,cx" with a radius of "r".
-This does not work on quest levels. The epicentre is NOT affected.
-Only about 15% of the grids are affected. The player takes 300 points
-of damage if they can't be moved to a safe grid, otherwise damage is
-from 10 to 40 points. The player forgets the affected area and it
-becomes dark. The grids can become granite, quartz, magma, or floor.
-
-#####GParameters
-Parameters:
-> "cy" is the y-coordinate of the earthquake origin.
-> "cx" is the x-coordinate of the earthquake origin.
-> "r" is the radius of the earthquake.
-
-----------------------------------------------------------------------
-
-#####R=== map_area ===
-
-#####GDeclaration
-    extern void map_area(void);
-
-#####GFile
-    cave.c
-
-#####GComment
-/*
- * Hack -- map the current panel (plus some) ala "magic mapping"
- */
-
-#####GDescription
-Map the current panel plus up to 10 grids up and down, and up to 20
-grids left and right.
-
-----------------------------------------------------------------------
-
-#####R=== wiz_lite ===
-
-#####GDeclaration
-    extern void wiz_lite(void);
-
-#####GFile
-    cave.c
-
-#####GComment
-/*
- * Light up the dungeon using "clairvoyance"
- *
- * This function "illuminates" every grid in the dungeon, memorises all
- * "objects", memorises all grids as with magic mapping, and, under the
- * standard option settings (view_perma_grids but not view_torch_grids)
- * memorises all floor grids too.
- *
- * Note that if "view_perma_grids" is not set, we do not memorise floor
- * grids, since this would defeat the purpose of "view_perma_grids", not
- * that anyone seems to play without this option.
- *
- * Note that if "view_torch_grids" is set, we do not memorise floor grids,
- * since this would prevent the use of "view_torch_grids" as a method to
- * keep track of what grids have been observed directly.
- */
-
-#####GDescription
-Light up the entire dungeon and show all monsters and objects.
-
-----------------------------------------------------------------------
-
-#####R=== wiz_lite_extra ===
-
-#####GDeclaration
-    extern void wiz_lite_extra(void);
-
-#####GFile
-    cave.c
-
-#####GComment
-(none)
-
-#####GDescription
-Light up the entire dungeon and show all monsters and objects. All
-squares are lit and remembered.
-
-----------------------------------------------------------------------
-
-#####R=== wiz_dark ===
-
-#####GDeclaration
-    extern void wiz_dark(void);
-
-#####GFile
-    cave.c
-
-#####GComment
-/*
- * Forget the dungeon map (ala "Thinking of Maud...").
- */
-
-#####GDescription
-Forget all grids and objects. All grids become dark.
-
-----------------------------------------------------------------------
-
-#####R=== lite_room ===
-
-#####GDeclaration
-    extern void lite_room(int y1, int x1);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Illuminate any room containing the given location.
- */
-
-#####GDescription
-Light up the room (if any) of grid "y1,x1".
-
-#####GParameters
-> "y1" is the y-coordinate of the grid.
-> "x1" is the x-coordinate of the grid.
-
-----------------------------------------------------------------------
-
-#####R=== unlite_room ===
-
-#####GDeclaration
-    extern void unlite_room(int y1, int x1);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Darken all rooms containing the given location
- */
-
-#####GDescription
-Darken all rooms (if any) of grid "y1,x1".
-
-#####GParameters
-> "y1" is the y-coordinate of the grid.
-> "x1" is the x-coordinate of the grid.
-
-----------------------------------------------------------------------
-
-#####R=== lite_area ===
-
-#####GDeclaration
-    extern bool lite_area(int dam, int rad);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Hack -- call light around the player
- * Affect all monsters in the projection radius
- */
-
-#####GDescription
-Light up the room (if any) of the player's grid. Monsters take "dam"
-points of GF_LITE_WEAK damage if they are within "r" grids of the
-player.
-
-#####GParameters
-> "dam" is the number of points of damage.
-> "rad" is the radius of the effect of the damage.
-
-----------------------------------------------------------------------
-
-#####R=== unlite_area ===
-
-#####GDeclaration
-    extern bool unlite_area(int dam, int rad);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Hack -- call darkness around the player
- * Affect all monsters in the projection radius
- */
-
-#####GDescription
-Darken the room (if any) of the player's grid. Monsters take "dam"
-points of GF_DARK_WEAK damage if they are within "r" grids of the
-player.
-
-#####GParameters
-> "dam" is the number of points of damage.
-> "rad" is the radius of the effect of the damage.
-
-----------------------------------------------------------------------
-
-#####R=== fire_ball_beam ===
-
-#####GDeclaration
-    extern bool fire_ball_beam(int typ, int dir, int dam,
-        int rad);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Cast a ball-beamed spell
- * Stop if we hit a monster, act as a "ball"
- * Allow "target" mode to pass over monsters
- * Affect grids, objects, and monsters
- */
-
-#####GDescription
-Cast a ball-beamed spell of type "typ" in direction "dir" for damage
-"dam" points with a radius of "rad" grids.
-
-#####GParameters
-> "typ" is the type of damage
-  *****fields.txt*0[GF_fields]
-> "dir" must be from 0 to 9.
-  *****fields.txt*0[direction]
-> "dam" is the number of points of damage.
-> "rad" is the radius of the effect of the damage (must be <= 16).
-
-----------------------------------------------------------------------
-
-#####R=== fire_ball ===
-
-#####GDeclaration
-    extern bool fire_ball(int typ, int dir, int dam, int rad);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Cast a ball spell
- * Stop if we hit a monster, act as a "ball"
- * Allow "target" mode to pass over monsters
- * Affect grids, objects, and monsters
- */
-
-#####GDescription
-Cast a ball spell of type "typ" in direction "dir" for "dam" points of
-damage. The ball has a radius of "rad" grids.
-
-#####GParameters
-> "typ" is the type of damage
-  *****fields.txt*0[GF_fields]
-> "dir" must be from 0 to 9.
-  *****fields.txt*0[direction]
-> "dam" is the number of points of damage.
-> "rad" is the radius of the effect of the damage (must be <= 16).
-
-----------------------------------------------------------------------
-
-#####R=== fire_bolt ===
-
-#####GDeclaration
-    extern bool fire_bolt(int typ, int dir, int dam);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Cast a bolt spell
- * Stop if we hit a monster, as a "bolt"
- * Affect monsters (not grids or objects)
- */
-
-#####GDescription
-Cast a bolt spell of type "typ" in direction "dir" for "dam" points of
-damage.
-
-#####GParameters
-> "typ" is the type of damage
-  *****fields.txt*0[GF_fields]
-> "dir" must be from 0 to 9
-  *****fields.txt*0[direction]
-> "dam" is the number of points of damage.
-
-----------------------------------------------------------------------
-
-#####R=== fire_beam ===
-
-#####GDeclaration
-    extern bool fire_beam(int typ, int dir, int dam);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Cast a beam spell
- * Pass through monsters, as a "beam"
- * Affect monsters (not grids or objects)
- */
-
-#####GDescription
-Cast a beam spell of type "typ" in direction "dir" for "dam" points of
-damage.
-
-#####GParameters
-> "typ" is the type of damage
-  *****fields.txt*0[GF_fields]
-> "dir" must be from 0 to 9.
-  *****fields.txt*0[direction]
-> "dam" is the number of points of damage.
-
-----------------------------------------------------------------------
-
-#####R=== fire_druid_ball ===
-
-#####GDeclaration
-    extern bool fire_druid_ball(int typ, int dir, int dam,
-        int rad);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Cast a druidic ball spell
- * Stop if we hit a monster, act as a "ball"
- * Allow "target" mode to pass over monsters
- * Affect grids, objects, and monsters
- */
-
-#####GDescription
-Cast a ball spell of type "typ" in direction "dir" for "dam" points of
-damage. The ball has a radius of "rad" grids. The spell follows a mana
-path.
-
-#####GParameters
-> "typ" is the type of damage
-  *****fields.txt*0[GF_fields]
-> "dir" must be from 0 to 9.
-  *****fields.txt*0[direction]
-> "dam" is the number of points of damage.
-> "rad" is the radius of the effect of the damage (must be <= 16).
-
-----------------------------------------------------------------------
-
-#####R=== fire_druid_bolt ===
-
-#####GDeclaration
-    extern bool fire_druid_bolt(int typ, int dir, int dam);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Cast a druidic bolt spell
- * Stop if we hit a monster, as a "bolt"
- * Affect monsters (not grids or objects)
- */
-
-#####GDescription
-Cast a bolt spell of type "typ" in direction "dir" for "dam" points of
-damage. The spell follows a mana path.
-
-#####GParameters
-> "typ" is the type of damage
-  *****fields.txt*0[GF_fields]
-> "dir" must be from 0 to 9.
-  *****fields.txt*0[direction]
-> "dam" is the number of points of damage.
-
-----------------------------------------------------------------------
-
-#####R=== fire_druid_beam ===
-
-#####GDeclaration
-    extern bool fire_druid_beam(int typ, int dir, int dam);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Cast a druidistic beam spell
- * Pass through monsters, as a "beam"
- * Affect monsters (not grids or objects)
- */
-
-#####GDescription
-Cast a beam spell of type "typ" in direction "dir" for "dam" points of
-damage. The spell follows a mana path.
-
-#####GParameters
-> "typ" is the type of damage
-  *****fields.txt*0[GF_fields]
-> "dir" must be from 0 to 9.
-  *****fields.txt*0[direction]
-> "dam" is the number of points of damage.
-
-----------------------------------------------------------------------
-
-#####R=== fire_bolt_or_beam ===
-
-#####GDeclaration
-    extern bool fire_bolt_or_beam(int prob, int typ, int dir,
-        int dam);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Cast a bolt spell, or rarely, a beam spell
- */
-
-#####GDescription
-Cast a beam (chance of "prob" in 100) or bolt spell of type "typ" in
-direction "dir" for "dam" points of damage.
-
-#####GParameters
-> "prob" is the number of times out of 100 that the bolt will actually
-  be a beam. Obviously this value should range from 1 to 99 (0 will
-  always give a beam, 100 or higher will always give a beam. There are
-  separate functions for these cases).
-> "typ" is the type of damage
-  *****fields.txt*0[GF_fields]
-> "dir" must be from 0 to 9.
-  *****fields.txt*0[direction]
-> "dam" is the number of points of damage.
-
-----------------------------------------------------------------------
-
-#####R=== alchemy ===
-
-#####GDeclaration
-    extern bool alchemy(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/* Turns an object into gold, gain some of its value in a shop */
-
-#####GDescription
-The player selects an object (and quantity if it applies) from the
-inventory or the floor and attempts to turn it into gold. If the
-price of the item is < 0 then the player gains nothing (fool's gold),
-otherwise the player gets a third of the price in gold. Artifacts are
-not affected.
-
-----------------------------------------------------------------------
-
-#####R=== alter_reality ===
-
-#####GDeclaration
-    extern void alter_reality(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-(none)
-
-#####GDescription
-The player leaves the level immediately.
-
-----------------------------------------------------------------------
-
-#####R=== teleport_swap ===
-
-#####GDeclaration
-    extern void teleport_swap(int dir);
-
-#####GFile
-    spells2.c
-
-#####GComment
-(none)
-
-#####GDescription
-Player swaps places with target in direction "dir". The target must be
-a monster. It will not work if the space-time continuum can not be
-disrupted or if the monster resists teleportation.
-
-----------------------------------------------------------------------
-
-#####R=== project_meteor ===
-
-#####GDeclaration
-    extern void project_meteor(int radius, int typ, int dam,
-        u32b flg);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Apply a "project()" a la meteor shower
- */
-
-#####GDescription
-Generate between "rad" and "rad" x 2 ball spells of type "typ" for
-"dam" points of damage. The ball can have various properties as
-denoted by "flg".
-
-#####GParameters
-> "rad" is the minimum number of balls created. "rad" + randint("rad")
-  balls are created. Each ball has a radius of 2 grids. Each target
-  grid is within 5 grids of the player.
-> "typ" is the type of damage
-  *****fields.txt*0[GF_fields]
-> "dam" is the number of points of damage.
-> "flg" is the projection effect
-  *****fields.txt*0[PROJECT_fields]
-
-----------------------------------------------------------------------
-
-#####R=== passwall ===
-
-#####GDeclaration
-    extern bool passwall(int dir, bool safe);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Send the player shooting through walls in the given direction until
- * they reach a non-wall space, or a monster, or a permanent wall.
- */
-
-#####GDescription
-Move the player through walls in direction "dir". if "safe" then the
-player can not end up in a wall - if they do, the wall is replaced by
-a floor. This does not work in the wilderness, on quest levels, or if
-teleport is not allowed. Stopping on monsters or inside vaults is not
-allowed.
-
-#####GParameters
-> "dir" must be from 0 to 9. It can not be 5.
-  *****fields.txt*0[direction]
-> "safe" must be true if the player is not to be trapped in a wall
-  when the movement is finished.
-
-----------------------------------------------------------------------
-
-#####R=== project_hook ===
-
-#####GDeclaration
-    extern bool project_hook(int typ, int dir, int dam,
-        int flg);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Hack -- apply a "projection()" in a direction (or at the target)
- */
-
-#####GDescription
-Generate a beam/bolt of type "typ" in direction "dir" (or at a target)
-for "dam" points of damage. The beam/bolt can have various properties
-as denoted by "flg".
-
-#####GParameters
-> "typ" is the type of damage
-  *****fields.txt*0[GF_fields]
-> "dir" must be from 0 to 9. 5 means use the current target.
-  *****fields.txt*0[direction]
-> "dam" is the number of points of damage.
-> "flg" is the projection effect
-  *****fields.txt*0[PROJECT_fields]
-
-----------------------------------------------------------------------
-
-#####R=== reset_recall ===
-
-#####GDeclaration
-    extern bool reset_recall(void);
-
-#####GFile
-    spells2.c
-
-#####GComment
-(none)
-
-#####GDescription
-Ask the player for a dungeon and appropriate level within the dungeon.
-The player can not specify a dungeon they have not gone to yet. If the
-player chooses levels 99 or 100, the level is set to 98.
-
-----------------------------------------------------------------------
-
-#####R=== get_aim_dir ===
-
-#####GDeclaration
-    extern bool get_aim_dir(int *dp = 0);
-
-#####GFile
-    xtra2.c
-
-#####GComment
-/*
- * Get an "aiming direction" from the user.
- *
- * The "dir" is loaded with 1,2,3,4,6,7,8,9 for "actual direction", and
- * "0" for "current target", and "-1" for "entry aborted".
- *
- * Note that "Force Target", if set, will pre-empt user interaction,
- * if there is a usable target already set.
- *
- * Note that confusion over-rides any (explicit?) user choice.
- */
-
-#####GDescription
-Get an aiming direction from the user and store it in "dp". A target
-can be selected. If the player is confused, the direction will be
-random.
-
-#####GParameters
-> "dp" = player direction.
-
-----------------------------------------------------------------------
-
-#####R=== project_hack ===
-
-#####GDeclaration
-    extern bool project_hack(int typ, int dam);
-
-#####GFile
-    spells2.c
-
-#####GComment
-/*
- * Apply a "project()" directly to all viewable monsters
- *
- * Note that affected monsters are NOT auto-tracked by this usage.
- */
-
-#####GDescription
-Generate beam/bolt spells of type "typ" for "dam" points of damage to
-all viewable monsters in line of site.
-
-#####GParameters
-> "typ" is the type of damage
-  *****fields.txt*0[GF_fields]
-> "dam" is the number of points of damage.
-
-----------------------------------------------------------------------
-
-
-Back to the *****lua.hlp*0[lua help index] .
-
-                                                     [[[[[gThis file by Chris Hadgis]
diff --git a/lib/mods/theme/help/lua_util.txt b/lib/mods/theme/help/lua_util.txt
deleted file mode 100644
index 8886a2b4..00000000
--- a/lib/mods/theme/help/lua_util.txt
+++ /dev/null
@@ -1,898 +0,0 @@
-|||||oy
-
-#####R             /----------------------------------------\
-#####R            <      util.pkg functions helper file      >
-#####R             \----------------------------------------/
-
-----------------------------------------------------------------------
-
-#####R=== bst ===
-
-#####GDeclaration
-    s32b bst(s32b what, s32b t);
-
-#####GFile
-    util.c
-
-#####GComment
-/*
- * Break scalar time
- */
-
-#####GDescription
-Return the minute, hour, day, or year for turn "t". One turn takes 7.5
-seconds.
-
-#####GParameters
-> "what" is the unit to be returned and must be one of
-  MINUTE (number of turns per minute, which is 8)
-  HOUR   (number of turns per hour, which is 480)
-  DAY    (number of turns per day, which is 11,520)
-  YEAR   (number of turns per year, which is 4,204,800)
-> "t" is the number of turns.
-
-----------------------------------------------------------------------
-
-#####R=== path_build ===
-
-#####GDeclaration
-    errr path_build(char *buf, int max, cptr path, cptr file);
-
-#####GFile
-    util.c
-
-#####GComment
-/*
-* Create a new path by appending a file (or directory) to a path
-*
-* This requires no special processing on simple machines, except
-* for verifying the size of the filename, but note the ability to
-* bypass the given "path" with certain special file-names.
-*
-* Note that the "file" may actually be a "sub-path", including
-* a path and a file.
-*
-* Note that this function yields a path which must be "parsed"
-* using the "parse" function above.
-*/
-
-#####GDescription
-Append file "file" to path "path" and return the result in "buf". The
-length of "buf" is a maximum of "max" characters. If "file" starts
-with '~' then return "file". If "file" starts with the path separator
-and the path separator is not blank then return "file". If there is no
-path then return "file". Otherwise return "path" + path separator +
-"file". The path separator is defined in "H-config.h".
-
-#####GParameters
-> "buf" contains the new path.
-> "max" is the maximum number of characters allowed in "buf".
-> "path" is the original path.
-> "file" is the original file.
-
-----------------------------------------------------------------------
-
-#####R=== move_cursor ===
-
-#####GDeclaration
-    void move_cursor(int row, int col);
-
-#####GFile
-    util.c
-
-#####GComment
-/*
-* Move the cursor
-*/
-
-#####GDescription
-Move the cursor to row "row" and column "col".
-
-#####GParameters
-> "row" is the row the cursor is to be moved to.
-> "col" is the column the cursor is to be moved to.
-
-----------------------------------------------------------------------
-
-#####R=== inkey ===
-
-#####GDeclaration
-    char inkey(void);
-
-#####GFile
-    util.c
-
-#####GComment
-/*
-* Get a keypress from the user.
-*
-* This function recognises a few "global parameters".  These are variables
-* which, if set to TRUE before calling this function, will have an effect
-* on this function, and which are always reset to FALSE by this function
-* before this function returns.  Thus they function just like normal
-* parameters, except that most calls to this function can ignore them.
-*
-* If "inkey_xtra" is TRUE, then all pending keypresses will be flushed,
-* and any macro processing in progress will be aborted.  This flag is
-* set by the "flush()" function, which does not actually flush anything
-* itself, but rather, triggers delayed input flushing via "inkey_xtra".
-*
-* If "inkey_scan" is TRUE, then we will immediately return "zero" if no
-* keypress is available, instead of waiting for a keypress.
-*
-* If "inkey_base" is TRUE, then all macro processing will be bypassed.
-* If "inkey_base" and "inkey_scan" are both TRUE, then this function will
-* not return immediately, but will wait for a keypress for as long as the
-* normal macro matching code would, allowing the direct entry of macro
-* triggers.  The "inkey_base" flag is extremely dangerous!
-*
-* If "inkey_flag" is TRUE, then we will assume that we are waiting for a
-* normal command, and we will only show the cursor if "hilite_player" is
-* TRUE (or if the player is in a store), instead of always showing the
-* cursor.  The various "main-xxx.c" files should avoid saving the game
-* in response to a "menu item" request unless "inkey_flag" is TRUE, to
-* prevent savefile corruption.
-*
-* If we are waiting for a keypress, and no keypress is ready, then we will
-* refresh (once) the window which was active when this function was called.
-*
-* Note that "back-quote" is automatically converted into "escape" for
-* convenience on machines with no "escape" key.  This is done after the
-* macro matching, so the user can still make a macro for "backquote".
-*
-* Note the special handling of "ascii 30" (ctrl-caret, aka ctrl-shift-six)
-* and "ascii 31" (ctrl-underscore, aka ctrl-shift-minus), which are used to
-* provide support for simple keyboard "macros".  These keys are so strange
-* that their loss as normal keys will probably be noticed by nobody.  The
-* "ascii 30" key is used to indicate the "end" of a macro action, which
-* allows recursive macros to be avoided.  The "ascii 31" key is used by
-* some of the "main-xxx.c" files to introduce macro trigger sequences.
-*
-* Hack -- we use "ascii 29" (ctrl-right-bracket) as a special "magic" key,
-* which can be used to give a variety of "sub-commands" which can be used
-* any time.  These sub-commands could include commands to take a picture of
-* the current screen, to start/stop recording a macro action, etc.
-*
-* If "angband_term[0]" is not active, we will make it active during this
-* function, so that the various "main-xxx.c" files can assume that input
-* is only requested (via "Term_inkey()") when "angband_term[0]" is active.
-*
-* Mega-Hack -- This function is used as the entry point for clearing the
-* "signal_count" variable, and of the "character_saved" variable.
-*
-* Hack -- Note the use of "inkey_next" to allow "keymaps" to be processed.
-*
-* Mega-Hack -- Note the use of "inkey_hack" to allow the "Borg" to steal
-* control of the keyboard from the user.
-*/
-
-#####GDescription
-Get a keypress from the user.
-
-----------------------------------------------------------------------
-
-#####R=== cmsg_print ===
-
-#####GDeclaration
-    void cmsg_print(byte color, cptr msg);
-
-#####GFile
-    util.c
-
-#####GComment
-/*
-* Output a message to the top line of the screen.
-*
-* Break long messages into multiple pieces (40-72 chars).
-*
-* Allow multiple short messages to "share" the top line.
-*
-* Prompt the user to make sure he has a chance to read them.
-*
-* These messages are memorised for later reference (see above).
-*
-* We could do "Term_fresh()" to provide "flicker" if needed.
-*
-* The global "msg_flag" variable can be cleared to tell us to
-* "erase" any "pending" messages still on the screen.
-*
-* XXX XXX XXX Note that we must be very careful about using the
-* "msg_print()" functions without explicitly calling the special
-* "msg_print(NULL)" function, since this may result in the loss
-* of information if the screen is cleared, or if anything is
-* displayed on the top line.
-*
-* XXX XXX XXX Note that "msg_print(NULL)" will clear the top line
-* even if no messages are pending.  This is probably a hack.
-*/
-
-#####GDescription
-In color "color", output message "msg" to the top line of the screen.
-If the message is blank or has more than 1000 characters, nothing is
-printed. Long messages are split after the 40th character and before
-the 72nd character.
-
-#####GParameters
-> "color" is the color of the message.
-  *****fields.txt*0[colors]
-> "msg" is the message.
-
-----------------------------------------------------------------------
-
-#####R=== msg_print ===
-
-#####GDeclaration
-    void msg_print(cptr msg);
-
-#####GFile
-    util.c
-
-#####GComment
-/* Hack -- for compatibility and easy sake */
-
-#####GDescription
-Print message "msg" in white (see cmsg_print() above).
-
-#####GParameters
-> "msg" is the message.
-
-----------------------------------------------------------------------
-
-#####R=== screen_save ===
-
-#####GDeclaration
-    void screen_save(void);
-
-#####GFile
-    util.c
-
-#####GComment
-/*
- * Save the screen, and increase the "icky" depth.
- *
- * This function must match exactly one call to "screen_load()".
- */
-
-#####GDescription
-Save a screen shot.
-
-----------------------------------------------------------------------
-
-#####R=== screen_load ===
-
-#####GDeclaration
-    void screen_load(void);
-
-#####GFile
-    util.c
-
-#####GComment
-/*
- * Load the screen, and decrease the "icky" depth.
- *
- * This function must match exactly one call to "screen_save()".
- */
-
-#####GDescription
-Load a previously saved screen shot.
-
-----------------------------------------------------------------------
-
-#####R=== c_put_str ===
-
-#####GDeclaration
-    void c_put_str(byte attr, cptr str, int row, int col);
-
-#####GFile
-    util.c
-
-#####GComment
-/*
-* Display a string on the screen using an attribute.
-*
-* At the given location, using the given attribute, if allowed,
-* add the given string.  Do not clear the line.
-*/
-
-#####GDescription
-Put string "str" at row "row" and column "col" with attribute "attr".
-
-#####GParameters
-> "attr" is the color of the message.
-  *****fields.txt*0[colors]
-> "msg" is the message.
-> "row" is the row the message is to be printed at.
-> "col" is the column the message is to be printed at.
-
-----------------------------------------------------------------------
-
-#####R=== c_prt ===
-
-#####GDeclaration
-    void c_prt(byte attr, cptr str, int row, int col);
-
-#####GFile
-    util.c
-
-#####GComment
-/*
-* Display a string on the screen using an attribute, and clear
-* to the end of the line.
-*/
-
-#####GDescription
-Clear row "row" from column "col". Put string "str" at "row", "col"
-with attribute "attr".
-
-#####GParameters
-> "attr" is the color of the message.
-  *****fields.txt*0[colors]
-> "msg" is the message.
-> "row" is the row the message is to be printed at.
-> "col" is the column the message is to be printed at.
-
-----------------------------------------------------------------------
-
-#####R=== clear_from ===
-
-#####GDeclaration
-    void clear_from(int row);
-
-#####GFile
-    util.c
-
-#####GComment
-/*
-* Clear part of the screen
-*/
-
-#####GDescription
-Clear the screen from row "row" onwards.
-
-#####GParameters
-> "row" is the first row of the screen to be cleared.
-
-----------------------------------------------------------------------
-
-#####R=== askfor_aux ===
-
-#####GDeclaration
-    bool askfor_aux(char *buf, int len);
-
-#####GFile
-    util.c
-
-#####GComment
-/*
-* Get some input at the cursor location.
-* Assume the buffer is initialized to a default string.
-* Note that this string is often "empty" (see below).
-* The default buffer is displayed in yellow until cleared.
-* Pressing RETURN right away accepts the default entry.
-* Normal chars clear the default and append the char.
-* Backspace clears the default or deletes the final char.
-* ESCAPE clears the buffer and the window and returns FALSE.
-* RETURN accepts the current buffer contents and returns TRUE.
-*/
-
-#####GDescription
-Get string "buf" from the screen. "buf" is to be no more than "len"
-bytes. The string starts at the current cursor position. The length
-can not exceed the number of bytes from the cursor to the end of the
-line. Accept user input until the escape or return key is pressed.
-
-#####GParameters
-> "buf" is the string returned from the screen.
-> "len" is the length of the string. If it is <1 it is forced to 1.
-
-----------------------------------------------------------------------
-
-#####R=== get_string ===
-
-#####GDeclaration
-    bool get_string(cptr prompt, char *buf, int len);
-
-#####GFile
-    util.c
-
-#####GComment
-/*
-* Get a string from the user
-*
-* The "prompt" should take the form "Prompt: "
-*
-* Note that the initial contents of the string is used as
-* the default response, so be sure to "clear" it if needed.
-*
-* We clear the input, and return FALSE, on "ESCAPE".
-*/
-
-#####GDescription
-Print prompt "prompt" at the top-left corner of the screen and return
-response "buf" which will have a maximum length "length". If ESCAPE
-is entered, the function returns FALSE, otherwise it returns TRUE.
-
-#####GParameters
-> "prompt" is the prompt for input.
-> "buf" is the returned response.
-> "len" is the maximum length of the string.
-
-----------------------------------------------------------------------
-
-#####R=== get_check ===
-
-#####GDeclaration
-    bool get_check(cptr prompt);
-
-#####GFile
-    util.c
-
-#####GComment
-/*
-* Verify something with the user
-*
-* The "prompt" should take the form "Query? "
-*
-* Note that "[y/n]" is appended to the prompt.
-*/
-
-#####GDescription
-Ask the user question "prompt" which requires a yes/no answer. The
-prompt appears in the top-left corner of the screen. A response of
-'Y' (either case) returns TRUE. A response of 'N' (either case) or
-ESCAPE returns FALSE.
-
-#####GParameters
-> "prompt" is the question asked. It has a maximum length of 70
-  characters.
-
-----------------------------------------------------------------------
-
-#####R=== get_com_lua ===
-
-#####GDeclaration
-    bool get_com_lua @ get_com(cptr promtp, int *com);
-
-#####GFile
-    util.c
-
-#####GComment
-/*
-* Prompts for a keypress
-*
-* The "prompt" should take the form "Command: "
-*
-* Returns TRUE unless the character is "Escape"
-*/
-
-#####GDescription
-Ask the user for command "prompt" and return the key press "com". A
-response of ESCAPE returns FALSE. All other responses return TRUE.
-
-#####GParameters
-> "prompt" is the prompt for the key press.
-> "com" is the returned key press.
-
-----------------------------------------------------------------------
-
-#####R=== get_quantity ===
-
-#####GDeclaration
-    s32b get_quantity(cptr prompt, s32b max);
-
-#####GFile
-    util.c
-
-#####GComment
-/*
-* Request a "quantity" from the user
-*
-* Hack -- allow "command_arg" to specify a quantity
-*/
-
-#####GDescription
-Ask the user for quantity "prompt" of maximum value "max" and return
-a quantity. If the user quantity is higher than the maximum then the
-maximum is returned. If the response is a letter then the maximum is
-returned. If the user quantity is negative then zero is returned.
-
-#####GParameters
-> "prompt" is the prompt for a quantity.
-> "max" is the maximum value allowed.
-
-----------------------------------------------------------------------
-
-#####R=== test_monster_name ===
-
-#####GDeclaration
-    int test_monster_name(cptr name);
-
-#####GFile
-    util.c
-
-#####GComment
-/*
- * Given monster name as string, return the index in r_info array. Name
- * must exactly match (look out for commas and the like!), or else 0 is 
- * returned. Case doesn't matter. -GSN-
- */
-
-#####GDescription
-Return the monster index for monster with name "name". If no match is
-found then zero is returned.
-
-#####GParameters
-> "name" is the monster name.
-
-----------------------------------------------------------------------
-
-#####R=== test_item_name ===
-
-#####GDeclaration
-    int test_item_name(cptr name);
-
-#####GFile
-    util.c
-
-#####GComment
-/*
- * Given item name as string, return the index in k_info array. Name
- * must exactly match (look out for commas and the like!), or else 0 is 
- * returned. Case doesn't matter. -DG-
- */
-
-#####GDescription
-Return the item index for item with name "name". If no match is found
-then zero is returned.
-
-#####GParameters
-> "name" is the item name.
-
-----------------------------------------------------------------------
-
-#####R=== luck ===
-
-#####GDeclaration
-    int luck(int min, int max);
-
-#####GFile
-    xtra1.c
-
-#####GComment
-/*
- * Return a luck number between a certain range
- */
-
-#####GDescription
-Return a number for luck between minimum "min" and maximum "max". The
-value begins with the player's current luck. The value is forced to
-be between -30 and +30. 30 is added to give a value between 0 and 60.
-The value is multiplied by the range (maximum - minimum) and divided
-by 60. The value is increased by the minimum. The value is returned.
-
-For example, if the player's current luck is 15, the minimum is -10,
-and the maximum is 10 (range 20), then the value returned is
-(45 * 20) / 60 which is 900 / 60 which is 15 + the minimum -10 gives
-a returned value of 5.
-
-#####GParameters
-> "min" is the minimum luck.
-> "max" is the maximum luck. Beware: this should be greater than the
-  minimum but it is not checked!
-
-----------------------------------------------------------------------
-
-#####R=== get_player_race_name ===
-
-#####GDeclaration
-    cptr get_player_race_name(int pr, int ps);
-
-#####GFile
-    util.c
-
-#####GComment
-(none)
-
-#####GDescription
-Return the name for player race "pr" and player sub-race "ps".
-
-#####GParameters
-> "pr" is the index for player race.
-> "ps" is the index for player sub-race.
-
-----------------------------------------------------------------------
-
-#####R=== quit ===
-
-#####GDeclaration
-    void quit(cptr str);
-
-#####GFile
-    z-util.c
-
-#####GComment
-/*
- * Exit (ala "exit()").  If 'str' is NULL, do "exit(0)".
- * If 'str' begins with "+" or "-", do "exit(atoi(str))".
- * Otherwise, plog() 'str' and exit with an error code of -1.
- * But always use 'quit_aux', if set, before anything else.
- */
-
-#####GDescription
-Quit the game. If "str" is a string then write the string to the
-error file or screen. If "str" is a number then exit with the
-number as the exit code.
-
-#####GParameters
-> "str" is an error message or exit code.
-
-----------------------------------------------------------------------
-
-#####R=== dump_hooks ===
-
-#####GDeclaration
-    void dump_hooks();
-
-#####GFile
-    plots.c
-
-#####GComment
-(none)
-
-#####GDescription
-Print the name and type (C or Lua) of hooks in the hook list.
-
-----------------------------------------------------------------------
-
-#####R=== add_hook_script ===
-
-#####GDeclaration
-    void add_hook_script(int h_idx, char *script, cptr name);
-
-#####GFile
-    plots.c
-
-#####GComment
-(none)
-
-#####GDescription
-To hook list with index "h_idx", add a script with script file
-"script" and name "name" as a Lua hook if a hook with that name
-does not already exist.
-
-#####GParameters
-> "h_idx" is the index of the hook list in the array of hook lists.
-> "script" is the name of the script file.
-> "name" is the name of the hook to be added.
-
-----------------------------------------------------------------------
-
-#####R=== del_hook_name ===
-
-#####GDeclaration
-    void del_hook_name(int h_idx, cptr name);
-
-#####GFile
-    plots.c
-
-#####GComment
-(none)
-
-#####GDescription
-Search hook list with index "h_idx" and remove the hook with name
-"name".
-
-#####GParameters
-> "h_idx" is the index of the hook list in the array of hook lists.
-> "name" is the name of the hook to be removed.
-
-----------------------------------------------------------------------
-
-#####R=== pern_dofile ===
-
-#####GDeclaration
-    bool pern_dofile(char *file);
-
-#####GFile
-    script.c
-
-#####GComment
-(none)
-
-#####GDescription
-Parse the Lua script file "file".
-
-#####GParameters
-> "file" is the Lua script file to be parsed.
-
-----------------------------------------------------------------------
-
-#####R=== intMod ===
-
-#####GDeclaration
-    s32b intMod(s32b a, s32b b);
-
-#####GFile
-    script.c
-
-#####GComment
-(none)
-
-#####GDescription
-Return the result of operation "a" mod  "b" (a % b).
-
-#####GParameters
-> "a" is a number.
-> "b" is a number.
-
-----------------------------------------------------------------------
-
-#####R=== intAnd ===
-
-#####GDeclaration
-    s32b intAnd(s32b a, s32b b);
-
-#####GFile
-    script.c
-
-#####GComment
-(none)
-
-#####GDescription
-Return the result of bitwise operation "a" AND "b" (a & b).
-
-#####GParameters
-> "a" is a number.
-> "b" is a number.
-
-----------------------------------------------------------------------
-
-#####R=== intOr ===
-
-#####GDeclaration
-    s32b intOr(s32b a, s32b b);
-
-#####GFile
-    script.c
-
-#####GComment
-(none)
-
-#####GDescription
-Return the result of bitwise operation "a" OR "b" (a | b).
-
-#####GParameters
-> "a" is a number.
-> "b" is a number.
-
-----------------------------------------------------------------------
-
-#####R=== intXor ===
-
-#####GDeclaration
-    s32b intXor(s32b a, s32b b);
-
-#####GFile
-    script.c
-
-#####GComment
-(none)
-
-#####GDescription
-Return the result of bitwise operation "a" XOR "b" (a ^ b).
-
-#####GParameters
-> "a" is a number.
-> "b" is a number.
-
-----------------------------------------------------------------------
-
-#####R=== intShiftl ===
-
-#####GDeclaration
-    s32b intShiftl(s32b a, s32b b);
-
-#####GFile
-    script.c
-
-#####GComment
-(none)
-
-#####GDescription
-Return the result of bitwise operation "a" << "b".
-
-#####GParameters
-> "a" is a number.
-> "b" is a number.
-
-----------------------------------------------------------------------
-
-#####R=== intShiftr ===
-
-#####GDeclaration
-    s32b intShiftr(s32b a, s32b b);
-
-#####GFile
-    script.c
-
-#####GComment
-(none)
-
-#####GDescription
-Return the result of bitwise operation "a" >> "b".
-
-#####GParameters
-> "a" is a number.
-> "b" is a number.
-
-----------------------------------------------------------------------
-
-#####R=== intBitNot ===
-
-#####GDeclaration
-    s32b intBitNot(s32b b);
-
-#####GFile
-    script.c
-
-#####GComment
-(none)
-
-#####GDescription
-Return the result of bitwise operation NOT "b" (~ b).
-
-#####GParameters
-> "b" is a number.
-
-----------------------------------------------------------------------
-
-#####R=== register_savefile ===
-
-#####GDeclaration
-    void register_savefile(int num);
-
-#####GFile
-    loadsave.c
-
-#####GComment
-/*
- * Add num slots to the savefile
- */
-
-#####GDescription
-Add "num" slots to the save file.
-
-#####GParameters
-> "num" is the number of slots to add to the savefile. If num is <0
-  then "num" is forced to zero.
-
-----------------------------------------------------------------------
-
-#####R=== save_number_key ===
-
-#####GDeclaration
-    void save_number_key(char *key, s32b val);
-
-#####GFile
-    util.c
-
-#####GComment
-(none)
-
-#####GDescription
-Save the length of key "key", the key itself, and the value "val" as
-bytes in the savefile.
-
-#####GParameters
-> "key" is the key string for the value.
-> "val" is the value to be saved.
-
-----------------------------------------------------------------------
-
-
-
-Back to the *****lua.hlp*0[lua help index] .
-
-
-                                                     [[[[[gThis file by Chris Hadgis]
-
diff --git a/lib/mods/theme/help/m_divin.txt b/lib/mods/theme/help/m_divin.txt
index df92c11b..e03bd334 100644
--- a/lib/mods/theme/help/m_divin.txt
+++ b/lib/mods/theme/help/m_divin.txt
@@ -26,7 +26,7 @@ There are six spells available for the divination school. These Spells are:
    Asks for an object and identifies it.
    At spell level 17 it identifies all objects in the inventory.
    At spell level 27 it identifies all objects in the inventory and in a 
-   radius on the floor, as well as probing monsters in that radius.
+   radius on the floor.
 4. [[[[[sReveal Ways] (school level 9)
    Detects the doors/stairs/ways in a certain radius around you.
 5. [[[[[sVision] (school level 15)
diff --git a/lib/mods/theme/help/m_music.txt b/lib/mods/theme/help/m_music.txt
index 0f84f08f..40116252 100644
--- a/lib/mods/theme/help/m_music.txt
+++ b/lib/mods/theme/help/m_music.txt
@@ -61,8 +61,7 @@ of instrument contains a different family of musical songs:
    Consumes mana each turn.
 5. [[[[[vClairaudience(IV)] (School level 25)
    Allows you to sense monster minds as long as you sing.
-   At level 10 it identifies all objects in a radius on the floor,
-   as well as probing monsters in that radius.
+   At level 10 it identifies all objects in a radius on the floor.
    Consumes mana each turn.
 
 #####GHorns
diff --git a/lib/mods/theme/help/macrofaq.txt b/lib/mods/theme/help/macrofaq.txt
index 97fad944..d285194c 100644
--- a/lib/mods/theme/help/macrofaq.txt
+++ b/lib/mods/theme/help/macrofaq.txt
@@ -975,10 +975,6 @@ These are accessible through the (=) Set options command.
 *****option.txt*2[(hilite_player)] -- causes the player's symbol to be drawn with the
 "cursor" on it. It will be drawn with the same color as the character.
 
-*****option.txt*3[(player_symbols)] -- for graphics mode only, and only works when option
-(use_graphics) is also on. This apparently varies the player graphic
-and its color based on class, race, and sex.
-
 #####G----------------------------------------------------------------------
 #####G4.18 Recharging a rod using a Recharge Item spell
 #####G----------------------------------------------------------------------
@@ -1070,15 +1066,7 @@ create a macro for a function key.
 #####G5.2 How can I automatically inscribe items when I pick them up?
 #####G----------------------------------------------------------------------
 
-You need to turn on the "Merge inscriptions when stacking" option.
-If you are already carrying the same item with an inscription, a new
-one will be added to the stack. Note that this WON'T merge discounts.
-Although discounts display like inscriptions, they are different.
-
-1) =   Options
-2) 1   User interface options
-3)     "Merge inscriptions when stacking" (stack_force_notes)
-       move down to this line and change to "yes".
+(Content removed because it was obsolete. Inscribe-on-pickup is now the default.)
 
 #####G----------------------------------------------------------------------
 #####G5.3 Can I use macros inside other macros?
@@ -1788,9 +1776,6 @@ options screen.
 rogue_like_commands
 use_old_target
 always_pickup
-depth_in_feet
-alert_hitpoint
-auto_haggle
 auto_scum
 
 #####G----------------------------------------------------------------------
diff --git a/lib/mods/theme/help/magic.txt b/lib/mods/theme/help/magic.txt
index 93486f0b..1811be84 100644
--- a/lib/mods/theme/help/magic.txt
+++ b/lib/mods/theme/help/magic.txt
@@ -23,17 +23,15 @@ schools:
 
 Other magical skills, generally being used primarily by characters of a
 specific class, are:
-     *****m_demono.txt*0[Demonology]     *****m_necrom.txt*0[Necromancy]      *****skills.txt*36[Runecraft]
-     *****m_thaum.txt*0[Thaumaturgy]    *****skills.txt*49[Alchemy]         *****m_geoman.txt*0[Geomancy]
+     *****m_demono.txt*0[Demonology]     *****m_necrom.txt*0[Necromancy]
+     *****m_thaum.txt*0[Thaumaturgy]     *****m_geoman.txt*0[Geomancy]
 
 The *****m_demono.txt*0[Demonology] skill is primarily used by *****c_demono.txt*0[Demonologists] for their special
 spells, whereas the *****m_necrom.txt*0[Necromancy] skill is used by *****c_necro.txt*0[Necromancers] for their own set
 of special spells.
-The same goes for *****skills.txt*36[Runecraft], which is used by *****c_runecr.txt*0[Runecrafters] to allow use of more
-difficult runes or rune-combinations. *****m_thaum.txt*0[Thaumaturgy] gives you randomly chosen
+*****m_thaum.txt*0[Thaumaturgy] gives you randomly chosen
 attack spells, and as such each game with it will be different. *****c_geoman.txt*0[Geomancers]
-harness the powers of the elements using *****m_geoman.txt*0[Geomancy]. Lastly we have
-*****skills.txt*49[Alchemy], which is used by *****c_alchem.txt*0[Alchemists].
+harness the powers of the elements using *****m_geoman.txt*0[Geomancy].
 
 In addition to the schools of magic, you can get access to special sets of
 spells if you worship a God. There are currently four good Gods,
diff --git a/lib/mods/theme/help/option.txt b/lib/mods/theme/help/option.txt
index 34a2fe6b..f1d485db 100644
--- a/lib/mods/theme/help/option.txt
+++ b/lib/mods/theme/help/option.txt
@@ -56,20 +56,6 @@ can also be viewed from the option menu while playing, but not changed then.
     but extremely deadly - imagine that Greater Checkerboard Vault with Lokkak
     on dungeon level 1!
 
-#####GAllow notes to be written to a file    [take_notes]
-    Allows any player-written notes (with the "|" command) to be written to
-    a file and kept (instead of being put in the message list).
-
-#####GAutomatically note important events    [auto_notes]
-    Used in conjunction with the take_notes option, this option makes a note
-    each time you gain a level, kill a unique, find an artifact, etc.
-
-#####GFast autoroller (NOT on multiuser systems)    [fast_autoroller]
-    The normal autoroller has a built-in delay that helps prevent it from
-    overloading a system. This option reduces that delay, allowing characters
-    to be rolled in a much shorter time, but should not be used on multiuser
-    systems.
-
 #####GAllow use of some 'joke' monsters    [joke_monsters]
     Allows monsters flagged as being some of DarkGod's jokes to be generated.
 
@@ -80,6 +66,10 @@ can also be viewed from the option menu while playing, but not changed then.
 #####GYou can receive fates, good or bad    [fate_option]
     Allows the player to turn off ToME's *****fatespoi.txt*0[fates] for that character.
 
+#####GItems always sell for 0 gold    [no_selling]
+    Disables selling items back to shops for money. The value of gold found in the
+    dungeon is increased to compensate.
+
 ~~~~~07|Options|Ingame
 #####RIN GAME OPTIONS
 #####R===============
@@ -98,9 +88,6 @@ off at will during the course of the game.
     (useful for monster farming).  Allows most keys to mean "no" to any
     "[y/n]" prompt.
 
-#####GPrompt for various information    [other_query_flag]
-    No longer used.
-
 #####GPrompt before picking things up    [carry_query_flag]
     Forces the game to ask you for confirmation when you do something that
     would normally cause an item to be picked up.
@@ -123,56 +110,8 @@ off at will during the course of the game.
 
 #####GRepeat obvious commands    [always_repeat]
     Tells the game that when you attempt to open a door or chest, bash
-    a door, tunnel through walls, or disarm traps or chests, that you
-    wish to repeat the command 99 times (see *****command.txt*0["command.txt"]).
-
-#####GShow dungeon level in feet    [depth_in_feet]
-    Display the dungeon depth in "feet" instead of as a level number (one
-    level is equivalent to 50'). This also affects the monster memory display.
-
-#####GMerge inscriptions when stacking    [stack_force_notes]
-    Force otherwise identical objects to merge, even if one has an empty
-    inscription and the other does not.  The resulting stack keeps the
-    non-empty inscription.
-
-#####GMerge discounts when stacking    [stack_force_costs]
-    Force otherwise identical objects to merge, even if they have different
-    discounts.  The resulting stack keeps the largest discount.  This option
-    may cause you to lose "value", but will give you optimal pack usage.
-
-#####GShow labels in object lists    [show_labels]
-    Display the "labels" for objects in the equipment list, and in any
-    special window which is displaying the equipment.  These labels
-    indicate what the player is using the object for, such as "wielding"
-    or "wearing" (in a given location).  After you have played for a while,
-    this information is no longer useful, and can be annoying.
-    Note that in ToME this option no longer controls the "plain
-    flavoured object descriptions": a separate option for them has been added
-    under "ToME Options".
-
-#####GShow weights in object lists    [show_weights]
-    Display the weight of objects in the inventory and equipment lists,
-    and in stores, and in any special window which is displaying any of
-    these lists.
-
-#####GShow graphics in inventory list   [show_inven_graph]
-    Display the graphics of objects in the inventory list, and in any special
-    window which is displaying the inventory list.
-
-#####GShow graphics in equipment list   [show_equip_graph]
-    Display the graphics of objects in the equipment list, and in any special
-    window which is displaying the equipment list.
-
-#####GShow graphics in stores   [show_store_graph]
-    Display the graphics of objects in the store list.
-
-#####GShow choices in certain sub-windows    [show_choices]
-    Indicate legal choices in special windows which display lists.
-
-#####GShow details in certain sub-windows    [show_details]
-    Indicate extra details in special windows, currently used to activate
-    the display of death counts and monster descriptions when recalling
-    details about a monster.
+    a door, or tunnel through walls, that you wish to repeat the command
+    99 times (see *****command.txt*0["command.txt"]).
 
 #####GAudible bell (on errors, etc)    [ring_bell]
     Attempt to make a "bell" noise when various errors occur.
@@ -205,16 +144,12 @@ off at will during the course of the game.
     monster becomes viewable for the first time, and also whenever any
     viewable monster becomes no longer viewable.  This option ignores
     the existence of telepathy for the purpose of determining whether
-    a monster is viewable.  See also the "view_reduce_view" option.
+    a monster is viewable.
 
 #####GDisturb whenever map panel changes    [disturb_panel]
     This option causes you to be disturbed (stop running) when the screen
     scrolls, as it does when you get close to the edge of the visible screen.
 
-#####GDisturb whenever leaving trap-detected area    [disturb_detect]
-    This option causes you to be disturbed whenever you are leaving
-    a trap-detected area.  This option is strongly recommended.
-
 #####GDisturb whenever player state changes    [disturb_state]
     This option causes you to be disturbed whenever the player state
     changes, including changes in hunger, resistance, confusion, etc.
@@ -232,10 +167,6 @@ off at will during the course of the game.
     even if this option is unset.  (You may also inscribe an item with {.}
     to suppress its random-teleportation power, unless it is cursed.)
 
-#####GAlert user to critical hitpoints    [alert_hitpoint]
-    Produce a "bell" noise, and flushes all pending input, when your hitpoints
-    reach the warning point chosen elsewhere, preventing stupid deaths.
-
 #####GAlert user to various failures    [alert_failure]
     Produce a "bell" noise, and flushes all pending input, when various
     failures occur, as described above.
@@ -245,18 +176,6 @@ off at will during the course of the game.
     dies. If this option is not selected, the "You die." message is displayed
     instead.
 
-#####GAllow shopkeepers and uniques to speak    [speak_unique]
-    If this option is in use, shopkeepers may sometimes whisper rumours to
-    you. Also certain monsters start boasting as they attack you, and when
-    they die, they say their "last words".
-
-#####GNo query to destroy known worthless items    [auto_destroy]
-    It can sometimes be annoying that the Destroy command asks for confirmation
-    when you are attempting to destroy a Broken sword {cursed}. If this option
-    is set, no confirmation will be asked if you attempt to destroy an object
-    which you know to be worthless. Of course, cursed artifacts cannot be
-    destroyed even if this option is set.
-
 #####GConfirm to wear/wield known cursed items    [confirm_wear]
     Some players may occasionally, due to a typing mistake, find themselves
     wearing an item which they knew was cursed. If this option is set, you
@@ -281,13 +200,6 @@ off at will during the course of the game.
     to only one known door, using the "o"pen command will not prompt you for
     a direction.
 
-#####GAutomatically disarm traps    [easy_disarm]
-    Attempts to disarm traps by walking into/over them.  Also, if you are
-    adjacent to only one known trap, using the "D"isarm command will not
-    prompt you for a direction.  If your disarming ability is particularly
-    low, you should probably not enable this option, because you will often
-    fail to disarm the traps, and sometimes trigger them.
-
 #####GAutomatically tunnel walls    [easy_tunnel]
     Automatically tunnels into walls by walking into them.
 
@@ -308,18 +220,6 @@ off at will during the course of the game.
     is based on the dungeon level, so the deeper you go, the better the
     level will be.
 
-#####GAllow weapons and armor to stack    [stack_allow_items]
-    Allow identical weapons and armor to be combined into a stack.  This
-    also allows unidentified, but identical, ammo to be combined, which
-    may result in the auto-identification of some of the ammo, but which
-    makes it a lot easier to actually use unidentified ammo.
-
-#####GAllow wands/staffs/rods to stack    [stack_allow_wands]
-    Allow identical wands/staffs/rods to be combined into a stack.  This
-    may force the items to be unstacked to use them, which may result
-    in overflow of the pack.  Also, the entire stack can be recharged
-    (and possibly destroyed) at the same time.
-
 #####GExpand the power of the look command    [expand_look]
     Expand the "l"ook command to allow the user to look at grids which
     are not actually in view of the player, allowing the examination of
@@ -374,38 +274,10 @@ off at will during the course of the game.
     Allow monsters to make paths to the player when they are nearby.  This
     option is extremely slow, but can produce viciously smart monsters.
 ~~~~~3
-#####GUse special symbols for the player char   [player_symbols]
-    If this option has been compiled in, it allows you to display your
-    character using race / class / sex dependent colours and graphical
-    symbols. Note that the support for this option may not have been
-    compiled in on all platforms.
-
-#####GPlain object descriptions    [plain_descriptions]
-    In ToME, this option disables "full" names for identified flavoured
-    objects; in other words, if this option is not in use, an identified
-    Potion of Speed could be listed (for example) as a Blue Potion of Speed.
-    If you prefer simpler, less verbose descriptions, set this option.
-
 #####GMonsters learn from their mistakes    [smart_learn]
     Allow monsters to learn what spell attacks you are resistant to,
     and to use this information to choose the best attacks.
 
-#####GMonsters exploit players weaknesses    [smart_cheat]
-    Allow monsters to know what spell attacks you are resistant to, without
-    first having to observe such an attack upon you, and to use this
-    information to choose the best attacks.
-
-#####GMonsters behave stupidly    [stupid_monsters]
-    ToME incorporates Keldon Jones' improved monster Artificial
-    Intelligence patch. While this patch most certainly makes monsters
-    behave more realistically, they will also be more deadly with the
-    improved AI. If you are a sissy, set this option to get the old,
-    really stupid monster AI.
-    Note that the new AI is a bit processing power expensive. If you have
-    an old computer (386sx) and ToME is running too slowly, you could
-    try turning stupid_monsters on. Or dumpster-dive for a Pentium so you can
-    run ToME. :-)
-
 #####GAllow unusually small dungeon levels    [small_levels]
     This option enables the creation of levels of varying sizes. Levels
     that are as small as one "screen" (80x24) are possible, and they can be
@@ -432,9 +304,6 @@ off at will during the course of the game.
     but is extremely annoying.  Certain older versions of Angband used
     this behavior always, so "purists" should turn it on.
 
-#####GReduce view-radius in town    [view_reduce_view]
-    No longer in use.
-
 #####GAvoid checking for user abort    [avoid_abort]
     Avoid checking to see if the user has pressed a key during resting
     or running or repeated commands.  This not only makes the game much
@@ -494,6 +363,7 @@ off at will during the course of the game.
     This option forces the game to flush all output after every message
     displayed by the game.  This will give you maximal information, but
     may slow down the game somewhat.
+
 ~~~~~2
 #####GHilite the player with the cursor    [hilite_player]
     Place the visible cursor on the player.  This looks fine on some Unix
@@ -551,11 +421,6 @@ Features which are unique to ToME are collected in this menu.
     for new players.  More experienced players may wish to switch this option
     off.
 
-#####GShow the experience needed for the next level    [exp_need]
-    Setting this option alters the display of experience on the left of
-    the main screen to the experience needed to reach the next character level,
-    instead of the character's current total experience.
-
 #####GUse the old(Z) coloring scheme(reload the game)    [old_colors]
     Setting this option toggles the ASCII game colour display from the
     standard Angband monster colours to the Zangband-based monster colours.
diff --git a/lib/mods/theme/help/skills.txt b/lib/mods/theme/help/skills.txt
index c4a02c06..6d6638d6 100644
--- a/lib/mods/theme/help/skills.txt
+++ b/lib/mods/theme/help/skills.txt
@@ -63,8 +63,7 @@ gets the free points).  For example, a skill point put into Weaponmastery
 raises Combat by 0.5 skill points. This is actually multiplied by the skill
 modifier that your character has in the Combat skill.  For example, a
 Swordmaster investing a skill point into Weaponmastery would have his Combat
-skill raised by 0.5 * [0.900] while a Runecrafter would have his Combat
-skill raised by 0.5 * [0.200].
+skill raised by 0.5 * [0.900].
 
 As well as this, skills are grouped together in similar types. Looking under
 the Combat skill, there are subtypes of Weaponmastery, Archery and Antimagic.
@@ -108,7 +107,7 @@ on what each skill does, try [[[[[ghttp://www.killerbunnies.org/angband/skill-22
 for some third party help!
 The skills are:
 
-  *****skills.txt*27[Air]                 *****skills.txt*49[Alchemy]            *****skills.txt*50[Antimagic]          *****skills.txt*08[Archery]
+  *****skills.txt*27[Air]                 *****skills.txt*50[Antimagic]          *****skills.txt*08[Archery]
   *****skills.txt*05[Axe-mastery]         *****skills.txt*18[Backstab]           *****skills.txt*13[Barehand-combat]    *****skills.txt*61[Bearform-combat]
   *****skills.txt*12[Boomerang-mastery]   *****skills.txt*58[Boulder-throwing]   *****skills.txt*10[Bow-mastery]        *****skills.txt*01[Combat]             
   *****skills.txt*30[Conveyance]          *****skills.txt*44[Corpse-preservation]*****skills.txt*04[Critical-hits]      *****skills.txt*11[Crossbow-mastery]   
@@ -117,11 +116,11 @@ The skills are:
   *****skills.txt*21[Magic]               *****skills.txt*54[Magic-device]       *****skills.txt*24[Mana]               *****skills.txt*29[Meta]               
   *****skills.txt*47[Mimicry]             *****skills.txt*33[Mind]               *****skills.txt*41[Mindcraft]          *****skills.txt*42[Monster-lore]       
   *****skills.txt*59[Music]               *****skills.txt*34[Nature]             *****skills.txt*35[Necromancy]         *****skills.txt*07[Polearm-mastery]    
-  *****skills.txt*45[Possession]          *****skills.txt*39[Prayer]             *****skills.txt*36[Runecraft]          *****skills.txt*09[Sling-mastery]      
-  *****skills.txt*14[Sneakiness]          *****skills.txt*22[Spell-power]        *****skills.txt*38[Spirituality]       *****skills.txt*23[Sorcery]            
-  *****skills.txt*19[Stealing]            *****skills.txt*15[Stealth]            *****skills.txt*53[Stunning-blows]     *****skills.txt*43[Summoning]          
-  *****skills.txt*03[Sword-mastery]       *****skills.txt*46[Symbiosis]          *****skills.txt*32[Temporal]           *****skills.txt*37[Thaumaturgy]        
-  *****skills.txt*48[Udun]                *****skills.txt*26[Water]              *****skills.txt*02[Weaponmastery]
+  *****skills.txt*45[Possession]          *****skills.txt*39[Prayer]             *****skills.txt*09[Sling-mastery]
+  *****skills.txt*22[Spell-power]         *****skills.txt*38[Spirituality]       *****skills.txt*23[Sorcery]            *****skills.txt*19[Stealing]
+  *****skills.txt*15[Stealth]             *****skills.txt*53[Stunning-blows]     *****skills.txt*43[Summoning]          *****skills.txt*03[Sword-mastery]
+  *****skills.txt*46[Symbiosis]           *****skills.txt*32[Temporal]           *****skills.txt*37[Thaumaturgy]        *****skills.txt*48[Udun]
+  *****skills.txt*26[Water]               *****skills.txt*02[Weaponmastery]
 
 
 ~~~~~01|Skills|Combat
@@ -257,12 +256,6 @@ spirituality sub-skills.
 This skill does not affect your ability to use scrolls and potions, but other 
 items that require [Self]Magic-Device are affected. At higher levels you gain 
 the ability to detect traps and disrupt all teleportation.
-~~~~~14|Skills|Sneakiness
-[[[[[BSneakiness]
-The sneakiness skill affects your searching and perception abilities.
-
-Sub-skills of Sneakiness include Stealth, Disarming, Trapping, Backstab,
-Stealing and Dodging.
 ~~~~~15|Skills|Stealth
 [[[[[BStealth]
 This skill is a sub-skill of the Sneakiness skill. It affects your ability
@@ -311,7 +304,7 @@ ability.
 
 Sub-skills include: Magic-device, Spell-power, Sorcery, Mana, Fire, Water, Air,
 Earth, Meta, Conveyance, Divination, Temporal, Mind, Nature, Udun, Demonology,
-Necromancy, Runecraft, Thaumaturgy, and Alchemy.
+Necromancy, and Thaumaturgy.
 ~~~~~54|Skills|Magic-device
 [[[[[BMagic-device]
 This skill is a sub-skill of the Magic skill. It eases the use of magical
@@ -452,11 +445,6 @@ point on your Necromancy skill adds 0.04 bonus skill points to your Magic skill.
 
 Investing in the Necromancy skill? You might be interested in the 
 *****ability.txt*08[Touch of Death] and *****ability.txt*12[Undead Form] abilities.
-~~~~~36|Skills|Runecraft
-[[[[[BRunecraft]
-This skill is a sub-skill of the Magic skill. This is the base skill of the
-Runecrafter class. Spending 1 skill point on your Runecraft skill adds 0.12
-bonus skill points to your Magic skill.
 ~~~~~37|Skills|Thaumaturgy
 [[[[[BThaumaturgy]
 This skill is a sub-skill of the Magic skill. Each level of *****m_thaum.txt*0[thaumaturgy] gives
@@ -465,13 +453,6 @@ any sort. However, once learned these spells do not gain in levels as the
 thaumaturgy skill or the spell-power skills are increased. Spending 1 skill
 point on your Thaumaturgy skill adds 0.06 bonus skill points to your Magic
 skill.
-~~~~~49|Skills|Alchemy
-[[[[[BAlchemy]
-The Alchemy skill affects your ability to extract and use essences to create
-magical items. 
-
-Investing in the Alchemy skill? You might be interested in the *****ability.txt*09[Artifact Creation] 
-ability.
 ~~~~~38|Skills|Spirituality
 [[[[[BSpirituality]
 The spirituality skill influences things which have a "helping hand" from the
diff --git a/lib/mods/theme/help/spoiler.hlp b/lib/mods/theme/help/spoiler.hlp
index bc229852..996c0d32 100644
--- a/lib/mods/theme/help/spoiler.hlp
+++ b/lib/mods/theme/help/spoiler.hlp
@@ -7,7 +7,6 @@ Please choose one of the following online spoiler files:
 
      *****/acorspoil.txt*0[(a) Corruptions]
      *****/bdunspoil.txt*0[(b) Dungeons]
-     *****/cessences.txt*0[(c) Essence Spoiler]
      *****/dinscrip.txt*0[(d) Floor Inscriptions]
      *****/eluckspoi.txt*0[(e) Luck]
      *****/ffatespoi.txt*0[(f) Fates]
diff --git a/lib/mods/theme/help/tome_faq.txt b/lib/mods/theme/help/tome_faq.txt
index 756ce639..d321a28a 100644
--- a/lib/mods/theme/help/tome_faq.txt
+++ b/lib/mods/theme/help/tome_faq.txt
@@ -81,8 +81,7 @@ You can also fill empty bottles at a fountain (enabling you to identify the
 potion and hence the type of fountain) by using the 'H' command and answering
 'F' at the prompt.  The game will then ask you to choose bottles and how many
 bottles you want to fill.  You can find empty bottles on the dungeon and
-drinking pints of fine ale/wine will give you emtpy bottles; if you are 
-trained in Alchemy, you can reuse bottles after quaffing potions as well.
+drinking pints of fine ale/wine will give you emtpy bottles.
 
 #####G------------------------------------------------------------------------------
 #####GQ: I got killed by a Great Wyrm of Power at 50'!!! What happened?
@@ -102,16 +101,6 @@ activation can be something very nasty....
 
 To activate it, use the normal Activation command, but when prompted for which 
 item to activate change to the backpack instead of wielded equipment.
-~~~~~10|Essences
-~~~~~11|Runes
-#####G------------------------------------------------------------------------------
-#####GQ: I keep coming across "essences" and "runes". What are they? 
-
-Essences are the *****c_alchem.txt*0[Alchemist's] friend, and you can only use them if you
-have access to the *****skills.txt*49[Alchemy] skill. 
-Runes are used to cast and store spells of varying types. *****c_runecr.txt*0[Runecrafters] are the
-class who are most proficient at using these. You can only use them if you 
-have access to the *****skills.txt*36[Runecrafting] skill.
 ~~~~~12|Homes
 #####G------------------------------------------------------------------------------
 #####GQ: Where can I store all my equipment? Theere's not enough room in my
diff --git a/lib/mods/theme/module.lua b/lib/mods/theme/module.lua
deleted file mode 100644
index cc0b6f08..00000000
--- a/lib/mods/theme/module.lua
+++ /dev/null
@@ -1,48 +0,0 @@
-add_module
-{
-	["name"]    = "Theme",
-	["version"] = { 1, 2, 0 },
-	["author"]  = { "furiosity", "furiosity@gmail.com" },
-	["desc"] = {
-		"A module that goes back to Tolkien roots, though by no means canonical.",
-		"A new wilderness map, new monsters, objects, artifacts, uniques, ego items,",
-		"terrain features, gods, races, subraces, and classes. Have fun. :-)",
-	},
-
-	["rand_quest"] = TRUE,
-	["C_quest"] = TRUE,
-
-	["base_dungeon"] = 4,
-	["death_dungeon"] = 28,
-
-	["astral_dungeon"] = 8,
-	["astral_wild_x"] = 45,
-	["astral_wild_y"] = 19,
-
-	["random_artifact_weapon_chance"] = 30,
-	["random_artifact_armor_chance"] = 30,
-	["random_artifact_jewelry_chance"] = 30,
-
-	["max_plev"] = 50,
-	["max_skill_overage"] = 5,
-
-	["mod_savefiles"]=
-	{
-		"Theme",
-	},
-	["layout"] = 
-	{ 
-	["apex"] = "theme", 
-	["core"] = "theme",
-	["data"] = "theme", 
-	["dngn"] = "theme",
-	["edit"] = "theme", 
-	["file"] = "theme",
-	["help"] = "theme",
-	["note"] = "theme",
-	["save"] = "theme",
-	["scpt"] = "theme",
-	["user"] = "theme",
-	["pref"] = "theme",
-	}, 
-}
\ No newline at end of file
diff --git a/lib/mods/theme/pref/font-ami.prf b/lib/mods/theme/pref/font-ami.prf
deleted file mode 100644
index 1c06dbb3..00000000
--- a/lib/mods/theme/pref/font-ami.prf
+++ /dev/null
@@ -1,28 +0,0 @@
-# File: font-ami.prf
-
-#
-# This file contains text remapping data
-# currently used in the Amiga version.
-#
-# Lars Haugseth <larshau@ifi.uio.no>
-#
-
-
-# Color palette - Text
-V:0:0x01:0x00:0x00:0x00
-V:1:0x01:0xFF:0xFF:0xFF
-V:2:0x01:0xC7:0xC7:0xC7
-V:3:0x01:0xFF:0x92:0x00
-V:4:0x01:0xFF:0x00:0x00
-V:5:0x01:0x00:0xCD:0x00
-V:6:0x01:0x00:0x00:0xFE
-V:7:0x01:0xC8:0x64:0x00
-V:8:0x01:0x8A:0x8A:0x8A
-V:9:0x01:0xE0:0xE0:0xE0
-V:10:0x01:0xA5:0x00:0xFF
-V:11:0x01:0xFF:0xFD:0x00
-V:12:0x01:0xFF:0x00:0xBC
-V:13:0x01:0x00:0xFF:0x00
-V:14:0x01:0x00:0xC8:0xFF
-V:15:0x01:0xFF:0xCC:0x80
-
diff --git a/lib/mods/theme/pref/font-dos.prf b/lib/mods/theme/pref/font-dos.prf
deleted file mode 100644
index 9cf1866f..00000000
--- a/lib/mods/theme/pref/font-dos.prf
+++ /dev/null
@@ -1,8 +0,0 @@
-# File: font-dos.prf
-
-#
-# This file is used by Angband (when it was compiled using "main-dos.c")
-# to specify simple attr/char remappings using a standard font, allowing
-# the use of special pseudo-graphic pictures for walls and such.
-#
-
diff --git a/lib/mods/theme/pref/font-mac.new b/lib/mods/theme/pref/font-mac.new
deleted file mode 100644
index 8b7f937c..00000000
--- a/lib/mods/theme/pref/font-mac.new
+++ /dev/null
@@ -1,110 +0,0 @@
-# File: font-mac.prf
-
-#
-# This file is used by Angband (when it was compiled using "main-mac.c")
-# to specify simple attr/char remappings using a standard font, allowing
-# the use of the Macintosh's special characters for some things.
-#
-
-
-##### Feature attr/char definitions #####
-
-# fountain
-F:2:0x01/0xBA
-
-# fountain
-F:15:0x08/0xBA
-
-# stream of shallow water
-F:84:0x0E/0xC5
-
-# pool of deep lava
-F:85:0x0C/0xC5
-
-# stream of shallow lava
-F:86:0x04/0xC5
-
-# dead tree
-F:92:0x08/0xB4
-
-# tree
-F:96:0x0D/0xB4
-
-# mountain chain
-F:97:0x0F/0xC6
-
-# high mountain chain
-F:101:0x09/0xC6
-
-# Void Jumpgate
-F:160:0x0A/0xBD
-
-# Altar of Being
-F:161:0x09/0xB9
-
-# Altar of Winds
-F:162:0x0E/0xB9
-
-# Altar of Force
-F:163:0x0C/0xB9
-
-# Altar of Darkness
-F:164:0x08/0xB9
-
-# stream of tainted water
-F:174:0x07/0xC5
-
-# Void Jumpgate
-F:176:0x0A/0xBD
-
-# Great Fire
-F:178:0x0A/0xC5
-
-# Ekkaia, the Encircling Sea
-F:182:0x06/0xC5
-
-# pool of deep water
-F:187:0x06/0xC5
-
-# small tree
-F:202:0x05/0xB4
-
-# a blazing fire
-F:205:0x0B/0xC5
-
-# condensing water
-F:209:0x0E/0xC5
-
-# dark pit
-F:248:0x04:0x27
-
-##### Monster attr/char definitions #####
-
-# Old Man Willow
-R:206:0x02/0xB4
-
-# Tangleweed
-R:248:0x05/0xB4
-
-# Poison ivy
-R:266:0x05/0xB4
-
-# Giant Venus Flytrap
-R:317:0x05/0xB4
-
-# Huorn
-R:329:0x05/0xB4
-
-# Xiclotlan
-R:396:0x08/0xB4
-
-# Ent
-R:708:0x0D/0xB4
-
-# Quickbeam, the Ent
-R:714:0x0D/0xB4
-
-# Fangorn the Treebeard, Lord of the Ents
-R:934:0x0D/0xB4
-
-
diff --git a/lib/mods/theme/pref/font-xxx.prf b/lib/mods/theme/pref/font-xxx.prf
index 298a8643..3e5d24ee 100644
--- a/lib/mods/theme/pref/font-xxx.prf
+++ b/lib/mods/theme/pref/font-xxx.prf
@@ -429,9 +429,6 @@ E:114:0x0D
 # DAEMON BOOK
 E:115:0x03
 
-# POWER BATERIES
-E:4:0x0D
-
 # MAGE STAFFS
 E:6:0x0E
 
diff --git a/lib/mods/theme/pref/font.prf b/lib/mods/theme/pref/font.prf
index 505964bd..38614683 100644
--- a/lib/mods/theme/pref/font.prf
+++ b/lib/mods/theme/pref/font.prf
@@ -28,33 +28,13 @@
 ?:[IOR [EQU $SYS xaw] [EQU $SYS x11] [EQU $SYS gtk]]
 %:font-x11.prf
 
-?:[EQU $SYS glu]
-%:font-glu.prf
-
 ?:[EQU $SYS gcu]
 %:font-gcu.prf
 
-?:[EQU $SYS ami]
-%:font-ami.prf
-
 ?:[EQU $SYS mac]
 %:font-mac.prf
 
 ?:[EQU $SYS win]
 %:font-win.prf
 
-?:[EQU $SYS dos]
-%:font-dos.prf
-
-?:[EQU $SYS ibm]
-%:font-ibm.prf
-
-?:[EQU $SYS emx]
-%:font-emx.prf
-
-?:[EQU $SYS acn]
-%:font-acn.prf
-
 ?:1
-
-
diff --git a/lib/mods/theme/pref/graf-ami.prf b/lib/mods/theme/pref/graf-ami.prf
deleted file mode 100644
index d9b1b356..00000000
--- a/lib/mods/theme/pref/graf-ami.prf
+++ /dev/null
@@ -1,64 +0,0 @@
-# File: graf-ami.prf
-
-#
-# This file contains color definitions and
-# graphics remapping for the Amiga version.
-#
-# Lars Haugseth <larshau@ifi.uio.no>
-#
-
-
-# Color palette - Graphics
-V:0:0x01:0x00:0x00:0x00
-V:1:0x01:0xF0:0xE0:0xD0
-V:2:0x01:0x80:0x80:0x80
-V:3:0x01:0x50:0x50:0x50
-V:4:0x01:0xE0:0xB0:0x00
-V:5:0x01:0xC0:0xA0:0x70
-V:6:0x01:0x80:0x60:0x40
-V:7:0x01:0x40:0x30:0x20
-V:8:0x01:0x00:0xA0:0xF0
-V:9:0x01:0x00:0x00:0xF0
-V:10:0x01:0x00:0x00:0x70
-V:11:0x01:0xF0:0x00:0x00
-V:12:0x01:0x80:0x00:0x00
-V:13:0x01:0x90:0x00:0xB0
-V:14:0x01:0x00:0x60:0x10
-V:15:0x01:0x60:0xF0:0x40
-
-
-# Color palette - Text
-V:16:0x01:0x00:0x00:0x00
-V:17:0x01:0xFF:0xFF:0xFF
-V:18:0x01:0xC7:0xC7:0xC7
-V:19:0x01:0xFF:0x92:0x00
-V:20:0x01:0xFF:0x00:0x00
-V:21:0x01:0x00:0xCD:0x00
-V:22:0x01:0x00:0x00:0xFE
-V:23:0x01:0xC8:0x64:0x00
-V:24:0x01:0x8A:0x8A:0x8A
-V:25:0x01:0xE0:0xE0:0xE0
-V:26:0x01:0xA5:0x00:0xFF
-V:27:0x01:0xFF:0xFD:0x00
-V:28:0x01:0xFF:0x00:0xBC
-V:29:0x01:0x00:0xFF:0x00
-V:30:0x01:0x00:0xC8:0xFF
-V:31:0x01:0xFF:0xCC:0x80
-
-
-# Standard file
-%:graf-xxx.prf
-
-
-### Feature attr/char definitions
-
-# nothing
-F:0:0x01/0x20
-
-# open floor
-F:1:0x81/0x8E
-
-# invis trap
-F:2:0x81/0x8E
-
-
diff --git a/lib/mods/theme/pref/graf-dos.prf b/lib/mods/theme/pref/graf-dos.prf
deleted file mode 100644
index 41f38c76..00000000
--- a/lib/mods/theme/pref/graf-dos.prf
+++ /dev/null
@@ -1,15 +0,0 @@
-# File: graf-win.prf
-
-#
-# This file defines special attr/char mappings for use in "graphics" mode
-#
-# See "lib/help/command.txt" and "src/files.c" for more information.
-#
-
-# Standard file
-?:[EQU $GRAF old]
-%:graf-xxx.prf
-
-# New tiles
-?:[EQU $GRAF new]
-%:graf-new.prf
diff --git a/lib/mods/theme/pref/graf-ibm.prf b/lib/mods/theme/pref/graf-ibm.prf
deleted file mode 100644
index eee54a13..00000000
--- a/lib/mods/theme/pref/graf-ibm.prf
+++ /dev/null
@@ -1,6237 +0,0 @@
-# File: graf-ibm.prf
-
-# This file defines special attr/char mappings for use in the pseudo
-# graphics mode using character generator font redefinitions. It can
-# also be used with X11/XAW/GTK ports by generating a bdf (then pcf)
-# file from lib/xtra/angband.fnt. How to do so is beyond the scope of
-# this file.
-#
-# See "lib/help/command.txt" and "src/files.c" for more information.
-#
-
-
-##### Special attr/char values #####
-
-## # Unused
-## S:0x00:0x00/0x40
-## S:0x01:0x01/0x40
-## S:0x02:0x02/0x40
-## S:0x03:0x03/0x40
-## S:0x04:0x04/0x40
-## S:0x05:0x05/0x40
-## S:0x06:0x06/0x40
-## S:0x07:0x07/0x40
-## S:0x08:0x08/0x40
-## S:0x09:0x09/0x40
-## S:0x0A:0x0A/0x40
-## S:0x0B:0x0B/0x40
-## S:0x0C:0x0C/0x40
-## S:0x0D:0x0D/0x40
-## S:0x0E:0x0E/0x40
-## S:0x0F:0x0F/0x40
-
-## # Unused
-## S:0x10:0x00/0x40
-## S:0x11:0x01/0x40
-## S:0x12:0x02/0x40
-## S:0x13:0x03/0x40
-## S:0x14:0x04/0x40
-## S:0x15:0x05/0x40
-## S:0x16:0x06/0x40
-## S:0x17:0x07/0x40
-## S:0x18:0x08/0x40
-## S:0x19:0x09/0x40
-## S:0x1A:0x0A/0x40
-## S:0x1B:0x0B/0x40
-## S:0x1C:0x0C/0x40
-## S:0x1D:0x0D/0x40
-## S:0x1E:0x0E/0x40
-## S:0x1F:0x0F/0x40
-
-## # Unused
-## S:0x20:0x00/0x40
-## S:0x21:0x01/0x40
-## S:0x22:0x02/0x40
-## S:0x23:0x03/0x40
-## S:0x24:0x04/0x40
-## S:0x25:0x05/0x40
-## S:0x26:0x06/0x40
-## S:0x27:0x07/0x40
-## S:0x28:0x08/0x40
-## S:0x29:0x09/0x40
-## S:0x2A:0x0A/0x40
-## S:0x2B:0x0B/0x40
-## S:0x2C:0x0C/0x40
-## S:0x2D:0x0D/0x40
-## S:0x2E:0x0E/0x40
-## S:0x2F:0x0F/0x40
-
-# Spells (*)
-S:0x30:0x00/0x2A
-S:0x31:0x01/0x2A
-S:0x32:0x02/0x2A
-S:0x33:0x03/0x2A
-S:0x34:0x04/0x2A
-S:0x35:0x05/0x2A
-S:0x36:0x06/0x2A
-S:0x37:0x07/0x2A
-S:0x38:0x08/0x2A
-S:0x39:0x09/0x2A
-S:0x3A:0x0A/0x2A
-S:0x3B:0x0B/0x2A
-S:0x3C:0x0C/0x2A
-S:0x3D:0x0D/0x2A
-S:0x3E:0x0E/0x2A
-S:0x3F:0x0F/0x2A
-
-# Spells (|)
-S:0x40:0x00/0x7C
-S:0x41:0x01/0x7C
-S:0x42:0x02/0x7C
-S:0x43:0x03/0x7C
-S:0x44:0x04/0x7C
-S:0x45:0x05/0x7C
-S:0x46:0x06/0x7C
-S:0x47:0x07/0x7C
-S:0x48:0x08/0x7C
-S:0x49:0x09/0x7C
-S:0x4A:0x0A/0x7C
-S:0x4B:0x0B/0x7C
-S:0x4C:0x0C/0x7C
-S:0x4D:0x0D/0x7C
-S:0x4E:0x0E/0x7C
-S:0x4F:0x0F/0x7C
-
-# Spells (-)
-S:0x50:0x00/0x2D
-S:0x51:0x01/0x2D
-S:0x52:0x02/0x2D
-S:0x53:0x03/0x2D
-S:0x54:0x04/0x2D
-S:0x55:0x05/0x2D
-S:0x56:0x06/0x2D
-S:0x57:0x07/0x2D
-S:0x58:0x08/0x2D
-S:0x59:0x09/0x2D
-S:0x5A:0x0A/0x2D
-S:0x5B:0x0B/0x2D
-S:0x5C:0x0C/0x2D
-S:0x5D:0x0D/0x2D
-S:0x5E:0x0E/0x2D
-S:0x5F:0x0F/0x2D
-
-# Spells (/)
-S:0x60:0x00/0x2F
-S:0x61:0x01/0x2F
-S:0x62:0x02/0x2F
-S:0x63:0x03/0x2F
-S:0x64:0x04/0x2F
-S:0x65:0x05/0x2F
-S:0x66:0x06/0x2F
-S:0x67:0x07/0x2F
-S:0x68:0x08/0x2F
-S:0x69:0x09/0x2F
-S:0x6A:0x0A/0x2F
-S:0x6B:0x0B/0x2F
-S:0x6C:0x0C/0x2F
-S:0x6D:0x0D/0x2F
-S:0x6E:0x0E/0x2F
-S:0x6F:0x0F/0x2F
-
-# Spells (\)
-S:0x70:0x00/0x5C
-S:0x71:0x01/0x5C
-S:0x72:0x02/0x5C
-S:0x73:0x03/0x5C
-S:0x74:0x04/0x5C
-S:0x75:0x05/0x5C
-S:0x76:0x06/0x5C
-S:0x77:0x07/0x5C
-S:0x78:0x08/0x5C
-S:0x79:0x09/0x5C
-S:0x7A:0x0A/0x5C
-S:0x7B:0x0B/0x5C
-S:0x7C:0x0C/0x5C
-S:0x7D:0x0D/0x5C
-S:0x7E:0x0E/0x5C
-S:0x7F:0x0F/0x5C
-
-# Amulets
-S:0x80:0x00/0xE7
-S:0x81:0x01/0xE7
-S:0x82:0x02/0xE7
-S:0x83:0x03/0xE7
-S:0x84:0x04/0xE7
-S:0x85:0x05/0xE7
-S:0x86:0x06/0xE7
-S:0x87:0x07/0xE7
-S:0x88:0x08/0xE7
-S:0x89:0x09/0xE7
-S:0x8A:0x0A/0xE7
-S:0x8B:0x0B/0xE7
-S:0x8C:0x0C/0xE7
-S:0x8D:0x0D/0xE7
-S:0x8E:0x0E/0xE7
-S:0x8F:0x0F/0xE7
-
-# Rings
-S:0x90:0x00/0xE8
-S:0x91:0x01/0xE8
-S:0x92:0x02/0xE8
-S:0x93:0x03/0xE8
-S:0x94:0x04/0xE8
-S:0x95:0x05/0xE8
-S:0x96:0x06/0xE8
-S:0x97:0x07/0xE8
-S:0x98:0x08/0xE8
-S:0x99:0x09/0xE8
-S:0x9A:0x0A/0xE8
-S:0x9B:0x0B/0xE8
-S:0x9C:0x0C/0xE8
-S:0x9D:0x0D/0xE8
-S:0x9E:0x0E/0xE8
-S:0x9F:0x0F/0xE8
-
-# Staffs
-S:0xA0:0x00/0xE9
-S:0xA1:0x01/0xE9
-S:0xA2:0x02/0xE9
-S:0xA3:0x03/0xE9
-S:0xA4:0x04/0xE9
-S:0xA5:0x05/0xE9
-S:0xA6:0x06/0xE9
-S:0xA7:0x07/0xE9
-S:0xA8:0x08/0xE9
-S:0xA9:0x09/0xE9
-S:0xAA:0x0A/0xE9
-S:0xAB:0x0B/0xE9
-S:0xAC:0x0C/0xE9
-S:0xAD:0x0D/0xE9
-S:0xAE:0x0E/0xE9
-S:0xAF:0x0F/0xE9
-
-# Wands
-S:0xB0:0x00/0xEA
-S:0xB1:0x01/0xEA
-S:0xB2:0x02/0xEA
-S:0xB3:0x03/0xEA
-S:0xB4:0x04/0xEA
-S:0xB5:0x05/0xEA
-S:0xB6:0x06/0xEA
-S:0xB7:0x07/0xEA
-S:0xB8:0x08/0xEA
-S:0xB9:0x09/0xEA
-S:0xBA:0x0A/0xEA
-S:0xBB:0x0B/0xEA
-S:0xBC:0x0C/0xEA
-S:0xBD:0x0D/0xEA
-S:0xBE:0x0E/0xEA
-S:0xBF:0x0F/0xEA
-
-# Rods
-S:0xC0:0x00/0xEB
-S:0xC1:0x01/0xEB
-S:0xC2:0x02/0xEB
-S:0xC3:0x03/0xEB
-S:0xC4:0x04/0xEB
-S:0xC5:0x05/0xEB
-S:0xC6:0x06/0xEB
-S:0xC7:0x07/0xEB
-S:0xC8:0x08/0xEB
-S:0xC9:0x09/0xEB
-S:0xCA:0x0A/0xEB
-S:0xCB:0x0B/0xEB
-S:0xCC:0x0C/0xEB
-S:0xCD:0x0D/0xEB
-S:0xCE:0x0E/0xEB
-S:0xCF:0x0F/0xEB
-
-# Scrolls
-S:0xD0:0x00/0xEC
-S:0xD1:0x01/0xEC
-S:0xD2:0x02/0xEC
-S:0xD3:0x03/0xEC
-S:0xD4:0x04/0xEC
-S:0xD5:0x05/0xEC
-S:0xD6:0x06/0xEC
-S:0xD7:0x07/0xEC
-S:0xD8:0x08/0xEC
-S:0xD9:0x09/0xEC
-S:0xDA:0x0A/0xEC
-S:0xDB:0x0B/0xEC
-S:0xDC:0x0C/0xEC
-S:0xDD:0x0D/0xEC
-S:0xDE:0x0E/0xEC
-S:0xDF:0x0F/0xEC
-
-# Potions
-S:0xE0:0x00/0xED
-S:0xE1:0x01/0xED
-S:0xE2:0x02/0xED
-S:0xE3:0x03/0xED
-S:0xE4:0x04/0xED
-S:0xE5:0x05/0xED
-S:0xE6:0x06/0xED
-S:0xE7:0x07/0xED
-S:0xE8:0x08/0xED
-S:0xE9:0x09/0xED
-S:0xEA:0x0A/0xED
-S:0xEB:0x0B/0xED
-S:0xEC:0x0C/0xED
-S:0xED:0x0D/0xED
-S:0xEE:0x0E/0xED
-S:0xEF:0x0F/0xED
-
-# Food
-S:0xF0:0x00/0xEE
-S:0xF1:0x01/0xEE
-S:0xF2:0x02/0xEE
-S:0xF3:0x03/0xEE
-S:0xF4:0x04/0xEE
-S:0xF5:0x05/0xEE
-S:0xF6:0x06/0xEE
-S:0xF7:0x07/0xEE
-S:0xF8:0x08/0xEE
-S:0xF9:0x09/0xEE
-S:0xFA:0x0A/0xEE
-S:0xFB:0x0B/0xEE
-S:0xFC:0x0C/0xEE
-S:0xFD:0x0D/0xEE
-S:0xFE:0x0E/0xEE
-S:0xFF:0x0F/0xEE
-
-
-##### Feature attr/char definitions #####
-
-# nothing
-# F:0:0x01/0x20
-
-# open floor
-F:1:0x01/0xB5
-
-# fountain
-F:2:0x0E/0xC8
-
-# glyph of warding
-F:3:0x0B/0xC6
-
-# open door
-F:4:0x0F/0xB9
-
-# broken door
-F:5:0x0F/0xBA
-
-# up staircase
-F:6:0x01/0xB6
-
-# down staircase
-F:7:0x01/0xB7
-
-# quest entrance
-F:8:0x0B/0xB7
-
-# quest exit
-F:9:0x0B/0xB6
-
-# quest down level
-F:10:0x04/0xB7
-
-# quest up level
-F:11:0x04/0xB6
-
-# town exit
-F:12:0x05/0xB7
-
-# shaft down
-F:13:0x0F/0xB7
-
-# shaft up
-F:14:0x0F/0xB6
-
-# fountain
-F:15:0x08/0xC8
-
-# web
-F:16:0x0B/0xCA
-
-# trap
-F:17:0x01/0xC7
-
-# door
-F:32:0x0F/0xB8
-
-# locked door
-F:33:0x0F/0xB8
-
-# locked door
-F:34:0x0F/0xB8
-
-# locked door
-F:35:0x0F/0xB8
-
-# locked door
-F:36:0x0F/0xB8
-
-# locked door
-F:37:0x0F/0xB8
-
-# locked door
-F:38:0x0F/0xB8
-
-# locked door
-F:39:0x0F/0xB8
-
-# jammed door
-F:40:0x0F/0xB8
-
-# jammed door
-F:41:0x0F/0xB8
-
-# jammed door
-F:42:0x0F/0xB8
-
-# jammed door
-F:43:0x0F/0xB8
-
-# jammed door
-F:44:0x0F/0xB8
-
-# jammed door
-F:45:0x0F/0xB8
-
-# jammed door
-F:46:0x0F/0xB8
-
-# jammed door
-F:47:0x0F/0xB8
-
-# secret door
-F:48:0x02/0xBC
-
-# pile of rubble
-F:49:0x02/0xBB
-
-# magma vein
-F:50:0x01/0xBC
-
-# quartz vein
-F:51:0x09/0xBC
-
-# magma vein
-F:52:0x01/0xBC
-
-# quartz vein
-F:53:0x09/0xBC
-
-# magma vein with treasure
-F:54:0x03/0xBC
-
-# quartz vein with treasure
-F:55:0x03/0xBC
-
-# granite wall
-F:56:0x02/0xBC
-
-# granite wall
-F:57:0x02/0xBC
-
-# granite wall
-F:58:0x02/0xBC
-
-# granite wall
-F:59:0x02/0xBC
-
-# permanent wall
-F:60:0x02/0xBC
-
-# permanent wall
-F:61:0x02/0xBC
-
-# permanent wall
-F:62:0x02/0xBC
-
-# permanent wall
-F:63:0x02/0xBC
-
-# explosive rune
-F:64:0x0C/0xC6
-
-# Straight Road startpoint
-F:65:0x01/0xCA
-
-# section of the Straight Road
-F:66:0x0E/0xCA
-
-# section of the Straight Road
-F:67:0x06/0xCA
-
-# section of the Straight Road
-F:68:0x0E/0xCA
-
-# section of the Straight Road
-F:69:0x06/0xCA
-
-# section of the Straight Road
-F:70:0x09/0xCA
-
-# section of the Straight Road (discharged)
-F:71:0x09/0xCA
-
-# Straight Road exit
-F:72:0x01/0xCA
-
-# corrupted section of the Straight Road
-F:73:0x08/0xCA
-
-# Building
-F:74:0x0F/0xC5
-
-# permanent wall
-F:75:0x02/0xBC
-
-# permanent wall
-F:76:0x02/0xBC
-
-# permanent wall
-F:77:0x02/0xBC
-
-# permanent wall
-F:78:0x02/0xBC
-
-# stream of shallow water
-F:84:0x0E/0xCB
-
-# pool of deep lava
-F:85:0x04/0xCB
-
-# stream of shallow lava
-F:86:0x0C/0xCB
-
-# dark pit
-F:87:0x08/0xD0
-
-# dirt
-F:88:0x07/0xB5
-
-# patch of grass
-F:89:0x0D/0xC9
-
-# ice
-F:90:0x01/0xD0
-
-# sand
-F:91:0x0F/0xB5
-
-# dead tree
-F:92:0x08/0xCC
-
-# ash
-F:93:0x02/0xB5
-
-# mud
-F:94:0x07/0xB5
-
-# ice wall
-F:95:0x01/0xCF
-
-# tree
-F:96:0x05/0xCC
-
-# mountain chain
-F:97:0x02/0xCE
-
-# sandwall
-F:98:0x0F/0xCF
-
-# sandwall
-F:99:0x0F/0xCF
-
-# sandwall with treasure
-F:100:0x03/0xCF
-
-# high mountain chain
-F:101:0x01/0xCE
-
-# nether mist
-F:102:0x0A/0xCA
-
-# Void Jumpgate
-F:160:0x0A/0xB9
-
-# Altar of Being
-F:161:0x09/0xD1
-
-# Altar of Winds
-F:162:0x0E/0xD1
-
-# Altar of Force
-F:163:0x0C/0xD1
-
-# Altar of Darkness
-F:164:0x08/0xD1
-
-# Altar of Nature
-# F:165:0x05/0x30
-
-# floor
-F:172:0x01/0xB5
-
-# Underground Tunnel
-F:173:0x02/0xB9
-
-# stream of tainted water
-F:174:0x0A/0xCB
-
-# monster trap
-F:175:0x0A/0xC6
-
-# Void Jumpgate
-F:176:0x0A/0xB9
-
-# lava wall
-F:177:0x0C/0xBC
-
-# Great Fire
-F:178:0x0C/0xCB
-
-# path to the next area
-F:179:0x01/0xB7
-
-# path to the previous area
-F:180:0x01/0xB6
-
-# field
-F:181:0x05/0xB5
-
-# Ekkaia, the Encircling Sea
-F:182:0x06/0xCB
-
-# pool of deep water
-F:187:0x06/0xCB
-
-# glass wall
-F:188:0x0E/0xD0
-
-# illusion wall
-F:189:0x02/0xBC
-
-# Grass roof
-F:190:0x0F/0xCA
-
-# grass roof top
-F:191:0x0F/0xCA
-
-# grass roof chimney
-F:192:0x0F/0xCA
-
-# brick roof
-F:193:0x04/0xCF
-
-# brick roof top
-F:194:0x04/0xCF
-
-# brick roof chimney
-F:195:0x04/0xCF
-
-# window
-F:196:0x01/0x4F
-
-# small window
-F:197:0x01/0x6F
-
-# rain barrel
-F:198:0x02/0xBC
-
-# grass with flowers
-F:199:0x04/0xC9
-
-# cobblestone road
-F:200:0x02/0xB5
-
-# cobblestone with outlet
-F:201:0x02/0xB5
-
-# small tree
-F:202:0x0D/0xCD
-
-# town
-F:203:0x01/0xC5
-
-# Underground Tunnel
-F:204:0x02/0xB9
-
-# a blazing fire
-F:205:0x0C/0xCB
-
-# pile of rubble
-F:206:0x02/0xBB
-
-# rocky ground
-F:207:0x02/0xB5
-
-# cloud-like vapour
-F:208:0x09/0xCA
-
-# condensing water
-F:209:0x0E/0xCB
-
-# dense mist
-F:210:0x01/0xCA
-
-# hail-stone wall
-F:211:0x09/0xBC
-
-
-##### Building attr/char definitions #####
-
-# General Store
-B:0:0x0F/0xBD
-
-# Armoury
-B:1:0x02/0xBE
-
-# Weaponsmith
-B:2:0x01/0xBF
-
-# Temple
-B:3:0x05/0xC0
-
-# Alchemy shop
-B:4:0x06/0xC1
-
-# Magic shop
-B:5:0x04/0xC4
-
-# Black Market
-B:6:0x08/0xC3
-
-# Home
-B:7:0x0B/0xB8
-
-# Book Store
-B:8:0x03/0xC2
-
-# Pet Shop
-B:9:0x06/0xB8
-
-# Mayor's Office
-B:10:0x03/0xB8
-
-# Inn
-B:11:0x01/0xB8
-
-# The Soothsayer
-B:12:0x0E/0xB8
-
-# Library
-B:13:0x0F/0xC2
-
-# Castle
-B:14:0x03/0xB8
-
-# Casino
-B:15:0x02/0xB8
-
-# Beastmaster Shanty
-B:16:0x05/0xB8
-
-# Fighters Hall
-B:17:0x02/0xB8
-
-# Tower of Magery
-B:18:0x06/0xB8
-
-# Inner Temple
-B:19:0x0D/0xC0
-
-# Paladins Guild
-B:20:0x05/0xB8
-
-# Rangers Guild
-B:21:0x07/0xB8
-
-# Thunderlords' Nest
-B:22:0x0F/0xB8
-
-# The Mirror
-B:23:0x0F/0xB8
-
-# Seat of Ruling
-B:24:0x0F/0xCC
-
-# Wizards Spire
-B:25:0x0F/0xB8
-
-# Priests Circle
-B:26:0x03/0xB8
-
-# Tower of the King
-B:27:0x0F/0xB8
-
-# Library
-B:28:0x0F/0xC2
-
-# The White Tree
-B:29:0x01/0xCC
-
-# Craftsmaster
-B:30:0x02/0xB8
-
-# Earth-Dome (Nature)
-B:31:0x0F/0xB8
-
-# Minstrels Haven
-B:32:0x0F/0xB8
-
-# Star-Dome
-B:33:0x0F/0xB8
-
-# Valarin Temple
-B:34:0x0F/0xC0
-
-# Sea-Dome
-B:35:0x0F/0xB8
-
-# The Golden Flower
-B:36:0x0F/0xB8
-
-# The Fountain
-B:37:0x0F/0xC8
-
-# Axe Smith
-B:38:0x01/0xBF
-
-# Hafted Smith
-B:39:0x01/0xBF
-
-# Polearm Smith
-B:40:0x01/0xBF
-
-# Sword Smith
-B:41:0x01/0xBF
-
-# Rare Jewelry Shop
-B:42:0x0A/0xC4
-
-# Jewelry Shop
-B:43:0x0B/0xC4
-
-# Footwear Shop
-B:44:0x04/0xBE
-
-# Rare Footwear Shop
-B:45:0x04/0xBE
-
-# Library
-B:46:0x0B/0xC2
-
-# Forbidden Library
-B:47:0x0A/0xC2
-
-# Expensive Black Market
-B:48:0x0A/0xC3
-
-# Common Shop
-B:49:0x0F/0xBD
-
-# Dragon Hunter
-B:50:0x0A/0xBE
-
-# Speed Ring Market
-B:51:0x0D/0xC4
-
-# Scribe
-B:52:0x0E/0xC1
-
-# Potion Store
-B:53:0x0E/0xC1
-
-# Recaller
-B:54:0x06/0xB8
-
-# Master Archer
-B:55:0x05/0xBF
-
-# Merchants Guild
-B:56:0x05/0xB8
-
-# The Mathom-house
-B:57:0x05/0xB8
-
-# The Prancing Pony
-B:58:0x01/0xB8
-
-# Mining Supply store
-B:59:0x02/0xB8
-
-
-##### Object attr/char definitions #####
-
-# something
-# K:0:0x01/0x26
-
-# Blindness
-K:1:0x00/0xEE
-
-# Paranoia
-K:2:0x00/0xEE
-
-# Confusion
-K:3:0x00/0xEE
-
-# Hallucination
-K:4:0x00/0xEE
-
-# Cure Poison
-K:5:0x00/0xEE
-
-# Cure Blindness
-K:6:0x00/0xEE
-
-# Cure Paranoia
-K:7:0x00/0xEE
-
-# Cure Confusion
-K:8:0x00/0xEE
-
-# Weakness
-K:9:0x00/0xEE
-
-# Unhealth
-K:10:0x00/0xEE
-
-# Restore Constitution
-K:11:0x00/0xEE
-
-# Restoring
-K:12:0x00/0xEE
-
-# Stupidity
-K:13:0x00/0xEE
-
-# Naivety
-K:14:0x00/0xEE
-
-# Poison
-K:15:0x00/0xEE
-
-# Sickness
-K:16:0x00/0xEE
-
-# Paralysis
-K:17:0x00/0xEE
-
-# Restore Strength
-K:18:0x00/0xEE
-
-# Disease
-K:19:0x00/0xEE
-
-# Cure Serious Wounds
-K:20:0x00/0xEE
-
-# & Ration~ of Food
-K:21:0x0F/0xF2
-
-# & Hard Biscuit~
-K:22:0x0F/0xF2
-
-# & Strip~ of Venison
-K:23:0x07/0xF2
-
-# & Slime Mold~
-K:24:0x05/0xF2
-
-# & Lembas~
-K:25:0x0E/0xF2
-
-# & Pint~ of Fine Ale
-K:26:0x0B/0xED
-
-# & Pint~ of Fine Wine
-K:27:0x04/0xED
-
-# & Mattock~
-K:28:0x08/0xD9
-
-# & Blue Stone~
-K:29:0x0E/0xE7
-
-# & Broken Dagger~
-K:30:0x08/0xDC
-
-# & Bastard Sword~
-K:31:0x09/0xDC
-
-# & Scimitar~
-K:32:0x09/0xDC
-
-# & Tulwar~
-K:33:0x09/0xDC
-
-# & Broad Sword~
-K:34:0x09/0xDC
-
-# & Short Sword~
-K:35:0x09/0xDC
-
-# & Blade~ of Chaos
-K:36:0x0A/0xDC
-
-# & Two-Handed Sword~
-K:37:0x09/0xDC
-
-# & Main Gauche~
-K:38:0x09/0xDC
-
-# & Cutlass~
-K:39:0x09/0xDC
-
-# & Executioner's Sword~
-K:40:0x04/0xDC
-
-# & Katana~
-K:41:0x09/0xDC
-
-# & Long Sword~
-K:42:0x09/0xDC
-
-# & Dagger~
-K:43:0x09/0xDC
-
-# & Rapier~
-K:44:0x09/0xDC
-
-# & Sabre~
-K:45:0x09/0xDC
-
-# & Small Sword~
-K:46:0x09/0xDC
-
-# & Broken Sword~
-K:47:0x08/0xDC
-
-# & Ball-and-Chain~
-K:48:0x08/0xDA
-
-# & Whip~
-K:49:0x08/0xDA
-
-# & Flail~
-K:50:0x08/0xDA
-
-# & Two-Handed Flail~
-K:51:0x0B/0xDA
-
-# & Morning Star~
-K:52:0x08/0xDA
-
-# & Mace~
-K:53:0x08/0xDA
-
-# & Quarterstaff~
-K:54:0x0F/0xDA
-
-# & War Hammer~
-K:55:0x08/0xDA
-
-# & Lead-Filled Mace~
-K:56:0x08/0xDA
-
-# & Mace~ of Disruption
-K:57:0x0A/0xDA
-
-# & Lucerne Hammer~
-K:58:0x0E/0xDA
-
-# & Beaked Axe~
-K:59:0x02/0xDB
-
-# & Glaive~
-K:60:0x02/0xDB
-
-# & Halberd~
-K:61:0x02/0xDB
-
-# & Awl-Pike~
-K:62:0x02/0xDB
-
-# & Pike~
-K:63:0x02/0xDB
-
-# & Spear~
-K:64:0x02/0xDB
-
-# & Trident~
-K:65:0x0B/0xDB
-
-# & Lance~
-K:66:0x02/0xDB
-
-# & Great Axe~
-K:67:0x02/0xDB
-
-# & Battle Axe~
-K:68:0x02/0xDB
-
-# & Lochaber Axe~
-K:69:0x08/0xDB
-
-# & Broad Axe~
-K:70:0x02/0xDB
-
-# & Scythe~
-K:71:0x02/0xDB
-
-# & Scythe~ of Slicing
-K:72:0x04/0xDB
-
-# & Short Bow~
-K:73:0x0F/0xD8
-
-# & Long Bow~
-K:74:0x0F/0xD8
-
-# & Light Crossbow~
-K:75:0x02/0xD8
-
-# & Heavy Crossbow~
-K:76:0x02/0xD8
-
-# & Sling~
-K:77:0x07/0xD8
-
-# & Arrow~
-K:78:0x0F/0xD7
-
-# & Seeker Arrow~
-K:79:0x0D/0xD7
-
-# & Bolt~
-K:80:0x02/0xD7
-
-# & Seeker Bolt~
-K:81:0x0E/0xD7
-
-# & Rounded Pebble~
-K:82:0x02/0xD6
-
-# & Iron Shot~
-K:83:0x02/0xD6
-
-# & Shovel~
-K:84:0x02/0xD9
-
-# & Gnomish Shovel~
-K:85:0x0D/0xD9
-
-# & Dwarven Shovel~
-K:86:0x0E/0xD9
-
-# & Pick~
-K:87:0x02/0xD9
-
-# & Orcish Pick~
-K:88:0x05/0xD9
-
-# & Dwarven Pick~
-K:89:0x06/0xD9
-
-# & Elven Cloak~
-K:90:0x0D/0xE2
-
-# & Pair~ of Soft Leather Boots
-K:91:0x0F/0xDD
-
-# & Pair~ of Hard Leather Boots
-K:92:0x0F/0xDD
-
-# & Pair~ of Metal Shod Boots
-K:93:0x02/0xDD
-
-# & Hard Leather Cap~
-K:94:0x07/0xDF
-
-# & Metal Cap~
-K:95:0x02/0xDF
-
-# & Iron Helm~
-K:96:0x02/0xDF
-
-# & Steel Helm~
-K:97:0x09/0xDF
-
-# & Iron Crown~
-K:98:0x02/0xE0
-
-# & Golden Crown~
-K:99:0x0B/0xE0
-
-# & Jewel Encrusted Crown~
-K:100:0x0A/0xE0
-
-# & Robe~
-K:101:0x06/0xE3
-
-# & Filthy Rag~
-K:102:0x08/0xE3
-
-# Soft Leather Armour~
-K:103:0x0F/0xE3
-
-# Soft Studded Leather~
-K:104:0x0F/0xE3
-
-# Hard Leather Armour~
-K:105:0x0F/0xE3
-
-# Hard Studded Leather~
-K:106:0x0F/0xE3
-
-# Leather Scale Mail~
-K:107:0x0F/0xE3
-
-# Metal Scale Mail~
-K:108:0x02/0xE4
-
-# Chain Mail~
-K:109:0x02/0xE4
-
-# Rusty Chain Mail~
-K:110:0x04/0xE4
-
-# Augmented Chain Mail~
-K:111:0x02/0xE4
-
-# Bar Chain Mail~
-K:112:0x02/0xE4
-
-# Metal Brigandine Armour~
-K:113:0x02/0xE4
-
-# Partial Plate Armour~
-K:114:0x09/0xE4
-
-# Metal Lamellar Armour~
-K:115:0x09/0xE4
-
-# Full Plate Armour~
-K:116:0x09/0xE4
-
-# Ribbed Plate Armour~
-K:117:0x09/0xE4
-
-# Adamantite Plate Mail~
-K:118:0x0D/0xE4
-
-# Mithril Plate Mail~
-K:119:0x0E/0xE4
-
-# Mithril Chain Mail~
-K:120:0x0E/0xE4
-
-# Double Chain Mail~
-K:121:0x02/0xE4
-
-# & Shield~ of Deflection
-K:122:0x0E/0xE1
-
-# & Cloak~
-K:123:0x05/0xE2
-
-# & Shadow Cloak~
-K:124:0x08/0xE2
-
-# & Set~ of Leather Gloves
-K:125:0x0F/0xDE
-
-# & Set~ of Gauntlets
-K:126:0x0F/0xDE
-
-# & Set~ of Cesti
-K:127:0x09/0xDE
-
-# & Small Leather Shield~
-K:128:0x0F/0xE1
-
-# & Large Leather Shield~
-K:129:0x0F/0xE1
-
-# & Small Metal Shield~
-K:130:0x02/0xE1
-
-# & Large Metal Shield~
-K:131:0x02/0xE1
-
-# Strength
-K:132:0x00/0xE8
-
-# Dexterity
-K:133:0x00/0xE8
-
-# Constitution
-K:134:0x00/0xE8
-
-# Intelligence
-K:135:0x00/0xE8
-
-# Speed
-K:136:0x00/0xE8
-
-# Searching
-K:137:0x00/0xE8
-
-# Teleportation
-K:138:0x00/0xE8
-
-# Slow Digestion
-K:139:0x00/0xE8
-
-# Fire Resistance
-K:140:0x00/0xE8
-
-# Cold Resistance
-K:141:0x00/0xE8
-
-# Levitation
-K:142:0x00/0xE8
-
-# Poison Resistance
-K:143:0x00/0xE8
-
-# Free Action
-K:144:0x00/0xE8
-
-# Weakness
-K:145:0x00/0xE8
-
-# Flames
-K:146:0x00/0xE8
-
-# Acid
-K:147:0x00/0xE8
-
-# Ice
-K:148:0x00/0xE8
-
-# Woe
-K:149:0x00/0xE8
-
-# Stupidity
-K:150:0x00/0xE8
-
-# Damage
-K:151:0x00/0xE8
-
-# Accuracy
-K:152:0x00/0xE8
-
-# Protection
-K:153:0x00/0xE8
-
-# Aggravate Monster
-K:154:0x00/0xE8
-
-# See Invisible
-K:155:0x00/0xE8
-
-# Sustain Strength
-K:156:0x00/0xE8
-
-# Sustain Intelligence
-K:157:0x00/0xE8
-
-# Sustain Wisdom
-K:158:0x00/0xE8
-
-# Sustain Constitution
-K:159:0x00/0xE8
-
-# Sustain Dexterity
-K:160:0x00/0xE8
-
-# Sustain Charisma
-K:161:0x00/0xE8
-
-# Slaying
-K:162:0x00/0xE8
-
-# Brilliance
-K:163:0x00/0xE7
-
-# Charisma
-K:164:0x00/0xE7
-
-# Searching
-K:165:0x00/0xE7
-
-# Teleportation
-K:166:0x00/0xE7
-
-# Slow Digestion
-K:167:0x00/0xE7
-
-# Acid Resistance
-K:168:0x00/0xE7
-
-# Adornment
-K:169:0x00/0xE7
-
-# Double Ring Mail~
-K:170:0x02/0xE4
-
-# the Magi
-K:171:0x00/0xE7
-
-# Doom
-K:172:0x00/0xE7
-
-# Enchant Weapon To-Hit
-K:173:0x00/0xEC
-
-# Enchant Weapon To-Dam
-K:174:0x00/0xEC
-
-# Enchant Armor
-K:175:0x00/0xEC
-
-# Identify
-K:176:0x00/0xEC
-
-# *Identify*
-K:177:0x00/0xEC
-
-# Rumour
-K:178:0x00/0xEC
-
-# Chaos
-K:179:0x00/0xEC
-
-# Remove Curse
-K:180:0x00/0xEC
-
-# Light
-K:181:0x00/0xEC
-
-# Fire
-K:182:0x00/0xEC
-
-# Ice
-K:183:0x00/0xEC
-
-# Summon Monster
-K:184:0x00/0xEC
-
-# Phase Door
-K:185:0x00/0xEC
-
-# Teleportation
-K:186:0x00/0xEC
-
-# Teleport Level
-K:187:0x00/0xEC
-
-# Monster Confusion
-K:188:0x00/0xEC
-
-# Magic Mapping
-K:189:0x00/0xEC
-
-# Rune of Protection
-K:190:0x00/0xEC
-
-# *Remove Curse*
-K:191:0x00/0xEC
-
-# Treasure Detection
-K:192:0x00/0xEC
-
-# Object Detection
-K:193:0x00/0xEC
-
-# Trap Detection
-K:194:0x00/0xEC
-
-# & Sheaf Arrow~
-K:195:0x03/0xD7
-
-# & Mithril Shot~
-K:196:0x0E/0xD6
-
-# Door/Stair Location
-K:197:0x00/0xEC
-
-# Acquirement
-K:198:0x00/0xEC
-
-# *Acquirement*
-K:199:0x00/0xEC
-
-# Mass Genocide
-K:200:0x00/0xEC
-
-# Detect Invisible
-K:201:0x00/0xEC
-
-# Aggravate Monster
-K:202:0x00/0xEC
-
-# Trap Creation
-K:203:0x00/0xEC
-
-# Trap/Door Destruction
-K:204:0x00/0xEC
-
-# Artifact Creation
-K:205:0x00/0xEC
-
-# Recharging
-K:206:0x00/0xEC
-
-# Genocide
-K:207:0x00/0xEC
-
-# Darkness
-K:208:0x00/0xEC
-
-# Protection from Evil
-K:209:0x00/0xEC
-
-# Satisfy Hunger
-K:210:0x00/0xEC
-
-# Dispel Undead
-K:211:0x00/0xEC
-
-# *Enchant Weapon*
-K:212:0x00/0xEC
-
-# Curse Weapon
-K:213:0x00/0xEC
-
-# *Enchant Armor*
-K:214:0x00/0xEC
-
-# Curse Armor
-K:215:0x00/0xEC
-
-# Summon Undead
-K:216:0x00/0xEC
-
-# Blessing
-K:217:0x00/0xEC
-
-# Holy Chant
-K:218:0x00/0xEC
-
-# Holy Prayer
-K:219:0x00/0xEC
-
-# Word of Recall
-K:220:0x00/0xEC
-
-# *Destruction*
-K:221:0x00/0xEC
-
-# Slime Mold Juice
-K:222:0x00/0xED
-
-# Apple Juice
-K:223:0x00/0xED
-
-# Water
-K:224:0x00/0xED
-
-# Strength
-K:225:0x00/0xED
-
-# Weakness
-K:226:0x00/0xED
-
-# Restore Strength
-K:227:0x00/0xED
-
-# Intelligence
-K:228:0x00/0xED
-
-# Stupidity
-K:229:0x00/0xED
-
-# Restore Intelligence
-K:230:0x00/0xED
-
-# Wisdom
-K:231:0x00/0xED
-
-# Naivety
-K:232:0x00/0xED
-
-# Restore Wisdom
-K:233:0x00/0xED
-
-# Charisma
-K:234:0x00/0xED
-
-# Ugliness
-K:235:0x00/0xED
-
-# Restore Charisma
-K:236:0x00/0xED
-
-# Curing
-K:237:0x00/0xED
-
-# Invulnerability
-K:238:0x00/0xED
-
-# New Life
-K:239:0x00/0xED
-
-# Cure Serious Wounds
-K:240:0x00/0xED
-
-# Cure Critical Wounds
-K:241:0x00/0xED
-
-# Healing
-K:242:0x00/0xED
-
-# Constitution
-K:243:0x00/0xED
-
-# Experience
-K:244:0x00/0xED
-
-# Sleep
-K:245:0x00/0xED
-
-# Blindness
-K:246:0x00/0xED
-
-# Booze
-K:247:0x00/0xED
-
-# Poison
-K:248:0x00/0xED
-
-# Speed
-K:249:0x00/0xED
-
-# Slowness
-K:250:0x00/0xED
-
-# Dexterity
-K:251:0x00/0xED
-
-# Restore Dexterity
-K:252:0x00/0xED
-
-# Restore Constitution
-K:253:0x00/0xED
-
-# Lose Memories
-K:254:0x00/0xED
-
-# Salt Water
-K:255:0x00/0xED
-
-# Enlightenment
-K:256:0x00/0xED
-
-# Heroism
-K:257:0x00/0xED
-
-# Berserk Strength
-K:258:0x00/0xED
-
-# Boldness
-K:259:0x00/0xED
-
-# Restore Life Levels
-K:260:0x00/0xED
-
-# Resist Heat
-K:261:0x00/0xED
-
-# Resist Cold
-K:262:0x00/0xED
-
-# Detect Invisible
-K:263:0x00/0xED
-
-# Slow Poison
-K:264:0x00/0xED
-
-# Neutralise Poison
-K:265:0x00/0xED
-
-# Restore Mana
-K:266:0x00/0xED
-
-# Infra-vision
-K:267:0x00/0xED
-
-# Resistance
-K:268:0x00/0xED
-
-# Spell
-K:269:0x00/0xEA
-
-# Manathrust
-K:270:0x00/0xEA
-
-# Fireflash
-K:271:0x00/0xEA
-
-# Firewall
-K:272:0x00/0xEA
-
-# Tidal Wave
-K:273:0x00/0xEA
-
-# Ice Storm
-K:274:0x00/0xEA
-
-# Noxious Cloud
-K:275:0x00/0xEA
-
-# Poison Blood
-K:276:0x00/0xEA
-
-# Thunderstorm
-K:277:0x00/0xEA
-
-# Dig
-K:278:0x00/0xEA
-
-# Stone Prison
-K:279:0x00/0xEA
-
-# Strike
-K:280:0x00/0xEA
-
-# Teleport Away
-K:281:0x00/0xEA
-
-# Summon Animal
-K:282:0x00/0xEA
-
-# Magelock
-K:283:0x00/0xEA
-
-# Slow Monster
-K:284:0x00/0xEA
-
-# Essence of Speed
-K:285:0x00/0xEA
-
-# Banishment
-K:286:0x00/0xEA
-
-# Disperse Magic
-K:287:0x00/0xEA
-
-# Charm
-K:288:0x00/0xEA
-
-# Confuse
-K:289:0x00/0xEA
-
-# Demon Blade
-K:290:0x00/0xEA
-
-# Heal Monster
-K:291:0x00/0xEA
-
-# Haste Monster
-K:292:0x00/0xEA
-
-# & Flight Arrow~
-K:293:0x0B/0xD7
-
-# Spell
-K:300:0x00/0xE9
-
-# Nothing
-K:301:0x00/0xE9
-
-# Globe of Light
-K:302:0x00/0xE9
-
-# Fiery Shield
-K:303:0x00/0xE9
-
-# Remove Curses
-K:304:0x00/0xE9
-
-# Wings of Winds
-K:305:0x00/0xE9
-
-# Shake
-K:306:0x00/0xE9
-
-# Disarm
-K:307:0x00/0xE9
-
-# Teleportation
-K:308:0x00/0xE9
-
-# Probability Travel
-K:309:0x00/0xE9
-
-# Recovery
-K:310:0x00/0xE9
-
-# Healing
-K:311:0x00/0xE9
-
-# Vision
-K:312:0x00/0xE9
-
-# Identify
-K:313:0x00/0xE9
-
-# Sense Hidden
-K:314:0x00/0xE9
-
-# Reveal Ways
-K:315:0x00/0xE9
-
-# Sense Monsters
-K:316:0x00/0xE9
-
-# Genocide
-K:317:0x00/0xE9
-
-# Summon
-K:318:0x00/0xE9
-
-# Wish
-K:320:0x00/0xE9
-
-# Mana
-K:321:0x00/0xE9
-
-# & Tome~ of Magical Energy
-K:330:0x0E/0xEF
-
-# & Tome~ of the Eternal Flame
-K:331:0x0C/0xEF
-
-# & Tome~ of the Blowing Wind
-K:332:0x06/0xEF
-
-# & Tome~ of the Impenetrable Earth
-K:333:0x0F/0xEF
-
-# & Tome~ of the Everrunning Wave
-K:334:0x0E/0xEF
-
-# & Tome~ of Translocation
-K:335:0x0E/0xEF
-
-# & Tome~ of the Tree
-K:336:0x0D/0xEF
-
-# & Tome~ of Knowledge
-K:337:0x08/0xEF
-
-# & Small wooden chest~
-K:338:0x02/0xD5
-
-# & Large wooden chest~
-K:339:0x02/0xD5
-
-# & Small iron chest~
-K:340:0x02/0xD5
-
-# & Large iron chest~
-K:341:0x02/0xD5
-
-# & Small steel chest~
-K:342:0x02/0xD5
-
-# & Large steel chest~
-K:343:0x02/0xD5
-
-# & Ruined chest~
-K:344:0x02/0xD5
-
-# & Iron Spike~
-K:345:0x09/0xD4
-
-# & Wooden Torch~
-K:346:0x07/0xF1
-
-# & Brass Lantern~
-K:347:0x0F/0xE6
-
-# & Flask~ of oil
-K:348:0x0B/0xED
-
-# & Empty Bottle~
-K:349:0x01/0xED
-
-# Havoc
-K:350:0x00/0xEB
-
-# Door/Stair Location
-K:351:0x00/0xEB
-
-# Trap Location
-K:352:0x00/0xEB
-
-# Probing
-K:353:0x00/0xEB
-
-# Recall
-K:354:0x00/0xEB
-
-# Illumination
-K:355:0x00/0xEB
-
-# Light
-K:356:0x00/0xEB
-
-# Lightning Bolts
-K:357:0x00/0xEB
-
-# Frost Bolts
-K:358:0x00/0xEB
-
-# Fire Bolts
-K:359:0x00/0xEB
-
-# Polymorph
-K:360:0x00/0xEB
-
-# Slow Monster
-K:361:0x00/0xEB
-
-# Sleep Monster
-K:362:0x00/0xEB
-
-# Drain Life
-K:363:0x00/0xEB
-
-# Teleport Other
-K:364:0x00/0xEB
-
-# Disarming
-K:365:0x00/0xEB
-
-# Lightning Balls
-K:366:0x00/0xEB
-
-# Cold Balls
-K:367:0x00/0xEB
-
-# Fire Balls
-K:368:0x00/0xEB
-
-# Acid Balls
-K:369:0x00/0xEB
-
-# Acid Bolts
-K:370:0x00/0xEB
-
-# Enlightenment
-K:371:0x00/0xEB
-
-# Perception
-K:372:0x00/0xEB
-
-# Curing
-K:373:0x00/0xEB
-
-# Healing
-K:374:0x00/0xEB
-
-# Detection
-K:375:0x00/0xEB
-
-# Restoration
-K:376:0x00/0xEB
-
-# Speed
-K:377:0x00/0xEB
-
-# Spell
-K:378:0x00/0xE8
-
-# Spell
-K:379:0x00/0xE7
-
-# & Broken Skull~
-K:391:0x01/0xD3
-
-# & Broken Bone~
-K:392:0x01/0xD3
-
-# & Canine Skeleton~
-K:393:0x01/0xD3
-
-# & Rodent Skeleton~
-K:394:0x01/0xD3
-
-# & Human Skeleton~
-K:395:0x01/0xD3
-
-# & Dwarf Skeleton~
-K:396:0x01/0xD3
-
-# & Elf Skeleton~
-K:397:0x01/0xD3
-
-# & Gnome Skeleton~
-K:398:0x01/0xD3
-
-# & Great Hammer~
-K:399:0x08/0xDA
-
-# Black Dragon Scale Mail~
-K:400:0x02/0xE5
-
-# Blue Dragon Scale Mail~
-K:401:0x06/0xE5
-
-# White Dragon Scale Mail~
-K:402:0x01/0xE5
-
-# Red Dragon Scale Mail~
-K:403:0x04/0xE5
-
-# Green Dragon Scale Mail~
-K:404:0x05/0xE5
-
-# Multi-Hued Dragon Scale Mail~
-K:405:0x0A/0xE5
-
-# Pseudo Dragon Scale Mail~
-K:406:0x0A/0xE5
-
-# Law Dragon Scale Mail~
-K:407:0x0E/0xE5
-
-# Bronze Dragon Scale Mail~
-K:408:0x0F/0xE5
-
-# Gold Dragon Scale Mail~
-K:409:0x0B/0xE5
-
-# Chaos Dragon Scale Mail~
-K:410:0x0A/0xE5
-
-# Balance Dragon Scale Mail~
-K:411:0x0A/0xE5
-
-# Power Dragon Scale Mail~
-K:412:0x0A/0xE5
-
-# & Dragon Helm~
-K:413:0x0D/0xDF
-
-# & Dragon Shield~
-K:414:0x0D/0xE1
-
-# Death
-K:415:0x00/0xED
-
-# Ruination
-K:416:0x00/0xED
-
-# Detonations
-K:417:0x00/0xED
-
-# Augmentation
-K:418:0x00/0xED
-
-# *Healing*
-K:419:0x00/0xED
-
-# Life
-K:420:0x00/0xED
-
-# Self Knowledge
-K:421:0x00/0xED
-
-# *Enlightenment*
-K:422:0x00/0xED
-
-# Fear Resistance
-K:425:0x00/0xE8
-
-# Light and Darkness Resistance
-K:426:0x00/0xE8
-
-# Nether Resistance
-K:427:0x00/0xE8
-
-# Nexus Resistance
-K:428:0x00/0xE8
-
-# Sound Resistance
-K:429:0x00/0xE8
-
-# Confusion Resistance
-K:430:0x00/0xE8
-
-# Shard Resistance
-K:431:0x00/0xE8
-
-# Disenchantment Resistance
-K:432:0x00/0xE8
-
-# Chaos Resistance
-K:433:0x00/0xE8
-
-# Blindness Resistance
-K:434:0x00/0xE8
-
-# Lordly Protection
-K:435:0x00/0xE8
-
-# Extra Attacks
-K:436:0x00/0xE8
-
-# Cure Light Wounds
-K:437:0x00/0xED
-
-# Clumsiness
-K:438:0x00/0xED
-
-# Sickliness
-K:439:0x00/0xED
-
-# Map of Bree
-K:440:0x02/0xEC
-
-# Map of Gondolin
-K:441:0x02/0xEC
-
-# Map of Lothlorien
-K:442:0x02/0xEC
-
-# Map of Minas Anor
-K:443:0x02/0xEC
-
-# & Silver Arrow~
-K:465:0x09/0xD7
-
-# & Silver Bolt~
-K:466:0x01/0xD7
-
-# Lightning Resistance
-K:467:0x00/0xE7
-
-# Wisdom
-K:468:0x00/0xE7
-
-# Regeneration
-K:469:0x00/0xE7
-
-# Infravision
-K:470:0x00/0xE7
-
-# Devotion
-K:471:0x00/0xE7
-
-# Weaponmastery
-K:472:0x00/0xE7
-
-# Trickery
-K:473:0x00/0xE7
-
-# Telepathy
-K:474:0x00/0xE7
-
-# Sustenance
-K:475:0x00/0xE7
-
-# & Palantir~
-K:476:0x0B/0xF0
-
-# & Elfstone~
-K:477:0x05/0xE7
-
-# & Jewel~
-K:478:0x01/0xE7
-
-# & Ring~
-K:479:0x00/0xE8
-
-# copper
-K:480:0x07/0xF3
-
-# copper
-K:481:0x07/0xF3
-
-# copper
-K:482:0x07/0xF3
-
-# silver
-K:483:0x02/0xF3
-
-# silver
-K:484:0x02/0xF3
-
-# silver
-K:485:0x02/0xF3
-
-# garnets
-K:486:0x04/0xF4
-
-# garnets
-K:487:0x04/0xF4
-
-# gold
-K:488:0x0B/0xF3
-
-# gold
-K:489:0x0B/0xF3
-
-# gold
-K:490:0x0B/0xF3
-
-# opals
-K:491:0x09/0xF4
-
-# sapphires
-K:492:0x06/0xF4
-
-# rubies
-K:493:0x04/0xF4
-
-# diamonds
-K:494:0x01/0xF4
-
-# emeralds
-K:495:0x05/0xF4
-
-# mithril
-K:496:0x0E/0xF3
-
-# adamantite
-K:497:0x0D/0xF3
-
-# & Mighty Hammer~
-K:498:0x08/0xDA
-
-# & Massive Iron Crown~
-K:499:0x08/0xE0
-
-# & Phial~
-K:500:0x0B/0xF0
-
-# & Star~
-K:501:0x0E/0xF0
-
-# & Arkenstone~
-K:502:0x0C/0xF0
-
-# & Amulet~
-K:503:0x00/0xE7
-
-# & Amulet~
-K:504:0x00/0xE7
-
-# & Necklace~
-K:505:0x00/0xE7
-
-# & Ring~
-K:506:0x00/0xE8
-
-# & Ring~
-K:507:0x00/0xE8
-
-# & Ring~
-K:508:0x00/0xE8
-
-# & Ring~
-K:509:0x00/0xE8
-
-# & Ring~
-K:510:0x00/0xE8
-
-# & Ring~
-K:511:0x0B/0xE8
-
-# Reflection
-K:520:0x00/0xE7
-
-# Anti-Magic
-K:521:0x00/0xE7
-
-# Anti-Teleportation
-K:522:0x00/0xE7
-
-# Resistance
-K:523:0x00/0xE7
-
-# & Zweihander~
-K:524:0x01/0xDC
-
-# & Dwarven Lantern~
-K:525:0x06/0xE6
-
-# Splint Mail~
-K:526:0x08/0xE4
-
-# & Everburning Torch~
-K:527:0x0C/0xF1
-
-# & Trifurcate Spear~
-K:528:0x03/0xDB
-
-# & Three Piece Rod~
-K:529:0x07/0xDA
-
-# & Feanorian Lamp~
-K:530:0x0E/0xE6
-
-# & Fur Cloak~
-K:531:0x09/0xE2
-
-# Water Curing
-K:532:0x00/0xED
-
-# & Hatchet~
-K:533:0x02/0xDB
-
-# Rhino Hide Armour~
-K:535:0x02/0xE3
-
-# Leather Jacket~
-K:536:0x0F/0xE3
-
-# & Sickle~
-K:537:0x02/0xDB
-
-# & Club~
-K:542:0x07/0xDA
-
-# & Broad Spear~
-K:543:0x01/0xDB
-
-# & Khopesh~
-K:544:0x09/0xDC
-
-# & Flamberge~
-K:545:0x09/0xDC
-
-# & Claymore~
-K:546:0x09/0xDC
-
-# & Espadon~
-K:547:0x09/0xDC
-
-# & Great Scimitar~
-K:548:0x09/0xDC
-
-# Arrow
-K:549:0x04/0xF8
-
-# Bolt
-K:550:0x03/0xF8
-
-# & Fauchard~
-K:551:0x02/0xDB
-
-# & Guisarme~
-K:552:0x02/0xDB
-
-# & Heavy Lance~
-K:553:0x02/0xDB
-
-# & Basillard~
-K:554:0x01/0xDC
-
-# Catapult
-K:555:0x0C/0xF8
-
-# Ring Mail~
-K:556:0x02/0xE4
-
-# Cord Armour~
-K:557:0x0B/0xE3
-
-# Paper Armour~
-K:558:0x01/0xE3
-
-# Padded Armour~
-K:559:0x0B/0xE3
-
-# Fumes
-K:560:0x0D/0xF8
-
-# Stone and Hide Armour~
-K:561:0x0F/0xE3
-
-# Magic
-K:562:0x05/0xF8
-
-# Device
-K:563:0x0A/0xF8
-
-# Nothing
-K:564:0x00/0xEC
-
-# Poison
-K:565:0x0D/0xF6
-
-# Nothing
-K:566:0x00/0xEA
-
-# Nothing
-K:567:0x00/0xE8
-
-# Nothing
-K:568:0x00/0xE9
-
-# Nothing
-K:569:0x00/0xEB
-
-# Explosion
-K:570:0x0D/0xF6
-
-# Teleport
-K:571:0x0D/0xF6
-
-# Nothing
-K:572:0x00/0xE7
-
-# & Blood~ of Life
-K:573:0x00/0xED
-
-# Cold
-K:574:0x0D/0xF6
-
-# Fire
-K:575:0x0D/0xF6
-
-# Acid
-K:576:0x0D/0xF6
-
-# & Mage Staff~
-K:577:0x0E/0xE9
-
-# Lightning
-K:578:0x00/0xE8
-
-# Life
-K:579:0x0D/0xF6
-
-# Confusion
-K:580:0x0D/0xF6
-
-# Light
-K:581:0x0D/0xF6
-
-# & Ring~
-K:582:0x0B/0xE8
-
-# Invisibility
-K:583:0x00/0xED
-
-# Chaos
-K:584:0x0D/0xF6
-
-# Corruption
-K:585:0x00/0xED
-
-# Invisibility
-K:586:0x00/0xE8
-
-# Time
-K:587:0x0D/0xF6
-
-# Deep Thoughts
-K:588:0x03/0xEC
-
-# More Deep Thoughts
-K:589:0x03/0xEC
-
-# Compendium of Deep Thoughts
-K:590:0x03/0xEC
-
-# Artifact Lore Vol. I
-K:591:0x03/0xEC
-
-# Artifact Lore Vol. II
-K:592:0x03/0xEC
-
-# Artifact Lore Vol. III
-K:593:0x03/0xEC
-
-# Monstrous Compendium 1
-K:594:0x03/0xEC
-
-# Monstrous Compendium 2
-K:595:0x03/0xEC
-
-# Monstrous Compendium 3
-K:596:0x03/0xEC
-
-# Monstrous Compendium 4
-K:597:0x03/0xEC
-
-# Monstrous Compendium 5
-K:598:0x03/0xEC
-
-# Monstrous Compendium 6
-K:599:0x03/0xEC
-
-# Monstrous Compendium 7
-K:600:0x03/0xEC
-
-# Monstrous Compendium 8
-K:601:0x03/0xEC
-
-# Monstrous Compendium 9
-K:602:0x03/0xEC
-
-# Monstrous Compendium 10
-K:603:0x03/0xEC
-
-# Monstrous Compendium 11
-K:604:0x03/0xEC
-
-# Abomination
-K:605:0x00/0xED
-
-# Shape of Wolf
-K:606:0x00/0xED
-
-# Shape of Ape
-K:607:0x00/0xED
-
-# Shape of Goat
-K:608:0x00/0xED
-
-# Shape of Insect
-K:609:0x00/0xED
-
-# Shape of Sparrow
-K:610:0x00/0xED
-
-# Shape of Ent
-K:611:0x00/0xED
-
-# Shape of Vampire
-K:612:0x00/0xED
-
-# Shape of Spider
-K:613:0x00/0xED
-
-# Shape of Mana ball
-K:614:0x00/0xED
-
-# Shape of Fire cloud
-K:615:0x00/0xED
-
-# Shape of Cold cloud
-K:616:0x00/0xED
-
-# Shape of Chaos cloud
-K:617:0x00/0xED
-
-# [Wolf]
-K:618:0x0B/0xE2
-
-# [Ape]
-K:619:0x0B/0xE2
-
-# [Goat]
-K:620:0x0B/0xE2
-
-# [Insect]
-K:621:0x0B/0xE2
-
-# [Sparrow]
-K:622:0x0B/0xE2
-
-# [Ent]
-K:623:0x0B/0xE2
-
-# [Vampire]
-K:624:0x0B/0xE2
-
-# [Spider]
-K:625:0x0B/0xE2
-
-# [Mana ball]
-K:626:0x0B/0xE2
-
-# [Fire cloud]
-K:627:0x0B/0xE2
-
-# [Cold cloud]
-K:628:0x0B/0xE2
-
-# [Chaos Cloud]
-K:629:0x0B/0xE2
-
-# [Ghost]
-K:630:0x0B/0xE2
-
-# [Kobold]
-K:631:0x0B/0xE2
-
-# [Dragon]
-K:632:0x0B/0xE2
-
-# [Demon]
-K:633:0x0B/0xE2
-
-# [Hound]
-K:634:0x0B/0xE2
-
-# [Quylthulg]
-K:635:0x0B/0xE2
-
-# [Maia]
-K:636:0x0B/0xE2
-
-# [Serpent]
-K:637:0x0B/0xE2
-
-# [Giant]
-K:638:0x0B/0xE2
-
-# [Vala]
-K:639:0x0B/0xE2
-
-# Magic
-K:640:0x0D/0xF6
-
-# corpse
-K:641:0x0F/0xD2
-
-# skeleton
-K:642:0x0F/0xD2
-
-# head
-K:643:0x0F/0xD2
-
-# skull
-K:644:0x0F/0xD2
-
-# raw meat
-K:645:0x0F/0xD2
-
-# & Thunderlord Coat~
-K:646:0x0B/0xE3
-
-# & Stone~
-K:647:0x05/0xF0
-
-# & Small Wooden Boomerang~
-K:648:0x0B/0xD8
-
-# & Wooden Boomerang~
-K:649:0x0B/0xD8
-
-# & Small Metal Boomerang~
-K:650:0x0B/0xD8
-
-# & metal Boomerang~
-K:651:0x0B/0xD8
-
-# & Anchor~
-K:652:0x0A/0xF0
-
-# & ~
-K:653:0x0B/0xD2
-
-# Summon Never-Moving Pet
-K:654:0x00/0xEC
-
-# Cure Light Insanity
-K:657:0x00/0xED
-
-# Cure Serious Insanity
-K:658:0x00/0xED
-
-# Cure Critical Insanity
-K:659:0x00/0xED
-
-# Cure Insanity
-K:660:0x00/0xED
-
-# & Phial~
-K:661:0x0B/0xF0
-
-# Random Artifact
-K:662:0x03/0xD3
-
-# Craftmanship
-K:663:0x00/0xEC
-
-# The One Ring
-K:664:0x02/0xEC
-
-# & Book~ of the Lays of the Heroes
-K:665:0x0B/0xEF
-
-# & Book~ of Sound Patterns
-K:666:0x0B/0xEF
-
-# & Flute~
-K:669:0x09/0xF7
-
-# & Drum~
-K:670:0x09/0xF7
-
-# & Harp~
-K:671:0x09/0xF7
-
-# & Banjo~
-K:672:0x09/0xF7
-
-# & Lute~
-K:673:0x09/0xF7
-
-# & Mandolin~
-K:674:0x09/0xF7
-
-# & Palantir~
-K:675:0x0B/0xF0
-
-# Egg
-K:676:0x09/0xD6
-
-# Reset Recall
-K:677:0x00/0xEC
-
-# Divination
-K:678:0x00/0xEC
-
-# Self
-K:679:0x06/0xF5
-
-# Ray
-K:680:0x06/0xF5
-
-# Sphere
-K:681:0x06/0xF5
-
-# Knowledge
-K:682:0x06/0xF5
-
-# Life
-K:683:0x08/0xF5
-
-# Fire
-K:684:0x04/0xF5
-
-# Cold
-K:685:0x06/0xF5
-
-# Lightning
-K:686:0x09/0xF5
-
-# Acid
-K:687:0x0E/0xF5
-
-# Element
-K:688:0x05/0xF5
-
-# Chaos
-K:689:0x0A/0xF5
-
-# Mind
-K:690:0x08/0xF5
-
-# Holding
-K:691:0x0E/0xF5
-
-# Arrow
-K:692:0x06/0xF5
-
-# Power Surge
-K:693:0x06/0xF5
-
-# Armageddon
-K:694:0x06/0xF5
-
-# Gravity
-K:695:0x0D/0xF5
-
-# Extra Life
-K:696:0x0D/0xF6
-
-# Undeath
-K:697:0x0D/0xF5
-
-# Protection
-K:698:0x0D/0xF5
-
-# & Horn~
-K:699:0x09/0xF7
-
-# & Ring~ of Precognition
-K:700:0x00/0xE8
-
-# & Sprig~ of Athelas
-K:701:0x05/0xF2
-
-# & Old Scroll~ of Deincarnation
-K:720:0x00/0xEC
-
-# & Dark Sword~
-K:721:0x08/0xDC
-
-# Numenorean for Beginners (I)
-K:722:0x02/0xEC
-
-# Numenorean for Beginners (II)
-K:723:0x02/0xEC
-
-# Advanced lessons of Numenorean
-K:724:0x02/0xEC
-
-# Advanced lessons of Sindarin
-K:725:0x02/0xEC
-
-# & Shard~ of Pottery
-K:726:0x04/0xD3
-
-# & Broken Stick~
-K:727:0x04/0xD3
-
-# & Book~ of Beginner Cantrips
-K:738:0x01/0xEF
-
-# & Book~ of Teleportation
-K:739:0x01/0xEF
-
-# & Book~ of Recall
-K:740:0x01/0xEF
-
-# & Book~ of Summoning
-K:741:0x01/0xEF
-
-# & Book~ of Fireflash
-K:742:0x01/0xEF
-
-# & Potion~ of Learning
-K:743:0x00/0xED
-
-# Spell
-K:749:0x00/0xEC
-
-# Khuzdul - The Hidden Tongue of the Dwarves
-K:751:0x02/0xEC
-
-# Nandorin for Dummies
-K:752:0x02/0xEC
-
-# Advanced Lessons of Orcish
-K:753:0x02/0xEC
-
-# Flying
-K:755:0x00/0xE8
-
-# & Tome~ of the Time
-K:756:0x06/0xEF
-
-# & Spellbook~ of #
-K:757:0x01/0xEF
-
-# & Tome~ of Meta Spells
-K:758:0x0A/0xEF
-
-# & Tome~ of the Mind
-K:759:0x0E/0xEF
-
-# & Holy Tome~ of Eru Iluvatar
-K:760:0x0D/0xEF
-
-# & Holy Tome~ of Manwe Sulimo
-K:761:0x0E/0xEF
-
-# & War Tome~ of Tulkas
-K:762:0x0C/0xEF
-
-# & Unholy Tome~ of the Hellflame
-K:763:0x0A/0xEF
-
-# & Corrupted Tome~ of Melkor
-K:764:0x08/0xEF
-
-# & Forest Tome~ of Yavanna
-K:768:0x0D/0xEF
-
-# & Ring~
-K:770:0x00/0xE8
-
-# [Earth]
-K:771:0x0C/0xEF
-
-# [Fire]
-K:772:0x0C/0xEF
-
-# [Air]
-K:773:0x04/0xEF
-
-# [Water]
-K:774:0x04/0xEF
-
-# [Mana]
-K:775:0x04/0xEF
-
-# Home Summoning
-K:776:0x00/0xEB
-
-# & Shadow Blade~
-K:777:0x08/0xDC
-
-# & Bluesteel Blade~
-K:778:0x06/0xDC
-
-# the Serpents
-K:779:0x0D/0xE7
-
-# Darkness
-K:780:0x0D/0xF6
-
-# Knowledge
-K:781:0x0D/0xF6
-
-# Force
-K:782:0x0D/0xF6
-
-# Lightning
-K:783:0x0D/0xF6
-
-# Mana
-K:784:0x0D/0xF6
-
-# Ring~ of Power
-K:785:0x00/0xE8
-
-# Climbing Set~
-K:786:0x0E/0xF8
-
-# Adventurer's Guide to Middle-earth
-K:787:0x03/0xEC
-
-# & Demonblade~
-K:788:0x0C/0xEF
-
-# & Demonshield~
-K:789:0x0C/0xEF
-
-# & Demonhorn~
-K:790:0x0C/0xEF
-
-# & Wooden Rod~ of#
-K:793:0x07/0xEB
-
-# & Copper Rod~ of#
-K:794:0x02/0xEB
-
-# & Iron Rod~ of#
-K:795:0x08/0xEB
-
-# & Moonstone Rod~ of#
-K:796:0x0F/0xEB
-
-# & Silver Rod~ of#
-K:797:0x02/0xEB
-
-# & Golden Rod~ of#
-K:798:0x0B/0xEB
-
-# & Mithril Rod~ of#
-K:799:0x0E/0xEB
-
-# & Adamantite Rod~ of#
-K:800:0x0A/0xEB
-
-# & Greater Ration~ of Health
-K:801:0x05/0xF2
-
-# & Crumpled Scroll~ of Mass Resurrection
-K:802:0x00/0xEC
-
-# & Cleaver~
-K:803:0x02/0xDB
-
-# & Light War Axe~
-K:804:0x02/0xDB
-
-# & Slaughter Axe~
-K:805:0x0D/0xDB
-
-# & Runestone~
-K:806:0x0A/0xF5
-
-# & Fortune cookie~
-K:807:0x0F/0xF2
-
-# Portable hole
-K:808:0x0E/0xF8
-
-# Critical Hits
-K:809:0x00/0xE8
-
-# & Wand~ of Digging of Thrain
-K:810:0x00/0xEA
-
-# & Gnarled Staff~ of Holy Fire of Mithrandir
-K:811:0x00/0xE9
-
-# Partial Totem
-K:812:0x0A/0xF8
-
-# True Totem
-K:813:0x0A/0xF8
-
-# & Piece~ of the Relic of Eru
-K:814:0x0A/0xD3
-
-# & Piece~ of the Relic of Manwe
-K:815:0x0A/0xD3
-
-# & Piece~ of the Relic of Tulkas
-K:816:0x0A/0xD3
-
-# & Piece~ of the Relic of Melkor
-K:817:0x0A/0xD3
-
-# & Piece~ of the Relic of Yavanna
-K:818:0x0A/0xD3
-
-
-##### Monster attr/char definitions #####
-
-# Player
-R:0:0x01/0x80
-
-# Filthy street urchin
-R:1:0x08/0xAE
-
-# Scrawny cat
-R:2:0x0F/0xA0
-
-# Sparrow
-R:3:0x0F/0x82
-
-# Chaffinch
-R:4:0x04/0x82
-
-# Wild rabbit
-R:5:0x0F/0xAC
-
-# Woodsman
-R:6:0x05/0xAE
-
-# Scruffy little dog
-R:7:0x0F/0x83
-
-# Farmer Maggot
-R:8:0x01/0xA2
-
-# Blubbering idiot
-R:9:0x09/0xAE
-
-# Boil-covered wretch
-R:10:0x05/0xAE
-
-# Village idiot
-R:11:0x0D/0xAE
-
-# Pitiful-looking beggar
-R:12:0x0F/0xAE
-
-# Mangy-looking leper
-R:13:0x07/0xAE
-
-# Agent of the black market
-R:14:0x06/0xAE
-
-# Singing, happy drunk
-R:15:0x0B/0xAE
-
-# Aimless-looking merchant
-R:16:0x03/0xAE
-
-# Mean-looking mercenary
-R:17:0x04/0xAE
-
-# Battle-scarred veteran
-R:18:0x0E/0xAE
-
-# Martti Ihrasaari
-R:19:0x01/0x90
-
-# Grey mold
-R:20:0x02/0xA7
-
-# Large white snake
-R:21:0x01/0x8A
-
-# Grey mushroom patch
-R:22:0x02/0xEE
-
-# Newt
-R:23:0x0B/0x92
-
-# Giant white centipede
-R:24:0x01/0x9D
-
-# White icky thing
-R:25:0x01/0xA3
-
-# Clear icky thing
-R:26:0x0E/0xA3
-
-# Giant white mouse
-R:27:0x01/0xAC
-
-# Large brown snake
-R:28:0x07/0x8A
-
-# Small kobold
-R:29:0x0B/0xA5
-
-# Kobold
-R:30:0x0D/0xA5
-
-# White worm mass
-R:31:0x01/0xB1
-
-# Floating eye
-R:32:0x03/0x9F
-
-# Rock lizard
-R:33:0x0F/0x92
-
-# Grid bug
-R:34:0x0A/0x89
-
-# Jackal
-R:35:0x0F/0x83
-
-# Soldier ant
-R:36:0x07/0x9B
-
-# Fruit bat
-R:37:0x03/0x9C
-
-# Insect swarm
-R:38:0x07/0x89
-
-# The Greater hell-beast
-R:39:0x02/0x95
-
-# Shrieker mushroom patch
-R:40:0x0C/0xEE
-
-# Blubbering icky thing
-R:41:0x09/0xA3
-
-# Metallic green centipede
-R:42:0x05/0x9D
-
-# Novice warrior
-R:43:0x07/0xAA
-
-# Novice rogue
-R:44:0x06/0xAA
-
-# Novice priest
-R:45:0x05/0xAA
-
-# Novice mage
-R:46:0x04/0xAA
-
-# Yellow mushroom patch
-R:47:0x0B/0xEE
-
-# White jelly
-R:48:0x01/0xA4
-
-# Giant black ant
-R:49:0x08/0x9B
-
-# Salamander
-R:50:0x03/0x92
-
-# White harpy
-R:51:0x01/0x88
-
-# Blue yeek
-R:52:0x06/0xB3
-
-# Grip, Farmer Maggot's dog
-R:53:0x01/0x83
-
-# Wolf, Farmer Maggot's dog
-R:54:0x01/0x83
-
-# Fang, Farmer Maggot's dog
-R:55:0x01/0x83
-
-# Giant green frog
-R:56:0x05/0x92
-
-# Freesia
-R:57:0x07/0xA0
-
-# Green worm mass
-R:58:0x05/0xB1
-
-# Large yellow snake
-R:59:0x0B/0x8A
-
-# Cave spider
-R:60:0x08/0x93
-
-# Crow
-R:61:0x02/0x82
-
-# Wild cat
-R:62:0x0F/0xA0
-
-# Smeagol
-R:63:0x0E/0xA2
-
-# Green ooze
-R:64:0x05/0xA4
-
-# Poltergeist
-R:65:0x02/0x87
-
-# Yellow jelly
-R:66:0x0B/0xA4
-
-# Metallic blue centipede
-R:67:0x06/0x9D
-
-# Raven
-R:68:0x08/0x82
-
-# Giant white louse
-R:69:0x01/0x89
-
-# Giant yellow centipede
-R:70:0x0B/0x9D
-
-# Black naga
-R:71:0x08/0xA8
-
-# Spotted mushroom patch
-R:72:0x03/0xEE
-
-# Silver jelly
-R:73:0x09/0xA4
-
-# Scruffy-looking hobbit
-R:74:0x02/0xA2
-
-# Giant white ant
-R:75:0x01/0x9B
-
-# Yellow mold
-R:76:0x0B/0xA7
-
-# Metallic red centipede
-R:77:0x04/0x9D
-
-# Yellow worm mass
-R:78:0x0B/0xB1
-
-# Clear worm mass
-R:79:0x0E/0xB1
-
-# Radiation eye
-R:80:0x0C/0x9F
-
-# Yellow light
-R:81:0x0B/0xF0
-
-# Cave lizard
-R:82:0x07/0x92
-
-# Novice ranger
-R:83:0x09/0xAA
-
-# Blue jelly
-R:84:0x06/0xA4
-
-# Creeping copper coins
-R:85:0x07/0xF3
-
-# Giant white rat
-R:86:0x09/0xAC
-
-# Snotling
-R:87:0x0F/0xA9
-
-# Swordfish
-R:88:0x09/0x7E
-
-# Blue worm mass
-R:89:0x06/0xB1
-
-# Large grey snake
-R:90:0x02/0x8A
-
-# Skeleton kobold
-R:91:0x09/0xAD
-
-# Ewok
-R:92:0x0D/0xA2
-
-# Novice mage
-R:93:0x04/0xAA
-
-# Green naga
-R:94:0x05/0xA8
-
-# Giant leech
-R:95:0x07/0xB1
-
-# Barracuda
-R:96:0x0D/0x7E
-
-# Novice paladin
-R:97:0x01/0xAA
-
-# Zog
-R:98:0x06/0xA2
-
-# Blue ooze
-R:99:0x06/0xA4
-
-# Green glutton ghost
-R:100:0x05/0x87
-
-# Green jelly
-R:101:0x05/0xA4
-
-# Large kobold
-R:102:0x06/0xA5
-
-# Grey icky thing
-R:103:0x02/0xA3
-
-# Disenchanter eye
-R:104:0x0A/0x9F
-
-# Red worm mass
-R:105:0x04/0xB1
-
-# Copperhead snake
-R:106:0x03/0x8A
-
-# Death sword
-R:107:0x09/0xDC
-
-# Purple mushroom patch
-R:108:0x0A/0xEE
-
-# Novice priest
-R:109:0x05/0xAA
-
-# Novice warrior
-R:110:0x07/0xAA
-
-# Nibelung
-R:111:0x08/0xA2
-
-# The disembodied hand that strangled people
-R:112:0x05/0xB4
-
-# Brown mold
-R:113:0x07/0xA7
-
-# Giant brown bat
-R:114:0x07/0x9C
-
-# Rat-thing
-R:115:0x0C/0xAC
-
-# Novice rogue
-R:116:0x06/0xAA
-
-# Creeping silver coins
-R:117:0x02/0xF3
-
-# Snaga
-R:118:0x0F/0xA9
-
-# Rattlesnake
-R:119:0x04/0x8A
-
-# Giant slug
-R:120:0x0F/0xB1
-
-# Giant pink frog
-R:121:0x04/0x92
-
-# Dark elf
-R:122:0x08/0xA2
-
-# Zombified kobold
-R:123:0x02/0xB4
-
-# Crypt creep
-R:124:0x08/0xAD
-
-# Rotting corpse
-R:125:0x0C/0xB4
-
-# Cave orc
-R:126:0x0D/0xA9
-
-# Wood spider
-R:127:0x0F/0x93
-
-# Manes
-R:128:0x04/0xAF
-
-# Bloodshot eye
-R:129:0x04/0x9F
-
-# Red naga
-R:130:0x04/0xA8
-
-# Red jelly
-R:131:0x04/0xA4
-
-# Green icky thing
-R:132:0x05/0xA3
-
-# Lost soul
-R:133:0x09/0x87
-
-# Night lizard
-R:134:0x06/0x92
-
-# Mughash, the Kobold Lord
-R:135:0x0A/0xA5
-
-# Skeleton orc
-R:136:0x09/0xAD
-
-# Wormtongue, Agent of Saruman
-R:137:0x0E/0xAA
-
-# Robin Hood, the Outlaw
-R:138:0x0D/0xAA
-
-# Nurgling
-R:139:0x03/0xAF
-
-# Lagduf, the Snaga
-R:140:0x0B/0xA9
-
-# Brown yeek
-R:141:0x07/0xB3
-
-# Novice ranger
-R:142:0x09/0xAA
-
-# Giant salamander
-R:143:0x0C/0x92
-
-# Space monster
-R:144:0x00/0xB5
-
-# Carnivorous flying monkey
-R:145:0x0C/0x88
-
-# Green mold
-R:146:0x05/0xA7
-
-# Novice paladin
-R:147:0x01/0xAA
-
-# Lemure
-R:148:0x0F/0xAF
-
-# Hill orc
-R:149:0x07/0xA9
-
-# Bandit
-R:150:0x06/0xAA
-
-# Hunting hawk
-R:151:0x07/0x82
-
-# Phantom warrior
-R:152:0x0E/0x87
-
-# Gremlin
-R:153:0x07/0xAF
-
-# Yeti
-R:154:0x01/0x99
-
-# Bloodshot icky thing
-R:155:0x04/0xA3
-
-# Giant grey rat
-R:156:0x02/0xAC
-
-# Black harpy
-R:157:0x08/0x88
-
-# Skaven
-R:158:0x0D/0xAC
-
-# The wounded bear
-R:159:0x04/0xAB
-
-# Cave bear
-R:160:0x07/0xAB
-
-# Rock mole
-R:161:0x02/0xAC
-
-# Mindcrafter
-R:162:0x0B/0xAA
-
-# Baby blue dragon
-R:163:0x06/0x9E
-
-# Baby white dragon
-R:164:0x01/0x9E
-
-# Baby green dragon
-R:165:0x05/0x9E
-
-# Baby black dragon
-R:166:0x02/0x9E
-
-# Baby red dragon
-R:167:0x04/0x9E
-
-# Giant red ant
-R:168:0x04/0x9B
-
-# Brodda, the Easterling
-R:169:0x0F/0xAA
-
-# Bloodfang, the Wolf
-R:170:0x0C/0x83
-
-# King cobra
-R:171:0x05/0x8A
-
-# Eagle
-R:172:0x07/0x82
-
-# War bear
-R:173:0x07/0xAB
-
-# Killer bee
-R:174:0x0B/0x89
-
-# Giant spider
-R:175:0x0A/0x93
-
-# Giant white tick
-R:176:0x01/0x93
-
-# The Borshin
-R:177:0x01/0xA1
-
-# Dark elven mage
-R:178:0x04/0xA2
-
-# Kamikaze yeek
-R:179:0x04/0xB3
-
-# Orfax, Son of Boldor
-R:180:0x0E/0xB3
-
-# Servant of Glaaki
-R:181:0x0D/0xB4
-
-# Dark elven warrior
-R:182:0x07/0xA2
-
-# Sand-dweller
-R:183:0x0B/0xAF
-
-# Clear mushroom patch
-R:184:0x0E/0xEE
-
-# Quiver slot
-R:185:0x0F/0xEE
-
-# Grishnakh, the Hill Orc
-R:186:0x0B/0xA9
-
-# Giant tan bat
-R:187:0x0F/0x9C
-
-# Owlbear
-R:188:0x03/0x88
-
-# Blue horror
-R:189:0x0E/0xAF
-
-# Hairy mold
-R:190:0x03/0xA7
-
-# Grizzly bear
-R:191:0x0F/0xAB
-
-# Disenchanter mold
-R:192:0x0A/0xA7
-
-# Pseudo dragon
-R:193:0x03/0x9E
-
-# Tengu
-R:194:0x06/0xAF
-
-# Creeping gold coins
-R:195:0x0B/0xF3
-
-# Wolf
-R:196:0x07/0x83
-
-# Giant fruit fly
-R:197:0x0D/0x89
-
-# Panther
-R:198:0x08/0xA0
-
-# Brigand
-R:199:0x06/0xAA
-
-# Hobbes the Tiger
-R:200:0x0B/0xA0
-
-# Shadow Creature of Fiona
-R:201:0x02/0xA2
-
-# Undead mass
-R:202:0x07/0xA4
-
-# Chaos shapechanger
-R:203:0x0A/0x88
-
-# Baby multi-hued dragon
-R:204:0x0A/0x9E
-
-# Vorpal bunny
-R:205:0x01/0xAC
-
-# Old Man Willow
-R:206:0x02/0xCC
-
-# Hippocampus
-R:207:0x0E/0x88
-
-# Zombified orc
-R:208:0x02/0xB4
-
-# Hippogriff
-R:209:0x0F/0x88
-
-# Black mamba
-R:210:0x08/0x8A
-
-# White wolf
-R:211:0x01/0x83
-
-# Grape jelly
-R:212:0x0A/0xA4
-
-# Nether worm mass
-R:213:0x08/0xB1
-
-# Abyss worm mass
-R:214:0x08/0xB1
-
-# Golfimbul, the Hill Orc Chief
-R:215:0x0B/0xA9
-
-# Swordsman
-R:216:0x07/0xAA
-
-# Skaven shaman
-R:217:0x05/0xAC
-
-# Baby bronze dragon
-R:218:0x0F/0x9E
-
-# Baby gold dragon
-R:219:0x0B/0x9E
-
-# Evil eye
-R:220:0x08/0x9F
-
-# Mine-dog
-R:221:0x07/0x83
-
-# Hellcat
-R:222:0x0C/0xA0
-
-# Moon beast
-R:223:0x09/0xAB
-
-# Master yeek
-R:224:0x05/0xB3
-
-# Priest
-R:225:0x05/0xAA
-
-# Dark elven priest
-R:226:0x05/0xA2
-
-# Air spirit
-R:227:0x0E/0x85
-
-# Skeleton human
-R:228:0x09/0xAD
-
-# Zombified human
-R:229:0x02/0xB4
-
-# Tiger
-R:230:0x03/0xA0
-
-# Moaning spirit
-R:231:0x07/0x87
-
-# Stegocentipede
-R:232:0x07/0x9D
-
-# Spotted jelly
-R:233:0x03/0xA4
-
-# Drider
-R:234:0x06/0x93
-
-# Mongbat
-R:235:0x0F/0x9C
-
-# Killer brown beetle
-R:236:0x07/0x8B
-
-# Boldor, King of the Yeeks
-R:237:0x0A/0xB3
-
-# Ogre
-R:238:0x0F/0x8F
-
-# Creeping mithril coins
-R:239:0x0E/0xF3
-
-# Illusionist
-R:240:0x0C/0xAA
-
-# Druid
-R:241:0x0D/0xAA
-
-# Pink horror
-R:242:0x0C/0xAF
-
-# Cloaker
-R:243:0x05/0xE2
-
-# Black orc
-R:244:0x08/0xA9
-
-# Ochre jelly
-R:245:0x0F/0xA4
-
-# Software bug
-R:246:0x04/0x89
-
-# Lurker
-R:247:0x01/0xB5
-
-# Tangleweed
-R:248:0x05/0xCC
-
-# Vlasta
-R:249:0x0E/0x92
-
-# Giant white dragon fly
-R:250:0x01/0x86
-
-# Snaga sapper
-R:251:0x0F/0xA9
-
-# Blue icky thing
-R:252:0x06/0xA3
-
-# Gibbering mouther
-R:253:0x03/0xA4
-
-# Wolfhound of Flora
-R:254:0x02/0x83
-
-# Hill giant
-R:255:0x0F/0x90
-
-# Flesh golem
-R:256:0x0C/0xA1
-
-# Warg
-R:257:0x08/0x83
-
-# Cheerful leprechaun
-R:258:0x0D/0xA2
-
-# Giant flea
-R:259:0x02/0x89
-
-# Ufthak of Cirith Ungol
-R:260:0x05/0xA9
-
-# Clay golem
-R:261:0x0F/0xA1
-
-# Black ogre
-R:262:0x08/0x8F
-
-# Dweller on the threshold
-R:263:0x02/0x99
-
-# Half-orc
-R:264:0x02/0xA9
-
-# Dark naga
-R:265:0x02/0xA8
-
-# Poison ivy
-R:266:0x05/0xCC
-
-# Magic mushroom patch
-R:267:0x0E/0xEE
-
-# Plaguebearer of Nurgle
-R:268:0x03/0xB4
-
-# Guardian naga
-R:269:0x0B/0xA8
-
-# Wererat
-R:270:0x08/0xAC
-
-# Light hound
-R:271:0x03/0x9A
-
-# Dark hound
-R:272:0x08/0x9A
-
-# Flying skull
-R:273:0x02/0xAD
-
-# Mi-Go
-R:274:0x0C/0x89
-
-# Giant tarantula
-R:275:0x03/0x93
-
-# Giant clear centipede
-R:276:0x0E/0x9D
-
-# Mirkwood spider
-R:277:0x0D/0x93
-
-# Frost giant
-R:278:0x01/0x90
-
-# Griffon
-R:279:0x07/0x88
-
-# Homunculus
-R:280:0x0B/0xAF
-
-# Gnome mage
-R:281:0x0C/0xA2
-
-# Clear hound
-R:282:0x0E/0x9A
-
-# Umber hulk
-R:283:0x0F/0x98
-
-# Rust monster
-R:284:0x03/0xAB
-
-# Ogrillon
-R:285:0x09/0x8F
-
-# Gelatinous cube
-R:286:0x0D/0xA4
-
-# Giant green dragon fly
-R:287:0x0D/0x86
-
-# Fire giant
-R:288:0x04/0x90
-
-# Hummerhorn
-R:289:0x0B/0x89
-
-# Lizard man
-R:290:0x0D/0xA2
-
-# Ulfast, Son of Ulfang
-R:291:0x0F/0xAA
-
-# Crebain
-R:292:0x08/0x82
-
-# Berserker
-R:293:0x07/0xAA
-
-# Quasit
-R:294:0x03/0xAF
-
-# Sphinx
-R:295:0x03/0x88
-
-# Imp
-R:296:0x05/0xAF
-
-# Forest troll
-R:297:0x05/0x94
-
-# Freezing sphere
-R:298:0x01/0xF0
-
-# Jumping fireball
-R:299:0x04/0xF0
-
-# Ball lightning
-R:300:0x0E/0xF0
-
-# 2-headed hydra
-R:301:0x07/0x8D
-
-# Swamp thing
-R:302:0x05/0x88
-
-# Water spirit
-R:303:0x06/0x85
-
-# Giant red scorpion
-R:304:0x04/0x93
-
-# Earth spirit
-R:305:0x07/0x85
-
-# Fire spirit
-R:306:0x04/0x85
-
-# Fire hound
-R:307:0x04/0x9A
-
-# Cold hound
-R:308:0x01/0x9A
-
-# Energy hound
-R:309:0x06/0x9A
-
-# Lesser Mimic
-R:310:0x0B/0xA7
-
-# Door mimic
-R:311:0x0F/0xB8
-
-# Blink dog
-R:312:0x0E/0x83
-
-# Uruk
-R:313:0x0E/0xA9
-
-# Shagrat, the Orc Captain
-R:314:0x05/0xA9
-
-# Gorbag, the Orc Captain
-R:315:0x05/0xA9
-
-# Shambling mound
-R:316:0x05/0xEE
-
-# Giant Venus Flytrap
-R:317:0x05/0xCC
-
-# Chaos beastman
-R:318:0x07/0x88
-
-# Daemonette of Slaanesh
-R:319:0x0C/0xAF
-
-# Giant bronze dragon fly
-R:320:0x0F/0x86
-
-# Stone giant
-R:321:0x09/0x90
-
-# Giant black dragon fly
-R:322:0x02/0x86
-
-# Stone golem
-R:323:0x09/0xA1
-
-# Red mold
-R:324:0x04/0xA7
-
-# Giant gold dragon fly
-R:325:0x0B/0x86
-
-# Stunwall
-R:326:0x09/0xBC
-
-# Ghast
-R:327:0x07/0xB4
-
-# Neekerbreeker
-R:328:0x08/0x89
-
-# Huorn
-R:329:0x05/0xCC
-
-# Bolg, Son of Azog
-R:330:0x0A/0xA9
-
-# Phase spider
-R:331:0x0E/0x93
-
-# Lizard king
-R:332:0x05/0xA2
-
-# Landmine
-R:333:0x01/0xB5
-
-# Wyvern
-R:334:0x05/0x9E
-
-# Great eagle
-R:335:0x07/0x82
-
-# Livingstone
-R:336:0x09/0xBC
-
-# Earth hound
-R:337:0x07/0x9A
-
-# Air hound
-R:338:0x05/0x9A
-
-# Sabre-tooth tiger
-R:339:0x0B/0xA0
-
-# Acid hound
-R:340:0x02/0x9A
-
-# Chimaera
-R:341:0x04/0x88
-
-# Quylthulg
-R:342:0x0B/0x91
-
-# Sasquatch
-R:343:0x09/0x99
-
-# Weir
-R:344:0x09/0x83
-
-# Ranger
-R:345:0x09/0xAA
-
-# Paladin
-R:346:0x01/0xAA
-
-# Werewolf
-R:347:0x08/0x83
-
-# Dark elven lord
-R:348:0x02/0xA2
-
-# Cloud giant
-R:349:0x06/0x90
-
-# Ugluk, the Uruk
-R:350:0x0A/0xA9
-
-# Blue dragon bat
-R:351:0x06/0x9C
-
-# Mimic
-R:352:0x0B/0xA7
-
-# Ultimate Mimic
-R:353:0x0B/0xA7
-
-# Fire vortex
-R:354:0x04/0xB0
-
-# Acid vortex
-R:355:0x02/0xB0
-
-# Lugdush, the Uruk
-R:356:0x0A/0xA9
-
-# Arch-vile
-R:357:0x09/0xAF
-
-# Cold vortex
-R:358:0x01/0xB0
-
-# Energy vortex
-R:359:0x06/0xB0
-
-# Globefish
-R:360:0x01/0x7E
-
-# Giant firefly
-R:361:0x04/0x89
-
-# Mummified orc
-R:362:0x01/0xB4
-
-# Wolf chieftain
-R:363:0x08/0x83
-
-# Serpent man
-R:364:0x0D/0x8A
-
-# Vampiric mist
-R:365:0x08/0xCA
-
-# Killer stag beetle
-R:366:0x05/0x8B
-
-# Iron golem
-R:367:0x02/0xA1
-
-# Auto-roller
-R:368:0x02/0xA1
-
-# Giant yellow scorpion
-R:369:0x0B/0x93
-
-# Jade monk
-R:370:0x0D/0xAA
-
-# Black ooze
-R:371:0x08/0xA4
-
-# Hardened warrior
-R:372:0x07/0xAA
-
-# Azog, King of the Uruk-Hai
-R:373:0x0A/0xA9
-
-# Fleshhound of Khorne
-R:374:0x0C/0x83
-
-# Dark elven warlock
-R:375:0x0A/0xA2
-
-# Master rogue
-R:376:0x06/0xAA
-
-# Red dragon bat
-R:377:0x04/0x9C
-
-# Killer white beetle
-R:378:0x01/0x8B
-
-# Ice skeleton
-R:379:0x01/0xAD
-
-# Angamaite of Umbar
-R:380:0x0F/0xAA
-
-# Forest wight
-R:381:0x05/0x97
-
-# Khim, Son of Mim
-R:382:0x03/0xA2
-
-# Ibun, Son of Mim
-R:383:0x03/0xA2
-
-# Meneldor the Swift
-R:384:0x07/0x82
-
-# Phantom beast
-R:385:0x0E/0x87
-
-# Giant silver ant
-R:386:0x09/0x9B
-
-# 4-headed hydra
-R:387:0x0B/0x8D
-
-# Lesser hell-beast
-R:388:0x02/0x95
-
-# Tyrannosaur
-R:389:0x05/0x92
-
-# Mummified human
-R:390:0x01/0xB4
-
-# Vampire bat
-R:391:0x08/0x9C
-
-# Sangahyando of Umbar
-R:392:0x0F/0xAA
-
-# It
-R:393:0x09/0xB5
-
-# Banshee
-R:394:0x06/0x87
-
-# Carrion crawler
-R:395:0x03/0x9D
-
-# Xiclotlan
-R:396:0x08/0xCC
-
-# Silent watcher
-R:397:0x02/0xA1
-
-# Pukelman
-R:398:0x08/0xA1
-
-# Disenchanter beast
-R:399:0x0A/0xAB
-
-# Dark elven druid
-R:400:0x0D/0xA2
-
-# Stone troll
-R:401:0x09/0x94
-
-# Black
-R:402:0x00/0xA4
-
-# Hill troll
-R:403:0x02/0x94
-
-# Wereworm
-R:404:0x07/0xB1
-
-# Killer red beetle
-R:405:0x04/0x8B
-
-# Disenchanter bat
-R:406:0x0A/0x9C
-
-# Gnoph-Keh
-R:407:0x02/0xAB
-
-# Giant grey ant
-R:408:0x02/0x9B
-
-# Khufu, the Mummified King
-R:409:0x0A/0xB4
-
-# Gwaihir the Windlord
-R:410:0x07/0x82
-
-# Giant fire tick
-R:411:0x0C/0x93
-
-# Displacer beast
-R:412:0x06/0xA0
-
-# Ulwarth, Son of Ulfang
-R:413:0x0F/0xAA
-
-# Werebear
-R:414:0x08/0xAB
-
-# Cave ogre
-R:415:0x07/0x8F
-
-# White wraith
-R:416:0x01/0x97
-
-# Angel
-R:417:0x03/0x81
-
-# Ghoul
-R:418:0x0F/0xB4
-
-# Mim, Betrayer of Turin
-R:419:0x03/0xA2
-
-# Hellblade
-R:420:0x0A/0xDC
-
-# Killer fire beetle
-R:421:0x0C/0x8B
-
-# Beast of Nurgle
-R:422:0x0B/0xAB
-
-# Creeping adamantite coins
-R:423:0x0D/0xF3
-
-# Algroth
-R:424:0x03/0x94
-
-# Flamer of Tzeentch
-R:425:0x04/0xEE
-
-# Roper
-R:426:0x08/0xBC
-
-# Headless
-R:427:0x07/0x88
-
-# Vibration hound
-R:428:0x0B/0x9A
-
-# Nexus hound
-R:429:0x0A/0x9A
-
-# Half-ogre
-R:430:0x03/0x8F
-
-# Lokkak, the Ogre Chieftain
-R:431:0x0A/0x8F
-
-# Vampire
-R:432:0x09/0x96
-
-# Gorgimaera
-R:433:0x03/0x88
-
-# Shantak
-R:434:0x08/0x88
-
-# Colbran
-R:435:0x0B/0xA1
-
-# Spirit naga
-R:436:0x01/0xA8
-
-# Corpser
-R:437:0x08/0xEE
-
-# Fiend of Slaanesh
-R:438:0x0C/0x93
-
-# Stairway to Hell
-R:439:0x09/0xB7
-
-# 5-headed hydra
-R:440:0x05/0x8D
-
-# Barney the Dinosaur
-R:441:0x0A/0x92
-
-# Black knight
-R:442:0x02/0xAA
-
-# Seahorse
-R:443:0x03/0x7E
-
-# Cyclops
-R:444:0x07/0x90
-
-# Clairvoyant
-R:445:0x0B/0xAA
-
-# Purple worm
-R:446:0x0A/0xB1
-
-# Catoblepas
-R:447:0x05/0xAB
-
-# Lesser wall monster
-R:448:0x09/0xBC
-
-# Mage
-R:449:0x04/0xAA
-
-# Mind flayer
-R:450:0x0A/0xA2
-
-# The Ultimate Dungeon Cleaner
-R:451:0x08/0xA1
-
-# Deep one
-R:452:0x05/0xAF
-
-# Basilisk
-R:453:0x02/0x92
-
-# Ice troll
-R:454:0x01/0x94
-
-# Dhole
-R:455:0x02/0xB1
-
-# Archangel
-R:456:0x0E/0x81
-
-# Greater Mimic
-R:457:0x0B/0xA7
-
-# Chaos tile
-R:458:0x0A/0xB5
-
-# Young blue dragon
-R:459:0x06/0x9E
-
-# Young white dragon
-R:460:0x01/0x9E
-
-# Young green dragon
-R:461:0x05/0x9E
-
-# Young bronze dragon
-R:462:0x0F/0x9E
-
-# Aklash
-R:463:0x0C/0x94
-
-# Mithril golem
-R:464:0x0E/0xA1
-
-# Skeleton troll
-R:465:0x09/0xAD
-
-# Skeletal tyrannosaur 
-R:466:0x01/0x92
-
-# Beorn, the Shape-Changer
-R:467:0x08/0xAB
-
-# Thorondor, Lord of Eagles
-R:468:0x07/0x82
-
-# Giant blue ant
-R:469:0x06/0x9B
-
-# Grave wight
-R:470:0x06/0x97
-
-# Shadow drake
-R:471:0x0D/0x9E
-
-# Manticore
-R:472:0x0B/0x88
-
-# Giant army ant
-R:473:0x03/0x9B
-
-# Killer slicer beetle
-R:474:0x0B/0x8B
-
-# Gorgon
-R:475:0x06/0x88
-
-# Gug
-R:476:0x0D/0x90
-
-# Ghost
-R:477:0x01/0x87
-
-# Death watch beetle
-R:478:0x08/0x8B
-
-# Mountain ogre
-R:479:0x02/0x8F
-
-# Nexus quylthulg
-R:480:0x0A/0x91
-
-# Shelob, Spider of Darkness
-R:481:0x08/0x93
-
-# Giant squid
-R:482:0x05/0x7E
-
-# Ghoulking
-R:483:0x08/0xB4
-
-# Doombat
-R:484:0x0C/0x9C
-
-# Ninja
-R:485:0x07/0xAA
-
-# Memory moss
-R:486:0x06/0xEE
-
-# Storm giant
-R:487:0x0E/0x90
-
-# Spectator
-R:488:0x0E/0x9F
-
-# Bokrug
-R:489:0x0A/0x92
-
-# Biclops
-R:490:0x07/0x90
-
-# Half-troll
-R:491:0x0F/0x94
-
-# Ivory monk
-R:492:0x01/0xAA
-
-# Bert the Stone Troll
-R:493:0x09/0x94
-
-# Bill the Stone Troll
-R:494:0x09/0x94
-
-# Tom the Stone Troll
-R:495:0x09/0x94
-
-# Cave troll
-R:496:0x07/0x94
-
-# Anti-paladin
-R:497:0x08/0xAA
-
-# Chaos master
-R:498:0x0A/0xAA
-
-# Barrow wight
-R:499:0x0A/0x97
-
-# Skeleton ettin
-R:500:0x09/0xAD
-
-# Chaos drake
-R:501:0x0A/0x9E
-
-# Law drake
-R:502:0x0E/0x9E
-
-# Balance drake
-R:503:0x0A/0x9E
-
-# Ethereal drake
-R:504:0x03/0x9E
-
-# Groo, the Wanderer
-R:505:0x0F/0xAA
-
-# Fasolt the Giant
-R:506:0x07/0x90
-
-# Shade
-R:507:0x08/0x87
-
-# Spectre
-R:508:0x0F/0x87
-
-# Water troll
-R:509:0x0E/0x94
-
-# Fire elemental
-R:510:0x04/0x85
-
-# Cherub
-R:511:0x0D/0x81
-
-# Water elemental
-R:512:0x06/0x85
-
-# Multi-hued hound
-R:513:0x0A/0x9A
-
-# Invisible stalker
-R:514:0x0B/0x85
-
-# Carrion crawler
-R:515:0x03/0x9D
-
-# Master thief
-R:516:0x06/0xAA
-
-# The Watcher in the Water
-R:517:0x0A/0x7E
-
-# Lich
-R:518:0x03/0x8C
-
-# Gas spore
-R:519:0x05/0x9F
-
-# Master vampire
-R:520:0x05/0x96
-
-# Oriental vampire
-R:521:0x02/0x96
-
-# Greater mummy
-R:522:0x0B/0xB4
-
-# Bloodletter of Khorne
-R:523:0x04/0x95
-
-# Giant grey scorpion
-R:524:0x02/0x93
-
-# Earth elemental
-R:525:0x07/0x85
-
-# Air elemental
-R:526:0x0E/0x85
-
-# Shimmering mold
-R:527:0x06/0xA7
-
-# Gargoyle
-R:528:0x02/0xAF
-
-# Malicious leprechaun
-R:529:0x0A/0xA2
-
-# Eog golem
-R:530:0x07/0xA1
-
-# Little Boy
-R:531:0x08/0xD6
-
-# Dagashi
-R:532:0x07/0xAA
-
-# Headless ghost
-R:533:0x07/0x87
-
-# Dread
-R:534:0x03/0x87
-
-# Leng spider
-R:535:0x0A/0x93
-
-# Gauth
-R:536:0x02/0x9F
-
-# Smoke elemental
-R:537:0x0C/0x85
-
-# Olog
-R:538:0x0B/0x94
-
-# Halfling slinger
-R:539:0x0F/0xA2
-
-# Gravity hound
-R:540:0x09/0x9A
-
-# Acidic cytoplasm
-R:541:0x02/0xA4
-
-# Inertia hound
-R:542:0x09/0x9A
-
-# Impact hound
-R:543:0x07/0x9A
-
-# Shardstorm
-R:544:0x07/0xB0
-
-# Ooze elemental
-R:545:0x05/0x85
-
-# Young black dragon
-R:546:0x02/0x9E
-
-# Mumak
-R:547:0x02/0xAB
-
-# Giant fire ant
-R:548:0x0C/0x9B
-
-# Mature white dragon
-R:549:0x01/0x9E
-
-# Xorn
-R:550:0x07/0x98
-
-# Rogrog the Black Troll
-R:551:0x08/0x94
-
-# Mist giant
-R:552:0x0E/0xCA
-
-# Phantom
-R:553:0x0A/0x87
-
-# Grey wraith
-R:554:0x02/0x97
-
-# Revenant
-R:555:0x07/0x97
-
-# Young multi-hued dragon
-R:556:0x0A/0x9E
-
-# Raal's Tome of Destruction
-R:557:0x04/0xEF
-
-# Colossus
-R:558:0x0D/0xA1
-
-# Young gold dragon
-R:559:0x0B/0x9E
-
-# Mature blue dragon
-R:560:0x06/0x9E
-
-# Mature green dragon
-R:561:0x05/0x9E
-
-# Mature bronze dragon
-R:562:0x0F/0x9E
-
-# Young red dragon
-R:563:0x04/0x9E
-
-# Nightblade
-R:564:0x08/0xA2
-
-# Trapper
-R:565:0x01/0xB5
-
-# Bodak
-R:566:0x04/0xAF
-
-# Time bomb
-R:567:0x01/0xB5
-
-# Mezzodaemon
-R:568:0x03/0xAF
-
-# Elder thing
-R:569:0x0D/0xAF
-
-# Ice elemental
-R:570:0x01/0x85
-
-# Necromancer
-R:571:0x0C/0xAA
-
-# The Greater hell magic mushroom were-quylthulg
-R:572:0x02/0x91
-
-# Lorgan, Chief of the Easterlings
-R:573:0x0A/0xAA
-
-# Chaos spawn
-R:574:0x02/0x9F
-
-# Mummified troll
-R:575:0x01/0xB4
-
-# Storm of Unmagic
-R:576:0x0A/0xB0
-
-# Crypt thing
-R:577:0x0D/0x8C
-
-# Chaos butterfly
-R:578:0x0D/0x89
-
-# Time elemental
-R:579:0x0D/0x85
-
-# Flying polyp
-R:580:0x0C/0x7E
-
-# The Queen Ant
-R:581:0x0A/0x9B
-
-# Will o' the wisp
-R:582:0x09/0x85
-
-# Shan
-R:583:0x0E/0x89
-
-# Magma elemental
-R:584:0x03/0x85
-
-# Black pudding
-R:585:0x08/0xA4
-
-# Killer iridescent beetle
-R:586:0x0A/0x8B
-
-# Nexus vortex
-R:587:0x0A/0xB0
-
-# Plasma vortex
-R:588:0x0C/0xB0
-
-# Mature red dragon
-R:589:0x04/0x9E
-
-# Mature gold dragon
-R:590:0x0B/0x9E
-
-# Crystal drake
-R:591:0x07/0x9E
-
-# Mature black dragon
-R:592:0x02/0x9E
-
-# Mature multi-hued dragon
-R:593:0x0A/0x9E
-
-# Sky whale
-R:594:0x0D/0x7E
-
-# Draebor, the Imp
-R:595:0x0A/0xAF
-
-# Mother Hydra
-R:596:0x0A/0xAF
-
-# Death knight
-R:597:0x08/0xAA
-
-# Castamir the Usurper
-R:598:0x0C/0xAA
-
-# Time vortex
-R:599:0x0E/0xB0
-
-# Shimmering vortex
-R:600:0x03/0xB0
-
-# Ancient blue dragon
-R:601:0x06/0x84
-
-# Ancient bronze dragon
-R:602:0x0F/0x84
-
-# Beholder
-R:603:0x0F/0x9F
-
-# Emperor wight
-R:604:0x04/0x97
-
-# Seraph
-R:605:0x04/0x81
-
-# Vargo, Tyrant of Fire
-R:606:0x04/0x85
-
-# Black wraith
-R:607:0x08/0x97
-
-# Nightgaunt
-R:608:0x08/0x95
-
-# Baron of hell
-R:609:0x0F/0x95
-
-# Scylla
-R:610:0x0E/0x8D
-
-# Monastic lich
-R:611:0x07/0x8C
-
-# Nether wraith
-R:612:0x0D/0x97
-
-# Hellhound
-R:613:0x04/0x83
-
-# 7-headed hydra
-R:614:0x0D/0x8D
-
-# Waldern, King of Water
-R:615:0x06/0x85
-
-# Kavlax the Many-Headed
-R:616:0x0A/0x9E
-
-# Ancient white dragon
-R:617:0x01/0x84
-
-# Ancient green dragon
-R:618:0x05/0x84
-
-# Chthonian
-R:619:0x08/0xB1
-
-# Eldrak
-R:620:0x04/0x94
-
-# Ettin
-R:621:0x06/0x94
-
-# Night mare
-R:622:0x0D/0xAB
-
-# Vampire lord
-R:623:0x06/0x96
-
-# Ancient black dragon
-R:624:0x02/0x84
-
-# Weird fume
-R:625:0x0A/0xCA
-
-# Spawn of Ubbo-Sathla
-R:626:0x0A/0xA4
-
-# Fat Man
-R:627:0x08/0xD6
-
-# Malekith the Accursed
-R:628:0x0A/0xA2
-
-# Shadowfax, steed of Gandalf
-R:629:0x0A/0xAB
-
-# Spirit troll
-R:630:0x0D/0x87
-
-# War troll
-R:631:0x06/0x94
-
-# Disenchanter worm mass
-R:632:0x0A/0xB1
-
-# Rotting quylthulg
-R:633:0x07/0x91
-
-# Lesser titan
-R:634:0x0B/0x90
-
-# 9-headed hydra
-R:635:0x04/0x8D
-
-# Enchantress
-R:636:0x0C/0xAA
-
-# Ranger chieftain
-R:637:0x09/0xAA
-
-# Sorcerer
-R:638:0x0C/0xAA
-
-# Xaren
-R:639:0x02/0x98
-
-# Giant roc
-R:640:0x07/0x82
-
-# Minotaur
-R:641:0x0F/0x88
-
-# Medusa, the Gorgon
-R:642:0x0A/0xA8
-
-# Death drake
-R:643:0x0D/0x84
-
-# Ancient red dragon
-R:644:0x04/0x84
-
-# Ancient gold dragon
-R:645:0x0B/0x84
-
-# Great crystal drake
-R:646:0x0F/0x84
-
-# Wyrd sister
-R:647:0x0A/0xAA
-
-# Vrock
-R:648:0x02/0x95
-
-# Death quasit
-R:649:0x08/0xAF
-
-# Giganto, the Gargantuan
-R:650:0x02/0x7E
-
-# Strygalldwir
-R:651:0x09/0x95
-
-# Fallen angel
-R:652:0x02/0x81
-
-# Giant headless
-R:653:0x07/0x88
-
-# Judge Fire
-R:654:0x0C/0xAD
-
-# Ubbo-Sathla, the Unbegotten Source
-R:655:0x09/0xA4
-
-# Judge Mortis
-R:656:0x0D/0xB4
-
-# Dark elven sorcerer
-R:657:0x0C/0xA2
-
-# Master lich
-R:658:0x04/0x8C
-
-# Byakhee
-R:659:0x08/0x95
-
-# Eol, the Dark Elf
-R:660:0x08/0xA2
-
-# Archon
-R:661:0x0B/0x81
-
-# Formless spawn of Tsathoggua
-R:662:0x08/0x95
-
-# Hunting horror
-R:663:0x08/0x95
-
-# Undead beholder
-R:664:0x07/0x9F
-
-# Shadow
-R:665:0x08/0x87
-
-# Iron lich
-R:666:0x02/0x8C
-
-# Dread
-R:667:0x03/0x87
-
-# Greater basilisk
-R:668:0x08/0x92
-
-# Charybdis
-R:669:0x04/0x7E
-
-# Jack of Shadows
-R:670:0x02/0xAA
-
-# Zephyr Lord
-R:671:0x0A/0x97
-
-# Juggernaut of Khorne
-R:672:0x08/0xA1
-
-# Mumak
-R:673:0x02/0xAB
-
-# Judge Fear
-R:674:0x08/0x97
-
-# Ancient multi-hued dragon
-R:675:0x0A/0x84
-
-# Ethereal dragon
-R:676:0x03/0x84
-
-# Dark young of Shub-Niggurath
-R:677:0x05/0x95
-
-# Colour out of space
-R:678:0x0A/0xB5
-
-# Quaker, Master of Earth
-R:679:0x07/0x85
-
-# Death leprechaun
-R:680:0x08/0xA2
-
-# Chaugnar Faugn, Horror from the Hills
-R:681:0x08/0xAB
-
-# Lloigor
-R:682:0x0E/0xB0
-
-# Utgard-Loke
-R:683:0x0A/0x90
-
-# Quachil Uttaus, Treader of the Dust
-R:684:0x08/0xB4
-
-# Shoggoth
-R:685:0x08/0xA4
-
-# Judge Death
-R:686:0x08/0x97
-
-# Ariel, Queen of Air
-R:687:0x0E/0x85
-
-# 11-headed hydra
-R:688:0x0C/0x8D
-
-# Patriarch
-R:689:0x0D/0xAA
-
-# Dreadmaster
-R:690:0x0B/0x87
-
-# Drolem
-R:691:0x05/0xA1
-
-# Scatha the Worm
-R:692:0x09/0x84
-
-# Warrior of the Dawn
-R:693:0x0C/0xAA
-
-# Lesser black reaver
-R:694:0x08/0x8C
-
-# Zoth-Ommog
-R:695:0x0A/0x92
-
-# Grand master thief
-R:696:0x06/0xAA
-
-# Smaug the Golden
-R:697:0x0C/0x84
-
-# The Stormbringer
-R:698:0x08/0xDC
-
-# Knight Templar
-R:699:0x01/0xAA
-
-# Leprechaun fanatic
-R:700:0x04/0xA2
-
-# Dracolich
-R:701:0x0D/0x84
-
-# Greater titan
-R:702:0x03/0x90
-
-# Dracolisk
-R:703:0x0C/0x84
-
-# Winged Horror
-R:704:0x08/0x82
-
-# Spectral tyrannosaur
-R:705:0x0D/0x92
-
-# Yibb-Tstll, the Patient One
-R:706:0x08/0x90
-
-# Ghatanothoa
-R:707:0x08/0xB0
-
-# Ent
-R:708:0x0D/0xCC
-
-# Hru
-R:709:0x02/0x90
-
-# Itangast the Fire Drake
-R:710:0x0C/0x84
-
-# Death mold
-R:711:0x08/0xA7
-
-# Fafner the Dragon
-R:712:0x0D/0x84
-
-# Charon, Boatman of the Styx
-R:713:0x0E/0x97
-
-# Quickbeam, the Ent
-R:714:0x0D/0xCC
-
-# Glaurung, Father of the Dragons
-R:715:0x0C/0x84
-
-# Behemoth
-R:716:0x0E/0x88
-
-# Garm, Guardian of Hel
-R:717:0x06/0x83
-
-# Greater wall monster
-R:718:0x09/0xBC
-
-# Nycadaemon
-R:719:0x03/0x95
-
-# Barbazu
-R:720:0x0D/0x95
-
-# Goat of Mendes
-R:721:0x08/0xAB
-
-# Nightwing
-R:722:0x08/0x97
-
-# Maulotaur
-R:723:0x02/0x88
-
-# Nether hound
-R:724:0x0D/0x9A
-
-# Time hound
-R:725:0x0E/0x9A
-
-# Plasma hound
-R:726:0x0C/0x9A
-
-# Demonic quylthulg
-R:727:0x04/0x91
-
-# Great Storm Wyrm
-R:728:0x06/0x84
-
-# Ulik the Troll
-R:729:0x0A/0x94
-
-# Baphomet the Minotaur Lord
-R:730:0x0A/0x88
-
-# Hell knight
-R:731:0x08/0xAA
-
-# Bull Gates
-R:732:0x08/0xAA
-
-# Santa Claus
-R:733:0x04/0xA2
-
-# Eihort, the Thing in the Labyrinth
-R:734:0x0C/0xA4
-
-# The King in Yellow
-R:735:0x0B/0x8C
-
-# Great unclean one
-R:736:0x05/0x95
-
-# Lord of Chaos
-R:737:0x0A/0xAA
-
-# Old Sorcerer
-R:738:0x0C/0xAA
-
-# Ethereal hound
-R:739:0x0D/0x9A
-
-# Lesser kraken
-R:740:0x0D/0x7E
-
-# Great Ice Wyrm
-R:741:0x01/0x84
-
-# Demilich
-R:742:0x0F/0x8C
-
-# The Phoenix
-R:743:0x04/0x82
-
-# Nightcrawler
-R:744:0x08/0x97
-
-# Lord of Change
-R:745:0x0A/0x95
-
-# Keeper of Secrets
-R:746:0x0D/0x88
-
-# Shudde M'ell
-R:747:0x02/0xB1
-
-# Hand druj
-R:748:0x0B/0xAD
-
-# Eye druj
-R:749:0x04/0xAD
-
-# Skull druj
-R:750:0x03/0xAD
-
-# Chaos vortex
-R:751:0x0A/0xB0
-
-# Aether vortex
-R:752:0x0A/0xB0
-
-# Nidhogg, the Hel-Drake
-R:753:0x08/0x84
-
-# The Lernaean Hydra
-R:754:0x0A/0x8D
-
-# Thuringwethil, the Vampire Messenger
-R:755:0x0A/0x96
-
-# Great Hell Wyrm
-R:756:0x04/0x84
-
-# Hastur the Unspeakable
-R:757:0x06/0x88
-
-# Bloodthirster
-R:758:0x04/0x95
-
-# Draconic quylthulg
-R:759:0x05/0x91
-
-# Nyogtha, the Thing that Should not Be
-R:760:0x08/0xA4
-
-# Ahtu, Avatar of Nyarlathotep
-R:761:0x08/0xBC
-
-# Fundin Bluecloak
-R:762:0x0E/0xA2
-
-# Bile Demon
-R:763:0x0C/0x95
-
-# Uriel, Angel of Fire
-R:764:0x0C/0x81
-
-# Azriel, Angel of Death
-R:765:0x08/0x81
-
-# Ancalagon the Black
-R:766:0x08/0x84
-
-# Daoloth, the Render of the Veils
-R:767:0x02/0x95
-
-# Nightwalker
-R:768:0x08/0x97
-
-# Gabriel, the Messenger
-R:769:0x01/0x81
-
-# Artsi, the Champion of Chaos
-R:770:0x0A/0xA2
-
-# Saruman of Many Colours
-R:771:0x0A/0xAA
-
-# Harowen the Black Hand
-R:772:0x0E/0xAA
-
-# Osyluth
-R:773:0x09/0x95
-
-# Dreadlord
-R:774:0x04/0x87
-
-# Greater kraken
-R:775:0x0D/0x7E
-
-# Archlich
-R:776:0x0E/0x8C
-
-# The Cat Lord
-R:777:0x0A/0xA0
-
-# Jabberwock
-R:778:0x0A/0x88
-
-# Chaos hound
-R:779:0x0A/0x9A
-
-# Vlad Dracula, Prince of Darkness
-R:780:0x08/0x96
-
-# Beholder hive-mother
-R:781:0x0B/0x9F
-
-# Leviathan
-R:782:0x0A/0x7E
-
-# Great Wyrm of Chaos
-R:783:0x0A/0x84
-
-# Great Wyrm of Law
-R:784:0x0E/0x84
-
-# Great Wyrm of Balance
-R:785:0x0A/0x84
-
-# Shambler
-R:786:0x09/0x85
-
-# Gelugon
-R:787:0x01/0x95
-
-# Glaaki
-R:788:0x0A/0x7E
-
-# Trone, the Rebel Thunderlord
-R:789:0x08/0x82
-
-# Great Wyrm of Many Colours
-R:790:0x0A/0x84
-
-# Marda, rider of gold Laronth
-R:791:0x0B/0x82
-
-# Tselakus, the Dreadlord
-R:792:0x0C/0x87
-
-# Sky Drake
-R:793:0x0E/0x84
-
-# Eilinel the Entrapped
-R:794:0x08/0xAA
-
-# Horned Reaper
-R:795:0x0E/0x95
-
-# The Norsa
-R:796:0x0E/0x88
-
-# Rhan-Tegoth
-R:797:0x06/0x93
-
-# Black reaver
-R:798:0x08/0x8C
-
-# Master mindcrafter
-R:799:0x0B/0xAA
-
-# Greater demonic quylthulg
-R:800:0x0C/0x91
-
-# Greater draconic quylthulg
-R:801:0x0D/0x91
-
-# Greater rotting quylthulg
-R:802:0x0F/0x91
-
-# Null, the Living Void
-R:803:0x00/0xB5
-
-# Feagwath, the Undead Sorcerer
-R:804:0x0B/0x8C
-
-# Omarax the Eye Tyrant
-R:805:0x0A/0x9F
-
-# Tsathoggua, the Sleeper of N'kai
-R:806:0x08/0x92
-
-# Greater Balrog
-R:807:0x0A/0x95
-
-# Ungoliant, the Unlight
-R:808:0x08/0x93
-
-# Atlach-Nacha, the Spider God
-R:809:0x08/0x93
-
-# Y'golonac
-R:810:0x0C/0x88
-
-# Aether hound
-R:811:0x0A/0x9A
-
-# Pit Fiend
-R:812:0x03/0x95
-
-# The Serpent of Chaos
-R:813:0x0A/0x8A
-
-# Yig, Father of Serpents
-R:814:0x06/0x8A
-
-# Unmaker
-R:815:0x0A/0x85
-
-# Cyberdemon
-R:816:0x07/0x95
-
-# Hela, Queen of the Dead
-R:817:0x0D/0xAA
-
-# The Mouth of Sauron
-R:818:0x0A/0xAA
-
-# The Necromancer of Dol Guldur
-R:819:0x0A/0xAA
-
-# Lisa, rider of gold Romth
-R:820:0x0B/0x82
-
-# Master quylthulg
-R:821:0x0E/0x91
-
-# Qlzqqlzuup, the Lord of Flesh
-R:822:0x0A/0x91
-
-# Cthugha, the Living Flame
-R:823:0x0C/0x85
-
-# Flare, rider of bronze Moonth
-R:824:0x0F/0x82
-
-# Maeglin, the Traitor of Gondolin
-R:825:0x08/0xA2
-
-# Cyaegha
-R:826:0x0D/0x9F
-
-# Pazuzu, Lord of Air
-R:827:0x06/0x95
-
-# Ithaqua the Windwalker
-R:828:0x0E/0x99
-
-# Greater Hellhound
-R:829:0x04/0x83
-
-# Cantoras, the Skeletal Lord
-R:830:0x0A/0xAD
-
-# Mephistopheles, Lord of Hell
-R:831:0x04/0x95
-
-# Godzilla
-R:832:0x0A/0x92
-
-# Abhoth, Source of Uncleanness
-R:833:0x0D/0xA4
-
-# Ymir, the Ice Giant
-R:834:0x01/0x90
-
-# Loki, the Trickster
-R:835:0x08/0x90
-
-# Star-spawn of Cthulhu
-R:836:0x0D/0x95
-
-# Surtur, the Fire Giant
-R:837:0x04/0x90
-
-# The Tarrasque
-R:838:0x0A/0x92
-
-# Lungorthin, the Balrog of White Fire
-R:839:0x0A/0x95
-
-# Draugluin, Sire of All Werewolves
-R:840:0x0A/0x83
-
-# Shuma-Gorath
-R:841:0x0D/0x9F
-
-# Tulzscha, the Green Flame
-R:842:0x0D/0x85
-
-# Oremorj, the Cyberdemon Lord
-R:843:0x07/0x95
-
-# Vecna, the Emperor Lich
-R:844:0x0A/0x8C
-
-# Yog-Sothoth, the All-in-One
-R:845:0x0A/0xA4
-
-# Fenris Wolf
-R:846:0x08/0x83
-
-# Great Wyrm of Power
-R:847:0x0A/0x84
-
-# Shub-Niggurath, Black Goat of the Woods
-R:848:0x08/0x95
-
-# Nodens, Lord of the Great Abyss
-R:849:0x09/0x90
-
-# Carcharoth, the Jaws of Thirst
-R:850:0x08/0x83
-
-# Nyarlathotep, the Crawling Chaos
-R:851:0x04/0x95
-
-# Azathoth, the Daemon Sultan
-R:852:0x0E/0x85
-
-# Huan, Wolfhound of the Valar
-R:853:0x09/0x83
-
-# Jormungand the Midgard Serpent
-R:854:0x0A/0x8A
-
-# The Destroyer
-R:855:0x0A/0xA1
-
-# Gothmog, the High Captain of Balrogs
-R:856:0x0A/0x95
-
-# Great Cthulhu
-R:857:0x05/0x95
-
-# Sarko, rider of gold Foronth
-R:858:0x0B/0x82
-
-# The Unicorn of Order
-R:859:0x01/0xAB
-
-# Sauron, the Sorcerer
-R:860:0x0A/0xAA
-
-# DarkGod, the Mighty Coder of Hell
-R:861:0x0E/0x90
-
-# Morgoth, Lord of Darkness
-R:862:0x08/0x90
-
-# Human Warrior
-R:863:0x07/0xAA
-
-# Elven archer
-R:864:0x09/0xA2
-
-# Dwarven warrior
-R:865:0x0F/0xA2
-
-# Elite uruk
-R:866:0x01/0xA9
-
-# The Philosophy Teacher
-R:867:0x04/0xAA
-
-# The Variant Maintainer
-R:868:0x0E/0xAA
-
-# Random Number Generator
-R:869:0x06/0x89
-
-# Rocket mine
-R:870:0x0C/0xB5
-
-# Bouncing mine
-R:871:0x0E/0xB5
-
-# Durin's Bane
-R:872:0x0A/0x95
-
-# The Icky Queen
-R:873:0x0A/0xA3
-
-# Rot jelly
-R:874:0x07/0xA4
-
-# Death
-R:875:0x08/0x87
-
-# Famine
-R:876:0x0F/0x87
-
-# Pestilence
-R:877:0x0D/0x87
-
-# War
-R:878:0x04/0x87
-
-# Pike
-R:879:0x02/0x7E
-
-# Electric eel
-R:880:0x0E/0x8A
-
-# Giant crayfish
-R:881:0x0C/0x7E
-
-# Mermaid
-R:882:0x0D/0xA2
-
-# Box jellyfish
-R:883:0x0E/0x7E
-
-# Giant piranha
-R:884:0x05/0x7E
-
-# Piranha
-R:885:0x05/0x7E
-
-# Bullywug
-R:886:0x05/0xA2
-
-# Bullywug warrior
-R:887:0x05/0xA2
-
-# Bullywug shaman
-R:888:0x05/0xA2
-
-# Whale
-R:889:0x0D/0x7E
-
-# Sand mite
-R:890:0x0E/0x7E
-
-# Octopus
-R:891:0x05/0x7E
-
-# Giant octopus
-R:892:0x05/0x7E
-
-# Eye of the deep
-R:893:0x06/0x9F
-
-# Murk dweller
-R:894:0x02/0x93
-
-# Drowned soul
-R:895:0x0E/0x87
-
-# Tiger shark
-R:896:0x05/0x7E
-
-# Hammerhead shark
-R:897:0x05/0x7E
-
-# Great white shark
-R:898:0x01/0x7E
-
-# Aquatic golem
-R:899:0x06/0xA1
-
-# Aquatic kobold
-R:900:0x0E/0xA5
-
-# White shark
-R:901:0x09/0x7E
-
-# Scrag
-R:902:0x0E/0x94
-
-# Jaws
-R:903:0x01/0x7E
-
-# Aquatic elf
-R:904:0x06/0xA2
-
-# Aquatic elven warrior
-R:905:0x06/0xA2
-
-# Aquatic elven shaman
-R:906:0x06/0xA2
-
-# Stargazer
-R:907:0x0B/0x7E
-
-# Elder stargazer
-R:908:0x0B/0x7E
-
-# Flounder
-R:909:0x02/0x7E
-
-# Giant turtle
-R:910:0x0D/0x92
-
-# Baby dragon turtle
-R:911:0x09/0x9E
-
-# Young dragon turtle
-R:912:0x09/0x9E
-
-# Mature dragon turtle
-R:913:0x09/0x9E
-
-# Ancient dragon turtle
-R:914:0x09/0x84
-
-# Fastitocalon
-R:915:0x05/0x84
-
-# Undead stargazer
-R:916:0x0B/0x7E
-
-# Killer whale
-R:917:0x01/0x7E
-
-# Merrow
-R:918:0x0E/0x8F
-
-# Water naga
-R:919:0x0E/0xA8
-
-# Devilfish
-R:920:0x02/0x7E
-
-# Undead devilfish
-R:921:0x08/0x7E
-
-# Moby Dick, the White Whale
-R:922:0x01/0x7E
-
-# Aquatic hound
-R:923:0x0E/0x9A
-
-# Water demon
-R:924:0x0E/0x95
-
-# Ixitxachitl
-R:925:0x02/0x7E
-
-# Ixitxachitl priest
-R:926:0x02/0x7E
-
-# Vampiric ixitxachitl
-R:927:0x08/0x7E
-
-# Mathilde, the Science Student
-R:928:0x0B/0xA2
-
-# Child spirit
-R:929:0x09/0x87
-
-# Young spirit
-R:930:0x09/0x87
-
-# Mature spirit
-R:931:0x09/0x87
-
-# Experienced spirit
-R:932:0x09/0x87
-
-# Wise spirit
-R:933:0x09/0x87
-
-# Fangorn the Treebeard, Lord of the Ents
-R:934:0x0D/0xCC
-
-# Gandalf the Grey
-R:935:0x02/0xAA
-
-# Nar, the Dwarf
-R:936:0x0B/0xA2
-
-# Novice mindcrafter
-R:937:0x0B/0xAA
-
-# Great Swamp Wyrm
-R:938:0x05/0x84
-
-# Great Bile Wyrm
-R:939:0x02/0x84
-
-# Blue Firebird
-R:940:0x0E/0x82
-
-# Green Firebird
-R:941:0x0D/0x82
-
-# Brown Firebird
-R:942:0x07/0x82
-
-# Bronze Firebird
-R:943:0x0F/0x82
-
-# Gold Firebird
-R:944:0x0B/0x82
-
-# High-elven ranger
-R:945:0x0D/0xA2
-
-# Uvatha the Horseman
-R:946:0x08/0x97
-
-# Adunaphel the Quiet
-R:947:0x08/0x97
-
-# Akhorahil the Blind
-R:948:0x08/0x97
-
-# Ren the Unclean
-R:949:0x08/0x97
-
-# Ji Indur Dawndeath
-R:950:0x08/0x97
-
-# Dwar, Dog Lord of Waw
-R:951:0x08/0x97
-
-# Hoarmurath of Dir
-R:952:0x08/0x97
-
-# Khamul, the Black Easterling
-R:953:0x08/0x97
-
-# The Witch-King of Angmar
-R:954:0x08/0x97
-
-# Green Thunderlord
-R:955:0x05/0x82
-
-# Blue Thunderlord
-R:956:0x06/0x82
-
-# Brown Thunderlord
-R:957:0x07/0x82
-
-# Bronze Thunderlord
-R:958:0x0F/0x82
-
-# Gold Thunderlord
-R:959:0x0B/0x82
-
-# Blood Sprout
-R:960:0x05/0xEE
-
-# Gorlim, Betrayer of Barahir
-R:961:0x02/0xAA
-
-# The Blubbering idiot, agent of black market, Simon the weak
-R:962:0x09/0xAE
-
-# Aranea
-R:963:0x04/0x93
-
-# Elder aranea
-R:964:0x0A/0x93
-
-# Giant brown tick
-R:965:0x07/0x93
-
-# Wavelord
-R:966:0x06/0xAA
-
-# Novice possessor (soul)
-R:967:0x08/0x87
-
-# Bat of Gorgoroth
-R:968:0x05/0x9C
-
-# The Princess
-R:969:0x0B/0xAA
-
-# Merton Proudfoot, the lost hobbit
-R:970:0x0A/0xA2
-
-# The Wight-King of the Barrow-downs
-R:971:0x0A/0x97
-
-# Adventurer
-R:972:0x0F/0x80
-
-# Experienced possessor (soul)
-R:973:0x08/0x87
-
-# Old possessor (soul)
-R:974:0x08/0x87
-
-# Death orb
-R:975:0x08/0x85
-
-# Bronze dragon worm
-R:976:0x0F/0xB1
-
-# Gold dragon worm
-R:977:0x0B/0xB1
-
-# Moldoux, the Defenceless Mold
-R:978:0x0A/0xA7
-
-# The Physics Teacher
-R:979:0x01/0xAA
-
-# Ar-Pharazon the Golden
-R:980:0x0B/0xAA
-
-# Doppelganger
-R:981:0x01/0x80
-
-# Marylene, Heartbreakeress of the Netherworld
-R:982:0x09/0x90
-
-# The Greater Lag Monster
-R:983:0x0A/0x95
-
-# Hrungnir, the Stone Giant
-R:984:0x09/0x90
-
-# Bullroarer the Hobbit
-R:985:0x0F/0xA2
-
-# 3-headed hydra
-R:986:0x03/0x8D
-
-# Uldor the Accursed
-R:987:0x0F/0xAA
-
-# Mystic
-R:988:0x03/0xAA
-
-# Elder vampire
-R:989:0x04/0x96
-
-# Ulfang the Black
-R:990:0x0F/0xAA
-
-# Demonologist
-R:991:0x0C/0xAA
-
-# Hezrou
-R:992:0x05/0x95
-
-# Glabrezu
-R:993:0x0F/0x95
-
-# Nalfeshnee
-R:994:0x04/0x95
-
-# Marilith
-R:995:0x0B/0x95
-
-# Lesser Balrog
-R:996:0x0A/0x95
-
-# Master mystic
-R:997:0x03/0xAA
-
-# Grand master mystic
-R:998:0x03/0xAA
-
-# Erinyes
-R:999:0x07/0x95
-
-# Novice mindcrafter
-R:1000:0x0B/0xAA
-
-# Polyphemus, the Blind Cyclops
-R:1001:0x05/0x90
-
-# Great Wyrm of Perplexity
-R:1002:0x0F/0x84
-
-# Hound of Tindalos
-R:1003:0x02/0x9A
-
-# Great Wyrm of Thunder
-R:1004:0x0B/0x84
-
-# Silver mouse
-R:1005:0x09/0xAC
-
-# The Rat King
-R:1006:0x0A/0xAC
-
-# Vort the Kobold Queen
-R:1007:0x0A/0xA5
-
-# Giant black louse
-R:1008:0x08/0x89
-
-# Fire Phantom
-R:1009:0x04/0x87
-
-# The Insane Player
-R:1010:0x0A/0xAA
-
-# Glaryssa, Succubus Queen
-R:1011:0x09/0x95
-
-# Vermicious Knid
-R:1012:0x02/0xA4
-
-# Bone golem
-R:1013:0x01/0xA1
-
-# Snake of Yig
-R:1014:0x06/0x8A
-
-# Bronze golem
-R:1015:0x03/0xA1
-
-# Dimensional shambler
-R:1016:0x0E/0xA2
-
-# Cultist
-R:1017:0x0D/0xAA
-
-# Cult leader
-R:1018:0x0D/0xAA
-
-# Servitor of the outer gods
-R:1019:0x0B/0x88
-
-# Avatar of Nyarlathotep
-R:1020:0x0C/0xAA
-
-# Thiazi, the Storm Giant
-R:1021:0x0E/0x90
-
-# Hypnos, Lord of Sleep
-R:1022:0x0D/0xAA
-
-# Blue dragon worm
-R:1023:0x0E/0xB1
-
-# White dragon worm
-R:1024:0x09/0xB1
-
-# Green dragon worm
-R:1025:0x0D/0xB1
-
-# Black dragon worm
-R:1026:0x02/0xB1
-
-# Red dragon worm
-R:1027:0x0C/0xB1
-
-# Multi-hued dragon worm
-R:1028:0x0A/0xB1
-
-# The Minotaur of the Labyrinth
-R:1029:0x02/0x88
-
-# The Sandworm Queen
-R:1030:0x0A/0xB1
-
-# Sandworm
-R:1031:0x0B/0xB1
-
-# Tik'srvzllat
-R:1032:0x0A/0x87
-
-# The Glass Golem
-R:1033:0x09/0xBC
-
-# The White Balrog
-R:1034:0x09/0x95
-
-# Golgarach, the Living Rock
-R:1035:0x09/0xBC
-
-# Atlas, the Titan
-R:1036:0x02/0x90
-
-# Kronos, Lord of the Titans
-R:1037:0x0A/0x90
-
-# Water hound
-R:1038:0x04/0x9A
-
-# Improv, the mighty MoLD
-R:1039:0x0A/0xA7
-
-# Emperor Mimic
-R:1040:0x0B/0xA7
-
-# Melinda Proudfoot
-R:1041:0x0A/0xA2
-
-# Thrain, the King Under the Mountain
-R:1042:0x0E/0xA2
-
-# Fire golem
-R:1043:0x04/0xA1
-
-# Melkor, Lord of Darkness
-R:1044:0x0A/0x87
-
-# Spirit
-R:1045:0x0A/0x87
-
-# Spirit
-R:1046:0x0E/0x87
-
-# Spirit
-R:1047:0x0E/0x87
-
-# Spirit
-R:1048:0x0A/0x87
-
-# Spirit
-R:1049:0x0F/0x87
-
-# Spirit
-R:1050:0x0A/0x87
-
-# Spirit
-R:1051:0x05/0x87
-
-# Spirit
-R:1052:0x0A/0x87
-
-# Spirit
-R:1053:0x09/0xB5
-
-# Spirit
-R:1054:0x05/0x87
-
-# Spirit
-R:1055:0x09/0x87
-
-# Spirit
-R:1056:0x00/0x87
-
-# Spirit
-R:1057:0x07/0x87
-
-# Spirit
-R:1058:0x04/0x87
-
-# Spirit
-R:1059:0x0D/0x87
-
-# Spirit
-R:1060:0x09/0x87
-
-# Spirit
-R:1061:0x02/0x87
-
-# Spirit
-R:1062:0x06/0x87
-
-# Spirit
-R:1063:0x04/0x87
-
-# Spirit
-R:1064:0x01/0x87
-
-# Spirit
-R:1065:0x02/0x87
-
-# Spirit
-R:1066:0x06/0x87
-
-# Spirit
-R:1067:0x0A/0x87
-
-# Spirit
-R:1068:0x00/0x87
-
-# Spirit
-R:1069:0x09/0x87
-
-# Spirit
-R:1070:0x0A/0x87
-
-# Spirit
-R:1071:0x0D/0x87
-
-# Spirit
-R:1072:0x0B/0x87
-
-# Spirit
-R:1073:0x08/0x87
-
-# Spirit
-R:1074:0x03/0x87
-
-# Spirit
-R:1075:0x0A/0x87
-
-
diff --git a/lib/mods/theme/pref/graf-iso.prf b/lib/mods/theme/pref/graf-iso.prf
deleted file mode 100644
index eaf26901..00000000
--- a/lib/mods/theme/pref/graf-iso.prf
+++ /dev/null
@@ -1,5963 +0,0 @@
-# File: graf-iso.prf
-
-#
-# This file defines special attr/char mappings for use in "graphics" mode
-# with the isometric view.
-#
-# By Hansjoerg Malthaner < hansjoerg.malthaner@gmx.de >
-#
-# See "lib/help/command.txt" and "src/files.c" for more information.
-#
-
-
-# Scrolls (?)
-S:0xD0:0x80/0xBF
-S:0xD1:0x80/0xBF
-S:0xD2:0x80/0xBF
-S:0xD3:0x80/0xBF
-S:0xD4:0x80/0xBF
-S:0xD5:0x80/0xBF
-S:0xD6:0x80/0xBF
-S:0xD7:0x80/0xBF
-S:0xD8:0x80/0xBF
-S:0xD9:0x80/0xBF
-S:0xDA:0x80/0xBF
-S:0xDB:0x80/0xBF
-S:0xDC:0x80/0xBF
-S:0xDD:0x80/0xBF
-S:0xDE:0x80/0xBF
-S:0xDF:0x80/0xBF
-
-# Potions (!)
-S:0xE0:0x81/0x68
-S:0xE1:0x81/0x69
-S:0xE2:0x81/0x6A
-S:0xE3:0x81/0x6B
-S:0xE4:0x81/0x6C
-S:0xE5:0x81/0x6D
-S:0xE6:0x81/0x6E
-S:0xE7:0x81/0x6F
-S:0xE8:0x81/0x68
-S:0xE9:0x81/0x69
-S:0xEA:0x81/0x6A
-S:0xEB:0x81/0x6B
-S:0xEC:0x81/0x6C
-S:0xED:0x81/0x6D
-S:0xEE:0x81/0x6E
-S:0xEF:0x81/0x6F
-
-
-# Food (,)
-S:0xF0:0x90/0x92
-S:0xF1:0x90/0x92
-S:0xF2:0x90/0x92
-S:0xF3:0x90/0x92
-S:0xF4:0x90/0x92
-S:0xF5:0x90/0x92
-S:0xF6:0x90/0x92
-S:0xF7:0x90/0x92
-S:0xF8:0x90/0x92
-S:0xF9:0x90/0x92
-S:0xFA:0x90/0x92
-S:0xFB:0x90/0x92
-S:0xFC:0x90/0x92
-S:0xFD:0x90/0x92
-S:0xFE:0x90/0x92
-S:0xFF:0x90/0x92
-
-
-# Spells (*)
-S:48:0x82/0x60
-S:49:0x82/0x61
-S:50:0x82/0x62
-S:51:0x82/0x63
-S:52:0x82/0x64
-S:53:0x82/0x65
-S:54:0x82/0x66
-S:55:0x82/0x67
-S:56:0x82/0x60
-S:57:0x82/0x61
-S:58:0x82/0x62
-S:59:0x82/0x63
-S:60:0x82/0x64
-S:61:0x82/0x65
-S:62:0x82/0x66
-S:63:0x82/0x67
-
-# Spells (|)
-S:64:0x82/0x40
-S:65:0x82/0x44
-S:66:0x82/0x48
-S:67:0x82/0x4C
-S:68:0x82/0x50
-S:69:0x82/0x54
-S:70:0x82/0x58
-S:71:0x82/0x5C
-S:72:0x82/0x40
-S:73:0x82/0x44
-S:74:0x82/0x48
-S:75:0x82/0x4C
-S:76:0x82/0x50
-S:77:0x82/0x54
-S:78:0x82/0x58
-S:79:0x82/0x5C
-
-# Spells (-)
-S:80:0x82/0x41
-S:81:0x82/0x45
-S:82:0x82/0x49
-S:83:0x82/0x4D
-S:84:0x82/0x51
-S:85:0x82/0x55
-S:86:0x82/0x59
-S:87:0x82/0x5D
-S:88:0x82/0x41
-S:89:0x82/0x45
-S:90:0x82/0x49
-S:91:0x82/0x4D
-S:92:0x82/0x51
-S:93:0x82/0x55
-S:94:0x82/0x59
-S:95:0x82/0x5D
-
-# Spells (/)
-S:96:0x82/0x42
-S:97:0x82/0x46
-S:98:0x82/0x4A
-S:99:0x82/0x4E
-S:100:0x82/0x52
-S:101:0x82/0x56
-S:102:0x82/0x5A
-S:103:0x82/0x5D
-S:104:0x82/0x42
-S:105:0x82/0x46
-S:106:0x82/0x4A
-S:107:0x82/0x4D
-S:108:0x82/0x52
-S:109:0x82/0x56
-S:110:0x82/0x5A
-S:111:0x82/0x5D
-
-# Spells (\)
-S:112:0x82/0x43
-S:113:0x82/0x47
-S:114:0x82/0x4B
-S:115:0x82/0x4F
-S:116:0x82/0x53
-S:117:0x82/0x57
-S:118:0x82/0x5B
-S:119:0x82/0x5F
-S:120:0x82/0x43
-S:121:0x82/0x47
-S:122:0x82/0x4B
-S:123:0x82/0x4F
-S:124:0x82/0x53
-S:125:0x82/0x57
-S:126:0x82/0x5B
-S:127:0x82/0x5F
-
-
-# Feature attr/char definitions
-
-# nothing
-F:0:0x80:0xA0
-
-# open floor
-F:1:0x82:0xBC
-
-# fountain
-F:2:0x81:0x8D
-
-# glyph of warding
-F:3:0x80:0xBB
-
-# open door
-F:4:0x80:0xA7
-
-# broken door
-F:5:0x80:0xA7
-
-# up staircase
-F:6:0x80:0xBC
-
-# down staircase
-F:7:0x80:0xBE
-
-# quest entrance
-F:8:0x80:0xBE
-
-# quest exit
-F:9:0x80:0xBC
-
-# quest down level
-F:10:0x80:0xBE
-
-# quest up level
-F:11:0x80:0xBC
-
-# town exit
-F:12:0x80:0xBE
-
-# shaft down
-F:13:0x80:0xBE
-
-# shaft up
-F:14:0x80:0xBC
-
-# fountain
-F:15:0x81:0x8D
-
-# door
-F:32:0x80:0xAB
-
-# locked door
-F:33:0x80:0xAB
-
-# locked door
-F:34:0x80:0xAB
-
-# locked door
-F:35:0x80:0xAB
-
-# locked door
-F:36:0x80:0xAB
-
-# locked door
-F:37:0x80:0xAB
-
-# locked door
-F:38:0x80:0xAB
-
-# locked door
-F:39:0x80:0xAB
-
-# jammed door
-F:40:0x80:0xAB
-
-# jammed door
-F:41:0x80:0xAB
-
-# jammed door
-F:42:0x80:0xAB
-
-# jammed door
-F:43:0x80:0xAB
-
-# jammed door
-F:44:0x80:0xAB
-
-# jammed door
-F:45:0x80:0xAB
-
-# jammed door
-F:46:0x80:0xAB
-
-# jammed door
-F:47:0x80:0xAB
-
-# secret door
-F:48:0x80:0xA3
-
-# pile of rubble
-F:49:0x80:0xBA
-
-# magma vein
-F:50:0x80:0xA5
-
-# quartz vein
-F:51:0x81:0xF3
-
-# magma vein
-F:52:0x81:0xF3
-
-# quartz vein
-F:53:0x81:0xF3
-
-# magma vein with treasure
-F:54:0x80:0xAA
-
-# quartz vein with treasure
-F:55:0x80:0xAA
-
-# granite wall
-F:56:0x81:0xF0
-
-# granite wall
-F:57:0x81:0xF0
-
-# granite wall
-F:58:0x81:0xF0
-
-# granite wall
-F:59:0x81:0xF0
-
-# permanent wall
-F:60:0x81:0xF3
-
-# permanent wall
-F:61:0x81:0xF3
-
-# permanent wall
-F:62:0x81:0xF3
-
-# permanent wall
-F:63:0x81:0xF3
-     
-# explosive rune
-F:64:0x80:0xAA
-
-# Straight Road startpoint
-F:65:0x80:0xAA
-
-# section of the Straight Road
-F:66:0x80:0xAA
-
-# section of the Straight Road
-F:67:0x80:0xAA
-
-# section of the Straight Road
-F:68:0x80:0xAA
-
-# section of the Straight Road
-F:69:0x80:0xAA
-
-# section of the Straight Road
-F:70:0x80:0xAA
-
-# section of the Straight Road (discharged)
-F:71:0x80:0xAA
-
-# Straight Road exit
-F:72:0x80:0xAA
-
-# corrupted section of the Straight Road
-F:73:0x80:0xAA
-
-# General Store
-B:0:0x80:0xB0
-
-# Armoury
-B:1:0x80:0xB1
-
-# Weapon Smiths
-B:2:0x80:0xB2
-
-# Temple
-B:3:0x80:0xB3
-
-# Alchemy Shop
-B:4:0x80:0xB4
-
-# Magic Shop
-B:5:0x80:0xB5
-
-# Black Market
-B:6:0x80:0xB6
-
-# Home
-B:7:0x80:0xB7
-
-# Bookstore
-B:8:0x80:0xB8
-
-# Pet shop
-B:9:0x80:0xAB
-
-# Mayors office
-B:10:0x80:0xAB
-
-# Inn
-B:11:0x80:0xAB
-
-# The Soothsayer
-B:12:0x80:0xAB
-
-# The library
-B:13:0x80:0xAB
-
-B:14:0x80:0xAB
-B:15:0x80:0xAB
-B:16:0x80:0xAB
-B:17:0x80:0xAB
-B:18:0x80:0xAB
-B:19:0x80:0xAB
-B:20:0x80:0xAB
-B:21:0x80:0xAB
-B:22:0x80:0xAB
-B:23:0x80:0xAB
-B:24:0x80:0xAB
-B:25:0x80:0xAB
-B:26:0x80:0xAB
-B:27:0x80:0xAB
-B:28:0x80:0xAB
-B:29:0x80:0xAB
-B:30:0x80:0xAB
-B:31:0x80:0xAB
-B:32:0x80:0xAB
-B:33:0x80:0xAB
-B:34:0x80:0xAB
-B:35:0x80:0xAB
-B:36:0x80:0xAB
-B:37:0x80:0xAB
-
-# Building
-F:74:0x80:0xB1
-
-# permanent wall
-F:75:0x80:0xA3
-
-# permanent wall
-F:76:0x80:0xA3
-
-# permanent wall
-F:77:0x80:0xA3
-
-# permanent wall
-F:78:0x80:0xA3
-
-# Deep water
-F:83:0xCB:0x81
-
-# stream of shallow water
-F:84:0x82:0xEB
-
-# pool of deep lava
-F:85:0x80:0xA3
-
-# stream of shallow lava
-F:86:0x80:0xA3
-
-# dark pit
-F:87:0x83:0x8B
-
-# dirt
-F:88:0x82:0xF3
-
-# patch of grass
-F:89:0x82:0xE8
-
-# ice
-F:90:0x80:0xAE
-
-# sand
-F:91:0x80:0xAE
-
-# dead tree
-F:92:0x80:0xA3
-
-# ash
-F:93:0x80:0xAE
-
-# mud
-F:94:0x80:0xAE
-
-# ice wall
-F:95:0x80:0x80
-
-# tree
-F:96:0x83:0x88
-
-# mountain chain
-F:97:0x81:0x9D
-
-# sandwall
-F:98:0x80:0xA3
-
-# sandwall
-F:99:0x80:0xA5
-
-# sandwall with treasure
-F:100:0x80:0xAA
-
-# high mountain chain
-F:101:0x80:0xDE
-
-# nether mist
-F:102:0x80:0x80
-
-# molten glass wall
-F:103:0x80:0xAE
-
-# Between gate
-F:160:0x81:0x8C
-
-# Altar of Forests
-F:161:0x81:0x94
-
-# Altar of Water
-F:162:0x81:0x94
-
-# Altar of Earth
-F:163:0x81:0x94
-
-# Altar of Darkness
-F:164:0x81:0x94
-
-# Altar of Moon
-F:165:0x81:0x94
-
-# Altar of Sun
-F:166:0x81:0x94
-
-# Altar of Rage
-F:167:0x81:0x94
-
-# Altar of Winds
-F:168:0x81:0x94
-
-# Altar of Stars
-F:169:0x81:0x94
-
-# Altar of Being
-F:170:0x81:0x94
-
-# Altar of Randomness
-F:171:0x81:0x94
-
-# pool of deep water
-F:187:0x82:0xF0
-
-# glass wall
-F:188:0x80:0xAE
-
-# illusion wall
-F:189:0x80:0xA3
-
-# Grass roof
-F:190:0x82:0xF6
-
-# grass roof top
-F:191:0x82:0xFE
-
-# grass roof chimney
-F:192:0x82:0xF7
-
-# brick roof
-F:193:0x82:0xEE
-
-# brick roof top
-F:194:0x82:0xEF
-
-# brick roof chimney
-F:195:0x80:0xA3
-
-# window
-F:196:0x80:0xA3
-
-# small window
-F:197:0x80:0xA3
-
-# rain barrel
-F:198:0x80:0xA3
-
-# grass with flowers
-F:199:0x82:0xF8
-
-# cobblestone road
-F:200:0x83:0x83
-
-# cobblestone with outlet
-F:201:0x80:0xAE
-
-# small tree
-F:202:0x80:0xA3
-
-# town
-F:203:0x80:0xAA
-
-
-
-
-
-
-
-# Object attr/char definitions
-
-# something
-K:0:0x80:0xA6
-
-# Blindness
-K:1:0x80:0xAC
-
-# Paranoia
-K:2:0x80:0xAC
-
-# Confusion
-K:3:0x80:0xAC
-
-# Hallucination
-K:4:0x80:0xAC
-
-# Cure Poison
-K:5:0x80:0xAC
-
-# Cure Blindness
-K:6:0x80:0xAC
-
-# Cure Paranoia
-K:7:0x80:0xAC
-
-# Cure Confusion
-K:8:0x80:0xAC
-
-# Weakness
-K:9:0x80:0xAC
-
-# Unhealth
-K:10:0x80:0xAC
-
-# Restore Constitution
-K:11:0x80:0xAC
-
-# Restoring
-K:12:0x80:0xAC
-
-# Stupidity
-K:13:0x80:0xAC
-
-# Naivety
-K:14:0x80:0xAC
-
-# Poison
-K:15:0x80:0xAC
-
-# Sickness
-K:16:0x80:0xAC
-
-# Paralysis
-K:17:0x80:0xAC
-
-# Restore Strength
-K:18:0x80:0xAC
-
-# Disease
-K:19:0x80:0xAC
-
-# Cure Serious Wounds
-K:20:0x80:0xAC
-
-# & Ration~ of Food
-K:21:0x80:0xAC
-
-# & Hard Biscuit~
-K:22:0x80:0xAC
-
-# & Strip~ of Venison
-K:23:0x80:0xAC
-
-# & Slime Mold~
-K:24:0x80:0xAC
-
-# & Piece~ of Elvish Waybread
-K:25:0x80:0xAC
-
-# & Pint~ of Fine Ale
-K:26:0x80:0xAC
-
-# & Pint~ of Fine Wine
-K:27:0x80:0xAC
-
-# & Mattock~
-K:28:0x80:0xDC
-
-# & No-dachi~
-K:29:0x80:0xFC
-
-# & Broken Dagger~
-K:30:0x80:0xFC
-
-# & Bastard Sword~
-K:31:0x80:0xFC
-
-# & Scimitar~
-K:32:0x80:0xFC
-
-# & Tulwar~
-K:33:0x80:0xFC
-
-# & Broad Sword~
-K:34:0x80:0xFC
-
-# & Short Sword~
-K:35:0x80:0xFC
-
-# & Blade~ of Chaos
-K:36:0x80:0xFC
-
-# & Two-Handed Sword~
-K:37:0x80:0xFC
-
-# & Main Gauche~
-K:38:0x80:0xFC
-
-# & Cutlass~
-K:39:0x80:0xFC
-
-# & Executioner's Sword~
-K:40:0x80:0xFC
-
-# & Katana~
-K:41:0x80:0xFC
-
-# & Long Sword~
-K:42:0x80:0xFC
-
-# & Dagger~
-K:43:0x80:0xFC
-
-# & Rapier~
-K:44:0x80:0xFC
-
-# & Sabre~
-K:45:0x80:0xFC
-
-# & Small Sword~
-K:46:0x80:0xFC
-
-# & Broken Sword~
-K:47:0x80:0xFC
-
-# & Ball-and-Chain~
-K:48:0x80:0xDC
-
-# & Whip~
-K:49:0x80:0xDC
-
-# & Flail~
-K:50:0x80:0xDC
-
-# & Two-Handed Flail~
-K:51:0x80:0xDC
-
-# & Morning Star~
-K:52:0x80:0xDC
-
-# & Mace~
-K:53:0x80:0xDC
-
-# & Quarterstaff~
-K:54:0x80:0xDC
-
-# & War Hammer~
-K:55:0x80:0xDC
-
-# & Lead-Filled Mace~
-K:56:0x80:0xDC
-
-# & Mace~ of Disruption
-K:57:0x80:0xDC
-
-# & Lucerne Hammer~
-K:58:0x80:0xDC
-
-# & Beaked Axe~
-K:59:0x80:0xAF
-
-# & Glaive~
-K:60:0x80:0xAF
-
-# & Halberd~
-K:61:0x80:0xAF
-
-# & Awl-Pike~
-K:62:0x80:0xAF
-
-# & Pike~
-K:63:0x80:0xAF
-
-# & Spear~
-K:64:0x80:0xAF
-
-# & Trident~
-K:65:0x80:0xAF
-
-# & Lance~
-K:66:0x80:0xAF
-
-# & Great Axe~
-K:67:0x80:0xAF
-
-# & Battle Axe~
-K:68:0x80:0xAF
-
-# & Lochaber Axe~
-K:69:0x80:0xAF
-
-# & Broad Axe~
-K:70:0x80:0xAF
-
-# & Scythe~
-K:71:0x80:0xAF
-
-# & Scythe~ of Slicing
-K:72:0x80:0xAF
-
-# & Short Bow~
-K:73:0x80:0xFD
-
-# & Long Bow~
-K:74:0x80:0xFD
-
-# & Light Crossbow~
-K:75:0x80:0xFD
-
-# & Heavy Crossbow~
-K:76:0x80:0xFD
-
-# & Sling~
-K:77:0x80:0xFD
-
-# & Arrow~
-K:78:0x80:0xFB
-
-# & Seeker Arrow~
-K:79:0x80:0xFB
-
-# & Bolt~
-K:80:0x80:0xFB
-
-# & Seeker Bolt~
-K:81:0x80:0xFB
-
-# & Rounded Pebble~
-K:82:0x81:0x93
-
-# & Iron Shot~
-K:83:0x80:0xFB
-
-# & Shovel~
-K:84:0x80:0xDC
-
-# & Gnomish Shovel~
-K:85:0x80:0xDC
-
-# & Dwarven Shovel~
-K:86:0x80:0xDC
-
-# & Pick~
-K:87:0x80:0xDC
-
-# & Orcish Pick~
-K:88:0x80:0xDC
-
-# & Dwarven Pick~
-K:89:0x80:0xDC
-
-# & Elven Cloak~
-K:90:0x80:0xA8
-
-# & Pair~ of Soft Leather Boots
-K:91:0x80:0xDD
-
-# & Pair~ of Hard Leather Boots
-K:92:0x80:0xDD
-
-# & Pair~ of Metal Shod Boots
-K:93:0x80:0xDD
-
-# & Hard Leather Cap~
-K:94:0x80:0xDD
-
-# & Metal Cap~
-K:95:0x80:0xDD
-
-# & Iron Helm~
-K:96:0x80:0xDD
-
-# & Steel Helm~
-K:97:0x80:0xDD
-
-# & Iron Crown~
-K:98:0x80:0xDD
-
-# & Golden Crown~
-K:99:0x80:0xDD
-
-# & Jewel Encrusted Crown~
-K:100:0x80:0xDD
-
-# & Robe~
-K:101:0x80:0xA8
-
-# & Filthy Rag~
-K:102:0x80:0xA8
-
-# Soft Leather Armour~
-K:103:0x80:0xA8
-
-# Soft Studded Leather~
-K:104:0x80:0xA8
-
-# Hard Leather Armour~
-K:105:0x80:0xA8
-
-# Hard Studded Leather~
-K:106:0x80:0xA8
-
-# Leather Scale Mail~
-K:107:0x80:0xA8
-
-# Metal Scale Mail~
-K:108:0x80:0xDB
-
-# Chain Mail~
-K:109:0x80:0xDB
-
-# Rusty Chain Mail~
-K:110:0x80:0xDB
-
-# Augmented Chain Mail~
-K:111:0x80:0xDB
-
-# Bar Chain Mail~
-K:112:0x80:0xDB
-
-# Metal Brigandine Armour~
-K:113:0x80:0xDB
-
-# Partial Plate Armour~
-K:114:0x80:0xDB
-
-# Metal Lamellar Armour~
-K:115:0x80:0xDB
-
-# Full Plate Armour~
-K:116:0x80:0xDB
-
-# Ribbed Plate Armour~
-K:117:0x80:0xDB
-
-# Adamantite Plate Mail~
-K:118:0x80:0xDB
-
-# Mithril Plate Mail~
-K:119:0x80:0xDB
-
-# Mithril Chain Mail~
-K:120:0x80:0xDB
-
-# Double Chain Mail~
-K:121:0x80:0xDB
-
-# & Shield~ of Deflection
-K:122:0x80:0xDB
-
-# & Cloak~
-K:123:0x80:0xA8
-
-# & Shadow Cloak~
-K:124:0x80:0xA8
-
-# & Set~ of Leather Gloves
-K:125:0x80:0xDD
-
-# & Set~ of Gauntlets
-K:126:0x80:0xDD
-
-# & Set~ of Cesti
-K:127:0x80:0xDD
-
-# & Small Leather Shield~
-K:128:0x80:0xA9
-
-# & Large Leather Shield~
-K:129:0x80:0xA9
-
-# & Small Metal Shield~
-K:130:0x80:0xA9
-
-# & Large Metal Shield~
-K:131:0x80:0xA9
-
-# Strength
-K:132:0x80:0xBD
-
-# Dexterity
-K:133:0x80:0xBD
-
-# Constitution
-K:134:0x80:0xBD
-
-# Intelligence
-K:135:0x80:0xBD
-
-# Speed
-K:136:0x80:0xBD
-
-# Searching
-K:137:0x80:0xBD
-
-# Teleportation
-K:138:0x80:0xBD
-
-# Slow Digestion
-K:139:0x80:0xBD
-
-# Resist Fire
-K:140:0x80:0xBD
-
-# Resist Cold
-K:141:0x80:0xBD
-
-# Levitation
-K:142:0x80:0xBD
-
-# Poison Resistance
-K:143:0x80:0xBD
-
-# Free Action
-K:144:0x80:0xBD
-
-# Weakness
-K:145:0x80:0xBD
-
-# Flames
-K:146:0x80:0xBD
-
-# Acid
-K:147:0x80:0xBD
-
-# Ice
-K:148:0x80:0xBD
-
-# Woe
-K:149:0x80:0xBD
-
-# Stupidity
-K:150:0x80:0xBD
-
-# Damage
-K:151:0x80:0xBD
-
-# Accuracy
-K:152:0x80:0xBD
-
-# Protection
-K:153:0x80:0xBD
-
-# Aggravate Monster
-K:154:0x80:0xBD
-
-# See Invisible
-K:155:0x80:0xBD
-
-# Sustain Strength
-K:156:0x80:0xBD
-
-# Sustain Intelligence
-K:157:0x80:0xBD
-
-# Sustain Wisdom
-K:158:0x80:0xBD
-
-# Sustain Constitution
-K:159:0x80:0xBD
-
-# Sustain Dexterity
-K:160:0x80:0xBD
-
-# Sustain Charisma
-K:161:0x80:0xBD
-
-# Slaying
-K:162:0x80:0xBD
-
-# Brilliance
-K:163:0x80:0xA2
-
-# Charisma
-K:164:0x80:0xA2
-
-# Searching
-K:165:0x80:0xA2
-
-# Teleportation
-K:166:0x80:0xA2
-
-# Slow Digestion
-K:167:0x80:0xA2
-
-# Resist Acid
-K:168:0x80:0xA2
-
-# Adornment
-K:169:0x80:0xA2
-
-# Double Ring Mail~
-K:170:0x80:0xDB
-
-# the Magi
-K:171:0x80:0xA2
-
-# DOOM
-K:172:0x80:0xA2
-
-# Enchant Weapon To-Hit
-K:173:0x80:0xBF
-
-# Enchant Weapon To-Dam
-K:174:0x80:0xBF
-
-# Enchant Armor
-K:175:0x80:0xBF
-
-# Identify
-K:176:0x80:0xBF
-
-# *Identify*
-K:177:0x80:0xBF
-
-# Rumour
-K:178:0x80:0xBF
-
-# Chaos
-K:179:0x80:0xBF
-
-# Remove Curse
-K:180:0x80:0xBF
-
-# Light
-K:181:0x80:0xBF
-
-# Fire
-K:182:0x80:0xBF
-
-# Ice
-K:183:0x80:0xBF
-
-# Summon Monster
-K:184:0x80:0xBF
-
-# Phase Door
-K:185:0x80:0xBF
-
-# Teleportation
-K:186:0x80:0xBF
-
-# Teleport Level
-K:187:0x80:0xBF
-
-# Monster Confusion
-K:188:0x80:0xBF
-
-# Magic Mapping
-K:189:0x80:0xBF
-
-# Rune of Protection
-K:190:0x80:0xBF
-
-# *Remove Curse*
-K:191:0x80:0xBF
-
-# Treasure Detection
-K:192:0x80:0xBF
-
-# Object Detection
-K:193:0x80:0xBF
-
-# Trap Detection
-K:194:0x80:0xBF
-
-# & Sheaf Arrow~
-K:195:0x80:0xFB
-
-# & Mithril Shot~
-K:196:0x80:0xFB
-
-# Door/Stair Location
-K:197:0x80:0xBF
-
-# Acquirement
-K:198:0x80:0xBF
-
-# *Acquirement*
-K:199:0x80:0xBF
-
-# Mass Genocide
-K:200:0x80:0xBF
-
-# Detect Invisible
-K:201:0x80:0xBF
-
-# Aggravate Monster
-K:202:0x80:0xBF
-
-# Trap Creation
-K:203:0x80:0xBF
-
-# Trap/Door Destruction
-K:204:0x80:0xBF
-
-# Artifact Creation
-K:205:0x80:0xBF
-
-# Recharging
-K:206:0x80:0xBF
-
-# Genocide
-K:207:0x80:0xBF
-
-# Darkness
-K:208:0x80:0xBF
-
-# Protection from Evil
-K:209:0x80:0xBF
-
-# Satisfy Hunger
-K:210:0x80:0xBF
-
-# Dispel Undead
-K:211:0x80:0xBF
-
-# *Enchant Weapon*
-K:212:0x80:0xBF
-
-# Curse Weapon
-K:213:0x80:0xBF
-
-# *Enchant Armor*
-K:214:0x80:0xBF
-
-# Curse Armor
-K:215:0x80:0xBF
-
-# Summon Undead
-K:216:0x80:0xBF
-
-# Blessing
-K:217:0x80:0xBF
-
-# Holy Chant
-K:218:0x80:0xBF
-
-# Holy Prayer
-K:219:0x80:0xBF
-
-# Word of Recall
-K:220:0x80:0xBF
-
-# *Destruction*
-K:221:0x80:0xBF
-
-# Slime Mold Juice
-K:222:0x80:0xA1
-
-# Apple Juice
-K:223:0x80:0xA1
-
-# Water
-K:224:0x80:0xA1
-
-# Strength
-K:225:0x80:0xA1
-
-# Weakness
-K:226:0x80:0xA1
-
-# Restore Strength
-K:227:0x80:0xA1
-
-# Intelligence
-K:228:0x80:0xA1
-
-# Stupidity
-K:229:0x80:0xA1
-
-# Restore Intelligence
-K:230:0x80:0xA1
-
-# Wisdom
-K:231:0x80:0xA1
-
-# Naivety
-K:232:0x80:0xA1
-
-# Restore Wisdom
-K:233:0x80:0xA1
-
-# Charisma
-K:234:0x80:0xA1
-
-# Ugliness
-K:235:0x80:0xA1
-
-# Restore Charisma
-K:236:0x80:0xA1
-
-# Curing
-K:237:0x80:0xA1
-
-# Invulnerability
-K:238:0x80:0xA1
-
-# New Life
-K:239:0x80:0xA1
-
-# Cure Serious Wounds
-K:240:0x80:0xA1
-
-# Cure Critical Wounds
-K:241:0x80:0xA1
-
-# Healing
-K:242:0x80:0xA1
-
-# Constitution
-K:243:0x80:0xA1
-
-# Experience
-K:244:0x80:0xA1
-
-# Sleep
-K:245:0x80:0xA1
-
-# Blindness
-K:246:0x80:0xA1
-
-# Booze
-K:247:0x80:0xA1
-
-# Poison
-K:248:0x80:0xA1
-
-# Speed
-K:249:0x80:0xA1
-
-# Slowness
-K:250:0x80:0xA1
-
-# Dexterity
-K:251:0x80:0xA1
-
-# Restore Dexterity
-K:252:0x80:0xA1
-
-# Restore Constitution
-K:253:0x80:0xA1
-
-# Lose Memories
-K:254:0x80:0xA1
-
-# Salt Water
-K:255:0x80:0xA1
-
-# Enlightenment
-K:256:0x80:0xA1
-
-# Heroism
-K:257:0x80:0xA1
-
-# Berserk Strength
-K:258:0x80:0xA1
-
-# Boldness
-K:259:0x80:0xA1
-
-# Restore Life Levels
-K:260:0x80:0xA1
-
-# Resist Heat
-K:261:0x80:0xA1
-
-# Resist Cold
-K:262:0x80:0xA1
-
-# Detect Invisible
-K:263:0x80:0xA1
-
-# Slow Poison
-K:264:0x80:0xA1
-
-# Neutralise Poison
-K:265:0x80:0xA1
-
-# Restore Mana
-K:266:0x80:0xA1
-
-# Infra-vision
-K:267:0x80:0xA1
-
-# Resistance
-K:268:0x80:0xA1
-
-# Light
-K:269:0x80:0xAD
-
-# Tame Monster
-K:270:0x80:0xAD
-
-# Frost Bolts
-K:271:0x80:0xAD
-
-# Fire Bolts
-K:272:0x80:0xAD
-
-# Stone to Mud
-K:273:0x80:0xAD
-
-# Polymorph
-K:274:0x80:0xAD
-
-# Heal Monster
-K:275:0x80:0xAD
-
-# Haste Monster
-K:276:0x80:0xAD
-
-# Slow Monster
-K:277:0x80:0xAD
-
-# Confuse Monster
-K:278:0x80:0xAD
-
-# Sleep Monster
-K:279:0x80:0xAD
-
-# Drain Life
-K:280:0x80:0xAD
-
-# Trap/Door Destruction
-K:281:0x80:0xAD
-
-# Magic Missile
-K:282:0x80:0xAD
-
-# Clone Monster
-K:283:0x80:0xAD
-
-# Scare Monster
-K:284:0x80:0xAD
-
-# Teleport Other
-K:285:0x80:0xAD
-
-# Disarming
-K:286:0x80:0xAD
-
-# Lightning Balls
-K:287:0x80:0xAD
-
-# Cold Balls
-K:288:0x80:0xAD
-
-# Fire Balls
-K:289:0x80:0xAD
-
-# Stinking Cloud
-K:290:0x80:0xAD
-
-# Acid Balls
-K:291:0x80:0xAD
-
-# Wonder
-K:292:0x80:0xAD
-
-# & Flight Arrow~
-K:293:0x80:0xFB
-
-# Acid Bolts
-K:294:0x80:0xAD
-
-# Dragon's Flame
-K:295:0x80:0xAD
-
-# Dragon's Frost
-K:296:0x80:0xAD
-
-# Dragon's Breath
-K:297:0x80:0xAD
-
-# Annihilation
-K:298:0x80:0xAD
-
-# Rockets
-K:299:0x80:0xAD
-
-# Trap Location
-K:300:0x80:0xDF
-
-# Treasure Location
-K:301:0x80:0xDF
-
-# Object Location
-K:302:0x80:0xDF
-
-# Teleportation
-K:303:0x80:0xDF
-
-# Earthquakes
-K:304:0x80:0xDF
-
-# Summoning
-K:305:0x80:0xDF
-
-# Light
-K:306:0x80:0xDF
-
-# *Destruction*
-K:307:0x80:0xDF
-
-# Starlight
-K:308:0x80:0xDF
-
-# Haste Monsters
-K:309:0x80:0xDF
-
-# Slow Monsters
-K:310:0x80:0xDF
-
-# Sleep Monsters
-K:311:0x80:0xDF
-
-# Cure Light Wounds
-K:312:0x80:0xDF
-
-# Detect Invisible
-K:313:0x80:0xDF
-
-# Speed
-K:314:0x80:0xDF
-
-# Slowness
-K:315:0x80:0xDF
-
-# Door/Stair Location
-K:316:0x80:0xDF
-
-# Remove Curse
-K:317:0x80:0xDF
-
-# Detect Evil
-K:318:0x80:0xDF
-
-# Curing
-K:319:0x80:0xDF
-
-# Dispel Evil
-K:320:0x80:0xDF
-
-# Probing
-K:321:0x80:0xDF
-
-# Darkness
-K:322:0x80:0xDF
-
-# Genocide
-K:323:0x80:0xDF
-
-# Power
-K:324:0x80:0xDF
-
-# the Magi
-K:325:0x80:0xDF
-
-# Perception
-K:326:0x80:0xDF
-
-# Holiness
-K:327:0x80:0xDF
-
-# Enlightenment
-K:328:0x80:0xDF
-
-# Healing
-K:329:0x80:0xDF
-
-# [Call of the West]
-K:330:0x80:0xBF
-
-# [Light of Valinor]
-K:331:0x80:0xBF
-
-# [Divine Mastery]
-K:332:0x80:0xBF
-
-# [Words of Power]
-K:333:0x80:0xBF
-
-# [Apprentice Handbook]
-K:334:0x80:0xBF
-
-# [Mystical Words]
-K:335:0x80:0xBF
-
-# [Arcane Chants]
-K:336:0x80:0xBF
-
-# [Locus of Force]
-K:337:0x80:0xBF
-
-# & Small wooden chest~
-K:338:0x80:0xFE
-
-# & Large wooden chest~
-K:339:0x80:0xFE
-
-# & Small iron chest~
-K:340:0x80:0xFE
-
-# & Large iron chest~
-K:341:0x80:0xFE
-
-# & Small steel chest~
-K:342:0x80:0xFE
-
-# & Large steel chest~
-K:343:0x80:0xFE
-
-# & Ruined chest~
-K:344:0x80:0xFE
-
-# & Iron Spike~
-K:345:0x81:0x91
-
-# & Wooden Torch~
-K:346:0x80:0xFE
-
-# & Brass Lantern~
-K:347:0x80:0xFE
-
-# & Flask~ of oil
-K:348:0x80:0xA1
-
-# & Empty Bottle~
-K:349:0x80:0xA1
-
-# Havoc
-K:350:0x80:0xAD
-
-# Door/Stair Location
-K:351:0x80:0xAD
-
-# Trap Location
-K:352:0x80:0xAD
-
-# Probing
-K:353:0x80:0xAD
-
-# Recall
-K:354:0x80:0xAD
-
-# Illumination
-K:355:0x80:0xAD
-
-# Light
-K:356:0x80:0xAD
-
-# Lightning Bolts
-K:357:0x80:0xAD
-
-# Frost Bolts
-K:358:0x80:0xAD
-
-# Fire Bolts
-K:359:0x80:0xAD
-
-# Polymorph
-K:360:0x80:0xAD
-
-# Slow Monster
-K:361:0x80:0xAD
-
-# Sleep Monster
-K:362:0x80:0xAD
-
-# Drain Life
-K:363:0x80:0xAD
-
-# Teleport Other
-K:364:0x80:0xAD
-
-# Disarming
-K:365:0x80:0xAD
-
-# Lightning Balls
-K:366:0x80:0xAD
-
-# Cold Balls
-K:367:0x80:0xAD
-
-# Fire Balls
-K:368:0x80:0xAD
-
-# Acid Balls
-K:369:0x80:0xAD
-
-# Acid Bolts
-K:370:0x80:0xAD
-
-# Enlightenment
-K:371:0x80:0xAD
-
-# Perception
-K:372:0x80:0xAD
-
-# Curing
-K:373:0x80:0xAD
-
-# Healing
-K:374:0x80:0xAD
-
-# Detection
-K:375:0x80:0xAD
-
-# Restoration
-K:376:0x80:0xAD
-
-# Speed
-K:377:0x80:0xAD
-
-# [Inner Void]
-K:378:0x80:0xBF
-
-# [Lurkings of the Night]
-K:379:0x80:0xBF
-
-# [Beings of Darkness]
-K:380:0x80:0xBF
-
-# [Material Shadow]
-K:381:0x80:0xBF
-
-# [Sign of Chaos]
-K:383:0x80:0xBF
-
-# [Chaos Mastery]
-K:384:0x80:0xBF
-
-# [Chaos Channels]
-K:385:0x80:0xBF
-
-# [Armageddon Tome]
-K:386:0x80:0xBF
-
-# [Nether Openings]
-K:387:0x80:0xBF
-
-# [Unholy Blessings]
-K:388:0x80:0xBF
-
-# & Firestone~
-K:389:0x80:0xFE
-
-# & Small Firestone~
-K:390:0x80:0xFE
-
-# & Broken Skull~
-K:391:0x80:0xFE
-
-# & Broken Bone~
-K:392:0x80:0xFE
-
-# & Canine Skeleton~
-K:393:0x80:0xFE
-
-# & Rodent Skeleton~
-K:394:0x80:0xFE
-
-# & Human Skeleton~
-K:395:0x80:0xFE
-
-# & Dwarf Skeleton~
-K:396:0x80:0xFE
-
-# & Elf Skeleton~
-K:397:0x80:0xFE
-
-# & Gnome Skeleton~
-K:398:0x80:0xFE
-
-# & Great Hammer~
-K:399:0x80:0xDC
-
-# Black Dragon Scale Mail~
-K:400:0x80:0xDB
-
-# Blue Dragon Scale Mail~
-K:401:0x80:0xDB
-
-# White Dragon Scale Mail~
-K:402:0x80:0xDB
-
-# Red Dragon Scale Mail~
-K:403:0x80:0xDB
-
-# Green Dragon Scale Mail~
-K:404:0x80:0xDB
-
-# Multi-Hued Dragon Scale Mail~
-K:405:0x80:0xDB
-
-# Pseudo Dragon Scale Mail~
-K:406:0x80:0xDB
-
-# Law Dragon Scale Mail~
-K:407:0x80:0xDB
-
-# Bronze Dragon Scale Mail~
-K:408:0x80:0xDB
-
-# Gold Dragon Scale Mail~
-K:409:0x80:0xDB
-
-# Chaos Dragon Scale Mail~
-K:410:0x80:0xDB
-
-# Balance Dragon Scale Mail~
-K:411:0x80:0xDB
-
-# Power Dragon Scale Mail~
-K:412:0x80:0xDB
-
-# & Dragon Helm~
-K:413:0x80:0xDD
-
-# & Dragon Shield~
-K:414:0x80:0xDB
-
-# Death
-K:415:0x80:0xA1
-
-# Ruination
-K:416:0x80:0xA1
-
-# Detonations
-K:417:0x80:0xA1
-
-# Augmentation
-K:418:0x80:0xA1
-
-# *Healing*
-K:419:0x80:0xA1
-
-# Life
-K:420:0x80:0xA1
-
-# Self Knowledge
-K:421:0x80:0xA1
-
-# *Enlightenment*
-K:422:0x80:0xA1
-
-# [Necromantic Incantations]
-K:423:0x80:0xBF
-
-# [Curses of Angmar]
-K:424:0x80:0xBF
-
-# Fear Resistance
-K:425:0x80:0xBD
-
-# Light and Darkness Resistance
-K:426:0x80:0xBD
-
-# Nether Resistance
-K:427:0x80:0xBD
-
-# Nexus Resistance
-K:428:0x80:0xBD
-
-# Sound Resistance
-K:429:0x80:0xBD
-
-# Confusion Resistance
-K:430:0x80:0xBD
-
-# Shard Resistance
-K:431:0x80:0xBD
-
-# Disenchantment Resistance
-K:432:0x80:0xBD
-
-# Chaos Resistance
-K:433:0x80:0xBD
-
-# Blindness Resistance
-K:434:0x80:0xBD
-
-# Lordly Protection
-K:435:0x80:0xBD
-
-# Extra Attacks
-K:436:0x80:0xBD
-
-# Cure Light Wounds
-K:437:0x80:0xA1
-
-# Clumsiness
-K:438:0x80:0xA1
-
-# Sickliness
-K:439:0x80:0xA1
-
-# Map of Bree
-K:440:0x80:0xBF
-
-# Map of Gondolin
-K:441:0x80:0xBF
-
-# Map of LothLorien
-K:442:0x80:0xBF
-
-# Map of Minas Anor
-K:443:0x80:0xBF
-
-# copper
-K:480:0x81:0xCA
-
-# copper
-K:481:0x81:0xC9
-
-# copper
-K:482:0x81:0xC8
-
-# silver
-K:483:0x80:0xA4
-
-# silver
-K:484:0x80:0xA4
-
-# silver
-K:485:0x80:0xA4
-
-# garnets
-K:486:0x80:0xA4
-
-# garnets
-K:487:0x80:0xA4
-
-# gold
-K:488:0x80:0xA4
-
-# gold
-K:489:0x80:0xA4
-
-# gold
-K:490:0x80:0xA4
-
-# opals
-K:491:0x80:0xA4
-
-# sapphires
-K:492:0x80:0xA4
-
-# rubies
-K:493:0x80:0xA4
-
-# diamonds
-K:494:0x80:0xA4
-
-# emeralds
-K:495:0x80:0xA4
-
-# mithril
-K:496:0x80:0xA4
-
-# adamantite
-K:497:0x80:0xA4
-
-# & Mighty Hammer~
-K:498:0x80:0xDC
-
-# & Massive Iron Crown~
-K:499:0x80:0xDD
-
-# & Phial~
-K:500:0x80:0xFE
-
-# & Star~
-K:501:0x80:0xFE
-
-# & Arkenstone~
-K:502:0x80:0xFE
-
-# & Amulet~
-K:503:0x80:0xA2
-
-# & Amulet~
-K:504:0x80:0xA2
-
-# & Necklace~
-K:505:0x80:0xA2
-
-# & Ring~
-K:506:0x80:0xBD
-
-# & Ring~
-K:507:0x80:0xBD
-
-# & Ring~
-K:508:0x80:0xBD
-
-# & Ring~
-K:509:0x80:0xBD
-
-# & Ring~
-K:510:0x80:0xBD
-
-# & Ring~
-K:511:0x80:0xBD
-
-# [Rites of Initiation]
-K:512:0x80:0xBF
-
-# [Ways of War]
-K:513:0x80:0xBF
-
-# [Divine Retribution]
-K:514:0x80:0xBF
-
-# [Essence of Fury]
-K:515:0x80:0xBF
-
-# [Novice Crafts]
-K:516:0x80:0xBF
-
-# [Arcane Channels]
-K:517:0x80:0xBF
-
-# [Sigils of Wizardry]
-K:518:0x80:0xBF
-
-# [Mana Focus]
-K:519:0x80:0xBF
-
-# Reflection
-K:520:0x80:0xA2
-
-# Anti-Magic
-K:521:0x80:0xA2
-
-# Anti-Teleportation
-K:522:0x80:0xA2
-
-# Resistance
-K:523:0x80:0xA2
-
-# & Zweihander~
-K:524:0x80:0xFC
-
-# & Tanto~
-K:525:0x80:0xFC
-
-# Splint Mail~
-K:526:0x80:0xDB
-
-# Do-maru~
-K:527:0x80:0xDB
-
-# & Trifurcate Spear~
-K:528:0x80:0xAF
-
-# & Three Piece Rod~
-K:529:0x80:0xDC
-
-# O-yoroi~
-K:530:0x80:0xDB
-
-# & Fur Cloak~
-K:531:0x80:0xA8
-
-# & Lajatang~
-K:532:0x80:0xAF
-
-# & Hatchet~
-K:533:0x80:0xAF
-
-# Rhino Hide Armour~
-K:535:0x80:0xA8
-
-# Leather Jacket~
-K:536:0x80:0xA8
-
-# & Sickle~
-K:537:0x80:0xAF
-
-# & Tetsubo~
-K:538:0x80:0xDC
-
-# & Nunchaku~
-K:539:0x80:0xDC
-
-# & Bo Staff~
-K:540:0x80:0xDC
-
-# & Jo Staff~
-K:541:0x80:0xDC
-
-# & Club~
-K:542:0x80:0xDC
-
-# & Broad Spear~
-K:543:0x80:0xAF
-
-# & Khopesh~
-K:544:0x80:0xFC
-
-# & Flamberge~
-K:545:0x80:0xFC
-
-# & Claymore~
-K:546:0x80:0xFC
-
-# & Espadon~
-K:547:0x80:0xFC
-
-# & Great Scimitar~
-K:548:0x80:0xFC
-
-# & Wakizashi~
-K:549:0x80:0xFC
-
-# & Naginata~
-K:550:0x80:0xAF
-
-# & Fauchard~
-K:551:0x80:0xAF
-
-# & Guisarme~
-K:552:0x80:0xAF
-
-# & Heavy Lance~
-K:553:0x80:0xAF
-
-# & Basillard~
-K:554:0x80:0xFC
-
-# & Ninjato~
-K:555:0x80:0xFC
-
-# Ring Mail~
-K:556:0x80:0xDB
-
-# Cord Armour~
-K:557:0x80:0xA8
-
-# Paper Armour~
-K:558:0x80:0xA8
-
-# Padded Armour~
-K:559:0x80:0xA8
-
-# & Kabuto~
-K:560:0x80:0xDD
-
-# Stone and Hide Armour~
-K:561:0x80:0xA8
-
-# & Jingasa~
-K:562:0x80:0xDD
-
-# Haramakido~
-K:563:0x80:0xDB
-
-# Nothing
-K:564:0x80:0xBF
-
-# Poison
-K:565:0x80:0xAA
-
-# Nothing
-K:566:0x80:0xAD
-
-# Nothing
-K:567:0x80:0xAD
-
-# Nothing
-K:568:0x80:0xAD
-
-# Nothing
-K:569:0x80:0xAD
-
-# Explosion
-K:570:0x80:0xAA
-
-# Teleport
-K:571:0x80:0xAA
-
-# Nothing
-K:572:0x80:0xAD
-
-# the Blood of Life
-K:573:0x80:0xA1
-
-# Cold
-K:574:0x80:0xAA
-
-# Fire
-K:575:0x80:0xAA
-
-# Acid
-K:576:0x80:0xAA
-
-# & Mage Staff~
-K:577:0x80:0xDC
-
-# Life
-K:579:0x80:0xAA
-
-# Confusion
-K:580:0x80:0xAA
-
-# Light
-K:581:0x80:0xAA
-
-# & Ring~
-K:582:0x80:0xBD
-
-# Invisibility
-K:583:0x80:0xA1
-
-# Chaos
-K:584:0x80:0xAA
-
-# Mutation
-K:585:0x80:0xA1
-
-# Invisibility
-K:586:0x80:0xBD
-
-# Time
-K:587:0x80:0xAA
-
-# Deep Thoughts
-K:588:0x80:0xBF
-
-# More Deep Thoughts
-K:589:0x80:0xBF
-
-# Compendium of Deep Thoughts
-K:590:0x80:0xBF
-
-# Artifact Lore Vol. I
-K:591:0x80:0xBF
-
-# Artifact Lore Vol. II
-K:592:0x80:0xBF
-
-# Artifact Lore Vol. III
-K:593:0x80:0xBF
-
-# Monstrous Compendium 1
-K:594:0x80:0xBF
-
-# Monstrous Compendium 2
-K:595:0x80:0xBF
-
-# Monstrous Compendium 3
-K:596:0x80:0xBF
-
-# Monstrous Compendium 4
-K:597:0x80:0xBF
-
-# Monstrous Compendium 5
-K:598:0x80:0xBF
-
-# Monstrous Compendium 6
-K:599:0x80:0xBF
-
-# Monstrous Compendium 7
-K:600:0x80:0xBF
-
-# Monstrous Compendium 8
-K:601:0x80:0xBF
-
-# Monstrous Compendium 9
-K:602:0x80:0xBF
-
-# Monstrous Compendium 10
-K:603:0x80:0xBF
-
-# Monstrous Compendium 11
-K:604:0x80:0xBF
-
-# Abomination
-K:605:0x80:0xA1
-
-# Shape of Wolf
-K:606:0x80:0xA1
-
-# Shape of Ape
-K:607:0x80:0xA1
-
-# Shape of Goat
-K:608:0x80:0xA1
-
-# Shape of Insect
-K:609:0x80:0xA1
-
-# Shape of Sparrow
-K:610:0x80:0xA1
-
-# Shape of Ent
-K:611:0x80:0xA1
-
-# Shape of Vampire
-K:612:0x80:0xA1
-
-# Shape of Spider
-K:613:0x80:0xA1
-
-# Shape of Mana ball
-K:614:0x80:0xA1
-
-# Shape of Fire cloud
-K:615:0x80:0xA1
-
-# Shape of Cold cloud
-K:616:0x80:0xA1
-
-# Shape of Chaos cloud
-K:617:0x80:0xA1
-
-# [Wolf]
-K:618:0x80:0xBF
-
-# [Ape]
-K:619:0x80:0xBF
-
-# [Goat]
-K:620:0x80:0xBF
-
-# [Insect]
-K:621:0x80:0xBF
-
-# [Sparrow]
-K:622:0x80:0xBF
-
-# [Ent]
-K:623:0x80:0xBF
-
-# [Vampire]
-K:624:0x80:0xBF
-
-# [Spider]
-K:625:0x80:0xBF
-
-# [Mana ball]
-K:626:0x80:0xBF
-
-# [Fire cloud]
-K:627:0x80:0xBF
-
-# [Cold cloud]
-K:628:0x80:0xBF
-
-# [Chaos Cloud]
-K:629:0x80:0xBF
-
-# [Ghost]
-K:630:0x80:0xBF
-
-# [Kobold]
-K:631:0x80:0xBF
-
-# [Dragon]
-K:632:0x80:0xBF
-
-# [Demon]
-K:633:0x80:0xBF
-
-# [Hound]
-K:634:0x80:0xBF
-
-# [Quylthulg]
-K:635:0x80:0xBF
-
-# [Maia]
-K:636:0x80:0xBF
-
-# [Serpent]
-K:637:0x80:0xBF
-
-# [Giant]
-K:638:0x80:0xBF
-
-# [Vala]
-K:639:0x80:0xBF
-
-# Magic
-K:640:0x80:0xAA
-
-# corpse
-K:641:0x80:0xFE
-
-# skeleton
-K:642:0x80:0xFE
-
-# head
-K:643:0x80:0xFE
-
-# skull
-K:644:0x80:0xFE
-
-# raw meat
-K:645:0x80:0xFE
-
-# & Dragonrider Coat~
-K:646:0x80:0xA8
-
-# & Stone~
-K:647:0x80:0xFE
-
-# & small wooden Boomerang~
-K:648:0x80:0xFB
-
-# & wooden Boomerang~
-K:649:0x80:0xFB
-
-# & small metal Boomerang~
-K:650:0x80:0xFB
-
-# & metal Boomerang~
-K:651:0x80:0xFB
-
-# & Anchor~
-K:652:0x80:0xFE
-
-# & ~
-K:653:0x80:0xFE
-
-# Summon never-moving pet
-K:654:0x80:0xBF
-
-# [Life in symbiosis]
-K:655:0x80:0xBF
-
-# [Perfect Symbiosis]
-K:656:0x80:0xBF
-
-# Cure Light Insanity
-K:657:0x80:0xA1
-
-# Cure Serious Insanity
-K:658:0x80:0xA1
-
-# Cure Critical Insanity
-K:659:0x80:0xA1
-
-# Cure Insanity
-K:660:0x80:0xA1
-
-# & Phial~
-K:661:0x80:0xFE
-
-# Random Artifact
-K:662:0x80:0xFE
-
-# Craftmanship
-K:663:0x80:0xBF
-
-# The One Ring
-K:664:0x80:0xBF
-
-# [Apprentice Handbook]
-K:665:0x80:0xBF
-
-# [Minstrel's Music]
-K:666:0x80:0xBF
-
-# [Harps of Rivendell]
-K:667:0x80:0xBF
-
-# [Lays of Beleriand]
-K:668:0x80:0xBF
-
-# & Flute~
-K:669:0x80:0xAF
-
-# & Drum~
-K:670:0x80:0xAF
-
-# & Harp~
-K:671:0x80:0xAF
-
-# & Banjo~
-K:672:0x80:0xAF
-
-# & Lute~
-K:673:0x80:0xAF
-
-# & Mandolin~
-K:674:0x80:0xAF
-
-# & Palantir~
-K:675:0x80:0xA1
-
-# Egg
-K:676:0x80:0xEF
-
-# Reset Recall
-K:677:0x80:0xBF
-
-# Divination
-K:678:0x80:0xBF
-
-# Self
-K:679:0x80:0xBF
-
-# Ray
-K:680:0x80:0xBF
-
-# Sphere
-K:681:0x80:0xBF
-
-# Knowledge
-K:682:0x80:0xBF
-
-# Life
-K:683:0x80:0xBF
-
-# Fire
-K:684:0x80:0xBF
-
-# Cold
-K:685:0x80:0xBF
-
-# Lightning
-K:686:0x80:0xBF
-
-# Acid
-K:687:0x80:0xBF
-
-# Element
-K:688:0x80:0xBF
-
-# Chaos
-K:689:0x80:0xBF
-
-# Mind
-K:690:0x80:0xBF
-
-# Holding
-K:691:0x80:0xBF
-
-# Arrow
-K:692:0x80:0xBF
-
-# Power Surge
-K:693:0x80:0xBF
-
-# Armageddon
-K:694:0x80:0xBF
-
-# Gravity
-K:695:0x80:0xBF
-
-# Extra Life
-K:696:0x80:0xAA
-
-# Anti-Death
-K:697:0x80:0xBF
-
-# Protection
-K:698:0x80:0xBF
-
-# & Horn~
-K:699:0x80:0xAF
-
-# Precognition
-K:700:0x80:0xBD
-
-# & Sprig~ of Athelas
-K:701:0x80:0xAC
-
-# [Magic for Beginners]
-K:702:0x80:0xBF
-
-# [Conjurings and Tricks]
-K:703:0x80:0xBF
-
-# [Incantations and Illusions]
-K:704:0x80:0xBF
-
-# [Sorcery and Evocations]
-K:705:0x80:0xBF
-
-# [Beginners Handbook]
-K:706:0x80:0xBF
-
-# [Words of Wisdom]
-K:707:0x80:0xBF
-
-# [Chants and Blessings]
-K:708:0x80:0xBF
-
-# [Exorcism and Dispelling]
-K:709:0x80:0xBF
-
-# [Resistance of Scarabtarices]
-K:710:0x80:0xBF
-
-# [Mordenkainen's Escapes]
-K:711:0x80:0xBF
-
-# [Kelek's Grimoire of Power]
-K:712:0x80:0xBF
-
-# [Tenser's Transformations]
-K:713:0x80:0xBF
-
-# [Raal's Tome of Destruction]
-K:714:0x80:0xBF
-
-# [Ethereal Openings]
-K:715:0x80:0xBF
-
-# [Godly Insights]
-K:716:0x80:0xBF
-
-# [Purifications and Healing]
-K:717:0x80:0xBF
-
-# [Holy Infusions]
-K:718:0x80:0xBF
-
-# [Wrath of God]
-K:719:0x80:0xBF
-
-# Deincarnation
-K:720:0x80:0xBF
-
-# Numenorean for beginners
-K:722:0x80:0xBF
-
-# Numenorean for beginners
-K:723:0x80:0xBF
-
-# Advanced lessons of Numenorean
-K:724:0x80:0xBF
-
-# Advanced lessons of Sindarin
-K:725:0x80:0xBF
-
-# & Shard~ of Pottery
-K:726:0x80:0xFE
-
-# & Broken Stick~
-K:727:0x80:0xFE
-
-# Wall Creation
-K:728:0x80:0xAD
-
-# [Illusions for Beginners]
-K:729:0x80:0xBF
-
-# [Tricks and Visions]
-K:730:0x80:0xBF
-
-# [Phantasms and Illusions]
-K:731:0x80:0xBF
-
-# [Shadows and Prisms]
-K:732:0x80:0xBF
-
-# [Serten's Immunities]
-K:733:0x80:0xBF
-
-# [Knowledge of Kenault]
-K:734:0x80:0xBF
-
-# [Otiluke's Spheres]
-K:735:0x80:0xBF
-
-# [Boccob's Book of Shadows]
-K:736:0x80:0xBF
-
-# [Bigby's Handbook]
-K:737:0x80:0xBF
-
-# [Hunt of Orome]
-K:738:0x80:0xBF
-
-# [Holy Sanctifications]
-K:739:0x80:0xBF
-
-# [Secrets of the Feanturi]
-K:740:0x80:0xBF
-
-# [War of Wrath]
-K:741:0x80:0xBF
-
-# [Gifts of Iluvatar]
-K:742:0x80:0xBF
-
-# Learning
-K:743:0x80:0xA1
-
-# [Eye of Sauron]
-K:744:0x80:0xBF
-
-# [Flame of Udun]
-K:745:0x80:0xBF
-
-# [Corruptions of Melkor]
-K:746:0x80:0xBF
-
-# [Crescent of Morgul]
-K:747:0x80:0xBF
-
-# [Morgoth's Ring]
-K:748:0x80:0xBF
-
-# Spell
-K:749:0x80:0xBF
-
-# Wishing
-K:750:0x80:0xDF
-
-# Khuzdul - The hidden tonge of the Dwarves
-K:751:0x80:0xBF
-
-# Nandorin for the dumbs
-K:752:0x80:0xBF
-
-# Advanced lessons of Orkish
-K:753:0x80:0xBF
-
-# Flying
-K:755:0x80:0xBD
-
-# [Powerful Sigils]
-K:756:0x80:0xBF
-
-# [Disruptive Forces]
-K:758:0x80:0xBF
-
-# [Forces of the Mind]
-K:759:0x80:0xBF
-
-# [Power of Ancient Sorcerors]
-K:760:0x80:0xBF
-
-# [Tricks of the Wild]
-K:761:0x80:0xBF
-
-# [Mastering the Rituals]
-K:762:0x80:0xBF
-
-# [Rites of Power]
-K:763:0x80:0xBF
-
-# [Tribal Power]
-K:764:0x80:0xBF
-
-# [Aiding Shades]
-K:765:0x80:0xBF
-
-# [Morgoth's Space-Time Warpings]
-K:766:0x80:0xBF
-
-# [Murazor Tome of Conjuring & Dispeling]
-K:767:0x80:0xBF
-
-# [Channeling the Void]
-K:768:0x80:0xBF
-
-# [Sauron's Forgotten Tome]
-K:769:0x80:0xBF
-
-# Wraith Form
-K:770:0x80:0xBD
-
-# [Earth]
-K:771:0x80:0xBF
-
-# [Fire]
-K:772:0x80:0xBF
-
-# [Air]
-K:773:0x80:0xBF
-
-# [Water]
-K:774:0x80:0xBF
-
-# [Mana]
-K:775:0x80:0xBF
-
-# Home Summoning
-K:776:0x80:0xAD
-
-# & Shadow Blade~
-K:777:0x80:0xFC
-
-# & Bluesteel Blade~
-K:778:0x80:0xFC
-
-# the Serpents
-K:779:0x80:0xA2
-
-# Darkness
-K:780:0x80:0xAA
-
-# Knowledge
-K:781:0x80:0xAA
-
-# Force
-K:782:0x80:0xAA
-
-# Lightning
-K:783:0x80:0xAA
-
-# Mana
-K:784:0x80:0xAA
-
-# Power
-K:785:0x80:0xBD
-
-# Climbing Set
-K:786:0x80:0xE0
-
-# Adventurer's Guide to Middle-earth
-K:787:0x80:0xBF
-
-# [Dark Incantations]
-K:788:0x80:0xBF
-
-# [Immortal Rituals]
-K:789:0x80:0xBF
-
-# [Minions of Azathoth]
-K:790:0x80:0xBF
-
-# [Demonthoughts]
-K:791:0x80:0xBF
-
-# [Hellfire Tome]
-K:792:0x80:0xBF
-
-# & Wooden Rod~ of#
-K:793:0x80:0xAD
-
-# & Copper Rod~ of#
-K:794:0x80:0xAD
-
-# & Iron Rod~ of#
-K:795:0x80:0xAD
-
-# & Aluminium Rod~ of#
-K:796:0x80:0xAD
-
-# & Silver Rod~ of#
-K:797:0x80:0xAD
-
-# & Golden Rod~ of#
-K:798:0x80:0xAD
-
-# & Mithril Rod~ of#
-K:799:0x80:0xAD
-
-# & Adamantite Rod~ of#
-K:800:0x80:0xAD
-
-
-
-
-
-
-
-# Monster attr/char definitions
-
-# Player
-R:0:0x80:0xC0
-
-# Filthy street urchin
-R:1:0x80:0xF4
-
-# Scrawny cat
-R:2:0x80:0xE6
-
-# Sparrow
-R:3:0x80:0xC2
-
-# Chaffinch
-R:4:0x80:0xC2
-
-# Wild rabbit
-R:5:0x80:0xF2
-
-# Woodsman
-R:6:0x80:0xF0
-
-# Scruffy little dog
-R:7:0x80:0xC3
-
-# Farmer Maggot
-R:8:0x81:0xBB
-
-# Blubbering idiot
-R:9:0x80:0xF4
-
-# Boil-covered wretch
-R:10:0x80:0xF4
-
-# Village idiot
-R:11:0x80:0xF4
-
-# Pitiful looking beggar
-R:12:0x80:0xF4
-
-# Mangy looking leper
-R:13:0x80:0xF4
-
-# Agent of black market
-R:14:0x81:0xB8
-
-# Singing, happy drunk
-R:15:0x81:0xB9
-
-# Aimless looking merchant
-R:16:0x81:0xBA
-
-# Mean looking mercenary
-R:17:0x80:0xF4
-
-# Battle scarred veteran
-R:18:0x81:0xC3
-
-# Martti Ihrasaari
-R:19:0x80:0xD0
-
-# Grey mold
-R:20:0x81:0x32
-
-# Large white snake
-R:21:0x81:0xA0
-
-# Grey mushroom patch
-R:22:0x80:0xAC
-
-# Newt
-R:23:0x80:0xD2
-
-# Giant white centipede
-R:24:0x80:0xE3
-
-# White icky thing
-R:25:0x80:0xE9
-
-# Clear icky thing
-R:26:0x80:0xE9
-
-# Giant white mouse
-R:27:0x80:0xF2
-
-# Large brown snake
-R:28:0x81:0xA1
-
-# Small kobold
-R:29:0x80:0xEB
-
-# Kobold
-R:30:0x80:0xEB
-
-# White worm mass
-R:31:0x80:0xF7
-
-# Floating eye
-R:32:0x80:0xE5
-
-# Rock lizard
-R:33:0x80:0xD2
-
-# Grid bug
-R:34:0x81:0xA9
-
-# Jackal
-R:35:0x81:0xB1
-
-# Soldier ant
-R:36:0x81:0xAA
-
-# Fruit bat
-R:37:0x80:0xE2
-
-# Insect swarm
-R:38:0x81:0xA8
-
-# Greater hell-beast
-R:39:0x80:0xD5
-
-# Shrieker mushroom patch
-R:40:0x80:0xAC
-
-# Blubbering icky thing
-R:41:0x80:0xE9
-
-# Metallic green centipede
-R:42:0x80:0xE3
-
-# Novice warrior
-R:43:0x81:0xC2
-
-# Novice rogue
-R:44:0x80:0xF0
-
-# Novice priest
-R:45:0x80:0xF0
-
-# Novice mage
-R:46:0x80:0xF0
-
-# Yellow mushroom patch
-R:47:0x80:0xAC
-
-# White jelly
-R:48:0x80:0xEA
-
-# Giant black ant
-R:49:0x80:0xE1
-
-# Salamander
-R:50:0x80:0xD2
-
-# White harpy
-R:51:0x80:0xC8
-
-# Blue yeek
-R:52:0x80:0xF9
-
-# Grip, Farmer Maggot's dog
-R:53:0x80:0xC3
-
-# Wolf, Farmer Maggot's dog
-R:54:0x80:0xC3
-
-# Fang, Farmer Maggot's dog
-R:55:0x80:0xC3
-
-# Giant green frog
-R:56:0x80:0xD2
-
-# Freesia
-R:57:0x80:0xE6
-
-# Green worm mass
-R:58:0x80:0xF7
-
-# Large yellow snake
-R:59:0x80:0xCA
-
-# Cave spider
-R:60:0x80:0xD3
-
-# Crow
-R:61:0x80:0xC2
-
-# Wild cat
-R:62:0x80:0xE6
-
-# Smeagol
-R:63:0x80:0xE8
-
-# Green ooze
-R:64:0x80:0xEA
-
-# Poltergeist
-R:65:0x80:0xC7
-
-# Yellow jelly
-R:66:0x80:0xEA
-
-# Metallic blue centipede
-R:67:0x80:0xE3
-
-# Raven
-R:68:0x80:0xC2
-
-# Giant white louse
-R:69:0x80:0xEC
-
-# Piranha
-R:70:0x80:0xFE
-
-# Black naga
-R:71:0x80:0xEE
-
-# Spotted mushroom patch
-R:72:0x80:0xAC
-
-# Silver jelly
-R:73:0x80:0xEA
-
-# Scruffy looking hobbit
-R:74:0x80:0xE8
-
-# Giant white ant
-R:75:0x80:0xE1
-
-# Yellow mold
-R:76:0x80:0xED
-
-# Metallic red centipede
-R:77:0x80:0xE3
-
-# Yellow worm mass
-R:78:0x80:0xF7
-
-# Clear worm mass
-R:79:0x80:0xF7
-
-# Radiation eye
-R:80:0x80:0xE5
-
-# Yellow light
-R:81:0x80:0xAA
-
-# Cave lizard
-R:82:0x80:0xD2
-
-# Novice ranger
-R:83:0x80:0xF0
-
-# Blue jelly
-R:84:0x80:0xEA
-
-# Creeping copper coins
-R:85:0x80:0xA4
-
-# Giant white rat
-R:86:0x80:0xF2
-
-# Snotling
-R:87:0x80:0xEF
-
-# Swordfish
-R:88:0x80:0xFE
-
-# Blue worm mass
-R:89:0x80:0xF7
-
-# Large grey snake
-R:90:0x80:0xCA
-
-# Skeleton kobold
-R:91:0x80:0xF3
-
-# Ewok
-R:92:0x80:0xE8
-
-# Novice mage
-R:93:0x80:0xF0
-
-# Green naga
-R:94:0x80:0xEE
-
-# Giant leech
-R:95:0x80:0xF7
-
-# Barracuda
-R:96:0x80:0xFE
-
-# Novice paladin
-R:97:0x80:0xF0
-
-# Zog
-R:98:0x80:0xE8
-
-# Blue ooze
-R:99:0x80:0xEA
-
-# Green glutton ghost
-R:100:0x80:0xC7
-
-# Green jelly
-R:101:0x80:0xEA
-
-# Large kobold
-R:102:0x80:0xEB
-
-# Grey icky thing
-R:103:0x80:0xE9
-
-# Disenchanter eye
-R:104:0x80:0xE5
-
-# Red worm mass
-R:105:0x80:0xF7
-
-# Copperhead snake
-R:106:0x80:0xCA
-
-# Death sword
-R:107:0x80:0xFC
-
-# Purple mushroom patch
-R:108:0x80:0xAC
-
-# Novice priest
-R:109:0x80:0xF0
-
-# Novice warrior
-R:110:0x80:0xF0
-
-# Nibelung
-R:111:0x80:0xE8
-
-# Disembodied hand that strangled people
-R:112:0x80:0xFA
-
-# Brown mold
-R:113:0x80:0xED
-
-# Giant brown bat
-R:114:0x80:0xE2
-
-# Rat-thing
-R:115:0x80:0xF2
-
-# Novice archer
-R:116:0x81:0xC1
-
-# Creeping silver coins
-R:117:0x80:0xA4
-
-# Snaga
-R:118:0x80:0xEF
-
-# Rattlesnake
-R:119:0x80:0xCA
-
-# Giant slug
-R:120:0x80:0xF7
-
-# Giant pink frog
-R:121:0x80:0xD2
-
-# Dark elf
-R:122:0x80:0xE8
-
-# Zombified kobold
-R:123:0x80:0xFA
-
-# Crypt Creep
-R:124:0x80:0xF3
-
-# Rotting corpse
-R:125:0x80:0xFA
-
-# Cave orc
-R:126:0x81:0xBC
-
-# Wood spider
-R:127:0x80:0xD3
-
-# Manes
-R:128:0x80:0xF5
-
-# Bloodshot eye
-R:129:0x80:0xE5
-
-# Red naga
-R:130:0x80:0xEE
-
-# Red jelly
-R:131:0x80:0xEA
-
-# Green icky thing
-R:132:0x80:0xE9
-
-# Lost soul
-R:133:0x80:0xC7
-
-# Night lizard
-R:134:0x80:0xD2
-
-# Mughash the Kobold Lord
-R:135:0x80:0xEB
-
-# Skeleton orc
-R:136:0x80:0xF3
-
-# Wormtongue, Agent of Saruman
-R:137:0x80:0xF0
-
-# Robin Hood, the Outlaw
-R:138:0x80:0xF0
-
-# Nurgling
-R:139:0x80:0xF5
-
-# Lagduf, the Snaga
-R:140:0x80:0xEF
-
-# Brown yeek
-R:141:0x80:0xF9
-
-# Novice ranger
-R:142:0x80:0xF0
-
-# Giant salamander
-R:143:0x80:0xD2
-
-# Space monster
-R:144:0x80:0xAE
-
-# Carnivorous flying monkey
-R:145:0x80:0xC8
-
-# Green mold
-R:146:0x80:0xED
-
-# Novice paladin
-R:147:0x80:0xF0
-
-# Lemure
-R:148:0x80:0xF5
-
-# Hill orc
-R:149:0x80:0xEF
-
-# Bandit
-R:150:0x80:0xF0
-
-# Hunting hawk
-R:151:0x80:0xC2
-
-# Phantom warrior
-R:152:0x80:0xC7
-
-# Gremlin
-R:153:0x80:0xF5
-
-# Yeti
-R:154:0x80:0xD9
-
-# Bloodshot icky thing
-R:155:0x80:0xE9
-
-# Giant grey rat
-R:156:0x80:0xF2
-
-# Black harpy
-R:157:0x80:0xC8
-
-# Skaven
-R:158:0x80:0xF2
-
-# The wounded bear
-R:159:0x80:0xF1
-
-# Portuguese man-o-war
-R:160:0x80:0xEA
-
-# Rock mole
-R:161:0x80:0xF2
-
-# Orc shaman
-R:162:0x80:0xEF
-
-# Baby blue dragon
-R:163:0x80:0xE4
-
-# Baby white dragon
-R:164:0x80:0xE4
-
-# Baby green dragon
-R:165:0x80:0xE4
-
-# Baby black dragon
-R:166:0x80:0xE4
-
-# Baby red dragon
-R:167:0x80:0xE4
-
-# Giant red ant
-R:168:0x80:0xE1
-
-# Brodda, the Easterling
-R:169:0x80:0xF0
-
-# Bloodfang the Wolf
-R:170:0x80:0xC3
-
-# King cobra
-R:171:0x80:0xCA
-
-# Eagle
-R:172:0x80:0xC2
-
-# War bear
-R:173:0x80:0xF1
-
-# Killer bee
-R:174:0x80:0xC9
-
-# Giant spider
-R:175:0x80:0xD3
-
-# Giant white tick
-R:176:0x80:0xD3
-
-# The Borshin
-R:177:0x80:0xE7
-
-# Dark elven mage
-R:178:0x80:0xE8
-
-# Kamikaze yeek
-R:179:0x80:0xF9
-
-# Orfax, Son of Boldor
-R:180:0x80:0xF9
-
-# Servant of Glaaki
-R:181:0x80:0xFA
-
-# Dark elven warrior
-R:182:0x81:0xBF
-
-# Sand-dweller
-R:183:0x80:0xF5
-
-# Clear mushroom patch
-R:184:0x80:0xAC
-
-# Quiver slot
-R:185:0x80:0xAC
-
-# Grishnakh, the Hill Orc
-R:186:0x80:0xEF
-
-# Giant piranha
-R:187:0x80:0xFE
-
-# Owlbear
-R:188:0x80:0xC8
-
-# Blue horror
-R:189:0x80:0xF5
-
-# Hairy mold
-R:190:0x80:0xED
-
-# Grizzly bear
-R:191:0x80:0xF1
-
-# Disenchanter mold
-R:192:0x80:0xED
-
-# Pseudo dragon
-R:193:0x80:0xE4
-
-# Tengu
-R:194:0x80:0xF5
-
-# Creeping gold coins
-R:195:0x80:0xA4
-
-# Wolf
-R:196:0x80:0xC3
-
-# Giant fruit fly
-R:197:0x80:0xC9
-
-# Panther
-R:198:0x80:0xE6
-
-# Brigand
-R:199:0x80:0xF0
-
-# Hobbes the Tiger
-R:200:0x80:0xE6
-
-# Shadow Creature of Fiona
-R:201:0x80:0xE8
-
-# Undead mass
-R:202:0x80:0xEA
-
-# Chaos shapechanger
-R:203:0x80:0xC8
-
-# Baby multi-hued dragon
-R:204:0x80:0xE4
-
-# Vorpal bunny
-R:205:0x80:0xF2
-
-# Old Man Willow
-R:206:0x80:0xA3
-
-# Hippocampus
-R:207:0x80:0xC8
-
-# Zombified orc
-R:208:0x80:0xFA
-
-# Hippogriff
-R:209:0x80:0xC8
-
-# Black mamba
-R:210:0x80:0xCA
-
-# White wolf
-R:211:0x80:0xC3
-
-# Grape jelly
-R:212:0x80:0xEA
-
-# Nether worm mass
-R:213:0x80:0xF7
-
-# Abyss worm mass
-R:214:0x80:0xF7
-
-# Golfimbul, the Hill Orc Chief
-R:215:0x80:0xEF
-
-# Swordsman
-R:216:0x80:0xF0
-
-# Skaven shaman
-R:217:0x80:0xF2
-
-# Gazer
-R:218:0x80:0xE5
-
-# Knight archer
-R:219:0x80:0xF0
-
-# Ixitxachitl
-R:220:0x80:0xFE
-
-# Mine-dog
-R:221:0x80:0xC3
-
-# Hellcat
-R:222:0x80:0xE6
-
-# Moon beast
-R:223:0x80:0xF1
-
-# Master yeek
-R:224:0x80:0xF9
-
-# Priest
-R:225:0x80:0xF0
-
-# Dark elven priest
-R:226:0x80:0xE8
-
-# Air spirit
-R:227:0x80:0xC5
-
-# Skeleton human
-R:228:0x80:0xF3
-
-# Zombified human
-R:229:0x80:0xFA
-
-# Tiger
-R:230:0x80:0xE6
-
-# Moaning spirit
-R:231:0x80:0xC7
-
-# Stegocentipede
-R:232:0x80:0xE3
-
-# Spotted jelly
-R:233:0x80:0xEA
-
-# Drider
-R:234:0x80:0xD3
-
-# Mongbat
-R:235:0x80:0xE2
-
-# Killer brown beetle
-R:236:0x80:0xCB
-
-# Boldor, King of the Yeeks
-R:237:0x80:0xF9
-
-# Ogre
-R:238:0x81:0xBD
-
-# Creeping mithril coins
-R:239:0x80:0xA4
-
-# Illusionist
-R:240:0x80:0xF0
-
-# Druid
-R:241:0x80:0xF0
-
-# Pink horror
-R:242:0x80:0xF5
-
-# Cloaker
-R:243:0x80:0xA8
-
-# Black orc
-R:244:0x80:0xEF
-
-# Ochre jelly
-R:245:0x80:0xEA
-
-# Software bug
-R:246:0x80:0xC9
-
-# Lurker
-R:247:0x80:0xAE
-
-# Nixie
-R:248:0x80:0xE8
-
-# Vlasta
-R:249:0x80:0xD2
-
-# Giant white dragon fly
-R:250:0x80:0xC6
-
-# Snaga sapper
-R:251:0x80:0xEF
-
-# Blue icky thing
-R:252:0x80:0xE9
-
-# Gibbering mouther
-R:253:0x80:0xEA
-
-# Irish wolfhound of Flora
-R:254:0x80:0xC3
-
-# Hill giant
-R:255:0x80:0xD0
-
-# Flesh golem
-R:256:0x80:0xE7
-
-# Warg
-R:257:0x80:0xC3
-
-# Cheerful leprechaun
-R:258:0x80:0xE8
-
-# Giant black flea
-R:259:0x80:0xC9
-
-# Ufthak of Cirith Ungol
-R:260:0x80:0xEF
-
-# Clay golem
-R:261:0x80:0xE7
-
-# Black ogre
-R:262:0x80:0xCF
-
-# Dweller on the threshold
-R:263:0x80:0xD9
-
-# Half-orc
-R:264:0x80:0xEF
-
-# Dark naga
-R:265:0x80:0xEE
-
-# Giant octopus
-R:266:0x80:0xFE
-
-# Magic mushroom patch
-R:267:0x80:0xAC
-
-# Plaguebearer of Nurgle
-R:268:0x80:0xFA
-
-# Guardian naga
-R:269:0x80:0xEE
-
-# Wererat
-R:270:0x80:0xF2
-
-# Light hound
-R:271:0x80:0xDA
-
-# Shadow hound
-R:272:0x80:0xDA
-
-# Flying skull
-R:273:0x80:0xF3
-
-# Mi-Go
-R:274:0x80:0xC9
-
-# Giant tarantula
-R:275:0x80:0xD3
-
-# Giant clear centipede
-R:276:0x80:0xE3
-
-# Mirkwood spider
-R:277:0x80:0xD3
-
-# Frost giant
-R:278:0x80:0xD0
-
-# Griffon
-R:279:0x80:0xC8
-
-# Homonculous
-R:280:0x80:0xF5
-
-# Gnome mage
-R:281:0x80:0xE8
-
-# Clear hound
-R:282:0x80:0xDA
-
-# Umber hulk
-R:283:0x80:0xD8
-
-# Rust monster
-R:284:0x80:0xF1
-
-# Orc captain
-R:285:0x80:0xEF
-
-# Gelatinous cube
-R:286:0x80:0xEA
-
-# Giant green dragon fly
-R:287:0x80:0xC6
-
-# Fire giant
-R:288:0x80:0xD0
-
-# Hummerhorn
-R:289:0x80:0xC9
-
-# Lizardman
-R:290:0x80:0xE8
-
-# Ulfast, Son of Ulfang
-R:291:0x80:0xF0
-
-# Hammerhead
-R:292:0x80:0xFE
-
-# Berserker
-R:293:0x80:0xF0
-
-# Quasit
-R:294:0x80:0xF5
-
-# Sphinx
-R:295:0x80:0xC8
-
-# Imp
-R:296:0x80:0xF5
-
-# Forest troll
-R:297:0x80:0xD4
-
-# Freezing sphere
-R:298:0x80:0xAA
-
-# Jumping fireball
-R:299:0x80:0xAA
-
-# Ball lightning
-R:300:0x80:0xAA
-
-# 2-headed hydra
-R:301:0x80:0xCD
-
-# Swamp thing
-R:302:0x80:0xC8
-
-# Water spirit
-R:303:0x80:0xC5
-
-# Giant red scorpion
-R:304:0x80:0xD3
-
-# Earth spirit
-R:305:0x80:0xC5
-
-# Fire spirit
-R:306:0x80:0xC5
-
-# Fire hound
-R:307:0x80:0xDA
-
-# Cold hound
-R:308:0x80:0xDA
-
-# Energy hound
-R:309:0x80:0xDA
-
-# Potion mimic
-R:310:0x80:0xA1
-
-# Door mimic
-R:311:0x80:0xAB
-
-# Blink dog
-R:312:0x80:0xC3
-
-# Uruk
-R:313:0x80:0xEF
-
-# Shagrat, the Orc Captain
-R:314:0x80:0xEF
-
-# Gorbag, the Orc Captain
-R:315:0x80:0xEF
-
-# Shambling mound
-R:316:0x80:0xAC
-
-# White shark
-R:317:0x80:0xFE
-
-# Chaos beastman
-R:318:0x80:0xC8
-
-# Daemonette of Slaanesh
-R:319:0x80:0xF5
-
-# Giant bronze dragon fly
-R:320:0x80:0xC6
-
-# Stone giant
-R:321:0x80:0xD0
-
-# Giant black dragon fly
-R:322:0x80:0xC6
-
-# Stone golem
-R:323:0x80:0xE7
-
-# Red mold
-R:324:0x80:0xED
-
-# Giant gold dragon fly
-R:325:0x80:0xC6
-
-# Stunwall
-R:326:0x80:0xA3
-
-# Ghast
-R:327:0x80:0xFA
-
-# Ixitxachitl priest
-R:328:0x80:0xFE
-
-# Huorn
-R:329:0x80:0xA3
-
-# Bolg, Son of Azog
-R:330:0x80:0xEF
-
-# Phase spider
-R:331:0x80:0xD3
-
-# Lizard king
-R:332:0x80:0xE8
-
-# Landmine
-R:333:0x80:0xAE
-
-# Wyvern
-R:334:0x80:0xE4
-
-# Great eagle
-R:335:0x80:0xC2
-
-# Livingstone
-R:336:0x80:0xA3
-
-# Earth hound
-R:337:0x80:0xDA
-
-# Air hound
-R:338:0x80:0xDA
-
-# Sabre-tooth tiger
-R:339:0x80:0xE6
-
-# Water hound
-R:340:0x80:0xDA
-
-# Chimera
-R:341:0x80:0xC8
-
-# Quylthulg
-R:342:0x80:0xD1
-
-# Sasquatch
-R:343:0x80:0xD9
-
-# Weir
-R:344:0x80:0xC3
-
-# Whale
-R:345:0x80:0xFE
-
-# Electric eel
-R:346:0x80:0xCA
-
-# Werewolf
-R:347:0x80:0xC3
-
-# Dark elven lord
-R:348:0x80:0xE8
-
-# Cloud giant
-R:349:0x80:0xD0
-
-# Ugluk, the Uruk
-R:350:0x80:0xEF
-
-# Blue dragon bat
-R:351:0x80:0xE2
-
-# Scroll mimic
-R:352:0x80:0xBF
-
-# Chest mimic
-R:353:0x80:0xFE
-
-# Fire vortex
-R:354:0x80:0xF6
-
-# Water vortex
-R:355:0x80:0xF6
-
-# Lugdush, the Uruk
-R:356:0x80:0xEF
-
-# Arch-vile
-R:357:0x80:0xF5
-
-# Cold vortex
-R:358:0x80:0xF6
-
-# Energy vortex
-R:359:0x80:0xF6
-
-# Globefish
-R:360:0x80:0xFE
-
-# Carrion
-R:361:0x80:0xC2
-
-# Mummified orc
-R:362:0x80:0xFA
-
-# Killer whale
-R:363:0x80:0xFE
-
-# Serpent man
-R:364:0x80:0xCA
-
-# Vampiric mist
-R:365:0x80:0xA3
-
-# Killer stag beetle
-R:366:0x80:0xCB
-
-# Iron golem
-R:367:0x80:0xE7
-
-# Auto-roller
-R:368:0x80:0xE7
-
-# Giant yellow scorpion
-R:369:0x80:0xD3
-
-# Jade monk
-R:370:0x80:0xF0
-
-# Black ooze
-R:371:0x80:0xEA
-
-# Hardened warrior
-R:372:0x80:0xF0
-
-# Azog, King of the Uruk-Hai
-R:373:0x80:0xEF
-
-# Fleshhound of Khorne
-R:374:0x80:0xC3
-
-# Dark elven warlock
-R:375:0x80:0xE8
-
-# Master rogue
-R:376:0x80:0xF0
-
-# Red dragon bat
-R:377:0x80:0xE2
-
-# Killer white beetle
-R:378:0x80:0xCB
-
-# Ice skeleton
-R:379:0x80:0xF3
-
-# Angamaite of Umbar
-R:380:0x80:0xF0
-
-# Forest wight
-R:381:0x80:0xD7
-
-# Mime, the Nibelung
-R:382:0x80:0xE8
-
-# Ibun, Son of Mim
-R:383:0x80:0xE8
-
-# Meneldor the Swift
-R:384:0x80:0xC2
-
-# Phantom beast
-R:385:0x80:0xC7
-
-# Great white shark
-R:386:0x80:0xFE
-
-# 4-headed hydra
-R:387:0x80:0xCD
-
-# Lesser hell-beast
-R:388:0x80:0xD5
-
-# Tyrannosaur
-R:389:0x80:0xD2
-
-# Mummified human
-R:390:0x80:0xFA
-
-# Vampire bat
-R:391:0x80:0xE2
-
-# Sangahyando of Umbar
-R:392:0x80:0xF0
-
-# It
-R:393:0x80:0xAE
-
-# Banshee
-R:394:0x80:0xC7
-
-# Carrion crawler
-R:395:0x80:0xE3
-
-# Xiclotlan
-R:396:0x80:0xA3
-
-# Silent watcher
-R:397:0x80:0xE7
-
-# Pukelman
-R:398:0x80:0xE7
-
-# Disenchanter beast
-R:399:0x80:0xF1
-
-# Dark elven druid
-R:400:0x80:0xE8
-
-# Stone troll
-R:401:0x80:0xD4
-
-# Black
-R:402:0x80:0xEA
-
-# Troll priest
-R:403:0x80:0xD4
-
-# Wereworm
-R:404:0x80:0xF7
-
-# Killer crimson beetle
-R:405:0x80:0xCB
-
-# Vampiric ixitxachitl
-R:406:0x80:0xFE
-
-# Gnoph-Keh
-R:407:0x80:0xF1
-
-# Giant grey ant
-R:408:0x80:0xE1
-
-# Khufu the Mummified King
-R:409:0x80:0xFA
-
-# Gwaihir the Windlord
-R:410:0x80:0xC2
-
-# Giant red tick
-R:411:0x80:0xD3
-
-# Displacer beast
-R:412:0x80:0xE6
-
-# Ulwarth, Son of Ulfang
-R:413:0x80:0xF0
-
-# Agent of Saruman
-R:414:0x80:0xF0
-
-# Cave ogre
-R:415:0x80:0xCF
-
-# White wraith
-R:416:0x80:0xD7
-
-# Monadic Deva
-R:417:0x80:0xC1
-
-# Ghoul
-R:418:0x80:0xFA
-
-# Mim, Betrayer of Turin
-R:419:0x80:0xE8
-
-# Hellblade
-R:420:0x80:0xFC
-
-# Killer red beetle
-R:421:0x80:0xCB
-
-# Beast of Nurgle
-R:422:0x80:0xF1
-
-# Creeping adamantite coins
-R:423:0x80:0xA4
-
-# Algroth
-R:424:0x80:0xD4
-
-# Flamer of Tzeentch
-R:425:0x80:0xAC
-
-# Roper
-R:426:0x80:0xA3
-
-# Headless
-R:427:0x80:0xC8
-
-# Vibration hound
-R:428:0x80:0xDA
-
-# Nexus hound
-R:429:0x80:0xDA
-
-# Ogre mage
-R:430:0x80:0xCF
-
-# Lokkak, the Ogre Chieftain
-R:431:0x80:0xCF
-
-# Vampire
-R:432:0x80:0xD6
-
-# Gorgimera
-R:433:0x80:0xC8
-
-# Shantak
-R:434:0x80:0xC2
-
-# Colbran
-R:435:0x80:0xE7
-
-# Spirit naga
-R:436:0x80:0xEE
-
-# Corpser
-R:437:0x80:0xAC
-
-# Fiend of Slaanesh
-R:438:0x80:0xD3
-
-# Stairway to hell
-R:439:0x80:0xBE
-
-# 5-headed hydra
-R:440:0x80:0xCD
-
-# Barney the Dinosaur
-R:441:0x80:0xD2
-
-# Black knight
-R:442:0x80:0xF0
-
-# Seahorse
-R:443:0x80:0xFE
-
-# Cyclops
-R:444:0x80:0xD0
-
-# Clairvoyant
-R:445:0x80:0xF0
-
-# Giant purple worm
-R:446:0x80:0xF7
-
-# Catoblepas
-R:447:0x80:0xF1
-
-# Lesser wall monster
-R:448:0x80:0xA3
-
-# Mage
-R:449:0x80:0xF0
-
-# Mind flayer
-R:450:0x80:0xE8
-
-# The Ultimate Dungeon Cleaner
-R:451:0x80:0xE7
-
-# Deep one
-R:452:0x80:0xF5
-
-# Basilisk
-R:453:0x80:0xD2
-
-# Ice troll
-R:454:0x80:0xD4
-
-# Dhole
-R:455:0x80:0xF7
-
-# Movanic Deva
-R:456:0x80:0xC1
-
-# Ring mimic
-R:457:0x80:0xBD
-
-# Chaos tile
-R:458:0x80:0xAE
-
-# Young blue dragon
-R:459:0x80:0xE4
-
-# Young white dragon
-R:460:0x80:0xE4
-
-# Young green dragon
-R:461:0x80:0xE4
-
-# Young bronze dragon
-R:462:0x80:0xE4
-
-# Aklash
-R:463:0x80:0xD4
-
-# Mithril golem
-R:464:0x80:0xE7
-
-# Skeleton troll
-R:465:0x80:0xF3
-
-# Skeletal tyrannosaur 
-R:466:0x80:0xD2
-
-# Jaws
-R:467:0x80:0xFE
-
-# Thorondor 
-R:468:0x80:0xC2
-
-# Giant blue ant
-R:469:0x80:0xE1
-
-# Grave wight
-R:470:0x80:0xD7
-
-# Shadow drake
-R:471:0x80:0xE4
-
-# Manticore
-R:472:0x80:0xC8
-
-# Giant army ant
-R:473:0x80:0xE1
-
-# Killer slicer beetle
-R:474:0x80:0xCB
-
-# Gorgon
-R:475:0x80:0xC8
-
-# Gug
-R:476:0x80:0xC7
-
-# Ghost
-R:477:0x80:0xC7
-
-# Death watch beetle
-R:478:0x80:0xCB
-
-# Ogre shaman
-R:479:0x80:0xCF
-
-# Nexus quylthulg
-R:480:0x80:0xD1
-
-# Shelob, Spider of Darkness
-R:481:0x80:0xD3
-
-# Giant squid
-R:482:0x80:0xFE
-
-# Ghoulking
-R:483:0x80:0xFA
-
-# Doombat
-R:484:0x80:0xE2
-
-# Ninja
-R:485:0x80:0xF0
-
-# Memory moss
-R:486:0x80:0xAC
-
-# Storm giant
-R:487:0x80:0xD0
-
-# Spectator
-R:488:0x80:0xE5
-
-# Bokrug
-R:489:0x80:0xD2
-
-# Biclops
-R:490:0x80:0xD0
-
-# Half-troll
-R:491:0x80:0xD4
-
-# Ivory monk
-R:492:0x80:0xF0
-
-# Bert the Stone Troll
-R:493:0x80:0xD4
-
-# Bill the Stone Troll
-R:494:0x80:0xD4
-
-# Tom the Stone Troll
-R:495:0x80:0xD4
-
-# Cave troll
-R:496:0x80:0xD4
-
-# Anti-paladin
-R:497:0x80:0xF0
-
-# Chaos master
-R:498:0x80:0xF0
-
-# Barrow wight
-R:499:0x80:0xD7
-
-# Giant skeleton troll
-R:500:0x80:0xF3
-
-# Chaos drake
-R:501:0x80:0xE4
-
-# Law drake
-R:502:0x80:0xE4
-
-# Balance drake
-R:503:0x80:0xE4
-
-# Ethereal drake
-R:504:0x80:0xE4
-
-# Groo the Wanderer
-R:505:0x80:0xD4
-
-# Fasolt the Giant
-R:506:0x80:0xD0
-
-# Shade
-R:507:0x80:0xC7
-
-# Spectre
-R:508:0x80:0xC7
-
-# Water troll
-R:509:0x80:0xD4
-
-# Fire elemental
-R:510:0x80:0xC5
-
-# Cherub
-R:511:0x80:0xC1
-
-# Water elemental
-R:512:0x80:0xC5
-
-# Multi-hued hound
-R:513:0x80:0xDA
-
-# Night stalker
-R:514:0x80:0xC5
-
-# Carrion crawler
-R:515:0x80:0xE3
-
-# Master thief
-R:516:0x80:0xF0
-
-# Waldern, King of Water
-R:517:0x80:0xC5
-
-# Lich
-R:518:0x80:0xCC
-
-# Gas spore
-R:519:0x80:0xE5
-
-# Master vampire
-R:520:0x80:0xD6
-
-# Oriental vampire
-R:521:0x80:0xD6
-
-# Greater mummy
-R:522:0x80:0xFA
-
-# Bloodletter of Khorne
-R:523:0x80:0xD5
-
-# Giant grey scorpion
-R:524:0x80:0xD3
-
-# Earth elemental
-R:525:0x80:0xC5
-
-# Air elemental
-R:526:0x80:0xC5
-
-# Doom drake
-R:527:0x80:0xE4
-
-# Gargoyle
-R:528:0x80:0xF5
-
-# Malicious leprechaun
-R:529:0x80:0xE8
-
-# Eog golem
-R:530:0x80:0xE7
-
-# Little Boy
-R:531:0x80:0xFB
-
-# Dagashi
-R:532:0x80:0xF0
-
-# Headless ghost
-R:533:0x80:0xC7
-
-# Dread
-R:534:0x80:0xC7
-
-# Leng spider
-R:535:0x80:0xD3
-
-# Star vampire
-R:536:0x80:0xD6
-
-# Smoke elemental
-R:537:0x80:0xC5
-
-# Olog
-R:538:0x80:0xD4
-
-# Halfling slinger
-R:539:0x80:0xE8
-
-# Gravity hound
-R:540:0x80:0xDA
-
-# Acidic cytoplasm
-R:541:0x80:0xEA
-
-# Inertia hound
-R:542:0x80:0xDA
-
-# Impact hound
-R:543:0x80:0xDA
-
-# Sea troll
-R:544:0x80:0xD4
-
-# Ooze elemental
-R:545:0x80:0xC5
-
-# Young black dragon
-R:546:0x80:0xE4
-
-# Mumak
-R:547:0x80:0xF1
-
-# Giant red ant
-R:548:0x80:0xE1
-
-# Mature white dragon
-R:549:0x80:0xE4
-
-# Xorn
-R:550:0x80:0xD8
-
-# Rogrog the Black Troll
-R:551:0x80:0xD4
-
-# Mist giant
-R:552:0x80:0xA3
-
-# Phantom
-R:553:0x80:0xC7
-
-# Grey wraith
-R:554:0x80:0xD7
-
-# Revenant
-R:555:0x80:0xD7
-
-# Young multi-hued dragon
-R:556:0x80:0xE4
-
-# Raal's Tome of Destruction
-R:557:0x80:0xBF
-
-# Colossus
-R:558:0x80:0xE7
-
-# Young gold dragon
-R:559:0x80:0xE4
-
-# Mature blue dragon
-R:560:0x80:0xE4
-
-# Mature green dragon
-R:561:0x80:0xE4
-
-# Mature bronze dragon
-R:562:0x80:0xE4
-
-# Young red dragon
-R:563:0x80:0xE4
-
-# Nightblade
-R:564:0x80:0xE8
-
-# Trapper
-R:565:0x80:0xAE
-
-# Bodak
-R:566:0x80:0xF5
-
-# Time bomb
-R:567:0x80:0xAE
-
-# Mezzodaemon
-R:568:0x80:0xF5
-
-# Elder thing
-R:569:0x80:0xF5
-
-# Ice elemental
-R:570:0x80:0xC5
-
-# Necromancer
-R:571:0x81:0xBE
-
-# The Greater hell magic mushroom were-quylthulg
-R:572:0x80:0xD1
-
-# Lorgan, Chief of the Easterlings
-R:573:0x80:0xF0
-
-# Chaos spawn
-R:574:0x80:0xE5
-
-# Mummified troll
-R:575:0x80:0xFA
-
-# Fire angel
-R:576:0x80:0xE4
-
-# Crypt thing
-R:577:0x80:0xCC
-
-# Chaos butterfly
-R:578:0x80:0xC9
-
-# Time elemental
-R:579:0x80:0xC5
-
-# Flying polyp
-R:580:0x80:0xFE
-
-# The Queen Ant
-R:581:0x80:0xE1
-
-# Will o' the wisp
-R:582:0x80:0xC5
-
-# Shan
-R:583:0x80:0xC9
-
-# Magma elemental
-R:584:0x80:0xC5
-
-# Black pudding
-R:585:0x80:0xEA
-
-# Killer iridescent beetle
-R:586:0x80:0xCB
-
-# Nexus vortex
-R:587:0x80:0xF6
-
-# Plasma vortex
-R:588:0x80:0xF6
-
-# Mature red dragon
-R:589:0x80:0xE4
-
-# Mature gold dragon
-R:590:0x80:0xE4
-
-# Crystal drake
-R:591:0x80:0xE4
-
-# Mature black dragon
-R:592:0x80:0xE4
-
-# Mature multi-hued dragon
-R:593:0x80:0xE4
-
-# Sky whale
-R:594:0x80:0xFE
-
-# Draebor, the Imp
-R:595:0x80:0xF5
-
-# Mother Hydra
-R:596:0x80:0xF5
-
-# Death knight
-R:597:0x80:0xF0
-
-# Castamir the Usurper
-R:598:0x80:0xF0
-
-# Time vortex
-R:599:0x80:0xF6
-
-# Shimmering vortex
-R:600:0x80:0xF6
-
-# Ancient blue dragon
-R:601:0x80:0xC4
-
-# Ancient bronze dragon
-R:602:0x80:0xC4
-
-# Beholder
-R:603:0x80:0xE5
-
-# Emperor wight
-R:604:0x80:0xD7
-
-# Planetar
-R:605:0x80:0xC1
-
-# Vargo, Tyrant of Fire
-R:606:0x80:0xC5
-
-# Black wraith
-R:607:0x80:0xD7
-
-# Nightgaunt
-R:608:0x80:0xD5
-
-# Baron of hell
-R:609:0x80:0xD5
-
-# Medusa
-R:610:0x80:0xCD
-
-# Monastic lich
-R:611:0x80:0xCC
-
-# Nether wraith
-R:612:0x80:0xD7
-
-# Fire vampire
-R:613:0x80:0xD6
-
-# 7-headed hydra
-R:614:0x80:0xCD
-
-# Moire, Queen of Rebma
-R:615:0x80:0xC5
-
-# Kavlax the Many-Headed
-R:616:0x80:0xE4
-
-# Ancient white dragon
-R:617:0x80:0xC4
-
-# Ancient green dragon
-R:618:0x80:0xC4
-
-# Chthonian
-R:619:0x80:0xF7
-
-# Eldrak
-R:620:0x80:0xD4
-
-# Ettin
-R:621:0x80:0xD4
-
-# Night mare
-R:622:0x80:0xF1
-
-# Vampire lord
-R:623:0x80:0xD6
-
-# Ancient black dragon
-R:624:0x80:0xC4
-
-# Weird fume
-R:625:0x80:0xA3
-
-# Spawn of Ubbo-Sathla
-R:626:0x80:0xEA
-
-# Fat Man
-R:627:0x80:0xFB
-
-# Malekith the Accursed
-R:628:0x80:0xE8
-
-# Shadowfax, steed of Gandalf
-R:629:0x80:0xF1
-
-# Spirit troll
-R:630:0x80:0xD4
-
-# War troll
-R:631:0x80:0xD4
-
-# Disenchanter worm mass
-R:632:0x80:0xF7
-
-# Rotting quylthulg
-R:633:0x80:0xD1
-
-# Lesser titan
-R:634:0x80:0xD0
-
-# 9-headed hydra
-R:635:0x80:0xCD
-
-# Enchantress
-R:636:0x80:0xF0
-
-# Archpriest
-R:637:0x80:0xF0
-
-# Sorcerer
-R:638:0x80:0xF0
-
-# Xaren
-R:639:0x80:0xD8
-
-# Giant roc
-R:640:0x80:0xC2
-
-# Minotaur
-R:641:0x80:0xC8
-
-# Jasra, Brand's Mistress
-R:642:0x80:0xEE
-
-# Death drake
-R:643:0x80:0xC4
-
-# Ancient red dragon
-R:644:0x80:0xC4
-
-# Ancient gold dragon
-R:645:0x80:0xC4
-
-# Great crystal drake
-R:646:0x80:0xC4
-
-# Wyrd sister
-R:647:0x80:0xF0
-
-# Clubber demon
-R:648:0x80:0xD5
-
-# Death quasit
-R:649:0x80:0xF5
-
-# Giganto the Gargantuan
-R:650:0x80:0xFE
-
-# Strygalldwir
-R:651:0x80:0xD5
-
-# Fallen angel
-R:652:0x80:0xC1
-
-# Giant headless
-R:653:0x80:0xC8
-
-# Judge Fire
-R:654:0x80:0xF3
-
-# Ubbo-Sathla, the Unbegotten Source
-R:655:0x80:0xEA
-
-# Judge Mortis
-R:656:0x80:0xFA
-
-# Dark elven sorceror
-R:657:0x80:0xE8
-
-# Master lich
-R:658:0x80:0xCC
-
-# Byakhee
-R:659:0x80:0xD5
-
-# Eol the Dark Elf
-R:660:0x80:0xE8
-
-# Archon
-R:661:0x80:0xC1
-
-# Formless spawn of Tsathoggua
-R:662:0x80:0xD5
-
-# Hunting horror
-R:663:0x80:0xD5
-
-# Undead beholder
-R:664:0x80:0xE5
-
-# Shadow demon
-R:665:0x80:0xC7
-
-# Iron lich
-R:666:0x80:0xCC
-
-# Dread
-R:667:0x80:0xC7
-
-# Greater basilisk
-R:668:0x80:0xD2
-
-# Charybdis
-R:669:0x80:0xFE
-
-# Jack of Shadows
-R:670:0x80:0xF0
-
-# Zephyr Lord
-R:671:0x80:0xD7
-
-# Juggernaut of Khorne
-R:672:0x80:0xE7
-
-# Great Mumak
-R:673:0x80:0xF1
-
-# Judge Fear
-R:674:0x80:0xD7
-
-# Ancient multi-hued dragon
-R:675:0x80:0xC4
-
-# Ethereal dragon
-R:676:0x80:0xC4
-
-# Dark young of Shub-Niggurath
-R:677:0x80:0xA3
-
-# Colour out of space
-R:678:0x80:0xAE
-
-# Quaker, Master of Earth
-R:679:0x80:0xC5
-
-# Death leprechaun
-R:680:0x80:0xE8
-
-# Chaugnar Faugn, Horror from the Hills
-R:681:0x80:0xF1
-
-# Lloigor
-R:682:0x80:0xF6
-
-# Utgard-Loke
-R:683:0x80:0xD0
-
-# Quachil Uttaus, Treader of the Dust
-R:684:0x80:0xFA
-
-# Shoggoth
-R:685:0x80:0xEA
-
-# Judge Death
-R:686:0x80:0xD7
-
-# Ariel, Queen of Air
-R:687:0x80:0xC5
-
-# 11-headed hydra
-R:688:0x80:0xCD
-
-# High priest
-R:689:0x80:0xF0
-
-# Dreadmaster
-R:690:0x80:0xC7
-
-# Drolem
-R:691:0x80:0xE7
-
-# Scatha the Worm
-R:692:0x80:0xC4
-
-# Warrior of the Dawn
-R:693:0x80:0xF0
-
-# Lesser black reaver
-R:694:0x80:0xCC
-
-# Zoth-Ommog
-R:695:0x80:0xD2
-
-# Grand master thief
-R:696:0x80:0xF0
-
-# Smaug the Golden
-R:697:0x80:0xC4
-
-# The Stormbringer
-R:698:0x80:0xFC
-
-# Ultra-elite paladin
-R:699:0x80:0xF0
-
-# Leprechaun fanatic
-R:700:0x80:0xE8
-
-# Dracolich
-R:701:0x80:0xC4
-
-# Greater titan
-R:702:0x80:0xD0
-
-# Dracolisk
-R:703:0x80:0xC4
-
-# Fastitocalon
-R:704:0x80:0xC4
-
-# Spectral tyrannosaur
-R:705:0x80:0xD2
-
-# Yibb-Tstll the Patient One
-R:706:0x80:0xD0
-
-# Ghatanothoa
-R:707:0x80:0xC8
-
-# Ent
-R:708:0x80:0xA3
-
-# Hru
-R:709:0x80:0xD0
-
-# Itangast the Fire Drake
-R:710:0x80:0xC4
-
-# Death mold
-R:711:0x80:0xED
-
-# Fafner the Dragon
-R:712:0x80:0xC4
-
-# Charon the Boatsman
-R:713:0x80:0xD7
-
-# Quickbeam
-R:714:0x80:0xA3
-
-# Glaurung, Father of the Dragons
-R:715:0x80:0xC4
-
-# Behemoth
-R:716:0x80:0xC8
-
-# Garm, Guardian of Hel
-R:717:0x80:0xC3
-
-# Greater wall monster
-R:718:0x80:0xA3
-
-# Nycadaemon
-R:719:0x80:0xD5
-
-# Balrog
-R:720:0x80:0xD5
-
-# Goat of Mendes
-R:721:0x80:0xF1
-
-# Nightwing
-R:722:0x80:0xD7
-
-# Maulotaur
-R:723:0x80:0xC8
-
-# Nether hound
-R:724:0x80:0xDA
-
-# Time hound
-R:725:0x80:0xDA
-
-# Plasma hound
-R:726:0x80:0xDA
-
-# Demonic quylthulg
-R:727:0x80:0xD1
-
-# Great storm wyrm
-R:728:0x80:0xC4
-
-# Ulik the Troll
-R:729:0x80:0xD4
-
-# Baphomet the Minotaur Lord
-R:730:0x80:0xC8
-
-# Hell knight
-R:731:0x80:0xF0
-
-# Bull Gates
-R:732:0x80:0xF0
-
-# Santa Claus
-R:733:0x80:0xE8
-
-# Eihort, the Thing in the Labyrinth
-R:734:0x80:0xEA
-
-# The King in Yellow
-R:735:0x80:0xCC
-
-# Great unclean one
-R:736:0x80:0xD5
-
-# Lord of Chaos
-R:737:0x80:0xF0
-
-# Old Sorcerer
-R:738:0x80:0xF0
-
-# Hound of Tindalos
-R:739:0x80:0xDA
-
-# Lesser kraken
-R:740:0x80:0xFE
-
-# Great ice wyrm
-R:741:0x80:0xC4
-
-# Demilich
-R:742:0x80:0xCC
-
-# The Phoenix
-R:743:0x80:0xC2
-
-# Nightcrawler
-R:744:0x80:0xD7
-
-# Lord of Change
-R:745:0x80:0xC2
-
-# Keeper of Secrets
-R:746:0x80:0xC8
-
-# Shudde M'ell
-R:747:0x80:0xF7
-
-# Hand druj
-R:748:0x80:0xF3
-
-# Eye druj
-R:749:0x80:0xF3
-
-# Skull druj
-R:750:0x80:0xF3
-
-# Chaos vortex
-R:751:0x80:0xF6
-
-# Aether vortex
-R:752:0x80:0xF6
-
-# Nidhogg the Hel-Drake
-R:753:0x80:0xC4
-
-# The Lernean Hydra
-R:754:0x80:0xCD
-
-# Thuringwethil
-R:755:0x80:0xD6
-
-# Great hell wyrm
-R:756:0x80:0xC4
-
-# Hastur the Unspeakable
-R:757:0x80:0xC8
-
-# Bloodthirster
-R:758:0x80:0xD5
-
-# Draconic quylthulg
-R:759:0x80:0xD1
-
-# Nyogtha, the Thing that Should not Be
-R:760:0x80:0xEA
-
-# Ahtu, Avatar of Nyarlathotep
-R:761:0x80:0xA3
-
-# Fundin Bluecloak
-R:762:0x80:0xE8
-
-# The Philosophy Teacher
-R:763:0x80:0xF0
-
-# Uriel, Angel of Fire
-R:764:0x80:0xC1
-
-# Azriel, Angel of Death
-R:765:0x80:0xC1
-
-# Ancalagon the Black
-R:766:0x80:0xC4
-
-# Daoloth, the Render of the Veils
-R:767:0x80:0xD5
-
-# Nightwalker
-R:768:0x80:0xD7
-
-# Gabriel, the Messenger
-R:769:0x80:0xC1
-
-# Artsi the Champion of Chaos
-R:770:0x80:0xE8
-
-# Saruman of Many Colours
-R:771:0x80:0xF0
-
-# Harowen the Black Hand
-R:772:0x80:0xF0
-
-# The Physics Teacher
-R:773:0x80:0xF0
-
-# Shadowlord
-R:774:0x80:0xC7
-
-# Greater kraken
-R:775:0x80:0xFE
-
-# Archlich
-R:776:0x80:0xCC
-
-# The Cat Lord
-R:777:0x80:0xE6
-
-# Chaos beetle
-R:778:0x80:0xCB
-
-# Chaos hound
-R:779:0x80:0xDA
-
-# Vlad Dracula, Prince of Darkness
-R:780:0x80:0xD6
-
-# Ultimate beholder
-R:781:0x80:0xE5
-
-# Leviathan
-R:782:0x80:0xC4
-
-# Great Wyrm of Chaos
-R:783:0x80:0xC4
-
-# Great Wyrm of Law
-R:784:0x80:0xC4
-
-# Great Wyrm of Balance
-R:785:0x80:0xC4
-
-# Shambler
-R:786:0x80:0xC5
-
-# Hypnos, Lord of Sleep
-R:787:0x80:0xD0
-
-# Glaaki
-R:788:0x80:0xFE
-
-# T'ron, the rebel DragonRider
-R:789:0x80:0xC4
-
-# Great Wyrm of Many Colours
-R:790:0x80:0xC4
-
-# Mardra, rider of the Gold Loranth
-R:791:0x80:0xC4
-
-# Tselakus, the Dreadlord
-R:792:0x80:0xC7
-
-# Sky Drake
-R:793:0x80:0xC4
-
-# Eilinel the Entrapped
-R:794:0x80:0xF0
-
-# Tiamat, Celestial Dragon of Evil
-R:795:0x80:0xC4
-
-# The Norsa
-R:796:0x80:0xC8
-
-# Rhan-Tegoth
-R:797:0x80:0xD3
-
-# Black reaver
-R:798:0x80:0xCC
-
-# Troll High Priest
-R:799:0x80:0xD4
-
-# Master quylthulg
-R:800:0x80:0xD1
-
-# Greater draconic quylthulg
-R:801:0x80:0xD1
-
-# Greater rotting quylthulg
-R:802:0x80:0xD1
-
-# Null the Living Void
-R:803:0x80:0xAE
-
-# Vecna, the Emperor Lich
-R:804:0x80:0xCC
-
-# Omarax the Eye Tyrant
-R:805:0x80:0xE5
-
-# Tsathoggua, the Sleeper of N'kai
-R:806:0x80:0xF2
-
-# Greater Balrog
-R:807:0x80:0xD5
-
-# Ungoliant, the Unlight
-R:808:0x80:0xD3
-
-# Atlach-Nacha, the Spider God
-R:809:0x80:0xD3
-
-# Y'golonac
-R:810:0x80:0xC8
-
-# Aether hound
-R:811:0x80:0xDA
-
-# Warp demon
-R:812:0x80:0xD5
-
-# Serpent of Chaos
-R:813:0x80:0xCA
-
-# Yig, Father of Serpents
-R:814:0x80:0xD2
-
-# Unmaker
-R:815:0x80:0xC5
-
-# Cyberdemon
-R:816:0x80:0xD5
-
-# Hela, Queen of the Dead
-R:817:0x80:0xF0
-
-# The Mouth of Sauron
-R:818:0x80:0xF0
-
-# Klingsor, Evil Master of Magic
-R:819:0x80:0xF0
-
-# Lessa, rider of the Gold Ramoth
-R:820:0x80:0xC4
-
-# The Emperor Quylthulg
-R:821:0x80:0xD1
-
-# Qlzqqlzuup, the Lord of Flesh
-R:822:0x80:0xD1
-
-# Cthugha, the Living Flame
-R:823:0x80:0xC5
-
-# F'lar, rider of the Bronze Mnementh
-R:824:0x80:0xC4
-
-# Maeglin, Betrayer of Gondolin
-R:825:0x80:0xE8
-
-# Cyaegha
-R:826:0x80:0xE5
-
-# Pazuzu, Lord of Air
-R:827:0x80:0xC2
-
-# Ithaqua the Windwalker
-R:828:0x80:0xD9
-
-# Hell hound
-R:829:0x80:0xC3
-
-# Cantoras, the Skeletal Lord
-R:830:0x80:0xF3
-
-# Mephistopheles, Lord of Hell
-R:831:0x80:0xD5
-
-# Godzilla
-R:832:0x80:0xD2
-
-# Abhoth, Source of Uncleanness
-R:833:0x80:0xCA
-
-# Ymir the Ice Giant
-R:834:0x80:0xD0
-
-# Loki the Trickster
-R:835:0x80:0xD0
-
-# Star-spawn of Cthulhu
-R:836:0x80:0xD5
-
-# Surtur the Giant Fire Demon
-R:837:0x80:0xD0
-
-# The Tarrasque
-R:838:0x80:0xD2
-
-# Lungorthin, the Balrog of White Fire
-R:839:0x80:0xD5
-
-# Draugluin, Sire of All Werewolves
-R:840:0x80:0xC3
-
-# Shuma-Gorath
-R:841:0x80:0xE5
-
-# Tulzscha, the Green Flame
-R:842:0x80:0xC5
-
-# Oremorj the Cyberdemon Lord
-R:843:0x80:0xD5
-
-# Feagwath the Undead Sorceror
-R:844:0x80:0xCC
-
-# Yog-Sothoth, the All-in-One
-R:845:0x80:0xEA
-
-# Fenris Wolf
-R:846:0x80:0xC3
-
-# Great Wyrm of Power
-R:847:0x80:0xC4
-
-# Shub-Niggurath, Black Goat of the Woods
-R:848:0x80:0xD5
-
-# Nodens, Lord of the Great Abyss
-R:849:0x80:0xD0
-
-# Carcharoth, the Jaws of Thirst
-R:850:0x80:0xC3
-
-# Nyarlathotep, the Crawling Chaos
-R:851:0x80:0xD5
-
-# Azathoth, the Daemon Sultan
-R:852:0x80:0xC5
-
-# Cerberus, Guardian of Hades
-R:853:0x80:0xC3
-
-# Jormungand the Midgard Serpent
-R:854:0x80:0xCA
-
-# The Destroyer
-R:855:0x80:0xE7
-
-# Gothmog, the High Captain of Balrogs
-R:856:0x80:0xD5
-
-# Great Cthulhu
-R:857:0x80:0xD5
-
-# Sorka, rider of the Gold Faranth
-R:858:0x80:0xC4
-
-# The Unicorn of Order
-R:859:0x80:0xF1
-
-# Sauron, the Sorcerer
-R:860:0x80:0xF0
-
-# Dark God, the Mighty Coder of Hell
-R:861:0x80:0xD0
-
-# Morgoth, Lord of Darkness
-R:862:0x80:0xD0
-
-# Human Warrior
-R:863:0x81:0xB7
-
-# Elven Archer
-R:864:0x81:0xC0
-
-# Dwarven Warrior
-R:865:0x80:0xE8
-
-# Mountain Orc
-R:866:0x80:0xEF
-
-# The Philosophy Teacher
-R:867:0x80:0xD0
-
-# The Variant Maintainer
-R:868:0x80:0xF0
-
-# Random Number Generator
-R:869:0x80:0xC9
-
-# Rocket mine
-R:870:0x80:0xAE
-
-# Bouncing mine
-R:871:0x80:0xAE
-
-# Muar, the Balrog
-R:872:0x80:0xD5
-
-# The Icky Queen
-R:873:0x80:0xE9
-
-# Ratmold
-R:874:0x80:0xED
-
-# Death
-R:875:0x80:0xC7
-
-# Famine
-R:876:0x80:0xC7
-
-# Pestilence
-R:877:0x80:0xC7
-
-# War
-R:878:0x80:0xC7
-
-# Pike
-R:879:0x80:0xFE
-
-# Electric eel
-R:880:0x80:0xFE
-
-# Giant crayfish
-R:881:0x80:0xFE
-
-# Mermaid
-R:882:0x80:0xE8
-
-# Merman
-R:883:0x80:0xE8
-
-# Big Pirahna
-R:884:0x80:0xFE
-
-# Lizard man
-R:885:0x80:0xE8
-
-# Frogman
-R:886:0x80:0xE8
-
-# Frogman warrior
-R:887:0x80:0xE8
-
-# Frogman shaman
-R:888:0x80:0xE8
-
-# Small medusa
-R:889:0x80:0xD1
-
-# Sand mite
-R:890:0x80:0xFE
-
-# Octopus
-R:891:0x80:0xD1
-
-# Kraken
-R:892:0x80:0xD1
-
-# Aquatic beholder
-R:893:0x80:0xE5
-
-# Murk dweller
-R:894:0x80:0xD3
-
-# Drowned soul
-R:895:0x80:0xC7
-
-# Tiger shark
-R:896:0x80:0xFE
-
-# Hammerhead shark
-R:897:0x80:0xFE
-
-# Great white shark
-R:898:0x80:0xFE
-
-# Aquatic golem
-R:899:0x80:0xE7
-
-# Aquatic kobold
-R:900:0x80:0xEB
-
-# Elder kraken
-R:901:0x80:0xD1
-
-# Aquatic troll
-R:902:0x80:0xD4
-
-# Elder aquatic beholder
-R:903:0x80:0xE5
-
-# Abysmal elf
-R:904:0x80:0xE8
-
-# Abysmal elven warrior
-R:905:0x80:0xE8
-
-# Abysmal elven shaman
-R:906:0x80:0xE8
-
-# Stargazer
-R:907:0x80:0xFE
-
-# Elder stargazer
-R:908:0x80:0xFE
-
-# Flounder
-R:909:0x80:0xFE
-
-# Giant turtle
-R:910:0x80:0xD2
-
-# Baby abysmal dragon
-R:911:0x80:0xE4
-
-# Young abysmal dragon
-R:912:0x80:0xE4
-
-# Mature abysmal dragon
-R:913:0x80:0xE4
-
-# Ancient abysmal dragon
-R:914:0x80:0xC4
-
-# Dragon turtle
-R:915:0x80:0xD2
-
-# Undead stargazer
-R:916:0x80:0xFE
-
-# Killer whale
-R:917:0x80:0xFE
-
-# Undead killer whale
-R:918:0x80:0xC7
-
-# Aquatic naga
-R:919:0x80:0xEE
-
-# Devilfish
-R:920:0x80:0xFE
-
-# Undead devilfish
-R:921:0x80:0xFE
-
-# Devilfish beholder
-R:922:0x80:0xE5
-
-# Aquatic hound
-R:923:0x80:0xDA
-
-# Aquatic demon
-R:924:0x80:0xD5
-
-# Aquatic demonlord
-R:925:0x80:0xD5
-
-# Manta ray
-R:926:0x80:0xFE
-
-# Undead manta ray
-R:927:0x80:0xFE
-
-# Mathilde, the Science Student
-R:928:0x80:0xE8
-
-# Child spirit
-R:929:0x80:0xC7
-
-# Young spirit
-R:930:0x80:0xC7
-
-# Mature spirit
-R:931:0x80:0xC7
-
-# Experienced spirit
-R:932:0x80:0xC7
-
-# Wise spirit
-R:933:0x80:0xC7
-
-# Fangorn the Treebeard
-R:934:0x80:0xA3
-
-# Gandalf the Grey
-R:935:0x80:0xF0
-
-# Nar, the Dwarf
-R:936:0x80:0xE8
-
-# Black troll
-R:937:0x80:0xD4
-
-# Troll Clan Chief
-R:938:0x80:0xD4
-
-# Troll King
-R:939:0x80:0xD4
-
-# Blue Firelizard
-R:940:0x80:0xE4
-
-# Green Firelizard
-R:941:0x80:0xE4
-
-# Brown Firelizard
-R:942:0x80:0xE4
-
-# Bronze Firelizard
-R:943:0x80:0xE4
-
-# Gold Firelizard
-R:944:0x80:0xE4
-
-# High-elven ranger
-R:945:0x80:0xE8
-
-# Uvatha the Horseman
-R:946:0x80:0xD7
-
-# Adunaphel the Quiet
-R:947:0x80:0xD7
-
-# Akhorahil the Blind
-R:948:0x80:0xD7
-
-# Ren the Unclean
-R:949:0x80:0xD7
-
-# Ji Indur Dawndeath
-R:950:0x80:0xD7
-
-# Dwar, Dog Lord of Waw
-R:951:0x80:0xD7
-
-# Hoarmurath of Dir
-R:952:0x80:0xD7
-
-# Khamul the Easterling
-R:953:0x80:0xD7
-
-# Murazor, the Witch-King of Angmar
-R:954:0x80:0xD7
-
-# Green DragonRider
-R:955:0x80:0xC4
-
-# Blue DragonRider
-R:956:0x80:0xC4
-
-# Brown DragonRider
-R:957:0x80:0xC4
-
-# Bronze DragonRider
-R:958:0x80:0xC4
-
-# Gold DragonRider
-R:959:0x80:0xC4
-
-# Thread
-R:960:0x80:0xED
-
-# Gorlim, Betrayer of Barahir
-R:961:0x80:0xF0
-
-# The Blubbering idiot, agent of black market, Simon the weak
-R:962:0x80:0xF4
-
-# Aranea
-R:963:0x80:0xD3
-
-# Elder aranea
-R:964:0x80:0xD3
-
-# Greater Aranea
-R:965:0x80:0xD3
-
-# Dolphiner
-R:966:0x80:0xF0
-
-# XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-R:967:0x80:0xC0
-
-# XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-R:968:0x80:0xC0
-
-# XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-R:969:0x80:0xC0
-
-# XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-R:970:0x80:0xC0
-
-# XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-R:971:0x80:0xC0
-
-# XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-R:972:0x80:0xC0
-
-# XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-R:973:0x80:0xC0
-
-# XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-R:974:0x80:0xC0
-
-# XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-R:975:0x80:0xC0
-
-# XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-R:976:0x80:0xC0
-
-# XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-R:977:0x80:0xC0
-
-# Moldoux, the Defenceless Mold
-R:978:0x80:0xED
-
-# Ben Harrison
-R:979:0x80:0xF0
-
-# Ar-Pharazon the Golden
-R:980:0x80:0xF0
-
-# Doppleganger
-R:981:0x80:0xC0
-
-# Marylene, Heartbreakeress of the Netherworld
-R:982:0x80:0xD0
-
-# The Greater Lag Monster
-R:983:0x80:0xD5
-
-# Khim, Son of Mim
-R:984:0x80:0xE8
-
-# Bullroarer the Hobbit
-R:985:0x80:0xE8
-
-# 3-headed hydra
-R:986:0x80:0xCD
-
-# Uldor the Accursed
-R:987:0x80:0xF0
-
-# Mystic
-R:988:0x80:0xF0
-
-# Invisible stalker
-R:989:0x80:0xC5
-
-# Ulfang the Black
-R:990:0x80:0xF0
-
-# Demonologist
-R:991:0x80:0xF0
-
-# Hezrou
-R:992:0x80:0xD5
-
-# Glabrezu
-R:993:0x80:0xD5
-
-# Nalfeshnee
-R:994:0x80:0xD5
-
-# Marilith
-R:995:0x80:0xD5
-
-# Lesser Balrog
-R:996:0x80:0xD5
-
-# Master mystic
-R:997:0x80:0xF0
-
-# Grand master mystic
-R:998:0x80:0xF0
-
-# Erinyes
-R:999:0x80:0xD5
-
-# Medusa, the Gorgon
-R:1000:0x80:0xEE
-
-# Vrock
-R:1001:0x80:0xD5
-
-# Solar
-R:1002:0x80:0xC1
-
-# Ethereal hound
-R:1003:0x80:0xDA
-
-# Dreadlord
-R:1004:0x80:0xC7
-
-# Redweed
-R:1005:0x81:0xB0
-
-# The Rat King
-R:1006:0x80:0xF2
-
-# Vort the Kobold Queen
-R:1007:0x80:0xEB
-
-# Giant cockroach
-R:1008:0x80:0xC9
-
-# Fire Phantom
-R:1009:0x80:0xC7
-
-# The Insane Player
-R:1010:0x80:0xF0
-
-# Glaryssa, Succubus Queen
-R:1011:0x80:0xD5
-
-# Vermicious Knid
-R:1012:0x80:0xCF
-
-# Bone golem
-R:1013:0x80:0xE7
-
-# Snake of Yig
-R:1014:0x80:0xCA
-
-# Wild Man
-R:1015:0x80:0xE8
-
-# Dimensional shambler
-R:1016:0x80:0xE8
-
-# Cultist
-R:1017:0x80:0xF0
-
-# Cult leader
-R:1018:0x80:0xF0
-
-# Servitor of the outer gods
-R:1019:0x80:0xD5
-
-# Avatar of Nyarlathotep
-R:1020:0x80:0xF0
-
-# Fthagghua, Lord of the fire vampires
-R:1021:0x80:0xD5
-
-# Hypnos
-R:1022:0x80:0xF0
-
-# Blue Dragon Worm
-R:1023:0x80:0xF7
-
-# White Dragon Worm
-R:1024:0x80:0xF7
-
-# Red Dragon Worm
-R:1025:0x80:0xF7
-
-# Black Dragon Worm
-R:1026:0x80:0xF7
-
-# Green Dragon Worm
-R:1027:0x80:0xF7
-
-# Multi-hued Dragon Worm
-R:1028:0x80:0xF7
-
-# The Baby Minotaur
-R:1029:0x80:0xC8
-
-# The Sandworm Queen
-R:1030:0x80:0xF7
-
-# Sandworm
-R:1031:0x80:0xF7
-
-# Nobody, the Undefined Ghost
-R:1032:0x80:0xC7
-
-
-
-
-
diff --git a/lib/mods/theme/pref/graf-mac.prf b/lib/mods/theme/pref/graf-mac.prf
deleted file mode 100644
index 7bb84141..00000000
--- a/lib/mods/theme/pref/graf-mac.prf
+++ /dev/null
@@ -1,15 +0,0 @@
-# File: graf-mac.prf
-
-#
-# This file defines special attr/char mappings for use in "graphics" mode
-#
-# See "lib/help/command.txt" and "src/files.c" for more information.
-#
-
-# Standard file
-?:[EQU $GRAF old]
-%:graf-xxx.prf
-
-# New tiles
-?:[EQU $GRAF new]
-%:graf-new.prf
diff --git a/lib/mods/theme/pref/graf-new.prf b/lib/mods/theme/pref/graf-new.prf
deleted file mode 100644
index 2fb1b215..00000000
--- a/lib/mods/theme/pref/graf-new.prf
+++ /dev/null
@@ -1,6934 +0,0 @@
-# PRF file generated by Andreas Koch`s Tile Assigner
-# at 03.12.02 , 17:18:08 by Ja with version 1.7c
-
-# 2460 items 
-# 2312 probably mapped correctly
-# 147 imported but not yet defined
-# 1 defined to value(s) lower than 0x80
-# Old header :
-# File: graf-new.prf
-#
-# This file defines special attr/char mappings for use in "graphics" mode
-# with Adam Bolt's 16x16 tiles.
-#
-# By Robert Ruehlmann < rr9@angband.org >
-#
-# See "lib/help/command.txt" and "src/files.c" for more information.
-#
-
-# General Store
-B:0:0x82/0x87
-
-# Armoury
-B:1:0x82/0x88
-
-# Weaponsmith
-B:2:0x82/0x89
-
-# Temple
-B:3:0x82/0x8A
-
-# Alchemy shop
-B:4:0x82/0x8B
-
-# Magic shop
-B:5:0x82/0x8C
-
-# Black Market
-B:6:0x82/0x8D
-
-# Home
-B:7:0x82/0x8E
-
-# Book Store
-B:8:0x82/0x8F
-
-# Pet Shop
-B:9:0x82/0x90
-
-# Mayor's Office
-B:10:0x86/0xA0
-
-# Inn
-B:11:0x86/0xA1
-
-# The Soothsayer
-B:12:0x86/0xA2
-
-# Library
-B:13:0x86/0xA3
-
-# Castle
-B:14:0x86/0xA4
-
-# Casino
-B:15:0x86/0xA5
-
-# Beastmaster Shanty
-B:16:0x86/0xA6
-
-# Fighters Hall
-B:17:0x86/0xA7
-
-# Tower of Magery
-B:18:0x86/0xA8
-
-# Inner Temple
-B:19:0x86/0xA9
-
-# Paladins Guild
-B:20:0x86/0xAA
-
-# Rangers Guild
-B:21:0x86/0xAB
-
-# Thunderlords' Hide
-B:22:0x86/0xAC
-
-# The Mirror
-B:23:0x86/0xAD
-
-# Seat of Ruling
-B:24:0x86/0xAE
-
-# Wizards Spire
-B:25:0x86/0xAF
-
-# Priests Circle
-B:26:0x86/0xB0
-
-# Tower of the King
-B:27:0x86/0xB1
-
-# Library
-B:28:0x86/0xA3
-
-# The White Tree
-B:29:0x86/0xB2
-
-# Craftsmaster
-B:30:0x86/0xB3
-
-# Earth-Dome (Nature)
-B:31:0x86/0xB4
-
-# Minstrels Haven
-B:32:0x86/0xB5
-
-# Star-Dome
-B:33:0x86/0xB6
-
-# Valarin Temple
-B:34:0x86/0xB7
-
-# Sea-Dome
-B:35:0x86/0xB8
-
-# The Golden Flower
-B:36:0x86/0xB9
-
-# The Fountain
-B:37:0x86/0xBA
-
-# Axe Smith
-B:38:0x86/0xBB
-
-# Hafted Smith
-B:39:0x86/0xBC
-
-# Polearm Smith
-B:40:0x86/0xBD
-
-# Sword Smith
-B:41:0x86/0xBE
-
-# Rare Jewelry Shop
-B:42:0x86/0xBF
-
-# Jewelry Shop
-B:43:0x87/0xA0
-
-# Footwear Shop
-B:44:0x87/0xA1
-
-# Rare Footwear Shop
-B:45:0x87/0xA2
-
-# Library
-B:46:0x86/0xA3
-
-# Forbidden Library
-B:47:0x87/0xA3
-
-# Expensive Black Market
-B:48:0x87/0xA4
-
-# Common Shop
-B:49:0x87/0xA5
-
-# Dragon Hunter
-B:50:0x87/0xA6
-
-# Speed Ring Market
-B:51:0x87/0xA7
-
-# Scribe
-B:52:0x87/0xA8
-
-# Potion Store
-B:53:0x87/0xA9
-
-# Recaller
-B:54:0x87/0xAA
-
-# Master Archer
-B:55:0x87/0xAB
-
-# Merchants Guild
-B:56:0x87/0xAC
-
-# The Mathom-house
-B:57:0x87/0xAD
-
-# The Prancing Pony
-B:58:0x86/0xA1
-
-# Mining Supply store
-B:59:0x86/0xB3
-
-# Library quest in Minas Anor
-B:60:0x86/0xA3
-
-# Hunting Supply Store
-B:61:0x87/0xAB
-
-# Runic Magic Shop
-B:62:0x82/0x8C
-
-# Construction Supply Store
-B:63:0x86/0xB3
-
-# Music Store
-B:64:0x86/0xB5
-
-# Magic Rod Market
-B:65:0x82/0x8C
-
-# Map store
-B:66:0x86/0xA3
-
-# Farm
-B:67:0x87/0xA5
-
-#Pelargir inn - The Grey Swan
-B:68:0x86/0xA1
-
-#Caras Galadhon inn - The Garden
-B:69:0x86/0xA1
-
-#Khazad Dum inn - The Mithril Lode
-B:70:0x86/0xA1
-
-#Dale inn - The Builder Barracks
-B:71:0x86/0xA1
-
-#Edoras inn - The Horse and Ox
-B:72:0x86/0xA1
-
-#Esgaroth inn - The Dancing Dragon
-B:73:0x86/0xA1
-
-#Hobbiton inn - The Green Dragon
-B:74:0x86/0xA1
-
-#Osgiliath inn - The Twinkling Star
-B:75:0x86/0xA1
-
-#The House of Beorn
-B:76:0x86/0xA0
-
-#Bard's Hut
-B:77:0x86/0xA0
-
-#The Ranger Conclave
-B:78:0x86/0xA0
-
-#Imladris
-B:79:0x86/0xA0
-
-#The Hornburg
-B:80:0x86/0xA0
-
-#Thranduil's Hall
-B:81:0x86/0xA0
-
-#Meduseld
-B:82:0x86/0xA0
-
-#The Master's House
-B:83:0x86/0xA0
-
-#Bag End
-B:84:0x86/0xA0
-
-#The Castle of Stars
-B:85:0x86/0xA0
-
-#The Prince's Tower
-B:86:0x86/0xA0
-
-#The Seat of Durin
-B:87:0x86/0xA0
-
-### The forge in Imladris
-B:88:0x86/0xB3
-
-# nothing
-F:0:0x80/0x80
-
-# open floor
-F:1:0x80/0x81
-
-# fountain
-F:2:0xC3/0x9A
-
-# glyph of warding
-F:3:0x8D/0x95
-
-# open door
-F:4:0x82/0x84
-
-# broken door
-F:5:0x82/0x85
-
-# up staircase
-F:6:0x80/0x96
-
-# down staircase
-F:7:0x80/0x99
-
-# quest entrance
-F:8:0x80/0x9A
-
-# quest exit
-F:9:0x80/0x97
-
-# quest down level
-F:10:0x80/0x9B
-
-# quest up level
-F:11:0x80/0x98
-
-# town exit
-F:12:0x82/0x84
-
-# shaft down
-F:13:0xC3/0x84
-
-# shaft up
-F:14:0xC3/0x85
-
-# fountain
-F:15:0xC3/0x99
-
-# web
-F:16:0x81/0x8C
-
-# trap
-F:17:0x81/0x89
-
-# visible trap -- spiked pit
-F:18:0x81/0x89
-
-# visible trap -- poison pit
-F:19:0x81/0x89
-
-# visible trap -- rune -- summon
-F:20:0x81/0x8F
-
-# visible trap -- rune -- teleport
-F:21:0x81/0x92
-
-# visible trap -- spot -- fire
-F:22:0x81/0x86
-
-# visible trap -- spot -- acid
-F:23:0x81/0x86
-
-# visible trap -- dart -- slow
-F:24:0x81/0x80
-
-# visible trap -- dart -- lose str
-F:25:0x81/0x80
-
-# visible trap -- dart -- lose dex
-F:26:0x81/0x80
-
-# visible trap -- dart -- lose con
-F:27:0x81/0x80
-
-# visible trap -- gas -- blind
-F:28:0x81/0x83
-
-# visible trap -- gas -- confuse
-F:29:0x81/0x83
-
-# visible trap -- gas -- poison
-F:30:0x81/0x83
-
-# visible trap -- gas -- sleep
-F:31:0x81/0x83
-
-# door
-F:32:0x82/0x83
-
-# locked door
-F:33:0x82/0x83
-F:34:0x82/0x83
-F:35:0x82/0x83
-F:36:0x82/0x83
-F:37:0x82/0x83
-F:38:0x82/0x86
-F:39:0x82/0x86
-
-# jammed door
-F:40:0x82/0x83
-F:41:0x82/0x83
-F:42:0x82/0x83
-F:43:0x82/0x83
-F:44:0x82/0x83
-F:45:0x82/0x86
-F:46:0x82/0x86
-F:47:0x82/0x86
-
-# secret door
-F:48:0x80/0x84
-
-# pile of rubble
-F:49:0x80/0x9C
-
-# magma vein
-F:50:0x80/0x8D
-
-# quartz vein
-F:51:0x80/0x87
-
-# magma vein
-F:52:0x80/0x90
-
-# quartz vein
-F:53:0x80/0x87
-
-# magma vein with treasure
-F:54:0x80/0x90
-
-# quartz vein with treasure
-F:55:0x80/0x8A
-
-# granite wall
-F:56:0x80/0x84
-F:57:0x80/0x84
-F:58:0x80/0x84
-F:59:0x80/0x84
-
-# permanent wall
-F:60:0x80/0x93
-F:61:0x80/0x93
-F:62:0x80/0x93
-F:63:0x80/0x93
-
-# explosive rune
-F:64:0x8D/0x9E
-
-# Straight Road startpoint
-F:65:0x81/0x95
-
-# section of the Straight Road
-F:66:0x81/0x95
-F:67:0x81/0x95
-F:68:0x81/0x95
-F:69:0x81/0x95
-F:70:0x81/0x95
-
-# section of the Straight Road (discharged)
-F:71:0x81/0x98
-
-# Straight Road exit
-F:72:0x81/0x9B
-
-# corrupted section of the Straight Road
-F:73:0x81/0x9E
-
-# Building
-F:74:0x82/0x93
-
-# permanent wall
-F:75:0x82/0x93
-F:76:0x82/0x94
-F:77:0x82/0x95
-F:78:0x82/0x96
-
-#Elanor
-F:79:0xC6:0xA0
-
-#Fumellar
-F:80:0xC6:0xA1
-
-#Anemones
-F:81:0xC6:0xA2
-
-#Niphredil
-F:82:0xC6:0xA3
-
-#Iris
-F:83:0xC6:0xA4
-
-# stream of shallow water
-F:84:0xB4/0x97
-
-# pool of deep lava
-F:85:0x83/0x8D
-
-# stream of shallow lava
-F:86:0xB4/0x9A
-
-# dark pit
-F:87:0x80/0x80
-
-# dirt
-F:88:0xB4/0x91
-
-# patch of grass
-F:89:0xB4/0x94
-
-# ice
-F:90:0xC3/0x83
-
-# sand
-F:91:0xC3/0x88
-
-# dead tree
-F:92:0xC3/0x98
-
-# ash
-F:93:0xC3/0x97
-
-# mud
-F:94:0xC3/0x96
-
-# ice wall
-F:95:0xC5/0x92
-
-# tree
-F:96:0x82/0x9A
-
-# mountain chain
-F:97:0x8D/0x98
-
-# sandwall
-F:98:0xC3/0x86
-F:99:0xC3/0x86
-
-# sandwall with treasure
-F:100:0xC3/0x87
-
-# high mountain chain
-F:101:0xC3/0x9E
-
-# nether mist
-F:102:0xC3/0x9F
-
-# molten glass wall
-F:103:0xC0/0x9F
-
-# Void Jumpgate
-F:160:0x91/0x84
-
-# Altar of Being
-F:161:0xC1/0x8E
-
-# Altar of Winds
-F:162:0xB5/0x8A
-
-# Altar of Force
-F:163:0xB5/0x86
-
-# Altar of Darkness
-F:164:0xB5/0x86
-
-# Altar of Nature
-F:165:0xB5/0x91
-
-# Altar of Sun
-F:166:0xB5/0x8F
-
-# Altar of Rage
-F:167:0xB5/0x8C
-
-# Altar of Winds
-F:168:0xB5/0x92
-
-# Altar of Stars
-F:169:0xC1/0x8F
-
-# Altar of Being
-F:170:0xB5/0x8D
-
-# Altar of Randomness
-F:171:0xB5/0x88
-
-# floor
-F:172:0x80/0x81
-
-# Underground Tunnel
-F:173:0x80/0x82
-
-# stream of tainted water
-F:174:0xAF/0x8E
-
-# monster trap
-F:175:0x81/0x9C
-
-# Void Jumpgate
-F:176:0xAF/0x8C
-
-# lava wall
-F:177:0xC6/0x8C
-
-# Great Fire
-F:178:0xC6/0x8A
-
-# path to the next area
-F:179:0x88/0xA1
-
-# path to the previous area
-F:180:0x88/0xA0
-
-# field
-F:181:0x88/0xA2
-
-# Ekkaia, the Encircling Sea
-F:182:0x88/0xA3
-
-# Altar of Energy
-F:183:0xB5/0x9A
-
-# Altar of Matter
-F:184:0xB5/0x9B
-
-# Altar of Being
-F:185:0xB5/0x9C
-
-# Altar of Unbeing
-F:186:0xB5/0x9D
-
-# pool of deep water
-F:187:0x83/0x80
-
-# glass wall
-F:188:0xC0/0x9F
-
-# illusion wall
-F:189:0x80/0x84
-
-# Grass roof
-F:190:0xC2/0x80
-
-# grass roof top
-F:191:0xC2/0x81
-
-# grass roof chimney
-F:192:0xC2/0x82
-
-# brick roof
-F:193:0xC3/0x80
-
-# brick roof top
-F:194:0xC3/0x81
-
-# brick roof chimney
-F:195:0xC3/0x82
-
-# window
-F:196:0xC2/0x83
-
-# small window
-F:197:0xC2/0x84
-
-# rain barrel
-F:198:0xC2/0x85
-
-# grass with flowers
-F:199:0xC2/0x86
-
-# cobblestone road
-F:200:0xC2/0x87
-
-# cobblestone with outlet
-F:201:0xC2/0x88
-
-# small tree
-F:202:0x82/0x9D
-
-# town
-F:203:0xC3/0x95
-
-# Underground Tunnel
-F:204:0x80/0x82
-
-# a blazing fire
-F:205:0xC6/0x8A
-
-# pile of rubble
-F:206:0xC6/0x8B
-
-# rocky ground
-F:207:0x8D/0xA0
-
-# cloud-like vapour
-F:208:0x8D/0xA1
-
-# condensing water
-F:209:0x8D/0xA2
-
-# dense mist
-F:210:0x8D/0xA3
-
-# hail-stone wall
-F:211:0x8D/0xA4
-
-# dead small tree
-F:212:0xC6:0xA5
-
-# low hill
-F:213:0xC6:0xA6
-
-# dark mountain chain
-F:214:0xC6:0xA7
-
-# blue mountain chain
-F:215:0xC6:0xA8
-
-# grey mountain chain
-F:216:0xC6:0xA9
-
-# part of Mount Doom
-F:217:0xC6:0xAA
-
-# snow-capped peak
-F:218:0xC3:0x9E
-
-# fir tree
-F:219:0xC6:0xAB
-
-# section of a flet
-F:220:0xC6:0xAC
-
-# light post
-F:221:0xC6:0xAD
-
-# water lily
-F:222:0xC6:0xAE
-
-# part of the Dead Marshes
-F:223:0xC6:0xAF
-
-# Black Gate
-F:224:0xC6:0xB0
-
-# river
-F:225:0xC6:0xB1
-
-# swamp pool
-F:226:0xC6:0xB2
-
-# stream of the Anduin river
-F:227:0xC6:0xB3
-
-# road sign that says 'Hurry to Gondolin!'
-F:228:0xC6:0xB4
-
-# beehive
-F:229:0xC6:0xB5
-
-# dirt road
-F:230:0xC6:0xB6
-
-# wide gate
-F:231:0xC6:0xB7
-
-# open gate
-F:232:0xC6:0xB8
-
-# wooden board
-F:233:0xC6:0xB9
-
-# wooden board
-F:234:0xC6:0xBA
-
-# wooden board
-F:235:0xC6:0xBB
-
-# wooden board
-F:236:0xC6:0xBC
-
-# white tree
-F:237:0xC6:0xBD
-
-# swift waterfall
-F:238:0xC6:0xBE
-
-# slippery rock ledge
-F:239:0xC5:0xA0
-
-# stable
-F:240:0xC5:0xA1
-
-# wooden plank
-F:241:0xC5:0xA2
-
-# fosse pit
-F:242:0xC5:0xA3
-
-# Mallorn
-F:243:0xC5:0xA4
-
-# copper pillar
-F:244:0xC5:0xBC
-
-# ethereal wall
-F:245:0x80/0x81
-
-# glacial wall
-F:246:0xC5/0x92
-
-# battlement
-F:247:0xC5:0xBD
-
-# dark pit
-F:248:0x82/0x84
-
-# Skeleton
-G:M:1:0xC6/0x91
-
-# Zombie
-G:M:2:0xC6/0x92
-
-# Lich
-G:M:3:0xC6/0x93
-
-# Spectral
-G:M:4:0xC6/0x94
-
-# Captain
-G:M:5:0xC6/0x95
-
-# Chieftain
-G:M:6:0xC6/0x96
-
-# Shaman
-G:M:7:0xC6/0x97
-
-# Priest
-G:M:8:0xC6/0x98
-
-# Mage
-G:M:9:0xC6/0x99
-
-# Archer
-G:M:10:0xC6/0x9A
-
-# Rogue
-G:M:11:0xC6/0x9B
-
-# Inertia Ball Trap
-G:T:95:0x82/0xBF
-
-# something
-K:0:0x01:0x20
-
-# Blindness
-K:1:0x85:0x94
-
-# Fear
-K:2:0x85:0x94
-
-# Confusion
-K:3:0x85:0x94
-
-# Hallucination
-K:4:0x85:0x94
-
-# Cure Poison
-K:5:0x85:0x94
-
-# Cure Blindness
-K:6:0x85:0x94
-
-# Cure Fear
-K:7:0xC6:0x83
-
-# Cure Confusion
-K:8:0x85:0x94
-
-# Weakness
-K:9:0x85:0x94
-
-# Unhealth
-K:10:0x85:0x94
-
-# Restore Constitution
-K:11:0x85:0x94
-
-# Restoring
-K:12:0x85:0x94
-
-# Stupidity
-K:13:0x85:0x94
-
-# Naivety
-K:14:0x85:0x94
-
-# Poison
-K:15:0x85:0x94
-
-# Sickness
-K:16:0x85:0x94
-
-# Paralysis
-K:17:0x85:0x94
-
-# Restore Strength
-K:18:0x85:0x94
-
-# Disease
-K:19:0x85:0x94
-
-# Cure Serious Wounds
-K:20:0x85:0x94
-
-# & Ration~ of Cram
-K:21:0x8E:0x84
-
-# & Round Seed-Cake~
-K:22:0x8E:0x82
-
-# & Strip~ of Venison
-K:23:0x8E:0x83
-
-# & Slime Mold~
-K:24:0x8E:0x85
-
-# & Lembas~
-K:25:0x8E:0x86
-
-# & Pint~ of Fine Ale
-K:26:0x8E:0x80
-
-# & Pint~ of Old Winyards
-K:27:0x8E:0x80
-
-# & Mattock~
-K:28:0xB6:0x8C
-
-# & Blue Stone~
-K:29:0xC5:0x93
-
-# & Broken Dagger~
-K:30:0x8A:0x8D
-
-# & Bastard Sword~
-K:31:0x8A:0x8E
-
-# & Scimitar~
-K:32:0x8A:0x97
-
-# & Tulwar~
-K:33:0x8A:0x95
-
-# & Broad Sword~
-K:34:0x8A:0x98
-
-# & Short Sword~
-K:35:0x8A:0x94
-
-# & Blade~ of Chaos
-K:36:0x8A:0x9E
-
-# & Two-Handed Sword~
-K:37:0x8A:0x9C
-
-# & Main Gauche~
-K:38:0x8A:0x90
-
-# & Cutlass~
-K:39:0x8A:0x96
-
-# & Executioner's Sword~
-K:40:0x8A:0x9D
-
-# & Katana~
-K:41:0x8A:0x9B
-
-# & Long Sword~
-K:42:0x8A:0x99
-
-# & Dagger~
-K:43:0x8A:0x8F
-
-# & Rapier~
-K:44:0x8A:0x91
-
-# & Sabre~
-K:45:0x8A:0x93
-
-# & Small Sword~
-K:46:0x8A:0x92
-
-# & Broken Sword~
-K:47:0x8A:0x8E
-
-# & Ball-and-Chain~
-K:48:0x8B:0x86
-
-# & Whip~
-K:49:0x8A:0x9F
-
-# & Flail~
-K:50:0x8B:0x83
-
-# & Two-Handed Flail~
-K:51:0x8B:0x87
-
-# & Morning Star~
-K:52:0x8B:0x84
-
-# & Mace~
-K:53:0x8B:0x81
-
-# & Quarterstaff~
-K:54:0x8B:0x82
-
-# & War Hammer~
-K:55:0x8B:0x80
-
-# & Lead-Filled Mace~
-K:56:0x8B:0x85
-
-# & Mace~ of Disruption
-K:57:0x8B:0x88
-
-# & Lucerne Hammer~
-K:58:0x8B:0x8D
-
-# & Beaked Axe~
-K:59:0x8B:0x90
-
-# & Glaive~
-K:60:0x8B:0x92
-
-# & Halberd~
-K:61:0x8B:0x93
-
-# & Awl-Pike~
-K:62:0x8B:0x8B
-
-# & Pike~
-K:63:0x8B:0x8F
-
-# & Spear~
-K:64:0x8B:0x89
-
-# & Trident~
-K:65:0x8B:0x8A
-
-# & Lance~
-K:66:0x8B:0x8C
-
-# & Great Axe~
-K:67:0x8B:0x95
-
-# & Battle Axe~
-K:68:0x8B:0x8E
-
-# & Lochaber Axe~
-K:69:0x8B:0x94
-
-# & Broad Axe~
-K:70:0x8B:0x91
-
-# & Scythe~
-K:71:0x8B:0x96
-
-# & Scythe~ of Slicing
-K:72:0x8B:0x97
-
-# & Short Bow~
-K:73:0x8B:0x98
-
-# & Long Bow~
-K:74:0x8B:0x99
-
-# & Light Crossbow~
-K:75:0x8B:0x9A
-
-# & Heavy Crossbow~
-K:76:0x8B:0x9B
-
-# & Sling~
-K:77:0x8B:0x9C
-
-# & Arrow~
-K:78:0x8C:0x80
-
-# & Seeker Arrow~
-K:79:0x8C:0x81
-
-# & Bolt~
-K:80:0x8C:0x82
-
-# & Seeker Bolt~
-K:81:0x8C:0x83
-
-# & Rounded Pebble~
-K:82:0x8C:0x84
-
-# & Iron Shot~
-K:83:0x8C:0x85
-
-# & Shovel~
-K:84:0x8E:0x8F
-
-# & Gnomish Shovel~
-K:85:0x8E:0x90
-
-# & Dwarven Shovel~
-K:86:0x8E:0x91
-
-# & Pick~
-K:87:0x8E:0x8C
-
-# & Orcish Pick~
-K:88:0x8E:0x8D
-
-# & Dwarven Pick~
-K:89:0x8E:0x91
-
-# & Elven Cloak~
-K:90:0x89:0x8A
-
-# & Pair~ of Soft Leather Boots
-K:91:0x88:0x8E
-
-# & Pair~ of Hard Leather Boots
-K:92:0x88:0x8F
-
-# & Pair~ of Metal Shod Boots
-K:93:0x88:0x90
-
-# & Hard Leather Cap~
-K:94:0x87:0x98
-
-# & Metal Cap~
-K:95:0x87:0x99
-
-# & Iron Helm~
-K:96:0x87:0x9A
-
-# & Steel Helm~
-K:97:0x87:0x9B
-
-# & Iron Crown~
-K:98:0x87:0x9C
-
-# & Golden Crown~
-K:99:0x87:0x9D
-
-# & Jewel-Encrusted Crown~
-K:100:0x87:0x9E
-
-# & Robe~
-K:101:0x89:0x8C
-
-# & Filthy Rag~
-K:102:0x89:0x8B
-
-# Soft Leather Armour~
-K:103:0x89:0x8D
-
-# Soft Studded Leather~
-K:104:0x89:0x8E
-
-# Hard Leather Armour~
-K:105:0x89:0x8F
-
-# Hard Studded Leather~
-K:106:0x89:0x90
-
-# Leather Scale Mail~
-K:107:0x89:0x91
-
-# Metal Scale Mail~
-K:108:0x89:0x92
-
-# Chain Mail~
-K:109:0x89:0x94
-
-# Rusty Chain Mail~
-K:110:0x89:0x93
-
-# Augmented Chain Mail~
-K:111:0x89:0x96
-
-# Bar Chain Mail~
-K:112:0x89:0x97
-
-# Metal Brigandine Armour~
-K:113:0x89:0x98
-
-# Partial Plate Armour~
-K:114:0x89:0x99
-
-# Metal Lamellar Armour~
-K:115:0x89:0x9A
-
-# Full Plate Armour~
-K:116:0x89:0x9B
-
-# Ribbed Plate Armour~
-K:117:0x89:0x9C
-
-# Galvorn Plate Mail~
-K:118:0x89:0x9F
-
-# Mithril Plate Mail~
-K:119:0x89:0x9E
-
-# Mithril Chain Mail~
-K:120:0x89:0x9D
-
-# Double Chain Mail~
-K:121:0x89:0x95
-
-# & Shield~ of Deflection
-K:122:0x88:0x98
-
-# & Cloak~
-K:123:0x89:0x88
-
-# & Shadow Cloak~
-K:124:0x89:0x89
-
-# & Set~ of Leather Gloves
-K:125:0x88:0x91
-
-# & Set~ of Gauntlets
-K:126:0x88:0x92
-
-# & Set~ of Cesti
-K:127:0x88:0x93
-
-# & Small Leather Shield~
-K:128:0x88:0x94
-
-# & Large Leather Shield~
-K:129:0x88:0x95
-
-# & Small Metal Shield~
-K:130:0x88:0x96
-
-# & Large Metal Shield~
-K:131:0x88:0x97
-
-# Strength
-K:132:0x84:0x81
-
-# Dexterity
-K:133:0x84:0x83
-
-# Constitution
-K:134:0x84:0x83
-
-# Intelligence
-K:135:0x84:0x83
-
-# Speed
-K:136:0x84:0x83
-
-# Searching
-K:137:0x84:0x83
-
-# Teleportation
-K:138:0x84:0x83
-
-# Slow Digestion
-K:139:0x84:0x83
-
-# Fire Resistance
-K:140:0x84:0x83
-
-# Cold Resistance
-K:141:0x84:0x83
-
-# Levitation
-K:142:0x84:0x83
-
-# Poison Resistance
-K:143:0x84:0x83
-
-# Free Action
-K:144:0x84:0x83
-
-# Weakness
-K:145:0x84:0x83
-
-# Flames
-K:146:0x84:0x83
-
-# Acid
-K:147:0x84:0x83
-
-# Ice
-K:148:0x84:0x83
-
-# Woe
-K:149:0x84:0x83
-
-# Stupidity
-K:150:0x84:0x83
-
-# Damage
-K:151:0x84:0x83
-
-# Accuracy
-K:152:0x84:0x83
-
-# Protection
-K:153:0x84:0x83
-
-# Aggravate Monster
-K:154:0x84:0x83
-
-# See Invisible
-K:155:0x84:0x83
-
-# Sustain Strength
-K:156:0x84:0x83
-
-# Sustain Intelligence
-K:157:0x84:0x83
-
-# Sustain Wisdom
-K:158:0x84:0x83
-
-# Sustain Constitution
-K:159:0x84:0x83
-
-# Sustain Dexterity
-K:160:0x84:0x83
-
-# Sustain Charisma
-K:161:0x84:0x83
-
-# Slaying
-K:162:0x84:0x83
-
-# Brilliance
-K:163:0x87:0x83
-
-# Charisma
-K:164:0x87:0x83
-
-# Searching
-K:165:0x87:0x83
-
-# Teleportation
-K:166:0x87:0x83
-
-# Slow Digestion
-K:167:0x87:0x83
-
-# Acid Resistance
-K:168:0x87:0x83
-
-# Protection from Evil
-K:169:0x87:0x83
-
-# Double Ring Mail~
-K:170:0x89:0x9B
-
-# the Magi
-K:171:0x87:0x83
-
-# Doom
-K:172:0x87:0x83
-
-# Enchant Weapon To-Hit
-K:173:0x83:0x9C
-
-# Enchant Weapon To-Dam
-K:174:0x83:0x9C
-
-# Enchant Armor
-K:175:0x83:0x9C
-
-# Identify
-K:176:0x83:0x9C
-
-# *Identify*
-K:177:0x83:0x9C
-
-# Rumour
-K:178:0x83:0x9C
-
-# Chaos
-K:179:0x83:0x9C
-
-# Remove Curse
-K:180:0x83:0x9C
-
-# Light
-K:181:0x83:0x9C
-
-# Fire
-K:182:0x83:0x9C
-
-# Ice
-K:183:0x83:0x9C
-
-# Summon Monsters
-K:184:0x83:0x9C
-
-# Phase Door
-K:185:0x83:0x9C
-
-# Teleportation
-K:186:0x83:0x9C
-
-# Teleport Level
-K:187:0x83:0x9C
-
-# Monster Confusion
-K:188:0x83:0x9C
-
-# Magic Mapping
-K:189:0x83:0x9C
-
-# Rune of Protection
-K:190:0x83:0x9C
-
-# *Remove Curse*
-K:191:0x83:0x9C
-
-# Treasure Detection
-K:192:0x83:0x9C
-
-# Object Detection
-K:193:0x83:0x9C
-
-# Trap Detection
-K:194:0x83:0x9C
-
-# & Sheaf Arrow~
-K:195:0x8C:0x81
-
-# & Mithril Shot~
-K:196:0x8C:0x85
-
-# Door/Stair Location
-K:197:0x83:0x9C
-
-# Acquirement
-K:198:0x83:0x9C
-
-# *Acquirement*
-K:199:0x83:0x9C
-
-# Mass Genocide
-K:200:0x83:0x9C
-
-# Detect Invisible
-K:201:0x83:0x9C
-
-# Aggravation
-K:202:0x83:0x9C
-
-# Trap Creation
-K:203:0x83:0x9C
-
-# Trap/Door Destruction
-K:204:0x83:0x9C
-
-# Artifact Creation
-K:205:0x83:0x9C
-
-# Recharging
-K:206:0x83:0x9C
-
-# Genocide
-K:207:0x83:0x9C
-
-# Darkness
-K:208:0x83:0x9C
-
-# Protection from Evil
-K:209:0x83:0x9C
-
-# Satisfy Hunger
-K:210:0x83:0x9C
-
-# Dispel Undead
-K:211:0x83:0x9C
-
-# *Enchant Weapon*
-K:212:0x83:0x9C
-
-# Curse Weapon
-K:213:0x83:0x9C
-
-# *Enchant Armour*
-K:214:0x83:0x9C
-
-# Curse Armour
-K:215:0x83:0x9C
-
-# Summon Undead
-K:216:0x83:0x9C
-
-# Blessing
-K:217:0x83:0x9C
-
-# Holy Chant
-K:218:0x83:0x9C
-
-# Holy Prayer
-K:219:0x83:0x9C
-
-# Word of Recall
-K:220:0x83:0x9C
-
-# *Destruction*
-K:221:0x83:0x9C
-
-# Slime Mold Juice
-K:222:0x85:0x85
-
-# Apple Juice
-K:223:0x85:0x85
-
-# Water
-K:224:0x85:0x85
-
-# Strength
-K:225:0x85:0x85
-
-# Weakness
-K:226:0x85:0x85
-
-# Restore Strength
-K:227:0x85:0x85
-
-# Intelligence
-K:228:0x85:0x85
-
-# Stupidity
-K:229:0x85:0x85
-
-# Restore Intelligence
-K:230:0x85:0x85
-
-# Wisdom
-K:231:0x85:0x85
-
-# Naivety
-K:232:0x85:0x85
-
-# Restore Wisdom
-K:233:0x85:0x85
-
-# Charisma
-K:234:0x85:0x85
-
-# Ugliness
-K:235:0x85:0x85
-
-# Restore Charisma
-K:236:0x85:0x85
-
-# Curing
-K:237:0x85:0x85
-
-# Invulnerability
-K:238:0x85:0x85
-
-# New Life
-K:239:0x85:0x85
-
-# Cure Serious Wounds
-K:240:0x85:0x85
-
-# Cure Critical Wounds
-K:241:0x85:0x85
-
-# Healing
-K:242:0x85:0x85
-
-# Constitution
-K:243:0x85:0x85
-
-# Experience
-K:244:0x85:0x85
-
-# Sleep
-K:245:0x85:0x85
-
-# Blindness
-K:246:0x85:0x85
-
-# Booze
-K:247:0x85:0x85
-
-# Poison
-K:248:0x85:0x85
-
-# Speed
-K:249:0x85:0x85
-
-# Slowness
-K:250:0x85:0x85
-
-# Dexterity
-K:251:0x85:0x85
-
-# Restore Dexterity
-K:252:0x85:0x85
-
-# Restore Constitution
-K:253:0x85:0x85
-
-# Lose Memories
-K:254:0x85:0x85
-
-# Salt Water
-K:255:0x85:0x85
-
-# Enlightenment
-K:256:0x85:0x85
-
-# Heroism
-K:257:0x85:0x85
-
-# Berserk Strength
-K:258:0x85:0x85
-
-# Boldness
-K:259:0x85:0x85
-
-# Restore Life Levels
-K:260:0x85:0x85
-
-# Resist Heat
-K:261:0x85:0x85
-
-# Resist Cold
-K:262:0x85:0x85
-
-# Detect Invisible
-K:263:0x85:0x85
-
-# Slow Poison
-K:264:0x85:0x85
-
-# Neutralise Poison
-K:265:0x85:0x85
-
-# Restore Mana
-K:266:0x85:0x85
-
-# Infra-vision
-K:267:0x85:0x85
-
-# Resistance
-K:268:0x85:0x85
-
-# Spell
-K:269:0x86:0x93
-
-# Manathrust
-K:270:0x86:0x93
-
-# Fireflash
-K:271:0x86:0x93
-
-# Firewall
-K:272:0x86:0x93
-
-# Tidal Wave
-K:273:0x86:0x93
-
-# Ice Storm
-K:274:0x86:0x93
-
-# Noxious Cloud
-K:275:0x86:0x93
-
-# Poison Blood
-K:276:0x86:0x93
-
-# Thunderstorm
-K:277:0x86:0x93
-
-# Dig
-K:278:0x86:0x93
-
-# Stone Prison
-K:279:0x86:0x93
-
-# Strike
-K:280:0x86:0x93
-
-# Teleport Away
-K:281:0x86:0x93
-
-# Summon Animal
-K:282:0x86:0x93
-
-# Magelock
-K:283:0x86:0x93
-
-# Slow Monster
-K:284:0x86:0x93
-
-# Essence of Speed
-K:285:0x86:0x93
-
-# Banishment
-K:286:0x86:0x93
-
-# Disperse Magic
-K:287:0x86:0x93
-
-# Charm
-K:288:0x86:0x93
-
-# Confuse
-K:289:0x86:0x93
-
-# Demon Blade
-K:290:0x86:0x93
-
-# Heal Monster
-K:291:0x86:0x93
-
-# Haste Monster
-K:292:0x86:0x93
-
-# & Flight Arrow~
-K:293:0x8C:0x81
-
-# & Boulder~
-K:295:0xC6:0x9F
-
-# & Flame~ Imperishable
-K:296:0xBE:0x9F
-
-# & Necromantic Teeth~
-K:297:0xC5:0xA5
-
-# & Golden Horn~ of the Eagles
-K:298:0x86:0x93
-
-# Spell
-K:300:0x87:0x92
-
-# Nothing
-K:301:0x87:0x92
-
-# Globe of Light
-K:302:0x87:0x92
-
-# Fiery Shield
-K:303:0x87:0x92
-
-# Remove Curses
-K:304:0x87:0x92
-
-# Wings of Winds
-K:305:0x87:0x92
-
-# Shake
-K:306:0x87:0x92
-
-# Disarm
-K:307:0x87:0x92
-
-# Teleportation
-K:308:0x87:0x92
-
-# Probability Travel
-K:309:0x87:0x92
-
-# Recovery
-K:310:0x87:0x92
-
-# Healing
-K:311:0x87:0x92
-
-# Vision
-K:312:0x87:0x92
-
-# Identify
-K:313:0x87:0x92
-
-# Sense Hidden
-K:314:0x87:0x92
-
-# Reveal Ways
-K:315:0x87:0x92
-
-# Sense Monsters
-K:316:0x87:0x92
-
-# Genocide
-K:317:0x87:0x92
-
-# Summon
-K:318:0x87:0x92
-
-# Sterilization
-K:319:0x87:0x92
-
-# Wish
-K:320:0x87:0x92
-
-# Mana
-K:321:0x87:0x92
-
-# & Tome~ of Magical Energy
-K:330:0x90:0xA0
-
-# & Tome~ of the Eternal Flame
-K:331:0x90:0xA1
-
-# & Tome~ of the Blowing Wind
-K:332:0x90:0xA2
-
-# & Tome~ of the Impenetrable Earth
-K:333:0x90:0xA3
-
-# & Tome~ of the Everrunning Wave
-K:334:0x90:0xA4
-
-# & Tome~ of Translocation
-K:335:0x90:0xA5
-
-# & Tome~ of the Tree
-K:336:0x90:0xA6
-
-# & Tome~ of Knowledge
-K:337:0x90:0xA7
-
-# & Small wooden chest~
-K:338:0x84:0x99
-
-# & Large wooden chest~
-K:339:0x84:0x9A
-
-# & Small iron chest~
-K:340:0x84:0x9B
-
-# & Large iron chest~
-K:341:0x84:0x9C
-
-# & Small steel chest~
-K:342:0x84:0x9D
-
-# & Large steel chest~
-K:343:0x84:0x9E
-
-# & Ruined chest~
-K:344:0x84:0x9F
-
-# & Iron Spike~
-K:345:0x8E:0x89
-
-# & Wooden Torch~
-K:346:0x8E:0x8B
-
-# & Brass Lantern~
-K:347:0x8E:0x8A
-
-# & Flask~ of oil
-K:348:0x8E:0x88
-
-# & Empty Bottle~
-K:349:0x8E:0x87
-
-# Havoc
-K:350:0x86:0x83
-
-# Door/Stair Location
-K:351:0x86:0x83
-
-# Trap Location
-K:352:0x86:0x83
-
-# Probing
-K:353:0x86:0x83
-
-# Recall
-K:354:0x86:0x83
-
-# Illumination
-K:355:0x86:0x83
-
-# Light
-K:356:0x86:0x83
-
-# Lightning Bolts
-K:357:0x86:0x83
-
-# Frost Bolts
-K:358:0x86:0x83
-
-# Fire Bolts
-K:359:0x86:0x83
-
-# Polymorph
-K:360:0x86:0x83
-
-# Slow Monster
-K:361:0x86:0x83
-
-# Sleep Monster
-K:362:0x86:0x83
-
-# Drain Life
-K:363:0x86:0x83
-
-# Teleport Other
-K:364:0x86:0x83
-
-# Disarming
-K:365:0x86:0x83
-
-# Lightning Balls
-K:366:0x86:0x83
-
-# Cold Balls
-K:367:0x86:0x83
-
-# Fire Balls
-K:368:0x86:0x83
-
-# Acid Balls
-K:369:0x86:0x83
-
-# Acid Bolts
-K:370:0x86:0x83
-
-# Enlightenment
-K:371:0x86:0x83
-
-# Perception
-K:372:0x86:0x83
-
-# Curing
-K:373:0x86:0x83
-
-# Healing
-K:374:0x86:0x83
-
-# Detection
-K:375:0x86:0x83
-
-# Restoration
-K:376:0x86:0x83
-
-# Speed
-K:377:0x86:0x83
-
-# Spell
-K:378:0x84:0x83
-
-# Spell
-K:379:0x87:0x80
-
-# & Broken Skull~
-K:391:0x8E:0x94
-
-# & Broken Bone~
-K:392:0x8E:0x95
-
-# & Canine Skeleton~
-K:393:0x8E:0x9A
-
-# & Rodent Skeleton~
-K:394:0x8E:0x9B
-
-# & Human Skeleton~
-K:395:0x8E:0x96
-
-# & Dwarf Skeleton~
-K:396:0x8E:0x98
-
-# & Elf Skeleton~
-K:397:0x8E:0x97
-
-# & Gnome Skeleton~
-K:398:0x8E:0x99
-
-# & Great Hammer~
-K:399:0xB6:0x8A
-
-# Black Dragon Scale Mail~
-K:400:0x8A:0x82
-
-# Blue Dragon Scale Mail~
-K:401:0x8A:0x80
-
-# White Dragon Scale Mail~
-K:402:0x8A:0x81
-
-# Red Dragon Scale Mail~
-K:403:0x8A:0x83
-
-# Green Dragon Scale Mail~
-K:404:0x8A:0x84
-
-# Multi-Hued Dragon Scale Mail~
-K:405:0x8A:0x8B
-
-# Pseudo Dragon Scale Mail~
-K:406:0x8A:0x87
-
-# Law Dragon Scale Mail~
-K:407:0x8A:0x89
-
-# Bronze Dragon Scale Mail~
-K:408:0x8A:0x85
-
-# Gold Dragon Scale Mail~
-K:409:0x8A:0x86
-
-# Chaos Dragon Scale Mail~
-K:410:0x8A:0x88
-
-# Balance Dragon Scale Mail~
-K:411:0x8A:0x8A
-
-# Power Dragon Scale Mail~
-K:412:0x8A:0x8C
-
-# & Dragon Helm~
-K:413:0x88:0x82
-
-# & Dragon Shield~
-K:414:0x88:0x9C
-
-# Death
-K:415:0x85:0x85
-
-# Ruination
-K:416:0x85:0x85
-
-# Detonations
-K:417:0x85:0x85
-
-# Augmentation
-K:418:0x85:0x85
-
-# *Healing*
-K:419:0x85:0x85
-
-# Life
-K:420:0x85:0x85
-
-# Self Knowledge
-K:421:0x85:0x85
-
-# *Enlightenment*
-K:422:0x85:0x85
-
-# Fear Resistance
-K:425:0x84:0x83
-
-# Light and Darkness Resistance
-K:426:0x84:0x83
-
-# Nether Resistance
-K:427:0x84:0x83
-
-# Nexus Resistance
-K:428:0x84:0x83
-
-# Sound Resistance
-K:429:0x84:0x83
-
-# Confusion Resistance
-K:430:0x84:0x83
-
-# Shard Resistance
-K:431:0x84:0x83
-
-# Disenchantment Resistance
-K:432:0x84:0x83
-
-# Chaos Resistance
-K:433:0x84:0x83
-
-# Blindness Resistance
-K:434:0x84:0x83
-
-# Lordly Protection
-K:435:0x84:0x83
-
-# Extra Attacks
-K:436:0x84:0x83
-
-# Cure Light Wounds
-K:437:0x85:0x85
-
-# Clumsiness
-K:438:0x85:0x85
-
-# Sickliness
-K:439:0x85:0x85
-
-# Map of Bree
-K:440:0xC4:0x80
-
-# Map of Gondolin
-K:441:0xC4:0x80
-
-# Map of Lothlorien
-K:442:0xC4:0x80
-
-# Map of Minas Anor
-K:443:0xC4:0x80
-
-# & Silver Arrow~
-K:465:0xC6:0x81
-
-# & Silver Bolt~
-K:466:0xC6:0x82
-
-# Lightning Resistance
-K:467:0x87:0x80
-
-# Wisdom
-K:468:0x87:0x80
-
-# Regeneration
-K:469:0x87:0x80
-
-# Infravision
-K:470:0x87:0x80
-
-# Devotion
-K:471:0x87:0x80
-
-# Weaponmastery
-K:472:0x87:0x80
-
-# Trickery
-K:473:0x87:0x80
-
-# Telepathy
-K:474:0x87:0x80
-
-# Sustenance
-K:475:0x87:0x80
-
-# & Palantir~
-K:476:0xC6:0x87
-
-# & Elfstone~
-K:477:0xC6:0x83
-
-# & Jewel~
-K:478:0xC6:0x84
-
-# & Ring~
-K:479:0xC6:0x85
-
-# copper
-K:480:0x83:0x91
-
-# copper
-K:481:0x83:0x91
-
-# copper
-K:482:0x83:0x91
-
-# silver
-K:483:0x83:0x92
-
-# silver
-K:484:0x83:0x92
-
-# silver
-K:485:0x83:0x92
-
-# garnets
-K:486:0x83:0x96
-
-# garnets
-K:487:0x83:0x96
-
-# gold
-K:488:0x83:0x93
-
-# gold
-K:489:0x83:0x93
-
-# gold
-K:490:0x83:0x93
-
-# opals
-K:491:0x83:0x97
-
-# sapphires
-K:492:0x83:0x98
-
-# rubies
-K:493:0x83:0x99
-
-# diamonds
-K:494:0x83:0x9A
-
-# emeralds
-K:495:0x83:0x9B
-
-# mithril
-K:496:0x83:0x94
-
-# adamantite
-K:497:0x83:0x95
-
-# & Mighty Hammer~
-K:498:0xB6:0x8A
-
-# & Massive Iron Crown~
-K:499:0x87:0x9C
-
-# & Phial~
-K:500:0x8E:0x9D
-
-# & Star~
-K:501:0x8E:0x9E
-
-# & Arkenstone~
-K:502:0x8E:0x9F
-
-# & Amulet~
-K:503:0x84:0x96
-
-# & Amulet~
-K:504:0x84:0x97
-
-# & Necklace~
-K:505:0x84:0x98
-
-# & Ring~
-K:506:0x84:0x8F
-
-# & Ring~
-K:507:0x84:0x83
-
-# & Ring~
-K:508:0x84:0x92
-
-# & Ring~
-K:509:0x84:0x93
-
-# & Ring~
-K:510:0x84:0x94
-
-# & Ring~
-K:511:0x84:0x95
-
-# Reflection
-K:520:0x87:0x83
-
-# Anti-Magic
-K:521:0x87:0x83
-
-# Anti-Teleportation
-K:522:0x87:0x83
-
-# Resistance
-K:523:0x87:0x83
-
-# & Zweihander~
-K:524:0xB6:0x8C
-
-# & Dwarven Lantern~
-K:525:0xC5:0x94
-
-# Splint Mail~
-K:526:0x89:0x9C
-
-# & Everburning Torch~
-K:527:0xC5:0x95
-
-# & Trifurcate Spear~
-K:528:0xB6:0x85
-
-# & Three-Piece Rod~
-K:529:0xB6:0x80
-
-# & Feanorian Lamp~
-K:530:0xC5:0x96
-
-# & Fur Cloak~
-K:531:0x89:0x89
-
-# Water Curing
-K:532:0x85:0x85
-
-# & Hatchet~
-K:533:0xB6:0x8F
-
-# Mumak Hide Armour~
-K:535:0x89:0x98
-
-# & Leather Jerkin~
-K:536:0x89:0x8F
-
-# & Sickle~
-K:537:0xB6:0x90
-
-# & Club~
-K:542:0xB6:0x92
-
-# & Broad Spear~
-K:543:0xB6:0x84
-
-# & Khopesh~
-K:544:0xB6:0x94
-
-# & Flamberge~
-K:545:0xB6:0x83
-
-# & Claymore~
-K:546:0xB6:0x8D
-
-# & Espadon~
-K:547:0xB6:0x8E
-
-# & Great Scimitar~
-K:548:0xB6:0x8B
-
-# Arrow
-K:549:0x8E:0xA0
-
-# Bolt
-K:550:0x8E:0xA1
-
-# & Fauchard~
-K:551:0xB6:0x95
-
-# & Guisarme~
-K:552:0xB6:0x96
-
-# & Heavy Lance~
-K:553:0xB6:0x82
-
-# & Bardiche~
-K:554:0xB6:0x99
-
-# Catapult
-K:555:0x8E:0xA2
-
-# Ring Mail~
-K:556:0x89:0x9C
-
-# Cord Armour~
-K:557:0x89:0x90
-
-# Paper Armour~
-K:558:0x8A:0x81
-
-# Padded Armour~
-K:559:0x89:0x91
-
-# Fumes
-K:560:0x8E:0xA3
-
-# Golden Ring Mail~
-K:561:0xC5:0xB4
-
-# Magic
-K:562:0x8E:0xA4
-
-# Device
-K:563:0x8E:0xA5
-
-# Nothing
-K:569:0x86:0x83
-
-# & Blood~ of Life
-K:573:0x85:0x85
-
-# & Mage Staff~
-K:577:0xB8:0x80
-
-# Lightning
-K:578:0x84:0x80
-
-# & Ring~
-K:582:0x84:0x85
-
-# Invisibility
-K:583:0x85:0x85
-
-# Corruption
-K:585:0x85:0x85
-
-# Invisibility
-K:586:0x84:0x80
-
-# Deep Thoughts
-K:588:0x83:0x9C
-
-# More Deep Thoughts
-K:589:0x83:0x9D
-
-# Compendium of Deep Thoughts
-K:590:0x83:0x9E
-
-# Artifact Lore Vol. I
-K:591:0x83:0x9C
-
-# Artifact Lore Vol. II
-K:592:0x83:0x9D
-
-# Artifact Lore Vol. III
-K:593:0x83:0x9F
-
-# Monstrous Compendium 1
-K:594:0x83:0x9F
-
-# Monstrous Compendium 2
-K:595:0x83:0x9E
-
-# Monstrous Compendium 3
-K:596:0x83:0x9D
-
-# Monstrous Compendium 4
-K:597:0x83:0x9C
-
-# Monstrous Compendium 5
-K:598:0x83:0x9F
-
-# Monstrous Compendium 6
-K:599:0x83:0x9E
-
-# Monstrous Compendium 7
-K:600:0x83:0x9D
-
-# Monstrous Compendium 8
-K:601:0x83:0x9C
-
-# Monstrous Compendium 9
-K:602:0x83:0x9D
-
-# Monstrous Compendium 10
-K:603:0x83:0x9E
-
-# Monstrous Compendium 11
-K:604:0x83:0x9F
-
-# & Morphic Oil~ of #
-K:605:0x85:0x85
-
-# Artifact Lore Vol. IV
-K:607:0x83:0x9C
-
-# Artifact Lore Vol. V
-K:608:0x83:0x9D
-
-# Artifact Lore Vol. VI
-K:609:0x83:0x9E
-
-# Artifact Lore Vol. VII
-K:610:0x83:0x9F
-
-# Artifact Lore Vol. VIII
-K:611:0x83:0x9C
-
-# Artifact Lore Vol. IX
-K:612:0x83:0x9D
-
-# Artifact Lore Vol. X
-K:613:0x83:0x9E
-
-# Artifact Lore Vol. XI
-K:614:0x83:0x9F
-
-# Artifact Lore Vol. IX
-K:615:0x83:0x9C
-
-# Artifact Lore Vol. X
-K:616:0x83:0x9D
-
-# Artifact Lore Vol. XI
-K:617:0x83:0x9E
-
-# & #~
-K:618:0x8F:0xA0
-
-# corpse
-K:641:0xB8:0x81
-
-# skeleton
-K:642:0x8E:0x96
-
-# head
-K:643:0x8E:0x94
-
-# skull
-K:644:0x8E:0x94
-
-# raw meat
-K:645:0x8E:0x83
-
-# & Great Eagle Down Coat~
-K:646:0x8A:0x86
-
-# & Key~
-K:647:0x8E:0x9C
-
-# & Small Wooden Boomerang~
-K:648:0xB8:0x82
-
-# & Wooden Boomerang~
-K:649:0xB8:0x83
-
-# & Small Metal Boomerang~
-K:650:0xB8:0x84
-
-# & Metal Boomerang~
-K:651:0xB8:0x85
-
-# & Anchor~
-K:652:0x8D:0x9E
-
-# & ~
-K:653:0xC5:0xB5
-
-# Summon Never-Moving Pet
-K:654:0x83:0x9D
-
-# Cure Light Insanity
-K:657:0x85:0x85
-
-# Cure Serious Insanity
-K:658:0x85:0x85
-
-# Cure Critical Insanity
-K:659:0x85:0x85
-
-# Cure Insanity
-K:660:0x85:0x85
-
-# & Phial~
-K:661:0x8E:0x9D
-
-# Junkart
-K:662:0xC5:0xB6
-
-# Craftsmanship
-K:663:0x83:0x9F
-
-# The One Ring
-K:664:0x83:0x9E
-
-# & Horn~
-K:669:0xB8:0x88
-
-# & Drum~
-K:670:0xB8:0x89
-
-# & Harp~
-K:671:0xB8:0x8A
-
-# & Palantir~
-K:675:0x8D:0x9F
-
-# Egg
-K:676:0xB7:0x8D
-
-# Reset Recall
-K:677:0x83:0x9D
-
-# Divination
-K:678:0x83:0x9D
-
-# Self
-K:679:0xB7:0x8E
-
-# Ray
-K:680:0xB7:0x8F
-
-# Sphere
-K:681:0xB7:0x90
-
-# Knowledge
-K:682:0xB7:0x94
-
-# Life
-K:683:0xB7:0x95
-
-# Fire
-K:684:0xB7:0x96
-
-# Cold
-K:685:0xB7:0x97
-
-# Lightning
-K:686:0xB7:0x98
-
-# Acid
-K:687:0xB7:0x99
-
-# Element
-K:688:0xB7:0x9A
-
-# Chaos
-K:689:0xB7:0x9B
-
-# Mind
-K:690:0xB7:0x9C
-
-# Holding
-K:691:0xB7:0x9D
-
-# Arrow
-K:692:0xB7:0x91
-
-# Power Surge
-K:693:0xB7:0x92
-
-# Armageddon
-K:694:0xB7:0x93
-
-# Gravity
-K:695:0xB7:0x9E
-
-# Undeath
-K:697:0xB6:0x9B
-
-# Protection
-K:698:0xB6:0x9C
-
-# & Ring~ of Precognition
-K:700:0x84:0x83
-
-# & Sprig~ of Athelas
-K:701:0xB8:0x8E
-
-# & Old Scroll~ of Deincarnation
-K:720:0x83:0x9F
-
-# & Dark Sword~
-K:721:0xC4:0x81
-
-# Numenorean for Beginners (I)
-K:722:0x83:0x9D
-
-# Numenorean for Beginners (II)
-K:723:0x83:0x9D
-
-# Advanced Lessons of Numenorean
-K:724:0x83:0x9D
-
-# Advanced Lessons of Sindarin
-K:725:0x83:0x9D
-
-# & Shard~ of Pottery
-K:726:0x8E:0x92
-
-# & Broken Stick~
-K:727:0x8E:0x93
-
-# & Book~ of Beginner Cantrips
-K:738:0x90:0xA0
-
-# & Book~ of Teleportation
-K:739:0x90:0xA5
-
-# & Book~ of Summoning
-K:741:0x90:0xA7
-
-# & Potion~ of Learning
-K:743:0xC1:0x82
-
-# Khuzdul - The Hidden Tongue of the Dwarves
-K:751:0x83:0x9D
-
-# Nandorin for Dummies
-K:752:0x83:0x9D
-
-# Advanced Lessons of Orcish
-K:753:0x83:0x9D
-
-# Flying
-K:755:0x84:0x88
-
-# & Tome~ of the Time
-K:756:0x90:0xA5
-
-# & Spellbook~ of #
-K:757:0x91:0xA4
-
-# & Tome~ of Meta Spells
-K:758:0x90:0xA0
-
-# & Tome~ of the Mind
-K:759:0x90:0xA7
-
-# & Holy Tome~ of Eru Iluvatar
-K:760:0x90:0xA7
-
-# & Holy Tome~ of Manwe Sulimo
-K:761:0x90:0xA2
-
-# & War Tome~ of Tulkas
-K:762:0x90:0xA5
-
-# & Unholy Tome~ of the Hellflame
-K:763:0x90:0xA1
-
-# & Corrupted Tome~ of Melkor
-K:764:0x90:0xA1
-
-# & Earth Tome~ of Aule
-K:765:0x90:0xA3
-
-# & Shining Tome~ of Varda
-K:766:0x90:0xA2
-
-# & Water Tome~ of Ulmo
-K:767:0x90:0xA4
-
-# & Forest Tome~ of Yavanna
-K:768:0x90:0xA6
-
-# Tome of#
-K:769:0x90:0xA3
-
-# & Ring~
-K:770:0x84:0x84
-
-# & Holy Tome~ of Mandos
-K:771:0x90:0xA0
-
-# & Great Rod Tip~ of Home Summoning
-K:776:0x86:0x83
-
-# & Shadow Blade~
-K:777:0xC1:0x91
-
-# & Bluesteel Blade~
-K:778:0xC1:0x92
-
-# the Serpents
-K:779:0xC4:0x88
-
-# Ring~ of Power
-K:785:0xC4:0x8E
-
-# Climbing Set~
-K:786:0xC1:0x93
-
-# Adventurer's Guide to Middle-earth
-K:787:0x83:0x9E
-
-# & Demonblade~
-K:788:0x90:0xA8
-
-# & Demonshield~
-K:789:0x90:0xA9
-
-# & Demonhorn~
-K:790:0x90:0xAA
-
-# & Wooden Rod~ of#
-K:793:0xC1:0x95
-
-# & Copper Rod~ of#
-K:794:0xC1:0x96
-
-# & Iron Rod~ of#
-K:795:0xC1:0x97
-
-# & Moonstone Rod~ of#
-K:796:0xC1:0x98
-
-# & Silver Rod~ of#
-K:797:0xC1:0x99
-
-# & Golden Rod~ of#
-K:798:0xC1:0x9B
-
-# & Mithril Rod~ of#
-K:799:0xC1:0x9C
-
-# & Tilkal Rod~ of#
-K:800:0xC1:0x9D
-
-# & Greater Ration~ of Health
-K:801:0xC4:0x87
-
-# & Crumpled Scroll~ of Mass Resurrection
-K:802:0x83:0x9E
-
-# & Cleaver~
-K:803:0xC4:0x82
-
-# & Light War Axe~
-K:804:0xC4:0x83
-
-# & Slaughter Axe~
-K:805:0xC4:0x84
-
-# & Runestone~
-K:806:0xC4:0x85
-
-# & Fortune cookie~
-K:807:0xC6:0x86
-
-# Critical Hits
-K:809:0x84:0x83
-
-# & Wand~ of Digging of Thrain
-K:810:0x86:0x93
-
-# & Gnarled Staff~ of Holy Fire of Mithrandir
-K:811:0x87:0x92
-
-# Partial Totem
-K:812:0xC6:0x9D
-
-# True Totem
-K:813:0xC6:0x9E
-
-# & Piece~ of the Relic of Eru
-K:814:0x8C:0xA2
-
-# & Piece~ of the Relic of Manwe
-K:815:0x8C:0xA3
-
-# & Piece~ of the Relic of Tulkas
-K:816:0x8C:0xA4
-
-# & Piece~ of the Relic of Melkor
-K:817:0x8C:0xA5
-
-# & Piece~ of the Relic of Yavanna
-K:818:0x8C:0xA6
-
-# & Ring~
-K:819:0x84:0x83
-
-# & Ring~
-K:820:0x84:0x83
-
-# & Ring~
-K:821:0x84:0x83
-
-# & Ring~
-K:822:0x84:0x83
-
-# & Ring~
-K:823:0x84:0x83
-
-# & Ring~
-K:824:0x84:0x83
-
-# & Piece~ of the Relic of Aule
-K:825:0x8C:0xA7
-
-# & Piece~ of the Relic of Varda
-K:826:0x8C:0xA8
-
-# & Piece~ of the Relic of Ulmo
-K:827:0x8C:0xA9
-
-# & Piece~ of the Relic of Mandos
-K:828:0x8C:0xAA
-
-# THEME
-
-# & Pinch~ of Longbottom Leaf
-K:831:0xC5:0xAA
-
-# & Ear~ of Corn
-K:832:0xC6:0xBF
-
-# & Tater~
-K:833:0xC5:0xA6
-
-# & Strawberry~
-K:834:0x93:0xA4
-
-# & Turnip~
-K:835:0xC5:0xA7
-
-# & Jar~ of Honey
-K:836:0xC5:0xA8
-
-# & Jug~ of Milk
-K:837:0xC5:0xA9
-
-# of War
-K:838:0x87:0x80
-
-# of Life
-K:839:0x87:0x80
-
-# Wizardry
-K:840:0x84:0x83
-
-# Vitality
-K:841:0x84:0x83
-
-# Clear Thought
-K:842:0x84:0x83
-
-# Clumsiness
-K:843:0x84:0x83
-
-# Sickliness
-K:844:0x84:0x83
-
-# Fortune
-K:845:0x84:0x83
-
-# Sterilise
-K:846:0x83:0x9C
-
-# Map of Middle-earth
-K:847:0xC4:0x80
-
-# Map of Edoras
-K:848:0xC4:0x80
-
-# Map of Esgaroth
-K:849:0xC4:0x80
-
-# Map of Hobbiton
-K:850:0xC4:0x80
-
-# Map of Osgiliath
-K:851:0xC4:0x80
-
-# Map of Pelargir
-K:852:0xC4:0x80
-
-# Map of Beorn's domain
-K:853:0xC4:0x80
-
-# Map of Dale
-K:854:0xC4:0x80
-
-# Map of Henneth Annun
-K:855:0xC4:0x80
-
-# Map of Helm's Deep
-K:856:0xC4:0x80
-
-# Map of Thranduil's realm
-K:857:0xC4:0x80
-
-# Map of Imladris
-K:858:0xC4:0x80
-
-# & Bearded Axe~
-K:859:0xC5:0xAD
-
-# & Double Axe~
-K:860:0xC5:0xAE
-
-# & Crusader Axe~
-K:861:0xC5:0xAF
-
-# & Reaper Axe~
-K:862:0xC5:0xB0
-
-# & Mithril Helm~
-K:863:0xC5:0xB8
-
-# & Set~ of Mithril Gauntlets
-K:864:0xC5:0xB9
-
-# & Small Mithril Shield~
-K:865:0xC5:0xBA
-
-# & Large Mithril Shield~
-K:866:0xC5:0xBB
-
-# & Map~
-K:867:0xC4:0x80
-
-# & Key~
-K:868:0x93:0xA7
-
-# & Cup~
-K:869:0xC5:0xAB
-
-# & Red Arrow~
-K:870:0xAE:0x87
-
-# & Sceptre~
-K:871:0x86:0x94
-
-# & Rod~
-K:872:0x86:0x93
-
-# & Necklace~
-K:873:0x87:0x8C
-
-# & Amulet~
-K:874:0x87:0x80
-
-# & Black Banner~
-K:875:0xC5:0xAC
-
-# & Pearl~
-K:876:0xC5:0xB1
-
-# & Silmaril~
-K:877:0xC5:0xB2
-
-# & Silmaril~
-K:878:0xC5:0xB3
-
-# & Golden Harp~
-K:879:0xC5:0xB7
-
-# Player
-R:0:0x8E/0x80
-
-# Filthy street urchin
-R:1:0xAA:0x80
-
-# Scrawny cat
-R:2:0xA7:0x82
-
-# Sparrow
-R:3:0xB4:0x9E
-
-# Chaffinch
-R:4:0xB4:0x9E
-
-# Wild rabbit
-R:5:0xB4:0x9F
-
-# Woodsman
-R:6:0xAA:0x91
-
-# Scruffy little dog
-R:7:0x9D:0x9A
-
-# Farmer Maggot
-R:8:0xAA:0x81
-
-# Blubbering idiot
-R:9:0xAA:0x82
-
-# Boil-covered wretch
-R:10:0xAA:0x83
-
-# Village idiot
-R:11:0xAA:0x84
-
-# Pitiful-looking beggar
-R:12:0xAA:0x85
-
-# Mangy-looking leper
-R:13:0xAA:0x86
-
-# Agent of the black market
-R:14:0xAA:0x87
-
-# Singing, happy drunk
-R:15:0xAA:0x88
-
-# Aimless-looking merchant
-R:16:0xAA:0x89
-
-# Mean-looking mercenary
-R:17:0xAA:0x8A
-
-# Battle-scarred veteran
-R:18:0xAA:0x8B
-
-# The Squint-eyed Southerner
-R:19:0xB0:0x80
-
-# Grey mold
-R:20:0xA8:0x9F
-
-# Large white snake
-R:21:0xA2:0x85
-
-# Grey mushroom patch
-R:22:0xB0:0x81
-
-# Newt
-R:23:0xB0:0x82
-
-# Ox
-R:24:0xC0:0xAE
-
-# Kine of Araw
-R:25:0xC0:0xAF
-
-# Sheep
-R:26:0xC0:0xB0
-
-# Giant white mouse
-R:27:0xAC:0x85
-
-# Large brown snake
-R:28:0xA2:0x84
-
-# Meara
-R:29:0xC0:0xB1
-
-# Horse
-R:30:0xC0:0xB2
-
-# White worm mass
-R:31:0xAC:0x9D
-
-# Floating eye
-R:32:0xA6:0x9B
-
-# Rock lizard
-R:33:0xA2:0x86
-
-# The Boar of Everholt
-R:34:0xC0:0xB3
-
-# Jackal
-R:35:0x9D:0x9B
-
-# Soldier ant
-R:36:0xA5:0x87
-
-# Fruit bat
-R:37:0xA5:0x8F
-
-# Insect swarm
-R:38:0xB5:0x9E
-
-# Boar
-R:39:0xC0:0xB4
-
-# Shrieker mushroom patch
-R:40:0x9D:0x86
-
-# Cow
-R:41:0xC0:0xB5
-
-# Novice warrior
-R:43:0xAA:0x8C
-
-# Novice rogue
-R:44:0xAA:0x8D
-
-# Novice priest
-R:45:0xAA:0x8E
-
-# Novice mage
-R:46:0xAA:0x8F
-
-# Yellow mushroom patch
-R:47:0x9D:0x87
-
-# White jelly
-R:48:0xA8:0x8A
-
-# Giant black ant
-R:49:0xA5:0x88
-
-# Salamander
-R:50:0xA2:0x88
-
-# White harpy
-R:51:0xA0:0x88
-
-# Deer
-R:52:0xC0:0xB6
-
-# Grip, Farmer Maggot's dog
-R:53:0x9D:0x9C
-
-# Wolf, Farmer Maggot's dog
-R:54:0x9D:0x9D
-
-# Fang, Farmer Maggot's dog
-R:55:0x9D:0x9D
-
-# Giant green frog
-R:56:0xA2:0x87
-
-# Lion
-R:57:0xC0:0xB7
-
-# Green worm mass
-R:58:0xAC:0x9E
-
-# Large yellow snake
-R:59:0xA2:0x89
-
-# Cave spider
-R:60:0xA2:0x9D
-
-# Crow
-R:61:0xB5:0x9F
-
-# Wild cat
-R:62:0xA7:0x83
-
-# Smeagol
-R:63:0xAA:0x90
-
-# Green ooze
-R:64:0xA8:0x8B
-
-# Poltergeist
-R:65:0x9F:0x99
-
-# Yellow jelly
-R:66:0xA8:0x8D
-
-# Squirrel
-R:67:0xC0:0xB8
-
-# Raven
-R:68:0xB5:0x9F
-
-# White midge
-R:69:0xA8:0x9D
-
-# Squirrel of Mirkwood
-R:70:0xC0:0xB9
-
-# Black naga
-R:71:0xA9:0x88
-
-# Spotted mushroom patch
-R:72:0x9D:0x88
-
-# Silver jelly
-R:73:0xA8:0x8C
-
-# Scruffy-looking hobbit
-R:74:0xA7:0x93
-
-# Giant white ant
-R:75:0xA5:0x89
-
-# Yellow mold
-R:76:0xA9:0x80
-
-# Ape
-R:77:0xC0:0xBA
-
-# Yellow worm mass
-R:78:0xAC:0x9F
-
-# Clear worm mass
-R:79:0xAD:0x80
-
-# Radiation eye
-R:80:0xA6:0x9C
-
-# Yellow light
-R:81:0xB8:0x93
-
-# Cave lizard
-R:82:0xA2:0x8A
-
-# Novice ranger
-R:83:0xAA:0x91
-
-# Blue jelly
-R:84:0xA8:0x8E
-
-# Creeping copper coins
-R:85:0x9D:0x80
-
-# Giant white rat
-R:86:0xAC:0x86
-
-# Snotling
-R:87:0xB9:0x89
-
-# Swordfish
-R:88:0xB6:0x9E
-
-# Blue worm mass
-R:89:0xAD:0x81
-
-# Large grey snake
-R:90:0xA2:0x8B
-
-# Corsair of Umbar
-R:91:0xC0:0xBB
-
-# Dunlending
-R:92:0xC0:0xBC
-
-# Apprentice mage
-R:93:0xAA:0x8F
-
-# Green naga
-R:94:0xA9:0x89
-
-# Giant leech
-R:95:0xB8:0x94
-
-# Barracuda
-R:96:0xB6:0x9F
-
-# Novice paladin
-R:97:0xAA:0x92
-
-# Man of Harad
-R:98:0xC0:0xBD
-
-# Blue ooze
-R:99:0xA8:0x8F
-
-# Green glutton ghost
-R:100:0x9F:0x9A
-
-# Green jelly
-R:101:0xA8:0x90
-
-# Lurtz, Uruk Captain of the White Hand
-R:102:0xA8:0x9B
-
-# Munchkin
-R:103:0xA8:0x86
-
-# Disenchanter eye
-R:104:0xA6:0x9D
-
-# Red worm mass
-R:105:0xAD:0x82
-
-# Copperhead snake
-R:106:0xA2:0x8C
-
-# Death sword
-R:107:0xB0:0x87
-
-# Purple mushroom patch
-R:108:0x9D:0x89
-
-# Apprentice priest
-R:109:0xAA:0x8E
-
-# Apprentice warrior
-R:110:0xAA:0x8C
-
-# Petty-dwarf
-R:111:0xB0:0x88
-
-# Petty-dwarf mage
-R:112:0xC0:0xBE
-
-# Brown mold
-R:113:0xA9:0x81
-
-# Giant brown bat
-R:114:0xA5:0x90
-
-# Butterfly
-R:115:0xC4:0xB3
-
-# Apprentice rogue
-R:116:0xAA:0x87
-
-# Creeping silver coins
-R:117:0x9D:0x81
-
-# Snaga
-R:118:0xA9:0x8E
-
-# Rattlesnake
-R:119:0xA2:0x8D
-
-# Giant slug
-R:120:0xB8:0x94
-
-# Giant pink frog
-R:121:0xB8:0x95
-
-# Dark elf
-R:122:0x92:0x94
-
-# Moth
-R:123:0xC4:0xB4
-
-# Crypt creep
-R:124:0xB0:0x8A
-
-# Rotting corpse
-R:125:0xB0:0x8B
-
-# Cave orc
-R:126:0xA9:0x8F
-
-# Wood spider
-R:127:0xA2:0x9E
-
-# Hurog
-R:128:0xA0:0x91
-
-# Bloodshot eye
-R:129:0xA6:0x9E
-
-# Red naga
-R:130:0xA9:0x8A
-
-# Red jelly
-R:131:0xA8:0x91
-
-# Nightingale
-R:132:0xC4:0xAD
-
-# Lost soul
-R:133:0x9F:0x9B
-
-# Night lizard
-R:134:0xA2:0x8F
-
-# Gorcrow
-R:135:0xC4:0xB1
-
-# Skeleton orc
-R:136:0xAC:0x8A
-
-# Grima the Wormtongue, Agent of Saruman
-R:137:0xAA:0x98
-
-# Robin Hood, the Outlaw
-R:138:0xB0:0x8C
-
-# Gull
-R:139:0xC4:0xAE
-
-# Lagduf, the Snaga
-R:140:0xA9:0x90
-
-# Kirinki
-R:141:0xC4:0xAF
-
-# Apprentice ranger
-R:142:0xAA:0x91
-
-# Giant salamander
-R:143:0xA2:0x90
-
-# Space monster
-R:144:0xB0:0x8D
-
-# Swan
-R:145:0xC0:0xBF
-
-# Green mold
-R:146:0xA9:0x82
-
-# Apprentice paladin
-R:147:0xAA:0x92
-
-# Caborrog
-R:148:0xA0:0x92
-
-# Hill orc
-R:149:0xA9:0x91
-
-# Bandit
-R:150:0xAA:0x9B
-
-# Hunting hawk
-R:151:0xB0:0x8E
-
-# Phantom warrior
-R:152:0xB0:0x8F
-
-# Thrush
-R:153:0xC4:0xB0
-
-# Yeti
-R:154:0xA4:0x91
-
-# Fox
-R:155:0xC4:0xAC
-
-# Giant grey rat
-R:156:0xAC:0x87
-
-# Black harpy
-R:157:0xA0:0x89
-
-# Fly of Mordor
-R:158:0xC4:0xB5
-
-# Limlug
-R:159:0xBF:0xA0
-
-# Cave bear
-R:160:0xC4:0x8F
-
-# Rock mole
-R:161:0xBA:0x82
-
-# Mindcrafter
-R:162:0xAA:0x93
-
-# Hatchling blue dragon
-R:163:0xA5:0x9D
-
-# Hatchling white dragon
-R:164:0xA5:0x9E
-
-# Hatchling green dragon
-R:165:0xA5:0x9F
-
-# Hatchling black dragon
-R:166:0xA6:0x80
-
-# Hatchling red dragon
-R:167:0xA6:0x81
-
-# Giant red ant
-R:168:0xA5:0x8D
-
-# Brodda, the Easterling
-R:169:0xAA:0x9C
-
-# Radbug, the Goblin
-R:170:0xBF:0xA1
-
-# King cobra
-R:171:0xA2:0x91
-
-# Eagle
-R:172:0xB4:0x9E
-
-# War bear
-R:173:0xB0:0x91
-
-# Killer bee
-R:174:0xB0:0x92
-
-# Giant spider
-R:175:0xA2:0x9F
-
-# Giant white tick
-R:176:0xA8:0x9D
-
-# The Lucky Hobbit
-R:177:0xBF:0xA2
-
-# Dark elven mage
-R:178:0xA7:0x96
-
-# Dark dwarven warrior
-R:179:0xBF:0xA3
-
-# Dark dwarven smith
-R:180:0xBF:0xA4
-
-# Dark dwarven lord
-R:181:0xBF:0xA5
-
-# Dark dwarven priest
-R:182:0xBF:0xA6
-
-# Dark elven warrior
-R:183:0xBF:0xA6
-
-# Clear mushroom patch
-R:184:0xB8:0x96
-
-# Quiver slot
-R:185:0xB0:0x93
-
-# Grishnakh, the Hill Orc
-R:186:0xA9:0x93
-
-# Giant tan bat
-R:187:0xC4:0x90
-
-# Owlbear
-R:188:0xBA:0x87
-
-# Clear mewlip
-R:189:0xBF:0xA7
-
-# Hairy mold
-R:190:0xA9:0x83
-
-# Grizzly bear
-R:191:0xBA:0x88
-
-# Disenchanter mold
-R:192:0xA9:0x84
-
-# Pseudo-dragon
-R:193:0xA6:0x82
-
-# Limrog
-R:194:0xA0:0x93
-
-# Creeping gold coins
-R:195:0x9D:0x82
-
-# Wolf
-R:196:0x9D:0x9E
-
-# Giant fruit fly
-R:197:0x9F:0x91
-
-# Panther
-R:198:0xA7:0x84
-
-# Brigand
-R:199:0xB0:0x94
-
-# Gray mewlip
-R:200:0xBF:0xA8
-
-# Orange mewlip
-R:201:0xBF:0xA9
-
-# Undead mass
-R:202:0xB0:0x97
-
-# Bloodshot mewlip
-R:203:0xBF:0xAA
-
-# Hatchling multi-hued dragon
-R:204:0xA6:0x83
-
-# Green mewlip
-R:205:0xBF:0xAB
-
-# Old Man Willow
-R:206:0xBA:0x89
-
-# Blue mewlip
-R:207:0xBF:0xAC
-
-# Zombified orc
-R:208:0xAC:0x8C
-
-# Hippogryph
-R:209:0xA0:0x8A
-
-# Black mamba
-R:210:0xA2:0x92
-
-# White wolf
-R:211:0x9D:0x9F
-
-# Grape jelly
-R:212:0xA8:0x92
-
-# Nether worm mass
-R:213:0xAD:0x83
-
-# Brown mewlip
-R:214:0xBF:0xAD
-
-# Golfimbul, the Hill Orc Chief
-R:215:0xA9:0x94
-
-# Swordsman
-R:216:0x97:0x81
-
-# Stone mewlip
-R:217:0xBF:0xAE
-
-# Hatchling bronze dragon
-R:218:0xA6:0x82
-
-# Hatchling gold dragon
-R:219:0xA6:0x82
-
-# Evil eye
-R:220:0xC4:0x91
-
-# Yellow mewlip
-R:221:0xBF:0xAF
-
-# Pink mewlip
-R:222:0xBF:0xB0
-
-# Tree mewlip
-R:223:0xBF:0xB1
-
-# Air mewlip
-R:224:0xBF:0xB2
-
-# Priest
-R:225:0xAA:0x9E
-
-# Dark elven priest
-R:226:0xA7:0x99
-
-# Air spirit
-R:227:0x9E:0x9F
-
-# Skeleton human
-R:228:0xAC:0x8B
-
-# Zombified human
-R:229:0xAD:0x8E
-
-# Tiger
-R:230:0xA7:0x85
-
-# Moaning spirit
-R:231:0x9F:0x9C
-
-# Plague mewlip
-R:232:0xBF:0xB3
-
-# Spotted jelly
-R:233:0xA8:0x93
-
-# Drider
-R:234:0xA3:0x80
-
-# Mongbat
-R:235:0xB0:0x9C
-
-# Killer brown beetle
-R:236:0xA0:0x9B
-
-# Death mewlip
-R:237:0xBF:0xB4
-
-# Ogre
-R:238:0xA1:0x8B
-
-# Creeping mithril coins
-R:239:0x9D:0x83
-
-# Illusionist
-R:240:0xAB:0x80
-
-# Druid
-R:241:0xAB:0x81
-
-# Fuinur, Lord of the Haradrim
-R:242:0xBF:0xB5
-
-# Cloaker
-R:243:0x89:0x88
-
-# Black orc
-R:244:0xA9:0x95
-
-# Ochre jelly
-R:245:0xA8:0x94
-
-# Software bug
-R:246:0xB0:0x9D
-
-# Lurker
-R:247:0x80:0x81
-
-# Tangleweed
-R:248:0xC4:0x92
-
-# Glorfindel of Rivendell
-R:249:0xBF:0xB6
-
-# Giant white dragonfly
-R:250:0x9F:0x93
-
-# Snaga sapper
-R:251:0xB9:0x8C
-
-# Finrod Felagund
-R:252:0xBF:0xB7
-
-# Gibbering mouther
-R:253:0xB0:0x9E
-
-# Maedhros the Tall
-R:254:0xBF:0xB8
-
-# Hill giant
-R:255:0xA1:0x91
-
-# Flesh golem
-R:256:0xA7:0x89
-
-# Warg
-R:257:0x9E:0x80
-
-# Cheerful leprawn
-R:258:0xB1:0x80
-
-# Giant flea
-R:259:0x9F:0x92
-
-# Ufthak of Cirith Ungol
-R:260:0xBA:0x8C
-
-# Clay golem
-R:261:0xB8:0x9D
-
-# Black ogre
-R:262:0xA1:0x8C
-
-# Maglor the Mighty Singer
-R:263:0xBF:0xB9
-
-# Half-orc
-R:264:0xBA:0x8D
-
-# Dark naga
-R:265:0xB8:0x9E
-
-# Poison ivy
-R:266:0xC4:0x93
-
-# Magic mushroom patch
-R:267:0x9D:0x8B
-
-# Celegorm the Fair
-R:268:0xBF:0xBA
-
-# Guardian naga
-R:269:0xA9:0x8B
-
-# Wererat
-R:270:0xBA:0x8E
-
-# Light hound
-R:271:0xA4:0x93
-
-# Dark hound
-R:272:0xA4:0x94
-
-# Flying skull
-R:273:0xB1:0x81
-
-# Caranthir the Dark
-R:274:0xBF:0xBB
-
-# Giant tarantula
-R:275:0xA3:0x81
-
-# Curufin the Crafty
-R:276:0xBF:0xBC
-
-# Mirkwood spider
-R:277:0xA3:0x82
-
-# Frost giant
-R:278:0xA1:0x92
-
-# Griffon
-R:279:0xA0:0x8B
-
-# Aewrog
-R:280:0xA0:0x94
-
-# Gnome mage
-R:281:0xA7:0x98
-
-# Clear hound
-R:282:0xA4:0x95
-
-# Umber hulk
-R:283:0xA3:0x99
-
-# Rust monster
-R:284:0xB9:0x8F
-
-# Ogrillon
-R:285:0xA9:0x98
-
-# Gelatinous cube
-R:286:0xA8:0x95
-
-# Giant green dragonfly
-R:287:0x9F:0x94
-
-# Fire giant
-R:288:0xA1:0x93
-
-# Hummerhorn
-R:289:0xBA:0x8F
-
-# Lizard man
-R:290:0xB9:0x90
-
-# Ulfast, Son of Ulfang
-R:291:0xAB:0x82
-
-# Crebain
-R:292:0xC4:0x94
-
-# Berserker
-R:293:0xA9:0x97
-
-# Draugrog
-R:294:0xA0:0x95
-
-# Sphinx
-R:295:0xB9:0x91
-
-# Narrog
-R:296:0xA0:0x96
-
-# Forest troll
-R:297:0xA3:0x89
-
-# Freezing sphere
-R:298:0xBA:0x91
-
-# Jumping fireball
-R:299:0xB9:0x92
-
-# Ball lightning
-R:300:0xBA:0x92
-
-# 2-headed hydra
-R:301:0xA2:0x93
-
-# Swamp thing
-R:302:0xB9:0x93
-
-# Water spirit
-R:303:0x9F:0x80
-
-# Giant red scorpion
-R:304:0xA3:0x83
-
-# Earth spirit
-R:305:0x9F:0x81
-
-# Fire spirit
-R:306:0x9F:0x82
-
-# Fire hound
-R:307:0xA4:0x96
-
-# Cold hound
-R:308:0xA4:0x97
-
-# Energy hound
-R:309:0xA4:0x98
-
-# Lesser mimic
-R:310:0x9D:0x8E
-
-# Door mimic
-R:311:0x82:0x83
-
-# Blink dog
-R:312:0x9E:0x81
-
-# Uruk
-R:313:0xA9:0x99
-
-# Shagrat, the Orc Captain
-R:314:0xA9:0x9A
-
-# Gorbag, the Orc Captain
-R:315:0xA9:0x9B
-
-# Shambling mound
-R:316:0x9D:0x8C
-
-# Venus Flytrap
-R:317:0xC4:0x95
-
-# Amrod, Son of Feanor
-R:318:0xBF:0xBD
-
-# Amras, Son of Feanor
-R:319:0xBF:0xBD
-
-# Giant bronze dragonfly
-R:320:0x9F:0x98
-
-# Stone giant
-R:321:0xA1:0x94
-
-# Giant black dragonfly
-R:322:0x9F:0x96
-
-# Stone golem
-R:323:0xA7:0x8B
-
-# Red mold
-R:324:0xA9:0x85
-
-# Giant gold dragonfly
-R:325:0x9F:0x97
-
-# Telchar the Smith
-R:326:0xBF:0xBE
-
-# Ghast
-R:327:0xBA:0x95
-
-# Neekerbreeker
-R:328:0xC4:0x96
-
-# Huorn
-R:329:0xBA:0x96
-
-# Bolg, Son of Azog
-R:330:0xA9:0x9C
-
-# Phase spider
-R:331:0xA3:0x84
-
-# Lizard king
-R:332:0xB9:0x97
-
-# Landmine
-R:333:0xBA:0x97
-
-# Roac, son of Carc
-R:334:0xC4:0xB2
-
-# Great eagle
-R:335:0xB9:0x98
-
-# Livingstone
-R:336:0xB1:0x84
-
-# Earth hound
-R:337:0xA4:0x99
-
-# Air hound
-R:338:0xA4:0x9A
-
-# Sabre-tooth tiger
-R:339:0xA7:0x86
-
-# Acid hound
-R:340:0xA4:0x9B
-
-# Chimaera
-R:341:0xA0:0x8C
-
-# Quylthulg
-R:342:0xA1:0x9A
-
-# Sasquatch
-R:343:0xA4:0x92
-
-# Carc of Ravenhill
-R:344:0xC4:0xB2
-
-# Ranger
-R:345:0xAA:0x97
-
-# Paladin
-R:346:0xAB:0x92
-
-# Werewolf
-R:347:0xBA:0x99
-
-# Dark elven lord
-R:348:0xA7:0x9C
-
-# Cloud giant
-R:349:0xA1:0x96
-
-# Ugluk, the Uruk
-R:350:0xA9:0x9D
-
-# Blue dragon bat
-R:351:0xA5:0x91
-
-# Mimic
-R:352:0x83:0x9D
-
-# Ultimate mimic
-R:353:0x84:0x9E
-
-# Fire vortex
-R:354:0xAC:0x94
-
-# Acid vortex
-R:355:0xAC:0x95
-
-# Lugdush, the Uruk
-R:356:0xB9:0x9A
-
-# Alatar, the Blue Wizard
-R:357:0xBF:0xBF
-
-# Cold vortex
-R:358:0xAC:0x96
-
-# Energy vortex
-R:359:0xAC:0x97
-
-# Globefish
-R:360:0xB9:0x9B
-
-# Giant firefly
-R:361:0x9F:0x95
-
-# Mummified orc
-R:362:0xA1:0x88
-
-# Wolf chieftain
-R:363:0xC4:0x97
-
-# Pallando, the Blue Wizard
-R:364:0xBF:0xBF
-
-# Vampiric mist
-R:365:0xB9:0x9D
-
-# Killer stag beetle
-R:366:0xA0:0x9D
-
-# Iron golem
-R:367:0xA7:0x8C
-
-# Auto-roller
-R:368:0xB1:0x86
-
-# Giant yellow scorpion
-R:369:0xA3:0x85
-
-# Muzgash, the Snaga
-R:370:0xBE:0xA0
-
-# Black ooze
-R:371:0xA8:0x96
-
-# Hardened warrior
-R:372:0xAB:0x83
-
-# Azog, King of the Uruk-Hai
-R:373:0xA9:0x9F
-
-# Bill Ferny
-R:374:0xBE:0xA1
-
-# Dark elven warlock
-R:375:0xB1:0x87
-
-# Master rogue
-R:376:0xAB:0x84
-
-# Red dragon bat
-R:377:0xA5:0x92
-
-# Killer white beetle
-R:378:0xBA:0x9E
-
-# Ice skeleton
-R:379:0xB9:0x9F
-
-# Angamaite of Umbar
-R:380:0xBB:0x80
-
-# Forest wight
-R:381:0xB1:0x88
-
-# Khim, Son of Mim
-R:382:0xB1:0x89
-
-# Ibun, Son of Mim
-R:383:0xB1:0x8A
-
-# Meneldor the Swift
-R:384:0xBB:0x81
-
-# Phantom beast
-R:385:0xB1:0x8B
-
-# Giant silver ant
-R:386:0xA0:0x9C
-
-# 4-headed hydra
-R:387:0xA2:0x95
-
-# Beruthiel, Queen of Cats
-R:388:0xBE:0xA2
-
-# The Hunter
-R:389:0xB1:0x8C
-
-# Mummified human
-R:390:0xA1:0x89
-
-# Vampire bat
-R:391:0xA5:0x93
-
-# Sangahyando of Umbar
-R:392:0xAB:0x85
-
-# It
-R:393:0xB1:0x8D
-
-# Banshee
-R:394:0x9F:0x9D
-
-# Herumor, Lord of the Haradrim
-R:395:0xBE:0xA3
-
-# Fimbrethil
-R:396:0xBB:0x84
-
-# Silent watcher
-R:397:0xB1:0x8E
-
-# Pukelman
-R:398:0xA7:0x8D
-
-# Mauhur, the Uruk
-R:399:0xBE:0xA4
-
-# Dark elven druid
-R:400:0xA7:0x9F
-
-# Stone troll
-R:401:0xA3:0x8A
-
-# Prince Imrahil the Proud
-R:402:0xBE:0xA5
-
-# Hill troll
-R:403:0xA3:0x8B
-
-# Wereworm
-R:404:0xAD:0x84
-
-# Killer red beetle
-R:405:0xA0:0x9F
-
-# Disenchanter bat
-R:406:0xC4:0x98
-
-# Umuiyan, Doorkeeper of Tevildo
-R:407:0xBE:0xA6
-
-# Giant grey ant
-R:408:0xA5:0x8C
-
-# Oikeroi, Bodyguard of Tevildo
-R:409:0xBE:0xA7
-
-# Gwaihir the Windlord
-R:410:0xBB:0x81
-
-# Giant fire tick
-R:411:0xBB:0x87
-
-# Lotho Sackville-Baggins, Betrayer of the Shire
-R:412:0xBE:0xA8
-
-# Ulwarth, Son of Ulfang
-R:413:0xAA:0x99
-
-# Werebear
-R:414:0xC4:0x8F
-
-# Cave ogre
-R:415:0xA1:0x8D
-
-# White wraith
-R:416:0xA3:0x9F
-
-# Thranduil, King of the Wood Elves
-R:417:0xBE:0xA9
-
-# Ghoul
-R:418:0xB4:0x8F
-
-# Mim, Betrayer of Turin
-R:419:0xB1:0x90
-
-# Hellblade
-R:420:0xB1:0x91
-
-# Killer fire beetle
-R:421:0xA1:0x80
-
-# Denethor, Steward of Gondor
-R:422:0xBE:0xAA
-
-# Creeping adamantite coins
-R:423:0x9D:0x84
-
-# Algroth
-R:424:0xA3:0x8C
-
-# Boromir, Son of Denethor
-R:425:0xBE:0xAB
-
-# Roper
-R:426:0xB9:0x80
-
-# Headless
-R:427:0xB1:0x92
-
-# Vibration hound
-R:428:0xA4:0x9C
-
-# Nexus hound
-R:429:0xA4:0x9D
-
-# Half-ogre
-R:430:0xA1:0x8E
-
-# Lokkak, the Ogre Chieftain
-R:431:0xA1:0x90
-
-# Vampire
-R:432:0xA3:0x9A
-
-# Gorgimaera
-R:433:0xA0:0x8D
-
-# Faramir, Son of Denethor
-R:434:0xBE:0xAC
-
-# Colbran
-R:435:0xA7:0x8E
-
-# Spirit naga
-R:436:0xA9:0x8C
-
-# Harry Goatleaf, Gatekeeper of Bree
-R:437:0xBE:0xAD
-
-# The Watcher of Cirith Ungol
-R:438:0xB1:0x8E
-
-# Stairway to Hell
-R:439:0xB1:0x94
-
-# 5-headed hydra
-R:440:0xA2:0x96
-
-# Tom Bombadil
-R:441:0xBE:0xAE
-
-# Wainrider
-R:442:0xAB:0x88
-
-# Seahorse
-R:443:0xBB:0x89
-
-# Cyclops
-R:444:0xBB:0x8A
-
-# Clairvoyant
-R:445:0xAB:0x86
-
-# Purple worm
-R:446:0xB9:0x82
-
-# Catoblepas
-R:447:0xAC:0x81
-
-# Lesser wall monster
-R:448:0xB1:0x96
-
-# Mage
-R:449:0xAB:0x8A
-
-# Mind flayer
-R:450:0xAB:0x8B
-
-# The Ultimate Dungeon Cleaner
-R:451:0xB1:0x97
-
-# The Mewlip Queen
-R:452:0xBE:0xAF
-
-# Basilisk
-R:453:0xA2:0x97
-
-# Snow-troll
-R:454:0xA3:0x8D
-
-# Fluithuin the Ogress, Consort of Morgoth
-R:455:0xBE:0xB0
-
-# Ulbandi the Ogress, Consort of Morgoth
-R:456:0xBE:0xB1
-
-# Naugladur, Lord of Nogrod
-R:457:0xBE:0xB2
-
-# Greater mimic
-R:458:0xB1:0x9A
-
-# Young blue dragon
-R:459:0xA6:0x84
-
-# Young white dragon
-R:460:0xA6:0x85
-
-# Young green dragon
-R:461:0xA6:0x86
-
-# Young bronze dragon
-R:462:0xA6:0x87
-
-# Androg the Outlaw
-R:463:0xBE:0xB3
-
-# Mithril golem
-R:464:0xA7:0x8F
-
-# Skeleton troll
-R:465:0xAC:0x8D
-
-# Amlach, son of Imlach
-R:466:0xBE:0xB4
-
-# Beorn, the Shape-Changer
-R:467:0xC4:0x99
-
-# Thorondor, Lord of Eagles
-R:468:0xBB:0x81
-
-# Giant blue ant
-R:469:0xA5:0x8B
-
-# Grave wight
-R:470:0xAD:0x9C
-
-# Shadow drake
-R:471:0xA6:0x88
-
-# Manticore
-R:472:0xA0:0x8E
-
-# Giant army ant
-R:473:0xAE:0x81
-
-# Killer slicer beetle
-R:474:0xA1:0x81
-
-# Gorgon
-R:475:0xBB:0x8D
-
-# Radagast the Brown
-R:476:0xBE:0xB5
-
-# Ghost
-R:477:0x9F:0x9E
-
-# Death watch beetle
-R:478:0xA1:0x82
-
-# Mountain ogre
-R:479:0xA1:0x8F
-
-# Nexus quylthulg
-R:480:0xA1:0x9B
-
-# Shelob, Spider of Darkness
-R:481:0xA3:0x86
-
-# Giant squid
-R:482:0xB9:0x83
-
-# Ghoulking
-R:483:0xAD:0x8C
-
-# Doombat
-R:484:0xB9:0x84
-
-# Easterling
-R:485:0xAB:0x8C
-
-# Memory moss
-R:486:0xA9:0x86
-
-# Storm giant
-R:487:0xA1:0x95
-
-# Spectator
-R:488:0xB1:0x9B
-
-# Bjorn the Warper
-R:489:0xC4:0x99
-
-# Vaire, the Weaver
-R:490:0xBE:0xB6
-
-# Half-troll
-R:491:0xA9:0x9E
-
-# Irmo of Lorien
-R:492:0xBE:0xB7
-
-# Bert the Stone Troll
-R:493:0xA3:0x90
-
-# Bill the Stone Troll
-R:494:0xA3:0x91
-
-# Tom the Stone Troll
-R:495:0xA3:0x92
-
-# Cave troll
-R:496:0xA3:0x8E
-
-# Este, the Gentle
-R:497:0xBE:0xB8
-
-# Barrow wight
-R:499:0xA4:0x81
-
-# Skeleton ettin
-R:500:0xC4:0x9A
-
-# Chaos drake
-R:501:0xA6:0x89
-
-# Law drake
-R:502:0xA6:0x8A
-
-# Balance drake
-R:503:0xA6:0x8B
-
-# Ethereal drake
-R:504:0xA6:0x8C
-
-# Groo, the Wanderer
-R:505:0xB1:0x9E
-
-# Nessa the Lithe
-R:506:0xBE:0xB9
-
-# Shade
-R:507:0xA4:0x89
-
-# Spectre
-R:508:0xA0:0x80
-
-# Water troll
-R:509:0xA3:0x93
-
-# Fire elemental
-R:510:0x9F:0x83
-
-# Water elemental
-R:512:0x9F:0x84
-
-# Multi-hued hound
-R:513:0xB2:0x81
-
-# Invisible stalker
-R:514:0x9F:0x85
-
-# Vana, the Ever-young
-R:515:0xBE:0xBA
-
-# Master thief
-R:516:0xAB:0x8E
-
-# The Watcher in the Water
-R:517:0xAF:0x95
-
-# Lich
-R:518:0xA1:0x83
-
-# Gas spore
-R:519:0xB2:0x8E
-
-# Master vampire
-R:520:0xA3:0x9B
-
-# Oriental vampire
-R:521:0xB2:0x83
-
-# Greater mummy
-R:522:0xA1:0x8A
-
-# Ingeborg, the Runemistress
-R:523:0xBE:0xBB
-
-# Giant grey scorpion
-R:524:0xA3:0x87
-
-# Earth elemental
-R:525:0x9F:0x86
-
-# Air elemental
-R:526:0x9F:0x87
-
-# Shimmering mold
-R:527:0xAF:0x81
-
-# Sarnrog
-R:528:0xBB:0x91
-
-# Malicious leprawn
-R:529:0xB2:0x85
-
-# Eog golem
-R:530:0xA7:0x90
-
-# Lindal Lossehelin
-R:531:0xBE:0xBC
-
-# Variag
-R:532:0x04:0x70
-
-# Headless ghost
-R:533:0xBB:0x92
-
-# Dread
-R:534:0xB9:0x87
-
-# Zizzo, Last of the Yeeks
-R:535:0xC3:0xAF
-
-# Gauth
-R:536:0xC4:0x9B
-
-# Smoke elemental
-R:537:0x9F:0x90
-
-# Olog
-R:538:0xA3:0x94
-
-# Halfling slinger
-R:539:0xB2:0x86
-
-# Gravity hound
-R:540:0xA4:0x9E
-
-# Acidic cytoplasm
-R:541:0xA8:0x97
-
-# Inertia hound
-R:542:0xA4:0x9F
-
-# Impact hound
-R:543:0xA5:0x80
-
-# Shardstorm
-R:544:0xC4:0x9C
-
-# Ooze elemental
-R:545:0x9F:0x88
-
-# Young black dragon
-R:546:0xA6:0x8D
-
-# Mumak
-R:547:0xAC:0x84
-
-# Giant fire ant
-R:548:0xA5:0x8A
-
-# Cold-drake
-R:549:0xA6:0x8E
-
-# Xorn
-R:550:0xA4:0x8F
-
-# Rogrog the Black Troll
-R:551:0xA3:0x8F
-
-# Erianyth, the Sorceress
-R:552:0xA7:0x91
-
-# Phantom
-R:553:0xB2:0x87
-
-# Grey wraith
-R:554:0xA4:0x82
-
-# Revenant
-R:555:0xA4:0x88
-
-# Young multi-hued dragon
-R:556:0xA6:0x8F
-
-# Karrazix the Brave
-R:557:0x9E:0x89
-
-# Colossus
-R:558:0xB2:0x89
-
-# Young gold dragon
-R:559:0xA6:0x90
-
-# Blue drake
-R:560:0xA6:0x91
-
-# Green drake
-R:561:0xA6:0x92
-
-# Bronze drake
-R:562:0xA6:0x93
-
-# Young red dragon
-R:563:0xA6:0x94
-
-# Sir Physt
-R:564:0x0B:0x56
-
-# Trapper
-R:565:0xAD:0x9F
-
-# Adanrog
-R:566:0xA0:0x98
-
-# Time bomb
-R:567:0xBB:0x96
-
-# Rawrog
-R:568:0xAD:0x90
-
-# Nick LeYeek, Second Last of the Yeeks
-R:569:0xC3:0xB0
-
-# Ice elemental
-R:570:0x9F:0x8A
-
-# Necromancer
-R:571:0xB2:0x8C
-
-# Slappy, Abbess of Pain
-R:572:0xBE:0xBD
-
-# Lorgan, Chief of the Easterlings
-R:573:0xB2:0x8D
-
-# Snow tiger
-R:574:0xC2:0xB0
-
-# Mummified troll
-R:575:0xBB:0x97
-
-# Storm of Unmagic
-R:576:0xC4:0x9D
-
-# Crypt thing
-R:577:0xA4:0x80
-
-# Chaos butterfly
-R:578:0xBB:0x98
-
-# Time elemental
-R:579:0xB2:0x8F
-
-# Blue yeek
-R:580:0xAD:0x87
-
-# The Queen Ant
-R:581:0xA5:0x8E
-
-# Will o' the wisp
-R:582:0x9F:0x8B
-
-# Brown yeek
-R:583:0xAD:0x88
-
-# Magma elemental
-R:584:0x9F:0x8C
-
-# Black pudding
-R:585:0xA8:0x98
-
-# Killer iridescent beetle
-R:586:0xB4:0x90
-
-# Nexus vortex
-R:587:0xAE:0x80
-
-# Plasma vortex
-R:588:0xAC:0x98
-
-# Fire-drake
-R:589:0xA6:0x95
-
-# Golden drake
-R:590:0xA6:0x96
-
-# Crystal drake
-R:591:0xA6:0x97
-
-# Black drake
-R:592:0xA6:0x98
-
-# Multi-hued drake
-R:593:0xA6:0x99
-
-# Master yeek
-R:594:0xAD:0x8A
-
-# Orfax, son of Boldor
-R:595:0xAD:0x89
-
-# Boldor, King of the Yeeks
-R:596:0xAD:0x8B
-
-# Black Numenorean
-R:597:0xAB:0x94
-
-# Castamir the Usurper
-R:598:0xB2:0x90
-
-# Time vortex
-R:599:0xAC:0x99
-
-# Shimmering vortex
-R:600:0xAC:0x9A
-
-# Ancient blue dragon
-R:601:0x9E:0x88
-
-# Ancient bronze dragon
-R:602:0x9E:0x89
-
-# Beholder
-R:603:0xA6:0x9F
-
-# Emperor wight
-R:604:0xA4:0x83
-
-# Giant tree ant
-R:605:0xC4:0xB7
-
-# Vargo, Tyrant of Fire
-R:606:0x9F:0x8D
-
-# Black wraith
-R:607:0xA4:0x84
-
-# Giant yellow ant
-R:608:0xC4:0xB8
-
-# Giant green ant
-R:609:0xC4:0xB9
-
-# Aquatic ant
-R:610:0xC4:0xBA
-
-# Monastic lich
-R:611:0xA1:0x87
-
-# Nether wraith
-R:612:0xA4:0x85
-
-# Hellhound
-R:613:0xAD:0x96
-
-# 7-headed hydra
-R:614:0xA2:0x99
-
-# Waldern, King of Water
-R:615:0x9F:0x8E
-
-# Termite
-R:616:0xC4:0xB6
-
-# Ancient white dragon
-R:617:0x9E:0x8A
-
-# Ancient green dragon
-R:618:0x9E:0x8B
-
-# Giant snow bat
-R:619:0xC4:0xBB
-
-# Eldrak
-R:620:0xA3:0x97
-
-# Ettin
-R:621:0xA3:0x96
-
-# Night mare
-R:622:0xAC:0x83
-
-# Vampire lord
-R:623:0xA3:0x9C
-
-# Ancient black dragon
-R:624:0x9E:0x8C
-
-# Weird fume
-R:625:0xAF:0x80
-
-# Giant grey bat
-R:626:0xC4:0xBC
-
-# Giant silver bat
-R:627:0xC4:0xBD
-
-# Giant yellow bat
-R:628:0xC4:0xBE
-
-# Shadowfax, steed of Gandalf
-R:629:0xBB:0x9E
-
-# Spirit troll
-R:630:0xA3:0x98
-
-# War troll
-R:631:0xB2:0x94
-
-# Disenchanter worm mass
-R:632:0xAD:0x86
-
-# Rotting quylthulg
-R:633:0xA1:0x9C
-
-# Lesser titan
-R:634:0xA1:0x97
-
-# 9-headed hydra
-R:635:0xA2:0x99
-
-# Enchantress
-R:636:0xAB:0x96
-
-# Ranger chieftain
-R:637:0xAB:0x97
-
-# Sorcerer
-R:638:0xAB:0x98
-
-# Xaren
-R:639:0xA4:0x90
-
-# Giant green bat
-R:640:0xC4:0xBF
-
-# Death vortex
-R:641:0xC3:0xA5
-
-# Gas vortex
-R:642:0xC3:0xA6
-
-# Death drake
-R:643:0x9E:0x8D
-
-# Ancient red dragon
-R:644:0x9E:0x8E
-
-# Ancient gold dragon
-R:645:0x9E:0x8F
-
-# Great crystal drake
-R:646:0x9E:0x90
-
-# Mana vortex
-R:647:0xC3:0xA7
-
-# Helcungol
-R:648:0xB2:0x95
-
-# Lygrog
-R:649:0xA0:0x99
-
-# Slow vortex
-R:650:0xC3:0xA8
-
-# Nether vortex
-R:651:0xC3:0xA9
-
-# Puzzling vortex
-R:652:0xC3:0xAA
-
-# Dark yeek
-R:653:0xC3:0xAB
-
-# Judge Fire
-R:654:0xAB:0x93
-
-# White yeek
-R:655:0xC3:0xAC
-
-# Judge Mortis
-R:656:0xBC:0x82
-
-# Dark elven sorcerer
-R:657:0xA8:0x81
-
-# Master lich
-R:658:0xA1:0x84
-
-# Gray yeek
-R:659:0xC3:0xAD
-
-# Eol, the Dark Elf
-R:660:0xB2:0x99
-
-# Yellow yeek
-R:661:0xC3:0xAE
-
-# Adventurer yeek
-R:662:0xAD:0x88
-
-# Dark mushroom patch
-R:663:0xC3:0xA1
-
-# Undead beholder
-R:664:0xA7:0x80
-
-# Shadow
-R:665:0xA0:0x81
-
-# Iron lich
-R:666:0xB2:0x9C
-
-# Dread
-R:667:0xB9:0x87
-
-# Greater basilisk
-R:668:0xBC:0x83
-
-# White mushroom patch
-R:669:0xC3:0xA0
-
-# Brown mushroom patch
-R:670:0xC3:0xA2
-
-# Silver mushroom patch
-R:671:0xC3:0xA3
-
-# Green mushroom patch
-R:672:0xC3:0xA4
-
-# Mumak
-R:673:0xAC:0x82
-
-# Judge Fear
-R:674:0xA7:0x88
-
-# Ancient multi-hued dragon
-R:675:0x9E:0x91
-
-# Ethereal dragon
-R:676:0x9E:0x92
-
-# Dark elemental
-R:677:0xC3:0xB1
-
-# Slow elemental
-R:678:0xC3:0xB2
-
-# Quaker, Master of Earth
-R:679:0x9F:0x8F
-
-# Death leprawn
-R:680:0xA7:0x9E
-
-# Chaos elemental
-R:681:0xC3:0xB4
-
-# Confusion elemental
-R:682:0xC3:0xB3
-
-# Large blue snake
-R:683:0xC2:0xA8
-
-# Large silver snake
-R:684:0xC2:0xA9
-
-# Large purple snake
-R:685:0xC2:0xAA
-
-# Judge Death
-R:686:0xBC:0x99
-
-# Ariel, Queen of Air
-R:687:0x9F:0x91
-
-# 11-headed hydra
-R:688:0xA2:0x9A
-
-# Patriarch
-R:689:0xAB:0x9A
-
-# Dreadmaster
-R:690:0xA0:0x85
-
-# Drolem
-R:691:0xA7:0x92
-
-# Scatha the Worm
-R:692:0xAD:0x9B
-
-# Warrior of the Dawn
-R:693:0xB2:0x9E
-
-# Lesser black reaver
-R:694:0xA4:0x87
-
-# Large red snake
-R:695:0xC2:0xAB
-
-# Grand master thief
-R:696:0xC2:0x8A
-
-# Smaug the Golden
-R:697:0x9E:0x93
-
-# The Stormbringer
-R:698:0xB3:0x80
-
-# Knight Templar
-R:699:0xB3:0x81
-
-# Large eel
-R:700:0xC2:0xAC
-
-# Dracolich
-R:701:0x9E:0x95
-
-# Greater titan
-R:702:0xA1:0x98
-
-# Dracolisk
-R:703:0x9E:0x94
-
-# Winged Horror
-R:704:0xC4:0x9E
-
-# Killer gray beetle
-R:705:0xC2:0xA1
-
-# Killer orange beetle
-R:706:0xC2:0xA2
-
-# Killer blue beetle
-R:707:0xC2:0xA3
-
-# Ent
-R:708:0xBC:0x86
-
-# Rock giant
-R:709:0xBC:0x9D
-
-# Itangast the Fire Drake
-R:710:0x9E:0x96
-
-# Death mold
-R:711:0xA9:0x87
-
-# Killer silver beetle
-R:712:0xC2:0xA4
-
-# Killer green beetle
-R:713:0xC2:0xA5
-
-# Quickbeam, the Ent
-R:714:0xBC:0x9F
-
-# Glaurung, Father of the Dragons
-R:715:0xAD:0x9A
-
-# Behemoth
-R:716:0xBD:0x80
-
-# Killer aquatic beetle
-R:717:0xC2:0xA6
-
-# Greater wall monster
-R:718:0xB3:0x84
-
-# Menelrog
-R:719:0xAD:0x91
-
-# Mornungol
-R:720:0xAD:0x95
-
-# Killer tree beetle
-R:721:0xC2:0xA7
-
-# Nightwing
-R:722:0xAD:0x9D
-
-# 6-headed hydra
-R:723:0xC3:0xB9
-
-# Nether hound
-R:724:0xA5:0x81
-
-# Time hound
-R:725:0xA5:0x82
-
-# Plasma hound
-R:726:0xA5:0x83
-
-# Demonic quylthulg
-R:727:0xA1:0x9D
-
-# Great Storm Worm
-R:728:0x9E:0x97
-
-# Ulik the Troll
-R:729:0xBD:0x81
-
-# 8-headed hydra
-R:730:0xC3:0xBA
-
-# Oathbreaker
-R:731:0xBD:0x82
-
-# 10-headed hydra
-R:732:0xC3:0xBB
-
-# 12-headed hydra
-R:733:0xC3:0xBC
-
-# 13-headed hydra
-R:734:0xC3:0xBD
-
-# 14-headed hydra
-R:735:0xC3:0xBE
-
-# 15-headed hydra
-R:736:0xC3:0xBF
-
-# Killer hydra
-R:737:0xC2:0xA0
-
-# Old Sorcerer
-R:738:0x9C:0x8A
-
-# Ethereal hound
-R:739:0xB3:0x8A
-
-# Lesser kraken
-R:740:0xBD:0x83
-
-# Great Ice Worm
-R:741:0x9E:0x98
-
-# Demilich
-R:742:0xA4:0x8A
-
-# The Phoenix
-R:743:0x9D:0x98
-
-# Nightcrawler
-R:744:0xA4:0x8C
-
-# Forest ogre
-R:745:0xC3:0xB8
-
-# Rebel ogre
-R:746:0xA1:0x8B
-
-# Rebel giant
-R:747:0xA1:0x91
-
-# Hand druj
-R:748:0xAC:0x8E
-
-# Eye druj
-R:749:0xAC:0x8F
-
-# Skull druj
-R:750:0xAC:0x90
-
-# Chaos vortex
-R:751:0xAC:0x9B
-
-# Aether vortex
-R:752:0xAC:0x9C
-
-# Spider quylthulg
-R:753:0xC3:0xB5
-
-# Canine quylthulg
-R:754:0xC3:0xB6
-
-# Thuringwethil, the Vampire Messenger
-R:755:0xA3:0x9D
-
-# Great Worm of Fire
-R:756:0x9E:0x99
-
-# Aquatic quylthulg
-R:757:0xC3:0xB7
-
-# Adventurer quylthulg
-R:758:0xA1:0x9A
-
-# Draconic quylthulg
-R:759:0xA1:0x9E
-
-# White hulk
-R:760:0xC4:0xA0
-
-# Death hulk
-R:761:0xC4:0xA1
-
-# Fundin Bluecloak
-R:762:0xBE:0x91
-
-# Black Balrog
-R:763:0xC0:0xA9
-
-# Orange hulk
-R:764:0xC4:0xA2
-
-# Fire hulk
-R:765:0xC4:0xA3
-
-# Ancalagon the Black
-R:766:0x9E:0x9A
-
-# Forest hulk
-R:767:0xC4:0xA4
-
-# Nightwalker
-R:768:0xBD:0x85
-
-# Night hulk
-R:769:0xC4:0xA5
-
-# Silver hulk
-R:770:0xC4:0xA6
-
-# Saruman of Many Colours
-R:771:0xAB:0x9E
-
-# Harowen the Black Hand
-R:772:0xBE:0x94
-
-# Blue Balrog
-R:773:0xC0:0xAB
-
-# Dreadlord
-R:774:0xA0:0x86
-
-# Greater kraken
-R:775:0xBD:0x86
-
-# Archlich
-R:776:0xA4:0x8D
-
-# Tevildo, Prince of Cats
-R:777:0xB3:0x8F
-
-# Jabberwock
-R:778:0xC5:0x82
-
-# Chaos hound
-R:779:0xA5:0x85
-
-# Chaos hulk
-R:780:0xC4:0xA7
-
-# Beholder hive-mother
-R:781:0xBE:0x96
-
-# Leviathan
-R:782:0xBD:0x87
-
-# Great Worm of Chaos
-R:783:0x9E:0x9B
-
-# Great Worm of Law
-R:784:0x9E:0x9C
-
-# Great Worm of Balance
-R:785:0x9E:0x9D
-
-# Yellow hulk
-R:786:0xC4:0xA8
-
-# White Balrog
-R:787:0xC0:0xAA
-
-# Red hulk
-R:788:0xC4:0xA9
-
-# Trone, the Rebel Thunderlord
-R:789:0x08:0x42
-
-# Great Worm of Many Colours
-R:790:0xB3:0x93
-
-# Marda, rider of gold Laronth
-R:791:0xB3:0x94
-
-# Tselakus, the Dreadlord
-R:792:0xA0:0x87
-
-# Sky Drake
-R:793:0xB3:0x95
-
-# Eilinel the Entrapped
-R:794:0xA0:0x83
-
-# Dagorrog
-R:795:0xC5:0x84
-
-# Green hulk
-R:796:0xC4:0xAA
-
-# Blue hulk
-R:797:0xC4:0xAB
-
-# Black reaver
-R:798:0xA1:0x85
-
-# Master mindcrafter
-R:799:0xAB:0x9F
-
-# Greater demonic quylthulg
-R:800:0xA1:0x9F
-
-# Greater draconic quylthulg
-R:801:0xA2:0x80
-
-# Greater rotting quylthulg
-R:802:0xA2:0x81
-
-# Invisible Horror
-R:803:0xBC:0x88
-
-# Feagwath, the Undead Sorcerer
-R:804:0xA1:0x86
-
-# Silver wraith
-R:805:0xA3:0x9F
-
-# Adventurer wraith
-R:806:0xA4:0x81
-
-# Balrog Captain
-R:807:0xC0:0xAC
-
-# Ungoliant, the Unlight
-R:808:0xA3:0x88
-
-# Vampire orc
-R:809:0xC0:0xA0
-
-# Vampire yeek
-R:810:0xC0:0xA1
-
-# Aether hound
-R:811:0xA5:0x86
-
-# Greater Balrog
-R:812:0xC0:0xAD
-
-# Vampire ogre
-R:813:0xC0:0xA2
-
-# Vampire troll
-R:814:0xC0:0xA3
-
-# Vampire dwarf
-R:815:0xC0:0xA4
-
-# Vampire elf
-R:816:0xC0:0xA5
-
-# Vampire gnome
-R:817:0xC0:0xA6
-
-# The Mouth of Sauron
-R:818:0xBE:0x9E
-
-# The Necromancer of Dol Guldur
-R:819:0xB3:0x9E
-
-# Lisa, rider of gold Romth
-R:820:0xB3:0x9F
-
-# Master quylthulg
-R:821:0xA2:0x82
-
-# Qlzqqlzuup, the Lord of Flesh
-R:822:0xA2:0x83
-
-# Vampire adventurer
-R:823:0xA3:0x9A
-
-# Flare, rider of bronze Moonth
-R:824:0xB4:0x80
-
-# Maeglin, the Traitor of Gondolin
-R:825:0xA4:0x8E
-
-# Snow-frog
-R:826:0xC1:0xBE
-
-# Swamp lizard
-R:827:0xC1:0xBD
-
-# Giant silver frog
-R:828:0xC1:0xBE
-
-# Greater Hellhound
-R:829:0x9E:0x83
-
-# Cantoras, the Skeletal Lord
-R:830:0xAC:0x91
-
-# Blue lizard
-R:831:0xC1:0xBF
-
-# Death dragonfly
-R:832:0xC1:0xB3
-
-# Giant swamp dragonfly
-R:833:0xC1:0xB4
-
-# Giant red dragonfly
-R:834:0xC1:0xB5
-
-# Giant forest dragonfly
-R:835:0xC1:0xB6
-
-# Giant blue dragonfly
-R:836:0xC1:0xB7
-
-# Giant brown dragonfly
-R:837:0xC1:0xB8
-
-# The Tarrasque
-R:838:0xBC:0x93
-
-# Lungorthin, the Balrog of White Fire
-R:839:0xBF:0x86
-
-# Draugluin, Sire of All Werewolves
-R:840:0xBF:0x87
-
-# Giant silver dragonfly
-R:841:0xC1:0xB9
-
-# Giant violet dragonfly
-R:842:0xC1:0xBA
-
-# Giant pink dragonfly
-R:843:0xC1:0xBB
-
-# Vecna, the Emperor Lich
-R:844:0xB4:0x85
-
-# Aquatic dragonfly
-R:845:0xC1:0xBC
-
-# Giant red mouse
-R:846:0xC1:0xB0
-
-# Great Wyrm of Power
-R:847:0xB4:0x87
-
-# Giant blue mouse
-R:848:0xC1:0xB1
-
-# Giant yellow mouse
-R:849:0xC1:0xB2
-
-# Carcharoth, the Jaws of Thirst
-R:850:0x9E:0x86
-
-# Giant pink rat
-R:851:0xC1:0xAE
-
-# Giant tree rat
-R:852:0xC1:0xAF
-
-# Huan, Wolfhound of the Valar
-R:853:0x9E:0x87
-
-# Polar bear
-R:854:0xC1:0xA8
-
-# Blue bear
-R:855:0xC1:0xA9
-
-# Gothmog, the High Captain of Balrogs
-R:856:0xAD:0x98
-
-# Old bear
-R:857:0xC1:0xAA
-
-# Sarko, rider of gold Foronth
-R:858:0xB4:0x8C
-
-# Teddy bear
-R:859:0xC1:0xAB
-
-# Sauron, the Sorcerer
-R:860:0xAC:0x80
-
-# DarkGod, the Mighty Coder of Hell
-R:861:0xC0:0x9D
-
-# Morgoth, Lord of Darkness
-R:862:0xB4:0x8E
-
-# Human Warrior
-R:863:0xB5:0x80
-
-# Elven archer
-R:864:0xB5:0x81
-
-# Dwarven warrior
-R:865:0xB5:0x82
-
-# Elite uruk
-R:866:0xB5:0x83
-
-# Fire bear
-R:867:0xC1:0xAC
-
-# The Variant Maintainer
-R:868:0xBC:0x8B
-
-# Random Number Generator
-R:869:0xBC:0x8A
-
-# Rocket mine
-R:870:0xBD:0x88
-
-# Bouncing mine
-R:871:0xBD:0x89
-
-# Durin's Bane
-R:872:0xBF:0x89
-
-# Aquatic bear
-R:873:0xC1:0xAD
-
-# Rot jelly
-R:874:0xBD:0x8A
-
-# Death
-R:875:0xBD:0x8B
-
-# Famine
-R:876:0xBD:0x8D
-
-# Pestilence
-R:877:0xBD:0x8C
-
-# War
-R:878:0xBD:0x8E
-
-# Pike
-R:879:0xBD:0x8F
-
-# Electric eel
-R:880:0xBD:0x90
-
-# Giant crayfish
-R:881:0xBD:0x91
-
-# Mermaid
-R:882:0xBD:0x92
-
-# Box jellyfish
-R:883:0xBA:0x81
-
-# Giant piranha
-R:884:0xB6:0x9D
-
-# Piranha
-R:885:0xB6:0x9D
-
-# Swamp naga
-R:886:0xC1:0xA2
-
-# Ocean naga
-R:887:0xC1:0xA3
-
-# Snail
-R:888:0xBE:0xBE
-
-# Whale
-R:889:0xBA:0x98
-
-# Sand mite
-R:890:0xBD:0x98
-
-# Octopus
-R:891:0xBD:0x99
-
-# Giant octopus
-R:892:0xBD:0x9A
-
-# Eye of the deep
-R:893:0xBD:0x9B
-
-# Murk dweller
-R:894:0xBF:0x8B
-
-# Drowned soul
-R:895:0xBF:0x8C
-
-# Tiger shark
-R:896:0xBF:0x8D
-
-# Hammerhead shark
-R:897:0xBA:0x90
-
-# Great white shark
-R:898:0xBB:0x82
-
-# Aquatic golem
-R:899:0xBF:0x8E
-
-# Brown naga
-R:900:0xC1:0xA4
-
-# White shark
-R:901:0xBB:0x82
-
-# Scrag
-R:902:0xBF:0x91
-
-# Jaws
-R:903:0xBB:0x8C
-
-# Silver naga
-R:904:0xC1:0xA5
-
-# Aquatic elven warrior
-R:905:0xBF:0x94
-
-# Aquatic elven mage
-R:906:0xBF:0x95
-
-# Stargazer
-R:907:0xBF:0x96
-
-# Elder stargazer
-R:908:0xBF:0x97
-
-# Flounder
-R:909:0xBF:0x98
-
-# Giant turtle
-R:910:0xBF:0x99
-
-# Hatchling dragon turtle
-R:911:0xBF:0x9A
-
-# Young dragon turtle
-R:912:0xBF:0x9B
-
-# Mature dragon turtle
-R:913:0xBF:0x9C
-
-# Ancient dragon turtle
-R:914:0xBF:0x9D
-
-# Fastitocalon
-R:915:0xBF:0x9E
-
-# Undead stargazer
-R:916:0xBF:0x9F
-
-# Killer whale
-R:917:0xB9:0x9C
-
-# Merrow
-R:918:0xC5:0x85
-
-# Water naga
-R:919:0xC0:0x81
-
-# Night naga
-R:920:0xC1:0xA6
-
-# Tree naga
-R:921:0xC1:0xA7
-
-# Moby Dick, the White Whale
-R:922:0xC0:0x80
-
-# Aquatic hound
-R:923:0xC0:0x85
-
-# Gaurrog
-R:924:0xC0:0x86
-
-# Adventurer naga
-R:925:0xA9:0x88
-
-# White mold
-R:926:0xC2:0xBD
-
-# Silver mold
-R:927:0xC2:0xBE
-
-# Mathilde
-R:928:0xBD:0x9C
-
-# Child spirit
-R:929:0xBD:0x9D
-
-# Young spirit
-R:930:0xBD:0x9E
-
-# Mature spirit
-R:931:0xBD:0x9F
-
-# Experienced spirit
-R:932:0xBE:0x80
-
-# Wise spirit
-R:933:0xBE:0x81
-
-# Fangorn the Treebeard, Lord of the Ents
-R:934:0xC0:0x8A
-
-# Gandalf the Grey
-R:935:0xC0:0x8B
-
-# Nar, the Dwarf
-R:936:0xC0:0x8C
-
-# Apprentice mindcrafter
-R:937:0xAA:0x9A
-
-# Great Swamp Worm
-R:938:0xC5:0x86
-
-# Great Bile Worm
-R:939:0xC5:0x87
-
-# Blue Firebird
-R:940:0xBE:0x82
-
-# Green Firebird
-R:941:0xBE:0x83
-
-# Brown Firebird
-R:942:0xBE:0x84
-
-# Bronze Firebird
-R:943:0xBE:0x85
-
-# Gold Firebird
-R:944:0xBE:0x86
-
-# High-elven ranger
-R:945:0xBE:0x87
-
-# Uvatha the Horseman
-R:946:0xC0:0x90
-
-# Adunaphel the Quiet
-R:947:0xC0:0x91
-
-# Akhorahil the Blind
-R:948:0xC0:0x92
-
-# Ren the Unclean
-R:949:0xC0:0x93
-
-# Ji Indur Dawndeath
-R:950:0xC0:0x94
-
-# Dwar, Dog Lord of Waw
-R:951:0xC0:0x95
-
-# Hoarmurath of Dir
-R:952:0xC0:0x96
-
-# Khamul, the Black Easterling
-R:953:0xC0:0x97
-
-# The Witch-King of Angmar
-R:954:0xC0:0x98
-
-# Green Thunderlord
-R:955:0xB3:0x96
-
-# Blue Thunderlord
-R:956:0xB3:0x8E
-
-# Brown Thunderlord
-R:957:0xB3:0x98
-
-# Bronze Thunderlord
-R:958:0xB3:0x98
-
-# Gold Thunderlord
-R:959:0xB3:0x94
-
-# Blood Sprout
-R:960:0xBE:0x88
-
-# Gorlim the Unhappy
-R:961:0xC0:0x99
-
-# Pink mold
-R:962:0xC2:0xBF
-
-# Aranea
-R:963:0xC1:0x9A
-
-# Elder aranea
-R:964:0xC0:0x9A
-
-# Giant brown tick
-R:965:0xC5:0x88
-
-# Wavelord
-R:966:0xC0:0x9C
-
-# Novice possessor (soul)
-R:967:0xC4:0x86
-
-# Bat of Gorgoroth
-R:968:0xC5:0x97
-
-# The Princess
-R:969:0xC5:0x98
-
-# Merton Proudfoot, the lost hobbit
-R:970:0xC5:0x99
-
-# The Wight-King of the Barrow-downs
-R:971:0xA4:0x81
-
-# Adventurer
-R:972:0xC5:0x9B
-
-# Experienced possessor (soul)
-R:973:0xC5:0x9C
-
-# Old possessor (soul)
-R:974:0xC5:0x9D
-
-# Tree mold
-R:975:0xC1:0xA0
-
-# Bronze dragon worm
-R:976:0xC6:0x80
-
-# Gold dragon worm
-R:977:0xC5:0x9F
-
-# Defenceless Mold
-R:978:0xBC:0x89
-
-# Blue mold
-R:979:0xC1:0xA1
-
-# Ar-Pharazon the Golden
-R:980:0xC0:0x9E
-
-# Doppleganger
-R:981:0x97:0x8C
-
-# Marylene, Heartbreakeress of the Netherworld
-R:982:0xC1:0x8D
-
-# Adventurer mold
-R:983:0xA9:0x81
-
-# Gnome paladin
-R:984:0xC2:0xB7
-
-# Bandobras Took
-R:985:0xA7:0x9B
-
-# 3-headed hydra
-R:986:0xA2:0x94
-
-# Uldor the Accursed
-R:987:0xAB:0x95
-
-# Mystic
-R:988:0xAB:0x9B
-
-# Elder vampire
-R:989:0xA1:0x99
-
-# Ulfang the Black
-R:990:0xAA:0x96
-
-# Demonologist
-R:991:0xA8:0x82
-
-# Ungorrog
-R:992:0xA2:0x9C
-
-# Faunungol
-R:993:0xA2:0x8E
-
-# Naurungol
-R:994:0xC2:0x8E
-
-# Sererrog
-R:995:0xC2:0x8F
-
-# Red Balrog
-R:996:0xC0:0xA8
-
-# Master mystic
-R:997:0xAA:0x94
-
-# Grand master mystic
-R:998:0xAB:0x9D
-
-# Morgulrog
-R:999:0xA0:0x84
-
-# Novice mindcrafter
-R:1000:0xAA:0x9A
-
-# Gnome lord
-R:1001:0xC2:0xB8
-
-# Great Worm of Perplexity
-R:1002:0xC2:0x92
-
-# Gnome mystic
-R:1003:0xC2:0xBA
-
-# Great Worm of Thunder
-R:1004:0xC5:0x8A
-
-# Silver mouse
-R:1005:0xC5:0x8B
-
-# The Rat King
-R:1006:0xC2:0x96
-
-# Gnome priest
-R:1007:0xC2:0xB9
-
-# Black midge
-R:1008:0xC2:0x98
-
-# Fire Phantom
-R:1009:0xC2:0x99
-
-# The Insane Player
-R:1010:0x92:0x81
-
-# Gnome rogue
-R:1011:0xC2:0xBB
-
-# Vermicious Knid
-R:1012:0xC2:0x9B
-
-# Bone golem
-R:1013:0xC2:0x9C
-
-# Gnome warrior
-R:1014:0xC2:0xBC
-
-# Bronze golem
-R:1015:0xC5:0x8C
-
-# Wizard leprawn
-R:1016:0xC2:0xB5
-
-# Kender
-R:1017:0xC2:0xB6
-
-# Adventurer gnome
-R:1018:0xC2:0xBC
-
-# Tree cat
-R:1019:0xC2:0xB1
-
-# Night cat
-R:1020:0xC2:0xB2
-
-# Leopard
-R:1021:0xC2:0xB3
-
-# Cheshire cat
-R:1022:0xC2:0xB4
-
-# Blue dragon worm
-R:1023:0xC3:0x8E
-
-# White dragon worm
-R:1024:0xC3:0x8F
-
-# Green dragon worm
-R:1025:0xC3:0x92
-
-# Black dragon worm
-R:1026:0xC3:0x91
-
-# Red dragon worm
-R:1027:0xC3:0x90
-
-# Multi-hued dragon worm
-R:1028:0xC3:0x93
-
-# The Minotaur of the Labyrinth
-R:1029:0xC3:0x94
-
-# The Sandworm Queen
-R:1030:0xC3:0x9B
-
-# Sandworm
-R:1031:0xC3:0x9C
-
-# Tik'srvzllat
-R:1032:0xC3:0x9D
-
-# The Glass Golem
-R:1033:0xC5:0x8E
-
-# Elenwe the Lost
-R:1034:0xBE:0xBF
-
-# Golgarach, the Living Rock
-R:1035:0x80:0x84
-
-# Sanctimonious-looking preacher
-R:1036:0xC2:0xAD
-
-# Weary-looking traveller
-R:1037:0xC2:0xAE
-
-# Water hound
-R:1038:0xC6:0x88
-
-# Improv, the mighty MoLD
-R:1039:0xC6:0x8E
-
-# Emperor mimic
-R:1040:0xC6:0x9C
-
-# Melinda Proudfoot
-R:1041:0x88:0xAA
-
-# Thrain, the King Under the Mountain
-R:1042:0x88:0xAB
-
-# Fire golem
-R:1043:0x8C:0xA0
-
-# Melkor, Lord of Darkness
-R:1044:0x8C:0xA1
-
-# Spirit
-R:1045:0x92:0x9F
-
-# Spirit
-R:1046:0x92:0xA0
-
-# Spirit
-R:1047:0x92:0xA1
-
-# Spirit
-R:1048:0x92:0xA2
-
-# Spirit
-R:1049:0x92:0xA3
-
-# Spirit
-R:1050:0x92:0xA4
-
-# Spirit
-R:1051:0x92:0xA5
-
-# Spirit
-R:1052:0x92:0xA6
-
-# Spirit
-R:1053:0x92:0xA7
-
-# Spirit
-R:1054:0x92:0xA8
-
-# Spirit
-R:1055:0x92:0xA9
-
-# Spirit
-R:1056:0x92:0xAA
-
-# Spirit
-R:1057:0x92:0xA3
-
-# Spirit
-R:1058:0x92:0xAB
-
-# Spirit
-R:1059:0x92:0xAC
-
-# Spirit
-R:1060:0x92:0xAD
-
-# Spirit
-R:1061:0x92:0xAE
-
-# Spirit
-R:1062:0x92:0xAF
-
-# Spirit
-R:1063:0x92:0xB0
-
-# Spirit
-R:1064:0x92:0xB1
-
-# Spirit
-R:1065:0x92:0xB2
-
-# Spirit
-R:1066:0x92:0xB3
-
-# Spirit
-R:1067:0x92:0xB4
-
-# Spirit
-R:1068:0x92:0xB5
-
-# Spirit
-R:1069:0x92:0xB6
-
-# Spirit
-R:1070:0x92:0xB7
-
-# Spirit
-R:1071:0x92:0xB8
-
-# Spirit
-R:1072:0x92:0xB9
-
-# Spirit
-R:1073:0x92:0xBA
-
-# Spirit
-R:1074:0x92:0xBB
-
-# Spirit
-R:1075:0x92:0xBC
-
-# Neil, the Sorceror
-R:1076:0x0A:0x68
-
-# Swamp wight
-R:1077:0xC0:0xA7
-
-# Knight of the Swan
-R:1078:0xC2:0xAF
-
-# Spells (*)
-S:48:0x91/0x88
-S:49:0x91/0x89
-S:50:0x91/0x8A
-S:51:0x91/0x8B
-S:52:0x91/0x8C
-S:53:0x91/0x8D
-S:54:0x91/0x8E
-S:55:0x91/0x8F
-S:56:0x91/0x90
-S:57:0x91/0x91
-S:58:0x91/0x92
-S:59:0x91/0x93
-S:60:0x91/0x94
-S:61:0x91/0x95
-S:62:0x91/0x96
-S:63:0x91/0x97
-
-# Spells (|)
-S:64:0x8F/0x80
-S:65:0x8F/0x84
-S:66:0x8F/0x88
-S:67:0x8F/0x8C
-S:68:0x8F/0x90
-S:69:0x8F/0x94
-S:70:0x8F/0x98
-S:71:0x8F/0x9C
-S:72:0x90/0x80
-S:73:0x90/0x84
-S:74:0x90/0x88
-S:75:0x90/0x8C
-S:76:0x90/0x90
-S:77:0x90/0x94
-S:78:0x90/0x98
-S:79:0x90/0x9C
-
-# Spells (-)
-S:80:0x8F/0x81
-S:81:0x8F/0x85
-S:82:0x8F/0x89
-S:83:0x8F/0x8D
-S:84:0x8F/0x91
-S:85:0x8F/0x95
-S:86:0x8F/0x99
-S:87:0x8F/0x9D
-S:88:0x90/0x81
-S:89:0x90/0x85
-S:90:0x90/0x89
-S:91:0x90/0x8D
-S:92:0x90/0x91
-S:93:0x90/0x95
-S:94:0x90/0x99
-S:95:0x90/0x9D
-
-# Spells (/)
-S:96:0x8F/0x82
-S:97:0x8F/0x86
-S:98:0x8F/0x8A
-S:99:0x8F/0x8E
-S:100:0x8F/0x92
-S:101:0x8F/0x96
-S:102:0x8F/0x9A
-S:103:0x8F/0x9E
-S:104:0x90/0x82
-S:105:0x90/0x86
-S:106:0x90/0x8A
-S:107:0x90/0x8E
-S:108:0x90/0x92
-S:109:0x90/0x96
-S:110:0x90/0x9A
-S:111:0x90/0x9E
-
-# Spells (\)
-S:112:0x8F/0x83
-S:113:0x8F/0x87
-S:114:0x8F/0x8B
-S:115:0x8F/0x8F
-S:116:0x8F/0x93
-S:117:0x8F/0x97
-S:118:0x8F/0x9B
-S:119:0x8F/0x9F
-S:120:0x90/0x83
-S:121:0x90/0x87
-S:122:0x90/0x8B
-S:123:0x90/0x8F
-S:124:0x90/0x93
-S:125:0x90/0x97
-S:126:0x90/0x9B
-S:127:0x90/0x9F
-
-# Amulets (")
-S:128:0x87/0x87
-S:129:0x87/0x80
-S:130:0x87/0x88
-S:131:0x87/0x82
-S:132:0x87/0x83
-S:133:0x87/0x84
-S:134:0x87/0x85
-S:135:0x87/0x86
-S:136:0x87/0x81
-S:137:0x87/0x81
-S:138:0x87/0x89
-S:139:0x87/0x8A
-S:140:0x87/0x8B
-S:141:0x87/0x8C
-S:142:0x87/0x8D
-S:143:0x87/0x8E
-
-# Rings (=)
-S:144:0x84/0x87
-S:145:0x84/0x80
-S:146:0x84/0x88
-S:147:0x84/0x82
-S:148:0x84/0x83
-S:149:0x84/0x84
-S:150:0x84/0x85
-S:151:0x84/0x86
-S:152:0x84/0x81
-S:153:0x84/0x81
-S:154:0x84/0x89
-S:155:0x84/0x8A
-S:156:0x84/0x8B
-S:157:0x84/0x8C
-S:158:0x84/0x8D
-S:159:0x84/0x8E
-
-# Staffs (_)
-S:160:0x87/0x96
-S:161:0x87/0x95
-S:162:0x87/0x95
-S:163:0x87/0x92
-S:164:0x87/0x92
-S:165:0x87/0x93
-S:166:0x87/0x95
-S:167:0x87/0x90
-S:168:0x87/0x95
-S:169:0x87/0x95
-S:170:0x87/0x92
-S:171:0x87/0x94
-S:172:0x87/0x92
-S:173:0x87/0x93
-S:174:0x87/0x96
-S:175:0x87/0x90
-
-# Wands (-)
-S:176:0x86/0x97
-S:177:0x86/0x90
-S:178:0x86/0x98
-S:179:0x86/0x92
-S:180:0x86/0x93
-S:181:0x86/0x94
-S:182:0x86/0x95
-S:183:0x86/0x96
-S:184:0x86/0x91
-S:185:0x86/0x91
-S:186:0x86/0x99
-S:187:0x86/0x9A
-S:188:0x86/0x9B
-S:189:0x86/0x9C
-S:190:0x86/0x9D
-S:191:0x86/0x9E
-
-# Rods (-)
-S:192:0x86/0x87
-S:193:0x86/0x80
-S:194:0x86/0x88
-S:195:0x86/0x82
-S:196:0x86/0x83
-S:197:0x86/0x84
-S:198:0x86/0x85
-S:199:0x86/0x86
-S:200:0x86/0x81
-S:201:0x86/0x81
-S:202:0x86/0x89
-S:203:0x86/0x8A
-S:204:0x86/0x8B
-S:205:0x86/0x8C
-S:206:0x86/0x8D
-S:207:0x86/0x8E
-
-# Scrolls (?)
-S:208:0x83/0x9C
-S:209:0x83/0x9D
-S:210:0x83/0x9E
-S:211:0x83/0x9F
-S:212:0x83/0x9C
-S:213:0x83/0x9D
-S:214:0x83/0x9E
-S:215:0x83/0x9F
-S:216:0x83/0x9C
-S:217:0x83/0x9D
-S:218:0x83/0x9E
-S:219:0x83/0x9F
-S:220:0x83/0x9C
-S:221:0x83/0x9D
-S:222:0x83/0x9E
-S:223:0x83/0x9F
-
-# Potions (!)
-S:224:0x85/0x87
-S:225:0x85/0x80
-S:226:0x85/0x88
-S:227:0x85/0x82
-S:228:0x85/0x83
-S:229:0x85/0x84
-S:230:0x85/0x85
-S:231:0x85/0x86
-S:232:0x85/0x81
-S:233:0x85/0x81
-S:234:0x85/0x89
-S:235:0x85/0x8A
-S:236:0x85/0x8B
-S:237:0x85/0x8C
-S:238:0x85/0x8D
-S:239:0x85/0x8E
-
-# Food (,)
-S:240:0x85/0x97
-S:241:0x85/0x90
-S:242:0x85/0x98
-S:243:0x85/0x92
-S:244:0x85/0x93
-S:245:0x85/0x94
-S:246:0x85/0x95
-S:247:0x85/0x96
-S:248:0x85/0x91
-S:249:0x85/0x91
-S:250:0x85/0x99
-S:251:0x85/0x9A
-S:252:0x85/0x9B
-S:253:0x85/0x9C
-S:254:0x85/0x9D
-S:255:0x85/0x9E
-
-# Elven
-G:M:12:0x91/0xA1
-
-# Dwarven
-G:M:13:0x91/0xA0
-
-# Spirit
-R:1045:0x92/0x9F
-R:1046:0x92/0xA0
-R:1047:0x92/0xA1
-R:1048:0x92/0xA2
-R:1049:0x92/0xA3
-R:1050:0x92/0xA4
-R:1051:0x92/0xA5
-R:1052:0x92/0xA6
-R:1053:0x92/0xA7
-R:1054:0x92/0xA8
-R:1055:0x92/0xA9
-R:1056:0x92/0xAA
-R:1057:0x92/0xA3
-R:1058:0x92/0xAB
-R:1059:0x92/0xAC
-R:1060:0x92/0xAD
-R:1061:0x92/0xAE
-R:1062:0x92/0xAF
-R:1063:0x92/0xB0
-R:1064:0x92/0xB1
-R:1065:0x92/0xB2
-R:1066:0x92/0xB3
-R:1067:0x92/0xB4
-R:1068:0x92/0xB5
-R:1069:0x92/0xB6
-R:1070:0x92/0xB7
-R:1071:0x92/0xB8
-R:1072:0x92/0xB9
-R:1073:0x92/0xBA
-R:1074:0x92/0xBB
-R:1075:0x92/0xBC
-
-# & Spellbook~ of #
-K:757:0x91/0xA4
-
-# Weakness Trap
-#G:T:1:0xFF/0xFF
-#G:T:2:0xFF/0xFF
-#G:T:3:0xFF/0xFF
-
-# Intelligence Trap
-#G:T:4:0xFF/0xFF
-#G:T:5:0xFF/0xFF
-#G:T:6:0xFF/0xFF
-
-# Wisdom Trap
-#G:T:7:0xFF/0xFF
-#G:T:8:0xFF/0xFF
-#G:T:9:0xFF/0xFF
-
-# Fumbling Fingers Trap
-#G:T:10:0xFF/0xFF
-#G:T:11:0xFF/0xFF
-#G:T:12:0xFF/0xFF
-
-# Wasting Trap
-#G:T:13:0xFF/0xFF
-#G:T:14:0xFF/0xFF
-#G:T:15:0xFF/0xFF
-
-# Beauty Trap
-#G:T:16:0xFF/0xFF
-#G:T:17:0xFF/0xFF
-#G:T:18:0xFF/0xFF
-
-# Trap of Curse Weapon
-#G:T:20:0xFF/0xFF
-
-# Trap of Curse Armor
-#G:T:21:0xFF/0xFF
-
-# Earthquake Trap
-#G:T:22:0xFF/0xFF
-
-# Poison Needle Trap
-#G:T:23:0xFF/0xFF
-
-# Summon Monster Trap
-#G:T:24:0xFF/0xFF
-
-# Summon Undead Trap
-#G:T:25:0xFF/0xFF
-
-# Summon Greater Undead Trap
-#G:T:26:0xFF/0xFF
-
-# Teleport Trap
-#G:T:27:0xFF/0xFF
-
-# Paralyzing Trap
-#G:T:28:0xFF/0xFF
-
-# Explosive Device
-#G:T:29:0xFF/0xFF
-
-# Teleport Item Trap
-#G:T:30:0xFF/0xFF
-
-# Lose Memory Trap
-#G:T:31:0xFF/0xFF
-
-# Bitter Regret Trap
-#G:T:32:0xFF/0xFF
-
-# Bowel Cramps Trap
-#G:T:33:0xFF/0xFF
-
-# Blindness
-#G:T:34:0xFF/0xFF
-
-# Aggravation Trap
-#G:T:35:0xFF/0xFF
-
-# Multiplication Trap
-#G:T:36:0xFF/0xFF
-
-# Steal Item Trap
-#G:T:37:0xFF/0xFF
-
-# Summon Fast Quylthulgs Trap
-#G:T:38:0xFF/0xFF
-
-# Trap of Sinking
-#G:T:39:0xFF/0xFF
-
-# Trap of Mana Drain
-#G:T:40:0xFF/0xFF
-
-# Trap of Missing Money
-#G:T:41:0xFF/0xFF
-
-# Trap of No Return
-#G:T:42:0xFF/0xFF
-
-# Trap of Silent Switching
-#G:T:43:0xFF/0xFF
-
-# Trap of Walls
-#G:T:44:0xFF/0xFF
-
-# Trap of Calling Out
-#G:T:45:0xFF/0xFF
-
-# Trap of Sliding
-#G:T:46:0xFF/0xFF
-
-# Trap of Charges Drain
-#G:T:47:0xFF/0xFF
-
-# Trap of Stair Movement
-#G:T:48:0xFF/0xFF
-
-# Trap of New Trap
-#G:T:49:0xFF/0xFF
-
-# Trap of Scatter Items
-#G:T:50:0xFF/0xFF
-
-# Trap of Decay
-#G:T:51:0xFF/0xFF
-
-# Trap of Wasting Wands
-#G:T:52:0xFF/0xFF
-
-# Trap of Filling
-#G:T:53:0xFF/0xFF
-
-# Trap of Drain Speed
-#G:T:54:0xFF/0xFF
-
-# Lightning Bolt Trap
-#G:T:60:0xFF/0xFF
-
-# Poison Bolt Trap
-#G:T:61:0xFF/0xFF
-
-# Acid Bolt Trap
-#G:T:62:0xFF/0xFF
-
-# Cold Bolt Trap
-#G:T:63:0xFF/0xFF
-
-# Fire Bolt Trap
-#G:T:64:0xFF/0xFF
-
-# Plasma Bolt Trap
-#G:T:65:0xFF/0xFF
-
-# Water Bolt Trap
-#G:T:66:0xFF/0xFF
-
-# Lite Bolt Trap
-#G:T:67:0xFF/0xFF
-
-# Dark Bolt Trap
-#G:T:68:0xFF/0xFF
-
-# Shards Bolt Trap
-#G:T:69:0xFF/0xFF
-
-# Sound Bolt Trap
-#G:T:70:0xFF/0xFF
-
-# Confusion Bolt Trap
-#G:T:71:0xFF/0xFF
-
-# Force Bolt Trap
-#G:T:72:0xFF/0xFF
-
-# Inertia Bolt Trap
-#G:T:73:0xFF/0xFF
-
-# Mana Bolt Trap
-#G:T:74:0xFF/0xFF
-
-# Ice Bolt Trap
-#G:T:75:0xFF/0xFF
-
-# Chaos Bolt Trap
-#G:T:76:0xFF/0xFF
-
-# Nether Bolt Trap
-#G:T:77:0xFF/0xFF
-
-# Disenchantment Bolt Trap
-#G:T:78:0xFF/0xFF
-
-# Nexus Bolt Trap
-#G:T:79:0xFF/0xFF
-
-# Time Bolt Trap
-#G:T:80:0xFF/0xFF
-
-# Gravity Bolt Trap
-#G:T:81:0xFF/0xFF
-
-# Lightning Ball Trap
-#G:T:82:0xFF/0xFF
-
-# Poison Ball Trap
-#G:T:83:0xFF/0xFF
-
-# Acid Ball Trap
-#G:T:84:0xFF/0xFF
-
-# Cold Ball Trap
-#G:T:85:0xFF/0xFF
-
-# Fire Ball Trap
-#G:T:86:0xFF/0xFF
-
-# Plasma Ball Trap
-#G:T:87:0xFF/0xFF
-
-# Water Ball Trap
-#G:T:88:0xFF/0xFF
-
-# Light Ball Trap
-#G:T:89:0xFF/0xFF
-
-# Darkness Ball Trap
-#G:T:90:0xFF/0xFF
-
-# Shards Ball Trap
-#G:T:91:0xFF/0xFF
-
-# Sound Ball Trap
-#G:T:92:0xFF/0xFF
-
-# Confusion Ball Trap
-#G:T:93:0xFF/0xFF
-
-# Force Ball Trap
-#G:T:94:0xFF/0xFF
-
-# Mana Ball Trap
-#G:T:96:0xFF/0xFF
-
-# Ice Ball Trap
-#G:T:97:0xFF/0xFF
-
-# Chaos Ball Trap
-#G:T:98:0xFF/0xFF
-
-# Nether Ball Trap
-#G:T:99:0xFF/0xFF
-
-# Disenchantment Ball Trap
-#G:T:100:0xFF/0xFF
-
-# Nexus Ball Trap
-#G:T:101:0xFF/0xFF
-
-# Time Ball Trap
-#G:T:102:0xFF/0xFF
-
-# Gravity Ball Trap
-#G:T:103:0xFF/0xFF
-
-# Arrow Trap
-#G:T:110:0xFF/0xFF
-
-# Bolt Trap
-#G:T:111:0xFF/0xFF
-
-# Seeker Arrow Trap
-#G:T:112:0xFF/0xFF
-
-# Seeker Bolt Trap
-#G:T:113:0xFF/0xFF
-
-# Poison Arrow Trap
-#G:T:114:0xFF/0xFF
-
-# Poison Bolt Trap
-#G:T:115:0xFF/0xFF
-
-# Poison Seeker Arrow Trap
-#G:T:116:0xFF/0xFF
-
-# Poison Seeker Bolt Trap
-#G:T:117:0xFF/0xFF
-
-# Broken Dagger Trap
-#G:T:118:0xFF/0xFF
-
-# Dagger Trap
-#G:T:119:0xFF/0xFF
-
-# Poison Broken Dagger Trap
-#G:T:120:0xFF/0xFF
-
-# Poison Dagger Trap
-#G:T:121:0xFF/0xFF
-
-# Arrows Trap
-#G:T:122:0xFF/0xFF
-
-# Bolts Trap
-#G:T:123:0xFF/0xFF
-
-# Seeker Arrow Trap
-#G:T:124:0xFF/0xFF
-
-# Seeker Bolt Trap
-#G:T:125:0xFF/0xFF
-
-# Poison Arrows Trap
-#G:T:126:0xFF/0xFF
-
-# Poison Bolt Trap
-#G:T:127:0xFF/0xFF
-
-# Poison Seeker Arrows Trap
-#G:T:128:0xFF/0xFF
-
-# Poison Seeker Bolts Trap
-#G:T:129:0xFF/0xFF
-
-# Broken Daggers Trap
-#G:T:130:0xFF/0xFF
-
-# Dagger Trap
-#G:T:131:0xFF/0xFF
-
-# Poison Broken Daggers Trap
-#G:T:132:0xFF/0xFF
-
-# Poison Daggers Trap
-#G:T:133:0xFF/0xFF
-
-# Trap of Drop Item
-#G:T:140:0xFF/0xFF
-
-# Trap of Drop Items
-#G:T:141:0xFF/0xFF
-
-# Trap of Drop Everything
-#G:T:142:0xFF/0xFF
-
-# Trap of Femininity
-#G:T:150:0xFF/0xFF
-
-# Trap of Masculinity
-#G:T:151:0xFF/0xFF
-
-# Trap of Neutrality
-#G:T:152:0xFF/0xFF
-
-# Trap of Aging
-#G:T:153:0xFF/0xFF
-
-# Trap of Growing
-#G:T:154:0xFF/0xFF
-
-# Trap of Shrinking
-#G:T:155:0xFF/0xFF
-
-# Trap of Tanker Drain
-#G:T:157:0xFF/0xFF
-
-# Trap of Divine Anger
-#G:T:158:0xFF/0xFF
-
-# Trap of Divine Wrath
-#G:T:159:0xFF/0xFF
-
-# Hallucination Trap
-#G:T:160:0xFF/0xFF
-
-# Greater Magic Missile Trap
-#G:T:161:0xFF/0xFF
-
-# Foulness Trap
-#G:T:162:0xFF/0xFF
-
-# Trap of Holy Fire
-#G:T:164:0xFF/0xFF
-
-# Trap of Hell Fire
-#G:T:165:0xFF/0xFF
-
-# Psi Bolt Trap
-#G:T:166:0xFF/0xFF
-
-# Psi Drain Trap
-#G:T:167:0xFF/0xFF
-
-# Plasma Ball Trap
-#G:T:168:0xFF/0xFF
-
-# Psi Ball Trap
-#G:T:169:0xFF/0xFF
-
-# Acquirement Trap
-#G:T:170:0xFF/0xFF
-
-# Greater Lightning Bolt Trap
-#G:T:171:0xFF/0xFF
-
-# Greater Poison Bolt Trap
-#G:T:172:0xFF/0xFF
-
-# Greater Acid Bolt Trap
-#G:T:173:0xFF/0xFF
-
-# Greater Cold Bolt Trap
-#G:T:174:0xFF/0xFF
-
-# Greater Fire Bolt Trap
-#G:T:175:0xFF/0xFF
-# non-defines encountered :
-# Load the special player pictures
-%:xtra-new.prf
diff --git a/lib/mods/theme/pref/graf-sdl.prf b/lib/mods/theme/pref/graf-sdl.prf
deleted file mode 100644
index 818f876a..00000000
--- a/lib/mods/theme/pref/graf-sdl.prf
+++ /dev/null
@@ -1,37 +0,0 @@
-# File: graf-x11.prf
-
-
-# Font stuff
-%:font-x11.prf
-
-
-# Color palette - Graphics
-
-#V:16:0x01:0x00:0x00:0x00
-#V:17:0x01:0xF0:0xE0:0xD0
-#V:18:0x01:0x80:0x80:0x80
-#V:19:0x01:0x50:0x50:0x50
-#V:20:0x01:0xE0:0xB0:0x00
-#V:21:0x01:0xC0:0xA0:0x70
-#V:22:0x01:0x80:0x60:0x40
-#V:23:0x01:0x50:0x3C:0x28
-#V:24:0x01:0x00:0xA0:0xF0
-#V:25:0x01:0x00:0x00:0xF0
-#V:26:0x01:0x00:0x00:0x70
-#V:27:0x01:0xF0:0x00:0x00
-#V:28:0x01:0x80:0x00:0x00
-#V:29:0x01:0x90:0x00:0xB0
-#V:30:0x01:0x00:0x60:0x10
-#V:31:0x01:0x60:0xF0:0x40
-
-
-# Standard file
-?:[EQU $GRAF old]
-%:graf-xxx.prf
-
-# New tiles
-?:[EQU $GRAF new]
-%:graf-new.prf
-
-?:1
-
diff --git a/lib/mods/theme/pref/graf-win.prf b/lib/mods/theme/pref/graf-win.prf
deleted file mode 100644
index f59edb35..00000000
--- a/lib/mods/theme/pref/graf-win.prf
+++ /dev/null
@@ -1,16 +0,0 @@
-# File: graf-win.prf
-
-#
-# This file defines special attr/char mappings for use in "graphics" mode
-#
-# See "lib/help/command.txt" and "src/files.c" for more information.
-#
-
-
-# Standard file
-?:[EQU $GRAF old]
-%:graf-xxx.prf
-
-# New tiles
-?:[EQU $GRAF new]
-%:graf-new.prf
diff --git a/lib/mods/theme/pref/graf-x11.prf b/lib/mods/theme/pref/graf-x11.prf
deleted file mode 100644
index 818f876a..00000000
--- a/lib/mods/theme/pref/graf-x11.prf
+++ /dev/null
@@ -1,37 +0,0 @@
-# File: graf-x11.prf
-
-
-# Font stuff
-%:font-x11.prf
-
-
-# Color palette - Graphics
-
-#V:16:0x01:0x00:0x00:0x00
-#V:17:0x01:0xF0:0xE0:0xD0
-#V:18:0x01:0x80:0x80:0x80
-#V:19:0x01:0x50:0x50:0x50
-#V:20:0x01:0xE0:0xB0:0x00
-#V:21:0x01:0xC0:0xA0:0x70
-#V:22:0x01:0x80:0x60:0x40
-#V:23:0x01:0x50:0x3C:0x28
-#V:24:0x01:0x00:0xA0:0xF0
-#V:25:0x01:0x00:0x00:0xF0
-#V:26:0x01:0x00:0x00:0x70
-#V:27:0x01:0xF0:0x00:0x00
-#V:28:0x01:0x80:0x00:0x00
-#V:29:0x01:0x90:0x00:0xB0
-#V:30:0x01:0x00:0x60:0x10
-#V:31:0x01:0x60:0xF0:0x40
-
-
-# Standard file
-?:[EQU $GRAF old]
-%:graf-xxx.prf
-
-# New tiles
-?:[EQU $GRAF new]
-%:graf-new.prf
-
-?:1
-
diff --git a/lib/mods/theme/pref/graf-xxx.prf b/lib/mods/theme/pref/graf-xxx.prf
deleted file mode 100644
index 8be9d6da..00000000
--- a/lib/mods/theme/pref/graf-xxx.prf
+++ /dev/null
@@ -1,3267 +0,0 @@
-# PRF file generated by Andreas Koch`s Tile Assigner
-# at 12:19:29 AM
-
-# 2185 items 
-# 2185 probably mapped correctly
-# 0 imported but not yet defined
-# 0 defined to value(s) lower than 0x80
-# Old header :
-### Special attr:char values ###
-# # Unused (@)
-# S:0x00:0x00:0x40
-# S:0x01:0x01:0x40
-# S:0x02:0x02:0x40
-# S:0x03:0x03:0x40
-# S:0x04:0x04:0x40
-# S:0x05:0x05:0x40
-# S:0x06:0x06:0x40
-# S:0x07:0x07:0x40
-# S:0x08:0x08:0x40
-# S:0x09:0x09:0x40
-# S:0x0A:0x0A:0x40
-# S:0x0B:0x0B:0x40
-# S:0x0C:0x0C:0x40
-# S:0x0D:0x0D:0x40
-# S:0x0E:0x0E:0x40
-# S:0x0F:0x0F:0x40
-# # Unused (@)
-# S:0x10:0x00:0x40
-# S:0x11:0x01:0x40
-# S:0x12:0x02:0x40
-# S:0x13:0x03:0x40
-# S:0x14:0x04:0x40
-# S:0x15:0x05:0x40
-# S:0x16:0x06:0x40
-# S:0x17:0x07:0x40
-# S:0x18:0x08:0x40
-# S:0x19:0x09:0x40
-# S:0x1A:0x0A:0x40
-# S:0x1B:0x0B:0x40
-# S:0x1C:0x0C:0x40
-# S:0x1D:0x0D:0x40
-# S:0x1E:0x0E:0x40
-# S:0x1F:0x0F:0x40
-# # Unused (@)
-# S:0x20:0x00:0x40
-# S:0x21:0x01:0x40
-# S:0x22:0x02:0x40
-# S:0x23:0x03:0x40
-# S:0x24:0x04:0x40
-# S:0x25:0x05:0x40
-# S:0x26:0x06:0x40
-# S:0x27:0x07:0x40
-# S:0x28:0x08:0x40
-# S:0x29:0x09:0x40
-# S:0x2A:0x0A:0x40
-# S:0x2B:0x0B:0x40
-# S:0x2C:0x0C:0x40
-# S:0x2D:0x0D:0x40
-# S:0x2E:0x0E:0x40
-# S:0x2F:0x0F:0x40
-
-# General Store
-B:0:0x81/0x91
-
-# Armoury
-B:1:0x81/0x92
-
-# Weapon Smiths
-B:2:0x81/0x93
-
-# Temple
-B:3:0x81/0x94
-
-# Alchemy Shop
-B:4:0x81/0x95
-
-# Magic Shop
-B:5:0x81/0x96
-
-# Black Market
-B:6:0x81/0x97
-
-# Home
-B:7:0x81/0x98
-
-# Bookstore
-B:8:0x82/0x93
-
-# Pet Shop
-B:9:0xCB/0x96
-
-# Mayor's Office
-B:10:0xCB/0x92
-
-# Inn
-B:11:0xCB/0x95
-
-# The Soothsayer
-B:12:0xD4/0x85
-
-# Library
-B:13:0xD4/0x89
-
-# Castle
-B:14:0xCB/0x92
-
-# Casino
-B:15:0xD5/0x81
-
-# Beastmaster Shanty
-B:16:0xD3/0x8B
-
-# Fighters Hall
-B:17:0xD3/0x8C
-
-# Tower of Magery
-B:18:0xD4/0x8B
-
-# Inner Temple
-B:19:0xD4/0x9D
-
-# Paladins Guild
-B:20:0xCB/0x8F
-
-# Rangers Guild
-B:21:0xD3/0x83
-
-# Weyr
-B:22:0xCB/0x93
-
-# The Mirror
-B:23:0xD4/0x89
-
-# Seat of Ruling
-B:24:0xCB/0x92
-
-# Wizards Spire
-B:25:0xD4/0x8A
-
-# Priests Circle
-B:26:0xD4/0x92
-
-# Tower of the King
-B:27:0xCB/0x92
-
-# Library
-B:28:0xD4/0x89
-
-# The White Tree
-B:29:0xCB/0x95
-
-# Craftsmaster
-B:30:0xCB/0x97
-
-# Earth-Dome (Nature)
-B:31:0xCB/0x9A
-
-# Minstrels Haven
-B:32:0xD3/0x9F
-
-# Star-Dome
-B:33:0xD4/0x8C
-
-# Valarin Temple
-B:34:0xD4/0x90
-
-# Sea-Dome
-B:35:0xD4/0x91
-
-# The Golden Flower
-B:36:0xD3/0x83
-
-# The Fountain
-B:37:0xD4/0x9D
-
-# Axe Smith
-B:38:0xCC/0x96
-
-# Hafted Smith
-B:39:0xCC/0x97
-
-# Polearm Smith
-B:40:0xCC/0x98
-
-# Sword Smith
-B:41:0xCC/0x80
-
-# Rare Jewelry Shop
-B:42:0xD3/0x96
-
-# Jewelry Shop
-B:43:0xD3/0x93
-
-# Footwear Shop
-B:44:0xD3/0x9D
-
-# Rare Footwear Shop
-B:45:0xD3/0x9E
-
-# Library
-B:46:0xD3/0x9C
-
-# Forbidden Library
-B:47:0xD4/0x8F
-
-# Expensive Black Market
-B:48:0xD4/0x95
-
-# Common Shop
-B:49:0xD4/0x93
-
-# Dragon Hunter
-B:50:0xCC/0x89
-
-# Speed Ring Market
-B:51:0xD3/0x97
-
-# Scribe
-B:52:0xD4/0x86
-
-# Potion Store
-B:53:0xD4/0x80
-
-# Recaller
-B:54:0xD4/0x88
-
-# Master Archer
-B:55:0xD3/0x85
-
-# Merchants Guild
-B:56:0xD4/0x9B
-
-# The Mathom-house
-B:57:0xCB/0x9B
-
-# The Prancing Pony
-B:58:0xCB/0x95
-
-# Mining Supply store
-B:59:0xCB/0x97
-
-# Library quest in Minas Anor
-B:60:0xD3/0x9C
-
-# Hunting Supply Store
-B:61:0xD3/0x85
-
-# Runic Magic Shop
-B:62:0x81/0x96
-
-# Construction Supply Store
-B:63:0xCB/0x97
-
-# Music Store
-B:64:0xD3/0x9F
-
-# Magic Rod Market
-B:65:0x81/0x96
-
-# Map store
-B:66:0xD3/0x9C
-
-# Farm
-B:67:0xD4/0x93
-
-#Pelargir inn - The Grey Swan
-B:68:0xCB/0x95
-
-#Caras Galadhon inn - The Garden
-B:69:0xCB/0x95
-
-#Khazad Dum inn - The Mithril Lode
-B:70:0xCB/0x95
-
-#Dale inn - The Builder Barracks
-B:71:0xCB/0x95
-
-#Edoras inn - The Horse and Ox
-B:72:0xCB/0x95
-
-#Esgaroth inn - The Dancing Dragon
-B:73:0xCB/0x95
-
-#Hobbiton inn - The Green Dragon
-B:74:0xCB/0x95
-
-#Osgiliath inn - The Twinkling Star
-B:75:0xCB/0x95
-
-#The House of Beorn
-B:76:0xCB/0x92
-
-#Bard's Hut
-B:77:0xCB/0x92
-
-#The Ranger Conclave
-B:78:0xCB/0x92
-
-#Imladris
-B:79:0xCB/0x92
-
-#The Hornburg
-B:80:0xCB/0x92
-
-#Thranduil's Hall
-B:81:0xCB/0x92
-
-#Meduseld
-B:82:0xCB/0x92
-
-#The Master's House
-B:83:0xCB/0x92
-
-#Bag End
-B:84:0xCB/0x92
-
-#The Castle of Stars
-B:85:0xCB/0x92
-
-#The Prince's Tower
-B:86:0xCB/0x92
-
-#The Seat of Durin
-B:87:0xCB/0x92
-
-### The forge in Imladris
-B:88:0xCB/0x97
-
-# nothing
-F:0:0x81/0x80
-
-# open floor
-F:1:0x80/0x80
-
-# fountain - wet
-F:2:0xD1/0x83
-
-# glyph of warding
-F:3:0xA2/0x88
-
-# open door
-F:4:0x81/0x87
-
-# broken door
-F:5:0x81/0x87
-
-# up staircase
-F:6:0x81/0x9C
-
-# down staircase
-F:7:0x81/0x9E
-
-# quest entrance
-F:8:0x82/0x8E
-
-# quest exit
-F:9:0x82/0x8B
-
-# quest down level
-F:10:0x82/0x8F
-
-# quest up level
-F:11:0x82/0x8C
-
-# town exit
-F:12:0x82/0x91
-
-# shaft down
-F:13:0x82/0x90
-
-# shaft up
-F:14:0x82/0x8D
-
-# fountain
-F:15:0xD1/0x82
-
-# web
-F:16:0x82/0x92
-
-# Open pit
-F:17:0xA2/0x96
-
-# Spiked Pit
-F:18:0xA2/0x96
-
-# Poison Pit
-F:19:0xA2/0x96
-
-# Summon Rune
-F:20:0x8A/0x9C
-
-# Teleport Rune
-F:21:0x8A/0x9C
-
-# Fire spot
-F:22:0x8A/0x9B
-
-# Acid spot
-F:23:0x8A/0x9B
-
-# Slow dart trap
-F:24:0x82/0x9E
-
-# Lose str dart
-F:25:0xA2/0x89
-
-# Lose dex dart
-F:26:0xA2/0x8D
-
-# Lose con dart
-F:27:0xA2/0x92
-
-# gas trap - blind
-F:28:0xA2/0x8E
-
-# gas trap - confuse
-F:29:0xA2/0x8F
-
-# gas trap - poison
-F:30:0xA2/0x90
-
-# gas trap - sleep
-F:31:0xA2/0x91
-
-# door
-F:32:0x81/0x8B
-
-# locked door
-F:33:0x81/0x8B
-F:34:0x81/0x8B
-F:35:0x81/0x8B
-F:36:0x81/0x8B
-F:37:0x81/0x8B
-F:38:0x81/0x8B
-F:39:0x81/0x8B
-
-# jammed door
-F:40:0x81/0x8B
-F:41:0x81/0x8B
-F:42:0x81/0x8B
-F:43:0x81/0x8B
-F:44:0x81/0x8B
-F:45:0x81/0x8B
-F:46:0x81/0x8B
-F:47:0x81/0x8B
-
-# secret door
-F:48:0x80/0x82
-
-# pile of rubble
-F:49:0x81/0x9A
-
-# magma vein
-F:50:0x81/0x83
-
-# quartz vein
-F:51:0x80/0x83
-
-# magma vein
-F:52:0x81/0x83
-
-# quartz vein
-F:53:0x80/0x83
-
-# magma vein with treasure
-F:54:0x80/0x84
-
-# quartz vein with treasure
-F:55:0x80/0x84
-
-# granite wall
-F:56:0x80/0x82
-F:57:0x80/0x82
-F:58:0x80/0x82
-F:59:0x80/0x82
-
-# permanent wall
-F:60:0x80/0x95
-F:61:0x80/0x95
-F:62:0x80/0x95
-F:63:0x80/0x95
-
-# explosive rune
-F:64:0xA2/0x87
-
-# Straight Road startpoint
-F:65:0xA3/0x9D
-
-# section of the Straight Road
-F:66:0xA3/0x97
-F:67:0xA3/0x9C
-F:68:0xA3/0x9B
-F:69:0xA3/0x9A
-F:70:0xA3/0x98
-
-# section of the Straight Road (discharged)
-F:71:0xA3/0x98
-
-# Straight Road exit
-F:72:0xA3/0x9D
-
-# corrupted section of the Straight Road
-F:73:0xA3/0x99
-
-# Building
-F:74:0x81/0x91
-
-# permanent wall
-F:75:0x80/0x95
-F:76:0x80/0x95
-F:77:0x80/0x95
-F:78:0x80/0x95
-
-# grass with Elanor flowers
-F:79:0x82:0x95
-
-# grass with Fumella flowers
-F:80:0x82:0x96
-
-# grass with anemones
-F:81:0x82:0x97
-
-# grass with Niphredil flowers
-F:82:0x82:0x98
-
-# grass with irises
-F:83:0x82:0x99
-
-# stream of shallow water
-F:84:0xD2/0x81
-
-# pool of deep lava
-F:85:0xCB/0x89
-
-# stream of shallow lava
-F:86:0xCB/0x88
-
-# dark pit
-F:87:0x81/0x80
-
-# dirt
-F:88:0xCB/0x84
-
-# patch of grass
-F:89:0xD0/0x8E
-
-# ice
-F:90:0xCF/0x81
-
-# sand
-F:91:0xCF/0x8E
-
-# dead tree
-F:92:0xCF/0x85
-
-# ash
-F:93:0xCF/0x95
-
-# mud
-F:94:0xCF/0x8D
-
-# ice wall
-F:95:0xD0/0x88
-
-# tree
-F:96:0xCB/0x86
-
-# mountain chain
-F:97:0xCB/0x87
-
-# sandwall
-F:98:0xD0/0x87
-F:99:0xD0/0x87
-
-# sandwall with treasure
-F:100:0xD0/0x8A
-
-# high mountain chain
-F:101:0xCB/0x87
-
-# nether mist
-F:102:0xC5/0x8C
-
-# molten glass wall
-F:103:0xD0/0x89
-
-# Between gate
-F:160:0x8A/0x9D
-
-# Altar of Forests
-F:161:0xD1/0x85
-
-# Altar of Water
-F:162:0xD1/0x86
-
-# Altar of Earth
-F:163:0xD1/0x8E
-
-# Altar of Darkness
-F:164:0xD1/0x88
-
-# Altar of Moon
-F:165:0xD1/0x89
-
-# Altar of Sun
-F:166:0xD1/0x8C
-
-# Altar of Rage
-F:167:0xD1/0x8A
-
-# Altar of Winds
-F:168:0xD1/0x8B
-
-# Altar of Stars
-F:169:0xD1/0x8D
-
-# Altar of Being
-F:170:0xD1/0x87
-
-# Altar of Randomness
-F:171:0xD1/0x8F
-
-# floor
-F:172:0x80/0x80
-
-# Underground Tunnel
-F:173:0xCF/0x97
-
-# stream of tainted water
-F:174:0xD2/0x82
-
-# monster trap
-F:175:0x82/0x94
-
-# Between gate
-F:176:0x8A/0x9D
-
-# lava wall
-F:177:0xD0/0x86
-
-# Great Fire
-F:178:0xD1/0x90
-
-# Path to next area
-F:179:0xCF/0x9C
-
-# Path to previous area
-F:180:0xCF/0x9B
-
-# field
-F:181:0xCF/0x8A
-
-# Ekkaia, the Encircling Sea
-F:182:0xD2/0x84
-
-# pool of deep water
-F:187:0xD2/0x80
-
-# glass wall
-F:188:0xD0/0x89
-
-# illusion wall
-F:189:0xD0/0x8C
-
-# Grass roof
-F:190:0xD0/0x8F
-
-# grass roof top
-F:191:0xD0/0x8F
-
-# grass roof chimney
-F:192:0xD0/0x8F
-
-# brick roof
-F:193:0xD0/0x90
-
-# brick roof top
-F:194:0xD0/0x90
-
-# brick roof chimney
-F:195:0xD0/0x90
-
-# window
-F:196:0xD0/0x91
-
-# small window
-F:197:0xD0/0x92
-
-# rain barrel
-F:198:0xD0/0x93
-
-# grass with flowers
-F:199:0xD0/0x8D
-
-# cobblestone road
-F:200:0x82/0x8A
-
-# cobblestone with outlet
-F:201:0x82/0x8A
-
-# small tree
-F:202:0xD0/0x8B
-
-# town
-F:203:0xD0/0x94
-
-# Underground Tunnel
-F:204:0xD0/0x95
-
-# a blazing fire
-F:205:0xD1/0x84
-
-# pile of rubble
-F:206:0x81/0x9A
-
-# rocky ground
-F:207:0x82:0x9A
-
-# cloud-like vapour
-F:208:0x82:0x9B
-
-# condensing water
-F:209:0x82:0x9C
-
-# dense mist
-F:210:0x82:0x9D
-
-# hail-stone wall
-F:211:0x83:0x80
-
-# dead small tree
-F:212:0x83:0x83
-
-# low hill
-F:213:0x83:0x84
-
-# dark mountain chain
-F:214:0x83:0x85
-
-# blue mountain chain
-F:215:0x83:0x86
-
-# grey mountain chain
-F:216:0x83:0x87
-
-# part of Mount Doom
-F:217:0x83:0x88
-
-# snow-capped peak
-F:218:0x83:0x89
-
-# fir tree
-F:219:0x83:0x8A
-
-# section of a flet
-F:220:0x83:0x8B
-
-# light post
-F:221:0x83:0x8C
-
-# water lily
-F:222:0x83:0x8D
-
-# part of the Dead Marshes
-F:223:0x83:0x8E
-
-# Black Gate
-F:224:0x83:0x8F
-
-# river
-F:225:0x83:0x90
-
-# swamp pool
-F:226:0x83:0x91
-
-# stream of the Anduin river
-F:227:0x83:0x92
-
-# road sign that says 'Hurry to Gondolin!'
-F:228:0x83:0x93
-
-# beehive
-F:229:0x83:0x94
-
-# dirt road
-F:230:0x83:0x95
-
-# wide gate
-F:231:0x83:0x96
-
-# open gate
-F:232:0x83:0x97
-
-# wooden board
-F:233:0x83:0x98
-
-# wooden board
-F:234:0x83:0x99
-
-# wooden board
-F:235:0x83:0x9A
-
-# wooden board
-F:236:0x83:0x9B
-
-# white tree
-F:237:0x83:0x9C
-
-# swift waterfall
-F:238:0x83:0x9D
-
-# slippery rock ledge
-F:239:0x82:0x9A
-
-# stable
-F:240:0x83:0x9E
-
-# wooden plank
-F:241:0x83:0x9F
-
-# fosse pit
-F:242:0x82:0x9F
-
-# Mallorn
-F:243:0x81:0x9F
-
-# copper pillar
-F:244:0x86:0x93
-
-# ethereal wall
-F:245:0x80:0x80
-
-# glacial wall
-F:246:0xD0:0x88
-
-# battlement
-F:247:0x86:0x98
-
-# door of Orthanc
-F:248:0x04:0x27
-
-# something
-K:0:0x80:0x80
-
-# Blindness
-K:1:0xBA:0x81
-
-# Fear
-K:2:0xBA:0x81
-
-# Confusion
-K:3:0xBA:0x81
-
-# Hallucination
-K:4:0xBA:0x81
-
-# Cure Poison
-K:5:0xBA:0x81
-
-# Cure Blindness
-K:6:0xBA:0x81
-
-# Cure Fear
-K:7:0xBA:0x81
-
-# Cure Confusion
-K:8:0xBA:0x81
-
-# Weakness
-K:9:0xBA:0x81
-
-# Unhealth
-K:10:0xBA:0x81
-
-# Restore Constitution
-K:11:0xBA:0x81
-
-# Restoring
-K:12:0xBA:0x81
-
-# Stupidity
-K:13:0xBA:0x81
-
-# Naivety
-K:14:0xBA:0x81
-
-# Poison
-K:15:0xBA:0x81
-
-# Sickness
-K:16:0xBA:0x81
-
-# Paralysis
-K:17:0xBA:0x81
-
-# Restore Strength
-K:18:0xBA:0x81
-
-# Disease
-K:19:0xBA:0x81
-
-# Cure Serious Wounds
-K:20:0xBA:0x81
-
-# & Ration~ of Cram
-K:21:0x8B:0x82
-
-# & Round Seed-Cake~
-K:22:0x8B:0x82
-
-# & Strip~ of Venison
-K:23:0x8B:0x82
-
-# & Slime Mold~
-K:24:0x8A:0x9F
-
-# & Lembas~
-K:25:0x8B:0x80
-
-# & Pint~ of Fine Ale
-K:26:0x8A:0x95
-
-# & Pint~ of Old Winyards
-K:27:0x8A:0x96
-
-# & Mattock~
-K:28:0xCD:0x80
-
-# & Blue Stone~
-K:29:0xB6:0x89
-
-# & Broken Dagger~
-K:30:0x89:0x83
-
-# & Bastard Sword~
-K:31:0x89:0x85
-
-# & Scimitar~
-K:32:0x89:0x85
-
-# & Tulwar~
-K:33:0x89:0x84
-
-# & Broad Sword~
-K:34:0x89:0x85
-
-# & Short Sword~
-K:35:0x89:0x84
-
-# & Blade~ of Chaos
-K:36:0x89:0x87
-
-# & Two-Handed Sword~
-K:37:0x89:0x85
-
-# & Main Gauche~
-K:38:0x89:0x83
-
-# & Cutlass~
-K:39:0x89:0x84
-
-# & Executioner's Sword~
-K:40:0x89:0x86
-
-# & Katana~
-K:41:0x89:0x85
-
-# & Long Sword~
-K:42:0x89:0x85
-
-# & Dagger~
-K:43:0x89:0x83
-
-# & Rapier~
-K:44:0x89:0x84
-
-# & Sabre~
-K:45:0x89:0x84
-
-# & Small Sword~
-K:46:0x89:0x84
-
-# & Broken Sword~
-K:47:0x89:0x83
-
-# & Ball-and-Chain~
-K:48:0x89:0x88
-
-# & Whip~
-K:49:0x89:0x89
-
-# & Flail~
-K:50:0x89:0x8B
-
-# & Two-Handed Flail~
-K:51:0x89:0x8B
-
-# & Morning Star~
-K:52:0x89:0x8B
-
-# & Mace~
-K:53:0x89:0x8C
-
-# & Quarterstaff~
-K:54:0x89:0x8E
-
-# & War Hammer~
-K:55:0x89:0x8F
-
-# & Lead-Filled Mace~
-K:56:0x89:0x8C
-
-# & Mace~ of Disruption
-K:57:0x89:0x8D
-
-# & Lucerne Hammer~
-K:58:0x89:0x90
-
-# & Beaked Axe~
-K:59:0x89:0x90
-
-# & Glaive~
-K:60:0x89:0x90
-
-# & Halberd~
-K:61:0x89:0x90
-
-# & Awl-Pike~
-K:62:0x89:0x91
-
-# & Pike~
-K:63:0x89:0x91
-
-# & Spear~
-K:64:0x89:0x91
-
-# & Trident~
-K:65:0x89:0x92
-
-# & Lance~
-K:66:0x89:0x93
-
-# & Great Axe~
-K:67:0x89:0x90
-
-# & Battle Axe~
-K:68:0x89:0x90
-
-# & Lochaber Axe~
-K:69:0x89:0x90
-
-# & Broad Axe~
-K:70:0x89:0x90
-
-# & Scythe~
-K:71:0x89:0x94
-
-# & Scythe~ of Slicing
-K:72:0x89:0x94
-
-# & Short Bow~
-K:73:0x89:0x95
-
-# & Long Bow~
-K:74:0x89:0x96
-
-# & Light Crossbow~
-K:75:0x89:0x97
-
-# & Heavy Crossbow~
-K:76:0x89:0x98
-
-# & Sling~
-K:77:0x89:0x99
-
-# & Arrow~
-K:78:0x89:0x9A
-
-# & Seeker Arrow~
-K:79:0x89:0x9B
-
-# & Bolt~
-K:80:0x89:0x9C
-
-# & Seeker Bolt~
-K:81:0x89:0x9D
-
-# & Rounded Pebble~
-K:82:0x89:0x9E
-
-# & Iron Shot~
-K:83:0x89:0x9F
-
-# & Shovel~
-K:84:0x8A:0x98
-
-# & Gnomish Shovel~
-K:85:0x8B:0x8F
-
-# & Dwarven Shovel~
-K:86:0x8B:0x90
-
-# & Pick~
-K:87:0x8A:0x97
-
-# & Orcish Pick~
-K:88:0x8B:0x8D
-
-# & Dwarven Pick~
-K:89:0x8B:0x8E
-
-# & Elven Cloak~
-K:90:0x88:0x81
-
-# & Pair~ of Soft Leather Boots
-K:91:0x88:0x89
-
-# & Pair~ of Hard Leather Boots
-K:92:0x88:0x8A
-
-# & Pair~ of Metal Shod Boots
-K:93:0x88:0x8B
-
-# & Hard Leather Cap~
-K:94:0x88:0x82
-
-# & Metal Cap~
-K:95:0x88:0x83
-
-# & Iron Helm~
-K:96:0x88:0x84
-
-# & Steel Helm~
-K:97:0x88:0x85
-
-# & Iron Crown~
-K:98:0x88:0x86
-
-# & Golden Crown~
-K:99:0x88:0x87
-
-# & Jewel-Encrusted Crown~
-K:100:0x88:0x88
-
-# & Robe~
-K:101:0x88:0x95
-
-# & Filthy Rag~
-K:102:0x88:0x94
-
-# Soft Leather Armour~
-K:103:0x88:0x96
-
-# Soft Studded Leather~
-K:104:0x88:0x96
-
-# Hard Leather Armour~
-K:105:0x88:0x97
-
-# Hard Studded Leather~
-K:106:0x88:0x97
-
-# Leather Scale Mail~
-K:107:0x88:0x98
-
-# Metal Scale Mail~
-K:108:0x88:0x98
-
-# Chain Mail~
-K:109:0x88:0x99
-
-# Rusty Chain Mail~
-K:110:0x88:0x9A
-
-# Augmented Chain Mail~
-K:111:0x88:0x99
-
-# Bar Chain Mail~
-K:112:0x88:0x99
-
-# Metal Brigandine Armour~
-K:113:0x88:0x99
-
-# Partial Plate Armour~
-K:114:0x88:0x9B
-
-# Metal Lamellar Armour~
-K:115:0x88:0x9B
-
-# Full Plate Armour~
-K:116:0xCD:0x82
-
-# Ribbed Plate Armour~
-K:117:0x88:0x9B
-
-# Galvorn Plate Mail~
-K:118:0xA3:0x96
-
-# Mithril Plate Mail~
-K:119:0x85:0x96
-
-# Mithril Chain Mail~
-K:120:0x85:0x96
-
-# Double Chain Mail~
-K:121:0x88:0x99
-
-# & Shield~ of Deflection
-K:122:0x88:0x93
-
-# & Cloak~
-K:123:0x88:0x80
-
-# & Shadow Cloak~
-K:124:0x88:0x81
-
-# & Set~ of Leather Gloves
-K:125:0x88:0x8C
-
-# & Set~ of Gauntlets
-K:126:0x88:0x8D
-
-# & Set~ of Cesti
-K:127:0x88:0x8E
-
-# & Small Leather Shield~
-K:128:0x88:0x8F
-
-# & Large Leather Shield~
-K:129:0x88:0x90
-
-# & Small Metal Shield~
-K:130:0x88:0x91
-
-# & Large Metal Shield~
-K:131:0x88:0x92
-
-# Strength
-K:132:0xB5:0x81
-
-# Dexterity
-K:133:0xB5:0x81
-
-# Constitution
-K:134:0xB5:0x81
-
-# Intelligence
-K:135:0xB5:0x81
-
-# Speed
-K:136:0xB5:0x83
-
-# Searching
-K:137:0xB5:0x80
-
-# Teleportation
-K:138:0xB5:0x80
-
-# Slow Digestion
-K:139:0xB5:0x80
-
-# Fire Resistance
-K:140:0xB5:0x80
-
-# Cold Resistance
-K:141:0xB5:0x80
-
-# Levitation
-K:142:0xB5:0x80
-
-# Poison Resistance
-K:143:0xB5:0x82
-
-# Free Action
-K:144:0xB5:0x80
-
-# Weakness
-K:145:0xB5:0x80
-
-# Flames
-K:146:0xB5:0x82
-
-# Acid
-K:147:0xB5:0x82
-
-# Ice
-K:148:0xB5:0x82
-
-# Woe
-K:149:0xB5:0x82
-
-# Stupidity
-K:150:0xB5:0x80
-
-# Damage
-K:151:0xB5:0x81
-
-# Accuracy
-K:152:0xB5:0x81
-
-# Protection
-K:153:0xB5:0x80
-
-# Aggravate Monster
-K:154:0xB5:0x80
-
-# See Invisible
-K:155:0xB5:0x81
-
-# Sustain Strength
-K:156:0xB5:0x81
-
-# Sustain Intelligence
-K:157:0xB5:0x81
-
-# Sustain Wisdom
-K:158:0xB5:0x81
-
-# Sustain Constitution
-K:159:0xB5:0x81
-
-# Sustain Dexterity
-K:160:0xB5:0x81
-
-# Sustain Charisma
-K:161:0xB5:0x81
-
-# Slaying
-K:162:0xB5:0x81
-
-# Brilliance
-K:163:0xB6:0x9F
-
-# Charisma
-K:164:0xB6:0x9F
-
-# Searching
-K:165:0xB6:0x9E
-
-# Teleportation
-K:166:0xB6:0x9E
-
-# Slow Digestion
-K:167:0xB6:0x9E
-
-# Acid Resistance
-K:168:0xB6:0x9E
-
-# Protection from Evil
-K:169:0xB6:0x9E
-
-# Double Ring Mail~
-K:170:0xCD:0x83
-
-# the Magi
-K:171:0xB6:0x80
-
-# Doom
-K:172:0xB6:0x80
-
-# Enchant Weapon To-Hit
-K:173:0x86:0x80
-
-# Enchant Weapon To-Dam
-K:174:0x86:0x80
-
-# Enchant Armor
-K:175:0x86:0x80
-
-# Identify
-K:176:0x86:0x80
-
-# *Identify*
-K:177:0x86:0x82
-
-# Rumour
-K:178:0x86:0x80
-
-# Chaos
-K:179:0x86:0x80
-
-# Remove Curse
-K:180:0x86:0x80
-
-# Light
-K:181:0x86:0x80
-
-# Fire
-K:182:0x86:0x80
-
-# Ice
-K:183:0x86:0x80
-
-# Summon Monsters
-K:184:0x86:0x80
-
-# Phase Door
-K:185:0x86:0x80
-
-# Teleportation
-K:186:0x86:0x80
-
-# Teleport Level
-K:187:0x86:0x80
-
-# Monster Confusion
-K:188:0x86:0x80
-
-# Magic Mapping
-K:189:0x86:0x80
-
-# Rune of Protection
-K:190:0x86:0x82
-
-# *Remove Curse*
-K:191:0x86:0x82
-
-# Treasure Detection
-K:192:0x86:0x80
-
-# Object Detection
-K:193:0x86:0x80
-
-# Trap Detection
-K:194:0x86:0x80
-
-# & Sheaf Arrow~
-K:195:0xCD:0x84
-
-# & Mithril Shot~
-K:196:0xCD:0x85
-
-# Door/Stair Location
-K:197:0x86:0x80
-
-# Acquirement
-K:198:0x86:0x80
-
-# *Acquirement*
-K:199:0x86:0x82
-
-# Mass Genocide
-K:200:0x86:0x82
-
-# Detect Invisible
-K:201:0x86:0x80
-
-# Aggravation
-K:202:0x86:0x80
-
-# Trap Creation
-K:203:0x86:0x80
-
-# Trap/Door Destruction
-K:204:0x86:0x80
-
-# Artifact Creation
-K:205:0x86:0x82
-
-# Recharging
-K:206:0x86:0x81
-
-# Genocide
-K:207:0x86:0x81
-
-# Darkness
-K:208:0x86:0x80
-
-# Protection from Evil
-K:209:0x86:0x81
-
-# Satisfy Hunger
-K:210:0x86:0x80
-
-# Dispel Undead
-K:211:0x86:0x81
-
-# *Enchant Weapon*
-K:212:0x86:0x82
-
-# Curse Weapon
-K:213:0x86:0x82
-
-# *Enchant Armour*
-K:214:0x86:0x82
-
-# Curse Armour
-K:215:0x86:0x82
-
-# Summon Undead
-K:216:0x86:0x80
-
-# Blessing
-K:217:0x86:0x80
-
-# Holy Chant
-K:218:0x86:0x80
-
-# Holy Prayer
-K:219:0x86:0x81
-
-# Word of Recall
-K:220:0x86:0x80
-
-# *Destruction*
-K:221:0x86:0x82
-
-# Slime Mold Juice
-K:222:0xBC:0x85
-
-# Apple Juice
-K:223:0xBC:0x85
-
-# Water
-K:224:0xBC:0x85
-
-# Strength
-K:225:0xBC:0x86
-
-# Weakness
-K:226:0xBC:0x85
-
-# Restore Strength
-K:227:0xBC:0x86
-
-# Intelligence
-K:228:0xBC:0x86
-
-# Stupidity
-K:229:0xBC:0x85
-
-# Restore Intelligence
-K:230:0xBC:0x86
-
-# Wisdom
-K:231:0xBC:0x86
-
-# Naivety
-K:232:0xBC:0x85
-
-# Restore Wisdom
-K:233:0xBC:0x86
-
-# Charisma
-K:234:0xBC:0x86
-
-# Ugliness
-K:235:0xBC:0x86
-
-# Restore Charisma
-K:236:0xBC:0x86
-
-# Curing
-K:237:0xBC:0x86
-
-# Invulnerability
-K:238:0xBC:0x86
-
-# New Life
-K:239:0xBC:0x86
-
-# Cure Serious Wounds
-K:240:0xBC:0x85
-
-# Cure Critical Wounds
-K:241:0xBC:0x85
-
-# Healing
-K:242:0xBC:0x85
-
-# Constitution
-K:243:0xBC:0x86
-
-# Experience
-K:244:0xBC:0x87
-
-# Sleep
-K:245:0xBC:0x85
-
-# Blindness
-K:246:0xBC:0x85
-
-# Booze
-K:247:0xBC:0x85
-
-# Poison
-K:248:0xBC:0x85
-
-# Speed
-K:249:0xBC:0x85
-
-# Slowness
-K:250:0xBC:0x85
-
-# Dexterity
-K:251:0xBC:0x86
-
-# Restore Dexterity
-K:252:0xBC:0x86
-
-# Restore Constitution
-K:253:0xBC:0x86
-
-# Lose Memories
-K:254:0xBC:0x85
-
-# Salt Water
-K:255:0xBC:0x85
-
-# Enlightenment
-K:256:0xBC:0x85
-
-# Heroism
-K:257:0xBC:0x85
-
-# Berserk Strength
-K:258:0xBC:0x85
-
-# Boldness
-K:259:0xBC:0x85
-
-# Restore Life Levels
-K:260:0xBC:0x87
-
-# Resist Heat
-K:261:0xBC:0x85
-
-# Resist Cold
-K:262:0xBC:0x85
-
-# Detect Invisible
-K:263:0xBC:0x85
-
-# Slow Poison
-K:264:0xBC:0x85
-
-# Neutralise Poison
-K:265:0xBC:0x85
-
-# Restore Mana
-K:266:0xBC:0x86
-
-# Infra-vision
-K:267:0xBC:0x85
-
-# Resistance
-K:268:0xBC:0x85
-
-# Spell
-K:269:0xB7:0x8F
-
-# Manathrust
-K:270:0xB7:0x8F
-
-# Fireflash
-K:271:0xB7:0x8F
-
-# Firewall
-K:272:0xB7:0x90
-
-# Tidal Wave
-K:273:0xB7:0x8F
-
-# Ice Storm
-K:274:0xB7:0x8F
-
-# Noxious Cloud
-K:275:0xB7:0x8F
-
-# Poison Blood
-K:276:0xB7:0x8F
-
-# Thunderstorm
-K:277:0xB7:0x8F
-
-# Dig
-K:278:0xB7:0x8F
-
-# Stone Prison
-K:279:0xB7:0x8F
-
-# Strike
-K:280:0xB7:0x91
-
-# Teleport Away
-K:281:0xB7:0x8F
-
-# Summon Animal
-K:282:0xB7:0x8F
-
-# Magelock
-K:283:0xB7:0x90
-
-# Slow Monster
-K:284:0xB7:0x90
-
-# Essence of Speed
-K:285:0xB7:0x8F
-
-# Banishment
-K:286:0xB7:0x8F
-
-# Disperse Magic
-K:287:0xB7:0x90
-
-# Charm
-K:288:0xB7:0x90
-
-# Confuse
-K:289:0xB7:0x91
-
-# Demon Blade
-K:290:0xB7:0x8F
-
-# Heal Monster
-K:291:0xB7:0x91
-
-# Haste Monster
-K:292:0xB7:0x8F
-
-# & Flight Arrow~
-K:293:0xCD:0x86
-
-# & Boulder~
-K:295:0x85:0x97
-
-# & Flame~ Imperishable
-K:296:0x85:0x98
-
-# & Necromantic Teeth~
-K:297:0x85:0x99
-
-# & Golden Horn~ of the Eagles
-K:298:0xB7:0x91
-
-# Spell
-K:300:0xB9:0x99
-
-# Nothing
-K:301:0xB9:0x99
-
-# Globe of Light
-K:302:0xB9:0x99
-
-# Fiery Shield
-K:303:0xB9:0x99
-
-# Remove Curses
-K:304:0xB9:0x9A
-
-# Wings of Winds
-K:305:0xB9:0x99
-
-# Shake
-K:306:0xB9:0x99
-
-# Disarm
-K:307:0xB9:0x9B
-
-# Teleportation
-K:308:0xB9:0x99
-
-# Probability Travel
-K:309:0xB9:0x99
-
-# Recovery
-K:310:0xB9:0x99
-
-# Healing
-K:311:0xB9:0x99
-
-# Vision
-K:312:0xB9:0x99
-
-# Identify
-K:313:0xB9:0x99
-
-# Sense Hidden
-K:314:0xB9:0x9A
-
-# Reveal Ways
-K:315:0xB9:0x99
-
-# Sense Monsters
-K:316:0xB9:0x99
-
-# Genocide
-K:317:0xB9:0x9A
-
-# Summon
-K:318:0xB9:0x99
-
-# Sterilization
-K:319:0xB9:0x9A
-
-# Wish
-K:320:0xB9:0x9B
-
-# Mana
-K:321:0xB9:0x9A
-
-# & Tome~ of Magical Energy
-K:330:0xA3:0x8A
-
-# & Tome~ of the Eternal Flame
-K:331:0xA3:0x8A
-
-# & Tome~ of the Blowing Wind
-K:332:0xA3:0x8A
-
-# & Tome~ of the Impenetrable Earth
-K:333:0xA3:0x8A
-
-# & Tome~ of the Everrunning Wave
-K:334:0xA3:0x8C
-
-# & Tome~ of Translocation
-K:335:0xA3:0x8C
-
-# & Tome~ of the Tree
-K:336:0xA3:0x8C
-
-# & Tome~ of Knowledge
-K:337:0xA3:0x8C
-
-# & Small wooden chest~
-K:338:0x80:0x96
-
-# & Large wooden chest~
-K:339:0x80:0x97
-
-# & Small iron chest~
-K:340:0x80:0x98
-
-# & Large iron chest~
-K:341:0x80:0x99
-
-# & Small steel chest~
-K:342:0x80:0x9A
-
-# & Large steel chest~
-K:343:0x80:0x9B
-
-# & Ruined chest~
-K:344:0x80:0x9C
-
-# & Iron Spike~
-K:345:0x8B:0x84
-
-# & Wooden Torch~
-K:346:0x8B:0x86
-
-# & Brass Lantern~
-K:347:0x8B:0x85
-
-# & Flask~ of oil
-K:348:0xBC:0x90
-
-# & Empty Bottle~
-K:349:0x8A:0x99
-
-# Havoc
-K:350:0xB8:0x94
-
-# Door/Stair Location
-K:351:0xB8:0x94
-
-# Trap Location
-K:352:0xB8:0x94
-
-# Probing
-K:353:0xB8:0x97
-
-# Recall
-K:354:0xB8:0x96
-
-# Illumination
-K:355:0xB8:0x95
-
-# Light
-K:356:0xB8:0x94
-
-# Lightning Bolts
-K:357:0xB8:0x94
-
-# Frost Bolts
-K:358:0xB8:0x95
-
-# Fire Bolts
-K:359:0xB8:0x95
-
-# Polymorph
-K:360:0xB8:0x95
-
-# Slow Monster
-K:361:0xB8:0x95
-
-# Sleep Monster
-K:362:0xB8:0x95
-
-# Drain Life
-K:363:0xB8:0x97
-
-# Teleport Other
-K:364:0xB8:0x96
-
-# Disarming
-K:365:0xB8:0x95
-
-# Lightning Balls
-K:366:0xB8:0x96
-
-# Cold Balls
-K:367:0xB8:0x96
-
-# Fire Balls
-K:368:0xB8:0x97
-
-# Acid Balls
-K:369:0xB8:0x97
-
-# Acid Bolts
-K:370:0xB8:0x95
-
-# Enlightenment
-K:371:0xB8:0x97
-
-# Perception
-K:372:0xB8:0x96
-
-# Curing
-K:373:0xB8:0x97
-
-# Healing
-K:374:0xB8:0x97
-
-# Detection
-K:375:0xB8:0x95
-
-# Restoration
-K:376:0xB8:0x97
-
-# Speed
-K:377:0xB8:0x97
-
-# Spell
-K:378:0xA3:0x8E
-
-# Spell
-K:379:0x86:0x9E
-
-# & Broken Skull~
-K:391:0x8B:0x8A
-
-# & Broken Bone~
-K:392:0x8B:0x8B
-
-# & Canine Skeleton~
-K:393:0x8B:0x87
-
-# & Rodent Skeleton~
-K:394:0x8B:0x87
-
-# & Human Skeleton~
-K:395:0x8B:0x87
-
-# & Dwarf Skeleton~
-K:396:0x8B:0x87
-
-# & Elf Skeleton~
-K:397:0x8B:0x87
-
-# & Gnome Skeleton~
-K:398:0x8B:0x87
-
-# & Great Hammer~
-K:399:0xCD:0x87
-
-# Black Dragon Scale Mail~
-K:400:0x88:0x9F
-
-# Blue Dragon Scale Mail~
-K:401:0x88:0x9D
-
-# White Dragon Scale Mail~
-K:402:0x88:0x9E
-
-# Red Dragon Scale Mail~
-K:403:0x89:0x81
-
-# Green Dragon Scale Mail~
-K:404:0x89:0x80
-
-# Multi-Hued Dragon Scale Mail~
-K:405:0x89:0x82
-
-# Pseudo Dragon Scale Mail~
-K:406:0xBB:0x9C
-
-# Law Dragon Scale Mail~
-K:407:0x88:0x9F
-
-# Bronze Dragon Scale Mail~
-K:408:0x88:0x96
-
-# Gold Dragon Scale Mail~
-K:409:0x88:0x9C
-
-# Chaos Dragon Scale Mail~
-K:410:0x89:0x80
-
-# Balance Dragon Scale Mail~
-K:411:0x88:0x99
-
-# Power Dragon Scale Mail~
-K:412:0xA2:0x9E
-
-# & Dragon Helm~
-K:413:0xA2:0x9D
-
-# & Dragon Shield~
-K:414:0xA2:0x9C
-
-# Death
-K:415:0xBC:0x88
-
-# Ruination
-K:416:0xBC:0x87
-
-# Detonations
-K:417:0xBC:0x87
-
-# Augmentation
-K:418:0xBC:0x87
-
-# *Healing*
-K:419:0xBC:0x87
-
-# Life
-K:420:0xBC:0x88
-
-# Self Knowledge
-K:421:0xBC:0x87
-
-# *Enlightenment*
-K:422:0xBC:0x88
-
-# Fear Resistance
-K:425:0xB5:0x81
-
-# Light and Darkness Resistance
-K:426:0xB5:0x81
-
-# Nether Resistance
-K:427:0xB5:0x81
-
-# Nexus Resistance
-K:428:0xB5:0x81
-
-# Sound Resistance
-K:429:0xB5:0x81
-
-# Confusion Resistance
-K:430:0xB5:0x81
-
-# Shard Resistance
-K:431:0xB5:0x81
-
-# Disenchantment Resistance
-K:432:0xB5:0x81
-
-# Chaos Resistance
-K:433:0xB5:0x81
-
-# Blindness Resistance
-K:434:0xB5:0x81
-
-# Lordly Protection
-K:435:0xB5:0x81
-
-# Extra Attacks
-K:436:0xB5:0x81
-
-# Cure Light Wounds
-K:437:0xBC:0x85
-
-# Clumsiness
-K:438:0xBC:0x85
-
-# Sickliness
-K:439:0xBC:0x85
-
-# Map of Bree
-K:440:0xD8:0x81
-
-# Map of Gondolin
-K:441:0xD8:0x81
-
-# Map of Lothlorien
-K:442:0xD8:0x81
-
-# Map of Minas Anor
-K:443:0xD8:0x81
-
-# & Silver Arrow~
-K:465:0xCE:0x91
-
-# & Silver Bolt~
-K:466:0xCE:0x92
-
-# Lightning Resistance
-K:467:0x87:0x80
-
-# Wisdom
-K:468:0x87:0x80
-
-# Regeneration
-K:469:0x87:0x80
-
-# Infravision
-K:470:0x87:0x80
-
-# Devotion
-K:471:0x87:0x80
-
-# Weaponmastery
-K:472:0x87:0x80
-
-# Trickery
-K:473:0x87:0x80
-
-# Telepathy
-K:474:0x87:0x80
-
-# Sustenance
-K:475:0x87:0x80
-
-# & Palantir~
-K:476:0xD8:0x8F
-
-# & Elfstone~
-K:477:0xB6:0x8F
-
-# & Jewel~
-K:478:0xB6:0x90
-
-# & Ring~
-K:479:0xB5:0x8E
-
-# copper
-K:480:0x80:0x8B
-
-# copper
-K:481:0x80:0x8B
-
-# copper
-K:482:0x80:0x8B
-
-# silver
-K:483:0x80:0x8C
-
-# silver
-K:484:0x80:0x8C
-
-# silver
-K:485:0x80:0x8C
-
-# garnets
-K:486:0x80:0x8F
-
-# garnets
-K:487:0x80:0x8F
-
-# gold
-K:488:0x80:0x8D
-
-# gold
-K:489:0x80:0x8D
-
-# gold
-K:490:0x80:0x8D
-
-# opals
-K:491:0x80:0x90
-
-# sapphires
-K:492:0x80:0x91
-
-# rubies
-K:493:0x80:0x92
-
-# diamonds
-K:494:0x80:0x93
-
-# emeralds
-K:495:0x80:0x94
-
-# mithril
-K:496:0x80:0x8E
-
-# adamantite
-K:497:0xA3:0x95
-
-# & Mighty Hammer~
-K:498:0x87:0x9A
-
-# & Massive Iron Crown~
-K:499:0x87:0x9B
-
-# & Phial~
-K:500:0x87:0x9D
-
-# & Star~
-K:501:0x87:0x9E
-
-# & Arkenstone~
-K:502:0x87:0x9F
-
-# & Amulet~
-K:503:0xB6:0x82
-
-# & Amulet~
-K:504:0xB6:0x83
-
-# & Necklace~
-K:505:0xB6:0x84
-
-# & Ring~
-K:506:0xB5:0x83
-
-# & Ring~
-K:507:0xB5:0x83
-
-# & Ring~
-K:508:0xB5:0x84
-
-# & Ring~
-K:509:0xB5:0x85
-
-# & Ring~
-K:510:0xB5:0x86
-
-# & Ring~
-K:511:0xB5:0x87
-
-# Reflection
-K:520:0xB6:0x80
-
-# Anti-Magic
-K:521:0xB6:0x80
-
-# Anti-Teleportation
-K:522:0xB6:0x80
-
-# Resistance
-K:523:0xB6:0x80
-
-# & Zweihander~
-K:524:0xCD:0x88
-
-# & Dwarven Lantern~
-K:525:0xD8:0x86
-
-# Splint Mail~
-K:526:0xCD:0x8A
-
-# & Everburning Torch~
-K:527:0xD8:0x87
-
-# & Trifurcate Spear~
-K:528:0xCD:0x96
-
-# & Three-Piece Rod~
-K:529:0xCD:0x8C
-
-# & Feanorian Lamp~
-K:530:0xD8:0x85
-
-# & Fur Cloak~
-K:531:0xCD:0x8E
-
-# Water Curing
-K:532:0xBC:0x84
-
-# & Hatchet~
-K:533:0xCD:0x90
-
-# Mumak Hide Armour~
-K:535:0xCD:0x91
-
-# & Leather Jerkin~
-K:536:0xCD:0x92
-
-# & Sickle~
-K:537:0xCD:0x93
-
-# & Club~
-K:542:0xCD:0x99
-
-# & Broad Spear~
-K:543:0xCD:0x9A
-
-# & Khopesh~
-K:544:0xCD:0x9B
-
-# & Flamberge~
-K:545:0xCD:0x9C
-
-# & Claymore~
-K:546:0xCD:0x9D
-
-# & Espadon~
-K:547:0xCD:0x9E
-
-# & Great Scimitar~
-K:548:0xCD:0x9F
-
-# Arrow
-K:549:0xD7:0x84
-
-# Bolt
-K:550:0xD7:0x83
-
-# & Fauchard~
-K:551:0xCE:0x82
-
-# & Guisarme~
-K:552:0xCE:0x83
-
-# & Heavy Lance~
-K:553:0xCE:0x84
-
-# & Bardiche~
-K:554:0xCE:0x85
-
-# Catapult
-K:555:0xD7:0x82
-
-# Ring Mail~
-K:556:0xCE:0x87
-
-# Cord Armour~
-K:557:0xCE:0x88
-
-# Paper Armour~
-K:558:0xCE:0x89
-
-# Padded Armour~
-K:559:0xCE:0x8A
-
-# Fumes
-K:560:0xD7:0x80
-
-# Golden Ring Mail~
-K:561:0x87:0x98
-
-# Magic
-K:562:0xD7:0x81
-
-# Device
-K:563:0xD7:0x85
-
-# Nothing
-K:569:0xB8:0x95
-
-# & Blood~ of Life
-K:573:0x87:0x88
-
-# & Mage Staff~
-K:577:0xCE:0x97
-
-# Lightning
-K:578:0xB5:0x81
-
-# & Ring~
-K:582:0xB5:0x8F
-
-# Invisibility
-K:583:0xB8:0x85
-
-# Corruption
-K:585:0xB8:0x85
-
-# Invisibility
-K:586:0xB5:0x81
-
-# Deep Thoughts
-K:588:0xD8:0x80
-
-# More Deep Thoughts
-K:589:0xD8:0x80
-
-# Compendium of Deep Thoughts
-K:590:0xD8:0x80
-
-# Artifact Lore Vol. I
-K:591:0xD8:0x80
-
-# Artifact Lore Vol. II
-K:592:0xD8:0x80
-
-# Artifact Lore Vol. III
-K:593:0xD8:0x80
-
-# Monstrous Compendium 1
-K:594:0xD8:0x80
-
-# Monstrous Compendium 2
-K:595:0xD8:0x80
-
-# Monstrous Compendium 3
-K:596:0xD8:0x80
-
-# Monstrous Compendium 4
-K:597:0xD8:0x80
-
-# Monstrous Compendium 5
-K:598:0xD8:0x80
-
-# Monstrous Compendium 6
-K:599:0xD8:0x80
-
-# Monstrous Compendium 7
-K:600:0xD8:0x80
-
-# Monstrous Compendium 8
-K:601:0xD8:0x80
-
-# Monstrous Compendium 9
-K:602:0xD8:0x80
-
-# Monstrous Compendium 10
-K:603:0xD8:0x80
-
-# Monstrous Compendium 11
-K:604:0xD8:0x80
-
-# & Morphic Oil~ of #
-K:605:0xBC:0x85
-
-# Artifact Lore Vol. IV
-K:607:0xD8:0x80
-
-# Artifact Lore Vol. V
-K:608:0xD8:0x80
-
-# Artifact Lore Vol. VI
-K:609:0xD8:0x80
-
-# Artifact Lore Vol. VII
-K:610:0xD8:0x80
-
-# Artifact Lore Vol. VIII
-K:611:0xD8:0x80
-
-# Artifact Lore Vol. IX
-K:612:0xD8:0x80
-
-# Artifact Lore Vol. X
-K:613:0xD8:0x80
-
-# Artifact Lore Vol. XI
-K:614:0xD8:0x80
-
-# Artifact Lore Vol. IX
-K:615:0xD8:0x80
-
-# Artifact Lore Vol. X
-K:616:0xD8:0x80
-
-# Artifact Lore Vol. XI
-K:617:0xD8:0x80
-
-# & #~
-K:618:0xCE:0x93
-
-# corpse
-K:641:0xB4:0x90
-
-# skeleton
-K:642:0xB4:0x8B
-
-# head
-K:643:0xB4:0x8E
-
-# skull
-K:644:0xB4:0x8F
-
-# raw meat
-K:645:0xB4:0x8C
-
-# & Great Eagle Down Coat~
-K:646:0xCE:0x98
-
-# & Key~
-K:647:0xD8:0x90
-
-# & Small Wooden Boomerang~
-K:648:0xCE:0x99
-
-# & Wooden Boomerang~
-K:649:0xCE:0x9A
-
-# & Small Metal Boomerang~
-K:650:0xCE:0x9B
-
-# & Metal Boomerang~
-K:651:0xCE:0x9C
-
-# & Anchor~
-K:652:0xD8:0x91
-
-# & ~
-K:653:0x87:0x99
-
-# Summon Never-Moving Pet
-K:654:0x86:0x80
-
-# Cure Light Insanity
-K:657:0xBC:0x85
-
-# Cure Serious Insanity
-K:658:0xBC:0x85
-
-# Cure Critical Insanity
-K:659:0xBC:0x85
-
-# Cure Insanity
-K:660:0xBC:0x85
-
-# & Phial~
-K:661:0x87:0x9D
-
-# Junkart
-K:662:0x87:0x9C
-
-# Craftsmanship
-K:663:0x86:0x82
-
-# The One Ring
-K:664:0xD8:0x81
-
-# & Horn~
-K:669:0xD8:0x88
-
-# & Drum~
-K:670:0xD8:0x89
-
-# & Harp~
-K:671:0xD8:0x8A
-
-# & Palantir~
-K:675:0xD8:0x8F
-
-# Egg
-K:676:0xD8:0x84
-
-# Reset Recall
-K:677:0x86:0x81
-
-# Divination
-K:678:0x86:0x81
-
-# Self
-K:679:0xDA:0x80
-
-# Ray
-K:680:0xDA:0x80
-
-# Sphere
-K:681:0xDA:0x80
-
-# Knowledge
-K:682:0xDA:0x80
-
-# Life
-K:683:0xDA:0x84
-
-# Fire
-K:684:0xDA:0x81
-
-# Cold
-K:685:0xDA:0x80
-
-# Lightning
-K:686:0xDA:0x85
-
-# Acid
-K:687:0xDA:0x88
-
-# Element
-K:688:0xDA:0x89
-
-# Chaos
-K:689:0xDA:0x83
-
-# Mind
-K:690:0xDA:0x84
-
-# Holding
-K:691:0xDA:0x84
-
-# Arrow
-K:692:0xDA:0x80
-
-# Power Surge
-K:693:0xDA:0x80
-
-# Armageddon
-K:694:0xDA:0x80
-
-# Gravity
-K:695:0xDA:0x82
-
-# Undeath
-K:697:0xDA:0x82
-
-# Protection
-K:698:0xDA:0x82
-
-# & Ring~ of Precognition
-K:700:0xB5:0x8E
-
-# & Sprig~ of Athelas
-K:701:0xCE:0x96
-
-# & Old Scroll~ of Deincarnation
-K:720:0x86:0x82
-
-# & Dark Sword~
-K:721:0xCE:0x9D
-
-# Numenorean for Beginners (I)
-K:722:0xD8:0x81
-
-# Numenorean for Beginners (II)
-K:723:0xD8:0x81
-
-# Advanced Lessons of Numenorean
-K:724:0xD8:0x81
-
-# Advanced Lessons of Sindarin
-K:725:0xD8:0x81
-
-# & Shard~ of Pottery
-K:726:0x8B:0x88
-
-# & Broken Stick~
-K:727:0x8B:0x89
-
-# & Book~ of Beginner Cantrips
-K:738:0xA3:0x8B
-
-# & Book~ of Teleportation
-K:739:0xA3:0x8B
-
-# & Book~ of Summoning
-K:741:0xA3:0x8B
-
-# & Potion~ of Learning
-K:743:0x87:0x86
-
-# Khuzdul - The Hidden Tongue of the Dwarves
-K:751:0xD8:0x81
-
-# Nandorin for Dummies
-K:752:0xD8:0x81
-
-# Advanced Lessons of Orcish
-K:753:0xD8:0x81
-
-# Flying
-K:755:0xB5:0x80
-
-# & Tome~ of the Time
-K:756:0xA3:0x8D
-
-# & Spellbook~ of #
-K:757:0xA3:0x8A
-
-# & Tome~ of Meta Spells
-K:758:0xA3:0x8D
-
-# & Tome~ of the Mind
-K:759:0xA3:0x8D
-
-# & Holy Tome~ of Eru Iluvatar
-K:760:0xA3:0x8B
-
-# & Holy Tome~ of Manwe Sulimo
-K:761:0xA3:0x8C
-
-# & War Tome~ of Tulkas
-K:762:0xA3:0x90
-
-# & Unholy Tome~ of the Hellflame
-K:763:0xA3:0x91
-
-# & Corrupted Tome~ of Melkor
-K:764:0xA3:0x91
-
-# & Earth Tome~ of Aule
-K:765:0xA3:0x92
-
-# & Shining Tome~ of Varda
-K:766:0xA3:0x8B
-
-# & Water Tome~ of Ulmo
-K:767:0xA3:0x8D
-
-# & Forest Tome~ of Yavanna
-K:768:0xA3:0x8F
-
-# Tome of#
-K:769:0xA3:0x8F
-
-# & Ring~
-K:770:0xB5:0x8E
-
-# & Holy Tome~ of Mandos
-K:771:0xA3:0x8A
-
-# & Great Rod Tip~ of Home Summoning
-K:776:0xB8:0x84
-
-# & Shadow Blade~
-K:777:0xCD:0x9C
-
-# & Bluesteel Blade~
-K:778:0xCE:0x9E
-
-# the Serpents
-K:779:0xB6:0x9F
-
-# Ring~ of Power
-K:785:0xB5:0x85
-
-# Climbing Set~
-K:786:0xD8:0x92
-
-# Adventurer's Guide to Middle-earth
-K:787:0xD8:0x80
-
-# & Demonblade~
-K:788:0xCE:0x94
-
-# & Demonshield~
-K:789:0xCE:0x94
-
-# & Demonhorn~
-K:790:0xCE:0x95
-
-# & Wooden Rod~ of#
-K:793:0xDB:0x80
-
-# & Copper Rod~ of#
-K:794:0xDB:0x81
-
-# & Iron Rod~ of#
-K:795:0xDB:0x82
-
-# & Moonstone Rod~ of#
-K:796:0xDB:0x83
-
-# & Silver Rod~ of#
-K:797:0xDB:0x84
-
-# & Golden Rod~ of#
-K:798:0xDB:0x85
-
-# & Mithril Rod~ of#
-K:799:0xDB:0x86
-
-# & Tilkal Rod~ of#
-K:800:0xDB:0x87
-
-# & Greater Ration~ of Health
-K:801:0x8A:0x9E
-
-# & Crumpled Scroll~ of Mass Resurrection
-K:802:0x86:0x82
-
-# & Cleaver~
-K:803:0xD8:0x93
-
-# & Light War Axe~
-K:804:0xD8:0x94
-
-# & Slaughter Axe~
-K:805:0xD8:0x95
-
-# & Runestone~
-K:806:0xDA:0x83
-
-# & Fortune cookie~
-K:807:0x8A:0x93
-
-# Critical Hits
-K:809:0xB5:0x82
-
-# & Wand~ of Digging of Thrain
-K:810:0xB8:0x97
-
-# & Gnarled Staff~ of Holy Fire of Mithrandir
-K:811:0xCE:0x9F
-
-# Partial Totem
-K:812:0xB4:0x82
-
-# True Totem
-K:813:0xB4:0x85
-
-# & Piece~ of the Relic of Eru
-K:814:0x8B:0x91
-
-# & Piece~ of the Relic of Manwe
-K:815:0x8B:0x92
-
-# & Piece~ of the Relic of Tulkas
-K:816:0x8B:0x93
-
-# & Piece~ of the Relic of Melkor
-K:817:0x8B:0x94
-
-# & Piece~ of the Relic of Yavanna
-K:818:0x8B:0x95
-
-# & Ring~
-K:819:0xB5:0x82
-
-# & Ring~
-K:820:0xB5:0x82
-
-# & Ring~
-K:821:0xB5:0x82
-
-# & Ring~
-K:822:0xB5:0x82
-
-# & Ring~
-K:823:0xB5:0x82
-
-# & Ring~
-K:824:0xB5:0x82
-
-# & Piece~ of the Relic of Aule
-K:825:0x8B:0x96
-
-# & Piece~ of the Relic of Varda
-K:826:0x8B:0x97
-
-# & Piece~ of the Relic of Ulmo
-K:827:0x8B:0x98
-
-# & Piece~ of the Relic of Mandos
-K:828:0x8B:0x99
-
-# & Pinch~ of Longbottom Leaf
-K:831:0x87:0x8C
-
-# & Ear~ of Corn
-K:832:0x85:0x9A
-
-# & Tater~
-K:833:0x85:0x9B
-
-# & Strawberry~
-K:834:0x85:0x9C
-
-# & Turnip~
-K:835:0x85:0x9D
-
-# & Jar~ of Honey
-K:836:0x85:0x9E
-
-# & Jug~ of Milk
-K:837:0x85:0x9F
-
-# of War
-K:838:0xB9:0x9A
-
-# of Life
-K:839:0xB9:0x9C
-
-# Wizardry
-K:840:0x82:0x81
-
-# Vitality
-K:841:0x82:0x81
-
-# Clear Thought
-K:842:0x00:0x3D
-
-# Clumsiness
-K:843:0x82:0x81
-
-# Sickliness
-K:844:0x82:0x81
-
-# Fortune
-K:845:0x82:0x7F
-
-# Sterilise
-K:846:0xA3:0x92
-
-# Map of Middle-earth
-K:847:0xA3:0x92
-
-# Map of Edoras
-K:848:0xD8:0x81
-
-# Map of Esgaroth
-K:849:0xD8:0x81
-
-# Map of Hobbiton
-K:850:0xD8:0x81
-
-# Map of Osgiliath
-K:851:0xD8:0x81
-
-# Map of Pelargir
-K:852:0xD8:0x81
-
-# Map of Beorn's domain
-K:853:0xD8:0x81
-
-# Map of Dale
-K:854:0xD8:0x81
-
-# Map of Henneth Annun
-K:855:0xD8:0x81
-
-# Map of Helm's Deep
-K:856:0xD8:0x81
-
-# Map of Thranduil's realm
-K:857:0xD8:0x81
-
-# Map of Imladris
-K:858:0xD8:0x81
-
-# & Bearded Axe~
-K:859:0x87:0x90
-
-# & Double Axe~
-K:860:0x87:0x91
-
-# & Crusader Axe~
-K:861:0x87:0x92
-
-# & Reaper Axe~
-K:862:0x87:0x93
-
-# & Mithril Helm~
-K:863:0x8B:0x9A
-
-# & Set~ of Mithril Gauntlets
-K:864:0x8B:0x9B
-
-# & Small Mithril Shield~
-K:865:0x8B:0x9C
-
-# & Large Mithril Shield~
-K:866:0x8B:0x9D
-
-# & Map~
-K:867:0xA3:0x92
-
-# & Key~
-K:868:0x87:0x8D
-
-# & Cup~
-K:869:0x87:0x8E
-
-# & Red Arrow~
-K:870:0x87:0x8F
-
-# & Sceptre~
-K:871:0x86:0x91
-
-# & Rod~
-K:872:0x86:0x90
-
-# & Necklace~
-K:873:0x86:0x9F
-
-# & Amulet~
-K:874:0x86:0x9E
-
-# & Black Banner~
-K:875:0x87:0x94
-
-# & Pearl~
-K:876:0x87:0x95
-
-# & Silmaril~
-K:877:0x87:0x96
-
-# & Silmaril~
-K:878:0x87:0x97
-
-# & Golden Harp~
-K:879:0xD9:0x8A
-
-# Player
-R:0:0x8C/0x81
-
-# Spells (*)
-S:0x30:0x85/0x93
-S:0x31:0x85/0x92
-S:0x32:0x85/0x92
-S:0x33:0x85/0x8D
-S:0x34:0x85/0x8C
-S:0x35:0x85/0x8F
-S:0x36:0x85/0x90
-S:0x37:0x85/0x95
-S:0x38:0x85/0x93
-S:0x39:0x85/0x92
-S:0x3A:0x85/0x91
-S:0x3B:0x85/0x8E
-S:0x3C:0x85/0x8D
-S:0x3D:0x85/0x8F
-S:0x3E:0x85/0x90
-S:0x3F:0x85/0x95
-
-# Spells (|)
-S:0x40:0x84/0x9C
-S:0x41:0x84/0x98
-S:0x42:0x84/0x98
-S:0x43:0x85/0x88
-S:0x44:0x84/0x80
-S:0x45:0x84/0x8C
-S:0x46:0x84/0x90
-S:0x47:0x85/0x84
-S:0x48:0x84/0x9C
-S:0x49:0x84/0x98
-S:0x4A:0x84/0x94
-S:0x4B:0x84/0x88
-S:0x4C:0x85/0x88
-S:0x4D:0x84/0x8C
-S:0x4E:0x84/0x90
-S:0x4F:0x85/0x84
-
-# Spells (-)
-S:0x50:0x84/0x9D
-S:0x51:0x84/0x99
-S:0x52:0x84/0x99
-S:0x53:0x85/0x89
-S:0x54:0x84/0x81
-S:0x55:0x84/0x8D
-S:0x56:0x84/0x91
-S:0x57:0x85/0x85
-S:0x58:0x84/0x9D
-S:0x59:0x84/0x99
-S:0x5A:0x84/0x95
-S:0x5B:0x84/0x89
-S:0x5C:0x85/0x89
-S:0x5D:0x84/0x8D
-S:0x5E:0x84/0x91
-S:0x5F:0x85/0x85
-
-# Spells (:)
-S:0x60:0x84/0x9E
-S:0x61:0x84/0x9A
-S:0x62:0x84/0x9A
-S:0x63:0x85/0x8A
-S:0x64:0x84/0x82
-S:0x65:0x84/0x8E
-S:0x66:0x84/0x92
-S:0x67:0x85/0x86
-S:0x68:0x84/0x9E
-S:0x69:0x84/0x9A
-S:0x6A:0x84/0x96
-S:0x6B:0x84/0x8A
-S:0x6C:0x85/0x8A
-S:0x6D:0x84/0x8E
-S:0x6E:0x84/0x92
-S:0x6F:0x85/0x86
-
-# Spells (\)
-S:0x70:0x84/0x9F
-S:0x71:0x84/0x9B
-S:0x72:0x84/0x9B
-S:0x73:0x85/0x8B
-S:0x74:0x84/0x83
-S:0x75:0x84/0x8F
-S:0x76:0x84/0x93
-S:0x77:0x85/0x87
-S:0x78:0x84/0x9F
-S:0x79:0x84/0x9B
-S:0x7A:0x84/0x97
-S:0x7B:0x84/0x8B
-S:0x7C:0x85/0x8B
-S:0x7D:0x84/0x8F
-S:0x7E:0x84/0x93
-S:0x7F:0x85/0x87
-
-# Amulets (")
-S:0x80:0xB6/0x87
-S:0x81:0xB6/0x88
-S:0x82:0xB6/0x85
-S:0x83:0xB6/0x86
-S:0x84:0xB6/0x81
-S:0x85:0xB6/0x82
-S:0x86:0xB6/0x83
-S:0x87:0xB6/0x84
-S:0x88:0xB6/0x87
-S:0x89:0xB6/0x88
-S:0x8A:0xB6/0x8E
-S:0x8B:0xB6/0x86
-S:0x8C:0xB6/0x81
-S:0x8D:0xB6/0x82
-S:0x8E:0xB6/0x8B
-S:0x8F:0xB6/0x8C
-
-# Rings (=)
-S:0x90:0xB5/0x8B
-S:0x91:0xB5/0x8C
-S:0x92:0xB5/0x89
-S:0x93:0xB5/0x8A
-S:0x94:0xB5/0x81
-S:0x95:0xB5/0x82
-S:0x96:0xB5/0x83
-S:0x97:0xB5/0x88
-S:0x98:0xB5/0x8B
-S:0x99:0xB5/0x8C
-S:0x9A:0xB5/0x80
-S:0x9B:0xB5/0x8A
-S:0x9C:0xB5/0x81
-S:0x9D:0xB5/0x82
-S:0x9E:0xB5/0x83
-S:0x9F:0xB5/0x88
-
-# Staffs (_)
-S:0xA0:0xB9/0x84
-S:0xA1:0xB9/0x85
-S:0xA2:0xB9/0x85
-S:0xA3:0xB9/0x81
-S:0xA4:0xB9/0x81
-S:0xA5:0xB9/0x82
-S:0xA6:0xB9/0x80
-S:0xA7:0xB9/0x87
-S:0xA8:0xB9/0x84
-S:0xA9:0xB9/0x85
-S:0xAA:0xB9/0x83
-S:0xAB:0xB9/0x87
-S:0xAC:0xB9/0x81
-S:0xAD:0xB9/0x82
-S:0xAE:0xB9/0x80
-S:0xAF:0xB9/0x87
-
-# Wands (-)
-S:0xB0:0xB7/0x84
-S:0xB1:0xB7/0x85
-S:0xB2:0xB7/0x85
-S:0xB3:0xB7/0x86
-S:0xB4:0xB7/0x81
-S:0xB5:0xB7/0x82
-S:0xB6:0xB7/0x80
-S:0xB7:0xB7/0x87
-S:0xB8:0xB7/0x84
-S:0xB9:0xB7/0x85
-S:0xBA:0xB7/0x83
-S:0xBB:0xB7/0x86
-S:0xBC:0xB7/0x81
-S:0xBD:0xB7/0x82
-S:0xBE:0xB7/0x80
-S:0xBF:0xB7/0x87
-
-# Rods (-)
-S:0xC0:0xB8/0x84
-S:0xC1:0xB8/0x85
-S:0xC2:0xB8/0x85
-S:0xC3:0xB8/0x86
-S:0xC4:0xB8/0x81
-S:0xC5:0xB8/0x82
-S:0xC6:0xB8/0x80
-S:0xC7:0xB8/0x87
-S:0xC8:0xB8/0x84
-S:0xC9:0xB8/0x85
-S:0xCA:0xB8/0x83
-S:0xCB:0xB8/0x86
-S:0xCC:0xB8/0x81
-S:0xCD:0xB8/0x82
-S:0xCE:0xB8/0x80
-S:0xCF:0xB8/0x87
-
-# Scrolls (?)
-S:0xD0:0x86/0x82
-S:0xD1:0x86/0x82
-S:0xD2:0x86/0x82
-S:0xD3:0x86/0x82
-S:0xD4:0x86/0x82
-S:0xD5:0x86/0x82
-S:0xD6:0x86/0x82
-S:0xD7:0x86/0x82
-S:0xD8:0x86/0x82
-S:0xD9:0x86/0x82
-S:0xDA:0x86/0x82
-S:0xDB:0x86/0x82
-S:0xDC:0x86/0x82
-S:0xDD:0x86/0x82
-S:0xDE:0x86/0x82
-S:0xDF:0x86/0x82
-
-# Potions (!)
-S:0xE0:0xBC/0x84
-S:0xE1:0xBC/0x83
-S:0xE2:0xBC/0x8A
-S:0xE3:0xBC/0x8B
-S:0xE4:0xBC/0x87
-S:0xE5:0xBC/0x86
-S:0xE6:0xBC/0x85
-S:0xE7:0xBC/0x89
-S:0xE8:0xBC/0x84
-S:0xE9:0xBC/0x83
-S:0xEA:0xBC/0x8E
-S:0xEB:0xBC/0x88
-S:0xEC:0xBC/0x8B
-S:0xED:0xBC/0x8C
-S:0xEE:0xBC/0x8D
-S:0xEF:0xBC/0x89
-
-# Food (,)
-S:0xF0:0xBA/0x84
-S:0xF1:0xBA/0x85
-S:0xF2:0xBA/0x85
-S:0xF3:0xBA/0x86
-S:0xF4:0xBA/0x81
-S:0xF5:0xBA/0x82
-S:0xF6:0xBA/0x80
-S:0xF7:0xBA/0x87
-S:0xF8:0xBA/0x84
-S:0xF9:0xBA/0x85
-S:0xFA:0xBA/0x83
-S:0xFB:0xBA/0x86
-S:0xFC:0xBA/0x81
-S:0xFD:0xBA/0x82
-S:0xFE:0xBA/0x80
-S:0xFF:0xBA/0x87
-
-# Unknown Amulet
-U:40:0xB6/0x81
-
-# Unknown Ring
-U:45:0xB5/0x81
-
-# Unknown Staff
-U:55:0xB9/0x81
-
-# Unknown Wand
-U:65:0xB7/0x81
-
-# Unknown Rod
-U:66:0xB8/0x81
-
-# Unknown Scroll
-U:70:0x86/0x82
-
-# Unknown Potion
-U:75:0xBC/0x85
-
-# Unknown Food
-U:80:0x8B/0x81
-# non-defines encountered :
-# Load the Trap image definitions
-%:trap-xxx.prf
diff --git a/lib/mods/theme/pref/graf.prf b/lib/mods/theme/pref/graf.prf
deleted file mode 100644
index a82ce364..00000000
--- a/lib/mods/theme/pref/graf.prf
+++ /dev/null
@@ -1,51 +0,0 @@
-# File: graf.prf
-
-#
-# This file defines special attr/char mappings for use in "graphics" mode
-#
-# This file includes, if appropriate, various "sub-files"
-#
-# See "lib/help/command.txt" and "src/files.c" for more information.
-#
-
-
-##### Standard font file #####
-
-%:font-xxx.prf
-
-
-##### System Specific Subfiles #####
-
-?:[IOR [EQU $SYS xaw] [EQU $SYS x11] [EQU $SYS gtk]]
-%:graf-x11.prf
-
-?:[EQU $SYS gcu]
-%:graf-gcu.prf
-
-?:[EQU $SYS ami]
-%:graf-ami.prf
-
-?:[EQU $SYS mac]
-%:graf-mac.prf
-
-?:[EQU $SYS dos]
-%:graf-dos.prf
-
-?:[EQU $SYS win]
-%:graf-win.prf
-
-?:[EQU $SYS ibm]
-%:graf-ibm.prf
-
-?:[EQU $SYS emx]
-%:graf-emx.prf
-
-?:[EQU $SYS acn]
-%:graf-acn.prf
-
-?:[EQU $SYS sdl]
-%:graf-sdl.prf
-
-?:1
-
-
diff --git a/lib/mods/theme/pref/pref-acn.prf b/lib/mods/theme/pref/pref-acn.prf
deleted file mode 100644
index ae95fe26..00000000
--- a/lib/mods/theme/pref/pref-acn.prf
+++ /dev/null
@@ -1,24 +0,0 @@
-# File: pref-acn.prf
-
-# This is a minimal "pref" file for RISC OS
-
-
-# Map cursor keys onto keypad
-
-A:4
-P:^_18C\r
-
-A:6
-P:^_18D\r
-
-A:2
-P:^_18E\r
-
-A:8
-P:^_18F\r
-
-
-# Map F3 to ^S (to be a bit RISC OS-ey)
-
-A:^S
-P:^_183\r
diff --git a/lib/mods/theme/pref/pref-ami.prf b/lib/mods/theme/pref/pref-ami.prf
deleted file mode 100644
index 08a1c310..00000000
--- a/lib/mods/theme/pref/pref-ami.prf
+++ /dev/null
@@ -1,7 +0,0 @@
-# File: pref-ami.prf
-
-#
-# This file contains various default macros for use with
-# the executable built from "main-ami.c".
-#
-
diff --git a/lib/mods/theme/pref/pref-emx.prf b/lib/mods/theme/pref/pref-emx.prf
deleted file mode 100644
index 555c0dbc..00000000
--- a/lib/mods/theme/pref/pref-emx.prf
+++ /dev/null
@@ -1,19 +0,0 @@
-# File: pref-emx.prf
-
-#
-# Include "pref-ibm.prf" to get the default macros.
-#
-# Note that, while most key-to-trigger mappings are the same as DOS/Win,
-# some few odd keys will be different or not available at all.
-#
-# Examples: Ctrl-Escape, Alt-PrintScreen
-#
-# What's NOT working: color palette redefinitions.
-#
-
-%:pref-win.prf
-
-
-# shift-5 - rest
-A:R\r
-P:^_Sx4C\r
diff --git a/lib/mods/theme/pref/pref.prf b/lib/mods/theme/pref/pref.prf
index a6bfdbe1..310e5b8a 100644
--- a/lib/mods/theme/pref/pref.prf
+++ b/lib/mods/theme/pref/pref.prf
@@ -285,27 +285,13 @@ L:j:jam:Jam a door
 ?:[EQU $SYS gcu]
 %:pref-gcu.prf
 
-?:[EQU $SYS ami]
-%:pref-ami.prf
-
 ?:[EQU $SYS mac]
 %:pref-mac.prf
 
-?:[IOR [EQU $SYS win] [EQU $SYS dos] [EQU $SYS ibm]]
+?:[EQU $SYS win]
 %:pref-win.prf
 
-?:[EQU $SYS emx]
-%:pref-emx.prf
-
-?:[EQU $SYS acn]
-%:pref-acn.prf
-
 ?:[EQU $SYS sdl]
 %:pref-sdl.prf
 
-?:[EQU $SYS pgu]
-%:pref-pgu.prf
-
 ?:1
-
-
diff --git a/lib/mods/theme/pref/trap-xxx.prf b/lib/mods/theme/pref/trap-xxx.prf
deleted file mode 100644
index f4d699a0..00000000
--- a/lib/mods/theme/pref/trap-xxx.prf
+++ /dev/null
@@ -1,428 +0,0 @@
-# Prf file for use with the 8x8 tiles to define 
-# trap image locations. Separated out from main 
-# graphics definitions due to the G:T:num:y:x 
-# instead of T:num:y:x  (major problems if this
-# file is opened in the TileAssigner)
-
-# Weakness Traps
-G:T:1:0x82:0x9E
-G:T:2:0x82:0x9E
-G:T:3:0x82:0x9E
-
-# Intelligence Traps
-G:T:4:0x82:0x9E
-G:T:5:0x82:0x9E
-G:T:6:0x82:0x9E
-
-# Wisdom Traps
-G:T:7:0x82:0x9E
-G:T:8:0x82:0x9E
-G:T:9:0x82:0x9E
-
-# Fumbling Fingers Traps
-G:T:10:0x82:0x9E
-G:T:11:0x82:0x9E
-G:T:12:0x82:0x9E
-
-# Wasting Traps
-G:T:13:0x82:0x9E
-G:T:14:0x82:0x9E
-G:T:15:0x82:0x9E
-
-# Beauty Traps
-G:T:16:0x82:0x9E
-G:T:17:0x82:0x9E
-G:T:18:0x82:0x9E
-
-# Trap of Curse Weapon
-G:T:20:0xA2:0x92
-
-# Trap of Curse Armor
-G:T:21:0xA2:0x92
-
-# Earthquake Trap
-G:T:22:0xA2:0x87
-
-# Poison Needle Trap
-G:T:23:0xA2:0x8B
-
-# Summon Monster Trap
-G:T:24:0xA2:0x89
-
-# Summon Undead Trap
-G:T:25:0xA2:0x89
-
-# Summon Greater Undead Trap
-G:T:26:0xA2:0x89
-
-# Teleport Trap
-G:T:27:0x8A:0x9C
-
-# Paralyzing Trap
-G:T:28:0xA2:0x8B
-
-# Explosive Device
-G:T:29:0xA2:0x8B
-
-# Teleport Item Trap
-G:T:30:0x8A:0x9C
-
-# Lose Memory Trap
-G:T:31:0xA2:0x8B
-
-# Bitter Regret Trap
-G:T:32:0xA2:0x8B
-
-# Bowel Cramps Trap
-G:T:33:0xA2:0x8B
-
-# Blindness/Confusion Trap
-G:T:34:0xA2:0x8B
-
-# Aggravation Trap
-G:T:35:0xA2:0x87
-
-# Multiplication Trap
-G:T:36:0xA2:0x87
-
-# Steal Item Trap
-G:T:37:0xA2:0x92
-
-# Summon Fast Quylthulgs Trap
-G:T:38:0xA2:0x89
-
-# Trap of Sinking
-G:T:39:0x8A:0x9C
-
-# Trap of Mana Drain
-G:T:40:0xA2:0x8B
-
-# Trap of Missing Money
-G:T:41:0xA2:0x92
-
-# Trap of No Return
-G:T:42:0xA2:0x92
-
-# Trap of Silent Switching
-G:T:43:0xA2:0x92
-
-# Trap of Walls
-G:T:44:0xA2:0x87
-
-# Trap of Calling Out
-G:T:45:0xA2:0x89
-
-# Trap of Sliding
-G:T:46:0xA2:0x8B
-
-# Trap of Charges Drain
-G:T:47:0xA2:0x92
-
-# Trap of Stair Movement
-G:T:48:0xA2:0x87
-
-# Trap of New Trap
-G:T:49:0xA2:0x87
-
-# Trap of Scatter Items
-G:T:50:0x8A:0x9C
-
-# Trap of Decay
-G:T:51:0xA2:0x8B
-
-# Trap of Wasting Wands
-G:T:52:0xA2:0x92
-
-# Trap of Filling
-G:T:53:0xA2:0x87
-
-# Trap of Drain Speed
-G:T:54:0xA2:0x92
-
-# Lightning Bolt Trap
-G:T:60:0xA2:0x8C
-
-# Poison Bolt Trap
-G:T:61:0xA2:0x8C
-
-# Acid Bolt Trap
-G:T:62:0xA2:0x8C
-
-# Cold Bolt Trap
-G:T:63:0xA2:0x8C
-
-# Fire Bolt Trap
-G:T:64:0xA2:0x8C
-
-# Plasma Bolt Trap
-G:T:65:0xA2:0x8C
-
-# Water Bolt Trap
-G:T:66:0xA2:0x8C
-
-# Lite Bolt Trap
-G:T:67:0xA2:0x8C
-
-# Dark Bolt Trap
-G:T:68:0xA2:0x8C
-
-# Shards Bolt Trap
-G:T:69:0xA2:0x8C
-
-# Sound Bolt Trap
-G:T:70:0xA2:0x8C
-
-# Confusion Bolt Trap
-G:T:71:0xA2:0x8C
-
-# Force Bolt Trap
-G:T:72:0xA2:0x8C
-
-# Inertia Bolt Trap
-G:T:73:0xA2:0x8C
-
-# Mana Bolt Trap
-G:T:74:0xA2:0x8C
-
-# Ice Bolt Trap
-G:T:75:0xA2:0x8C
-
-# Chaos Bolt Trap
-G:T:76:0xA2:0x8C
-
-# Nether Bolt Trap
-G:T:77:0xA2:0x8C
-
-# Disenchantment Bolt Trap
-G:T:78:0xA2:0x8C
-
-# Nexus  Bolt Trap
-G:T:79:0xA2:0x8C
-
-# Time Bolt Trap
-G:T:80:0xA2:0x8C
-
-# Gravity Bolt Trap
-G:T:81:0xA2:0x8C
-
-# Lightning Ball Trap
-G:T:82:0xA2:0x8D
-
-# Poison Ball Trap
-G:T:83:0xA2:0x8D
-
-# Acid Ball Trap
-G:T:84:0xA2:0x8D
-
-# Cold Ball Trap
-G:T:85:0xA2:0x8D
-
-# Fire Ball Trap
-G:T:86:0xA2:0x8D
-
-# Plasma Ball Trap
-G:T:87:0xA2:0x8D
-
-# Water Ball Trap
-G:T:88:0xA2:0x8D
-
-# Light Ball Trap
-G:T:89:0xA2:0x8D
-
-# Darkness Ball Trap
-G:T:90:0xA2:0x8D
-
-# Shards Ball Trap
-G:T:91:0xA2:0x8D
-
-# Sound Ball Trap
-G:T:92:0xA2:0x8D
-
-# Confusion Ball Trap
-G:T:93:0xA2:0x8D
-
-# Force Ball Trap
-G:T:94:0xA2:0x8D
-
-# Inertia Ball Trap
-G:T:95:0xA2:0x8D
-
-# Mana Ball Trap
-G:T:96:0xA2:0x8D
-
-# Ice Ball Trap
-G:T:97:0xA2:0x8D
-
-# Chaos Ball Trap
-G:T:98:0xA2:0x8D
-
-# Nether Ball Trap
-G:T:99:0xA2:0x8D
-
-# Disenchantment Ball Trap
-G:T:100:0xA2:0x8D
-
-# Nexus Ball Trap
-G:T:101:0xA2:0x8D
-
-# Time Ball Trap
-G:T:102:0xA2:0x8D
-
-# Gravity Ball Trap
-G:T:103:0xA2:0x8D
-
-# Arrow Trap
-G:T:110:0xA2:0x8E
-
-# Bolt Trap
-G:T:111:0xA2:0x8E
-
-# Seeker Arrow Trap
-G:T:112:0xA2:0x8E
-
-# Seeker Bolt Trap
-G:T:113:0xA2:0x8E
-
-# Poison Arrow Trap
-G:T:114:0xA2:0x8E
-
-# Poison Bolt Trap
-G:T:115:0xA2:0x8E
-
-# Poison Seeker Arrow Trap
-G:T:116:0xA2:0x8E
-
-# Poison Seeker Bolt Trap
-G:T:117:0xA2:0x8E
-
-# Broken Dagger Trap
-G:T:118:0xA2:0x8E
-
-# Dagger Trap
-G:T:119:0xA2:0x8E
-
-# Poison Broken Dagger Trap
-G:T:120:0xA2:0x8E
-
-# Poison Dagger Trap
-G:T:121:0xA2:0x8E
-
-# Arrows Trap
-G:T:122:0xA2:0x8E
-
-# Bolts Trap
-G:T:123:0xA2:0x8E
-
-# Seeker Arrow Trap
-G:T:124:0xA2:0x8E
-
-# Seeker Bolt Trap
-G:T:125:0xA2:0x8E
-
-# Poison Arrows Trap
-G:T:126:0xA2:0x8E
-
-# Poison Bolt Trap
-G:T:127:0xA2:0x8E
-
-# Poison Seeker Arrows Trap
-G:T:128:0xA2:0x8E
-
-# Poison Seeker Bolts Trap
-G:T:129:0xA2:0x8E
-
-# Broken Daggers Trap
-G:T:130:0xA2:0x8E
-
-# Dagger Trap
-G:T:131:0xA2:0x8E
-
-# Poison Broken Daggers Trap
-G:T:132:0xA2:0x8E
-
-# Poison Daggers Trap
-G:T:133:0xA2:0x8E
-
-# Trap of Drop Item
-G:T:140:0xA2:0x92
-
-# Trap of Drop Items
-G:T:141:0xA2:0x92
-
-# Trap of Drop Everything
-G:T:142:0xA2:0x92
-
-# Trap of Femininity
-G:T:150:0xA2:0x8B
-
-# Trap of Masculinity
-G:T:151:0xA2:0x8B
-
-# Trap of Neutrality
-G:T:152:0xA2:0x8B
-
-# Trap of Aging
-G:T:153:0xA2:0x8B
-
-# Trap of Growing
-G:T:154:0xA2:0x8B
-
-# Trap of Shrinking
-G:T:155:0xA2:0x8B
-
-# Trap of Tanker Drain
-G:T:157:0xA2:0x8B
-
-# Trap of Divine Anger
-G:T:158:0xA2:0x88
-
-# Trap of Divine Wrath
-G:T:159:0xA2:0x88
-
-# Hallucination Trap
-G:T:160:0xA2:0x8B
-
-# Greater Magic Missile Trap
-G:T:161:0xA2:0x8C
-
-# Foulness Trap
-G:T:162:0xA2:0x8C
-
-# Trap of Death Ray
-G:T:163:0xA2:0x8C
-
-# Trap of Holy Fire
-G:T:164:0xA2:0x8C
-
-# Trap of Hell Fire
-G:T:165:0xA2:0x8C
-
-# Psi Bolt Trap
-G:T:166:0xA2:0x8C
-
-# Psi Drain Trap
-G:T:167:0xA2:0x8B
-
-# Plasma (Nuke) Ball Trap
-G:T:168:0xA2:0x8D
-
-# Psi Ball Trap
-G:T:169:0xA2:0x8D
-
-# Aquirement Trap
-G:T:170:0xA2:0x89
-
-# Greater Lightning Bolt Trap
-G:T:171:0xA2:0x8C
-
-# Greater Poison Bolt Trap
-G:T:172:0xA2:0x8C
-
-# Greater Acid Bolt Trap
-G:T:173:0xA2:0x8C
-
-# Greater Cold Bolt Trap
-G:T:174:0xA2:0x8C
-
-# Greater Fire Bolt Trap
-G:T:175:0xA2:0x8C
\ No newline at end of file
diff --git a/lib/mods/theme/pref/user.prf b/lib/mods/theme/pref/user.prf
index 9e10b2ac..04715ebc 100644
--- a/lib/mods/theme/pref/user.prf
+++ b/lib/mods/theme/pref/user.prf
@@ -24,27 +24,10 @@
 ?:[EQU $SYS gcu]
 %:user-gcu.prf
 
-?:[EQU $SYS ami]
-%:user-ami.prf
-
 ?:[EQU $SYS mac]
 %:user-mac.prf
 
-?:[EQU $SYS dos]
-%:user-dos.prf
-
-?:[EQU $SYS ibm]
-%:user-ibm.prf
-
 ?:[EQU $SYS win]
 %:user-win.prf
 
-?:[EQU $SYS emx]
-%:user-emx.prf
-
-?:[EQU $SYS acn]
-%:user-acn.prf
-
 ?:1
-
-
diff --git a/lib/mods/theme/pref/xtra-new.prf b/lib/mods/theme/pref/xtra-new.prf
deleted file mode 100644
index 214796cf..00000000
--- a/lib/mods/theme/pref/xtra-new.prf
+++ /dev/null
@@ -1,63 +0,0 @@
-# File: xtra-new.prf
-
-#
-# This file defines special attr/char mappings for use in "graphics" mode
-#
-# Edited for use with Adam Bolt's new graphics by Robert Ruehlmann < rr9@angband.org >
-#
-# See "lib/help/command.txt" and "src/files.c" for more information.
-#
-
-
-##### AK 20011216 Default pictures for all races that
-#     are not handled below, without caring for class
-
-
-?:[EQU $RACE Human]
-R:0:0x89/0xA0
-?:[EQU $RACE Half-Elf]
-R:0:0x89/0xA1
-?:[EQU $RACE Elf]
-R:0:0x89/0xA2
-?:[EQU $RACE Hobbit]
-R:0:0x89/0xA3
-?:[EQU $RACE Gnome]
-R:0:0x89/0xA4
-?:[EQU $RACE Dwarf]
-R:0:0x89/0xA5
-?:[EQU $RACE Orc]
-R:0:0x89/0xA6
-?:[EQU $RACE Troll]
-R:0:0x89/0xA7
-?:[EQU $RACE Dunadan]
-R:0:0x89/0xA8
-?:[EQU $RACE High-Elf]
-R:0:0x89/0xA9
-?:[EQU $RACE Half-Ogre]
-R:0:0x89/0xAA
-?:[EQU $RACE Beorning]
-R:0:0x89/0xAB
-?:[EQU $RACE Druadan]
-R:0:0x89/0xAC
-?:[EQU $RACE Petty-Dwarf]
-R:0:0x89/0xAD
-?:[EQU $RACE Dark-Elf]
-R:0:0x89/0xAE
-?:[EQU $RACE Ent]
-R:0:0x89/0xAF
-?:[EQU $RACE RohanKnight]
-R:0:0x89/0xB0
-?:[EQU $RACE Eagle]
-R:0:0x89/0xB1
-?:[EQU $RACE Dragon]
-R:0:0x89/0xB2
-?:[EQU $RACE Yeek]
-R:0:0x89/0xB3
-?:[EQU $RACE Wood-Elf]
-R:0:0x89/0xB4
-?:[EQU $RACE Maia]
-R:0:0x89/0xB5
-?:[EQU $RACE Easterling]
-R:0:0x89/0xB6
-?:[EQU $RACE Demon]
-R:0:0x89/0xB7
\ No newline at end of file
diff --git a/lib/mods/theme/scpt/bounty.lua b/lib/mods/theme/scpt/bounty.lua
deleted file mode 100644
index 94c15598..00000000
--- a/lib/mods/theme/scpt/bounty.lua
+++ /dev/null
@@ -1,90 +0,0 @@
--- The bounty quest! bring back corpses to increase your monster lore skill
-
-add_quest
-{
-	["global"] =    "BOUNTY_QUEST",
-	["name"] =      "Bounty quest",
-	["desc"] =      function()
-		if quest(BOUNTY_QUEST).status == QUEST_STATUS_TAKEN then
-			print_hook("#####yBounty quest!\n")
-			print_hook("You must bring back "..monster_race_desc(bounty_quest_monster, 0).." corpse to the beastmaster.\n")
-			print_hook("\n")
-		end
-	end,
-	["level"] =     -1,
-	["data"] =      {
-			["bounty_quest_monster"] = 0,
-	},
-	["hooks"] =     {
-		-- Start the game without the quest, need to request it
-		[HOOK_BIRTH_OBJECTS] = function()
-			quest(BOUNTY_QUEST).status = QUEST_STATUS_UNTAKEN
-		end,
-	},
-}
-
-add_building_action
-{
-	-- Index is used in ba_info.txt to set the actions
-	["index"] =     54,
-	["action"] =    function()
-		if quest(BOUNTY_QUEST).status == QUEST_STATUS_UNTAKEN then
-			quest(BOUNTY_QUEST).status = QUEST_STATUS_TAKEN
-			bounty_quest_monster = get_new_bounty_monster(3 + ((player.lev * 3) / 2))
-
-			msg_print("You must bring me back "..monster_race_desc(bounty_quest_monster, 0).." corpse.")
-		else
-			msg_print("You still must bring me back "..monster_race_desc(bounty_quest_monster, 0).." corpse.")
-		end
-	end
-}
-
-add_building_action
-{
-	-- Index is used in ba_info.txt to set the actions
-	["index"] =     55,
-	["action"] =    function()
-		if quest(BOUNTY_QUEST).status == QUEST_STATUS_TAKEN then
-			local ret, item
-	
-			-- Ask for an item
-			ret, item = get_item("What corpse to return?",
-					     "You have no corpse to return.",
-					     bor(USE_INVEN),
-					     function (obj)
-					     	if (obj.tval == TV_CORPSE) and (obj.pval2 == bounty_quest_monster) then
-							return TRUE
-						end
-						return FALSE
-					     end
-			)
-
-			-- Ok we got the corpse!
-			if ret == TRUE then
-				-- Take the corpse from the inventory
-				inven_item_increase(item, -1)
-				inven_item_optimize(item)
-
-				msg_print("Ah well done adventurer!")
-				msg_print("As a reward I will teach you a bit of monster lore.")
-
-				if skill(SKILL_LORE).mod == 0 then
-					skill(SKILL_LORE).mod = 900
-					skill(SKILL_LORE).dev = TRUE
-				end
-				skill(SKILL_LORE).value = skill(SKILL_LORE).value + skill(SKILL_LORE).mod
-				if skill(SKILL_PRESERVATION).mod == 0 then
-					skill(SKILL_PRESERVATION).value = 800
-					skill(SKILL_PRESERVATION).mod = 800
-					skill(SKILL_PRESERVATION).dev = TRUE
-					msg_print("I see you don't know the corpse preservation skill, I shall teach you it too.")
-				end
-
-				quest(BOUNTY_QUEST).status = QUEST_STATUS_UNTAKEN
-				bounty_quest_monster = 0
-			end
-		else
-			msg_print("You do not have any bounty quest yet.")
-		end
-	end
-}
diff --git a/lib/mods/theme/scpt/corrupt.lua b/lib/mods/theme/scpt/corrupt.lua
deleted file mode 100644
index f402add3..00000000
--- a/lib/mods/theme/scpt/corrupt.lua
+++ /dev/null
@@ -1,1089 +0,0 @@
--- Definition of the corruptions
--- Theme adds the restriction T-Plus has for Maiar: they may only gain the Balrog corruptions.
-
--- The Balrog corruptions
-CORRUPT_BALROG_AURA = add_corruption
-{
-	["color"]       = TERM_ORANGE,
-	["name"]	= "Balrog Aura",
-	["get_text"]    = "A corrupted wall of flames surrounds you.",
-	["lose_text"]   = "The wall of corrupted flames abandons you.",
-	["desc"]	=
-	{
-			  "  Surrounds you with a fiery aura",
-			  "  But it can burn scrolls when you read them"
-	},
-	["hooks"]       =
-	{
-		[HOOK_CALC_BONUS] = function()
-			player.xtra_f3 = bor(player.xtra_f3, TR3_SH_FIRE)
-			player.xtra_f3 = bor(player.xtra_f3, TR3_LITE1)
-		end,
-		[HOOK_READ] = function(obj)
-			if magik(5) == TRUE then
-				msg_print("Your demon aura burns the scroll before you read it!")
-				return TRUE, TRUE, FALSE
-			else
-				return FALSE
-			end
-		end,
-	},
-}
-
-CORRUPT_BALROG_WINGS = add_corruption
-{
-	["color"]       = TERM_ORANGE,
-	["name"]	= "Balrog Wings",
-	["get_text"]    = "Wings of shadow grow in your back.",
-	["lose_text"]   = "The wings in your back fall apart.",
-	["desc"]	=
-	{
-			  "  Creates ugly, but working, wings allowing you to fly",
-			  "  But it reduces charisma by 4 and dexterity by 2"
-	},
-	["hooks"]       =
-	{
-		[HOOK_CALC_BONUS] = function()
-			player.xtra_f4 = bor(player.xtra_f4, TR4_FLY)
-			player.modify_stat(A_CHR, -4)
-			player.modify_stat(A_DEX, -2)
-		end,
-	},
-}
-
-CORRUPT_BALROG_STRENGTH = add_corruption
-{
-	["color"]       = TERM_ORANGE,
-	["name"]	= "Balrog Strength",
-	["get_text"]    = "Your muscles get unnatural strength.",
-	["lose_text"]   = "Your muscles get weaker again.",
-	["desc"]	=
-	{
-			  "  Provides 3 strength and 1 constitution",
-			  "  But it reduces charisma by 1 and dexterity by 3"
-	},
-	["hooks"]       =
-	{
-		[HOOK_CALC_BONUS] = function()
-			player.modify_stat(A_STR, 3)
-			player.modify_stat(A_CON, 1)
-			player.modify_stat(A_DEX, -3)
-			player.modify_stat(A_CHR, -1)
-		end,
-	},
-}
-
-CORRUPT_BALROG_FORM = add_corruption
-{
-	["color"]       = TERM_YELLOW,
-	["name"]	= "Balrog Form",
-	["get_text"]    = "You feel the might of a Balrog inside you.",
-	["lose_text"]   = "The presence of the Balrog seems to abandon you.",
-	["desc"]	=
-	{
-			  "  Allows you to turn into a Balrog at will",
-			  "  You need Balrog Wings, Balrog Aura and Balrog Strength to activate it"
-	},
-	["depends"]     =
-	{
-			[CORRUPT_BALROG_AURA] = TRUE,
-			[CORRUPT_BALROG_WINGS] = TRUE,
-			[CORRUPT_BALROG_STRENGTH] = TRUE
-	},
-	["hooks"]       =
-	{
-		[HOOK_CALC_POWERS] = function()
-			player.add_power(PWR_BALROG)
-		end,
-	},
-}
-
-
--- The Demon corruptions
-CORRUPT_DEMON_SPIRIT = add_corruption
-{
-	["color"]       = TERM_RED,
-	["name"]	= "Demon Spirit",
-	["get_text"]    = "Your spirit opens to corrupted thoughts.",
-	["lose_text"]   = "Your spirit closes again to the corrupted thoughts.",
-	["desc"]	=
-	{
-			  "  Increases your intelligence by 1",
-			  "  But reduce your charisma by 2",
-	},
-["can_gain"] =	function()
-			-- Maiar can't get this one!
-			local str = get_race_name()
-			if str == "Maia" then
-				return nil
-			else
-				return not nil
-			end
-	end,
-	["hooks"]       =
-	{
-		[HOOK_CALC_BONUS] = function()
-			player.modify_stat(A_INT, 1)
-			player.modify_stat(A_CHR, -2)
-		end,
-	},
-}
-
-CORRUPT_DEMON_HIDE = add_corruption
-{
-	["color"]       = TERM_RED,
-	["name"]	= "Demon Hide",
-	["get_text"]    = "Your skin grows into a thick hide.",
-	["lose_text"]   = "Your skin returns to a natural state.",
-	["desc"]	=
-	{
-			  "  Increases your armour class by your level",
-			  "  Provides immunity to fire at level 40",
-			  "  But reduces speed by your level / 7",
-	},
-["can_gain"] =	function()
-			-- Maiar can't get this one!
-			local str = get_race_name()
-			if str == "Maia" then
-				return nil
-			else
-				return not nil
-			end
-	end,
-	["hooks"]       =
-	{
-		[HOOK_CALC_BONUS] = function()
-			player.to_a = player.to_a + player.lev
-			player.dis_to_a = player.dis_to_a + player.lev
-			player.pspeed = player.pspeed - (player.lev / 7)
-			if player.lev >= 40 then player.xtra_f2 = bor(player.xtra_f2, TR2_IM_FIRE) end
-		end,
-	},
-}
-
-CORRUPT_DEMON_BREATH = add_corruption
-{
-	["color"]       = TERM_RED,
-	["name"]	= "Demon Breath",
-	["get_text"]    = "Your breath becomes mephitic.",
-	["lose_text"]   = "Your breath is once again normal.",
-	["desc"]	=
-	{
-			  "  Provides fire breath",
-			  "  But gives a small chance to spoil potions when you quaff them",
-	},
-	["hooks"]       =
-	{
-		[HOOK_CALC_POWERS] = function()
-			player.add_power(PWR_BR_FIRE)
-		end,
-		[HOOK_QUAFF] = function(obj)
-			if magik(9) == TRUE then
-				msg_print("Your demon breath spoils the potion!")
-				return TRUE, FALSE
-			else
-				return FALSE
-			end
-		end,
-	},
-}
-
-CORRUPT_DEMON_REALM = add_corruption
-{
-	["color"]       = TERM_L_RED,
-	["name"]	= "Demon Realm",
-	["get_text"]    = "You feel more attuned to the demon realm.",
-	["lose_text"]   = "You lose your attunement to the demon realm.",
-	["desc"]	=
-	{
-			  "  Provides access to the demon school skill and the use of demonic equipment",
-			  "  You need Demon Spirit, Demon Hide and Demon Breath to activate it"
-	},
-	["depends"]     =
-	{
-			[CORRUPT_DEMON_SPIRIT] = TRUE,
-			[CORRUPT_DEMON_HIDE] = TRUE,
-			[CORRUPT_DEMON_BREATH] = TRUE
-	},
-["can_gain"] =	function()
-			-- Maiar can't get this one!
-			local str = get_race_name()
-			if str == "Maia" then
-				return nil
-			else
-				return not nil
-			end
-	end,
-	["hooks"]       =
-	{
-		[HOOK_CALC_BONUS] = function()
-			-- 1500 may seem a lot, but people are rather unlikely to get the corruption very soon
-			-- due to the dependencies
-			if s_info[SKILL_DAEMON + 1].mod == 0 then s_info[SKILL_DAEMON + 1].mod = 1500 end
-			s_info[SKILL_DAEMON + 1].hidden = FALSE;
-		end,
-	},
-}
-
-
--- Teleportation corruptions
-
--- Random teleportation will ask for confirmation 70% of the time
--- But 30% of the time it will teleport, without asking
-CORRUPT_RANDOM_TELEPORT = add_corruption
-{
-	["color"]       = TERM_GREEN,
-	["name"]	= "Random teleportation",
-	["get_text"]    = "Space seems to fizzle around you.",
-	["lose_text"]   = "Space solidify again around you.",
-	["desc"]	=
-	{
-			  "  Randomly teleports you around",
-	},
-["can_gain"] =	function()
-			-- Maiar can't get this one!
-			local str = get_race_name()
-			if str == "Maia" then
-				return nil
-			else
-				return not nil
-			end
-	end,
-	-- No oppose field, it will be automatically set when we declare the anti-telep corruption to oppose us
-	["hooks"]       =
-	{
-		[HOOK_CALC_BONUS] = function()
-			player.xtra_f3 = bor(player.xtra_f3, TR3_TELEPORT)
-		end,
-		[HOOK_PROCESS_WORLD] = function()
-			if rand_int(300) == 1 then
-				if magik(70) == TRUE then
-					if get_check("Teleport?") == TRUE then
-						teleport_player(50)
-					end
-				else
-					disturb(0, 0)
-					msg_print("Your corruption takes over you, you teleport!")
-					teleport_player(50)
-				end
-			end
-		end,
-	},
-}
-
--- Anti-teleportation corruption, can be stopped with this power
-CORRUPT_ANTI_TELEPORT = add_corruption
-{
-	["color"]       = TERM_GREEN,
-	["name"]	= "Anti-teleportation",
-	["get_text"]    = "Space continuum freezes around you.",
-	["lose_text"]   = "Space continuum can once more be altered around you.",
-	["desc"]	=
-	{
-			  "  Prevents all teleportations, be it of you or monsters",
-	},
-	["oppose"]     	=
-	{
-			[CORRUPT_RANDOM_TELEPORT] = TRUE
-	},
-	["can_gain"] =	function()
-			-- Maiar can't get this one!
-			local str = get_race_name()
-			if str == "Maia" then
-				return nil
-			else
-				return not nil
-			end
-	end,
-	["hooks"]       =
-	{
-		[HOOK_BIRTH_OBJECTS] = function()
-			player.corrupt_anti_teleport_stopped = FALSE
-		end,
-		[HOOK_CALC_POWERS] = function()
-			player.add_power(POWER_COR_SPACE_TIME)
-		end,
-		[HOOK_CALC_BONUS] = function()
-			if player.corrupt_anti_teleport_stopped == FALSE then
-				player.resist_continuum = TRUE
-			end
-		end,
-		[HOOK_PROCESS_WORLD] = function()
-			if player.corrupt_anti_teleport_stopped == TRUE then
-				local amt = player.msp + player.csp
-				amt = amt / 100
-				if (amt < 1) then amt = 1 end
-				increase_mana(-amt)
-				if player.csp == 0 then
-					player.corrupt_anti_teleport_stopped = FALSE
-					msg_print("You stop controlling your corruption.")
-					player.update = bor(player.update, PU_BONUS)
-				end
-			end
-		end,
-	},
-}
-
-
--- Troll blood
-CORRUPT_TROLL_BLOOD = add_corruption
-{
-	["color"]       = TERM_GREEN,
-	["name"]	= "Troll Blood",
-	["get_text"]    = "Your blood thickens, you sense corruption in it.",
-	["lose_text"]   = "Your blood returns to a normal state.",
-	["desc"]	=
-	{
-			  "  Troll blood flows in your veins, granting increased regeneration",
-			  "  It also enables you to feel the presence of other troll beings",
-			  "  But it will make your presence more noticeable and aggravating",
-	},
-	["can_gain"] =	function()
-			-- Ok trolls should not get this one. never.
-			local str = get_race_name()
-			if (str == "Maia") or (str == "Troll") then
-				return nil
-			else
-				return not nil
-			end
-	end,
-	["hooks"]       =
-	{
-		[HOOK_CALC_BONUS] = function()
-			player.xtra_f3 = bor(player.xtra_f3, TR3_REGEN, TR3_AGGRAVATE)
-			player.xtra_esp = bor(player.xtra_esp, ESP_TROLL)
-		end,
-	},
-}
-
--- The vampire corruption set
-CORRUPT_VAMPIRE_TEETH = add_corruption
-{
-	["group"]       = "Vampire",
-	["removable"]   = FALSE,
-	["color"]       = TERM_L_DARK,
-	["name"]	= "Vampiric Teeth",
-	["get_text"]    = "You grow vampiric teeth!",
-	["lose_text"]   = "BUG! this should not happen",
-	["desc"]	=
-	{
-			  "  Your teeth allow you to drain blood to feed yourself",
-			  "  However your stomach now only accepts blood.",
-	},
-	["can_gain"] =	function()
-			-- Maiar can't get this one!
-			local str = get_race_name()
-			if str == "Maia" then
-				return nil
-			else
-				return not nil
-			end
-	end,
-	["allow"]       = function()
-		if test_race_flags(1, PR1_NO_SUBRACE_CHANGE) == FALSE then return not nil else return nil end
-	end,
-	["gain"]	= function()
-		switch_subrace(SUBRACE_SAVE, TRUE);
-
-		subrace_add_power(subrace(SUBRACE_SAVE), PWR_VAMPIRISM)
-		subrace(SUBRACE_SAVE).flags1 = bor(subrace(SUBRACE_SAVE).flags1, PR1_VAMPIRE, PR1_UNDEAD, PR1_NO_SUBRACE_CHANGE)
-	end,
-	["hooks"]       =
-	{
-	},
-}
-CORRUPT_VAMPIRE_STRENGTH = add_corruption
-{
-	["group"]       = "Vampire",
-	["removable"]   = FALSE,
-	["color"]       = TERM_L_DARK,
-	["name"]	= "Vampiric Strength",
-	["get_text"]    = "Your body seems more dead than alive.",
-	["lose_text"]   = "BUG! this should not happen",
-	["desc"]	=
-	{
-			  "  Your body seems somewhat dead",
-			  "  In this near undead state it has improved strength, constitution and intelligence",
-			  "  But reduced dexterity, wisdom and charisma.",
-	},
-	["depends"]     =
-	{
-			[CORRUPT_VAMPIRE_TEETH] = TRUE,
-	},
-	["can_gain"] =	function()
-			-- Maiar can't get this one!
-			local str = get_race_name()
-			if str == "Maia" then
-				return nil
-			else
-				return not nil
-			end
-	end,
-	["gain"]	= function()
-		-- Apply the bonuses/penalities
-		subrace(SUBRACE_SAVE).r_mhp = subrace(SUBRACE_SAVE).r_mhp + 1
-		subrace(SUBRACE_SAVE).r_exp = subrace(SUBRACE_SAVE).r_exp + 100
-
-		subrace(SUBRACE_SAVE).r_adj[A_STR + 1] = subrace(SUBRACE_SAVE).r_adj[A_STR + 1] + 3
-		subrace(SUBRACE_SAVE).r_adj[A_INT + 1] = subrace(SUBRACE_SAVE).r_adj[A_INT + 1] + 2
-		subrace(SUBRACE_SAVE).r_adj[A_WIS + 1] = subrace(SUBRACE_SAVE).r_adj[A_WIS + 1] - 3
-		subrace(SUBRACE_SAVE).r_adj[A_DEX + 1] = subrace(SUBRACE_SAVE).r_adj[A_DEX + 1] - 2
-		subrace(SUBRACE_SAVE).r_adj[A_CON + 1] = subrace(SUBRACE_SAVE).r_adj[A_CON + 1] + 1
-		subrace(SUBRACE_SAVE).r_adj[A_CHR + 1] = subrace(SUBRACE_SAVE).r_adj[A_CHR + 1] - 4
-
-		-- be reborn!
-		do_rebirth()
-		cmsg_print(TERM_L_DARK, "You feel death slipping inside.")
-	end,
-	["hooks"]       =
-	{
-	},
-}
-CORRUPT_VAMPIRE_VAMPIRE = add_corruption
-{
-	["group"]       = "Vampire",
-	["removable"]   = FALSE,
-	["color"]       = TERM_L_DARK,
-	["name"]	= "Vampire",
-	["get_text"]    = "You die to be reborn in a Vampire form.",
-	["lose_text"]   = "BUG! this should not happen",
-	["desc"]	=
-	{
-			  "  You are a Vampire. As such you resist cold, poison, darkness and nether.",
-			  "  Your life is sustained, but you cannot stand the light of the sun."
-	},
-	["depends"]     =
-	{
-			[CORRUPT_VAMPIRE_STRENGTH] = TRUE,
-	},
-	["can_gain"] =	function()
-			-- Maiar can't get this one!
-			local str = get_race_name()
-			if str == "Maia" then
-				return nil
-			else
-				return not nil
-			end
-	end,
-	["gain"]	= function()
-		-- Be a Vampire and be proud of it
-		local title = get_subrace_title(SUBRACE_SAVE)
-		if title == " " or title == "Vampire" then
-			title = "Vampire"
-			subrace(SUBRACE_SAVE).place = FALSE
-		else
-			title = "Vampire "..title
-		end
-		set_subrace_title(SUBRACE_SAVE, title)
-
-		-- Bonus/and .. not bonus :)
-		subrace(SUBRACE_SAVE).flags1 = bor(subrace(SUBRACE_SAVE).flags1, PR1_HURT_LITE)
-		subrace(SUBRACE_SAVE).oflags2[2] = bor(subrace(SUBRACE_SAVE).oflags2[2], TR2_RES_POIS, TR2_RES_NETHER, TR2_RES_COLD, TR2_RES_DARK, TR2_HOLD_LIFE)
-		subrace(SUBRACE_SAVE).oflags3[2] = bor(subrace(SUBRACE_SAVE).oflags3[2], TR3_LITE1)
-	end,
-	["hooks"]       =
-	{
-	},
-}
-
--- The old activable corruptions / mutations
-
-MUT1_SPIT_ACID = add_corruption
-{
-	["color"] = TERM_RED,
-	["name"]  = "Ancalagon's Breath",
-	["get_text"]    = "You gain the ability to spit acid.",
-	["lose_text"]   = "You lose the ability to spit acid.",
-	["desc"]        = 
-	{
-			  "  Fires an acid ball.",
-			  "  Damage=level Radius 1+(level/30)",
-			  "  Level=9, Cost=9, Stat=DEX, Difficulty=15",
-	},
-	["can_gain"] =	function()
-			-- Maiar can't get this one!
-			local str = get_race_name()
-			if str == "Maia" then
-				return nil
-			else
-				return not nil
-			end
-	end,
-	["hooks"]       =
-	{
-		[HOOK_CALC_POWERS] = function()
-			player.add_power(PWR_SPIT_ACID)
-		end,
-	},
-}
-
-MUT1_BR_FIRE = add_corruption
-{
-	["color"] = TERM_RED,
-	["name"]  = "Smaug's Breath",
-	["get_text"]    = "You gain the ability to breathe fire.",
-	["lose_text"]   = "You lose the ability to breathe fire.",
-	["desc"]        = 
-	{
-			  "  Fires a fire ball.",
-			  "  Damage=2*level Radius 1+(level/20)",
-			  "  Level=20, Cost=10, Stat=CON, Difficulty=18",
-	},
-	["can_gain"] =	function()
-			-- Maiar can't get this one!
-			local str = get_race_name()
-			if str == "Maia" then
-				return nil
-			else
-				return not nil
-			end
-	end,
-	["hooks"]       =
-	{
-		[HOOK_CALC_POWERS] = function()
-			player.add_power(PWR_BR_FIRE)
-		end,
-	},
-}
-
-MUT1_HYPN_GAZE = add_corruption
-{
-	["color"] = TERM_RED,
-	["name"]  = "Glaurung's Gaze",
-	["get_text"]    = "Your eyes look mesmerizing...",
-	["lose_text"]   = "Your eyes look uninteresting.",
-	["desc"]        = 
-	{
-			  "  Tries to make a monster your pet.",
-			  "  Power=level",
-			  "  Level=12, Cost=12, Stat=CHR, Difficulty=18",
-	},
-	["can_gain"] =	function()
-			-- Maiar can't get this one!
-			local str = get_race_name()
-			if str == "Maia" then
-				return nil
-			else
-				return not nil
-			end
-	end,
-	["hooks"]       =
-	{
-		[HOOK_CALC_POWERS] = function()
-			player.add_power(PWR_HYPN_GAZE)
-		end,
-	},
-}
-
-MUT1_TELEKINES = add_corruption
-{
-	["color"] = TERM_RED,
-	["name"]  = "Saruman's Power",
-	["get_text"]    = "You gain the ability to move objects telekinetically.",
-	["lose_text"]   = "You lose the ability to move objects telekinetically.",
-	["desc"]        = 
-	{
-			  "  Move an object in line of sight to you.",
-			  "  Max weight equal to (level) pounds",
-			  "  Level=9, Cost=9, Stat=WIS, Difficulty=14",
-	},
-	["can_gain"] =	function()
-			-- Maiar can't get this one!
-			local str = get_race_name()
-			if str == "Maia" then
-				return nil
-			else
-				return not nil
-			end
-	end,
-	["hooks"]       =
-	{
-		[HOOK_CALC_POWERS] = function()
-			player.add_power(PWR_TELEKINES)
-		end,
-	},
-}
-
-MUT1_VTELEPORT = add_corruption
-{
-	["color"] = TERM_RED,
-	["name"]  = "Teleport",
-	["get_text"]    = "You gain the power of teleportation at will.",
-	["lose_text"]   = "You lose the power of teleportation at will.",
-	["desc"]        = 
-	{
-			  "  Teleports the player at will.",
-			  "  Distance 10+4*level squares",
-			  "  Level=7, Cost=7, Stat=WIS, Difficulty=15",
-	},
-	["can_gain"] =	function()
-			-- Maiar can't get this one!
-			local str = get_race_name()
-			if str == "Maia" then
-				return nil
-			else
-				return not nil
-			end
-	end,
-	["hooks"]       =
-	{
-		[HOOK_CALC_POWERS] = function()
-			player.add_power(PWR_VTELEPORT)
-		end,
-	},
-}
-
-MUT1_MIND_BLST = add_corruption
-{
-	["color"] = TERM_RED,
-	["name"]  = "Glaurung's Spell",
-	["get_text"]    = "You gain the power of Mind Blast.",
-	["lose_text"]   = "You lose the power of Mind Blast.",
-	["desc"]        = 
-	{
-			  "  Fires a mind blasting bolt (psi damage).",
-			  "  Psi Damage (3+(level-1)/5)d3",
-			  "  Level=5, Cost=3, Stat=WIS, Difficulty=15",
-	},
-	["can_gain"] =	function()
-			-- Maiar can't get this one!
-			local str = get_race_name()
-			if str == "Maia" then
-				return nil
-			else
-				return not nil
-			end
-	end,
-	["hooks"]       =
-	{
-		[HOOK_CALC_POWERS] = function()
-			player.add_power(PWR_MIND_BLST)
-		end,
-	},
-}
-
-MUT1_VAMPIRISM = add_corruption
-{
-	["color"] = TERM_RED,
-	["name"]  = "Vampiric Drain",
-	["get_text"]    = "You become vampiric.",
-	["lose_text"]   = "You are no longer vampiric.",
-	["desc"]        = 
-	{
-			  "  You can drain life from a foe like a vampire.",
-			  "  Drains (level+1d(level))*(level/10) hitpoints,",
-			  "  heals you and satiates you. Doesn't work on all monsters",
-			  "  Level=4, Cost=5, Stat=CON, Difficulty=9",
-	},
-	["can_gain"] =	function()
-			-- Maiar can't get this one!
-			local str = get_race_name()
-			if str == "Maia" then
-				return nil
-			else
-				return not nil
-			end
-	end,
-	["hooks"]       =
-	{
-		[HOOK_CALC_POWERS] = function()
-			player.add_power(PWR_VAMPIRISM)
-		end,
-	},
-}
-
-MUT1_SMELL_MET = add_corruption
-{
-	["color"] = TERM_RED,
-	["name"]  = "Carcharoth's Nose",
-	["get_text"]    = "You smell a metallic odour.",
-	["lose_text"]   = "You no longer smell a metallic odour.",
-	["desc"]        = 
-	{
-			  "  You can detect nearby precious metal (treasure).",
-			  "  Radius 25",
-			  "  Level=3, Cost=2, Stat=INT, Difficulty=12",
-	},
-	["can_gain"] =	function()
-			-- Maiar can't get this one!
-			local str = get_race_name()
-			if str == "Maia" then
-				return nil
-			else
-				return not nil
-			end
-	end,
-	["hooks"]       =
-	{
-		[HOOK_CALC_POWERS] = function()
-			player.add_power(PWR_SMELL_MET)
-		end,
-	},
-}
-
-MUT1_SMELL_MON = add_corruption
-{
-	["color"] = TERM_RED,
-	["name"]  = "Huan's Nose",
-	["get_text"]    = "You smell filthy monsters.",
-	["lose_text"]   = "You no longer smell filthy monsters.",
-	["desc"]        = 
-	{
-			  "  You can detect nearby monsters.",
-			  "  Radius 25",
-			  "  Level=5, Cost=4, Stat=INT, Difficulty=15",
-	},
-	["can_gain"] =	function()
-			-- Maiar can't get this one!
-			local str = get_race_name()
-			if str == "Maia" then
-				return nil
-			else
-				return not nil
-			end
-	end,
-	["hooks"]       =
-	{
-		[HOOK_CALC_POWERS] = function()
-			player.add_power(PWR_SMELL_MON)
-		end,
-	},
-}
-
-MUT1_BLINK = add_corruption
-{
-	["color"] = TERM_RED,
-	["name"]  = "Blink",
-	["get_text"]    = "You gain the power of minor teleportation.",
-	["lose_text"]   = "You lose the power of minor teleportation.",
-	["desc"]        = 
-	{
-			  "  You can teleport yourself short distances (10 squares).",
-			  "  Level=3, Cost=3, Stat=WIS, Difficulty=12",
-	},
-	["can_gain"] =	function()
-			-- Maiar can't get this one!
-			local str = get_race_name()
-			if str == "Maia" then
-				return nil
-			else
-				return not nil
-			end
-	end,
-	["hooks"]       =
-	{
-		[HOOK_CALC_POWERS] = function()
-			player.add_power(PWR_BLINK)
-		end,
-	},
-}
-
-MUT1_EAT_ROCK = add_corruption
-{
-	["color"] = TERM_RED,
-	["name"]  = "Eat Rock",
-	["get_text"]    = "The walls look delicious.",
-	["lose_text"]   = "The walls look unappetizing.",
-	["desc"]        = 
-	{
-			  "  You can consume solid rock with food benefit,",
-			  "  leaving an empty space behind.",
-			  "  Level=8, Cost=12, Stat=CON, Difficulty=18",
-	},
-	["can_gain"] =	function()
-			-- Maiar can't get this one!
-			local str = get_race_name()
-			if str == "Maia" then
-				return nil
-			else
-				return not nil
-			end
-	end,
-	["hooks"]       =
-	{
-		[HOOK_CALC_POWERS] = function()
-			player.add_power(PWR_EAT_ROCK)
-		end,
-	},
-}
-
-MUT1_SWAP_POS = add_corruption
-{
-	["color"] = TERM_RED,
-	["name"]  = "Swap Position",
-	["get_text"]    = "You feel like walking a mile in someone else's shoes.",
-	["lose_text"]   = "You feel like staying in your own shoes.",
-	["desc"]        = 
-	{
-			  "  You can switch locations with another being,",
-			  "  unless it resists teleportation.",
-			  "  Level=15, Cost=12, Stat=DEX, Difficulty=16",
-	},
-	["can_gain"] =	function()
-			-- Maiar can't get this one!
-			local str = get_race_name()
-			if str == "Maia" then
-				return nil
-			else
-				return not nil
-			end
-	end,
-	["hooks"]       =
-	{
-		[HOOK_CALC_POWERS] = function()
-			player.add_power(PWR_SWAP_POS)
-		end,
-	},
-}
-
-MUT1_SHRIEK = add_corruption
-{
-	["color"] = TERM_RED,
-	["name"]  = "Shriek",
-	["get_text"]    = "Your vocal cords get much tougher.",
-	["lose_text"]   = "Your vocal cords get much weaker.",
-	["desc"]        = 
-	{
-			  "  Fires a sound ball and aggravates monsters.",
-			  "  Damage=level*4, Radius=8, centered on player",
-			  "  Level=4, Cost=4, Stat=CON, Difficulty=6",
-	},
-	["can_gain"] =	function()
-			-- Maiar can't get this one!
-			local str = get_race_name()
-			if str == "Maia" then
-				return nil
-			else
-				return not nil
-			end
-	end,
-	["hooks"]       =
-	{
-		[HOOK_CALC_POWERS] = function()
-			player.add_power(PWR_SHRIEK)
-		end,
-	},
-}
-
-MUT1_ILLUMINE = add_corruption
-{
-	["color"] = TERM_RED,
-	["name"]  = "Illuminate",
-	["get_text"]    = "You can light up rooms with your presence.",
-	["lose_text"]   = "You can no longer light up rooms with your presence.",
-	["desc"]        = 
-	{
-			  "  You can emit bright light that illuminates an area.",
-			  "  Damage=2d(level/2) Radius=(level/10)+1",
-			  "  Level=3, Cost=2, Stat=INT, Difficulty=10",
-	},
-	["can_gain"] =	function()
-			-- Maiar can't get this one!
-			local str = get_race_name()
-			if str == "Maia" then
-				return nil
-			else
-				return not nil
-			end
-	end,
-	["hooks"]       =
-	{
-		[HOOK_CALC_POWERS] = function()
-			player.add_power(PWR_ILLUMINE)
-		end,
-	},
-}
-
-MUT1_DET_CURSE = add_corruption
-{
-	["color"] = TERM_RED,
-	["name"]  = "Detect Curses",
-	["get_text"]    = "You can feel evil magics.",
-	["lose_text"]   = "You can no longer feel evil magics.",
-	["desc"]        = 
-	{
-			  "  You can feel the danger of evil magic.",
-			  "  It detects cursed items in the inventory",
-			  "  Level=7, Cost=14, Stat=WIS, Difficulty=14",
-	},
-	["can_gain"] =	function()
-			-- Maiar can't get this one!
-			local str = get_race_name()
-			if str == "Maia" then
-				return nil
-			else
-				return not nil
-			end
-	end,
-	["hooks"]       =
-	{
-		[HOOK_CALC_POWERS] = function()
-			player.add_power(PWR_DET_CURSE)
-		end,
-	},
-}
-
-MUT1_BERSERK = add_corruption
-{
-	["color"] = TERM_RED,
-	["name"]  = "Berserk",
-	["get_text"]    = "You feel a controlled rage.",
-	["lose_text"]   = "You no longer feel a controlled rage.",
-	["desc"]        = 
-	{
-			  "  You can drive yourself into a berserk frenzy.",
-			  "  It grants super-heroism. Duration=10+1d(level)",
-			  "  Level=8, Cost=8, Stat=STR, Difficulty=14",
-	},
-	["can_gain"] =	function()
-			-- Maiar can't get this one!
-			local str = get_race_name()
-			if str == "Maia" then
-				return nil
-			else
-				return not nil
-			end
-	end,
-	["hooks"]       =
-	{
-		[HOOK_CALC_POWERS] = function()
-			player.add_power(PWR_BERSERK)
-		end,
-	},
-}
-
-
-MUT1_MIDAS_TCH = add_corruption
-{
-	["color"] = TERM_RED,
-	["name"]  = "Midas touch",
-	["get_text"]    = "You gain the Midas touch.",
-	["lose_text"]   = "You lose the Midas touch.",
-	["desc"]        = 
-	{
-			  "  You can turn ordinary items to gold.",
-			  "  Turns a non-artifact object into 1/3 its value in gold",
-			  "  Level=10, Cost=5, Stat=INT, Difficulty=12",
-	},
-	["can_gain"] =	function()
-			-- Maiar can't get this one!
-			local str = get_race_name()
-			if str == "Maia" then
-				return nil
-			else
-				return not nil
-			end
-	end,
-	["hooks"]       =
-	{
-		[HOOK_CALC_POWERS] = function()
-			player.add_power(PWR_MIDAS_TCH)
-		end,
-	},
-}
-
-MUT1_GROW_MOLD = add_corruption
-{
-	["color"] = TERM_RED,
-	["name"]  = "Grow Mold",
-	["get_text"]    = "You feel a sudden affinity for mold.",
-	["lose_text"]   = "You feel a sudden dislike for mold.",
-	["desc"]        = 
-	{
-			  "  You can cause mold to grow near you.",
-			  "  Summons up to 8 molds around the player",
-			  "  Level=1, Cost=6, Stat=CON, Difficulty=14",
-	},
-	["can_gain"] =	function()
-			-- Maiar can't get this one!
-			local str = get_race_name()
-			if str == "Maia" then
-				return nil
-			else
-				return not nil
-			end
-	end,
-	["hooks"]       =
-	{
-		[HOOK_CALC_POWERS] = function()
-			player.add_power(PWR_GROW_MOLD)
-		end,
-	},
-}
-
-MUT1_RESIST = add_corruption
-{
-	["color"] = TERM_RED,
-	["name"]  = "Resist Elements",
-	["get_text"]    = "You feel like you can protect yourself.",
-	["lose_text"]   = "You feel like you might be vulnerable.",
-	["desc"]        = 
-	{
-			  "  You can harden yourself to the ravages of the elements.",
-			  "  Level-dependent chance of gaining resistances to the four ",
-			  "  elements and poison. Duration=20 + d20",
-			  "  Level=10, Cost=12, Stat=CON, Difficulty=12",
-	},
-	["can_gain"] =	function()
-			-- Maiar can't get this one!
-			local str = get_race_name()
-			if str == "Maia" then
-				return nil
-			else
-				return not nil
-			end
-	end,
-	["hooks"]       =
-	{
-		[HOOK_CALC_POWERS] = function()
-			player.add_power(PWR_RESIST)
-		end,
-	},
-}
-
-MUT1_EARTHQUAKE = add_corruption
-{
-	["color"] = TERM_RED,
-	["name"]  = "Earthquake",
-	["get_text"]    = "You gain the ability to wreck the dungeon.",
-	["lose_text"]   = "You lose the ability to wreck the dungeon.",
-	["desc"]        = 
-	{
-			  "  You can bring down the dungeon around your ears.",
-			  "  Radius=10, center on the player",
-			  "  Level=12, Cost=12, Stat=STR, Difficulty=16",
-	},
-	["can_gain"] =	function()
-			-- Maiar can't get this one!
-			local str = get_race_name()
-			if str == "Maia" then
-				return nil
-			else
-				return not nil
-			end
-	end,
-	["hooks"]       =
-	{
-		[HOOK_CALC_POWERS] = function()
-			player.add_power(PWR_EARTHQUAKE)
-		end,
-	},
-}
---[[
-CORRUPT_ = add_corruption
-{
-	["color"]       = TERM_GREEN,
-	["name"]	= "",
-	["get_text"]    = "",
-	["lose_text"]   = "",
-	["desc"]	=
-	{
-			  "  ",
-	},
-	["hooks"]       =
-	{
-		[HOOK_CALC_BONUS] = function()
-		end,
-	},
-}
-]]
diff --git a/lib/mods/theme/scpt/drunk.lua b/lib/mods/theme/scpt/drunk.lua
deleted file mode 100644
index 7d90af8d..00000000
--- a/lib/mods/theme/scpt/drunk.lua
+++ /dev/null
@@ -1,21 +0,0 @@
--- silly function that allows a drunk to take a bottle of wine/ale from the player
-
-function drunk_takes_wine(m_idx, item)
-
-	m_ptr = monster(m_idx)
-	o_ptr = get_object(item)
-
-	if (m_ptr.r_idx == test_monster_name("Singing, happy drunk")) 
-			and (o_ptr.tval == TV_FOOD) and ((o_ptr.sval == 38) or (o_ptr.sval == 39)) then
-
-		cmsg_print(TERM_YELLOW, "'Hic!'")
-
-		inven_item_increase(item, -1)
-		inven_item_optimize(item)
-		return TRUE
-	else
-		return FALSE
-	end
-end
-
-add_hook_script(HOOK_GIVE, "drunk_takes_wine", "drunk_takes_wine")
diff --git a/lib/mods/theme/scpt/fireprof.lua b/lib/mods/theme/scpt/fireprof.lua
deleted file mode 100644
index 8691b821..00000000
--- a/lib/mods/theme/scpt/fireprof.lua
+++ /dev/null
@@ -1,415 +0,0 @@
--- The Old Mages/Fireproofing quest: Bring back a rune from a fiery cave and get some books/scrolls/staves fireproofed in return
-
-fireproof_quest = {}
-
-
--- change this constant (and the FOO_POINTS ones) to adjust the no of items fire-proofed as a reward
-fireproof_quest.TOTAL_ITEM_POINTS = 24
-
--- These constants are how many 'points' each type of item will take up. So currently, you can fireproof 3 books, 4 staves or 12 scrolls.
-fireproof_quest.BOOK_POINTS = 4
-fireproof_quest.STAFF_POINTS = 3
-fireproof_quest.SCROLL_POINTS = 1
-
-add_quest
-{
-	["global"] =    "FIREPROOF_QUEST",
-	["name"] =      "Old Mages quest",
-	["desc"] =      function()
-			local num_books, num_staff, num_scroll
-
-			num_books = fireproof_quest.item_points_remaining / fireproof_quest.BOOK_POINTS
-			num_staff = fireproof_quest.item_points_remaining / fireproof_quest.STAFF_POINTS
-			num_scroll = fireproof_quest.item_points_remaining / fireproof_quest.SCROLL_POINTS
-
-			-- Quest taken
-			if (quest(FIREPROOF_QUEST).status == QUEST_STATUS_TAKEN)  then
-				print_hook("#####yAn Old Mages Quest!\n")
-				print_hook("Retrieve the strange rune for the old mage in Lothlorien.\n")
-				print_hook("\n")			
-			-- essence retrieved, not taken to mage
-			elseif (quest(FIREPROOF_QUEST).status == QUEST_STATUS_COMPLETED) then
-				print_hook("#####yAn Old Mages Quest!\n")
-				print_hook("You have retrieved the rune for the old mage in Lothlorien. Perhaps you \n")
-				print_hook("should see about a reward.\n")
-				print_hook("\n")
-			-- essence returned, not all books fireproofed
-			elseif (quest(FIREPROOF_QUEST).status == QUEST_STATUS_FINISHED) and (fireproof_quest.item_points_remaining > 0) then
-				print_hook("#####yAn Old Mages Quest!\n")
-				print_hook("You have retrieved the rune for the old mage in Lothlorien. He will still \n")
-				print_hook("fireproof "..num_books.." book(s) or "..num_staff.." staff/staves or "..num_scroll.." scroll(s) for you.\n")
-				print_hook("\n")
-			end
-	end,
-	["level"] =     20,
-	["data"] =      {
-			-- store some variables
-			["fireproof_quest.item_points_remaining"] = fireproof_quest.TOTAL_ITEM_POINTS, 
-			["fireproof_quest.essence"] = 0,
-	},
-	["hooks"] =     {
-			-- Start the game without the quest, need to request it
-			[HOOK_BIRTH_OBJECTS] = function()
-				quest(FIREPROOF_QUEST).status = QUEST_STATUS_UNTAKEN
-
-				-- reset some variables on birth
-				fireproof_quest.item_points_remaining = fireproof_quest.TOTAL_ITEM_POINTS
-				fireproof_quest.essence = 0
-			end,
-			[HOOK_GEN_QUEST] = function()
-				local essence, y, x, traps, tries, trap_y, trap_x, grid
-
-				-- Only if player doing this quest
-				if (player.inside_quest ~= FIREPROOF_QUEST) then
-					return FALSE
-				else
-					-- load the map
-					load_map("fireprof.map", 2, 2)
-
-					-- no teleport
-					level_flags2 = DF2_NO_TELEPORT
-
-					-- determine type of rune
-					fireproof_quest.essence = randint(5)
-
-					-- create essence
-					essence = create_object(TV_RUNE2, fireproof_quest.essence)
-
-					-- mark rune
-					essence.pval2 = fireproof_quest.essence
-					essence.note = quark_add("quest")
-
-					-- roll for co-ordinates in top half of map
-					y = randint(3) + 2
-					x = randint(45) + 2
-
-					-- drop it
-					drop_near(essence, -1, y, x)
-
-					-- how many traps to generate
-					traps = rand_range(10, 30)
-					
-					-- generate the traps
-					while (traps > 0) do
-
-						-- initialise tries variable
-						tries = 0
-						
-						-- make sure it's a safe place				  
-						while (tries == 0) do
-
-							-- get grid coordinates
-							trap_y = randint(19) + 2
-							trap_x = randint(45) + 2
-							grid = cave(trap_y, trap_x)
-	
-							-- are the coordinates on a stair, or a wall?
-							if (cave_is(grid, FF1_PERMANENT) ~= 0) or (cave_is(grid, FF1_FLOOR) == 0) then
-		
-								-- try again
-								tries = 0
-							else
-								-- not a stair, then stop this 'while'
-								tries = 1
-							end
-						end
-	
-						-- randomise level of trap
-						trap_level = rand_range(20, 40)
-
-						-- put the trap there
-						place_trap(trap_y, trap_x, trap_level)
-
-						-- that's one less trap to place
-						traps = traps - 1
-					end
-					return TRUE
-				end
-			end,
-			[HOOK_STAIR] = function()
-				local ret
-
-				-- only ask this if player about to go up stairs of quest and hasn't retrieved rune
-				if (player.inside_quest ~= FIREPROOF_QUEST) or 
-				(quest(FIREPROOF_QUEST).status == QUEST_STATUS_COMPLETED) then
-					return FALSE
-				else
-					if cave(player.py, player.px).feat ~= FEAT_LESS then return end
-
-					-- flush all pending input
-					flush()
-
-					-- confirm
-					ret = get_check("Really abandon the quest?")
-
-					-- if yes, then
-					if  (ret == TRUE) then
-
-						-- fail the quest
-						quest(FIREPROOF_QUEST).status = QUEST_STATUS_FAILED
-						return FALSE
-					else 
-						-- if no, they stay in the quest
-						return TRUE
-					end
-				end
-			end,
-			[HOOK_GET] = function(o_ptr)
-
-				-- if they're in the quest and haven't picked up the rune already, continue
-				if (player.inside_quest ~= FIREPROOF_QUEST) or 
-				(quest(FIREPROOF_QUEST).status == QUEST_STATUS_COMPLETED) then
-					return FALSE
-				else
-
-					-- check that it's the real rune and not another one generated via the random object placing in fireproof.map
-					if (o_ptr.pval2 == fireproof_quest.essence) then
-
-						-- ok mark the quest 'completed'
-						quest(FIREPROOF_QUEST).status = QUEST_STATUS_COMPLETED
-						msg_print(TERM_YELLOW, "Fine! Looks like you've found it.")
-					end
-				end
-			end,
-				
-	},
-}
-
--- add the bit that determines what happens when the request 'q'uest bit is done in the wizard spire
-add_building_action
-{
-	-- Index is used in ba_info.txt to set the actions
-	["index"] =     56,
-	["action"] =    function()
-
-			local num_books, num_staff, num_scroll
-
-			num_books = fireproof_quest.item_points_remaining / fireproof_quest.BOOK_POINTS
-			num_staff = fireproof_quest.item_points_remaining / fireproof_quest.STAFF_POINTS
-			num_scroll = fireproof_quest.item_points_remaining / fireproof_quest.SCROLL_POINTS
-
-			-- the quest hasn;t been requested already, right?
-			if quest(FIREPROOF_QUEST).status == QUEST_STATUS_UNTAKEN then
-
-				-- quest has been taken now
-				quest(FIREPROOF_QUEST).status = QUEST_STATUS_TAKEN
-				fireproof_quest.item_points_remaining = fireproof_quest.TOTAL_ITEM_POINTS
-
-				-- issue instructions
-				msg_print("I need a very special rune for a spell I am working on. I am too old to ")
-				msg_print("fetch it myself. Please bring it back to me. You can find it north of here.")
-				msg_print("Be careful with it, it's fragile and might be destroyed easily.")
-
-				return TRUE, FALSE, TRUE
-			-- if quest completed (rune was retrieved)
-			elseif (quest(FIREPROOF_QUEST).status == QUEST_STATUS_COMPLETED) then
-
-				-- ask for rune
-				ret, item = get_item("Which rune?",
-						     "You have no runes to return",
-						     bor(USE_INVEN),
-						     function (obj)
-
-							-- check it's the 'marked' rune
-							if (obj.tval == TV_RUNE2) and (obj.sval == fireproof_quest.essence) and (obj.pval2 == fireproof_quest.essence) then
-								return TRUE
-							end
-							return FALSE
-						     end
-				)
-
-				-- didn't get the rune?
-				if (ret == FALSE) then 
-					return TRUE
-
-				-- got the rune!
-				else
-
-					-- take rune
-					inven_item_increase(item, -1)
-					inven_item_optimize(item)
-					msg_print("Great! Let me fireproof some of your items in thanks. I can do "..num_books.." books, ")
-					msg_print(num_staff.." staves, or "..num_scroll.." scrolls.")
-
-					-- how many items to proof?
-					local items = fireproof_quest.item_points_remaining
-
-					-- repeat till up to 3 (value defined as TOTAL_ITEM_POINTS constant) books fireproofed
-					while items > 0 do
-						ret = fireproof()
-
-						-- don't loop the fireproof if there's nothing to fireproof
-						if ret == FALSE then 
-							break 
-						end
-
-						-- subtract item points
-						items = fireproof_quest.item_points_remaining
-					end
-
-					-- have they all been done?
-					if (fireproof_quest.item_points_remaining == 0) then 
-						-- mark quest to make sure no more quests are given
-						quest(FIREPROOF_QUEST).status = QUEST_STATUS_REWARDED 
-					else
-						-- mark in preparation of anymore books to fireproof
-						quest(FIREPROOF_QUEST).status = QUEST_STATUS_FINISHED
-					end
-
-
-				end	     
-
-			-- if the player asks for a quest when they already have it, but haven't failed it, give them some extra instructions
-			elseif (quest(FIREPROOF_QUEST).status == QUEST_STATUS_TAKEN) then
-				msg_print("The rune is in a cave just behind the shop.")
-
-			-- ok not all books have been fireproofed... lets do the rest
-			elseif (quest(FIREPROOF_QUEST).status == QUEST_STATUS_FINISHED) then
-
-				-- how many books still to proof?
-				local items = fireproof_quest.item_points_remaining
-
-				-- repeat as necessary
-				while items > 0 do
-					ret = fireproof()
-
-					-- don't loop the fireproof if there's nothing to fireproof
-					if ret == FALSE then 
-						break 
-					else 
-						-- have they all been done?
-						if (fireproof_quest.item_points_remaining == 0) then quest(FIREPROOF_QUEST).status = QUEST_STATUS_REWARDED end
-					end
-
-					-- subtract item points
-					items = fireproof_quest.item_points_remaining
-				end
-
-			-- quest failed or completed, then give no more quests
-			elseif (quest(FIREPROOF_QUEST).status == QUEST_STATUS_FAILED) or (quest(FIREPROOF_QUEST).status == QUEST_STATUS_REWARDED) then
-				msg_print("I have no more quests for you")
-			end
-			return TRUE
-	end,
-}
-
--- the routine that checks for a book and actually fireproofs it
-function fireproof()
-
-	local ret, item, obj2, stack, obj3, carry_it
-
-	ret, item = get_item("Which item shall I fireproof?",
-			"You have no more items I can fireproof, come back when you have some.",
-			bor(USE_INVEN),
-			function (obj)
-
-				-- get some flags
-				local f1, f2, f3, f4, f5, esp = object_flags(obj)
-
-				-- is it a book/staff/scroll, is it already fireproof?
-				if ((obj.tval == TV_BOOK) or (obj.tval == TV_SCROLL) or (obj.tval == TV_STAFF)) and (band(f3, TR3_IGNORE_FIRE) == 0) then
-					return TRUE
-				end
-				return FALSE
-			end
-		)
-
-	-- get the object type from the number
-	obj2 = get_object(item)
-
-	-- check we have enough points (if we 'got' an item)
-	if (ret == TRUE) then 
-		ret2, stack = enough_points(obj2)
-	end
-
-	-- did either routine fail?
-	if (ret == FALSE) or (ret2 == FALSE)  then 
-		return FALSE
-	else
-
-		-- are we part of the items from a stack?
-		if (obj2.number ~= stack) then 
-
-			-- make a new object to handle
-			object_copy(obj_forge, obj2)
-
-			-- give it the right number of items
-			obj_forge.number = stack
-
-			-- adjust for number of items in pack not to be fireproofed 
-			obj2.number = obj2.number - stack
-			obj3 = obj_forge
-
-			-- we'll need to add this to the inventory after fireproofing
-			carry_it = TRUE
-		else
-
-			-- use the whole stack
-			obj3 = obj2
-
-			-- we'll be dealing this while it's still in the inventory
-			carry_it = FALSE
-		end
-
-		-- make it fireproof
-		obj3.name2 = 149
-
-		-- apply it, making sure the pvals don't change with apply_magic (it would change the type of book!)
-		local oldpval = obj3.pval
-		local oldpval2 = obj3.pval2
-		local oldpval3 = obj3.pval3
-		apply_magic(obj3, -1, FALSE, FALSE, FALSE)
-		obj3.pval = oldpval
-		obj3.pval2 = oldpval2
-		obj3.pval3 = oldpval3
-
-		-- put it in the inventory if it's only part of a stack
-		if (carry_it == TRUE) then
-			inven_carry(obj3, TRUE)
-		end
-
-		-- id and notice it
-		set_known(obj3)
-		set_aware(obj3)
-
-		return TRUE
-	end
-end
-
--- This function makes sure the player has enough 'points' left to fireproof stuff.
-function enough_points(obj)
-	local item_value, stack
-
-	-- are the items in a stack?
-	if (obj.number > 1) then 
-
-		-- how many to fireproof?
-		stack = get_quantity("How many would you like fireproofed?", obj.number)
-	else 
-		stack = 1
-	end
-	
-	-- check for item type and multiply number in the stack by the amount of points per item of that type
-	if (obj.tval == TV_BOOK) then
-		item_value = fireproof_quest.BOOK_POINTS * stack
-	elseif (obj.tval == TV_STAFF) then
-		item_value = fireproof_quest.STAFF_POINTS * stack
-	elseif (obj.tval == TV_SCROLL) then
-		item_value = fireproof_quest.SCROLL_POINTS * stack
-	end
-
-	-- do we have enough points?
-	if (item_value > fireproof_quest.item_points_remaining) then
-		msg_print("I do not have enough fireproofing material for that.")
-		return FALSE
-	else 
-		-- if so then subtract those points before we do the fireproofing
-		fireproof_quest.item_points_remaining = fireproof_quest.item_points_remaining - item_value
-	end
-
-	-- Used all the points? the quest is completely rewarded.
-	if fireproof_quest.item_points_remaining == 0 then quest(FIREPROOF_QUEST).status = QUEST_STATUS_REWARDED end
-
-	return TRUE, stack
-end
-
diff --git a/lib/mods/theme/scpt/god.lua b/lib/mods/theme/scpt/god.lua
deleted file mode 100644
index 7567178c..00000000
--- a/lib/mods/theme/scpt/god.lua
+++ /dev/null
@@ -1,812 +0,0 @@
--- The god quest: find randomly placed relic in a randomly placed dungeon!
-
--- set some global variables (stored in the save file via the ["data"] key)
-god_quest = {}
-
--- increase this number to make god quests more common, to a max value of 100
-god_quest.CHANCE_OF_GOD_QUEST = 21
-
--- increase this number to make more quests
-god_quest.MAX_NUM_GOD_QUESTS = 7
-
--- d_idx of the god_quest (Lost Temple) dungeon
-god_quest.DUNGEON_GOD = 30
-
-add_quest
-{
-	["global"] =    "GOD_QUEST",
-	["name"] =      "God quest",
-	["desc"] =      function()
-
-			if quest(GOD_QUEST).status == QUEST_STATUS_TAKEN then
-
-				-- get the direction that the dungeon lies from lothlorien/angband
-				local home, home_axis, home_distance, home2, home2_axis, home2_distance = get_god_quest_axes()
-
-				print_hook("#####yGod quest "..god_quest.quests_given.."!\n")
-				print_hook("Thou art to find the lost temple of thy God and\n");
-				print_hook("to retrieve the lost part of the relic for thy God! \n")
-				if home_axis ~= "close" then
-					print_hook("The temple lies "..home_distance.." to the "..home_axis.." of "..home..", \n")
-				else
-					print_hook("The temple lies very close to "..home..", \n")
-				end
-				if home2_axis ~= "close" then
-					print_hook( "and "..home2_distance.." to the "..home2_axis.." of "..home2..", I can feel it.' \n")
-				else
-					print_hook("and very close to "..home2..", I can feel it.' \n")
-				end					
-				print_hook("\n")
-			end
-	end,
-	["level"] =     -1,
-	["data"] =      {
-		["god_quest.relic_num"] = 1,
-		["god_quest.quests_given"] = 0,
-		["god_quest.relics_found"] = 0,
-		["god_quest.dun_mindepth"] = 1,
-		["god_quest.dun_maxdepth"] = 4,
-		["god_quest.dun_minplev"] = 0,
-		["god_quest.relic_gen_tries"] = 0,
-		["god_quest.relic_generated"] = FALSE,
-		["god_quest.dung_x"] = 1,
-		["god_quest.dung_y"] = 1,
-		["god_quest.player_x"] = 0,
-		["god_quest.player_y"] = 0,
-	},
-	["hooks"] =     {
-		-- Start the game without the quest, given it by chance
-		[HOOK_BIRTH_OBJECTS] = function()
-			quest(GOD_QUEST).status = QUEST_STATUS_UNTAKEN
-
-			-- initialise save-file stored variables when new character is created
-			god_quest.relic_num = 1
-			god_quest.quests_given = 0
-			god_quest.relics_found = 0
-			god_quest.dun_mindepth = 1
-			god_quest.dun_maxdepth = 4
-			god_quest.dun_minplev = 0
-			god_quest.relic_gen_tries = 0
-			god_quest.relic_generated = FALSE
-		end,
-		[HOOK_PLAYER_LEVEL] = function(gained)
-			local home_axis, home
-
-			if gained > 0 then
-				-- roll for chance of quest
-				local give_god_quest = magik(god_quest.CHANCE_OF_GOD_QUEST)
-
-				-- check player is worshipping a god, not already on a god quest.
-				if (player.astral ~= FALSE) or (player.pgod <= 0) 
-				or (quest(GOD_QUEST).status == QUEST_STATUS_TAKEN) or (quest(GOD_QUEST).status == QUEST_STATUS_FAILED)
-				or (god_quest.quests_given >= god_quest.MAX_NUM_GOD_QUESTS) or (give_god_quest == FALSE)
-				or ((current_dungeon_idx == god_quest.DUNGEON_GOD) and (dun_level > 0)) or (player.lev <= god_quest.dun_minplev) then
-					-- Don't let a player get quests with trickery
-					if player.lev > god_quest.dun_minplev then
-						god_quest.dun_minplev = player.lev
-					end
-					return
-				else
-					-- each god has different characteristics, so the quests are differnet depending on your god
-					if player.pgod == GOD_ERU then
-						god_quest.relic_num = 7
-					elseif player.pgod == GOD_MANWE then
-						god_quest.relic_num = 8
-					elseif player.pgod == GOD_TULKAS then
-						god_quest.relic_num = 9
-					elseif player.pgod == GOD_MELKOR then
-						god_quest.relic_num = 10
-					elseif player.pgod == GOD_YAVANNA then
-						god_quest.relic_num = 11
-					elseif player.pgod == GOD_AULE then
-						god_quest.relic_num = 16
-					elseif player.pgod == GOD_VARDA then
-						god_quest.relic_num = 17
-					elseif player.pgod == GOD_ULMO then
-						god_quest.relic_num = 18
-					elseif player.pgod == GOD_MANDOS then
-						god_quest.relic_num = 19
-					end
-
-					-- This var will need resetting
-					god_quest.relic_generated = FALSE
-					quest(GOD_QUEST).status = QUEST_STATUS_TAKEN
-					god_quest.quests_given = god_quest.quests_given + 1
-
-					-- actually place the dungeon in a random place
-					place_rand_dung()
-
-					-- store the variables of the coords where the player was given the quest
-					god_quest.player_y, god_quest.player_x = player.get_wild_coord()
-
-					-- establish direction of player and 'home' from dungeon
-					local home, home_axis, home_distance, home2, home2_axis, home2_distance = get_god_quest_axes()
-
-					-- God issues instructions
-					cmsg_print(TERM_L_BLUE, "The voice of "..deity(player.pgod).name.." booms in your head:")
-
-					cmsg_print(TERM_YELLOW, "'I have a task for thee.")
-					cmsg_print(TERM_YELLOW, "Centuries ago an ancient relic of mine was broken apart.")
-					cmsg_print(TERM_YELLOW, "The pieces of it have been lost in fallen temples.")
-					cmsg_print(TERM_YELLOW, "Thou art to find my lost temple and retrieve a piece of the relic.")
-					cmsg_print(TERM_YELLOW, "When thy task is done, thou art to lift it in the air and call upon my name.")
-					cmsg_print(TERM_YELLOW, "I shall then come to reclaim what is mine!")
-					if home_axis ~= "close" then
-						cmsg_print(TERM_YELLOW, "The temple lies "..home_distance.." to the "..home_axis.." of "..home..", ")
-					else
-						cmsg_print(TERM_YELLOW, "The temple lies very close to "..home..",")
-					end
-
-					if home2_axis ~= "close" then
-						cmsg_print(TERM_YELLOW, "and "..home2_distance.." to the "..home2_axis.." of "..home2..", I can feel it.'")
-					else
-						cmsg_print(TERM_YELLOW, "and very close to "..home2..", I can feel it.'")
-					end
-
-					-- Prepare depth of dungeon. If this was generated in set_god_dungeon_attributes(),
-					-- then we'd have trouble if someone levelled up in the dungeon!
-					god_quest.dun_mindepth = player.lev*2/3
-					god_quest.dun_maxdepth = god_quest.dun_mindepth + 4
-				end
-			end
-		end,
-		[HOOK_LEVEL_END_GEN] = function()
-			local chance
-
-			-- Check for dungeon
-			if (current_dungeon_idx ~= god_quest.DUNGEON_GOD) or (quest(GOD_QUEST).status == QUEST_STATUS_UNTAKEN) then
-				return
-			-- if the relic has been created at this point, then it was created on the *PREVIOUS* call of HOOK_LEVEL_END_GEN, and 
-			-- therefore the player has caused another level generation in the temple and hence failed the quest.
-			elseif (god_quest.relic_generated == TRUE) and quest(GOD_QUEST).status ~= QUEST_STATUS_FAILED then 
-				
-					-- fail the quest, don't give another one, don't give this message again
-					quest(GOD_QUEST).status = QUEST_STATUS_FAILED
-					-- God issues instructions
-					cmsg_print(TERM_L_BLUE, "The voice of "..deity(player.pgod).name.." booms in your head:")
-
-					cmsg_print(TERM_YELLOW, "'Thou art a fool!")
-					cmsg_print(TERM_YELLOW, "I told thee to look carefully for the relic. It appears thou hast missed the")
-					cmsg_print(TERM_YELLOW, "opportunity to claim it in my name, as I sense that those monsters who ")
-					cmsg_print(TERM_YELLOW, "have overrun my temple have destroyed it themselves.")
-					cmsg_print(TERM_YELLOW, "I shall not ask thee to do such a thing again, as thou hast failed me in this")
-					cmsg_print(TERM_YELLOW, "simple task!'")					
-			else
-				-- Force relic generation on 5th attempt if others have been unsuccessful.
-				if (god_quest.relic_gen_tries == 4) and (god_quest.relic_generated == FALSE) then
-					generate_relic()
-				else
-					-- 1/5 chance of generation
-					chance = randint(5)
-					if (chance == 5) then
-						generate_relic()
-					else
-						god_quest.relic_gen_tries = god_quest.relic_gen_tries + 1
-					end
-				end
-			end
-		end,
-		[HOOK_ENTER_DUNGEON] = function(d_idx)
-			-- call the function to set the dungeon variables (dependant on pgod) the first time we enter the dungeon
-			if d_idx ~= god_quest.DUNGEON_GOD then
-				return
-			else
-				set_god_dungeon_attributes()
-			end
-		end,
-		[HOOK_GEN_LEVEL_BEGIN] = function()
-			-- call the function to set the dungeon variables (dependant on pgod) when we WoR back into the dungeon
-			if current_dungeon_idx ~= god_quest.DUNGEON_GOD then
-				return
-			else
-				set_god_dungeon_attributes()
-			end
-		end,
-		[HOOK_STAIR] = function()
-			-- call the function to set the dungeon variables (dependant on pgod) every time we go down a level
-			if current_dungeon_idx ~= god_quest.DUNGEON_GOD then
-				return
-			else
-				set_god_dungeon_attributes()
-			end
-		end,
-		[HOOK_GET] = function(o_ptr, item)
-				-- Is it the relic, and check to make sure the relic hasn't already been identified
-			if (quest(GOD_QUEST).status == QUEST_STATUS_TAKEN) and (o_ptr.tval == TV_JUNK) and (o_ptr.sval == god_quest.relic_num)
-			and (o_ptr.pval ~= TRUE)  and (god_quest.relics_found < god_quest.quests_given) then
-
-				-- more God talky-talky
-				cmsg_print(TERM_L_BLUE, deity(player.pgod).name.." speaks to you:")
-
-				-- Is it the last piece of the relic?
-				if (god_quest.quests_given == god_quest.MAX_NUM_GOD_QUESTS) then
-					cmsg_print(TERM_YELLOW, "'At last! Thou hast found all of the relic pieces.")
-
-					-- reward player by increasing prayer skill
-					cmsg_print(TERM_YELLOW, "Thou hast done exceptionally well! I shall increase thy prayer skill even more!'")
-					skill(SKILL_PRAY).value = skill(SKILL_PRAY).value + (10 * (skill(SKILL_PRAY).mod))
-
-					-- Take the relic piece
-					floor_item_increase(item, -1)
-					floor_item_optimize(item)
-				else
-					cmsg_print(TERM_YELLOW, "'Well done! Thou hast found part of the relic.")
-					cmsg_print(TERM_YELLOW, "I shall surely ask thee to find more of it later!")
-					cmsg_print(TERM_YELLOW, "I will take it from thee for now'")
-
-					-- Take the relic piece
-					floor_item_increase(item, -1)
-					floor_item_optimize(item)
-
-					-- reward player by increasing prayer skill
-					cmsg_print(TERM_YELLOW, "'As a reward, I shall teach thee how to pray better'")
-					skill(SKILL_PRAY).value = skill(SKILL_PRAY).value + (5 * (skill(SKILL_PRAY).mod))
-				end
-
-				-- relic piece has been identified
-				o_ptr.pval = TRUE
-				god_quest.relics_found = god_quest.relics_found + 1
-
-				-- Make sure quests can be given again if neccesary
-				quest(GOD_QUEST).status = QUEST_STATUS_UNTAKEN
-				return TRUE
-			end
-		end,
-		[HOOK_CHAR_DUMP] = function()
-
-			if (god_quest.quests_given > 0) then
-
-				local relics = god_quest.relics_found
-				local append_text = ""
-				if (god_quest.relics_found == god_quest.MAX_NUM_GOD_QUESTS) then
-					relics = "all"
-					append_text = " and pleased your god"
-				else
-					if (god_quest.relics_found == 0) then
-						relics = "none"
-					end
-					if (quest(GOD_QUEST).status == QUEST_STATUS_FAILED) then
-						append_text = " and failed in your quest"
-					end
-				end
-
-				print_hook("\n You found "..(relics).." of the relic pieces"..(append_text)..".")
-
-			end
-		end,
-	},
-}
-
--- this function places the lost temple at a randomly determined place.
-function place_rand_dung()
-	local tries, grid
-
-	-- erase old dungeon
-		if (god_quest.quests_given > 0) then 
-		place_dungeon(god_quest.dung_y, god_quest.dung_x)
-		
-		-- erase old recall level
-		max_dlv[god_quest.DUNGEON_GOD + 1] = 0
-	end
-
-	-- initialise tries variable
-	tries = 1000
-
-	while tries > 0 do
-
-		tries = tries - 1
-		-- get grid coordinates, within a range which prevents dungeon being generated at the very edge of the wilderness (would crash the game).
-		god_quest.dung_x = rand_range(1, max_wild_x-2)
-		god_quest.dung_y = rand_range(1, max_wild_y-2)
-
-		-- Is there a town/dungeon/potentially impassable feature there, ?
-		if (wild_map(god_quest.dung_y, god_quest.dung_x).entrance ~= 0)
-		or (wild_feat(wild_map(god_quest.dung_y, god_quest.dung_x)).entrance ~= 0)
-		or (wild_feat(wild_map(god_quest.dung_y, god_quest.dung_x)).terrain_idx == TERRAIN_EDGE)
-		or (wild_feat(wild_map(god_quest.dung_y, god_quest.dung_x)).terrain_idx == TERRAIN_DEEP_WATER)
-		or (wild_feat(wild_map(god_quest.dung_y, god_quest.dung_x)).terrain_idx == TERRAIN_TREES)
-		or (wild_feat(wild_map(god_quest.dung_y, god_quest.dung_x)).terrain_idx == TERRAIN_SHALLOW_LAVA)
-		or (wild_feat(wild_map(god_quest.dung_y, god_quest.dung_x)).terrain_idx == TERRAIN_DEEP_LAVA)
-		or (wild_feat(wild_map(god_quest.dung_y, god_quest.dung_x)).terrain_idx == TERRAIN_MOUNTAIN) then
-			-- try again
-		else
-			--neither player, nor wall, then stop this 'while'
-			break
-		end
-	end
-
-	-- Uhuh BAD ! lets use the default location up bree
-	if tries == 0 then
-		god_quest.dung_x = 32
-		god_quest.dung_y = 19
-	end
-
-	-- create god dungeon in that place
-	place_dungeon(god_quest.dung_y, god_quest.dung_x, god_quest.DUNGEON_GOD)
-
-end
-
--- this function generates the relic at a randomly determined place in the temple.
-function generate_relic()
-	local tries, grid, x, y, relic
-
-	-- initialise tries variable
-	tries = 1000
-
-	while (tries > 0) do
-
-		tries = tries - 1
-		-- get grid coordinates from current height/width, minus one to prevent relic being generated in outside wall. (would crash the game)
-		y = randint(cur_hgt-1)
-		x = randint(cur_wid-1)
-		grid = cave(y, x)
-
-		-- are the coordinates on a floor, not on a permanent feature (eg stairs), and not on a trap ?
-		if (cave_is(grid, FF1_FLOOR) == TRUE) and (cave_is(grid, FF1_PERMANENT) == FALSE) and (grid.t_idx == 0) then break end
-
-	end 
-	
-	-- create relic
-	relic = create_object(TV_JUNK, god_quest.relic_num)
-
-	-- inscribe it to prevent automatizer 'accidents'
-	relic.note = quark_add("quest")
-
-	-- If no safe co-ords were found, put it in the players backpack
-	if tries == 0 then
-
-		-- explain it
-		msg_print(TERM_L_BLUE, "You luckily stumble across the relic on the stairs!")
-
-		if (inven_carry_okay(relic)) then
-			inven_carry(relic, FALSE)
-		else
-		-- no place found, drop it on the stairs
-			drop_near(relic, -1, player.py, player.px)
-		end
-
-	else
-		-- drop it
-		drop_near(relic, -1, y, x)
-	end
-
-	-- Only generate once!
-	god_quest.relic_generated = TRUE
-
-	-- Reset some variables
-	god_quest.relic_gen_tries = 0
-
-end
-
-
-
-
-function set_god_dungeon_attributes()
-
-	-- dungeon properties altered according to which god player is worshipping,
-	if player.pgod == GOD_ERU then
-
-		-- The Eru temple is based on Meneltarma.
-		-- W: Not too many monsters (they'll be tough though, with big levels)
-		dungeon(god_quest.DUNGEON_GOD).min_m_alloc_level = 14
-		dungeon(god_quest.DUNGEON_GOD).min_m_alloc_chance = 200
-
-		-- L: Dirt and grass. More dirt at bottom, more grass at top. rocky ground would be nice
-		dungeon(god_quest.DUNGEON_GOD).floor1 = 88
-		dungeon(god_quest.DUNGEON_GOD).floor2 = 89
-		dungeon(god_quest.DUNGEON_GOD).floor_percent1[1] = 70
-		dungeon(god_quest.DUNGEON_GOD).floor_percent2[1] = 30
-		dungeon(god_quest.DUNGEON_GOD).floor_percent1[2] = 10
-		dungeon(god_quest.DUNGEON_GOD).floor_percent2[2] = 90
-
-		-- A: Outer wall mountain chain. other walls granite
-		dungeon(god_quest.DUNGEON_GOD).fill_type1 = 97
-		dungeon(god_quest.DUNGEON_GOD).fill_percent1[1] = 100
-		dungeon(god_quest.DUNGEON_GOD).outer_wall = 57
-		dungeon(god_quest.DUNGEON_GOD).inner_wall = 97
-		dungeon(god_quest.DUNGEON_GOD).fill_method = 2
-
-		-- O: "At Meneltarma no weapon or tool had ever been borne" (but invaders would have left a small number)
-		dungeon(god_quest.DUNGEON_GOD).objs.treasure = 45
-		dungeon(god_quest.DUNGEON_GOD).objs.combat = 5
-		dungeon(god_quest.DUNGEON_GOD).objs.magic = 45
-		dungeon(god_quest.DUNGEON_GOD).objs.tools = 5
-
-		-- F: A large pillar, with stairs created at edges. (You can't climb a rock through the middle, can you?)
-		dungeon(god_quest.DUNGEON_GOD).flags1 = bor(DF1_BIG, DF1_NO_DOORS, DF1_CIRCULAR_ROOMS, DF1_EMPTY, DF1_TOWER, DF1_FLAT, DF1_ADJUST_LEVEL_2)
-		dungeon(god_quest.DUNGEON_GOD).flags2 = bor(DF2_ADJUST_LEVEL_1_2, DF2_NO_SHAFT, DF2_ADJUST_LEVEL_PLAYER)
-
-		-- R:
-		dungeon(god_quest.DUNGEON_GOD).rules[1].mode = 3
-		dungeon(god_quest.DUNGEON_GOD).rules[1].percent = 50
-
-		-- M: We want evil or flying characters
-		dungeon(god_quest.DUNGEON_GOD).rules[1].mflags3 = RF3_EVIL
-
-		dungeon(god_quest.DUNGEON_GOD).rules[2].mode = 3
-		dungeon(god_quest.DUNGEON_GOD).rules[2].percent = 50
-
-		-- M: We want evil or flying characters
-		dungeon(god_quest.DUNGEON_GOD).rules[2].mflags7 = RF7_CAN_FLY
-
-
-	elseif player.pgod == GOD_MANWE then
-
-		-- Manwe's lost temple is high in the clouds
-		-- W: Has average number of monsters.
-		dungeon(god_quest.DUNGEON_GOD).min_m_alloc_level = 18
-		dungeon(god_quest.DUNGEON_GOD).min_m_alloc_chance = 160
-
-
-		-- L: floor will be 'cloud-like vapour' and pools of 'condensing water'
-		dungeon(god_quest.DUNGEON_GOD).floor1 = 208
-		dungeon(god_quest.DUNGEON_GOD).floor2 = 209
-		dungeon(god_quest.DUNGEON_GOD).floor_percent1[1] = 85
-		dungeon(god_quest.DUNGEON_GOD).floor_percent2[1] = 15
-
-		-- A: Outer wall is 'hail stone wall', inner wall 'dense fog'. FIlled at max smoothing, like islands.
-		dungeon(god_quest.DUNGEON_GOD).fill_type1 = 211
-		dungeon(god_quest.DUNGEON_GOD).fill_percent1[1] = 100
-		dungeon(god_quest.DUNGEON_GOD).outer_wall = 210
-		dungeon(god_quest.DUNGEON_GOD).inner_wall = 211
-		dungeon(god_quest.DUNGEON_GOD).fill_method = 4
-
-		-- O: Can't imagine Manwe having much treasure. Little need for tools in a cloud temple. lots of magical stuff though...
-		dungeon(god_quest.DUNGEON_GOD).objs.treasure = 15
-		dungeon(god_quest.DUNGEON_GOD).objs.combat = 25
-		dungeon(god_quest.DUNGEON_GOD).objs.magic = 55
-		dungeon(god_quest.DUNGEON_GOD).objs.tools = 5
-
-		-- F: It's open, goes up like a tower, give it a few interesting rooms, make the monsters hard(ish).
-		dungeon(god_quest.DUNGEON_GOD).flags1 = bor(DF1_NO_DOORS, DF1_TOWER, DF1_CAVERN,  DF1_ADJUST_LEVEL_2)
-		dungeon(god_quest.DUNGEON_GOD).flags2 = bor(DF2_NO_SHAFT, DF2_ADJUST_LEVEL_PLAYER)
-
-		-- R:
-		dungeon(god_quest.DUNGEON_GOD).rules[1].mode = 3
-		dungeon(god_quest.DUNGEON_GOD).rules[1].percent = 20
-		dungeon(god_quest.DUNGEON_GOD).rules[2].mode = 3
-		dungeon(god_quest.DUNGEON_GOD).rules[2].percent = 20
-		dungeon(god_quest.DUNGEON_GOD).rules[3].mode = 3
-		dungeon(god_quest.DUNGEON_GOD).rules[3].percent = 20
-		dungeon(god_quest.DUNGEON_GOD).rules[4].mode = 3
-		dungeon(god_quest.DUNGEON_GOD).rules[4].percent = 20
-		dungeon(god_quest.DUNGEON_GOD).rules[5].mode = 3
-		dungeon(god_quest.DUNGEON_GOD).rules[5].percent = 20
-
-		-- M: We want air(poison-type) or flying characters. Orcs too. They would have ransacked his elf-loving temple :)
-		dungeon(god_quest.DUNGEON_GOD).rules[1].mflags2 = RF2_INVISIBLE
-		dungeon(god_quest.DUNGEON_GOD).rules[2].mflags3 = bor(RF3_ORC, RF3_IM_POIS)
-		dungeon(god_quest.DUNGEON_GOD).rules[3].mflags4 = bor(RF4_BR_POIS, RF4_BR_GRAV)
-		dungeon(god_quest.DUNGEON_GOD).rules[4].mflags5 = RF5_BA_POIS
-		dungeon(god_quest.DUNGEON_GOD).rules[5].mflags7 = RF7_CAN_FLY
-
-
-	elseif player.pgod == GOD_TULKAS then
-
-		-- Tulkas dungeon is quite normal, possibly a bit boring to be honest. Maybe I should add something radical to it.
-		-- 'The house of Tulkas in the midmost of  Valmar was a house of mirth and revelry. It sprang into the air with many storeys,
-		-- and had a tower of bronze and pillars of copper in a wide arcade'
-		-- W: but with lots of monsters
-		dungeon(god_quest.DUNGEON_GOD).min_m_alloc_level = 20
-		dungeon(god_quest.DUNGEON_GOD).min_m_alloc_chance = 120
-
-		-- L: floor is normal
-		dungeon(god_quest.DUNGEON_GOD).floor1 = 1
-		dungeon(god_quest.DUNGEON_GOD).floor_percent1[1] = 100
-
-		-- A: Granite walls
-		dungeon(god_quest.DUNGEON_GOD).fill_type1 = 56
-		dungeon(god_quest.DUNGEON_GOD).fill_percent1[1] = 100
-		dungeon(god_quest.DUNGEON_GOD).outer_wall = 58
-		dungeon(god_quest.DUNGEON_GOD).inner_wall = 57
-		dungeon(god_quest.DUNGEON_GOD).fill_method = 0
-
-		-- O: Loads of combat drops
-		dungeon(god_quest.DUNGEON_GOD).objs.treasure = 10
-		dungeon(god_quest.DUNGEON_GOD).objs.combat = 70
-		dungeon(god_quest.DUNGEON_GOD).objs.magic = 5
-		dungeon(god_quest.DUNGEON_GOD).objs.tools = 15
-
-		-- F: fairly standard
-		dungeon(god_quest.DUNGEON_GOD).flags1 = bor(DF1_NO_DESTROY, DF1_ADJUST_LEVEL_2)
-		dungeon(god_quest.DUNGEON_GOD).flags2 = DF2_ADJUST_LEVEL_PLAYER
-
-		-- R:
-		dungeon(god_quest.DUNGEON_GOD).rules[1].mode = 3
-		dungeon(god_quest.DUNGEON_GOD).rules[1].percent = 100
-
-		-- M: plenty demons please
-		dungeon(god_quest.DUNGEON_GOD).rules[1].mflags3 = bor(RF3_DEMON, RF3_EVIL)
-
-
-	elseif player.pgod == GOD_MELKOR then
-
-		-- Melkors dungeon will be dark, fiery and stuff
-		-- Many many monsters! (but prob ADJUST_LEVEL_1_2)
-		dungeon(god_quest.DUNGEON_GOD).min_m_alloc_level = 24
-		dungeon(god_quest.DUNGEON_GOD).min_m_alloc_chance = 80
-
-
-		-- L: floor is dirt/mud/nether
-		dungeon(god_quest.DUNGEON_GOD).floor1 = 88
-		dungeon(god_quest.DUNGEON_GOD).floor2 = 94
-		dungeon(god_quest.DUNGEON_GOD).floor3 = 102
-		dungeon(god_quest.DUNGEON_GOD).floor_percent1[1] = 45
-		dungeon(god_quest.DUNGEON_GOD).floor_percent2[1] = 45
-		dungeon(god_quest.DUNGEON_GOD).floor_percent3[1] = 10
-		dungeon(god_quest.DUNGEON_GOD).floor_percent1[2] = 35
-		dungeon(god_quest.DUNGEON_GOD).floor_percent2[2] = 35
-		dungeon(god_quest.DUNGEON_GOD).floor_percent3[2] = 30
-
-		-- A: Granite walls to fill but glass walls for room perimeters (you can see the nasty monsters coming)
-		dungeon(god_quest.DUNGEON_GOD).fill_type1 = 188
-		dungeon(god_quest.DUNGEON_GOD).fill_percent1[1] = 100
-		dungeon(god_quest.DUNGEON_GOD).outer_wall = 188
-		dungeon(god_quest.DUNGEON_GOD).inner_wall = 57
-		dungeon(god_quest.DUNGEON_GOD).fill_method = 1
-
-		-- O: Even drops
-		dungeon(god_quest.DUNGEON_GOD).objs.treasure = 25
-		dungeon(god_quest.DUNGEON_GOD).objs.combat = 25
-		dungeon(god_quest.DUNGEON_GOD).objs.magic = 25
-		dungeon(god_quest.DUNGEON_GOD).objs.tools = 25
-
-		-- F: Small, lava rivers, nasty monsters hehehehehe
-		dungeon(god_quest.DUNGEON_GOD).flags1 = bor(DF1_SMALL, DF1_LAVA_RIVERS, DF1_ADJUST_LEVEL_1)
-		dungeon(god_quest.DUNGEON_GOD).flags2 = bor(DF2_ADJUST_LEVEL_1_2, DF2_ADJUST_LEVEL_PLAYER)
-
-		-- R: No restrictions on monsters here
-		dungeon(god_quest.DUNGEON_GOD).rules[1].mode = 0
-		dungeon(god_quest.DUNGEON_GOD).rules[1].percent = 80
-
-		-- R: Apart from making sure we have some GOOD ones
-		dungeon(god_quest.DUNGEON_GOD).rules[2].mode = 3
-		dungeon(god_quest.DUNGEON_GOD).rules[2].percent = 20
-
-		-- M:
-		dungeon(god_quest.DUNGEON_GOD).rules[2].mflags3 = RF3_GOOD
-
-	elseif player.pgod == GOD_YAVANNA then
-
-		-- Yavannas dungeon will be very natural, tress and stuff.
-		dungeon(god_quest.DUNGEON_GOD).min_m_alloc_level = 22
-		dungeon(god_quest.DUNGEON_GOD).min_m_alloc_chance = 100
-
-		-- L: floor is grass/flowers, plus dirt so not always regenerating quick!
-		dungeon(god_quest.DUNGEON_GOD).floor1 = 89
-		dungeon(god_quest.DUNGEON_GOD).floor2 = 199
-		dungeon(god_quest.DUNGEON_GOD).floor3 = 88
-		dungeon(god_quest.DUNGEON_GOD).floor_percent1[1] = 40
-		dungeon(god_quest.DUNGEON_GOD).floor_percent2[1] = 15
-		dungeon(god_quest.DUNGEON_GOD).floor_percent3[1] = 45
-
-		-- A: Tree walls to fill, small trees for inner walls
-		dungeon(god_quest.DUNGEON_GOD).fill_type1 = 96
-		dungeon(god_quest.DUNGEON_GOD).fill_percent1[1] = 100
-		dungeon(god_quest.DUNGEON_GOD).outer_wall = 202
-		dungeon(god_quest.DUNGEON_GOD).inner_wall = 96
-		dungeon(god_quest.DUNGEON_GOD).fill_method = 1
-
-		-- O: nt much combat.. tools where ransackers have tried to chop trees down.
-		dungeon(god_quest.DUNGEON_GOD).objs.treasure = 20
-		dungeon(god_quest.DUNGEON_GOD).objs.combat = 10
-		dungeon(god_quest.DUNGEON_GOD).objs.magic = 30
-		dungeon(god_quest.DUNGEON_GOD).objs.tools = 40
-
-		-- F: Natural looking
-		dungeon(god_quest.DUNGEON_GOD).flags1 = bor(DF1_NO_DOORS, DF1_WATER_RIVERS, DF1_NO_DESTROY, DF1_ADJUST_LEVEL_1, DF1_NO_RECALL)
-		dungeon(god_quest.DUNGEON_GOD).flags2 = bor(DF2_ADJUST_LEVEL_1_2, DF2_NO_SHAFT, DF2_NO_GENO, DF2_ADJUST_LEVEL_PLAYER)
-
-		-- R: Demons, Undead, non-living
-		dungeon(god_quest.DUNGEON_GOD).rules[1].mode = 3
-		dungeon(god_quest.DUNGEON_GOD).rules[1].percent = 100
-
-		-- M:
-		dungeon(god_quest.DUNGEON_GOD).rules[1].mflags3 = bor(RF3_DEMON, RF3_UNDEAD, RF3_NONLIVING)
-
-	elseif player.pgod == GOD_AULE then
-
-		dungeon(god_quest.DUNGEON_GOD).min_m_alloc_level = 24
-		dungeon(god_quest.DUNGEON_GOD).min_m_alloc_chance = 80
-
-		-- L: floor is dirt/mud/shallow water
-		dungeon(god_quest.DUNGEON_GOD).floor1 = 88
-		dungeon(god_quest.DUNGEON_GOD).floor2 = 94
-		dungeon(god_quest.DUNGEON_GOD).floor3 = 84
-		dungeon(god_quest.DUNGEON_GOD).floor_percent1[1] = 45
-		dungeon(god_quest.DUNGEON_GOD).floor_percent2[1] = 45
-		dungeon(god_quest.DUNGEON_GOD).floor_percent3[1] = 10
-		dungeon(god_quest.DUNGEON_GOD).floor_percent1[2] = 35
-		dungeon(god_quest.DUNGEON_GOD).floor_percent2[2] = 35
-		dungeon(god_quest.DUNGEON_GOD).floor_percent3[2] = 30
-
-		-- A: Grey mountains, inner walls are low hills
-		dungeon(god_quest.DUNGEON_GOD).fill_type1 = 216
-		dungeon(god_quest.DUNGEON_GOD).fill_percent1[1] = 100
-		dungeon(god_quest.DUNGEON_GOD).outer_wall = 216
-		dungeon(god_quest.DUNGEON_GOD).inner_wall = 213
-		dungeon(god_quest.DUNGEON_GOD).fill_method = 1
-
-		-- O: Weapons and tools only
-		dungeon(god_quest.DUNGEON_GOD).objs.treasure = 0
-		dungeon(god_quest.DUNGEON_GOD).objs.combat = 50
-		dungeon(god_quest.DUNGEON_GOD).objs.magic = 0
-		dungeon(god_quest.DUNGEON_GOD).objs.tools = 50
-
-		-- F: Small, no destroyed levels, min monster level = dungeon level
-		dungeon(god_quest.DUNGEON_GOD).flags1 = bor(DF1_SMALL, DF1_NO_DESTROY, DF1_ADJUST_LEVEL_1, DF1_NO_STREAMERS)
-
-		-- R: No restrictions on monsters here
-		dungeon(god_quest.DUNGEON_GOD).rules[1].mode = 0
-		dungeon(god_quest.DUNGEON_GOD).rules[1].percent = 80
-
-	elseif player.pgod == GOD_VARDA then
-
-		-- Varda lives with Manwe, so high in the clouds
-		-- W: Has average number of monsters.
-		dungeon(god_quest.DUNGEON_GOD).min_m_alloc_level = 18
-		dungeon(god_quest.DUNGEON_GOD).min_m_alloc_chance = 160
-
-
-		-- L: floor will be grass and flowers
-		dungeon(god_quest.DUNGEON_GOD).floor1 = 89
-		dungeon(god_quest.DUNGEON_GOD).floor2 = 82
-		dungeon(god_quest.DUNGEON_GOD).floor_percent1[1] = 85
-		dungeon(god_quest.DUNGEON_GOD).floor_percent2[1] = 15
-
-		-- A: Outer wall is 'hail stone wall', inner wall 'dense fog'. Filled at max smoothing, like islands.
-		dungeon(god_quest.DUNGEON_GOD).fill_type1 = 211
-		dungeon(god_quest.DUNGEON_GOD).fill_percent1[1] = 100
-		dungeon(god_quest.DUNGEON_GOD).outer_wall = 210
-		dungeon(god_quest.DUNGEON_GOD).inner_wall = 211
-		dungeon(god_quest.DUNGEON_GOD).fill_method = 4
-
-		-- O: Varda likes magical items and tools, not much treasure or weapons
-		dungeon(god_quest.DUNGEON_GOD).objs.treasure = 15
-		dungeon(god_quest.DUNGEON_GOD).objs.combat = 5
-		dungeon(god_quest.DUNGEON_GOD).objs.magic = 55
-		dungeon(god_quest.DUNGEON_GOD).objs.tools = 25
-
-		-- F: It's open, goes up like a tower, give it a few interesting rooms, make the monsters hard(ish).
-		dungeon(god_quest.DUNGEON_GOD).flags1 = bor(DF1_NO_DOORS, DF1_TOWER, DF1_CAVERN,  DF1_ADJUST_LEVEL_1)
-		dungeon(god_quest.DUNGEON_GOD).flags2 = bor(DF2_NO_SHAFT, DF2_ADJUST_LEVEL_PLAYER)
-
-		-- R:
-		dungeon(god_quest.DUNGEON_GOD).rules[1].mode = 3
-		dungeon(god_quest.DUNGEON_GOD).rules[1].percent = 20
-		dungeon(god_quest.DUNGEON_GOD).rules[2].mode = 3
-		dungeon(god_quest.DUNGEON_GOD).rules[2].percent = 20
-		dungeon(god_quest.DUNGEON_GOD).rules[3].mode = 3
-		dungeon(god_quest.DUNGEON_GOD).rules[3].percent = 20
-		dungeon(god_quest.DUNGEON_GOD).rules[4].mode = 3
-		dungeon(god_quest.DUNGEON_GOD).rules[4].percent = 20
-		dungeon(god_quest.DUNGEON_GOD).rules[5].mode = 3
-		dungeon(god_quest.DUNGEON_GOD).rules[5].percent = 20
-
-		-- M: We want air(poison-type) or flying characters. Orcs too.
-		dungeon(god_quest.DUNGEON_GOD).rules[1].mflags2 = RF2_INVISIBLE
-		dungeon(god_quest.DUNGEON_GOD).rules[2].mflags3 = bor(RF3_ORC, RF3_IM_POIS)
-		dungeon(god_quest.DUNGEON_GOD).rules[3].mflags4 = bor(RF4_BR_POIS, RF4_BR_GRAV)
-		dungeon(god_quest.DUNGEON_GOD).rules[4].mflags5 = RF5_BA_POIS
-		dungeon(god_quest.DUNGEON_GOD).rules[5].mflags7 = RF7_CAN_FLY
-
-
-	elseif player.pgod == GOD_ULMO then
-
-		-- Mandos dungeon is basically Tulkas, except with undead.
-		-- W: but with lots of monsters
-		dungeon(god_quest.DUNGEON_GOD).min_m_alloc_level = 20
-		dungeon(god_quest.DUNGEON_GOD).min_m_alloc_chance = 120
-
-		-- L: floor is dirt
-		dungeon(god_quest.DUNGEON_GOD).floor1 = 88
-		dungeon(god_quest.DUNGEON_GOD).floor_percent1[1] = 100
-
-		-- A: Cheat: walls are water.
-		dungeon(god_quest.DUNGEON_GOD).fill_type1 = 187
-		dungeon(god_quest.DUNGEON_GOD).fill_percent1[1] = 100
-		dungeon(god_quest.DUNGEON_GOD).outer_wall = 238
-		dungeon(god_quest.DUNGEON_GOD).inner_wall = 84
-		dungeon(god_quest.DUNGEON_GOD).fill_method = 0
-
-		-- O: Lots of treasure, not much else.
-		dungeon(god_quest.DUNGEON_GOD).objs.treasure = 90
-		dungeon(god_quest.DUNGEON_GOD).objs.combat = 0
-		dungeon(god_quest.DUNGEON_GOD).objs.magic = 5
-		dungeon(god_quest.DUNGEON_GOD).objs.tools = 5
-
-		-- F: fairly standard
-		dungeon(god_quest.DUNGEON_GOD).flags1 = bor(DF1_NO_DESTROY, DF1_ADJUST_LEVEL_2)
-		dungeon(god_quest.DUNGEON_GOD).flags2 = DF2_ADJUST_LEVEL_PLAYER
-
-		-- R:
-		dungeon(god_quest.DUNGEON_GOD).rules[1].mode = 3
-		dungeon(god_quest.DUNGEON_GOD).rules[1].percent = 35
-		dungeon(god_quest.DUNGEON_GOD).rules[2].mode = 3
-		dungeon(god_quest.DUNGEON_GOD).rules[2].percent = 30
-		dungeon(god_quest.DUNGEON_GOD).rules[3].mode = 3
-		dungeon(god_quest.DUNGEON_GOD).rules[3].percent = 30
-
-		-- M: Aquatic creatures only.
-		dungeon(god_quest.DUNGEON_GOD).rules[1].mflags3 = RF7_CAN_FLY
-		dungeon(god_quest.DUNGEON_GOD).rules[2].mflags3 = RF7_AQUATIC
-		dungeon(god_quest.DUNGEON_GOD).rules[3].mflags3 = RF3_RES_WATE
-
-	elseif player.pgod == GOD_MANDOS then
-
-		-- Mandos dungeon is basically Tulkas, except with undead.
-		-- W: but with lots of monsters
-		dungeon(god_quest.DUNGEON_GOD).min_m_alloc_level = 20
-		dungeon(god_quest.DUNGEON_GOD).min_m_alloc_chance = 120
-
-		-- L: floor is normal
-		dungeon(god_quest.DUNGEON_GOD).floor1 = 1
-		dungeon(god_quest.DUNGEON_GOD).floor_percent1[1] = 100
-
-		-- A: Granite walls
-		dungeon(god_quest.DUNGEON_GOD).fill_type1 = 56
-		dungeon(god_quest.DUNGEON_GOD).fill_percent1[1] = 100
-		dungeon(god_quest.DUNGEON_GOD).outer_wall = 58
-		dungeon(god_quest.DUNGEON_GOD).inner_wall = 57
-		dungeon(god_quest.DUNGEON_GOD).fill_method = 0
-
-		-- O: Loads of combat drops
-		dungeon(god_quest.DUNGEON_GOD).objs.treasure = 10
-		dungeon(god_quest.DUNGEON_GOD).objs.combat = 70
-		dungeon(god_quest.DUNGEON_GOD).objs.magic = 5
-		dungeon(god_quest.DUNGEON_GOD).objs.tools = 15
-
-		-- F: fairly standard
-		dungeon(god_quest.DUNGEON_GOD).flags1 = bor(DF1_NO_DESTROY, DF1_ADJUST_LEVEL_2)
-		dungeon(god_quest.DUNGEON_GOD).flags2 = DF2_ADJUST_LEVEL_PLAYER
-
-		-- R:
-		dungeon(god_quest.DUNGEON_GOD).rules[1].mode = 3
-		dungeon(god_quest.DUNGEON_GOD).rules[1].percent = 100
-
-		-- M: vampires!
-		dungeon(god_quest.DUNGEON_GOD).rules[1].r_char = "V"
-		dungeon(god_quest.DUNGEON_GOD).rules[1].mflags3 = bor(RF3_UNDEAD, RF3_EVIL)
-
-	end
-
-	-- W: All dungeons are 5 levels deep, and created at 2/3 of the player clvl when the quest is given
-	dungeon(god_quest.DUNGEON_GOD).mindepth = god_quest.dun_mindepth
-	dungeon(god_quest.DUNGEON_GOD).maxdepth = god_quest.dun_maxdepth
-	dungeon(god_quest.DUNGEON_GOD).minplev = god_quest.dun_minplev
-
-end
-
--- Calling this function returns the direction the dungeon is in from the players position at the time
--- the quest was given, and also the direction from angband (if the player is worshipping Melkor) or lothlorien.
-function get_god_quest_axes()
-	local home, home_y_coord, home_x_coord, home_axis, home2, home2_y_coord, home2_x_coord, home2_axis, mydistance
-
-	-- different values for different gods...
-	if player.pgod ~= GOD_MELKOR then
-
-		-- one of the valar, "home" is lothlorien, home2 is Minas Arnor
-		home = "Bree"
-		home_y_coord = 21
-		home_x_coord = 35
-		home2 = "Minas Anor"
-		home2_y_coord = 56
-		home2_x_coord = 60
-	else
-		-- Melkor, "home" is angband, home2 is Barad-dur
-		home = "the Pits of Angband"
-		home_y_coord = 7
-		home_x_coord = 11
-		home2 = "the Land of Mordor"
-		home2_y_coord = 49
-		home2_x_coord = 70
-	end
-
-	home_axis = compass(home_y_coord, home_x_coord, god_quest.dung_y, god_quest.dung_x)
-	home2_axis = compass(home2_y_coord, home2_x_coord, god_quest.dung_y, god_quest.dung_x)
-
-	home_distance = approximate_distance(home_y_coord, home_x_coord, god_quest.dung_y, god_quest.dung_x)
-	home2_distance = approximate_distance(home2_y_coord, home2_x_coord, god_quest.dung_y, god_quest.dung_x)
-
-	return home, home_axis, home_distance, home2, home2_axis, home2_distance
-end
diff --git a/lib/mods/theme/scpt/gods.lua b/lib/mods/theme/scpt/gods.lua
deleted file mode 100644
index 014a4423..00000000
--- a/lib/mods/theme/scpt/gods.lua
+++ /dev/null
@@ -1,26 +0,0 @@
-add_hooks
-{
-	[HOOK_FOLLOW_GOD] = function(god, action)
-		if action == "ask" then
-			if not (god == GOD_MELKOR) then
-				local i = INVEN_WIELD
-				while i < INVEN_TOTAL do
-					-- 13 is ART_POWER
-					if player.inventory(i).name1 == 13 then
-						msg_print("The One Ring has corrupted you, and you are rejected.")
-						return TRUE
-					end
-					i = i + 1
-				end
-			end
-		end
-		return FALSE
-	end,
-	[HOOK_RECALC_SKILLS] = function()
-		if not (player.pgod == GOD_NONE) and (get_skill(SKILL_ANTIMAGIC) > 0) then
-			msg_print("You no longer believe.")
-			abandon_god(GOD_ALL)
-		end
-		return FALSE
-	end,
-}
diff --git a/lib/mods/theme/scpt/gods_new.lua b/lib/mods/theme/scpt/gods_new.lua
deleted file mode 100644
index 8153d453..00000000
--- a/lib/mods/theme/scpt/gods_new.lua
+++ /dev/null
@@ -1,454 +0,0 @@
--- This file contains all the new gods
-
-add_loadsave("GRACE_DELAY",0)
-
-function aule_stone_skin()
-local type
-	if player.grace >= 10000 then
-		type = SHIELD_COUNTER
-	else
-		type = 0
-	end
-
-	set_shield(randint(10) + 10 + (player.grace / 100), 10 + (player.grace / 100), type, 2 + (player.grace / 200), 3 + (player.grace / 400))
-end
-
-GOD_AULE = add_god
-{
-	["name"] = "Aule the Smith",
-	["desc"] =
-	{
-		"Aule is a smith, and the creator of the Dwarves."
-	},
-	["hooks"] =
-	{
-		[HOOK_CALC_BONUS] = function()
-			if (player.pgod == GOD_AULE) and (player.grace > 0) then
-				-- Resist fire, not shown on the character screen (?)
-				if (player.grace > 5000) then
-					player.resist_fire = TRUE
-				end
-
-				local bonus = player.grace / 5000
-				if bonus > 5 then
-					bonus = 5
-				end
-				player.to_h = player.to_h + bonus
-				player.dis_to_h = player.dis_to_h + bonus
-				player.to_d = player.to_d + bonus
-				player.dis_to_d = player.dis_to_d + bonus
-				
-			end
-		end,
-		[HOOK_PROCESS_WORLD] = function()
-			if (player.pgod == GOD_AULE) then
-				GRACE_DELAY = GRACE_DELAY + 1
-				if GRACE_DELAY >= 15 then
-					-- Aule likes Dwarves and Dark Elves (Eol's influence here)
-					if 
-					(get_race_name() ~= "Dwarf") and 
-					(get_race_name() ~= "Petty-dwarf") and 
-					(get_race_name() ~= "Gnome") and 
-					(get_race_name() ~= "Dark-Elf") then
-						set_grace(player.grace - 1)
-					end
-					
-					-- Search inventory for axe or hammer - Gain 1 point of grace for each hammer or axe
-					for i = 0, INVEN_TOTAL - 1 do
-						if ((player.inventory(i).tval) == TV_AXE) then 
-							set_grace(player.grace + 1)
-						end
-						if ((player.inventory(i).tval) == TV_HAFTED) then
-							if (((player.inventory(i).sval) == SV_WAR_HAMMER) or ((player.inventory(i).sval) == SV_LUCERN_HAMMER) or ((player.inventory(i).sval) == SV_GREAT_HAMMER)) then
-								set_grace(player.grace + 1)
-							end
-						end
-					end
-					
-					if (player.praying == TRUE) then
-						set_grace(player.grace - 2)
-						
-						-- Chance of casting Stoneskin if praying
-						local chance
-						if (player.grace >= 50000) then
-							chance = 50000
-						else
-							chance = 50000 - player.grace
-						end
-
-						if (randint(100000) <= 100000 / chance) then
-							aule_stone_skin()
-							msg_print("Aule casts Stone Skin on you.")
-						end
-						
-					end
-					GRACE_DELAY = 0
-				end
-				
-			end
-		end,
-		[HOOK_SACRIFICE_GOD] = function() 
-			if (player.pgod == GOD_AULE) then 
-				local ret, item, obj, value 
-				ret, item = get_item( 
-					"Sacrifice which item? ", 
-					"You have nothing to sacrifice.", 
-					USE_INVEN, 
-					function(obj) 
-						-- perhaps restrict this only to metal armour and weapons 
-						if (obj.found == OBJ_FOUND_SELFMADE) then 
-							return TRUE 
-						end 
-						return FALSE 
-					end 
-				) 
-
-				-- Item selected 
-				if ret == TRUE then 
-					-- Increase piety by the value of the item / 10 
-					-- object_value is not available in Lua, therefore I used the 
-					-- cost of the base item, without magical boni 
-					obj = get_object(item) 
-					-- value = object_value(obj)/10 
-					value = k_info[obj.k_idx + 1].cost/10
-
-					set_grace(player.grace + value) 
-
-					-- remove the object 
-					inven_item_increase(item, -1) 
-					inven_item_optimize(item) 
-				end 
-			end 
-		end,
-		[HOOK_MONSTER_DEATH] = function(m_idx)
-			if (player.pgod == GOD_AULE) then
-				m_ptr = monster(m_idx)
-				if 
-				(m_ptr.r_idx == test_monster_name("Petty-dwarf"))  or 
-				(m_ptr.r_idx == test_monster_name("Petty-dwarf mage"))  or 
-				(m_ptr.r_idx == test_monster_name("Dark dwarven warrior"))  or 
-				(m_ptr.r_idx == test_monster_name("Dark dwarven smith"))  or 
-				(m_ptr.r_idx == test_monster_name("Dark dwarven lord"))  or 
-				(m_ptr.r_idx == test_monster_name("Dark dwarven priest"))  or 
-				(m_ptr.r_idx == test_monster_name("Dwarven warrior")) then
-					-- Aule dislikes you killing dwarves
-					set_grace(player.grace - 20)
-				end
-				if 
-				(m_ptr.r_idx == test_monster_name("Nar, the Dwarf"))  or 
-				(m_ptr.r_idx == test_monster_name("Naugladur, Lord of Nogrod"))  or 
-				(m_ptr.r_idx == test_monster_name("Telchar the Smith"))  or 
-				(m_ptr.r_idx == test_monster_name("Fundin Bluecloak"))  or 
-				(m_ptr.r_idx == test_monster_name("Khim, Son of Mim")) or 
-				(m_ptr.r_idx == test_monster_name("Ibun, Son of Mim")) or 
-				(m_ptr.r_idx == test_monster_name("Mim, Betrayer of Turin")) then
-					-- These uniques earn a bigger penalty
-					set_grace(player.grace - 500)
-				end
-			end
-		end,
-	}
-}
-
-GOD_VARDA = add_god
-{
-	["name"] = "Varda Elentari",
-	["desc"] =
-	{
-		"The Queen of the Stars. In light is her power and joy."
-	},
-	["hooks"] =
-	{
-		[HOOK_PROCESS_WORLD] = function()
-			if (player.pgod == GOD_VARDA) then
-				GRACE_DELAY = GRACE_DELAY + 1
-				
-				-- piety increase if in light
-				if (GRACE_DELAY >= 15) then
-					if band(cave(player.py, player.px).info, CAVE_GLOW) ~= 0 then
-						set_grace(player.grace + 2)
-					end
-					if (
-					(get_race_name() == "Orc") or 
-					(get_race_name() == "Troll") or 
-					(get_race_name() == "Dragon") or 
-					(get_race_name() == "Demon")) then
-					-- Varda hates evils
-					set_grace(player.grace - 2)
-					else
-						set_grace(player.grace - 1)
-					end
-					
-					if (player.praying == TRUE) then
-						set_grace(player.grace - 1)
-					end
-					GRACE_DELAY = 0
-				end
-			end
-		end,
-		[HOOK_CALC_LITE] = function()
-			if (player.pgod == GOD_VARDA) then
-				-- increase lite radius
-				player.cur_lite = player.cur_lite + 1
-			end
-		end,
-		[HOOK_GF_EXEC] = function (target, who, type, dam, r, y, x, m_ptr)
-			if (player.pgod == GOD_VARDA) then
-				if ((type == GF_LITE) or (type == GF_LITE_WEAK)) then
-					-- Raise piety for using lite
-					set_grace(player.grace + 1)
-				end
-			end
-		end,
-	},
-}
-
-GOD_ULMO = add_god
-{
-	["name"] = "Ulmo",
-	["desc"] =
-	{
-		"Ulmo is called Lord of Waters, he rules all that is water on Arda."
-	},
-	["hooks"] =
-	{
-		[HOOK_CALC_BONUS] = function()
-			if (player.pgod == GOD_ULMO) then
-				player.water_breath = TRUE
-			end
-			if (player.pgod == GOD_ULMO) and (player.grace > 0) then
-				local bonus = player.grace / 5000
-					if bonus > 5 then
-						bonus = 5
-				end
-				
-				if ((player.grace > 1000) and (player.praying == TRUE)) then
-					player.resist_pois = TRUE
-				end
-				if ((player.grace > 15000) and (player.praying == TRUE)) then
-					player.magic_breath = TRUE
-				end
-			end
-		end,
-		
-		[HOOK_MONSTER_DEATH] = function(m_idx)
-			if (player.pgod == GOD_ULMO) then
-				m_ptr = monster(m_idx)
-				if 
-				(m_ptr.r_idx == test_monster_name("Swordfish"))  or 
-				(m_ptr.r_idx == test_monster_name("Barracuda"))  or 
-				(m_ptr.r_idx == test_monster_name("Globefish"))  or 
-				(m_ptr.r_idx == test_monster_name("Aquatic bear"))  or 
-				(m_ptr.r_idx == test_monster_name("Pike"))  or 
-				(m_ptr.r_idx == test_monster_name("Electric eel"))  or 
-				(m_ptr.r_idx == test_monster_name("Giant crayfish"))  or 
-				(m_ptr.r_idx == test_monster_name("Mermaid"))  or 
-				(m_ptr.r_idx == test_monster_name("Leviathan"))  or 
-				(m_ptr.r_idx == test_monster_name("Box jellyfish"))  or 
-				(m_ptr.r_idx == test_monster_name("Giant piranha"))  or 
-				(m_ptr.r_idx == test_monster_name("Piranha"))  or 
-				(m_ptr.r_idx == test_monster_name("Ocean naga"))  or 
-				(m_ptr.r_idx == test_monster_name("Whale"))  or 
-				(m_ptr.r_idx == test_monster_name("Octopus"))  or 
-				(m_ptr.r_idx == test_monster_name("Giant octopus"))  or 
-				(m_ptr.r_idx == test_monster_name("Drowned soul"))  or 
-				(m_ptr.r_idx == test_monster_name("Tiger shark"))  or 
-				(m_ptr.r_idx == test_monster_name("Hammerhead shark"))  or 
-				(m_ptr.r_idx == test_monster_name("Great white shark"))  or 
-				(m_ptr.r_idx == test_monster_name("White shark"))  or 
-				(m_ptr.r_idx == test_monster_name("Stargazer"))  or 
-				(m_ptr.r_idx == test_monster_name("Flounder"))  or 
-				(m_ptr.r_idx == test_monster_name("Giant turtle"))  or 
-				(m_ptr.r_idx == test_monster_name("Killer whale"))  or 
-				(m_ptr.r_idx == test_monster_name("Water naga"))  or 
-				(m_ptr.r_idx == test_monster_name("Behemoth")) then
-					-- He doesn't like it if you kill these monsters
-					set_grace(player.grace - 20)
-				end
-				if 
-				(m_ptr.r_idx == test_monster_name("Seahorse"))  or 
-				(m_ptr.r_idx == test_monster_name("Aquatic elven warrior")) or
-				(m_ptr.r_idx == test_monster_name("Aquatic elven mage")) or
-				(m_ptr.r_idx == test_monster_name("Wavelord")) or
-				(m_ptr.r_idx == test_monster_name("The Watcher in the Water")) then
-					-- These monsters earn higher penalties
-					set_grace(player.grace - 500)
-				end
-			end
-		end,
-		[HOOK_GF_EXEC] = function (target, who, type, dam, r, y, x, m_ptr)
-			if (player.pgod == GOD_ULMO) then
-				if ((type == GF_FIRE) or (type == GF_HELL_FIRE) or (type == GF_HOLY_FIRE) or (type == GF_LAVA_FLOW) or (type == GF_METEOR) or (type == GF_NUKE) or (type == GF_PLASMA)) then
-					-- Reduce piety for using any kind of fire magic
-					set_grace(player.grace - 5)
-				end
-			end
-		end,
-		[HOOK_PROCESS_WORLD] = function()
-			if (player.pgod == GOD_ULMO) then
-				GRACE_DELAY = GRACE_DELAY + 1
-				if GRACE_DELAY >= 15 then
-					-- Ulmo likes the Edain (except Easterlings)
-					if 
-					(get_race_name() == "Human") or 
-					(get_race_name() == "Dunadan") or 
-					(get_race_name() == "Druadan") or 
-					(get_race_name() == "RohanKnight") then 
-						set_grace(player.grace + 1)
-					
-					elseif (
-					(get_race_name() == "Easterling") or 
-					(get_race_name() == "Demon") or
-					(get_race_name() == "Orc")) then
-					-- hated races
-					set_grace(player.grace - 2)
-					else
-						set_grace(player.grace + 1)
-					end
-					
-					if (player.praying == TRUE) then
-						set_grace(player.grace - 1)
-					end					
-					-- Search inventory for axe or hammer - Gain 1 point of grace for each hammer or axe
-					for i = 0, INVEN_TOTAL - 1 do
-						if ((player.inventory(i).tval) == TV_POLEARM) then
-							if ((player.inventory(i).sval) == SV_TRIDENT) then
-								set_grace(player.grace + 1)
-							end
-						end
-					end
-
-					GRACE_DELAY = 0
-				end
-				
-			end
-		end,
-	},
-}
-
-GOD_MANDOS = add_god
-{
-	["name"] = "Mandos",
-	["desc"] =
-	{
-		"The Doomsman of the Valar and keeper of the slain."
-	},
-	["hooks"] =
-	{
-		[HOOK_CALC_BONUS] = function()
-			if (player.pgod == GOD_MANDOS) then
-				player.resist_neth = TRUE
-			end
-			if (player.pgod == GOD_MANDOS) and (player.grace > 0) then
-				local bonus = player.grace / 5000
-					if bonus > 5 then
-						bonus = 5
-				end
-				
-				if ((player.grace > 10000) and (player.praying == TRUE)) then
-				player.resist_continuum = TRUE
-				end
-	
-				if ((player.grace > 20000) and (player.praying == TRUE)) then
-				player.immune_neth = TRUE
-				end
-			end
-		end,
-		[HOOK_PROCESS_WORLD] = function()
-			if (player.pgod == GOD_MANDOS) then
-				GRACE_DELAY = GRACE_DELAY + 1
-				if GRACE_DELAY >= 15 then
-					-- He loves astral beings 
-					if (get_subrace_name() == "LostSoul") then
-						set_grace(player.grace + 1)
-					end
-
-					-- He likes High Elves only, though, as races
-					if (get_race_name() ~= "High-Elf") then 
-						set_grace(player.grace - 1)
-					end
-				end
-				-- piety increase if (condition)
-				if (GRACE_DELAY >= 15) then
-					if (
-					(get_subrace_name() == "Vampire") or 
-					(get_race_name() == "Demon")) then
-					-- hated races
-					set_grace(player.grace - 10)
-					else
-						set_grace(player.grace + 2)
-					end
-					-- he really doesn't like to be disturbed
-					if (player.praying == TRUE) then
-						set_grace(player.grace - 5)
-					end					
-					GRACE_DELAY = 0
-				end
-				
-			end
-		end,
-		[HOOK_MONSTER_DEATH] = function(m_idx)
-			if (player.pgod == GOD_MANDOS) then
-				m_ptr = monster(m_idx)
-				if
-				(m_ptr.r_idx == test_monster_name("Vampire")) or 
-				(m_ptr.r_idx == test_monster_name("Master vampire")) or 
-				(m_ptr.r_idx == test_monster_name("Oriental vampire")) or 
-				(m_ptr.r_idx == test_monster_name("Vampire lord")) or 
-				(m_ptr.r_idx == test_monster_name("Vampire orc")) or 
-				(m_ptr.r_idx == test_monster_name("Vampire yeek")) or 
-				(m_ptr.r_idx == test_monster_name("Vampire ogre")) or 
-				(m_ptr.r_idx == test_monster_name("Vampire troll")) or 
-				(m_ptr.r_idx == test_monster_name("Vampire dwarf")) or 
-				(m_ptr.r_idx == test_monster_name("Vampire gnome")) or
-				(m_ptr.r_idx == test_monster_name("Elder vampire")) then
-					-- He really likes it if you kill Vampires (but not the adventurer kind :P)
-					set_grace(player.grace + 50)
-				end
-
-				if
-				(m_ptr.r_idx == test_monster_name("Vampire elf")) or 
-				(m_ptr.r_idx == test_monster_name("Thuringwethil, the Vampire Messenger")) then
-					-- He *loves* it if you kill vampire Elves
-					-- He will also thank you extra kindly if you kill Thuringwethil
-					set_grace(player.grace + 200)
-				end
-
-				if 
-				(m_ptr.r_idx == test_monster_name("Dark elf")) or 
-				(m_ptr.r_idx == test_monster_name("Dark elven druid")) or 
-				(m_ptr.r_idx == test_monster_name("Eol, the Dark Elf")) or 
-				(m_ptr.r_idx == test_monster_name("Maeglin, the Traitor of Gondolin")) or 
-				(m_ptr.r_idx == test_monster_name("Dark elven mage")) or 
-				(m_ptr.r_idx == test_monster_name("Dark elven warrior")) or 
-				(m_ptr.r_idx == test_monster_name("Dark elven priest")) or 
-				(m_ptr.r_idx == test_monster_name("Dark elven lord")) or 
-				(m_ptr.r_idx == test_monster_name("Dark elven warlock")) or 
-				(m_ptr.r_idx == test_monster_name("Dark elven sorcerer")) then 
-					-- He doesn't like it if you kill normal Elves (means more work for him :P)
-					set_grace(player.grace - 20)
-				end
-				if 
-				(m_ptr.r_idx == test_monster_name("Glorfindel of Rivendell")) or 
-				(m_ptr.r_idx == test_monster_name("Finrod Felagund")) or 
-				(m_ptr.r_idx == test_monster_name("Thranduil, King of the Wood Elves")) or 
-				(m_ptr.r_idx == test_monster_name("Aquatic elven warrior")) or 
-				(m_ptr.r_idx == test_monster_name("Aquatic elven mage")) or 
-				(m_ptr.r_idx == test_monster_name("High-elven ranger")) or 
-				(m_ptr.r_idx == test_monster_name("Elven archer")) then
-					-- He hates it if you kill coaligned Elves
-					set_grace(player.grace - 200)
-				end
-				if 
-				(m_ptr.r_idx == test_monster_name("Child spirit")) or 
-				(m_ptr.r_idx == test_monster_name("Young spirit")) or 
-				(m_ptr.r_idx == test_monster_name("Mature spirit")) or 
-				(m_ptr.r_idx == test_monster_name("Experienced spirit")) or 
-				(m_ptr.r_idx == test_monster_name("Wise spirit")) then
-					-- He *hates* it if you kill the coaligned Spirits
-					set_grace(player.grace - 1000)
-				end
-			end
-		end
-	}
-}
diff --git a/lib/mods/theme/scpt/gondolin.lua b/lib/mods/theme/scpt/gondolin.lua
deleted file mode 100644
index c85d8f53..00000000
--- a/lib/mods/theme/scpt/gondolin.lua
+++ /dev/null
@@ -1,63 +0,0 @@
--- This script makes the void jumpgates between Minas Anor and Gondolin appear in Gondolin rather than in a weird wilderness spot
--- as well as making the Save Gondolin quest take the player straight to Gondolin instead of the Secret Valley.
--- Many thanks to TheFalcon for the code.
-
-function minas_gate()
-	if (quest(16).status == QUEST_STATUS_FINISHED) and (player.wilderness_y == 56) and (player.wilderness_x == 60) and (player.wild_mode == FALSE) then
-		cave(35,10).feat = 159
-	end
-end
-
-add_hook_script(HOOK_QUEST_FINISH, "minas_gate", "minas_gate")
-add_hook_script(HOOK_WILD_GEN, "minas_gate", "minas_gate")
-
-function minas_jump(direction)
-	if (quest(16).status == QUEST_STATUS_FINISHED) and (player.wilderness_y == 56) and (player.wilderness_x == 60) and (player.wild_mode == FALSE) then
-		if (player.px == 10) and (player.py == 35) then
-			if (direction == "down") then
-				player.wilderness_x = 3
-				player.wilderness_y = 11
-				player.wild_mode = FALSE
-				player.px = 119
-				player.py = 25
-				player.oldpx = player.px
-				player.oldpy = player.py
-				dun_level = 0
-				player.leaving = TRUE
-				return TRUE
-			end
-		end
-	end
-end
-
-add_hook_script(HOOK_STAIR, "minas_jump", "minas_jump")
-
-add_loadsave("tolan_count", 0)
-
-function tolan_travel()
-	if (quest(15).status == QUEST_STATUS_TAKEN) and (tolan_count == 0) then
-		player.wilderness_x = 3
-		player.wilderness_y = 11
-		player.wild_mode = FALSE
-		player.px = 117
-		player.py = 25
-		player.oldpx = player.px
-		player.oldpy = player.py
-		dun_level = 0
-		player.leaving = TRUE
-		tolan_count = 1
-		return TRUE
-	end
-end
-
-add_hook_script(HOOK_END_TURN, "tolan_travel", "tolan_travel")
-
-add_hooks
-{
-   [HOOK_BIRTH] = function()
-      if tolan_count >=1
-         then tolan_count = 0
-      else
-      end
-   end
-}
\ No newline at end of file
diff --git a/lib/mods/theme/scpt/help.lua b/lib/mods/theme/scpt/help.lua
deleted file mode 100644
index 4e244df6..00000000
--- a/lib/mods/theme/scpt/help.lua
+++ /dev/null
@@ -1,445 +0,0 @@
--- Ingame contextual help
-
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
------------------------Here comes the definition of help-----------------------
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
-
-ingame_help
-{
-	["hook"] =      HOOK_MOVE,
-	["event"] =     function(y, x) if cave(y, x).feat == FEAT_BETWEEN then return TRUE end end,
-	["desc"] =
-	{
-		"Void Jumpgates can be entered by pressing the > key. They will transport",
-		"you to another jumpgate, but beware of the cold damage that might kill you.",
-	}
-}
-
-ingame_help
-{
-	["hook"] =      HOOK_MOVE,
-	["event"] =     function(y, x) if cave(y, x).feat == FEAT_FOUNTAIN then return TRUE end end,
-	["desc"] =
-	{
-		"Fountains are always magical. You can quaff from them by pressing H.",
-		"Beware that unlike potions they cannot be identified.",
-	}
-}
-
-ingame_help
-{
-	["hook"] =      HOOK_MOVE,
-	["event"] =     function(y, x) if cave(y, x).o_idx ~= 0 then return TRUE end end,
-	["desc"] =
-	{
-		"So you found your first item! Nice, eh? Now when you stumble across",
-		"objects, you can pick them up by pressing g, and if you are wondering",
-		"what they do, press I (then *, then the letter for the item) to get",
-		"some basic information. You may also want to identify them with scrolls,",
-		"staves, rods or spells.",
-	}
-}
-
-ingame_help
-{
-	["hook"] =      HOOK_MOVE,
-	["event"] =     function(y, x) if (cave(y, x).feat >= FEAT_ALTAR_HEAD) and (cave(y, x).feat <= FEAT_ALTAR_TAIL) then return TRUE end end,
-	["desc"] =
-	{
-		"Altars are the way to reach the Valar, powers of the world,",
-		"usualy called Gods. You can press O to become a follower.",
-		"Beware that once you follow a god, you are not allowed to change.",
-		"For an exact description of what gods do and want, read the documentation."
-	}
-}
-
--- Beware this one, if Bree is moved from 21, 34 (y, x) on the wilderness map it will break
-ingame_help
-{
-	["hook"] =      HOOK_END_TURN,
-	["event"] =     function(y, x)
-		if ((player.wilderness_x ~= 34) or (player.wilderness_y ~= 21) and (player.astral == FALSE)) then return TRUE end
-	end,
-	["desc"] =
-	{
-		"Ahh wilderness travel... The overview mode will allow you to travel",
-		"fast, but that comes to the cost of GREATLY increased food consumption.",
-		"So you should bring lots of food and really watch your hunger status.",
-		"To enter the overview mode, press < while in the wilderness.",
-	}
-}
-
-ingame_help
-{
-	["hook"] =      HOOK_PLAYER_LEVEL,
-	["event"] =     function(y, x) if player.lev > 1 then return TRUE end end,
-	["desc"] =
-	{
-		"Ok, so you now gained a level, and you have skill points to spend.",
-		"To do so simply press G to learn skills. Reading the documentation",
-		"about skills and abilities is also strongly recommended.",
-	}
-}
-
-ingame_help
-{
-	["hook"] =      HOOK_MOVE,
-	["event"] =     function(y, x) if cave(y, x).feat == FEAT_MORE then return TRUE end end,
-	["desc"] =
-	{
-		"Ah, this is a stair, or a way into something. Press > to enter it.",
-		"But be ready to fight what lies within, for it might not be too friendly.",
-	}
-}
-
-ingame_help
-{
-	["callback"] =  "monster_chat",
-	["desc"] =
-	{
-		"Somebody is speaking to you it seems. You can talk back with the Y key.",
-		"This can lead to quests. You can also give items to 'monsters' with the y key.",
-	}
-}
-
-ingame_help
-{
-	["hook"] =      HOOK_END_TURN,
-	["event"] =     function(y, x) return TRUE end,
-	["desc"] =
-	{
-		"Welcome to Theme! I am the spirit of knowledge and my task is to help you",
-		"to get used to how to play. I have prepared a #vparchment#y for you to #vread#y.",
-		"Press r, then space then select it. You can also check the documentation",
-		"by pressing ? at (nearly) any time.",
-		"The first place you can explore is Barrow-downs. Go to the west of town",
-		"and you should see a #v>#y there.",
-		"If you miss any of this you can press ctrl+p to see your message log.",
-		"Now I must reveal your task here. You are on a quest to investigate",
-		"the dreadful tower of Dol Guldur in the Mirkwood forest to see what evil",
-		"lurks there, but beware, you are not yet ready.",
-		"If you do not want me to bother you any more with tips, press = then go",
-		"into the ToME options and deactivate the ingame_help option.",
-		"You can see your quest log by pressing ctrl+q. Now go to your destiny!",
-	}
-}
-
-ingame_help
-{
-	["no_test"] =   TRUE,
-	["callback"] =  "select_context",
-	["fct"] =       function(typ, name)
-			-- list of files for classes, { filename, anchor }
-			local t =
-			{
-				["race"] =
-				{
-					["Beorning"] = { "r_beorn.txt", 0 },
-					["Dragon"] = { "r_dragon.txt", 0 },
-					["Dark-Elf"] = { "r_drkelf.txt", 0 },
-					["Dunadan"] = { "r_dunad.txt", 0 },
-					["Dwarf"] = { "r_dwarf.txt", 0 },
-					["Elf"] = { "r_elf.txt", 0 },
-					["Ent"] = { "r_ent.txt", 0 },
-					["Gnome"] = { "r_gnome.txt", 0 },
-					["Half-Elf"] = { "r_hafelf.txt", 0 },
-					["Half-Ogre"] = { "r_hafogr.txt", 0 },
-					["High-Elf"] = { "r_hielf.txt", 0 },
-					["Hobbit"] = { "r_hobbit.txt", 0 },
-					["Human"] = { "r_human.txt", 0 },
-					["Druadan"] = { "r_druadan.txt", 0 },
-					["Maia"] = { "r_maia.txt", 0 },
-					["Orc"] = { "r_orc.txt", 0 },
-					["Petty-Dwarf"] = { "r_pettyd.txt", 0 },
-					["RohanKnight"] = { "r_rohank.txt", 0 },
-					["Eagle"] = { "r_eagle.txt", 0 },
-					["Troll"] = { "r_troll.txt", 0 },
-					["Wood-Elf"] = { "r_wodelf.txt", 0 },
-					["Yeek"] = { "r_yeek.txt", 0 },
-					["Easterling"] = { "r_easterl.txt", 0 },
-					["Demon"] = { "r_demon.txt", 0},
-				},
-				["subrace"] =
-				{
-					["Barbarian"] = { "rm_barb.txt", 0 },
-					["Classical"] = { "rm_class.txt", 0 },
-					["Corrupted"] = { "rm_corru.txt", 0 },
-					["Hermit"] = { "rm_herm.txt", 0 },
-					["LostSoul"] = { "rm_lsoul.txt", 0 },
-					["Skeleton"] = { "rm_skel.txt", 0 },
-					["Spectre"] = { "rm_spec.txt", 0 },
-					["Vampire"] = { "rm_vamp.txt", 0 },
-					["Zombie"] = { "rm_zomb.txt", 0 },
-					["Red"] = {"rm_red.txt", 0 },
-					["Black"] = {"rm_black.txt", 0 },
-					["Green"] = {"rm_green.txt", 0 },
-					["Blue"] = {"rm_blue.txt", 0 },
-					["White"] = {"rm_white.txt", 0 },
-					["Ethereal"] = {"rm_ether.txt", 0 },
-					["(Narrog)"] = {"rm_narrog.txt", 0 },
-					["(Aewrog)"] = {"rm_aewrog.txt", 0 },
-					["(Hurog)"] = {"rm_hurog.txt", 0 },
-					["(Sarnrog)"] = {"rm_sarnrog.txt", 0 },
-					["(Caborrog)"] = {"rm_cabrog.txt", 0 },
-					["(Draugrog)"] = {"rm_drarog.txt", 0 },
-					["(Lygrog)"] = {"rm_lygrog.txt", 0 },
-					["(Limrog)"] = {"rm_limrog.txt", 0 },
-					["(Rawrog)"] = {"rm_rawrog.txt", 0 },
-					["(Adanrog)"] = {"rm_adanrog.txt", 0 },
-				},
-				["class"] =
-				{
-					["Archer"] = { "c_archer.txt", 0 },
-					["Ascetic"] = { "c_ascet.txt", 0 },
-					["Assassin"] = { "c_assass.txt", 0 },
-					["Axemaster"] = { "c_axemas.txt", 0 },
-					["Bard"] = { "c_bard.txt", 0 },
-					["Clairvoyant"] = {"c_clairv.txt", 0},
-					["Dark-Priest"] = { "c_pr_drk.txt", 0 },
-					["Demonologist"] = { "c_demono.txt", 0 },
-					["Druid"] = { "c_druid.txt", 0 },
-					["Geomancer"] = { "c_geoman.txt", 0 },
-					["Haftedmaster"] = { "c_hafted.txt", 0 },
-					["Loremaster"] = { "c_lorema.txt", 0 },
-					["Mage"] = { "c_mage.txt", 0 },
-					["Mercenary"] = { "c_mercen.txt", 0 },
-					["Mimic"] = { "c_mimic.txt", 0 },
-					["Mindcrafter"] = { "c_mindcr.txt", 0 },
-					["Monk"] = { "c_monk.txt", 0 },
-					["Necromancer"] = { "c_necro.txt", 0 },
-					["Pacifist"] = { "c_pacif.txt", 0 },
-					["Paladin"] = { "c_palad.txt", 0 },
-					["Peace-mage"] = { "c_peacemag.txt", 0 },
-					["Polearmmaster"] = { "c_polear.txt", 0 },
-					["Possessor"] = { "c_posses.txt", 0 },
-					["Priest"] = { "c_priest.txt", 0 },
-					["Priest(Eru)"] = { "c_pr_eru.txt", 0 },
-					["Priest(Mandos)"] = { "c_pr_mand.txt", 0 },
-					["Priest(Manwe)"] = { "c_pr_man.txt", 0 },
-					["Priest(Ulmo)"] = { "c_pr_ulmo.txt", 0 },
-					["Priest(Varda)"] = { "c_pr_varda.txt", 0 },
-					["Ranger"] = { "c_ranger.txt", 0 },
-					["Rogue"] = { "c_rogue.txt", 0 },
-					["Runecrafter"] = { "c_runecr.txt", 0 },
-					["Sniper"] = {"c_sniper.txt", 0 },
-					["Sorceror"] = { "c_sorcer.txt", 0 },
-					["Stonewright"] = { "c_stonewr.txt", 0 },
-					["Summoner"] = { "c_summon.txt", 0 },
-					["Swordmaster"] = { "c_swordm.txt", 0 },
-					["Symbiant"] = { "c_symbia.txt", 0 },
-					["Thaumaturgist"] = { "c_thaum.txt", 0 },
-					["Trapper"] = { "c_trapper.txt", 0 },
-					["Unbeliever"] = { "c_unbel.txt", 0 },
-					["Wainrider"] = { "c_wainrid.txt", 0 },
-					["War-mage"] = { "c_warmage.txt", 0 },
-					["Warper"] = { "c_warper.txt", 0 },
-					["Warrior"] = { "c_warrio.txt", 0 },
-				},
-				["god"] =
-				{
-					["Aule the Smith"] = { "g_aule.txt", 0 },
-					["Eru Iluvatar"] = { "g_eru.txt", 0 },
-					["Mandos"] = { "g_mandos.txt", 0 },  
-					["Manwe Sulimo"] = { "g_manwe.txt", 0 },
-					["Melkor Bauglir"] = { "g_melkor.txt", 0 },
-					["Tulkas"] = { "g_tulkas.txt", 0 },
-					["Ulmo"] = { "g_ulmo.txt", 0 }, 
-					["Varda Elentari"] = { "g_varda.txt", 0 },
-					["Yavanna Kementari"] = { "g_yavann.txt", 0 },  
-				},
-				["skill"] =
-				{
-					["Air"] = { "skills.txt", 27 },
-					["Alchemy"] = { "skills.txt", 49 },
-					["Antimagic"] = { "skills.txt", 50 },
-					["Archery"] = { "skills.txt", 08 },
-					["Axe-mastery"] = { "skills.txt", 05 },
-					["Backstab"] = { "skills.txt", 18 },
-					["Barehand-combat"] = { "skills.txt", 13 },
-					["Boomerang-mastery"] = { "skills.txt", 12 },
-					["Boulder-throwing"] = { "skills.txt", 58 },
-					["Bow-mastery"] = { "skills.txt", 10 },
-					["Combat"] = { "skills.txt", 01 },
-					["Conveyance"] = { "skills.txt", 30 },
-					["Corpse-preservation"] = { "skills.txt", 44 },
-					["Critical-hits"] = { "skills.txt", 04 },
-					["Crossbow-mastery"] = { "skills.txt", 11 },
-					["Demonology"] = { "skills.txt", 52 },
-					["Disarming"] = { "skills.txt", 16 },
-					["Divination"] = { "skills.txt", 31 },
-					["Dodging"] = { "skills.txt", 20 },
-					["Druidistic"] = { "skills.txt", 40 },
-					["Earth"] = { "skills.txt", 28 },
-					["Fire"] = { "skills.txt", 25 },
-					["Geomancy"] = { "skills.txt", 60 },
-					["Hafted-mastery"] = { "skills.txt", 06 },
-					["Magic"] = { "skills.txt", 21 },
-					["Magic-Device"] = { "skills.txt", 54 },
-					["Mana"] = { "skills.txt", 24 },
-					["Meta"] = { "skills.txt", 29 },
-					["Mimicry"] = { "skills.txt", 47 },
-					["Mind"] = { "skills.txt", 33 },
-					["Mindcraft"] = { "skills.txt", 41 },
-					["Monster-lore"] = { "skills.txt", 42 },
-					["Music"] = { "skills.txt", 59 },
-					["Nature"] = { "skills.txt", 34 },
-					["Necromancy"] = { "skills.txt", 35 },
-					["Polearm-mastery"] = { "skills.txt", 07 },
-					["Possession"] = { "skills.txt", 45 },
-					["Prayer"] = { "skills.txt", 39 },
-					["Runecraft"] = { "skills.txt", 36 },
-					["Sling-mastery"] = { "skills.txt", 09 },
-					["Sneakiness"] = { "skills.txt", 14 },
-					["Spell-power"] = { "skills.txt", 22 },
-					["Spirituality"] = { "skills.txt", 38 },
-					["Sorcery"] = { "skills.txt", 23 },
-					["Stealing"] = { "skills.txt", 19 },
-					["Stealth"] = { "skills.txt", 15 },
-					["Stunning-blows"] = { "skills.txt", 53 },
-					["Summoning"] = { "skills.txt", 43 },
-					["Sword-mastery"] = { "skills.txt", 03 },
-					["Symbiosis"] = { "skills.txt", 46 },
-					["Temporal"] = { "skills.txt", 32 },
-					["Thaumaturgy"] = { "skills.txt", 37 },
-					["Udun"] = { "skills.txt", 48 },
-					["Weaponmastery"] = { "skills.txt", 02 },
-					["Water"] = { "skills.txt", 26 },
-				},
-				["ability"] = 
-				{
-				    ["Spread blows"] = { "ability.txt", 02 },
-				    ["Tree walking"] = { "ability.txt", 03 },
-				    ["Perfect casting"] = { "ability.txt", 04 },
-				    ["Extra Max Blow(1)"] = { "ability.txt", 05 },
-				    ["Extra Max Blow(2)"] = { "ability.txt", 06 },
-				    ["Ammo creation"] = { "ability.txt", 07 },
-				    ["Touch of death"] = { "ability.txt", 08 },
-				    ["Artifact Creation"] = { "ability.txt", 09 },
-				    ["Far reaching attack"] = { "ability.txt", 10 },
-				    ["Trapping"] = { "ability.txt", 11 },
-				    ["Undead Form"] = { "ability.txt", 12 },
-				},
-			}
-
-			if t[typ][name] then ingame_help_doc(t[typ][name][1], t[typ][name][2])
-			else ingame_help_doc("help.hlp", 0)
-			end
-	end,
-}
-
-ingame_help
-{
-	["hook"] =      HOOK_IDENTIFY,
-	["event"] =     function(i, mode)
-				if mode == "full" then
-					local obj = get_object(i)
-					local f1, f2, f3, f4, f5, esp = object_flags(obj)
-					if band(f5, TR5_SPELL_CONTAIN) ~= 0 then return TRUE end
-				end
-			end,
-	["desc"] =
-	{
-		"Ah, an item that can contain a spell. To use it you must have some levels of",
-		"Magic skill and then you get the option to copy a spell when pressing m.",
-		"Then just select which spell to copy and to which object. Note that doing so",
-		"is permanent; the spell cannot be removed or changed later.",
-	}
-}
-
-ingame_help
-{
-	["hook"] =      HOOK_GET,
-	["event"] =     function(obj, idx) if obj.tval == TV_BATERIE then return TRUE end end,
-	["desc"] =
-	{
-		"Ah, an essence! Those magical containers stores energies. They are used",
-		"with the Alchemy skill to create or modify the powers of items.",
-	}
-}
-
-ingame_help
-{
-	["hook"] =      HOOK_GET,
-	["event"] =     function(obj, idx) if obj.tval == TV_RUNE1 or obj.tval == TV_RUNE2 then return TRUE end end,
-	["desc"] =
-	{
-		"Ah, a rune! Runes are used with the Runecraft skill to allow you to",
-		"create spells on your own.",
-	}
-}
-
-ingame_help
-{
-	["hook"] =      HOOK_GET,
-	["event"] =     function(obj, idx) if obj.tval == TV_ROD_MAIN then return TRUE end end,
-	["desc"] =
-	{
-		"This is a rod. You will need to attach a rod tip to it before you",
-		"can use it. This main part of the rod may give the rod bonuses",
-		"like quicker charging time, or a larger capacity for charges.",
-	}
-}
-
-ingame_help
-{
-	["hook"] =      HOOK_GET,
-	["event"] =     function(obj, idx) if obj.tval == TV_ROD then return TRUE end end,
-	["desc"] =
-	{
-		"You've found a rod-tip! You will need to attach it to a rod base",
-		"before you can use it. Once it has been attatched (use the 'z' key)",
-		"you cannot unattach it! The rod tip will determine the effect of",
-		"the rod. To use your rod, 'z'ap it once it has been assembled.",
-	}
-}
-
-ingame_help
-{
-	["hook"] =      HOOK_GET,
-	["event"] =     function(obj, idx) if obj.tval == TV_TRAPKIT then return TRUE end end,
-	["desc"] =
-	{
-		"Ooooh, a trapping kit. If you have ability in the trapping skill,",
-		"you can lay this trap (via the 'm' key) to harm unsuspecting foes.",
-		"You'll generally need either some ammo or magic device depending",
-		"on the exact type of trap kit.",
-	}
-}
-
-ingame_help
-{
-	["hook"] =      HOOK_RECALC_SKILLS,
-	["event"] =     function() if game.started and (get_melee_skills() > 1) then return TRUE end end,
-	["desc"] =
-	{
-		"Ah, you now possess more than one melee type. To switch between them press m",
-		"and select the switch melee type option.",
-	}
-}
-
-ingame_help
-{
-	["hook"] =      HOOK_GET,
-	["event"] =     function(obj, idx) if obj.tval == TV_WAND or obj.tval == TV_STAFF then return TRUE end end,
-	["desc"] =
-	{
-		"You've found a magical device, either a staff or a wand. Each staff",
-		"contains a spell, often from one of the primary magic schools. There",
-		"is a lot of information you can find about this object if you identify",
-		"it and 'I'nspect it. Check the help file on Magic for more about these.",
-	}
-}
-
-ingame_help
-{
-	["hook"] =      HOOK_PLAYER_LEVEL,
-	["event"] =     function(y, x) if player.lev >= 20 then return TRUE end end,
-	["desc"] =
-	{
-		"I see you are now at least level 20. Nice! If you want to gloat about your",
-		"character you could press 'C' then 'f' to make a character dump and post it to",
-		"http://angband.oook.cz/ where it will end up in the ladder.",
-	}
-}
diff --git a/lib/mods/theme/scpt/init.lua b/lib/mods/theme/scpt/init.lua
deleted file mode 100644
index 958d8f7d..00000000
--- a/lib/mods/theme/scpt/init.lua
+++ /dev/null
@@ -1,56 +0,0 @@
---
--- This file is loaded at the initialisation of ToME
---
-
--- Load the class specific stuff
-tome_dofile("player.lua")
-
--- Load the ingame contextual help
-tome_dofile("help.lua")
-
--- let the store specific stuff happen!
-tome_dofile("stores.lua")
-
--- Add various 'U' powers
-tome_dofile("powers.lua")
-
--- Add the mimic shapes
-tome_dofile("mimic.lua")
-
--- Add the corruptions
-tome_dofile("corrupt.lua")
-
--- Add the mkey activations
-tome_dofile("mkeys.lua")
-
--- Add god stuff
-tome_dofile("gods.lua")
-tome_dofile("gods_new.lua")
-
--- Add the schools of magic
-tome_dofile("spells.lua")
-
--- Add some quests
-tome_dofile("bounty.lua")
-tome_dofile("god.lua")
-tome_dofile("fireprof.lua")
-tome_dofile("library.lua")
-
--- Add joke stuff
-tome_dofile("drunk.lua")
-tome_dofile("joke.lua")
-
--- Some tests, if the file is not present, this is fine
-tome_dofile_anywhere(ANGBAND_DIR_SCPT, "dg_test.lua", FALSE)
-
--- A nice custom intro :)
-tome_dofile("intro.lua")
-
--- Add monster interaction
-tome_dofile("monsters.lua")
-
--- Add miscellaneous stuff
-tome_dofile("misc.lua")
-
--- Add map-related quest fix
-tome_dofile("gondolin.lua")
\ No newline at end of file
diff --git a/lib/mods/theme/scpt/intro.lua b/lib/mods/theme/scpt/intro.lua
deleted file mode 100644
index 3cdce225..00000000
--- a/lib/mods/theme/scpt/intro.lua
+++ /dev/null
@@ -1,43 +0,0 @@
-function tome_intro()
-	screen_save()
-	Term_clear()
-
-	if (TRUE == drop_text_left(TERM_L_BLUE, "Three Rings for the Elven-kings under the sky,", 10, 0)) then screen_load() return end
-	if (TRUE == drop_text_right(TERM_L_BLUE, "Seven for the Dwarf-lords in their halls of stone,", 11, -1)) then screen_load() return end
-	if (TRUE == drop_text_left(TERM_L_BLUE, "Nine for Mortal Men doomed to die,", 12, 0)) then screen_load() return end
-	if (TRUE == drop_text_right(TERM_L_BLUE, "One for the Dark Lord on his dark throne", 13, -1)) then screen_load() return end
-	if (TRUE == drop_text_left(TERM_L_BLUE, "In the land of Mordor, where the Shadows lie.", 14, 0)) then screen_load() return end
-	if (TRUE == drop_text_right(TERM_L_BLUE, "One Ring to rule them all, One Ring to find them,", 15, -1)) then screen_load() return end
-	if (TRUE == drop_text_left(TERM_L_BLUE, "One Ring to bring them all and in the darkness bind them", 16, 0)) then screen_load() return end
-	if (TRUE == drop_text_right(TERM_L_BLUE, "In the land of Mordor, where the Shadows lie.", 17, -1)) then screen_load() return end
-	if (TRUE == drop_text_right(TERM_L_GREEN, "--J.R.R. Tolkien", 18, 0)) then screen_load() return end
-	if (TRUE == drop_text_left(TERM_WHITE, "[Press any key to continue]", 23, -1)) then screen_load() return end
-
-	Term_putch(0, 0, TERM_DARK, 32)
-	inkey_scan = FALSE
-	inkey()
-
-	Term_clear()
-
-	if (TRUE == drop_text_left(TERM_L_BLUE, "furiosity", 8, 0)) then screen_load() return end
-	if (TRUE == drop_text_right(TERM_WHITE, "in collaboration with", 9, -1)) then screen_load() return end
-	if (TRUE == drop_text_left(TERM_L_GREEN, "DarkGod and all the ToME contributors,", 10, 0)) then screen_load() return end
-	if (TRUE == drop_text_right(TERM_L_GREEN, "module creators, t-o-m-e.net forum posters,", 11, -1)) then screen_load() return end
-	if (TRUE == drop_text_left(TERM_WHITE, "and", 12, 0)) then screen_load() return end
-	if (TRUE == drop_text_right(TERM_L_GREEN, "by the grace of the Valar", 13, -1)) then screen_load() return end
-
-	if (TRUE == drop_text_left(TERM_WHITE, "present", 15, 1)) then screen_load() return end
-	if (TRUE == drop_text_right(TERM_YELLOW, "Theme (a module for ToME)", 16, 0)) then screen_load() return end
-
-	if (TRUE == drop_text_left(TERM_WHITE, "[Press any key to continue]", 23, -1)) then screen_load() return end
-	Term_putch(0, 0, TERM_DARK, 32)
-
-	inkey_scan = FALSE
-
-	inkey()
-
-	screen_load()
-	return
-end
-
-add_hook_script(HOOK_INIT, "tome_intro", "lua_intro_init")
diff --git a/lib/mods/theme/scpt/joke.lua b/lib/mods/theme/scpt/joke.lua
deleted file mode 100644
index 2d87b651..00000000
--- a/lib/mods/theme/scpt/joke.lua
+++ /dev/null
@@ -1,31 +0,0 @@
--- Place a monster in a good spot
-function gen_joke_place_monster(r_idx)
-	local try = 1000
-	local x
-	local y
-	while try > 0 do
-		x = randint(cur_hgt - 4) + 2
-		y = randint(cur_wid - 4) + 2
-		if not (0 == place_monster_one(y, x, r_idx, 0, FALSE, MSTATUS_ENEMY)) then
-			return
-		end
-		try = try - 1
-	end
-end
-
--- Check if a special joke monster can be generated here
-function gen_joke_monsters()
-	if joke_monsters == FALSE then
-		return
-	end
-
-	-- Neil
-	if (current_dungeon_idx == 20) and (dun_level == 72) then
-		neil = test_monster_name("Neil, the Sorceror")
-		m_allow_special[neil + 1] = TRUE
-		gen_joke_place_monster(neil)
-		m_allow_special[neil + 1] = FALSE
-	end
-end
-
-add_hook_script(HOOK_LEVEL_END_GEN, "gen_joke_monsters", "gen_joke_monsters")
diff --git a/lib/mods/theme/scpt/library.lua b/lib/mods/theme/scpt/library.lua
deleted file mode 100644
index a16d37ef..00000000
--- a/lib/mods/theme/scpt/library.lua
+++ /dev/null
@@ -1,439 +0,0 @@
--- Library quest in Minas Anor
-
--- Partially based on Fireproofing quest
-
-library_quest = {}
-
--- Map helper
-library_quest.place_random = function(minY, minX, maxY, maxX, monster)
-	y = randint(maxY - minY + 1) + minY
-	x = randint(maxX - minX + 1) + minX
-	return place_monster_one(y, x, monster, 0, TRUE, MSTATUS_ENEMY)
-end
-
--- Book creation helpers
-library_quest.bookable_spells =
-{
-	MANATHRUST, DELCURSES,
-	GLOBELIGHT, FIREGOLEM, FIREFLASH, FIREWALL,
-	GEYSER, VAPOR, ENTPOTION,
-	NOXIOUSCLOUD, POISONBLOOD,
-	STONESKIN, DIG,
-	RECHARGE, DISPERSEMAGIC,
-	BLINK, DISARM, TELEPORT,
-	SENSEMONSTERS, SENSEHIDDEN, REVEALWAYS, IDENTIFY, VISION,
-	MAGELOCK, SLOWMONSTER, ESSENCESPEED,
-	CHARM, CONFUSE, ARMOROFFEAR, STUN,
-	GROWTREE, HEALING, RECOVERY,
-	ERU_SEE, ERU_LISTEN,
-	MANWE_BLESS, MANWE_SHIELD,
-	YAVANNA_CHARM_ANIMAL, YAVANNA_GROW_GRASS, YAVANNA_TREE_ROOTS,
-	TULKAS_AIM, TULKAS_SPIN,
-	MELKOR_CURSE, MELKOR_CORPSE_EXPLOSION, DRAIN,
-	AULE_FIREBRAND, AULE_CHILD,
-	VARDA_LIGHT_VALINOR, VARDA_EVENSTAR,
-	ULMO_BELEGAER, ULMO_WRATH,
-	MANDOS_TEARS_LUTHIEN, MANDOS_TALE_DOOM
-}
-
-library_quest.get_term_size = function()
-	local width = 0
-	local height = 0
-	ret, width, height = Term_get_size(width, height)
-	return width, height
-end
-
-library_quest.book_slots_left = function()
-	if school_book[61][1] == -1 then
-		return 3
-	elseif school_book[61][2] == -1 then
-		return 2
-	elseif school_book[61][3] == -1 then
-		return 1
-	else
-		return 0
-	end
-end
-
-library_quest.book_contains_spell = function(spell)
-	if school_book[61][1] == spell then
-		return TRUE
-	elseif school_book[61][2] == spell then
-		return TRUE
-	elseif school_book[61][3] == spell then
-		return TRUE
-	else
-		return FALSE
-	end
-end
-
-library_quest.add_spell = function(spell)
-	if school_book[61][1] == -1 then
-		school_book[61][1] = spell
-		return TRUE
-	elseif school_book[61][2] == -1 then
-		school_book[61][2] = spell
-		return TRUE
-	elseif school_book[61][3] == -1 then
-		school_book[61][3] = spell
-		return TRUE
-	else
-		return FALSE
-	end
-end
-
-library_quest.remove_spell = function(spell)
-	if school_book[61][1] == spell then
-		school_book[61][1] = school_book[61][2]
-		school_book[61][2] = school_book[61][3]
-		school_book[61][3] = -1
-		return TRUE
-	elseif school_book[61][2] == spell then
-		school_book[61][2] = school_book[61][3]
-		school_book[61][3] = -1
-		return TRUE
-	elseif school_book[61][3] == spell then
-		school_book[61][3] = -1
-		return TRUE
-	else
-		return FALSE
-	end
-end
-
--- Print a spell (taken from s_aux)
-function library_quest.print_spell(color, y, spl)
-	local x, index, sch, size, s
-
-	x = 0
-	size = 0
-	book = 255
-	obj = nil
-
-	-- Hack if the book is 255 it is a random book
-	if book == 255 then
-		school_book[book] = {spl}
-	end
-
-	-- Parse all spells
-	for index, s in school_book[book] do
-		local lvl, na = get_level_school(s, 50, -50)
-		local xx, sch_str
-
-		sch_str = spell_school_name(s)
-
-		if s == spl then
-			if na then
-				c_prt(color, format("%-20s%-16s   %3s %4s %3d%s %s", spell(s).name, sch_str, na, get_mana(s), spell_chance(s), "%", __spell_info[s]()), y, x)
-			else
-				c_prt(color, format("%-20s%-16s   %3d %4s %3d%s %s", spell(s).name, sch_str, lvl, get_mana(s), spell_chance(s), "%", __spell_info[s]()), y, x)
-			end
-			y = y + 1
-			size = size + 1
-		end
-	end
-	return y
-end
-
--- spell selection routines inspired by skills.c
-library_quest.print_spells = function(first, current)
-	Term_clear()
-	width, height = library_quest.get_term_size()
-	slots = library_quest.book_slots_left()
-
-	c_prt(TERM_WHITE, "Book Creation Screen", 0, 0);
-	c_prt(TERM_WHITE, "Up/Down to move, Right/Left to modify, I to describe, Esc to Save/Cancel", 1, 0);
-
-	if slots == 0 then
-		c_prt(TERM_L_RED, "The book can hold no more spells.", 2, 0);
-	elseif slots == 1 then
-		c_prt(TERM_L_BLUE, "The book can hold 1 more spell.", 2, 0);
-	else
-		c_prt(TERM_L_BLUE, "The book can hold "..slots.." more spells.", 2, 0);
-	end
-
-	row = 3;
-	for index, spell in library_quest.bookable_spells do
-		if index >= first then
-			if index == current then
-				color = TERM_GREEN
-			elseif library_quest.book_contains_spell(spell) == TRUE then
-				color = TERM_WHITE
-			else
-				color = TERM_ORANGE
-			end
-			library_quest.print_spell(color, row, spell)
-	
-			if row == height - 1 then
-				return
-			end
-			row = row + 1
-		end
-	end
-end
-
-library_quest.fill_book = function()
-	-- Always start with a cleared book
-	school_book[61] = {-1, -1, -1}
-
-	screen_save()
-	width, height = library_quest.get_term_size()
-	-- room for legend
-	margin = 3
-
-	first = 1
-	current = 1
-	done = FALSE
-
-	while done == FALSE do
-		library_quest.print_spells(first, current)
-
-		inkey_scan = FALSE
-		inkey_base = TRUE
-		char = inkey()
-		dir = get_keymap_dir(char)
-		if char == ESCAPE then
-			if library_quest.book_slots_left() == 0 then
-				flush()
-				done = get_check("Really create the book?")
-			else
-				done = TRUE
-			end
-		elseif char == strbyte('\r') then
-			-- TODO: make tree of schools
-		elseif char == strbyte('n') then
-			current = current + height
-		elseif char == strbyte('p') then
-			current = current - height
-		elseif char == strbyte('I') then
-			print_spell_desc(library_quest.bookable_spells[current], 0)
-			inkey()
-		elseif dir == 2 then
-			current = current + 1
-		elseif dir == 8 then
-			current = current - 1
-		elseif dir == 6 then
-			if library_quest.book_contains_spell(library_quest.bookable_spells[current]) == FALSE then
-				library_quest.add_spell(library_quest.bookable_spells[current])
-			end
-		elseif dir == 4 then
-			library_quest.remove_spell(library_quest.bookable_spells[current])
-		end
-		total = getn(library_quest.bookable_spells)
-		if current > total then
-			current = total
-		elseif current < 1 then
-			current = 1
-		end
-		
-		if current > (first + height - margin - 1) then
-			first = current - height + margin + 1
-		elseif first > current then
-			first = current
-		end
-	end
-
-	screen_load()
-end
-
--- Quest data and hooks
-add_quest
-{
-	["global"] = "LIBRARY_QUEST",
-	["name"] = "Library quest",
-	["desc"] = function()
-		-- Quest taken
-		if (quest(LIBRARY_QUEST).status == QUEST_STATUS_TAKEN) then
-			print_hook("#####yAn Old Mages Quest! (Danger Level: 35)\n")
-			print_hook("Make the library safe for the old mage in Minas Anor.\n")
-			print_hook("\n")
-		-- Quest done, book not gotten yet
-		elseif (quest(LIBRARY_QUEST).status == QUEST_STATUS_COMPLETED) then
-			print_hook("#####yAn Old Mages Quest!\n")
-			print_hook("You have made the library safe for the old mage in Minas Anor.\n")
-			print_hook("Perhaps you should see about a reward.\n")
-			print_hook("\n")
-		end
-	end,
-	["level"] = 35,
-	["data"] =
-	{
-		["school_book[61][1]"] = -1,
-		["school_book[61][2]"] = -1,
-		["school_book[61][3]"] = -1
-	},
-	["hooks"] =
-	{
-		-- Start the game without the quest, need to request it
-		[HOOK_BIRTH_OBJECTS] = function()
-			quest(LIBRARY_QUEST).status = QUEST_STATUS_UNTAKEN
-			school_book[61] = {-1, -1, -1}
-		end,
-
-		[HOOK_GEN_QUEST] = function()
-			-- Only if player doing this quest
-			if (player.inside_quest ~= LIBRARY_QUEST) then
-				return FALSE
-			end
-
-			load_map("library.map", 2, 2)
-			level_flags2 = DF2_NO_GENO
-
-			-- generate the Liches 518
-			liches = damroll(4, 2) -- plus one on the map
-			while(liches > 0) do
-				if 0 < library_quest.place_random(4, 4, 14, 37, 518) then
-					liches = liches - 1
-				end
-			end
-
-			-- generate the Monastic liches 611
-			liches = damroll(1, 2)
-			while(liches > 0) do
-				if 0 < library_quest.place_random(14, 34, 37, 67, 611) then
-					liches = liches - 1
-				end
-			end
-
-			-- generate more Monastic liches 611
-			liches = damroll(1, 2) - 1
-			while(liches > 0) do
-				if 0 < library_quest.place_random(4, 34, 14, 67, 611) then
-					liches = liches - 1
-				end
-			end
-
-			-- generate even more Monastic liches 611
-			liches = damroll(1, 2) - 1
-			while(liches > 0) do
-				if 0 < library_quest.place_random(14, 4, 37, 34, 611) then
-					liches = liches - 1
-				end
-			end
-
-			-- Flesh golem 256
-			golems = 2
-			while(golems > 0) do
-				if 0 < library_quest.place_random(10, 10, 37, 67, 256) then
-					golems = golems - 1
-				end
-			end
-
-			-- Clay golem 261
-			golems = 2
-			while(golems > 0) do
-				if 0 < library_quest.place_random(10, 10, 37, 67, 261) then
-					golems = golems - 1
-				end
-			end
-
-			-- Iron golem 367
-			golems = 2
-			while(golems > 0) do
-				if 0 < library_quest.place_random(10, 10, 37, 67, 367) then
-					golems = golems - 1
-				end
-			end
-
-			-- Mithril Golem 464
-			golems = 1
-			while(golems > 0) do
-				if 0 < library_quest.place_random(10, 10, 37, 67, 464) then
-					golems = golems - 1
-				end
-			end
-
-			-- one Master lich is on the map
-
-			return TRUE
-		end,
-		[HOOK_STAIR] = function()
-			local ret
-
-			-- only ask this if player about to go up stairs of quest and hasn't won yet
-			if (player.inside_quest ~= LIBRARY_QUEST) or (quest(LIBRARY_QUEST).status == QUEST_STATUS_COMPLETED) then
-				return FALSE
-			end
-
-			if cave(player.py, player.px).feat ~= FEAT_LESS then return end
-
-			-- flush all pending input
-			flush()
-
-			-- confirm
-			ret = get_check("Really abandon the quest?")
-
-			-- if yes, then
-			if ret == TRUE then
-				-- fail the quest
-				quest(LIBRARY_QUEST).status = QUEST_STATUS_FAILED
-				return FALSE
-			else 
-				-- if no, they stay in the quest
-				return TRUE
-			end
-		end,
-		[HOOK_MONSTER_DEATH] = function()
-			-- if they're in the quest and haven't won, continue
-			if (player.inside_quest ~= LIBRARY_QUEST) or (quest(LIBRARY_QUEST).status == QUEST_STATUS_COMPLETED) then
-				return FALSE
-			end
-
-			i = 1
-			count = -1
-			while i <= m_max do
-				local monster = m_list[i]
-				if (monster.r_idx > 0) and (monster.status <= MSTATUS_ENEMY) then
-					count = count + 1
-				end
-				i = i + 1
-			end
-
-			if count == 0 then
-				quest(LIBRARY_QUEST).status = QUEST_STATUS_COMPLETED
-				msg_print(TERM_YELLOW, "The library is safe now.")
-			end
-		end,
-	},
-}
-
--- Library store action
-add_building_action
-{
-	["index"] = 61,
-	["action"] = function()
-		-- the quest hasn't been requested already, right?
-		if quest(LIBRARY_QUEST).status == QUEST_STATUS_UNTAKEN then
-			-- quest has been taken now
-			quest(LIBRARY_QUEST).status = QUEST_STATUS_TAKEN
-
-			-- issue instructions
-			msg_print("I need get some stock from my main library, but it is infested with monsters!")
-			msg_print("Please use the side entrance and vanquish the intruders for me.")
-
-			return TRUE, FALSE, TRUE
-		-- if quest completed
-		elseif (quest(LIBRARY_QUEST).status == QUEST_STATUS_COMPLETED) then
-			msg_print("Thank you!  Let me make a special book for you.")
-			msg_print("Tell me three spells and I will write them in the book.")
-			library_quest.fill_book()
-			if library_quest.book_slots_left() == 0 then
-				quest(LIBRARY_QUEST).status = QUEST_STATUS_REWARDED
-				book = create_object(TV_BOOK, 61)
-				book.art_name = quark_add(player_name())
-				book.found = OBJ_FOUND_REWARD
-				set_aware(book)
-				set_known(book)
-				inven_carry(book, FALSE)
-			end
-
-		-- if the player asks for a quest when they already have it, but haven't failed it, give them some extra instructions
-		elseif (quest(LIBRARY_QUEST).status == QUEST_STATUS_TAKEN) then
-			msg_print("Please use the side entrance and vanquish the intruders for me.")
-
-		-- quest failed or completed, then give no more quests
-		elseif (quest(LIBRARY_QUEST).status == QUEST_STATUS_FAILED) or (quest(LIBRARY_QUEST).status == QUEST_STATUS_REWARDED) then
-			msg_print("I have no more quests for you.")
-		end
-		return TRUE
-	end,
-}
diff --git a/lib/mods/theme/scpt/mimic.lua b/lib/mods/theme/scpt/mimic.lua
deleted file mode 100644
index f38f70f7..00000000
--- a/lib/mods/theme/scpt/mimic.lua
+++ /dev/null
@@ -1,419 +0,0 @@
--- Define the various possible mimic shapes
-
--- Nature shapes
-add_mimic_shape
-{
-	["name"] =      "Mouse",
-	["obj_name"] =  "Mouse Fur",
-	["desc"] = 	"Mice are small, fast and very stealthy",
-	["realm"] =     "nature",
-	["level"] =     1,
-	["rarity"] =    10,
-	["duration"] =  {20, 40},
-	["calc"] =      function ()
-			-- Mice run!
-			player.pspeed = player.pspeed + 5 + (player.mimic_level / 7)
-
-			-- They can crtawl under your armor to hit you ;)
-			player.to_h = player.to_h + 10 + (player.mimic_level / 5)
-			player.dis_to_h = player.dis_to_h + 10 + (player.mimic_level / 5)
-
-			-- But they are not very powerfull
-			player.to_d = player.to_d / 5
-			player.dis_to_d = player.dis_to_d / 5
-
-			-- But they are stealthy
-			player.skill_stl = player.skill_stl + 10 + (player.mimic_level / 5)
-
-			-- Stat mods
-			player.modify_stat(A_STR, -5)
-			player.modify_stat(A_DEX, 3)
-			player.modify_stat(A_CON, 1)
-
-	end,
-	["power"] =     function()
-			if player.mimic_level >= 30 then
-				player.add_power(POWER_INVISIBILITY)
-			end
-	end,
-}
-
-add_mimic_shape
-{
-	["name"] =      "Eagle",
-	["obj_name"] =  "Feathered Cloak",
-	["desc"] = 	"Eagles are master of the air, good hunters with excellent vision.",
-	["realm"] =     "nature",
-	["level"] =     10,
-	["rarity"] =    30,
-	["duration"] =  {10, 50},
-	["calc"] =      function ()
-			player.ffall = TRUE
-			player.pspeed = player.pspeed + 2 + (player.mimic_level / 6)
-
-			player.modify_stat(A_STR, -3)
-			player.modify_stat(A_DEX, 2 + (player.mimic_level / 15))
-			player.modify_stat(A_CON, 4 + (player.mimic_level / 20))
-			player.modify_stat(A_INT, -1)
-			player.modify_stat(A_WIS, 1)
-			player.modify_stat(A_CHR, -1)
-
-			if player.mimic_level >= 20 then
-                player.xtra_f4 = bor(player.xtra_f4, TR4_FLY)
-                player.xtra_f3 = bor(player.xtra_f3, TR3_SEE_INVIS)
-			end
-			if player.mimic_level >= 25 then
-                player.xtra_f2 = bor(player.xtra_f2, TR2_FREE_ACT)
-			end
-			if player.mimic_level >= 30 then
-                player.xtra_f2 = bor(player.xtra_f2, TR2_RES_ELEC)
-			end
-			if player.mimic_level >= 30 then
-                player.xtra_f3 = bor(player.xtra_f3, TR3_SH_ELEC)
-			end
-	end,
-}
-
-add_mimic_shape
-{
-	["name"] =      "Wolf",
-	["obj_name"] =  "Wolf Pelt",
-	["desc"] = 	"Wolves are masters of movement, strong and have excellent eyesight.",
-	["realm"] =     "nature",
-	["level"] =     20,
-	["rarity"] =    40,
-	["duration"] =  {10, 50},
-	["calc"] =      function ()
-			player.modify_stat(A_STR, 2 + (player.mimic_level / 20))
-			player.modify_stat(A_DEX, 3 + (player.mimic_level / 20))
-			player.modify_stat(A_INT, -3)
-			player.modify_stat(A_CHR, -2)
-
-			player.pspeed = player.pspeed + 10 + (player.mimic_level / 5)
-
-            player.xtra_f2 = bor(player.xtra_f2, TR2_FREE_ACT)
-            player.xtra_f2 = bor(player.xtra_f2, TR2_RES_FEAR)
-
-			if player.mimic_level >= 10 then
-				player.xtra_f2 = bor(player.xtra_f2, TR2_RES_COLD)
-			end
-			if player.mimic_level >= 15 then
-                player.xtra_f3 = bor(player.xtra_f3, TR3_SEE_INVIS)
-			end
-			if player.mimic_level >= 30 then
-				player.xtra_f2 = bor(player.xtra_f2, TR2_RES_DARK)
-			end
-			if player.mimic_level >= 35 then
-				player.xtra_f2 = bor(player.xtra_f2, TR2_RES_CONF)
-			end
-	end,
-}
-
-add_mimic_shape
-{
-	["name"] =      "Spider",
-	["obj_name"] =  "Spider Web",
-	["desc"] = 	"Spiders are clever and become good climbers.",
-	["realm"] =     "nature",
-	["level"] =     25,
-	["rarity"] =    50,
-	["duration"] =  {10, 50},
-	["calc"] =      function ()
-			player.modify_stat(A_STR, -4)
-			player.modify_stat(A_DEX, 1 + (player.mimic_level / 8))
-			player.modify_stat(A_INT, 1 + (player.mimic_level / 5))
-			player.modify_stat(A_WIS, 1 + (player.mimic_level / 5))
-			player.modify_stat(A_CON, -5)
-			player.modify_stat(A_CHR, -10)
-
-			player.pspeed = player.pspeed + 5
-
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_POIS)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_FEAR)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_DARK)
-
-			if player.mimic_level >= 40 then
-                player.xtra_f4 = bor(player.xtra_f4, TR4_CLIMB)
-			end
-
-	end,
-	["power"] =     function()
-			if player.mimic_level >= 25 then
-				player.add_power(POWER_WEB)
-			end
-	end,
-}
-
-add_mimic_shape
-{
-	["name"] =      "Elder Ent",
-	["obj_name"] =  "Entish Bark",
-	["desc"] = 	"Ents are powerful tree-like beings dating from the dawn of time.",
-	["realm"] =     "nature",
-	["level"] =     40,
-	["rarity"] =    60,
-	["duration"] =  {10, 30},
-	["limit"] =     TRUE,
-	["calc"] =      function ()
-			player.pspeed = player.pspeed - 5 - (player.mimic_level / 10)
-
-			player.to_a = player.to_a + 10 + player.mimic_level
-			player.dis_to_a = player.dis_to_a + 10 + player.mimic_level
-
-			player.modify_stat(A_STR, player.mimic_level / 5)
-			player.modify_stat(A_INT, - (player.mimic_level / 7))
-			player.modify_stat(A_WIS, - (player.mimic_level / 7))
-			player.modify_stat(A_DEX, -4)
-			player.modify_stat(A_CON, player.mimic_level / 5)
-			player.modify_stat(A_CHR, -7)
-
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_POIS)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_COLD)
-            player.xtra_f2 = bor(player.xtra_f2, TR2_FREE_ACT)
-            player.xtra_f3 = bor(player.xtra_f3, TR3_REGEN)
-            player.xtra_f3 = bor(player.xtra_f3, TR3_SEE_INVIS)
-            player.xtra_f2 = bor(player.xtra_f2, TR2_SENS_FIRE)
-	end,
-	["power"] =     function ()
-			player.add_power(PWR_GROW_TREE)
-	end,
-}
-
-add_mimic_shape
-{
-	["name"] =      "Vapour",
-	["obj_name"] =  "Cloak of Mist",
-	["desc"] = 	"A sentient cloud, darting around",
-	["realm"] =     "nature",
-	["level"] =     15,
-	["rarity"] =    10,
-	["duration"] =  {10, 40},
-	["calc"] =      function ()
-
-			player.pspeed = player.pspeed + 5
-
-			--Try to hit a cloud!
-			player.to_a = player.to_a + 40 + player.mimic_level
-			player.dis_to_a = player.dis_to_a + 40 + player.mimic_level
-
-			--Try to hit WITH a cloud!
-			player.to_h = player.to_h - 40
-			player.dis_to_h = player.dis_to_h -40
-
-			-- Stat mods
-			player.modify_stat(A_STR, -4)
-			player.modify_stat(A_DEX, 5)
-			player.modify_stat(A_CON, -4)
-			player.modify_stat(A_CHR, -10)
-
-			-- But they are stealthy
-			player.skill_stl = player.skill_stl + 10 + (player.mimic_level / 5)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_POIS)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_SHARDS)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_IM_COLD)
-            player.xtra_f2 = bor(player.xtra_f2, TR2_FREE_ACT)
-            player.xtra_f3 = bor(player.xtra_f3, TR3_REGEN)
-            player.xtra_f3 = bor(player.xtra_f3, TR3_SEE_INVIS)
-            player.xtra_f2 = bor(player.xtra_f2, TR2_SENS_FIRE)
-            player.xtra_f3 = bor(player.xtra_f3, TR3_FEATHER)
-	end,
-}
-
-add_mimic_shape
-{
-	["name"] =      "Serpent",
-	["obj_name"] =  "Snakeskin Cloak",
-	["desc"] = 	"Serpents are fast, lethal predators.",
-	["realm"] =     "nature",
-	["level"] =     30,
-	["rarity"] =    25,
-	["duration"] =  {15, 20},
-	["calc"] =      function ()
-			player.pspeed = player.pspeed + 10 + (player.mimic_level / 6)
-			player.to_a = player.to_a + 3 + (player.mimic_level / 8)
-			player.dis_to_a = player.dis_to_a + 3 + (player.mimic_level / 8)
-
-			player.modify_stat(A_STR, player.mimic_level / 8)
-			player.modify_stat(A_INT, -6)
-			player.modify_stat(A_WIS, -6)
-			player.modify_stat(A_DEX, -4)
-			player.modify_stat(A_CON, player.mimic_level / 7)
-			player.modify_stat(A_CHR, -6)
-
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_POIS)
-			if player.mimic_level >= 25 then
-            	player.xtra_f2 = bor(player.xtra_f2, TR2_FREE_ACT)
-			end
-	end,
-}
-
-add_mimic_shape
-{
-	["name"] =      "Mumak",
-	["obj_name"] =  "Mumak Hide",
-	["desc"] = 	"A giant, elaphantine form.",
-	["realm"] =     "nature",
-	["level"] =     40,
-	["rarity"] =    40,
-	["duration"] =  {15, 20},
-	["calc"] =      function ()
-			player.pspeed = player.pspeed - 5 - (player.mimic_level / 10)
-			player.to_a = player.to_a + 10 + (player.mimic_level / 6)
-			player.dis_to_a = player.dis_to_a + 10 + (player.mimic_level / 6)
-			player.to_d = player.to_d + 5 + ((player.mimic_level * 2) / 3)
-			player.dis_to_d = player.dis_to_d + 5 + ((player.mimic_level * 2) / 3)
-
-			player.modify_stat(A_STR, player.mimic_level / 4)
-			player.modify_stat(A_INT, -8)
-			player.modify_stat(A_WIS, -4)
-			player.modify_stat(A_DEX, -5)
-			player.modify_stat(A_CON, player.mimic_level / 3)
-			player.modify_stat(A_CHR, -10)
-
-			if player.mimic_level >= 10 then
-				player.xtra_f2 = bor(player.xtra_f2, TR2_RES_FEAR)
-			end
-			if player.mimic_level >= 25 then
-				player.xtra_f2 = bor(player.xtra_f2, TR2_RES_CONF)
-			end
-			if player.mimic_level >= 30 then
-            	player.xtra_f2 = bor(player.xtra_f2, TR2_FREE_ACT)
-			end
-			if player.mimic_level >= 35 then
-				player.xtra_f2 = bor(player.xtra_f2, TR2_RES_NEXUS)
-			end
-	end,
-}
-
---------- Extra shapes -----------
-
--- For Beornings
-add_mimic_shape
-{
-	["name"] =      "Bear",
-	["desc"] = 	"A fierce, terrible bear.",
-	["realm"] =     nil,
-	["level"] =     1,
-	["rarity"] =    101,
-	["duration"] =  {50, 200},
-	["limit"] =     TRUE,
-	["calc"] =      function ()
-			player.pspeed = player.pspeed - 5 + (player.mimic_level / 5)
-
-			player.to_a = player.to_a + 5 + ((player.mimic_level * 2) / 3)
-			player.dis_to_a = player.dis_to_a + 5 + ((player.mimic_level * 2) / 3)
-
-			player.modify_stat(A_STR, player.mimic_level / 11)
-			player.modify_stat(A_INT, player.mimic_level / 11)
-			player.modify_stat(A_WIS, player.mimic_level / 11)
-			player.modify_stat(A_DEX, -1)
-			player.modify_stat(A_CON, player.mimic_level / 11)
-			player.modify_stat(A_CHR, -10)
-
-			if player.mimic_level >= 10 then
-            	player.xtra_f2 = bor(player.xtra_f2, TR2_FREE_ACT)
-			end
-			if player.mimic_level >= 20 then
-	            player.xtra_f3 = bor(player.xtra_f3, TR3_REGEN)
-			end
-			if player.mimic_level >= 30 then
-				player.xtra_f2 = bor(player.xtra_f2, TR2_RES_CONF)
-			end
-			if player.mimic_level >= 35 then
-				player.xtra_f2 = bor(player.xtra_f2, TR2_RES_NEXUS)
-			end
-
-			-- activate the skill
-			skill(SKILL_BEAR).hidden = FALSE
-	end,
-}
-
--- For balrog corruptions
-add_mimic_shape
-{
-	["name"] =      "Balrog",
-	["desc"] = 	"A corrupted maia.",
-	["realm"] =     nil,
-	["level"] =     1,
-	["rarity"] =    101,
-	["duration"] =  {30, 70},
-	["limit"] =     TRUE,
-	["calc"] =      function ()
-			player.modify_stat(A_STR, 5 + player.mimic_level / 5)
-			player.modify_stat(A_INT, player.mimic_level / 10)
-			player.modify_stat(A_WIS, - ( 5 + player.mimic_level / 10))
-			player.modify_stat(A_DEX, player.mimic_level / 10)
-			player.modify_stat(A_CON, 5 + player.mimic_level / 5)
-			player.modify_stat(A_CHR, - ( 5 + player.mimic_level / 10))
-
-			player.xtra_f2 = bor(player.xtra_f2, TR2_IM_ACID)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_IM_FIRE)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_IM_ELEC)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_DARK)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_CHAOS)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_POIS)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_HOLD_LIFE)
-			player.xtra_f3 = bor(player.xtra_f3, TR3_FEATHER)
-			player.xtra_f3 = bor(player.xtra_f3, TR3_REGEN)
-			player.xtra_f3 = bor(player.xtra_f3, TR3_SH_FIRE)
-			player.xtra_f3 = bor(player.xtra_f3, TR3_LITE1)
-			return 1
-	end,
-}
-
--- For avatar spell
-add_mimic_shape
-{
-	["name"] =      "Maia",
-	["desc"] = 	"A near god-like being.",
-	["realm"] =     nil,
-	["level"] =     1,
-	["rarity"] =    101,
-	["duration"] =  {30, 70},
-	["limit"] =     TRUE,
-	["calc"] =      function ()
-			player.modify_stat(A_STR, 5 + player.mimic_level / 5)
-			player.modify_stat(A_INT, 5 + player.mimic_level / 5)
-			player.modify_stat(A_WIS, 5 + player.mimic_level / 5)
-			player.modify_stat(A_DEX, 5 + player.mimic_level / 5)
-			player.modify_stat(A_CON, 5 + player.mimic_level / 5)
-			player.modify_stat(A_CHR, 5 + player.mimic_level / 5)
-
-			player.xtra_f2 = bor(player.xtra_f2, TR2_IM_FIRE)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_IM_ELEC)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_IM_ACID)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_IM_COLD)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_POIS)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_LITE)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_DARK)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_CHAOS)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_HOLD_LIFE)
-			player.xtra_f3 = bor(player.xtra_f3, TR3_FEATHER)
-			player.xtra_f3 = bor(player.xtra_f3, TR3_REGEN)
-			return 2
-	end,
-}
-
--- For Geomancy
-add_mimic_shape
-{
-	["name"] =      "Fire Elem.",
-	["desc"] = 	"A towering column of flames",
-	["realm"] =     nil,
-	["level"] =     1,
-	["rarity"] =    101,
-	["duration"] =  {10, 10},
-	["limit"] =     TRUE,
-	["calc"] =      function ()
-			player.modify_stat(A_STR, 5 + (player.mimic_level / 5))
-			player.modify_stat(A_DEX, 5 + (player.mimic_level / 5))
-			player.modify_stat(A_WIS, -5 - (player.mimic_level / 5))
-
-			player.xtra_f2 = bor(player.xtra_f2, TR2_IM_FIRE)
-			-- was immune to poison in the 3.0.0 version
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_POIS)
-			player.xtra_f3 = bor(player.xtra_f3, TR3_SH_FIRE)
-			player.xtra_f3 = bor(player.xtra_f3, TR3_LITE1)
-			return 0
-	end,
-}
diff --git a/lib/mods/theme/scpt/misc.lua b/lib/mods/theme/scpt/misc.lua
deleted file mode 100644
index acb45f3c..00000000
--- a/lib/mods/theme/scpt/misc.lua
+++ /dev/null
@@ -1,213 +0,0 @@
--- New scrolls
-function sterilize_scroll(tval, sval)
-	if tval == 70 and sval == 54 then
-		msg_print("A neutralising wave radiates from you!")
-		set_no_breeders(randint(100) + 100)
-		return TRUE
-	end
-end
-
-add_hook_script(HOOK_READ, "sterilize_scroll", "sterilize_scroll")
-
--- Neil's automagic statgain script
-
-player.last_rewarded_level = 1
-add_loadsave("player.last_rewarded_level", 1)
-
-add_hooks
-	{
-	[HOOK_PLAYER_LEVEL] = function()
-		while player.last_rewarded_level * 5 <= player.lev do
-			do_inc_stat(A_STR)
-			do_inc_stat(A_INT)
-			do_inc_stat(A_WIS)
-			do_inc_stat(A_DEX)
-			do_inc_stat(A_CON)
-			do_inc_stat(A_CHR)
-			player.last_rewarded_level = player.last_rewarded_level + 1
-			end
-		end,
-	}
-
-add_hooks
-{
-   [HOOK_BIRTH_OBJECTS] = function()
-      if player.last_rewarded_level >= 1
-         then player.last_rewarded_level = 1
-      else
-      end
-   end
-}
-
--- silly function that allows a drunk to take a bottle of wine/ale from the player
-
-function drunk_takes_wine(m_idx, item)
-
-	m_ptr = monster(m_idx)
-	o_ptr = get_object(item)
-
-	if (m_ptr.r_idx == test_monster_name("Singing, happy drunk")) 
-			and (o_ptr.tval == TV_FOOD) and ((o_ptr.sval == 38) or (o_ptr.sval == 39)) then
-
-		cmsg_print(TERM_YELLOW, "'Hic!'")
-
-		inven_item_increase(item, -1)
-		inven_item_optimize(item)
-
--- HackSmurf: the drunk may drop an empty bottle
-		bottle = create_object(TV_BOTTLE,1)
-		drop_near(bottle, 50, player.py, player.px)
-		return TRUE
-	else
-		return FALSE
-	end
-end
-
-add_hook_script(HOOK_GIVE, "drunk_takes_wine", "drunk_takes_wine")
-
--- winged races are allowed soft armor only, no cloaks (from T-Plus)
-function __hook_wings_wear(obj) 
-    local str = get_race_name() 
-    local type = obj.tval
-         if (str == "Dragon" or str == "Eagle") and (type == 35 or type == 37 or type == 38) then 
-            return TRUE, -1 
-         end        
-end 
-
-add_hook_script(HOOK_WIELD_SLOT, "__hook_wings_wear", "__hook_wings_wear") 
-
--- A not-too-scummy way of generating junk for ammo
-function food_vessel(object)
-   if ((object.tval == 80) and (object.sval == 43)) or
-	((object.tval == 80) and (object.sval == 44)) then
-      local obj = create_object(TV_JUNK, 3)
-	obj.ident = bor(obj.ident, IDENT_MENTAL, IDENT_KNOWN)
-	inven_carry(obj, FALSE)
-	end_object(obj)
-	return FALSE
-   end
-end
-
-add_hook_script(HOOK_EAT, "food_vessel", "food_vessel")
-
--- Longbottom Leaf *is* a great stress reliever:
-function longbottom_leaf(object)
-	if (object.tval == 80) and (object.sval == 45) then
-		msg_print("What a stress reliever!")
-		heal_insanity(1000)
-		return FALSE
-	end
-end
-add_hook_script(HOOK_EAT, "longbottom_leaf", "longbottom_leaf")
-
--- Hobbits like food
-function hobbit_food(m_idx, item)
-
-	m_ptr = monster(m_idx)
-	o_ptr = get_object(item)
-
-	if (m_ptr.r_idx == test_monster_name("Scruffy-looking hobbit")) 
-	and (o_ptr.tval == TV_FOOD) then
-		cmsg_print(TERM_YELLOW, "'Yum!'")
-		inven_item_increase(item, -1)
-		inven_item_optimize(item)
-		return TRUE
-	else
-		return FALSE
-	end
-end
-
-add_hook_script(HOOK_GIVE, "hobbit_food", "hobbit_food")
-
--- Smeagol likes rings
-function smeagol_ring(m_idx, item)
-
-   m_ptr = monster(m_idx)
-   o_ptr = get_object(item)
-
-   if (m_ptr.r_idx == test_monster_name("Smeagol"))
-         and (o_ptr.tval == TV_RING) then
-
-      cmsg_print(TERM_YELLOW, "'MY... PRECIOUSSSSS!!!'")
-
-      inven_item_increase(item, -1)
-      inven_item_optimize(item)
-      return TRUE
-   else
-      return FALSE
-   end
-end
-
-add_hook_script(HOOK_GIVE, "smeagol_ring", "smeagol_ring") 
-
--- functions to check for Map and Key of Thror before proceeding in Erebor
--- Thank you, Massimiliano Marangio :-)
-add_hooks
-{
-   [HOOK_STAIR] = function(direction)
-      if ((current_dungeon_idx == 20) and (dun_level == 60) and (direction == "down")) then
-            local i
-            local mapkey = 0
-            for i = 0, INVEN_TOTAL - 1 do
-               if ((player.inventory(i).name1 == 209) or (player.inventory(i).name1 == 210)) then
-                  mapkey = mapkey + 1
-               end
-            end
-
-            if (mapkey == 2) then
-                msg_print("The moon-letters on the map show you the keyhole! You use the key to enter.")
-                return FALSE
-            else
-                msg_print("You have found a door, but you cannot find a way to enter. Ask in Dale, perhaps?")
-                return TRUE
-            end
-      end
-      return FALSE
-   end,
-}
-
--- function to make the Dale mayor tell you about how to get to Erebor 61
-add_building_action
-{
-	["index"] =     66,
-	["action"] =    function()
-		msg_print("You will need Thorin's Key and Thrain's Map to get anywhere in Erebor. One may be found in the Barrow-Downs. The other, in Mirkwood.")
-	end
-}
-
--- function to make Melkor like it if a player quaffs potions of corruption
-function melkor_potion_corruption(object)
-	if (player.pgod == GOD_MELKOR) then
-		if (object.tval == TV_POTION) and (object.sval == SV_POTION_MUTATION) then
-		msg_print("Your quaffing of this potion pleases Melkor!")
-		set_grace(player.grace + 2)
-		return FALSE
-		end
-	end
-end
-add_hook_script(HOOK_QUAFF, "melkor_potion_corruption", "melkor_potion_corruption")
-
--- function to check for Key of Orthanc before proceeding to the final level in Isengard
-add_hooks
-{
-   [HOOK_STAIR] = function(direction)
-      if ((current_dungeon_idx == 36) and (dun_level == 39) and (direction == "down")) then
-            local i
-            local orthkey = 0
-            for i = 0, INVEN_TOTAL - 1 do
-               if (player.inventory(i).name1 == 15) then
-                  orthkey = orthkey + 1
-               end
-            end
-
-            if (orthkey == 1) then
-                msg_print("#BYou have the key to the tower of Orthanc! You may proceed.#w")
-                return FALSE
-            else
-                msg_print("#yYou may not enter Orthanc without the key to the gates!#w Rumours say the key was lost in the Mines of Moria...")
-                return TRUE
-            end
-      end
-      return FALSE
-   end,
-}
\ No newline at end of file
diff --git a/lib/mods/theme/scpt/mkeys.lua b/lib/mods/theme/scpt/mkeys.lua
deleted file mode 100644
index 07105c64..00000000
--- a/lib/mods/theme/scpt/mkeys.lua
+++ /dev/null
@@ -1,95 +0,0 @@
--- Mkeys for skills & abilities
-
-GF_INSTA_DEATH = add_spell_type
-{
-	["color"]       = { TERM_DARK, 0 },
-	["angry"]       = function() return TRUE, TRUE end,
-	["monster"]     = function(who, dam, rad, y, x, monst)
-			local race = race_info_idx(monst.r_idx, monst.ego)
-			if magik(5) == FALSE or band(race.flags1, RF1_UNIQUE) ~= FALSE or band(race.flags3, RF3_UNDEAD) ~= FALSE or band(race.flags3, RF3_NONLIVING) ~= FALSE then
-				return TRUE, FALSE
-			else
-				-- Reduce the exp gained this way
-				monst.level = monst.level / 3
-				return TRUE, FALSE, 32535, 0, 0, 0, 0, 0, 0, 0, " faints.", " is sucked out of life."
-			end
-	end,
-}
-
--- Death touch ability
-add_mkey
-{
-	["mkey"] 	= 100,
-	["fct"] 	= function()
-			if player.csp > 40 then
-				increase_mana(-40)
-				set_project(randint(30) + 10, GF_INSTA_DEATH, 1, 0, bor(PROJECT_STOP, PROJECT_KILL))
-				energy_use = 100
-			else
-				msg_print("You need at least 40 mana.")
-			end
-	end,
-}
-
-
--- Geomancy skill
-add_mkey
-{
-	["mkey"] 	= 101,
-	["fct"] 	= function()
-			local s
-
-			-- No magic
-			if (player.antimagic > 0) then
-				msg_print("Your anti-magic field disrupts any magic attempts.")
-				return
-			end
-
-			local obj = get_object(INVEN_WIELD)
-			if (obj.k_idx <= 0) or (obj.tval ~= TV_MSTAFF) then
-				msg_print('You must wield a magestaff to use Geomancy.')
-				return
-			end
-
-			s = get_school_spell("cast", "is_ok_spell", 62);
-
-			-- Actualy cast the choice
-			if (s ~= -1) then
-				cast_school_spell(s, spell(s))
-			end
-	end,
-}
-
--- Far reaching attack of polearms
-add_mkey
-{
-	["mkey"]	= 102,
-	["fct"]	 = function()
-			local weapon = get_object(INVEN_WIELD);
-			if weapon.tval == TV_POLEARM then
-			else
-				msg_print("You will need a long polearm for this!")
-				return
-			end
-
-			ret, dir = get_rep_dir()
-			if ret == FALSE then return end
-
-			local dy, dx = explode_dir(dir)
-			dy = dy * 2
-			dx = dx * 2
-		    	targety = player.py + dy
-		    	targetx = player.px + dx
-
-			local max_blows = get_skill_scale(SKILL_POLEARM, player.num_blow / 2)
-			if max_blows == 0 then max_blows = 1 end
-
-			if get_skill(SKILL_POLEARM) >= 40 then
-				energy_use = energy_use + 200
-				return project(0, 0, targety, targetx, max_blows, GF_ATTACK, bor(PROJECT_BEAM, PROJECT_KILL))
-			else
-				energy_use = energy_use + 200
-				return project(0, 0, targety, targetx, max_blows, GF_ATTACK, bor(PROJECT_BEAM, PROJECT_STOP, PROJECT_KILL))
-			end
-	end,
-}
diff --git a/lib/mods/theme/scpt/monsters.lua b/lib/mods/theme/scpt/monsters.lua
deleted file mode 100644
index ad3a5628..00000000
--- a/lib/mods/theme/scpt/monsters.lua
+++ /dev/null
@@ -1,182 +0,0 @@
--- This file holds various things that govern monster behaviour with respect to the player
-
--- Enables player to push past any monster who is >= MSTATUS_NEUTRAL.
--- Written by BauMog for the Intets Hevn module; permission granted to use in the Theme module
-
--- Adapted from defines.h
-function cave_floor_bold(y, x)
-	local c_ptr = cave(y, x);
-	if(cave_is(c_ptr, FF1_FLOOR) == TRUE) and (c_ptr.feat ~= FEAT_MON_TRAP) then
-		return TRUE
-	else
-		return FALSE
-	end
-end
-
--- Adapted from cmd1.c
-function __hook_push_past(y, x)
-	local c_ptr = cave(y, x);
-	
-	if(c_ptr.m_idx > 0) then
-		m_ptr = monster(c_ptr.m_idx);
-		if(m_ptr.status >= MSTATUS_NEUTRAL) then
-			if(cave_floor_bold(y, x) == TRUE) or (m_ptr.flags2 == RF2_PASS_WALL) then
-				msg_print(format("You push past %s.", monster_desc(m_ptr, 0)));
-				m_ptr.fy = player.py;
-				m_ptr.fx = player.px;
-				cave(player.py, player.px).m_idx = c_ptr.m_idx;
-				c_ptr.m_idx = 0;
-			else
-				msg_print(format("%s is in your way!", monster_desc(m_ptr, 0)));
-				energy_use = 0;
-			end
-		end
-	end
-	
-end
-
-add_hook_script(HOOK_MOVE, "__hook_push_past", "__hook_push_past");
-
--- Monster vs. Player Race alignment script
--- From T-Plus by Ingeborg S. Norden
-
-monst_al = {} 
-
-function monst_al_add(status, mrs, prs) 
-for i,v in mrs do 
--- added end 
-if not monst_al[v] then monst_al[v] = {} end 
-for j, w in prs do 
-monst_al[v][w] = status 
-end 
-end 
-end 
-
-function monst_al_get(mr,pr) 
- if monst_al[mr] then return monst_al[mr][pr] 
- else return end 
-end 
-
--- Maia aggravation for evil beings (provided that no demonic corruptions are present)
--- Based on parts of angel.lua from T-Plus by Ingeborg S. Norden
-
--- cast dispel evil with 0 damage every 10 turns 
-
-TIMER_AGGRAVATE_EVIL = new_timer 
-{ 
-   ["enabled"] = FALSE, 
-   ["delay"] = 10, 
-   ["callback"] = function() 
-      dispel_evil(0) 
-   end, 
-} 
-
-add_hooks{ 
-[HOOK_GAME_START] = function() 
-
-  	if ((get_race_name() == "Maia") and 
-	(player.corruption(CORRUPT_BALROG_AURA) ~= TRUE) and 
-	(player.corruption(CORRUPT_BALROG_WINGS) ~= TRUE) and 
-	(player.corruption(CORRUPT_BALROG_STRENGTH) ~= TRUE) and 
-	(player.corruption(CORRUPT_BALROG_FORM) ~= TRUE)) then 
-	-- "Proper" Maiar aggravate evil beings
-    	TIMER_AGGRAVATE_EVIL.enabled = TRUE
-	-- Good beings (except swans, GWoPs, Wyrm Spirits, and some joke uniques) are coaligned with Maiar 
-
-	monst_al_add(MSTATUS_FRIEND, {25, 29, 45, 97, 109, 147, 225, 335, 346, 443, 581, 629, 699, 853, 984, 1007, 1017}, {21})
-
-	-- Non-evil humanoids are neutral to Humans, Dunedain, Druedain, Rohirrim
-	elseif ((get_race_name() == "Human") or 
-	(get_race_name() == "Dunadan") or 
-	(get_race_name() == "Druadan") or 
-	(get_race_name() == "RohanKnight")) then
-	monst_al_add(MSTATUS_NEUTRAL, {43, 45, 46, 83, 93, 97, 109, 110, 142, 147, 216, 225, 293, 345, 346, 693, 699, 937, 988, 997, 998, 1000},{0, 8, 12, 16})
-
-	-- Non-evil sentient (and non-animal) creatures are neutral to Hobbits, Elves, Wood-Elves
-	elseif ((get_race_name() == "Hobbit") or 
-	(get_race_name() == "Elf") or 
-	(get_race_name() == "Wood-Elf")) then
-	monst_al_add(MSTATUS_NEUTRAL, {43, 45, 46, 83, 93, 97, 109, 110, 142, 147, 216, 225, 293, 345, 346, 693, 699, 937, 988, 997, 998, 1000, 74, 103, 882, 1017},{2, 3, 20})
-
-	-- Gnome monsters are neutral to Gnomes
-	elseif get_race_name() == "Gnome" then
-	monst_al_add(MSTATUS_NEUTRAL, {103, 281, 680, 984, 1001, 1003, 1007, 1011, 1014, 1016},{4})
-
-	-- Dwarven monsters are neutral to Petty-dwarves and Dwarves
-	elseif ((get_race_name() == "Dwarf") or
-	(get_race_name() == "Petty-Dwarf")) then
-	monst_al_add(MSTATUS_NEUTRAL, {111, 112, 179, 180, 181, 182},{5, 13})
-
-	-- If an Orc character worships Melkor, lower-level Orcs are neutral (not Uruk-hai, however)
-	elseif ((get_race_name() == "Orc") and 
-      (player.pgod == GOD_MELKOR)) then
-	monst_al_add(MSTATUS_FRIEND, {87, 118, 126, 149, 244, 251, 264},{6})
-
-	-- If a Troll character worships Melkor, Trolls are neutral (not Eldraks, Ettins, and War trolls, though)
-	elseif ((get_race_name() == "Troll") and 
-      (player.pgod == GOD_MELKOR)) then
-	monst_al_add(MSTATUS_NEUTRAL, {297, 401, 403, 424, 454, 491, 496, 509, 538},{7})
-
-	-- Ogres are neutral to Half-Ogres
-	elseif get_race_name() == "Half-Ogre" then
-	monst_al_add(MSTATUS_NEUTRAL, {262, 285, 415, 430, 479, 745, 918},{10})
-
-	-- Bears are neutral to Beornings, except werebears.
-	elseif get_race_name() == "Beorning" then
-	monst_al_add(MSTATUS_NEUTRAL, {160, 173, 191, 854, 855, 867, 873},{11})
-
-	-- Dark elven monsters are coaligned with Dark Elves
-	elseif get_race_name() == "Dark-Elf" then
-	monst_al_add(MSTATUS_FRIEND, {122, 178, 183, 226, 348, 375, 400, 657},{14})
-
-	-- Plants are coaligned with Ents
-	elseif get_race_name() == "Ent" then
-	monst_al_add(MSTATUS_FRIEND, {248, 266, 317, 329, 396},{15})
-
-	-- And since the above is largely useless except out in the wild...
-	-- If an Ent worships Yavanna, lower-level animals are coaligned
-	-- should make the early game a bit easier for Ents.
-	elseif ((get_race_name() == "Ent") and
-	(player.pgod == GOD_YAVANNA)) then
-	monst_al_add(MSTATUS_FRIEND, {21, 23, 24, 25, 26, 27, 28, 29, 30, 31, 33, 35, 36, 37, 38, 39, 41, 49, 50, 52, 56, 57, 58, 59, 60, 61, 62, 69, 70, 75, 77, 78, 79, 86, 88, 89, 90, 95, 96, 105, 106, 114, 119, 120, 121, 123, 127, 134, 141, 143, 151, 154, 155, 156, 160, 161, 168, 171, 173, 174, 175, 176, 187, 191, 196, 197, 198, 210, 211, 213, 230, 236, 250, 259},{15})
-
-	-- All non-evil non-neutral birds are coaligned with Eagles
-	elseif get_race_name() == "Eagle" then
-	monst_al_add(MSTATUS_FRIEND, {61, 141, 151, 279},{17})
-
-	-- Hatchling dragons are coaligned with Dragons
-	elseif get_race_name() == "Dragon" then
-	monst_al_add(MSTATUS_FRIEND, {163, 164, 165, 166, 167, 204, 218, 219, 911},{18})
-
-	-- Yeeks are neutral to Yeeks
-	elseif get_race_name() == "Yeek" then
-	monst_al_add(MSTATUS_NEUTRAL, {580, 583, 594, 653, 655, 659, 661},{19})
-
-	-- Oathbreakers are coaligned if player is wielding Anduril
-	-- It's dirty, but it works, and it doesn't bother checking demons and the races who can't wield weapons.
-	elseif get_object(INVEN_WIELD).name1 == 83 then
-	monst_al_add(MSTATUS_FRIEND, {731},{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 19, 20, 21, 22, 23})
-	end
-end,
-
-[HOOK_LEVEL_END_GEN] = function() 
-
-for i=0,m_max-1 do
-	local monst = monster(i)
-	local s = monst_al_get(monst.r_idx, player.prace)
-	if s then monst.status = s end
-end	
-
-end, 
-
-[HOOK_NEW_MONSTER] = function() 
-
-for i=0,m_max-1 do
-	local monst = monster(i)
-	local s = monst_al_get(monst.r_idx, player.prace)
-	if s then monst.status = s end
-end	
-
-end, 
-
-}
\ No newline at end of file
diff --git a/lib/mods/theme/scpt/player.lua b/lib/mods/theme/scpt/player.lua
deleted file mode 100644
index fd11ed9d..00000000
--- a/lib/mods/theme/scpt/player.lua
+++ /dev/null
@@ -1,196 +0,0 @@
-------------------------------------------------------------------------------
------------------------ Hook to create birth objects -------------------------
-------------------------------------------------------------------------------
-function __birth_hook_objects()
-
-	-- Grace delay for adding piety
-	GRACE_DELAY = 0
-
-	-- Provide a book of Geyser to Geomancers
-	if get_class_name() == "Geomancer" then
-		local obj = create_object(TV_BOOK, 255);
-		obj.pval = find_spell("Geyser")
-		obj.ident = bor(obj.ident, IDENT_MENTAL, IDENT_KNOWN)
-		inven_carry(obj, FALSE)
-		end_object(obj)
-	end
-
-	-- Provide a book of prayer to priests
-	if get_class_name() == "Priest(Eru)" then
-		local obj = create_object(TV_BOOK, 255);
-		obj.pval = find_spell("See the Music")
-		obj.ident = bor(obj.ident, IDENT_MENTAL, IDENT_KNOWN)
-		inven_carry(obj, FALSE)
-		end_object(obj)
-	end
-	if get_class_name() == "Priest(Manwe)" then
-		local obj = create_object(TV_BOOK, 255);
-		obj.pval = find_spell("Manwe's Blessing")
-		obj.ident = bor(obj.ident, IDENT_MENTAL, IDENT_KNOWN)
-		inven_carry(obj, FALSE)
-		end_object(obj)
-	end
-	if get_class_name() == "Druid" then
-		local obj = create_object(TV_BOOK, 255);
-		obj.pval = find_spell("Charm Animal")
-		obj.ident = bor(obj.ident, IDENT_MENTAL, IDENT_KNOWN)
-		inven_carry(obj, FALSE)
-		end_object(obj)
-	end
-	if get_class_name() == "Dark-Priest" then
-		local obj = create_object(TV_BOOK, 255);
-		obj.pval = find_spell("Curse")
-		obj.ident = bor(obj.ident, IDENT_MENTAL, IDENT_KNOWN)
-		inven_carry(obj, FALSE)
-		end_object(obj)
-	end
-	if get_class_name() == "Paladin" then
-		local obj = create_object(TV_BOOK, 255);
-		obj.pval = find_spell("Divine Aim")
-		obj.ident = bor(obj.ident, IDENT_MENTAL, IDENT_KNOWN)
-		inven_carry(obj, FALSE)
-		end_object(obj)
-	end
-	if get_class_name() == "Stonewright" then
-		local obj = create_object(TV_BOOK, 255);
-		obj.pval = find_spell("Firebrand")
-		obj.ident = bor(obj.ident, IDENT_MENTAL, IDENT_KNOWN)
-		inven_carry(obj, FALSE)
-		end_object(obj)
-	end
-	if get_class_name() == "Priest(Varda)" then
-		local obj = create_object(TV_BOOK, 255);
-		obj.pval = find_spell("Light of Valinor")
-		obj.ident = bor(obj.ident, IDENT_MENTAL, IDENT_KNOWN)
-		inven_carry(obj, FALSE)
-		end_object(obj)
-	end
-	if get_class_name() == "Priest(Ulmo)" then
-		local obj = create_object(TV_BOOK, 255);
-		obj.pval = find_spell("Song of Belegaer")
-		obj.ident = bor(obj.ident, IDENT_MENTAL, IDENT_KNOWN)
-		inven_carry(obj, FALSE)
-		end_object(obj)
-	end
-	if get_class_name() == "Priest(Mandos)" then
-		local obj = create_object(TV_BOOK, 255);
-		obj.pval = find_spell("Tears of Luthien")
-		obj.ident = bor(obj.ident, IDENT_MENTAL, IDENT_KNOWN)
-		inven_carry(obj, FALSE)
-		end_object(obj)
-	end
-
-	if get_class_name() == "Mimic" then
-		local obj = create_object(TV_CLOAK, 100);
-		obj.pval2 = resolve_mimic_name("Mouse")
-		obj.ident = bor(obj.ident, IDENT_MENTAL, IDENT_KNOWN)
-		inven_carry(obj, FALSE)
-		end_object(obj)
-	end
-
-	-- Start the undeads, as undeads with the corruptions
-	if get_subrace_name() == "Vampire" then
-		player.corruption(CORRUPT_VAMPIRE_TEETH, TRUE)
-		player.corruption(CORRUPT_VAMPIRE_STRENGTH, TRUE)
-		player.corruption(CORRUPT_VAMPIRE_VAMPIRE, TRUE)
-	end
-
-	-- Start the Red (Fire) dragons with a book of Light (Theme)
-	if get_subrace_name() == "Red" then
-		local obj = create_object(TV_BOOK, 255);
-		obj.pval = find_spell("Globe of Light")
-		obj.ident = bor(obj.ident, IDENT_MENTAL, IDENT_KNOWN)
-		inven_carry(obj, FALSE)
-		end_object(obj)
-	end
-
-	-- Start the Black (Water) dragons with a book of Geyser (Theme)
-	if get_subrace_name() == "Black" then
-		local obj = create_object(TV_BOOK, 255);
-		obj.pval = find_spell("Geyser")
-		obj.ident = bor(obj.ident, IDENT_MENTAL, IDENT_KNOWN)
-		inven_carry(obj, FALSE)
-		end_object(obj)
-	end
-
-	-- Start the Green (Air) dragons with a book of Noxious Cloud (Theme)
-	if get_subrace_name() == "Green" then
-		local obj = create_object(TV_BOOK, 255);
-		obj.pval = find_spell("Noxious Cloud")
-		obj.ident = bor(obj.ident, IDENT_MENTAL, IDENT_KNOWN)
-		inven_carry(obj, FALSE)
-		end_object(obj)
-	end
-
-	-- Start the Blue (Earth) dragons with a book of Stone Skin (Theme)
-	if get_subrace_name() == "Blue" then
-		local obj = create_object(TV_BOOK, 255);
-		obj.pval = find_spell("Stone Skin")
-		obj.ident = bor(obj.ident, IDENT_MENTAL, IDENT_KNOWN)
-		inven_carry(obj, FALSE)
-		end_object(obj)
-	end
-
-	-- Start the White dragons with a book of Sense Monsters (Theme)
-	if get_subrace_name() == "White" then
-		local obj = create_object(TV_BOOK, 255);
-		obj.pval = find_spell("Sense Monsters")
-		obj.ident = bor(obj.ident, IDENT_MENTAL, IDENT_KNOWN)
-		inven_carry(obj, FALSE)
-		end_object(obj)
-	end
-
-	-- Start the Ethereal dragons with a book of Recharge (Theme)
-	if get_subrace_name() == "Ethereal" then
-		local obj = create_object(TV_BOOK, 255);
-		obj.pval = find_spell("Recharge")
-		obj.ident = bor(obj.ident, IDENT_MENTAL, IDENT_KNOWN)
-		inven_carry(obj, FALSE)
-		end_object(obj)
-	end
-
-	-- Start the Aewroeg with a book of Charm (Theme)
-	if get_subrace_name() == "(Aewrog)" then
-		local obj = create_object(TV_BOOK, 255);
-		obj.pval = find_spell("Charm")
-		obj.ident = bor(obj.ident, IDENT_MENTAL, IDENT_KNOWN)
-		inven_carry(obj, FALSE)
-		end_object(obj)
-	end
-
-	-- Start the Narroeg with a book of blink (Theme)
-	if get_subrace_name() == "(Narrog)" then
-		local obj = create_object(TV_BOOK, 255);
-		obj.pval = find_spell("Phase Door")
-		obj.ident = bor(obj.ident, IDENT_MENTAL, IDENT_KNOWN)
-		inven_carry(obj, FALSE)
-		end_object(obj)
-	end
-
-	-- Start the Peace-mages with a book of blink (Theme)
-	if get_class_name() == "Peace-mage" then
-		local obj = create_object(TV_BOOK, 255);
-		obj.pval = find_spell("Phase Door")
-		obj.ident = bor(obj.ident, IDENT_MENTAL, IDENT_KNOWN)
-		inven_carry(obj, FALSE)
-		end_object(obj)
-	end
-
-	-- Start the Wainriders with a book of Curse (Theme)
-	if get_class_name() == "Wainrider" then
-		local obj = create_object(TV_BOOK, 255);
-		obj.pval = find_spell("Curse")
-		obj.ident = bor(obj.ident, IDENT_MENTAL, IDENT_KNOWN)
-		inven_carry(obj, FALSE)
-		end_object(obj)
-	end
-
-	-- Provide everyone with a scroll of WoR (Theme)
-	local obj = create_object(TV_SCROLL, SV_SCROLL_WORD_OF_RECALL);
-		inven_carry(obj, FALSE)
-		end_object(obj)
-		identify_pack_fully()
-end
-
--- Register in the hook list
-add_hook_script(HOOK_BIRTH_OBJECTS, "__birth_hook_objects", "__birth_hook_objects")
diff --git a/lib/mods/theme/scpt/powers.lua b/lib/mods/theme/scpt/powers.lua
deleted file mode 100644
index ff4c62c5..00000000
--- a/lib/mods/theme/scpt/powers.lua
+++ /dev/null
@@ -1,61 +0,0 @@
--- Various 'U' powers
-
--- Invisibility power, for the mouse mimic shape
-POWER_INVISIBILITY = add_power
-{
-	["name"] =      "invisibility",
-	["desc"] =      "You are able melt into the shadows to become invisible.",
-	["desc_get"] =  "You suddenly become able to melt into the shadows.",
-	["desc_lose"] = "You lose your shadow-melting ability.",
-	["level"] =     30,
-	["cost"] =      10,
-	["stat"] =      A_DEX,
-	["fail"] =      20,
-	["power"] =     function()
-			set_invis(20 + randint(30), 30)
-	end,
-}
-
--- Web power, for the spider mimic shape
-POWER_WEB = add_power
-{
-	["name"] =      "web",
-	["desc"] =      "You are able throw a thick and very resistant spider web.",
-	["desc_get"] =  "You suddenly become able to weave webs.",
-	["desc_lose"] = "You lose your web-weaving capability.",
-	["level"] =     25,
-	["cost"] =      30,
-	["stat"] =      A_DEX,
-	["fail"] =      20,
-	["power"] =     function()
-			-- Warning, beware of f_info changes .. I hate to do that ..
-			grow_things(16, 1 + (player.lev / 10))
-	end,
-}
-
--- Activating/stopping space-continuum
--- When stopped it will induce constant mana loss
-player.corrupt_anti_teleport_stopped = FALSE
-add_loadsave("player.corrupt_anti_teleport_stopped", FALSE)
-POWER_COR_SPACE_TIME = add_power
-{
-	["name"] =      "control space/time continuum",
-	["desc"] =      "You are able to control the space/time continuum.",
-	["desc_get"] =  "You become able to control the space/time continuum.",
-	["desc_lose"] = "You are no more able to control the space/time continuum.",
-	["level"] =     1,
-	["cost"] =      10,
-	["stat"] =      A_WIS,
-	["fail"] =      10,
-	["power"] =     function()
-		if player.corrupt_anti_teleport_stopped == TRUE then
-			player.corrupt_anti_teleport_stopped = FALSE
-			msg_print("You stop controlling your corruption.")
-			player.update = bor(player.update, PU_BONUS)
-		else
-			player.corrupt_anti_teleport_stopped = TRUE
-			msg_print("You start controlling your corruption, teleportation works once more.")
-			player.update = bor(player.update, PU_BONUS)
-		end
-	end,
-}
diff --git a/lib/mods/theme/scpt/s_air.lua b/lib/mods/theme/scpt/s_air.lua
deleted file mode 100644
index afd1f584..00000000
--- a/lib/mods/theme/scpt/s_air.lua
+++ /dev/null
@@ -1,193 +0,0 @@
--- handle the air school
-
-NOXIOUSCLOUD = add_spell
-{
-	["name"] = 	"Noxious Cloud",
-	["school"] = 	{SCHOOL_AIR},
-	["level"] = 	3,
-	["mana"] = 	3,
-	["mana_max"] = 	30,
-	["fail"] = 	20,
-	["stick"] =
-	{
-			["charge"] =    { 5, 7 },
-			[TV_WAND] =
-			{
-				["rarity"] = 		15,
-				["base_level"] =	{ 1, 15 },
-				["max_level"] =		{ 25, 50 },
-			},
-	},
-	["spell"] = 	function()
-			local ret, dir, type
-
-			ret, dir = get_aim_dir()
-			if ret == FALSE then return end
-			if get_level(NOXIOUSCLOUD, 50) >= 30 then type = GF_UNBREATH
-			else type = GF_POIS end
-			fire_cloud(type, dir, 7 + get_level(NOXIOUSCLOUD, 150), 3, 5 + get_level(NOXIOUSCLOUD, 40))
-			return TRUE
-	end,
-	["info"] = 	function()
-			return "dam "..(7 + get_level(NOXIOUSCLOUD, 150)).." rad 3 dur "..(5 + get_level(NOXIOUSCLOUD, 40))
-	end,
-	["desc"] =	{
-			"Creates a cloud of poison",
-			"The cloud will persist for some turns, damaging all monsters passing by",
-			"At spell level 30 it turns into a thick gas attacking all living beings"
-	}
-}
-
-AIRWINGS = add_spell
-{
-	["name"] = 	"Wings of Winds",
-	["school"] = 	{SCHOOL_AIR, SCHOOL_CONVEYANCE},
-	["level"] = 	22,
-	["mana"] = 	30,
-	["mana_max"] = 	40,
-	["fail"] = 	60,
-	["stick"] =
-	{
-			["charge"] =    { 7, 5 },
-			[TV_STAFF] =
-			{
-				["rarity"] = 		27,
-				["base_level"] =	{ 1, 10 },
-				["max_level"] =		{ 20, 50 },
-			},
-	},
-	["inertia"] = 	{ 1, 10 },
-	["spell"] = 	function()
-			if get_level(AIRWINGS, 50) >= 16 then
-				if player.tim_fly == 0 then return set_tim_fly(randint(10) + 5 + get_level(AIRWINGS, 25)) end
-			else
-				if player.tim_ffall == 0 then return set_tim_ffall(randint(10) + 5 + get_level(AIRWINGS, 25)) end
-			end
-			return FALSE
-	end,
-	["info"] = 	function()
-			return "dur "..(5 + get_level(AIRWINGS, 25)).."+d10"
-	end,
-	["desc"] =	{
-			"Grants the power of levitation",
-			"At level 16 it grants the power of controlled flight"
-	}
-}
-
-INVISIBILITY = add_spell
-{
-	["name"] = 	"Invisibility",
-	["school"] = 	{SCHOOL_AIR},
-	["level"] = 	16,
-	["mana"] = 	10,
-	["mana_max"] = 	20,
-	["fail"] = 	50,
-	["inertia"] = 	{ 1, 30 },
-	["spell"] = 	function()
-			if player.tim_invisible == 0 then return set_invis(randint(20) + 15 + get_level(INVISIBILITY, 50), 20 + get_level(INVISIBILITY, 50)) end
-	end,
-	["info"] = 	function()
-			return "dur "..(15 + get_level(INVISIBILITY, 50)).."+d20 power "..(20 + get_level(INVISIBILITY, 50))
-	end,
-	["desc"] =	{
-			"Grants invisibility"
-	}
-}
-
-POISONBLOOD = add_spell
-{
-	["name"] = 	"Poison Blood",
-	["school"] = 	{SCHOOL_AIR},
-	["level"] = 	12,
-	["mana"] = 	10,
-	["mana_max"] = 	20,
-	["fail"] = 	30,
-	["stick"] =
-	{
-			["charge"] =    { 10, 15 },
-			[TV_WAND] =
-			{
-				["rarity"] = 		45,
-				["base_level"] =	{ 1, 25 },
-				["max_level"] =		{ 35, 50 },
-			},
-	},
-	["inertia"] = 	{ 1, 35 },
-	["spell"] = 	function()
-			local obvious = nil
-		       	if player.oppose_pois == 0 then obvious = set_oppose_pois(randint(30) + 25 + get_level(POISONBLOOD, 25)) end
-		       	if (player.tim_poison == 0) and (get_level(POISONBLOOD, 50) >= 15) then obvious = is_obvious(set_poison(randint(30) + 25 + get_level(POISONBLOOD, 25)), obvious) end
-			return obvious
-       	end,
-	["info"] = 	function()
-			return "dur "..(25 + get_level(POISONBLOOD, 25)).."+d30"
-	end,
-	["desc"] =	{
-			"Grants resist poison",
-			"At level 15 it provides poison branding to wielded weapon"
-	}
-}
-
-THUNDERSTORM = add_spell
-{
-	["name"] = 	"Thunderstorm",
-	["school"] = 	{SCHOOL_AIR, SCHOOL_NATURE},
-	["level"] = 	25,
-	["mana"] = 	40,
-	["mana_max"] = 	60,
-	["fail"] = 	60,
-	["stick"] =
-	{
-			["charge"] =    { 5, 5 },
-			[TV_WAND] =
-			{
-				["rarity"] = 		85,
-				["base_level"] =	{ 1, 5 },
-				["max_level"] =		{ 25, 50 },
-			},
-	},
-	["inertia"] = 	{ 2, 15 },
-	["spell"] = 	function()
-			if player.tim_thunder == 0 then return set_tim_thunder(randint(10) + 10 + get_level(THUNDERSTORM, 25), 5 + get_level(THUNDERSTORM, 10), 10 + get_level(THUNDERSTORM, 25)) end
-			return FALSE
-	end,
-	["info"] = 	function()
-			return "dam "..(5 + get_level(THUNDERSTORM, 10)).."d"..(10 + get_level(THUNDERSTORM, 25)).." dur "..(10 + get_level(THUNDERSTORM, 25)).."+d10"
-	end,
-	["desc"] =	{
-			"Charges up the air around you with electricity",
-			"Each turn it will throw a thunder bolt at a random monster in sight",
-			"The thunder does 3 types of damage, one third of lightning",
-			"one third of sound and one third of light"
-	}
-}
-
-STERILIZE = add_spell
-{
-	["name"] = 	"Sterilize",
-	["school"] = 	{SCHOOL_AIR},
-	["level"] = 	20,
-	["mana"] = 	10,
-	["mana_max"] = 	100,
-	["fail"] = 	50,
-	["stick"] =
-	{
-			["charge"] =    { 7, 5 },
-			[TV_STAFF] =
-			{
-				["rarity"] = 		20,
-				["base_level"] =	{ 1, 10 },
-				["max_level"] =		{ 20, 50 },
-			},
-	},
-	["spell"] = 	function()
-			set_no_breeders((30) + 20 + get_level(STERILIZE, 70))
-			return TRUE
-	end,
-	["info"] = 	function()
-			return "dur "..(20 + get_level(STERILIZE, 70)).."+d30"
-	end,
-	["desc"] =	{
-			"Prevents explosive breeding for a while."
-	}
-}
diff --git a/lib/mods/theme/scpt/s_aule.lua b/lib/mods/theme/scpt/s_aule.lua
deleted file mode 100644
index d3ca4733..00000000
--- a/lib/mods/theme/scpt/s_aule.lua
+++ /dev/null
@@ -1,222 +0,0 @@
--- Spells for Aule school
-
-BOOK_AULE = 63 
- 
-AULE_FIREBRAND = add_spell 
-{ 
-	["name"] =	"Firebrand", 
-	["school"] =	{SCHOOL_AULE}, 
-	["level"] =	1, 
-	["mana"] =	10, 
-	["mana_max"] =	100, 
-	["fail"] =	20, 
-	["piety"] =	TRUE, 
-	["stat"] =	A_WIS, 
-	["random"] =	SKILL_SPIRITUALITY, 
-	["spell"] =	function() 
-		local type, rad
-		local level = get_level(AULE_FIREBRAND)
-		type = GF_FIRE
-		
-		if (get_level(AULE_FIREBRAND) > 30) then
-			type = GF_HOLY_FIRE
-		end
-		
-		rad = 0
-		if (level >= 15) then 
-			rad = 1 
-		end
-		return set_project(level + randint(20), 
-		type, 4 + level, rad, 
-		bor(PROJECT_STOP, PROJECT_KILL)) 
-	end, 
-	["info"] =	function() 
-		local level = get_level(AULE_FIREBRAND) 
-		return "dur "..(level).."+d20 dam "..(4 + level).."/blow" 
-	end, 
-	["desc"] =	{ 
-		"Imbues your melee weapon with fire to deal more damage", 
-		"At level 15 it spreads over a 1 radius zone around your target", 
-		"At level 30 it deals holy fire damage" 
-	} 
-} 
- 
-AULE_ENCHANT_WEAPON = add_spell 
-{
-	["name"] =	"Enchant Weapon",
-	["school"] =	{SCHOOL_AULE},
-	["level"] =	10,
-	["mana"] =	100, 
-	["mana_max"] =	200, 
-	["fail"] =	20, 
-	["piety"] =	TRUE, 
-	["stat"] =	A_WIS, 
-	["random"] =	SKILL_SPIRITUALITY, 
-	["spell"] =	function() 
-		local level = get_level(AULE_ENCHANT_WEAPON) 
-		local num_h, num_d, num_p 
-		
-		local ret, item, obj
-		
-		num_h = 1 + randint(level/12) 
-		num_d = 0 
-		num_p = 0 
-		if (level >= 5) then 
-			num_d = 1 + randint(level/12) 
-		end 
-		if (level >= 45) then 
-			num_p = 1
-		end 
-		--return enchant_spell(num_h, num_d, 0, num_p) 
-		
-		ret, item = get_item("Which object do you want to enchant?",
-					"You have no objects to enchant.",
-					bor(USE_INVEN),
-					function (obj)
-						if obj.name1 > 0 then return FALSE end
-						if (obj.tval == TV_MSTAFF) then
-							return TRUE
-						elseif (obj.tval == TV_BOW) then
-							return TRUE
-						elseif (obj.tval == TV_HAFTED) then
-							return TRUE
-						elseif (obj.tval == TV_POLEARM) then
-							return TRUE
-						elseif (obj.tval == TV_SWORD) then
-							return TRUE
-						elseif (obj.tval == TV_AXE) then
-							return TRUE
-						end
-						return FALSE
-					     end
-		)
-		if ret == FALSE then return FALSE end
-		
-		obj = get_object(item)
-		
-		obj.to_h = obj.to_h + num_h
-		obj.to_d = obj.to_d + num_h
-		obj.pval = obj.pval + num_p
-		
-		return TRUE
-
-	end, 
-	["info"] =	function() 
-		return "tries "..(1 + get_level(AULE_ENCHANT_WEAPON)/12) 
-	end, 
-	["desc"] =	{
-		"Tries to enchant a weapon to-hit", 
-		"At level 5 it also enchants to-dam", 
-		"At level 45 it enhances the special powers of magical weapons", 
-		"The might of the enchantment increases with the level" 
-	} 
-} 
- 
-AULE_ENCHANT_ARMOUR = add_spell { 
-	["name"] =	"Enchant Armour", 
-	["school"] =	{SCHOOL_AULE}, 
-	["level"] =	15, 
-	["mana"] =	100, 
-	["mana_max"] =	200, 
-	["fail"] =	20, 
-	["piety"] =	TRUE, 
-	["stat"] =	A_WIS, 
-	["random"] =	SKILL_SPIRITUALITY, 
-	["spell"] =	function() 
-		local level = get_level(AULE_ENCHANT_ARMOUR) 
-		local num_h, num_d, num_a, num_p 
- 		local ret, item, obj
-
-		num_a = 1 + randint(level/10) 
-		num_h = 0 
-		num_d = 0 
-		num_p = 0 
-		if (level >= 20) then 
-			num_h = 1 
-			num_d = 1 
-		end 
-		if (level >= 40) then 
-			num_p = 1 
-		end 
-		--return enchant_spell(num_h, num_d, num_a, num_p)
-		
-		ret, item = get_item("Which object do you want to enchant?",
-					"You have no objects to enchant.",
-					bor(USE_INVEN),
-					function (obj)
-						if obj.name1 > 0 then return FALSE end
-						if (obj.tval == TV_BOOTS) then
-							return TRUE
-						elseif (obj.tval == TV_GLOVES) then
-							return TRUE
-						elseif (obj.tval == TV_HELM) then
-							return TRUE
-						elseif (obj.tval == TV_CROWN) then
-							return TRUE
-						elseif (obj.tval == TV_SHIELD) then
-							return TRUE
-						elseif (obj.tval == TV_CLOAK) then
-							return TRUE
-						elseif (obj.tval == TV_SOFT_ARMOR) then
-							return TRUE
-						elseif (obj.tval == TV_HARD_ARMOR) then
-							return TRUE
-						elseif (obj.tval == TV_DRAG_ARMOR) then
-							return TRUE
-						end
-						return FALSE
-					     end
-		)
-		if ret == FALSE then return FALSE end
-		
-		obj = get_object(item)
-		
-		obj.to_h = obj.to_h + num_h
-		obj.to_d = obj.to_d + num_h
-		obj.pval = obj.pval + num_p
-		obj.to_a = obj.to_a + num_h
-		
-		return TRUE
-		
-	end, 
-	["info"] =	function() 
-		return "tries "..(1 + get_level(AULE_ENCHANT_ARMOUR)/10) 
-	end, 
-	["desc"] =	{
-		"Tries to enchant a piece of armour", 
-		"At level 20 it also enchants to-hit and to-dam", 
-		"At level 40 it enhances the special powers of magical armour", 
-		"The might of the enchantment increases with the level" 
-	} 
-} 
- 
-AULE_CHILD = add_spell
-{ 
-	["name"] =	"Child of Aule", 
-	["school"] =	{SCHOOL_AULE}, 
-	["level"] =	20, 
-	["mana"] =	200, 
-	["mana_max"] =	500, 
-	["fail"] =	40, 
-	["piety"] =	TRUE, 
-	["stat"] =	A_WIS, 
-	["random"] =	SKILL_SPIRITUALITY, 
-	["spell"] =	function() 
-		local y, x, m_idx
-
-		y, x = find_position(player.py, player.px) 
-		m_idx = place_monster_one(y, x, test_monster_name("Dwarven warrior"), 0, FALSE, MSTATUS_FRIEND) 
- 
-		if m_idx ~= 0 then 
-			monster_set_level(m_idx, 20 + get_level(AULE_CHILD, 70, 0)) 
-			return TRUE 
-		end 
-	end, 
-	["info"] =	function() 
-		return "level "..(20 + get_level(AULE_CHILD, 70)) 
-	end, 
-	["desc"] =	{ 
-		"Summons a levelled Dwarven warrior to help you battle the forces", 
-		"of Morgoth" 
-	} 
-} 
\ No newline at end of file
diff --git a/lib/mods/theme/scpt/s_convey.lua b/lib/mods/theme/scpt/s_convey.lua
deleted file mode 100644
index 1105a850..00000000
--- a/lib/mods/theme/scpt/s_convey.lua
+++ /dev/null
@@ -1,226 +0,0 @@
--- handle the conveyance school
-
-BLINK = add_spell
-{
-	["name"] = 	"Phase Door",
-	["school"] = 	{SCHOOL_CONVEYANCE},
-	["level"] = 	1,
-	["mana"] = 	1,
-	["mana_max"] =  3,
-	["fail"] = 	10,
-	["inertia"] = 	{ 1, 5 },
-	["spell"] = 	function()
-			if get_level(BLINK, 50) >= 30 then
-				local oy, ox = player.py, player.px
-
-				teleport_player(10 + get_level(BLINK, 8))
-				create_between_gate(0, oy, ox)
-				return TRUE
-			else
-				teleport_player(10 + get_level(BLINK, 8))
-				return TRUE
-			end
-	end,
-	["info"] = 	function()
-	       		return "distance "..(10 + get_level(BLINK, 8))
-	end,
-	["desc"] =	{
-			"Teleports you on a small scale range",
-			"At level 30 it creates void jumpgates",
-	}
-}
-
-DISARM = add_spell
-{
-	["name"] = 	"Disarm",
-	["school"] = 	{SCHOOL_CONVEYANCE},
-	["level"] = 	3,
-	["mana"] = 	2,
-	["mana_max"] = 	4,
-	["fail"] = 	15,
-	["stick"] =
-	{
-			["charge"] =    { 10, 15 },
-			[TV_STAFF] =
-			{
-				["rarity"] = 		4,
-				["base_level"] =	{ 1, 10 },
-				["max_level"] =		{ 10, 50 },
-			},
-	},
-	["spell"] = 	function()
-			local obvious
-			obvious = destroy_doors_touch()
-			if get_level(DISARM, 50) >= 10 then obvious = is_obvious(destroy_traps_touch(), obvious) end
-			return obvious
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"Destroys doors and disarms traps",
-			"At level 10 it unlocks doors and disarms traps",
-	}
-}
-
-TELEPORT = add_spell
-{
-	["name"] = 	"Teleportation",
-	["school"] = 	{SCHOOL_CONVEYANCE},
-	["level"] = 	10,
-	["mana"] = 	8,
-	["mana_max"] = 	14,
-	["fail"] = 	30,
-	["stick"] =
-	{
-			["charge"] =    { 7, 7 },
-			[TV_STAFF] =
-			{
-				["rarity"] = 		50,
-				["base_level"] =	{ 1, 20 },
-				["max_level"] =		{ 20, 50 },
-			},
-	},
-	["inertia"] = 	{ 1, 10 },
-	["spell"] = 	function()
-			player.energy = player.energy - (25 - get_level(TELEPORT, 50))
-			teleport_player(100 + get_level(TELEPORT, 100))
-			return TRUE
-	end,
-	["info"] = 	function()
-			return "distance "..(100 + get_level(TELEPORT, 100))
-	end,
-	["desc"] =	{
-			"Teleports you around the level. The casting time decreases with level",
-	}
-}
-
-TELEAWAY = add_spell
-{
-	["name"] = 	"Teleport Away",
-	["school"] = 	{SCHOOL_CONVEYANCE},
-	["level"] = 	23,
-	["mana"] = 	15,
-	["mana_max"] = 	40,
-	["fail"] = 	60,
-	["stick"] =
-	{
-			["charge"] =    { 3, 5 },
-			[TV_WAND] =
-			{
-				["rarity"] = 		75,
-				["base_level"] =	{ 1, 20 },
-				["max_level"] =		{ 20, 50 },
-			},
-	},
-	["spell"] = 	function()
-	       		local ret, dir
-
-			if get_level(TELEAWAY, 50) >= 20 then
-				return project_los(GF_AWAY_ALL, 100)
-			elseif get_level(TELEAWAY, 50) >= 10 then
-				ret, dir = get_aim_dir()
-				if ret == FALSE then return end
-				return fire_ball(GF_AWAY_ALL, dir, 100, 3 + get_level(TELEAWAY, 4))
-			else
-				ret, dir = get_aim_dir()
-				if ret == FALSE then return end
-				return teleport_monster(dir)
-			end
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"Teleports a line of monsters away",
-			"At level 10 it turns into a ball",
-			"At level 20 it teleports all monsters in sight"
-	}
-}
-
-RECALL = add_spell
-{
-	["name"] = 	"Recall",
-	["school"] = 	{SCHOOL_CONVEYANCE},
-	["level"] = 	30,
-	["mana"] = 	25,
-	["mana_max"] = 	25,
-	["fail"] =      60,
-	["spell"] = 	function()
-			local ret, x, y, c_ptr
-			ret, x, y = tgt_pt()
-			if ret == FALSE then return end
-			c_ptr = cave(y, x)
-			if (y == player.py) and (x == player.px) then
-				local d = 21 - get_level(RECALL, 15)
-				if d < 0 then
-					d = 0
-				end
-				local f = 15 - get_level(RECALL, 10)
-				if f < 1 then
-					f = 1
-				end
-				recall_player(d, f)
-				return TRUE
-			elseif c_ptr.m_idx > 0 then
-				swap_position(y, x)
-				return TRUE
-			elseif c_ptr.o_idx > 0 then
-				set_target(y, x)
-				if get_level(RECALL, 50) >= 15 then
-					fetch(5, 10 + get_level(RECALL, 150), FALSE)
-				else
-					fetch(5, 10 + get_level(RECALL, 150), TRUE)
-				end
-				return TRUE
-			end
-	end,
-	["info"] = 	function()
-			local d = 21 - get_level(RECALL, 15)
-			if d < 0 then
-				d = 0
-			end
-			local f = 15 - get_level(RECALL, 10)
-			if f < 1 then
-				f = 1
-			end
-			return "dur "..f.."+d"..d.." weight "..(1 + get_level(RECALL, 15)).."lb"
-	end,
-	["desc"] =	{
-			"Cast on yourself it will recall you to the surface/dungeon.",
-			"Cast at a monster you will swap positions with the monster.",
-			"Cast at an object it will fetch the object to you."
-	}
-}
-
-PROBABILITY_TRAVEL = add_spell
-{
-	["name"] = 	"Probability Travel",
-	["school"] = 	{SCHOOL_CONVEYANCE},
-	["level"] = 	35,
-	["mana"] = 	30,
-	["mana_max"] = 	50,
-	["fail"] = 	90,
-	["stick"] =
-	{
-			["charge"] =    { 1, 2 },
-			[TV_STAFF] =
-			{
-				["rarity"] = 		97,
-				["base_level"] =	{ 1, 5 },
-				["max_level"] =		{ 8, 25 },
-			},
-	},
-	["inertia"] = 	{ 6, 40 },
-	["spell"] = 	function()
-			return set_prob_travel(randint(20) + get_level(PROBABILITY_TRAVEL, 60))
-	end,
-	["info"] = 	function()
-			return "dur "..get_level(PROBABILITY_TRAVEL, 60).."+d20"
-	end,
-	["desc"] =	{
-			"Renders you immaterial, when you hit a wall you travel through it and",
-			"instantly appear on the other side of it. You can also float up and down",
-			"at will"
-	}
-}
diff --git a/lib/mods/theme/scpt/s_demon.lua b/lib/mods/theme/scpt/s_demon.lua
deleted file mode 100644
index ada97310..00000000
--- a/lib/mods/theme/scpt/s_demon.lua
+++ /dev/null
@@ -1,337 +0,0 @@
--- handle the demonology school
-
--- Demonblade
-DEMON_BLADE = add_spell
-{
-	["name"] =      "Demon Blade",
-	["school"] =    {SCHOOL_DEMON},
-	["level"] =     1,
-	["mana"] =      4,
-	["mana_max"] =  44,
-	["fail"] =      10,
-	["random"] =    0,
-	["stick"] =
-	{
-			["charge"] =    { 3, 7 },
-			[TV_WAND] =
-			{
-				["rarity"] =	    75,
-				["base_level"] =	{ 1, 17 },
-				["max_level"] =		{ 20, 40 },
-			},
-	},
-	["spell"] =     function()
-			local type, rad
-
-			type = GF_FIRE
-			if get_level(DEMON_BLADE) >= 30 then type = GF_HELL_FIRE end
-
-			rad = 0
-			if get_level(DEMON_BLADE) >= 45 then rad = 1 end
-
-			return set_project(randint(20) + get_level(DEMON_BLADE, 80),
-				    type,
-				    4 + get_level(DEMON_BLADE, 40),
-				    rad,
-				    bor(PROJECT_STOP, PROJECT_KILL))
-	end,
-	["info"] =      function()
-			return "dur "..(get_level(DEMON_BLADE, 80)).."+d20 dam "..(4 + get_level(DEMON_BLADE, 40)).."/blow"
-	end,
-	["desc"] =      {
-			"Imbues your blade with fire to deal more damage",
-			"At level 30 it deals hellfire damage",
-			"At level 45 it spreads over a 1 radius zone around your target",
-	}
-}
-
-DEMON_MADNESS = add_spell
-{
-	["name"] =      "Demon Madness",
-	["school"] =    {SCHOOL_DEMON},
-	["level"] =     10,
-	["mana"] =      5,
-	["mana_max"] =  20,
-	["fail"] =      25,
-	["random"] =    0,
-	["spell"] =     function()
-			local ret, dir, type, y1, x1, y2, x2
-
-			ret, dir = get_aim_dir()
-			if ret == FALSE then return end
-
-			type = GF_CHAOS
-			if magik(33) == TRUE then type = GF_CONFUSION end
-			if magik(33) == TRUE then type = GF_CHARM end
-
-			-- Calc the coordinates of arrival
-			y1, x1 = get_target(dir)
-			y2 = player.py - (y1 - player.py)
-			x2 = player.px - (x1 - player.px)
-
-			local obvious = nil
-			obvious = project(0, 1 + get_level(DEMON_MADNESS, 4, 0),
-				y1, x1,
-				20 + get_level(DEMON_MADNESS, 200),
-				type, bor(PROJECT_STOP, PROJECT_GRID, PROJECT_ITEM, PROJECT_KILL))
-			obvious = is_obvious(project(0, 1 + get_level(DEMON_MADNESS, 4, 0),
-				y2, x2,
-				20 + get_level(DEMON_MADNESS, 200),
-				type, bor(PROJECT_STOP, PROJECT_GRID, PROJECT_ITEM, PROJECT_KILL)), obvious)
-			return obvious
-	end,
-	["info"] =      function()
-			return "dam "..(20 + get_level(DEMON_MADNESS, 200)).." rad "..(1 + get_level(DEMON_MADNESS, 4, 0))
-	end,
-	["desc"] =      {
-			"Fire 2 balls in opposite directions of randomly chaos, confusion or charm",
-	}
-}
-
-DEMON_FIELD = add_spell
-{
-	["name"] =      "Demon Field",
-	["school"] =    {SCHOOL_DEMON},
-	["level"] =     20,
-	["mana"] =      20,
-	["mana_max"] =  60,
-	["fail"] =      60,
-	["random"] =    0,
-	["spell"] =     function()
-			local ret, dir
-
-			ret, dir = get_aim_dir()
-			if ret == FALSE then return end
-			return fire_cloud(GF_NEXUS, dir, 20 + get_level(DEMON_FIELD, 70), 7, 30 + get_level(DEMON_FIELD, 100))
-	end,
-	["info"] =      function()
-			return "dam "..(20 + get_level(DEMON_FIELD, 70)).." dur "..(30 + get_level(DEMON_FIELD, 100))
-	end,
-	["desc"] =      {
-			"Fires a cloud of deadly nexus over a radius of 7",
-	}
-}
-
--- Demonshield
-
-DOOM_SHIELD = add_spell
-{
-	["name"] =      "Doom Shield",
-	["school"] =    {SCHOOL_DEMON},
-	["level"] =     1,
-	["mana"] =      2,
-	["mana_max"] =  30,
-	["fail"] =      10,
-	["random"] =    0,
-	["spell"] =     function()
-			return set_shield(randint(10) + 20 + get_level(DOOM_SHIELD, 100), -300 + get_level(DOOM_SHIELD, 100), SHIELD_COUNTER, 1 + get_level(DOOM_SHIELD, 14), 10 + get_level(DOOM_SHIELD, 15))
-	end,
-	["info"] =      function()
-			return "dur "..(20 + get_level(DOOM_SHIELD, 100)).."+d10 dam "..(1 + get_level(DOOM_SHIELD, 14)).."d"..(10 + get_level(DOOM_SHIELD, 15))
-	end,
-	["desc"] =      {
-			"Raises a mirror of pain around you, doing very high damage to your foes",
-			"that dare hit you, but greatly reduces your armour class",
-	}
-}
-
-UNHOLY_WORD = add_spell
-{
-	["name"] =      "Unholy Word",
-	["school"] =    {SCHOOL_DEMON},
-	["level"] =     25,
-	["mana"] =      15,
-	["mana_max"] =  45,
-	["fail"] =      55,
-	["random"] =    0,
-	["spell"] =     function()
-			local ret, x, y, c_ptr
-			ret, x, y = tgt_pt()
-			if ret == FALSE then return end
-			c_ptr = cave(y, x)
-
-			-- ok that is a monster
-			if c_ptr.m_idx > 0 then
-				local m_ptr = monster(c_ptr.m_idx)
-				if m_ptr.status ~= MSTATUS_PET then
-					msg_print("You can only target a pet.")
-					return
-				end
-
-				-- Oups he is angry now
-				if magik(30 - get_level(UNHOLY_WORD, 25, 0)) == TRUE then
-					local m_name = monster_desc(m_ptr, 0).." turns against you."
-					msg_print(strupper(strsub(m_name, 0, 1))..strsub(m_name, 2))
-				else
-					local m_name = monster_desc(m_ptr, 0)
-					msg_print("You consume "..m_name..".")
-
-					local heal = (m_ptr.hp * 100) / m_ptr.maxhp
-					heal = ((30 + get_level(UNHOLY_WORD, 50, 0)) * heal) / 100
-
-					hp_player(heal)
-
-					delete_monster_idx(c_ptr.m_idx)
-				end
-				return TRUE
-			end
-	end,
-	["info"] =      function()
-			return "heal mhp% of "..(30 + get_level(UNHOLY_WORD, 50, 0)).."%"
-	end,
-	["desc"] =      {
-			"Kills a pet to heal you",
-			"There is a chance that the pet won't die but will turn against you",
-			"it will decrease with higher level",
-	}
-}
-
-DEMON_CLOAK = add_spell
-{
-	["name"] =      "Demon Cloak",
-	["school"] =    {SCHOOL_DEMON},
-	["level"] =     20,
-	["mana"] =      10,
-	["mana_max"] =  40,
-	["fail"] =      70,
-	["random"] =    0,
-	["spell"] =     function()
-			return set_tim_reflect(randint(5) + 5 + get_level(DEMON_CLOAK, 15, 0))
-	end,
-	["info"] =      function()
-			return "dur "..(5 + get_level(DEMON_CLOAK, 15, 0)).."+d5"
-	end,
-	["desc"] =      {
-			"Raises a mirror that can reflect bolts and arrows for a time",
-	}
-}
-
-
--- Demonhorn
-DEMON_SUMMON = add_spell
-{
-	["name"] =      "Summon Demon",
-	["school"] =    {SCHOOL_DEMON},
-	["level"] =     5,
-	["mana"] =      10,
-	["mana_max"] =  50,
-	["fail"] =      30,
-	["random"] =    0,
-	["spell"] =     function()
-			local type = SUMMON_DEMON
-			local level = dun_level
-			local minlevel = 4
-			if level < minlevel then level=minlevel end
-			summon_specific_level = 5 + get_level(DEMON_SUMMON, 100)
-			if get_level(DEMON_SUMMON) >= 35 then type = SUMMON_HI_DEMON end
-			if summon_monster(player.py, player.px, level, TRUE, type) == TRUE then
-				return TRUE
-			else
-				msg_print("Something blocks your summoning!")
-				return FALSE
-			end
-	end,
-	["info"] =      function()
-			return "level "..(5 + get_level(DEMON_SUMMON, 100))
-	end,
-	["desc"] =      {
-			"Summons a leveled demon to your side",
-			"At level 35 it summons a high demon",
-	}
-}
-
-DISCHARGE_MINION = add_spell
-{
-	["name"] =      "Discharge Minion",
-	["school"] =    {SCHOOL_DEMON},
-	["level"] =     10,
-	["mana"] =      20,
-	["mana_max"] =  50,
-	["fail"] =      30,
-	["random"] =    0,
-	["spell"] =     function()
-			local ret, x, y, c_ptr
-			ret, x, y = tgt_pt()
-			if ret == FALSE then return end
-			c_ptr = cave(y, x)
-
-			-- ok that is a monster
-			if c_ptr.m_idx > 0 then
-				local m_ptr = monster(c_ptr.m_idx)
-				if m_ptr.status ~= MSTATUS_PET then
-					msg_print("You can only target a pet.")
-					return
-				end
-
-				local dam = m_ptr.hp
-				delete_monster_idx(c_ptr.m_idx)
-				dam = (dam * (20 + get_level(DISCHARGE_MINION, 60, 0))) / 100
-				if dam > 100 + get_level(DISCHARGE_MINION, 500, 0) then
-					dam = 100 + get_level(DISCHARGE_MINION, 500, 0)
-				end
-
-				-- We use project instead of fire_ball because we must tell it exactly where to land
-				return project(0, 2,
-					y, x,
-					dam,
-					GF_GRAVITY, bor(PROJECT_STOP, PROJECT_GRID, PROJECT_ITEM, PROJECT_KILL))
-			end
-	end,
-	["info"] =      function()
-			return "dam "..(20 + get_level(DISCHARGE_MINION, 60, 0)).."% max "..(100 + get_level(DISCHARGE_MINION, 500, 0))
-	end,
-	["desc"] =      {
-			"The targeted pet will explode in a burst of gravity",
-	}
-}
-
-CONTROL_DEMON = add_spell
-{
-	["name"] =      "Control Demon",
-	["school"] =    {SCHOOL_DEMON},
-	["level"] =     25,
-	["mana"] =      30,
-	["mana_max"] =  70,
-	["fail"] =      55,
-	["random"] =    0,
-	["spell"] =     function()
-			local ret, dir = get_aim_dir()
-			return fire_ball(GF_CONTROL_DEMON, dir, 50 + get_level(CONTROL_DEMON, 250), 0)
-	end,
-	["info"] =      function()
-			return "power "..(50 + get_level(CONTROL_DEMON, 250))
-	end,
-	["desc"] =      {
-			"Attempts to control a demon",
-	}
-}
-
--- ok we need to have different wield slots
-add_hooks
-{
-	[HOOK_WIELD_SLOT] =     function (obj, ideal)
-			if (obj.tval == TV_DAEMON_BOOK) then
-				local slot
-				if (obj.sval == SV_DEMONBLADE) then
-					if(ideal == TRUE) then
-						slot = INVEN_WIELD
-					else
-						slot = get_slot(INVEN_WIELD)
-					end
-				elseif (obj.sval == SV_DEMONSHIELD) then
-					if(ideal == TRUE) then
-						slot = INVEN_ARM
-					else
-						slot = get_slot(INVEN_ARM)
-					end
-				elseif (obj.sval == SV_DEMONHORN) then
-					if(ideal == TRUE) then
-						slot = INVEN_HEAD
-					else
-						slot = get_slot(INVEN_HEAD)
-					end
-				end
-				return TRUE, slot
-			end
-	end,
-}
diff --git a/lib/mods/theme/scpt/s_divin.lua b/lib/mods/theme/scpt/s_divin.lua
deleted file mode 100644
index 60b0275f..00000000
--- a/lib/mods/theme/scpt/s_divin.lua
+++ /dev/null
@@ -1,230 +0,0 @@
--- Handles thhe divination school
-
-
-STARIDENTIFY = add_spell
-{
-	["name"] = 	"Greater Identify",
-	["school"] = 	{SCHOOL_DIVINATION},
-	["level"] = 	35,
-	["mana"] = 	30,
-	["mana_max"] = 	30,
-	["fail"] = 	80,
-	["spell"] = 	function()
-			if get_check("Cast on yourself?") == TRUE then
-				self_knowledge()
-			else
-				identify_fully()
-			end
-			return TRUE
-	end,
-	["info"] = 	function()
-		       	return ""
-	end,
-	["desc"] =	{
-			"Asks for an object and fully identify it, providing the full list of powers",
-			"Cast at yourself it will reveal your powers"
-	}
-}
-
-IDENTIFY = add_spell
-{
-	["name"] = 	"Identify",
-	["school"] = 	{SCHOOL_DIVINATION},
-	["level"] = 	8,
-	["mana"] = 	10,
-	["mana_max"] = 	50,
-	["fail"] = 	40,
-	["stick"] =
-	{
-			["charge"] =    { 7, 10 },
-			[TV_STAFF] =
-			{
-				["rarity"] = 		45,
-				["base_level"] =	{ 1, 15 },
-				["max_level"] =		{ 15, 40 },
-			},
-	},
-	["spell"] = 	function()
-			if get_level(IDENTIFY, 50) >= 27 then
-				local obvious
-				obvious = identify_pack()
-				obvious = is_obvious(fire_ball(GF_IDENTIFY, 0, 1, get_level(IDENTIFY, 3)), obvious)
-				if obvious == TRUE then
-					player.notice = bor(player.notice, PN_COMBINE, PN_REORDER)
-				end
-				return obvious
-			elseif get_level(IDENTIFY, 50) >= 17 then
-				local obvious
-				obvious = identify_pack()
-				obvious = is_obvious(fire_ball(GF_IDENTIFY, 0, 1, 0), obvious)
-				if obvious == TRUE then
-					player.notice = bor(player.notice, PN_COMBINE, PN_REORDER)
-				end
-				return obvious
-			else
-				if ident_spell() == TRUE then return TRUE else return end
-			end
-	end,
-	["info"] = 	function()
-			if get_level(IDENTIFY, 50) >= 27 then
-				return "rad "..(get_level(IDENTIFY, 3))
-			else
-				return ""
-			end
-	end,
-	["desc"] =	{
-			"Asks for an object and identifies it",
-			"At level 17 it identifies all objects in the inventory",
-			"At level 27 it identifies all objects in the inventory and in a",
-			"radius on the floor, as well as probing monsters in that radius"
-	}
-}
-
-VISION = add_spell
-{
-	["name"] = 	"Vision",
-	["school"] = 	{SCHOOL_DIVINATION},
-	["level"] = 	15,
-	["mana"] = 	7,
-	["mana_max"] = 	55,
-	["fail"] = 	45,
-	["stick"] =
-	{
-			["charge"] =    { 4, 6 },
-			[TV_STAFF] =
-			{
-				["rarity"] = 		60,
-				["base_level"] =	{ 1, 5 },
-				["max_level"] =		{ 10, 30 },
-			},
-	},
-	["inertia"] = 	{ 2, 200 },
-	["spell"] = 	function()
-			if get_level(VISION, 50) >= 25 then
-				wiz_lite_extra()
-			else
-				map_area()
-			end
-			return TRUE
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"Detects the layout of the surrounding area",
-			"At level 25 it maps and lights the whole level",
-	}
-}
-
-SENSEHIDDEN = add_spell
-{
-	["name"] = 	"Sense Hidden",
-	["school"] = 	{SCHOOL_DIVINATION},
-	["level"] = 	5,
-	["mana"] = 	2,
-	["mana_max"] = 	10,
-	["fail"] = 	25,
-	["stick"] =
-	{
-			["charge"] =    { 1, 15 },
-			[TV_STAFF] =
-			{
-				["rarity"] = 		20,
-				["base_level"] =	{ 1, 15 },
-				["max_level"] =		{ 10, 50 },
-			},
-	},
-	["inertia"] = 	{ 1, 10 },
-	["spell"] = 	function()
-			local obvious = nil
-			obvious = detect_traps(15 + get_level(SENSEHIDDEN, 40, 0))
-			if get_level(SENSEHIDDEN, 50) >= 15 then
-				obvious = is_obvious(set_tim_invis(10 + randint(20) + get_level(SENSEHIDDEN, 40)), obvious)
-			end
-			return obvious
-	end,
-	["info"] = 	function()
-			if get_level(SENSEHIDDEN, 50) >= 15 then
-				return "rad "..(15 + get_level(SENSEHIDDEN, 40)).." dur "..(10 + get_level(SENSEHIDDEN, 40)).."+d20"
-			else
-				return "rad "..(15 + get_level(SENSEHIDDEN, 40))
-			end
-	end,
-	["desc"] =	{
-			"Detects the traps in a certain radius around you",
-			"At level 15 it allows you to sense invisible for a while"
-	}
-}
-
-REVEALWAYS = add_spell
-{
-	["name"] = 	"Reveal Ways",
-	["school"] = 	{SCHOOL_DIVINATION},
-	["level"] = 	9,
-	["mana"] = 	3,
-	["mana_max"] = 	15,
-	["fail"] = 	20,
-	["stick"] =
-	{
-			["charge"] =    { 6, 6 },
-			[TV_STAFF] =
-			{
-				["rarity"] = 		35,
-				["base_level"] =	{ 1, 15 },
-				["max_level"] =		{ 25, 50 },
-			},
-	},
-	["inertia"] = 	{ 1, 10 },
-	["spell"] = 	function()
-			local obvious
-			obvious = detect_doors(10 + get_level(REVEALWAYS, 40, 0))
-			obvious = is_obvious(detect_stairs(10 + get_level(REVEALWAYS, 40, 0)), obvious)
-			return obvious
-	end,
-	["info"] = 	function()
-			return "rad "..(10 + get_level(REVEALWAYS, 40))
-	end,
-	["desc"] =	{
-			"Detects the doors/stairs/ways in a certain radius around you",
-	}
-}
-
-SENSEMONSTERS = add_spell
-{
-	["name"] = 	"Sense Monsters",
-	["school"] = 	{SCHOOL_DIVINATION},
-	["level"] = 	1,
-	["mana"] =      1,
-	["mana_max"] =  20,
-	["fail"] = 	10,
-	["stick"] =
-	{
-			["charge"] =    { 5, 10 },
-			[TV_STAFF] =
-			{
-				["rarity"] = 		37,
-				["base_level"] =	{ 1, 10 },
-				["max_level"] =		{ 15, 40 },
-			},
-	},
-	["inertia"] = 	{ 1, 10 },
-	["spell"] = 	function()
-			local obvious
-			obvious = detect_monsters_normal(10 + get_level(SENSEMONSTERS, 40, 0))
-			if get_level(SENSEMONSTERS, 50) >= 30 then
-				obvious = is_obvious(set_tim_esp(10 + randint(10) + get_level(SENSEMONSTERS, 20)), obvious)
-			end
-			return obvious
-	end,
-	["info"] = 	function()
-			if get_level(SENSEMONSTERS, 50) >= 30 then
-				return "rad "..(10 + get_level(SENSEMONSTERS, 40)).." dur "..(10 + get_level(SENSEMONSTERS, 20)).."+d10"
-			else
-				return "rad "..(10 + get_level(SENSEMONSTERS, 40))
-			end
-	end,
-	["desc"] =	{
-			"Detects all monsters near you",
-			"At level 30 it allows you to sense monster minds for a while"
-	}
-}
diff --git a/lib/mods/theme/scpt/s_earth.lua b/lib/mods/theme/scpt/s_earth.lua
deleted file mode 100644
index 23aa001c..00000000
--- a/lib/mods/theme/scpt/s_earth.lua
+++ /dev/null
@@ -1,184 +0,0 @@
--- The earth school
-
-STONESKIN = add_spell
-{
-	["name"] = 	"Stone Skin",
-	["school"] = 	SCHOOL_EARTH,
-	["level"] = 	1,
-	["mana"] = 	1,
-	["mana_max"] = 	50,
-	["fail"] = 	10,
-	["inertia"] = 	{ 2, 50 },
-	["spell"] = 	function()
-			local type
-			if get_level(STONESKIN, 50) >= 25 then
-				type = SHIELD_COUNTER
-			else
-				type = 0
-			end
-			return set_shield(randint(10) + 10 + get_level(STONESKIN, 100), 10 + get_level(STONESKIN, 50), type, 2 + get_level(STONESKIN, 5), 3 + get_level(STONESKIN, 5))
-	end,
-	["info"] = 	function()
-			if get_level(STONESKIN, 50) >= 25 then
-				return "dam "..(2 + get_level(STONESKIN, 5)).."d"..(3 + get_level(STONESKIN, 5)).." dur "..(10 + get_level(STONESKIN, 100)).."+d10 AC "..(10 + get_level(STONESKIN, 50))
-			else
-				return "dur "..(10 + get_level(STONESKIN, 100)).."+d10 AC "..(10 + get_level(STONESKIN, 50))
-			end
-	end,
-	["desc"] =	{
-			"Creates a shield of earth around you to protect you",
-			"At level 25 it starts dealing damage to attackers"
-		}
-}
-
-DIG = add_spell
-{
-	["name"] = 	"Dig",
-	["school"] = 	SCHOOL_EARTH,
-	["level"] = 	12,
-	["mana"] = 	14,
-	["mana_max"] = 	14,
-	["fail"] = 	20,
-	["stick"] =
-	{
-			["charge"] =    { 15, 5 },
-			[TV_WAND] =
-			{
-				["rarity"] = 		25,
-				["base_level"] =	{ 1, 1 },
-				["max_level"] =		{ 1, 1 },
-			},
-	},
-	["spell"] = 	function()
-			local ret, dir
-			ret, dir = get_aim_dir()
-			if ret == FALSE then return end
-			return wall_to_mud(dir)
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"Digs a hole in a wall much faster than any shovels",
-		}
-}
-
-STONEPRISON = add_spell
-{
-	["name"] = 	"Stone Prison",
-	["school"] = 	SCHOOL_EARTH,
-	["level"] = 	25,
-	["mana"] = 	30,
-	["mana_max"] = 	50,
-	["fail"] = 	65,
-	["stick"] =
-	{
-			["charge"] =    { 5, 3 },
-			[TV_WAND] =
-			{
-				["rarity"] = 		57,
-				["base_level"] =	{ 1, 3 },
-				["max_level"] =		{ 5, 20 },
-			},
-	},
-	["spell"] = 	function()
-			local ret, x, y
-			if get_level(STONEPRISON, 50) >= 10 then
-				ret, x, y = tgt_pt()
-			else
-				y = player.py
-				x = player.px
-			end
-			wall_stone(y, x)
-			return TRUE
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"Creates a prison of walls around you",
-			"At level 10 it allows you to target a monster"
-		}
-}
-
-STRIKE = add_spell
-{
-	["name"] = 	"Strike",
-	["school"] = 	{SCHOOL_EARTH},
-	["level"] = 	30,
-	["mana"] = 	30,
-	["mana_max"] = 	50,
-	["fail"] = 	60,
-	["stick"] =
-	{
-			["charge"] =    { 2, 6 },
-			[TV_WAND] =
-			{
-				["rarity"] = 		635,
-				["base_level"] =	{ 1, 5 },
-				["max_level"] =		{ 10, 50 },
-			},
-	},
-	["spell"] = 	function()
-			local ret, dir, rad
-			ret, dir = get_aim_dir()
-			if ret == FALSE then return end
-			if get_level(STRIKE, 50) >= 12 then
-				return fire_ball(GF_FORCE, dir, 50 + get_level(STRIKE, 50), 1)
-			else
-				return fire_ball(GF_FORCE, dir, 50 + get_level(STRIKE, 50), 0)
-			end
-	end,
-	["info"] = 	function()
-			if get_level(STRIKE, 50) >= 12 then
-	       			return "dam "..(50 + get_level(STRIKE, 50)).." rad 1"
-			else
-				return "dam "..(50 + get_level(STRIKE, 50))
-			end
-	end,
-	["desc"] =	{
-			"Creates a micro-ball of force that will push monsters backwards",
-			"If the monster is caught near a wall, it'll be crushed against it",
-			"At level 12 it turns into a ball of radius 1"
-	}
-}
-
-SHAKE = add_spell
-{
-	["name"] = 	"Shake",
-	["school"] = 	{SCHOOL_EARTH},
-	["level"] = 	27,
-	["mana"] = 	25,
-	["mana_max"] = 	30,
-	["fail"] = 	60,
-	["stick"] =
-	{
-			["charge"] =    { 5, 10 },
-			[TV_STAFF] =
-			{
-				["rarity"] = 		75,
-				["base_level"] =	{ 1, 3 },
-				["max_level"] =		{ 9, 20 },
-			},
-	},
-	["inertia"] = 	{ 2, 50 },
-	["spell"] = 	function()
-			local ret, x, y
-			if get_level(SHAKE, 50) >= 10 then
-			       	ret, x, y = tgt_pt()
-				if ret == FALSE then return end
-			else
-				x = player.px
-				y = player.py
-			end
-			earthquake(y, x, 4 + get_level(SHAKE, 10));
-			return TRUE
-	end,
-	["info"] = 	function()
-			return "rad "..(4 + get_level(SHAKE, 10))
-	end,
-	["desc"] =	{
-			"Creates a localised earthquake",
-			"At level 10 it can be targeted at any location"
-	}
-}
diff --git a/lib/mods/theme/scpt/s_eru.lua b/lib/mods/theme/scpt/s_eru.lua
deleted file mode 100644
index c0cb0aaf..00000000
--- a/lib/mods/theme/scpt/s_eru.lua
+++ /dev/null
@@ -1,130 +0,0 @@
--- Handle Eru Iluvatar magic school
-
-ERU_SEE = add_spell
-{
-	["name"] = 	"See the Music",
-	["school"] = 	{SCHOOL_ERU},
-	["level"] = 	1,
-	["mana"] = 	1,
-	["mana_max"] = 	50,
-	["fail"] = 	20,
-	-- Uses piety to cast
-	["piety"] =     TRUE,
-	["stat"] =      A_WIS,
-	-- Unnafected by blindness
-	["blind"] =     FALSE,
-	["random"] = 	SKILL_SPIRITUALITY,
-	["spell"] = 	function()
-			local obvious
-			obvious = set_tim_invis(randint(20) + 10 + get_level(ERU_SEE, 100))
-			if get_level(ERU_SEE) >= 30 then
-				wiz_lite_extra()
-				obvious = TRUE
-			elseif get_level(ERU_SEE) >= 10 then
-				map_area()
-				obvious = TRUE
-			end
-			if get_level(ERU_SEE) >= 20 then
-				obvious = is_obvious(set_blind(0), obvious)
-			end
-			return obvious
-	end,
-	["info"] = 	function()
-			return "dur "..(10 + get_level(ERU_SEE, 100)).."+d20"
-	end,
-	["desc"] =	{
-			"Allows you to 'see' the Great Music from which the world",
-			"originates, allowing you to see unseen things",
-			"At level 10 it allows you to see your surroundings",
-			"At level 20 it allows you to cure blindness",
-			"At level 30 it allows you to fully see all the level"
-	}
-}
-
-ERU_LISTEN = add_spell
-{
-	["name"] = 	"Listen to the Music",
-	["school"] = 	{SCHOOL_ERU},
-	["level"] = 	7,
-	["mana"] = 	15,
-	["mana_max"] = 	200,
-	["fail"] = 	25,
-	-- Uses piety to cast
-	["piety"] =     TRUE,
-	["stat"] =      A_WIS,
-	["random"] = 	SKILL_SPIRITUALITY,
-	["spell"] = 	function()
-			if get_level(ERU_LISTEN) >= 30 then
-				ident_all()
-				identify_pack()
-				return TRUE
-			elseif get_level(ERU_LISTEN) >= 14 then
-				identify_pack()
-				return TRUE
-			else
-				return ident_spell()
-			end
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"Allows you to listen to the Great Music from which the world",
-			"originates, allowing you to understand the meaning of things",
-			"At level 14 it allows you to identify all your pack",
-			"At level 30 it allows you to identify all items on the level",
-	}
-}
-
-ERU_UNDERSTAND = add_spell
-{
-	["name"] = 	"Know the Music",
-	["school"] = 	{SCHOOL_ERU},
-	["level"] = 	30,
-	["mana"] = 	200,
-	["mana_max"] = 	600,
-	["fail"] = 	50,
-	-- Uses piety to cast
-	["piety"] =     TRUE,
-	["stat"] =      A_WIS,
-	["random"] = 	SKILL_SPIRITUALITY,
-	["spell"] = 	function()
-			if get_level(ERU_UNDERSTAND) >= 10 then
-				identify_pack_fully()
-				return TRUE
-			else
-				return identify_fully()
-			end
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"Allows you to understand the Great Music from which the world",
-			"originates, allowing you to know the full abilities of things",
-			"At level 10 it allows you to *identify* all your pack",
-	}
-}
-
-ERU_PROT = add_spell
-{
-	["name"] = 	"Lay of Protection",
-	["school"] = 	{SCHOOL_ERU},
-	["level"] = 	35,
-	["mana"] = 	400,
-	["mana_max"] = 	400,
-	["fail"] = 	80,
-	-- Uses piety to cast
-	["piety"] =     TRUE,
-	["stat"] =      A_WIS,
-	["random"] = 	SKILL_SPIRITUALITY,
-	["spell"] = 	function()
-			return fire_ball(GF_MAKE_GLYPH, 0, 1, 1 + get_level(ERU_PROT, 2, 0))
-	end,
-	["info"] = 	function()
-			return "rad "..(1 + get_level(ERU_PROT, 2, 0))
-	end,
-	["desc"] =	{
-			"Creates a circle of safety around you",
-	}
-}
diff --git a/lib/mods/theme/scpt/s_fire.lua b/lib/mods/theme/scpt/s_fire.lua
deleted file mode 100644
index dbbf7604..00000000
--- a/lib/mods/theme/scpt/s_fire.lua
+++ /dev/null
@@ -1,227 +0,0 @@
--- handle the fire school
-
-GLOBELIGHT = add_spell
-{
-	["name"] =      "Globe of Light",
-	["school"] =    {SCHOOL_FIRE},
-	["level"] =     1,
-	["mana"] =      2,
-	["mana_max"] =  15,
-	["fail"] =      10,
-	["stick"] =
-	{
-			["charge"] =    { 10, 5 },
-			[TV_STAFF] =
-			{
-				["rarity"] =	    7,
-				["base_level"] =	{ 1, 15 },
-				["max_level"] =		{ 10, 45 },
-			},
-	},
-	["inertia"] = 	{ 1, 40 },
-	["spell"] =     function()
-		local obvious
-		if get_level(GLOBELIGHT, 50) >= 3 then
-			obvious = lite_area(10, 4)
-		else
-			lite_room(player.py, player.px)
-			obvious = TRUE
-		end
-		if get_level(GLOBELIGHT, 50) >= 15 then
-			obvious = is_obvious(fire_ball(GF_LITE, 0, 10 + get_level(GLOBELIGHT, 100), 5 + get_level(GLOBELIGHT, 6)), obvious)
-			player.update = bor(player.update, PU_VIEW)
-		end
-		return obvious
-	end,
-	["info"] =      function()
-		if get_level(GLOBELIGHT, 50) >= 15 then
-			return "dam "..(10 + get_level(GLOBELIGHT, 100)).." rad "..(5 + get_level(GLOBELIGHT, 6))
-		else
-			return ""
-		end
-	end,
-	["desc"] =      {
-			"Creates a globe of pure light",
-			"At level 3 it starts damaging monsters",
-			"At level 15 it starts creating a more powerful kind of light",
-	}
-}
-
-FIREFLASH = add_spell
-{
-	["name"] =      "Fireflash",
-	["school"] =    {SCHOOL_FIRE},
-	["level"] =     10,
-	["mana"] =      5,
-	["mana_max"] =  70,
-	["fail"] =      35,
-	["stick"] =
-	{
-			["charge"] =    { 5, 5 },
-			[TV_WAND] =
-			{
-				["rarity"] =	    35,
-				["base_level"] =	{ 1, 15 },
-				["max_level"] =		{ 15, 35 },
-			},
-	},
-	["spell"] =     function()
-		local ret, dir, type
-		if (get_level(FIREFLASH, 50) >= 20) then
-			type = GF_HOLY_FIRE
-		else
-			type = GF_FIRE
-		end
-		ret, dir = get_aim_dir()
-		if ret == FALSE then return end
-		return fire_ball(type, dir, 20 + get_level(FIREFLASH, 500), 2 + get_level(FIREFLASH, 5))
-	end,
-	["info"] =      function()
-		return "dam "..(20 + get_level(FIREFLASH, 500)).." rad "..(2 + get_level(FIREFLASH, 5))
-	end,
-	["desc"] =      {
-			"Conjures a ball of fire to burn your foes to ashes",
-			"At level 20 it turns into a ball of holy fire"
-	}
-}
-
-FIERYAURA = add_spell
-{
-	["name"] =      "Fiery Shield",
-	["school"] =    {SCHOOL_FIRE},
-	["level"] =     20,
-	["mana"] =      20,
-	["mana_max"] =  60,
-	["fail"] =      50,
-	["stick"] =
-	{
-			["charge"] =    { 3, 5 },
-			[TV_STAFF] =
-			{
-				["rarity"] =	    50,
-				["base_level"] =	{ 1, 10 },
-				["max_level"] =		{ 5, 40 },
-			},
-	},
-	["inertia"] = 	{ 2, 15 },
-	["spell"] =     function()
-		local type
-		if (get_level(FIERYAURA, 50) >= 8) then
-			type = SHIELD_GREAT_FIRE
-		else
-			type = SHIELD_FIRE
-		end
-		return set_shield(randint(20) + 10 + get_level(FIERYAURA, 70), 10, type, 5 + get_level(FIERYAURA, 10), 5 + get_level(FIERYAURA, 7))
-	end,
-	["info"] =      function()
-		return "dam "..(5 + get_level(FIERYAURA, 15)).."d"..(5 + get_level(FIERYAURA, 7)).." dur "..(10 + get_level(FIERYAURA, 70)).."+d20"
-	end,
-	["desc"] =      {
-			"Creates a shield of fierce flames around you",
-			"At level 8 it turns into a greater kind of flame that can not be resisted"
-	}
-}
-
-FIREWALL = add_spell
-{
-	["name"] =      "Firewall",
-	["school"] =    {SCHOOL_FIRE},
-	["level"] =     15,
-	["mana"] =      25,
-	["mana_max"] =  100,
-	["fail"] =      40,
-	["stick"] =
-	{
-			["charge"] =    { 4, 5 },
-			[TV_WAND] =
-			{
-				["rarity"] =	    55,
-				["base_level"] =	{ 1, 10 },
-				["max_level"] =		{ 5, 40 },
-			},
-	},
-	["spell"] =     function()
-		local ret, dir, type
-		if (get_level(FIREWALL, 50) >= 6) then
-			type = GF_HELL_FIRE
-		else
-			type = GF_FIRE
-		end
-		ret, dir = get_aim_dir()
-		if ret == FALSE then return end
-		fire_wall(type, dir, 40 + get_level(FIREWALL, 150), 10 + get_level(FIREWALL, 14))
-		return TRUE
-	end,
-	["info"] =      function()
-		return "dam "..(40 + get_level(FIREWALL, 150)).." dur "..(10 + get_level(FIREWALL, 14))
-	end,
-	["desc"] =      {
-			"Creates a fiery wall to incinerate monsters stupid enough to attack you",
-			"At level 6 it turns into a wall of hell fire"
-	}
-}
-
-FIREGOLEM = add_spell
-{
-	["name"] =      "Fire Golem",
-	["school"] =    {SCHOOL_FIRE, SCHOOL_MIND},
-	["level"] =     7,
-	["mana"] =      16,
-	["mana_max"] =  70,
-	["fail"] =      40,
-	["spell"] =     function()
-			local m_idx, y, x, ret, item
-
-			-- Can we reconnect ?
-			if do_control_reconnect() == TRUE then
-				msg_print("Control re-established.")
-				return
-			end
-
-			ret, item = get_item("Which light source do you want to use to create the golem?",
-					     "You have no light source for the golem",
-					     bor(USE_INVEN, USE_EQUIP),
-					     function (obj)
-						if (obj.tval == TV_LITE) and ((obj.sval == SV_LITE_TORCH) or (obj.sval == SV_LITE_LANTERN)) then
-							return TRUE
-							end
-							return FALSE
-					     end
-			)
-			if ret == FALSE then return TRUE end
-			inven_item_increase(item, -1)
-			inven_item_describe(item)
-			inven_item_optimize(item)
-
-			-- Summon it
-			m_allow_special[1043 + 1] = TRUE
-			y, x = find_position(player.py, player.px)
-			m_idx = place_monster_one(y, x, 1043, 0, FALSE, MSTATUS_FRIEND)
-			m_allow_special[1043 + 1] = FALSE
-
-			-- level it
-			if m_idx ~= 0 then
-				monster_set_level(m_idx, 7 + get_level(FIREGOLEM, 70))
-				player.control = m_idx
-				monster(m_idx).mflag = bor(monster(m_idx).mflag, MFLAG_CONTROL)
-			end
-			return TRUE
-	end,
-	["info"] =      function()
-			return "golem level "..(7 + get_level(FIREGOLEM, 70))
-	end,
-	["desc"] =      {
-			"Creates a fiery golem and controls it",
-			"During the control the available keylist is:",
-			"Movement keys: movement of the golem(depending on its speed",
-			"               it can move more than one square)",
-			", : pickup all items on the floor",
-			"d : drop all carried items",
-			"i : list all carried items",
-			"m : end the possession/use golem powers",
-			"Most of the other keys are disabled, you cannot interact with your",
-			"real body while controlling the golem",
-			"But to cast the spell you will need a lantern or a wooden torch to",
-			"Create the golem from"
-	}
-}
diff --git a/lib/mods/theme/scpt/s_geom.lua b/lib/mods/theme/scpt/s_geom.lua
deleted file mode 100644
index b9730318..00000000
--- a/lib/mods/theme/scpt/s_geom.lua
+++ /dev/null
@@ -1,656 +0,0 @@
--- Geomancy school
-
-function geomancy_random_wall(y, x)
-	local c_ptr = cave(y, x)
-
-	-- Do not destroy permanent things
-	if cave_is(c_ptr, FF1_PERMANENT) ~= FALSE then return end
-
-	local feat = nil
-	local table =
-	{
-		[1] = { SKILL_FIRE, FEAT_SANDWALL, 1},
-
-		[2] = { SKILL_WATER, FEAT_TREES, 1},
-		[3] = { SKILL_WATER, FEAT_ICE_WALL, 12},
-
-		[4] = { SKILL_EARTH, FEAT_WALL_EXTRA, 1},
-	}
-
-	while feat == nil do
-		local t = table[randint(getn(table))]
-
-		-- Do we meet the requirements ?
-		-- And then select the features based on skill proportions
-		if get_skill(t[1]) >= t[3] and magik(get_skill_scale(t[1], 100)) == TRUE then
-			feat = t[2]
-		end
-	end
-
-	cave_set_feat(y, x, feat)
-end
-
-
-GF_ELEMENTAL_WALL = add_spell_type
-{
-	["color"]       = { TERM_GREEN, 0 },
-	["angry"]       = function() return TRUE, FALSE end,
-	["grid"]     	= function(who, dam, rad, y, x)
-			if player.py ~= y or player.px ~= x then
-				geomancy_random_wall(y, x)
-			end
-	end,
-}
-
-function geomancy_random_floor(y, x, kill_wall)
-	local c_ptr = cave(y, x)
-
-	-- Do not destroy permanent things
-	if cave_is(c_ptr, FF1_PERMANENT) ~= FALSE then return end
-	if not kill_wall then
-		if cave_is(c_ptr, FF1_FLOOR) ~= TRUE then return end
-	end
-
-	local feat = nil
-	local table =
-	{
-		[1] = { SKILL_FIRE, FEAT_SAND, 1},
-		[2] = { SKILL_FIRE, FEAT_SHAL_LAVA, 8},
-		[3] = { SKILL_FIRE, FEAT_DEEP_LAVA, 18},
-
-		[4] = { SKILL_WATER, FEAT_SHAL_WATER, 1},
-		[5] = { SKILL_WATER, FEAT_DEEP_WATER, 8},
-		[6] = { SKILL_WATER, FEAT_ICE, 18},
-
-		[7] = { SKILL_EARTH, FEAT_GRASS, 1},
-		[8] = { SKILL_EARTH, FEAT_FLOWER, 8},
-		[9] = { SKILL_EARTH, FEAT_DARK_PIT, 18},
-	}
-
-	while feat == nil do
-		local t = table[randint(getn(table))]
-
-		-- Do we meet the requirements ?
-		-- And then select the features based on skill proportions
-		if get_skill(t[1]) >= t[3] and magik(get_skill_scale(t[1], 100)) == TRUE then
-			feat = t[2]
-		end
-	end
-
-	cave_set_feat(y, x, feat)
-end
-
-
-GF_ELEMENTAL_GROWTH = add_spell_type
-{
-	["color"]       = { TERM_GREEN, 0 },
-	["angry"]       = function() return TRUE, FALSE end,
-	["grid"]     	= function(who, dam, rad, y, x)
-			geomancy_random_floor(y, x)
-	end,
-}
-
-CALL_THE_ELEMENTS = add_spell
-{
-	["name"] = 	"Call the Elements",
-	["school"] = 	{SCHOOL_GEOMANCY},
-	["level"] = 	1,
-	["mana"] = 	2,
-	["mana_max"] = 	20,
-	["fail"] = 	10,
-	-- Unnafected by blindness
-	["blind"] =     FALSE,
-	["random"] =    0,
-	["spell"] = 	function()
-			local ret, dir = 0, 0
-
-			if get_level(CALL_THE_ELEMENTS) >= 17 then
-				ret, dir = get_aim_dir()
-				if ret == FALSE then return end
-			end
-
-			fire_ball(GF_ELEMENTAL_GROWTH, dir, 1, 1 + get_level(CALL_THE_ELEMENTS, 5, 0))
-			return TRUE
-	end,
-	["info"] = 	function()
-			return "rad "..(1 + get_level(CALL_THE_ELEMENTS, 5, 0))
-	end,
-	["desc"] =	{
-			"Randomly creates various elements around you",
-			"Each type of element chance is controlled by your level",
-			"in the corresponding skill",
-			"At level 17 it can be targeted",
-	}
-}
-
--- Seperate function because an other spell needs it
-function channel_the_elements(y, x, level, silent)
-	local t =
-	{
-		-- Earth stuff
-		[FEAT_GRASS] = function()
-			hp_player(player.mhp * (5 + get_skill_scale(SKILL_EARTH, 20)) / 100)
-		end,
-		[FEAT_FLOWER] = function()
-			hp_player(player.mhp * (5 + get_skill_scale(SKILL_EARTH, 30)) / 100)
-		end,
-		[FEAT_DARK_PIT] = function()
-			local ret, dir = get_aim_dir()
-			if ret == FALSE then return end
-
-			local type = GF_DARK
-			if get_skill(SKILL_EARTH) >= 18 then type = GF_NETHER end
-			fire_bolt(type, dir, damroll(10, get_skill(SKILL_EARTH)))
-		end,
-
-		-- Water stuff
-		[FEAT_SHAL_WATER] = function()
-			local ret, dir = get_aim_dir()
-			if ret == FALSE then return end
-
-			local type = GF_WATER
-			if get_skill(SKILL_WATER) >= 18 then type = GF_WAVE end
-
-			if get_skill(SKILL_WATER) >= 8 then
-				fire_beam(type, dir, damroll(3, get_skill(SKILL_WATER)))
-			else
-				fire_bolt(type, dir, damroll(3, get_skill(SKILL_WATER)))
-			end
-		end,
-		[FEAT_DEEP_WATER] = function()
-			local ret, dir = get_aim_dir()
-			if ret == FALSE then return end
-
-			local type = GF_WATER
-			if get_skill(SKILL_WATER) >= 18 then type = GF_WAVE end
-
-			if get_skill(SKILL_WATER) >= 8 then
-				fire_beam(type, dir, damroll(5, get_skill(SKILL_WATER)))
-			else
-				fire_bolt(type, dir, damroll(5, get_skill(SKILL_WATER)))
-			end
-		end,
-		[FEAT_ICE] = function()
-			local ret, dir = get_aim_dir()
-			if ret == FALSE then return end
-
-			if get_skill(SKILL_WATER) >= 12 then
-				fire_ball(GF_ICE, dir, get_skill_scale(SKILL_WATER, 340), 3)
-			else
-				fire_bolt(GF_ICE, dir, damroll(3, get_skill(SKILL_WATER)))
-			end
-		end,
-
-		-- Fire stuff
-		[FEAT_SAND] = function()
-			local type
-			if (get_level(FIERYAURA, 50) >= 8) then
-				type = SHIELD_GREAT_FIRE
-			else
-				type = SHIELD_FIRE
-			end
-			local dur = randint(20) + %level + get_skill(SKILL_AIR)
-			set_shield(dur, 0, type, 5 + get_skill_scale(SKILL_FIRE, 20), 5 + get_skill_scale(SKILL_FIRE, 14))
-			set_blind(dur)
-		end,
-		[FEAT_SHAL_LAVA] = function()
-			local ret, dir = get_aim_dir()
-			if ret == FALSE then return end
-
-			if get_skill(SKILL_FIRE) >= 15 then
-				fire_bolt(GF_HELL_FIRE, dir, damroll(get_skill_scale(SKILL_FIRE, 30), 15))
-			else
-				fire_bolt(GF_FIRE, dir, damroll(get_skill_scale(SKILL_FIRE, 30), 15))
-			end
-		end,
-		[FEAT_DEEP_LAVA] = function()
-			local ret, dir = get_aim_dir()
-			if ret == FALSE then return end
-
-			if get_skill(SKILL_FIRE) >= 15 then
-				fire_ball(GF_HELL_FIRE, dir, damroll(get_skill_scale(SKILL_FIRE, 30), 15), 3)
-			else
-				fire_ball(GF_FIRE, dir, damroll(get_skill_scale(SKILL_FIRE, 30), 15), 3)
-			end
-		end,
-	}
-
-	if t[cave(y, x).feat] then
-		t[cave(y, x).feat]()
-
-		if magik(100 - level) == TRUE then
-			if cave(y, x).feat == FEAT_FLOWER then
-				cave_set_feat(y, x, FEAT_GRASS)
-			else
-				cave_set_feat(y, x, FEAT_FLOOR)
-			end
-			msg_print("The area is drained.")
-		end
-	elseif not silent then
-		msg_print("You cannot channel this area.")
-	end
-end
-
-CHANNEL_ELEMENTS = add_spell
-{
-	["name"] = 	"Channel Elements",
-	["school"] = 	{SCHOOL_GEOMANCY},
-	["level"] = 	3,
-	["mana"] = 	3,
-	["mana_max"] = 	30,
-	["fail"] = 	20,
-	-- Unnafected by blindness
-	["blind"] =     FALSE,
-	["random"] =    0,
-	["spell"] = 	function()
-			channel_the_elements(player.py, player.px, get_level(CHANNEL_ELEMENTS), nil)
-			return TRUE
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"Draws on the caster's immediate environs to form an attack or other effect.",
-			"Grass/Flower heals.",
-			"Water creates water bolt attacks.",
-			"Ice creates ice bolt attacks.",
-			"Sand creates a wall of thick, blinding, burning sand around you.",
-			"Lava creates fire bolt attacks.",
-			"Deep lava creates fire ball attacks.",
-			"Chasm creates darkness bolt attacks.",
-			"At Earth level 18, darkness becomes nether.",
-			"At Water level 8, water attacks become beams with a striking effect.",
-			"At Water level 12, ice attacks become balls of ice shards.",
-			"At Water level 18, water attacks push monsters back.",
-			"At Fire level 15, fire become hellfire.",
-	}
-}
-
-ELEMENTAL_WAVE = add_spell
-{
-	["name"] = 	"Elemental Wave",
-	["school"] = 	{SCHOOL_GEOMANCY},
-	["level"] = 	15,
-	["mana"] = 	15,
-	["mana_max"] = 	50,
-	["fail"] = 	20,
-	-- Unnafected by blindness
-	["blind"] =     FALSE,
-	["random"] =    0,
-	["spell"] = 	function()
-			local ret, dir = get_rep_dir()
-			if ret == FALSE then return end
-
-			local y, x = explode_dir(dir)
-			y = y + player.py
-			x = x + player.px
-
-			local t =
-			{
-				-- Earth stuff
-				[FEAT_GRASS] 		= { GF_POIS, GF_POIS, 10 + get_skill_scale(SKILL_EARTH, 200) },
-				[FEAT_FLOWER] 		= { GF_POIS, GF_POIS, 10 + get_skill_scale(SKILL_EARTH, 300) },
-				-- cannot turn chasm into a wave
-
-				-- Water stuff
-				[FEAT_SHAL_WATER] 	= { GF_WATER, GF_WATER, 10 + get_skill_scale(SKILL_WATER, 200) },
-				[FEAT_DEEP_WATER] 	= { GF_WATER, GF_WATER, 10 + get_skill_scale(SKILL_WATER, 300) },
-				[FEAT_ICE] 		= { GF_ICE, GF_ICE, 10 + get_skill_scale(SKILL_WATER, 200) },
-
-				-- Fire stuff
-				[FEAT_SAND] 		= { GF_LITE, GF_LITE, 10 + get_skill_scale(SKILL_FIRE, 400) },
-				[FEAT_SHAL_LAVA] 	= { GF_FIRE, GF_HOLY_FIRE, 10 + get_skill_scale(SKILL_FIRE, 200) },
-				[FEAT_DEEP_LAVA] 	= { GF_FIRE, GF_HOLY_FIRE, 10 + get_skill_scale(SKILL_FIRE, 300) },
-			}
-
-
-			local effect = t[cave(y, x).feat]
-			if not effect then
-				msg_print("You cannot channel this area.")
-			else
-				local typ = effect[1]
-				if get_level(ELEMENTAL_WAVE) >= 20 then typ = effect[2] end
-
-				cave_set_feat(y, x, FEAT_FLOOR)
-
-				fire_wave(typ, 0, effect[3], 0, 6 + get_level(ELEMENTAL_WAVE, 20), EFF_WAVE + EFF_LAST + getglobal("EFF_DIR"..dir))
-			end
-
-			return TRUE
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"Draws on an adjacent special square to project a slow-moving",
-			"wave of that element in that direction",
-			"Abyss squares cannot be channeled into a wave.",
-	}
-}
-
-VAPORIZE = add_spell
-{
-	["name"] = 	"Vaporize",
-	["school"] = 	{SCHOOL_GEOMANCY},
-	["level"] = 	4,
-	["mana"] = 	3,
-	["mana_max"] = 	30,
-	["fail"] = 	15,
-	-- Unnafected by blindness
-	["blind"] =     FALSE,
-	-- Must have at least 4 Air
-	["random"] =    0,
-	["depend"] =    function()
-			if get_skill(SKILL_AIR) >= 4 then return TRUE end
-	end,
-	["spell"] = 	function()
-			local t =
-			{
-				-- Earth stuff
-				[FEAT_GRASS] 		= { GF_POIS, GF_POIS, 5 + get_skill_scale(SKILL_EARTH, 100) },
-				[FEAT_FLOWER] 		= { GF_POIS, GF_POIS, 5 + get_skill_scale(SKILL_EARTH, 150) },
-				[FEAT_DARK_PIT] 	= { GF_DARK, GF_DARK, 5 + get_skill_scale(SKILL_EARTH, 200) },
-
-				-- Water stuff
-				[FEAT_SHAL_WATER] 	= { GF_WATER, GF_WATER, 5 + get_skill_scale(SKILL_WATER, 100) },
-				[FEAT_DEEP_WATER] 	= { GF_WATER, GF_WATER, 5 + get_skill_scale(SKILL_WATER, 150) },
-				[FEAT_ICE] 		= { GF_ICE, GF_ICE, 5 + get_skill_scale(SKILL_WATER, 100) },
-
-				-- Fire stuff
-				[FEAT_SAND] 		= { GF_LITE, GF_LITE, 5 + get_skill_scale(SKILL_FIRE, 200) },
-				[FEAT_SHAL_LAVA] 	= { GF_FIRE, GF_HOLY_FIRE, 5 + get_skill_scale(SKILL_FIRE, 100) },
-				[FEAT_DEEP_LAVA] 	= { GF_FIRE, GF_HOLY_FIRE, 5 + get_skill_scale(SKILL_FIRE, 150) },
-			}
-
-			local effect = t[cave(player.py, player.px).feat]
-			if not effect then
-				msg_print("You cannot channel this area.")
-			else
-				local typ = effect[1]
-				if get_level(VAPORIZE) >= 20 then typ = effect[2] end
-
-				cave_set_feat(player.py, player.px, FEAT_FLOOR)
-
-				fire_cloud(typ, 0, effect[3], 1 + get_level(VAPORIZE, 4), 10 + get_level(VAPORIZE, 20))
-			end
-
-			return TRUE
-	end,
-	["info"] = 	function()
-			return "rad "..(1 + get_level(VAPORIZE, 4)).." dur "..(10 + get_level(VAPORIZE, 20))
-	end,
-	["desc"] =	{
-			"Draws upon your immediate environs to form a cloud of damaging vapors",
-	}
-}
-
-geomancy_can_tunnel =
-{
-	[FEAT_WALL_EXTRA] = TRUE,
-	[FEAT_WALL_OUTER] = TRUE,
-	[FEAT_WALL_INNER] = TRUE,
-	[FEAT_WALL_SOLID] = TRUE,
-
-	[FEAT_MAGMA] = TRUE,
-	[FEAT_QUARTZ] = TRUE,
-	[FEAT_MAGMA_H] = TRUE,
-	[FEAT_QUARTZ_H] = TRUE,
-	[FEAT_MAGMA_K] = TRUE,
-	[FEAT_QUARTZ_K] = TRUE,
-
-	[FEAT_TREES] = TRUE,
-	[FEAT_DEAD_TREE] = TRUE,
-
-	[FEAT_SANDWALL] = TRUE,
-	[FEAT_SANDWALL_H] = TRUE,
-	[FEAT_SANDWALL_K] = TRUE,
-
-	[FEAT_ICE_WALL] = TRUE,
-}
-
--- Dig & sprew
-function geomancy_dig(oy, ox, dir, length)
-	local dy, dx = explode_dir(dir)
-	local y = dy + oy
-	local x = dx + ox
-
-	for i = 1, length do
-		local c_ptr = cave(y, x)
-		local ox = x - dx
-		local oy = y - dy
-
-		-- stop at the end of tunnelable things
-		if not geomancy_can_tunnel[c_ptr.feat] then break end
-
-		if geomancy_can_tunnel[cave(y - 1, x - 1).feat] then geomancy_random_wall(y - 1, x - 1) end
-		if geomancy_can_tunnel[cave(y - 1, x).feat] then geomancy_random_wall(y - 1, x) end
-		if geomancy_can_tunnel[cave(y - 1, x + 1).feat] then geomancy_random_wall(y - 1, x + 1) end
-
-		if geomancy_can_tunnel[cave(y, x - 1).feat] then geomancy_random_wall(y, x - 1) end
-		if geomancy_can_tunnel[cave(y, x + 1).feat] then geomancy_random_wall(y, x + 1) end
-
-		if geomancy_can_tunnel[cave(y + 1, x - 1).feat] then geomancy_random_wall(y + 1, x - 1) end
-		if geomancy_can_tunnel[cave(y + 1, x).feat] then geomancy_random_wall(y + 1, x) end
-		if geomancy_can_tunnel[cave(y + 1, x + 1).feat] then geomancy_random_wall(y + 1, x + 1) end
-
-		y = y + dy
-		x = x + dx
-	end
-
-	y = y - dy
-	x = x - dx
-	while (y ~= oy) or (x ~= ox) do
-		geomancy_random_floor(y, x, TRUE)
-
-		-- Should we branch ?
-		if magik(20) == TRUE then
-			local rot = 1
-			if magik(50) == TRUE then rot = -1 end
-			geomancy_dig(y, x, rotate_dir(dir, rot), length / 3)
-		end
-
-		y = y - dy
-		x = x - dx
-	end
-end
-
-GEOLYSIS = add_spell
-{
-	["name"] = 	"Geolysis",
-	["school"] = 	{SCHOOL_GEOMANCY},
-	["level"] = 	7,
-	["mana"] = 	15,
-	["mana_max"] = 	40,
-	["fail"] = 	15,
-	-- Unnafected by blindness
-	["blind"] =     FALSE,
-	["random"] =    0,
-	-- Must have at least 7 Earth
-	["depend"] =    function()
-			if get_skill(SKILL_EARTH) >= 7 then return TRUE end
-	end,
-	["spell"] = 	function()
-			local ret, dir = get_rep_dir()
-			if ret == FALSE then return end
-
-			msg_print("Elements recombine before you, laying down an open path.")
-			geomancy_dig(player.py, player.px, dir, 5 + get_level(GEOLYSIS, 12))
-
-			return TRUE
-	end,
-	["info"] = 	function()
-			return "length "..(5 + get_level(GEOLYSIS, 12))
-	end,
-	["desc"] =	{
-			"Burrows deeply and slightly at random into a wall,",
-			"leaving behind tailings of various different sorts of walls in the passage.",
-	}
-}
-
-player.dripping_tread = 0
-add_loadsave("player.dripping_tread", 0)
-add_hooks
-{
-	[HOOK_MOVED] = function(oy, ox)
-		if player.dripping_tread > 0 then
-			geomancy_random_floor(oy, ox)
-			player.dripping_tread = player.dripping_tread - 1
-			if player.dripping_tread == 0 then
-				msg_print("You stop dripping raw elemental energies.")
-			end
-		end
-	end
-}
-DRIPPING_TREAD = add_spell
-{
-	["name"] = 	"Dripping Tread",
-	["school"] = 	{SCHOOL_GEOMANCY},
-	["level"] = 	10,
-	["mana"] = 	15,
-	["mana_max"] = 	25,
-	["fail"] = 	15,
-	-- Unnafected by blindness
-	["blind"] =     FALSE,
-	["random"] =    0,
-	-- Must have at least 10 Water
-	["depend"] =    function()
-			if get_skill(SKILL_WATER) >= 10 then return TRUE end
-	end,
-	["spell"] =     function()
-			if player.dripping_tread == 0 then
-				player.dripping_tread = randint(15) + 10 + get_level(DRIPPING_TREAD)
-				msg_print("You start dripping raw elemental energies.")
-			else
-				player.dripping_tread = 0
-				msg_print("You stop dripping raw elemental energies.")
-			end
-			return TRUE
-	end,
-	["info"] = 	function()
-			return "dur "..(10 + get_level(DRIPPING_TREAD)).."+d15 movs"
-	end,
-	["desc"] =	{
-			"Causes you to leave random elemental forms behind as you walk",
-	}
-}
-
-GROW_BARRIER = add_spell
-{
-	["name"] = 	"Grow Barrier",
-	["school"] = 	{SCHOOL_GEOMANCY},
-	["level"] = 	12,
-	["mana"] = 	30,
-	["mana_max"] = 	40,
-	["fail"] = 	15,
-	-- Unnafected by blindness
-	["blind"] =     FALSE,
-	["random"] =    0,
-	-- Must have at least 12 Earth
-	["depend"] =    function()
-			if get_skill(SKILL_EARTH) >= 12 then return TRUE end
-	end,
-	["spell"] = 	function()
-			local ret, dir = 0, 0
-
-			if get_level(GROW_BARRIER) >= 20 then
-				ret, dir = get_aim_dir()
-				if ret == FALSE then return end
-			end
-
-			fire_ball(GF_ELEMENTAL_WALL, dir, 1, 1)
-			return TRUE
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"Creates impassable terrain (walls, trees, etc.) around you.",
-			"At level 20 it can be projected around another area.",
-	}
-}
-
-ELEMENTAL_MINION = add_spell
-{
-	["name"] = 	"Elemental Minion",
-	["school"] = 	{SCHOOL_GEOMANCY},
-	["level"] = 	20,
-	["mana"] = 	40,
-	["mana_max"] = 	80,
-	["fail"] = 	25,
-	-- Unnafected by blindness
-	["random"] =    0,
-	-- Must have at least 12 Earth
-	["spell"] = 	function()
-			local ret, dir = 0, 0
-
-			ret, dir = get_rep_dir()
-			if ret == FALSE then return end
-
-			local t =
-			{
-				[FEAT_WALL_EXTRA] = { SKILL_EARTH, { "Earth elemental", "Xorn", "Xaren" } },
-				[FEAT_WALL_OUTER] = { SKILL_EARTH, { "Earth elemental", "Xorn", "Xaren" } },
-				[FEAT_WALL_INNER] = { SKILL_EARTH, { "Earth elemental", "Xorn", "Xaren" } },
-				[FEAT_WALL_SOLID] = { SKILL_EARTH, { "Earth elemental", "Xorn", "Xaren" } },
-				[FEAT_MAGMA] = { SKILL_EARTH, { "Earth elemental", "Xorn", "Xaren" } },
-				[FEAT_QUARTZ] = { SKILL_EARTH, { "Earth elemental", "Xorn", "Xaren" } },
-				[FEAT_MAGMA_H] = { SKILL_EARTH, { "Earth elemental", "Xorn", "Xaren" } },
-				[FEAT_QUARTZ_H] = { SKILL_EARTH, { "Earth elemental", "Xorn", "Xaren" } },
-				[FEAT_MAGMA_K] = { SKILL_EARTH, { "Earth elemental", "Xorn", "Xaren" } },
-				[FEAT_QUARTZ_K] = { SKILL_EARTH, { "Earth elemental", "Xorn", "Xaren" } },
-
-				[FEAT_DARK_PIT] = { SKILL_AIR, { "Air elemental", "Ancient blue dragon", "Great Storm Wyrm", "Sky Drake" } },
-
-				[FEAT_SANDWALL] = { SKILL_FIRE, { "Fire elemental", "Ancient red dragon" } },
-				[FEAT_SANDWALL_H] = { SKILL_FIRE, { "Fire elemental", "Ancient red dragon" } },
-				[FEAT_SANDWALL_K] = { SKILL_FIRE, { "Fire elemental", "Ancient red dragon" } },
-				[FEAT_SHAL_LAVA] = { SKILL_FIRE, { "Fire elemental", "Ancient red dragon" } },
-				[FEAT_DEEP_LAVA] = { SKILL_FIRE, { "Fire elemental", "Ancient red dragon" } },
-
-				[FEAT_ICE_WALL] = { SKILL_WATER, { "Water elemental", "Water troll", "Water demon" } },
-				[FEAT_SHAL_WATER] = { SKILL_WATER, { "Water elemental", "Water troll", "Water demon" } },
-				[FEAT_DEEP_WATER] = { SKILL_WATER, { "Water elemental", "Water troll", "Water demon" } },
-			}
-
-			local y, x = explode_dir(dir)
-			y = y + player.py
-			x = x + player.px
-
-			local effect = t[cave(y, x).feat]
-			if not effect then
-				msg_print("You cannot summon from this area.")
-			else
-				local skill = effect[1]
-				local types = effect[2]
-
-				local max = get_skill_scale(skill, getn(types))
-				if max == 0 then max = 1 end
-
-				local r_idx = test_monster_name(types[rand_range(1, max)])
-
-				-- Summon it
-				local my, mx = find_position(y, x)
-				local m_idx = place_monster_one(my, mx, r_idx, 0, FALSE, MSTATUS_FRIEND)
-
-				-- level it
-				if m_idx ~= 0 then
-					monster_set_level(m_idx, 10 + get_level(ELEMENTAL_MINION, 120))
-				end
-
-				cave_set_feat(y, x, FEAT_FLOOR)
-			end
-
-			return TRUE
-	end,
-	["info"] = 	function()
-			return "min level "..(10 + get_level(ELEMENTAL_MINION, 120))
-	end,
-	["desc"] =	{
-			"Summons a minion from a nearby element.",
-			"Walls can summon Earth elmentals, Xorns and Xarens",
-			"Dark Pits can summon Air elementals, Ancient blue dragons, Great Storm Wyrms",
-			"and Sky Drakes",
-			"Sandwalls and lava can summon Fire elementals and Ancient red dragons",
-			"Icewall, and water can summon Water elementals, Water trolls and Water demons",
-	}
-}
diff --git a/lib/mods/theme/scpt/s_mana.lua b/lib/mods/theme/scpt/s_mana.lua
deleted file mode 100644
index 736b06b0..00000000
--- a/lib/mods/theme/scpt/s_mana.lua
+++ /dev/null
@@ -1,132 +0,0 @@
--- The mana school
-
-function get_manathrust_dam()
-	return 3 + get_level(MANATHRUST, 50), 1 + get_level(MANATHRUST, 20)
-end
-
-MANATHRUST = add_spell
-{
-	["name"] = 	"Manathrust",
-	["school"] = 	SCHOOL_MANA,
-	["level"] = 	1,
-	["mana"] = 	1,
-	["mana_max"] =  25,
-	["fail"] = 	10,
-	["stick"] =
-	{
-			["charge"] =    { 7, 10 },
-			[TV_WAND] =
-			{
-				["rarity"] = 		5,
-				["base_level"] =	{ 1, 20 },
-				["max_level"] =		{ 15, 33 },
-			},
-	},
-	["spell"] = 	function()
-			local ret, dir	
-
-			ret, dir = get_aim_dir()
-			if ret == FALSE then return end
-			return fire_bolt(GF_MANA, dir, damroll(get_manathrust_dam()))
-	end,
-	["info"] = 	function()
-			local x, y
-
-			x, y = get_manathrust_dam()
-			return "dam "..x.."d"..y
-	end,
-	["desc"] =	{
-			"Conjures up mana into a powerful bolt",
-			"The damage is irresistible and will increase with level"
-		}
-}
-
-DELCURSES = add_spell
-{
-	["name"] = 	"Remove Curses",
-	["school"] = 	SCHOOL_MANA,
-	["level"] = 	10,
-	["mana"] = 	20,
-	["mana_max"] = 	40,
-	["fail"] = 	30,
-	["stick"] =
-	{
-			["charge"] =    { 3, 8 },
-			[TV_STAFF] =
-			{
-				["rarity"] = 		70,
-				["base_level"] =	{ 1, 5 },
-				["max_level"] =		{ 15, 50 },
-			},
-	},
-	["inertia"] = 	{ 1, 10 },
-	["spell"] = 	function()
-			local done
-
-			if get_level(DELCURSES, 50) >= 20 then done = remove_all_curse()
-			else done = remove_curse() end
-			if done == TRUE then msg_print("The curse is broken!") end
-			return done
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"Remove curses of worn objects",
-			"At level 20 switches to *remove curses*"
-		}
-}
-
-RESISTS = add_spell
-{
-	["name"] = 	"Elemental Shield",
-	["school"] = 	SCHOOL_MANA,
-	["level"] = 	20,
-	["mana"] = 	17,
-	["mana_max"] = 	20,
-	["fail"] = 	40,
-	["inertia"] = 	{ 2, 25 },
-	["spell"] = 	function()
-			local obvious
-		       	if player.oppose_fire == 0 then obvious = set_oppose_fire(randint(10) + 15 + get_level(RESISTS, 50)) end
-		       	if player.oppose_cold == 0 then obvious = is_obvious(set_oppose_cold(randint(10) + 15 + get_level(RESISTS, 50)), obvious) end
-		       	if player.oppose_elec == 0 then obvious = is_obvious(set_oppose_elec(randint(10) + 15 + get_level(RESISTS, 50)), obvious) end
-		       	if player.oppose_acid == 0 then obvious = is_obvious(set_oppose_acid(randint(10) + 15 + get_level(RESISTS, 50)), obvious) end
-			return obvious
-	end,
-	["info"] = 	function()
-			return "dur "..(15 + get_level(RESISTS, 50)).."+d10"
-	end,
-	["desc"] =	{
-			"Provide resistances to the four basic elements",
-		}
-}
-
-MANASHIELD = add_spell
-{
-	["name"] = 	"Disruption Shield",
-	["school"] = 	SCHOOL_MANA,
-	["level"] = 	45,
-	["mana"] = 	50,
-	["mana_max"] = 	50,
-	["fail"] = 	90,
-	["inertia"] = 	{ 9, 10},
-	["spell"] = 	function()
-			if get_level(MANASHIELD, 50) >= 5 then
-			       	if (player.invuln == 0) then
-					return set_invuln(randint(5) + 3 + get_level(MANASHIELD, 10))
-				end
-			else
-			       	if (player.disrupt_shield == 0) then return set_disrupt_shield(randint(5) + 3 + get_level(MANASHIELD, 10)) end
-			end
-	end,
-	["info"] = 	function()
-			return "dur "..(3 + get_level(MANASHIELD, 10)).."+d5"
-	end,
-	["desc"] =	{
-			"Uses mana instead of hp to take damage",
-			"At level 5 switches to Globe of Invulnerability.",
-			"The spell breaks as soon as a melee, shooting, throwing or magical",
-			"skill action is attempted, and lasts only a short time."
-		}
-}
diff --git a/lib/mods/theme/scpt/s_mandos.lua b/lib/mods/theme/scpt/s_mandos.lua
deleted file mode 100644
index cc7e346a..00000000
--- a/lib/mods/theme/scpt/s_mandos.lua
+++ /dev/null
@@ -1,186 +0,0 @@
--- Spells for the school of Mandos
-
-BOOK_MANDOS = 66
-
--- precognition timer for high-level spell [from T-Plus by Ingeborg S. Norden]
-
-add_loadsave("tim_precognition",0) 
-
-function set_precognition(v) 
-   local notice = FALSE 
-   if (v < 0) then v = 0 end 
-   if (v > 10000) then v = 10000 end 
-
-   -- Check if the state will change 
-   if (v > 0) and (tim_precognition == 0) then 
-      msg_print("You feel able to predict the future.") 
-      notice = TRUE 
-   elseif (v == 0) and (tim_precognition > 0) then 
-      msg_print("You feel less able to predict the future.") 
-      notice = TRUE 
-   end 
-
-   -- set the new value 
-   tim_precognition = v 
-
-   if (notice == TRUE) then 
-      player.update = bor(player.update, PU_BONUS) 
-      disturb(0,0) 
-   end 
-   return notice 
-end 
-
--- related hooks
-
-add_hooks{ 
-   [HOOK_CALC_BONUS] = function() 
-      if (tim_precognition > 0) then 
-         --player.precognition = TRUE 
-         apply_flags(0, 0, 0, TR4_PRECOGNITION, 0, 0, 0, 0, 0, 0, 0) 
-      end 
-   end, 
-
-   [HOOK_PROCESS_WORLD] = function() 
-      if (tim_precognition > 0) then 
-         set_precognition(tim_precognition - 1) 
-      end 
-   end, 
-} 
-
--- "Tears of Luthien" based on Holy Word from T-Plus
-MANDOS_TEARS_LUTHIEN = add_spell
-{
-	["name"] =      "Tears of Luthien",
-	["school"] =    {SCHOOL_MANDOS},
-	["level"] =     5,
-	["mana"] =      10,
-	["mana_max"] =  100,
-	["fail"] = 	25,
-	["piety"] =     TRUE,
-	["stat"] =      A_WIS,
-	["random"] = 	SKILL_SPIRITUALITY,
-	["spell"] = function() 
-      	local level = get_level(MANDOS_TEARS_LUTHIEN, 30) 
-      	local obvious = hp_player(10 * level) 
-        	obvious = is_obvious (set_stun(0), obvious) 
-         	obvious = is_obvious (set_cut(0), obvious) 
-         	obvious = is_obvious (set_afraid(0), obvious) 
-         	return obvious 
-   	end, 
-	["info"] = 	function()
-		local level = get_level(MANDOS_TEARS_LUTHIEN, 30)
-		return "heals "..(10 * level)
-	end,
-	["desc"] =	{
-			"Calls upon the spirit of Luthien to ask Mandos for healing and succour."
-			}
-}
-
--- "Spirit of the Feanturi" based on Restore Mind from T-Plus
-MANDOS_SPIRIT_FEANTURI = add_spell { 
-    ["name"] =  "Feanturi", 
-    ["school"] =    {SCHOOL_MANDOS}, 
-    ["level"] =     10, 
-    ["mana"] =      40, 
-    ["mana_max"] = 200, 
-    ["fail"] =     50, 
-    -- Uses piety to cast
-    ["piety"] =     TRUE,
-    ["stat"] =      A_WIS,
-    ["random"] = 	SKILL_SPIRITUALITY,
-    ["spell"] =     function() 
-            local level = get_level(MANDOS_SPIRIT_FEANTURI, 50) 
-            local obvious 
-            obvious = set_afraid(0) 
-            obvious = is_obvious(set_confused(0), obvious) 
-
-            if level >= 20 then 
-                obvious = is_obvious(do_res_stat(A_WIS, TRUE), obvious) 
-                obvious = is_obvious(do_res_stat(A_INT, TRUE), obvious) 
-            end 
-            
-            if level >= 30 then 
-                obvious = is_obvious(set_image(0), obvious) 
-                obvious = is_obvious(heal_insanity(player.msane * level / 100), obvious) 
-            end 
-            
-            return obvious 
-    end,        
-
-    ["info"] =  function() 
-            local level = get_level(MANDOS_SPIRIT_FEANTURI, 50) 
-            if level >= 20 then 
-                return "heals "..level.."%" 
-            else 
-                return "" 
-            end 
-    end, 
-    ["desc"] =  { 
-            "Channels the power of Mandos to cure fear and confusion.", 
-            "At level 20 it restores lost INT and WIS", 
-            "At level 30 it cures hallucinations and restores a percentage of lost sanity" 
-    } 
-} 
-
--- "Tale of Doom" based on Foretell from T-Plus
-MANDOS_TALE_DOOM = add_spell 
-{ 
-   ["name"] =    "Tale of Doom", 
-   ["school"] =  {SCHOOL_MANDOS}, 
-   ["level"] =    25, 
-   ["mana"] =     60, 
-   ["mana_max"] = 300, 
-   ["stat"] =      A_WIS,
-   ["fail"] =     75,
-   -- Uses piety to cast
-   ["piety"] =     TRUE,
-   ["stat"] =      A_WIS,
-   ["random"] = 	SKILL_SPIRITUALITY,
-   ["spell"] = function() 
-      return set_precognition(5 + get_level(MANDOS_TALE_DOOM,10)) 
-   end, 
-   ["info"] = function() 
-      return "dur "..(5 + get_level(MANDOS_TALE_DOOM,10)) 
-   end, 
-   ["desc"] = { 
-      "Allows you to predict the future for a short time."
- } 
-}
-
--- "Call to the Halls" based on Call Blessed Soul from T-Plus
-MANDOS_CALL_HALLS= add_spell
-
-{
-	["name"] = 	"Call to the Halls",
-	["school"] = 	{SCHOOL_MANDOS},
-	["level"] = 	30,
-	["mana"] = 	80,
-	["mana_max"] = 	400,
-	["fail"] = 	95,
-      ["piety"] =     TRUE,
-      ["stat"] =      A_WIS,
-      ["random"] = 	SKILL_SPIRITUALITY,
-	["spell"] =     function()
-			local y, x, m_idx
-			local summons =
-				{
-				test_monster_name("Experienced spirit"),
-				test_monster_name("Wise spirit"),
-				}
-			y, x = find_position(player.py, player.px)
-			m_idx = place_monster_one(y, x, summons[rand_range(1, 2)], 0, FALSE, MSTATUS_FRIEND)
-			if m_idx ~= 0 then
-				monster_set_level(m_idx, 20 + get_level(MANDOS_CALL_HALLS, 70, 0))
-				return TRUE
-			end
-	end,
-
-	["info"] = 	function()
-			return "level "..(get_level(MANDOS_CALL_HALLS, 70))
-	end,
-	["desc"] =	{
-			"Summons a leveled spirit from the Halls of Mandos",
-			"to fight for you."
-
-	}
-}
\ No newline at end of file
diff --git a/lib/mods/theme/scpt/s_manwe.lua b/lib/mods/theme/scpt/s_manwe.lua
deleted file mode 100644
index 6f0f9661..00000000
--- a/lib/mods/theme/scpt/s_manwe.lua
+++ /dev/null
@@ -1,144 +0,0 @@
--- Handle Manwe Sulimo magic school
-
-MANWE_SHIELD = add_spell
-{
-	["name"] =      "Wind Shield",
-	["school"] =    {SCHOOL_MANWE},
-	["level"] =     10,
-	["mana"] =      100,
-	["mana_max"] =  500,
-	["fail"] = 	30,
-	-- Uses piety to cast
-	["piety"] =     TRUE,
-	["stat"] =      A_WIS,
-	["random"] = 	SKILL_SPIRITUALITY,
-	["spell"] = 	function()
-			local dur = get_level(MANWE_SHIELD, 50) + 10 + randint(20)
-			local obvious
-
-			obvious = set_protevil(dur)
-			if get_level(MANWE_SHIELD) >= 10 then
-				local type
-
-				type = 0
-				if get_level(MANWE_SHIELD) >= 20 then
-					type = SHIELD_COUNTER
-				end
-				obvious = is_obvious(set_shield(dur, get_level(MANWE_SHIELD, 30), type, 1 + get_level(MANWE_SHIELD, 2), 1 + get_level(MANWE_SHIELD, 6)), obvious)
-			end
-			return obvious
-	end,
-	["info"] = 	function()
-			local desc = "dur "..(get_level(MANWE_SHIELD, 50) + 10).."+d20"
-
-			if get_level(MANWE_SHIELD) >= 10 then
-				desc = desc.." AC "..(get_level(MANWE_SHIELD, 30))
-			end
-			if get_level(MANWE_SHIELD) >= 20 then
-				desc = desc.." dam "..(1 + get_level(MANWE_SHIELD, 2)).."d"..(1 + get_level(MANWE_SHIELD, 6))
-			end
-			return desc
-	end,
-	["desc"] =	{
-			"It surrounds you with a shield of wind that deflects blows from evil monsters",
-			"At level 10 it increases your armour rating",
-			"At level 20 it retaliates against monsters that melee you",
-	}
-}
-
-MANWE_AVATAR = add_spell
-{
-	["name"] =      "Avatar",
-	["school"] =    {SCHOOL_MANWE},
-	["level"] =     35,
-	["mana"] =      1000,
-	["mana_max"] =  1000,
-	["fail"] = 	80,
-	-- Uses piety to cast
-	["piety"] =     TRUE,
-	["stat"] =      A_WIS,
-	["random"] = 	SKILL_SPIRITUALITY,
-	["spell"] = 	function()
-			return set_mimic(get_level(MANWE_AVATAR, 20) + randint(10), resolve_mimic_name("Maia"), player.lev)
-	end,
-	["info"] =      function()
-			return "dur "..(get_level(MANWE_AVATAR, 20)).."+d10"
-	end,
-	["desc"] =	{
-			"It turns you into a full grown Maia",
-	}
-}
-
-MANWE_BLESS = add_spell
-{
-	["name"] =      "Manwe's Blessing",
-	["school"] =    {SCHOOL_MANWE},
-	["level"] =     1,
-	["mana"] =      10,
-	["mana_max"] =  100,
-	["fail"] = 	20,
-	-- Uses piety to cast
-	["piety"] =     TRUE,
-	["stat"] =      A_WIS,
-	["random"] = 	SKILL_SPIRITUALITY,
-	["spell"] = 	function()
-			local dur = get_level(MANWE_BLESS, 70) + 30 + randint(40)
-			local obvious
-
-			obvious = set_blessed(dur)
-			obvious = is_obvious(set_afraid(0), obvious)
-			obvious = is_obvious(set_lite(0), obvious)
-			if get_level(MANWE_BLESS) >= 10 then
-				obvious = is_obvious(set_hero(dur), obvious)
-			end
-			if get_level(MANWE_BLESS) >= 20 then
-				obvious = is_obvious(set_shero(dur), obvious)
-			end
-			if get_level(MANWE_BLESS) >= 30 then
-				obvious = is_obvious(set_holy(dur), obvious)
-			end
-			return obvious
-	end,
-	["info"] =      function()
-			return "dur "..(get_level(MANWE_BLESS, 70) + 30).."+d40"
-	end,
-	["desc"] =	{
-			"Manwe's Blessing removes your fears, blesses you and surrounds you with",
-			"holy light",
-			"At level 10 it also grants heroism",
-			"At level 20 it also grants super heroism",
-			"At level 30 it also grants holy luck and life protection",
-	}
-}
-
-MANWE_CALL = add_spell
-{
-	["name"] =      "Manwe's Call",
-	["school"] =    {SCHOOL_MANWE},
-	["level"] =     20,
-	["mana"] =      200,
-	["mana_max"] =  500,
-	["fail"] = 	40,
-	-- Uses piety to cast
-	["piety"] =     TRUE,
-	["stat"] =      A_WIS,
-	["random"] = 	SKILL_SPIRITUALITY,
-	["spell"] = 	function()
-			local y, x, m_idx
-
-			y, x = find_position(player.py, player.px)
-			m_idx = place_monster_one(y, x, test_monster_name("Great eagle"), 0, FALSE, MSTATUS_FRIEND)
-
-			if m_idx ~= 0 then
-				monster_set_level(m_idx, 20 + get_level(MANWE_CALL, 70, 0))
-				return TRUE
-			end
-	end,
-	["info"] =      function()
-			return "level "..(get_level(MANWE_CALL, 70) + 20)
-	end,
-	["desc"] =	{
-			"Manwe's Call summons a Great Eagle to help you battle the forces",
-			"of Morgoth"
-	}
-}
diff --git a/lib/mods/theme/scpt/s_melkor.lua b/lib/mods/theme/scpt/s_melkor.lua
deleted file mode 100644
index b2c693dd..00000000
--- a/lib/mods/theme/scpt/s_melkor.lua
+++ /dev/null
@@ -1,154 +0,0 @@
--- handle the melkor school
-
--- Not included in the spell code directly because I need to call it from somewhere else too
-function do_melkor_curse(who)
-	local m_ptr = monster(who)
-
-	if get_level(MELKOR_CURSE) >= 35 then
-		local r_ptr = race_info_idx(m_ptr.r_idx, m_ptr.ego)
-
-		m_ptr.maxhp = m_ptr.maxhp - r_ptr.hside;
-		if m_ptr.maxhp < 1 then m_ptr.maxhp = 1 end
-		if m_ptr.hp > m_ptr.maxhp then m_ptr.hp = m_ptr.maxhp end
-		player.redraw = bor(player.redraw, PR_HEALTH)
-	end
-	if get_level(MELKOR_CURSE) >= 25 then
-		m_ptr.speed = m_ptr.speed - get_level(MELKOR_CURSE, 7)
-		m_ptr.mspeed = m_ptr.mspeed - get_level(MELKOR_CURSE, 7)
-
-		if m_ptr.speed < 70 then m_ptr.speed = 70 end
-		if m_ptr.mspeed < 70 then m_ptr.mspeed = 70 end
-	end
-	if get_level(MELKOR_CURSE) >= 15 then
-		m_ptr.ac = m_ptr.ac - get_level(MELKOR_CURSE, 50)
-
-		if m_ptr.ac < -70 then m_ptr.ac = -70 end
-	end
-
-	local i, pow
-	i = 1
-	pow = get_level(MELKOR_CURSE, 2)
-	while (i <= 4) do
-		if m_ptr.blow[i].d_dice > 0 then
-			if m_ptr.blow[i].d_dice < pow then
-				pow = m_ptr.blow[i].d_dice
-			end
-			if m_ptr.blow[i].d_side < pow then
-				pow = m_ptr.blow[i].d_side
-			end
-			m_ptr.blow[i].d_dice = m_ptr.blow[i].d_dice - pow
-		end
-		i = i + 1
-	end
-
-	local m_name = monster_desc(m_ptr, 0).." looks weaker."
-	msg_print(strupper(strsub(m_name, 0, 1))..strsub(m_name, 2))
-
-	-- wake it
-	m_ptr.csleep = 0;
-end
-
-MELKOR_CURSE = add_spell
-{
-	["name"] =      "Curse",
-	["school"] =    {SCHOOL_MELKOR},
-	["level"] =     1,
-	["mana"] =      50,
-	["mana_max"] =  300,
-	["fail"] = 	20,
-	-- Uses piety to cast
-	["piety"] =     TRUE,
-	["stat"] =      A_WIS,
-	["random"] = 	SKILL_SPIRITUALITY,
-	["spell"] = 	function()
-				local ret, dir = get_aim_dir()
-				if ret == FALSE then return end
-
-				if target_who == -1 then
-					msg_print("You must target a monster.")
-				else
-					do_melkor_curse(target_who)
-				end
-				return TRUE
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"It curses a monster, reducing its melee power",
-			"At level 5 it can be auto-casted (with no piety cost) while fighting",
-			"At level 15 it also reduces armor",
-			"At level 25 it also reduces speed",
-			"At level 35 it also reduces max life (but it is never fatal)",
-	}
-}
-
-MELKOR_CORPSE_EXPLOSION = add_spell
-{
-	["name"] =      "Corpse Explosion",
-	["school"] =    {SCHOOL_MELKOR},
-	["level"] =     10,
-	["mana"] =      100,
-	["mana_max"] =  500,
-	["fail"] = 	45,
-	-- Uses piety to cast
-	["piety"] =     TRUE,
-	["stat"] =      A_WIS,
-	["random"] = 	SKILL_SPIRITUALITY,
-	["spell"] = 	function()
-			return fire_ball(GF_CORPSE_EXPL, 0, 20 + get_level(MELKOR_CORPSE_EXPLOSION, 70), 2 + get_level(MELKOR_CORPSE_EXPLOSION, 5))
-	end,
-	["info"] = 	function()
-			return "dam "..(20 + get_level(MELKOR_CORPSE_EXPLOSION, 70)).."%"
-	end,
-	["desc"] =	{
-			"It makes corpses in an area around you explode for a percent of their",
-			"hit points as damage",
-	}
-}
-
-MELKOR_MIND_STEAL = add_spell
-{
-	["name"] =      "Mind Steal",
-	["school"] =    {SCHOOL_MELKOR},
-	["level"] =     20,
-	["mana"] =      1000,
-	["mana_max"] =  3000,
-	["fail"] = 	90,
-	-- Uses piety to cast
-	["piety"] =     TRUE,
-	["stat"] =      A_WIS,
-	["random"] = 	SKILL_SPIRITUALITY,
-	["spell"] = 	function()
-				local ret, dir = get_aim_dir()
-				if ret == FALSE then return end
-
-				if target_who == -1 then
-					msg_print("You must target a monster.")
-				else
-					local chance, m_ptr, r_ptr
-
-					m_ptr = monster(target_who)
-					r_ptr = race_info_idx(m_ptr.r_idx, m_ptr.ego)
-					chance = get_level(MELKOR_MIND_STEAL)
-					if (randint(m_ptr.level) < chance) and (band(r_ptr.flags1, RF1_UNIQUE) == 0) then
-						player.control = target_who
-						m_ptr.mflag = bor(m_ptr.mflag, MFLAG_CONTROL)
-
-						local m_name = monster_desc(m_ptr, 0).." falls under your control."
-						msg_print(strupper(strsub(m_name, 0, 1))..strsub(m_name, 2))
-					else
-						local m_name = monster_desc(m_ptr, 0).." resists."
-						msg_print(strupper(strsub(m_name, 0, 1))..strsub(m_name, 2))
-					end
-					return TRUE
-				end
-	end,
-	["info"] = 	function()
-			return "chance 1d(mlvl)<"..(get_level(MELKOR_MIND_STEAL))
-	end,
-	["desc"] =	{
-			"It allows your spirit to temporarily leave your own body, which will",
-			"be vulnerable, to control one of your enemies body."
-	}
-}
diff --git a/lib/mods/theme/scpt/s_meta.lua b/lib/mods/theme/scpt/s_meta.lua
deleted file mode 100644
index eab691d8..00000000
--- a/lib/mods/theme/scpt/s_meta.lua
+++ /dev/null
@@ -1,287 +0,0 @@
--- handle the meta school
-
-RECHARGE = add_spell
-{
-	["name"] = 	"Recharge",
-	["school"] = 	{SCHOOL_META},
-	["level"] = 	5,
-	["mana"] = 	10,
-	["mana_max"] = 	100,
-	["fail"] = 	20,
-	["spell"] = 	function()
-			return recharge(60 + get_level(RECHARGE, 140))
-	end,
-	["info"] = 	function()
-			return "power "..(60 + get_level(RECHARGE, 140))
-	end,
-	["desc"] =	{
-			"Taps on the ambient mana to recharge an object's power (charges or mana)",
-	}
-}
-
-function get_spellbinder_max()
-	local i
-
-	i = get_level(SPELLBINDER, 4)
-	if i > 4 then i = 4 end
-	return i
-end
---'
-SPELLBINDER = add_spell
-{
-	["name"] = 	"Spellbinder",
-	["school"] = 	{SCHOOL_META},
-	["level"] = 	20,
-	["mana"] = 	100,
-	["mana_max"] = 	300,
-	["fail"] = 	85,
-	["spell"] = 	function()
-			local i, ret, c
-
-			if player.spellbinder_num ~= 0 then
-				local t =
-				{
-					[SPELLBINDER_HP75] = "75% HP",
-					[SPELLBINDER_HP50] = "50% HP",
-					[SPELLBINDER_HP25] = "25% HP",
-				}
-				msg_print("The spellbinder is already active.")
-				msg_print("It will trigger at "..t[player.spellbinder_trigger]..".")
-				msg_print("With the spells: ")
-				for i = 1, player.spellbinder_num do
-					msg_print(spell(player.spellbinder[i]).name)
-				end
-				return TRUE
-			end
-
-			ret, c = get_com("Trigger at [a]75% hp [b]50% hp [c]25% hp?", strbyte("a"))
-			if ret == FALSE then return TRUE end
-			
-			if c == strbyte("a") then
-				player.spellbinder_trigger = SPELLBINDER_HP75
-			elseif c == strbyte("b") then
-				player.spellbinder_trigger = SPELLBINDER_HP50
-			elseif c == strbyte("c") then
-				player.spellbinder_trigger = SPELLBINDER_HP25
-			else
-				return
-			end
-			player.spellbinder_num = get_spellbinder_max()
-			i = player.spellbinder_num
-			while i > 0 do
-				local s
-
-				s = get_school_spell("bind", "is_ok_spell", 0)
-				if s == -1 then
-					player.spellbinder_trigger = 0
-					player.spellbinder_num = 0
-					return TRUE
-				else
-					if spell(s).skill_level > 7 + get_level(SPELLBINDER, 35) then
-						msg_print("You are only allowed spells with a base level of "..(7 + get_level(SPELLBINDER, 35))..".");
-						return TRUE
-					end
-				end
-				player.spellbinder[i] = s
-				i = i - 1
-			end
-			player.energy = player.energy - 3100;
-			msg_print("Spellbinder ready.")
-			return TRUE
-	end,
-	["info"] = 	function()
-			return "number "..(get_spellbinder_max()).." max level "..(7 + get_level(SPELLBINDER, 35))
-	end,
-	["desc"] =	{
-			"Stores spells in a trigger.",
-			"When the condition is met all spells fire off at the same time",
-			"This spell takes a long time to cast so you are advised to prepare it",
-			"in a safe area.",
-			"Also it will use the mana for the Spellbinder and the mana for the",
-			"selected spells"
-	}
-}
-
-DISPERSEMAGIC = add_spell
-{
-	["name"] = 	"Disperse Magic",
-	["school"] = 	{SCHOOL_META},
-	["level"] = 	15,
-	["mana"] = 	30,
-	["mana_max"] = 	60,
-	["fail"] = 	40,
-	-- Unnafected by blindness
-	["blind"] =     FALSE,
-	-- Unnafected by confusion
-	["confusion"] = FALSE,
-	["stick"] =
-	{
-			["charge"] =    { 5, 5 },
-			[TV_WAND] =
-			{
-				["rarity"] = 		25,
-				["base_level"] =	{ 1, 15 },
-				["max_level"] =		{ 5, 40 },
-			},
-	},
-	["inertia"] = 	{ 1, 5 },
-	["spell"] = 	function()
-			local obvious
-			obvious = set_blind(0)
-			obvious = is_obvious(set_lite(0), obvious)
-			if get_level(DISPERSEMAGIC, 50) >= 5 then
-				obvious = is_obvious(set_confused(0), obvious)
-				obvious = is_obvious(set_image(0), obvious)
-			end
-			if get_level(DISPERSEMAGIC, 50) >= 10 then
-				obvious = is_obvious(set_slow(0), obvious)
-				obvious = is_obvious(set_fast(0, 0), obvious)
-				obvious = is_obvious(set_light_speed(0), obvious)
-			end
-			if get_level(DISPERSEMAGIC, 50) >= 15 then
-				obvious = is_obvious(set_stun(0), obvious)
-				obvious = is_obvious(set_meditation(0), obvious)
-				obvious = is_obvious(set_cut(0), obvious)
-			end
-			if get_level(DISPERSEMAGIC, 50) >= 20 then
-				obvious = is_obvious(set_hero(0), obvious)
-				obvious = is_obvious(set_shero(0), obvious)
-				obvious = is_obvious(set_blessed(0), obvious)
-				obvious = is_obvious(set_shield(0, 0, 0, 0, 0), obvious)
-				obvious = is_obvious(set_afraid(0), obvious)
-				obvious = is_obvious(set_parasite(0, 0), obvious)
-				obvious = is_obvious(set_mimic(0, 0, 0), obvious)
-			end
-			return TRUE
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"Dispels a lot of magic that can affect you, be it good or bad",
-			"Level 1: blindness and light",
-			"Level 5: confusion and hallucination",
-			"Level 10: speed (both bad or good) and light speed",
-			"Level 15: stunning, meditation, cuts",
-			"Level 20: hero, super hero, bless, shields, afraid, parasites, mimicry",
-	}
-}
-
-TRACKER = add_spell
-{
-	["name"] = 	"Tracker",
-	["school"] = 	{SCHOOL_META, SCHOOL_CONVEYANCE},
-	["level"] = 	30,
-	["mana"] = 	50,
-	["mana_max"] = 	50,
-	["fail"] = 	95,
-	["spell"] = 	function()
-			if last_teleportation_y == -1 then
-				msg_print("There has not been any teleporatation here.")
-				return TRUE
-			end
-			teleport_player_to(last_teleportation_y, last_teleportation_x)
-			return TRUE
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"Tracks down the last teleportation that happened on the level and teleports",
-			"you to it",
-	}
-}
-
--- Saves the values of the timer
-save_timer("TIMER_INERTIA_CONTROL")
-add_loadsave("player.inertia_controlled_spell", -1)
-player.inertia_controlled_spell = -1
-
--- Automatically cast the inertia controlled spells
-TIMER_INERTIA_CONTROL = new_timer
-{
-	["enabled"] = FALSE,
-	["delay"] = 10,
-	["callback"] = function()
-		-- Don't cast a controlled spell in wilderness mode
-		if player.antimagic then
-			msg_print("Your anti-magic field disrupts any magic attempts.")
-		elseif player.anti_magic then
-			msg_print("Your anti-magic shell disrupts any magic attempts.")
-		elseif (player.inertia_controlled_spell ~= -1) and (player.wild_mode == FALSE) then
-			__spell_spell[player.inertia_controlled_spell]()
-		end
-	end,
-}
-
-stop_inertia_controlled_spell = function()
-	player.inertia_controlled_spell = -1
-	TIMER_INERTIA_CONTROL.enabled = FALSE
-	player.update = bor(player.update, PU_MANA)
-	return TRUE
-end
-
-add_hooks
-{
-	-- Reduce the mana by four times the cost of the spell
-	[HOOK_CALC_MANA] = function(msp)
-		if player.inertia_controlled_spell ~= -1 then
-			msp = msp - (get_mana(player.inertia_controlled_spell) * 4)
-			if msp < 0 then msp = 0 end
-			return TRUE, msp
-		end
-	end,
-
-	-- Stop a previous spell at birth
-	[HOOK_BIRTH_OBJECTS] = function()
-		stop_inertia_controlled_spell()
-	end,
-}
-
-INERTIA_CONTROL = add_spell
-{
-	["name"] = 	"Inertia Control",
-	["school"] = 	{SCHOOL_META},
-	["level"] = 	37,
-	["mana"] = 	300,
-	["mana_max"] = 	700,
-	["fail"] = 	95,
-	["spell"] = 	function()
-			if player.inertia_controlled_spell ~= -1 then
-				msg_print("You cancel your inertia flow control.")
-				return stop_inertia_controlled_spell()
-			end
-
-			local s = get_school_spell("control", "is_ok_spell", 0)
-			if s == -1 then
-				return stop_inertia_controlled_spell()
-			end
-
-			local inertia = __tmp_spells[s].inertia
-
-			if inertia == nil then
-				msg_print("This spell inertia flow can not be controlled.")
-				return stop_inertia_controlled_spell()
-			end
-			if inertia[1] > get_level(INERTIA_CONTROL, 10) then
-				msg_print("This spell inertia flow("..inertia[1]..") is too strong to be controlled by your current spell.")
-				return stop_inertia_controlled_spell()
-			end
-
-			player.inertia_controlled_spell = s
-			TIMER_INERTIA_CONTROL.enabled = TRUE
-			TIMER_INERTIA_CONTROL.delay = inertia[2]
-			TIMER_INERTIA_CONTROL.countdown = TIMER_INERTIA_CONTROL.delay
-			player.update = bor(player.update, PU_MANA)
-			msg_print("Inertia flow controlling spell "..spell(s).name..".")
-			return TRUE
-	end,
-	["info"] = 	function()
-			return "level "..get_level(INERTIA_CONTROL, 10)
-	end,
-	["desc"] = 	{
-			"Changes the energy flow of a spell to be continuously recasted",
-			"at a given interval. The inertia controlled spell reduces your",
-			"maximum mana by four times its cost.",
-	}
-}
diff --git a/lib/mods/theme/scpt/s_mind.lua b/lib/mods/theme/scpt/s_mind.lua
deleted file mode 100644
index d1b25e9e..00000000
--- a/lib/mods/theme/scpt/s_mind.lua
+++ /dev/null
@@ -1,132 +0,0 @@
--- handle the mind school
-
-CHARM = add_spell
-{
-	["name"] = 	"Charm",
-	["school"] = 	{SCHOOL_MIND},
-	["level"] = 	1,
-	["mana"] = 	1,
-	["mana_max"] = 	20,
-	["fail"] = 	10,
-	["stick"] =
-	{
-			["charge"] =    { 7, 5 },
-			[TV_WAND] =
-			{
-				["rarity"] = 		35,
-				["base_level"] =	{ 1, 15 },
-				["max_level"] =		{ 20, 40 },
-			},
-	},
-	["spell"] = 	function()
-			if get_level(CHARM, 50) >= 35 then
-				return project_los(GF_CHARM, 10 + get_level(CHARM, 150))
-			elseif get_level(CHARM, 50) >= 15 then
-				local ret, dir = get_aim_dir()
-				if ret == FALSE then return end
-				return fire_ball(GF_CHARM, dir, 10 + get_level(CHARM, 150), 3)
-			else
-				local ret, dir = get_aim_dir()
-				if ret == FALSE then return end
-				return fire_bolt(GF_CHARM, dir, 10 + get_level(CHARM, 150))
-			end
-	end,
-	["info"] = 	function()
-			return "power "..(10 + get_level(CHARM, 150))
-	end,
-	["desc"] =	{
-			"Tries to manipulate the mind of a monster to make it friendly",
-			"At level 15 it turns into a ball",
-			"At level 35 it affects all monsters in sight"
-	}
-}
-
-CONFUSE = add_spell
-{
-	["name"] = 	"Confuse",
-	["school"] = 	{SCHOOL_MIND},
-	["level"] = 	5,
-	["mana"] = 	5,
-	["mana_max"] = 	30,
-	["fail"] = 	20,
-	["stick"] =
-	{
-			["charge"] =    { 3, 4 },
-			[TV_WAND] =
-			{
-				["rarity"] = 		45,
-				["base_level"] =	{ 1, 5 },
-				["max_level"] =		{ 20, 40 },
-			},
-	},
-	["spell"] = 	function()
-			if get_level(CONFUSE, 50) >= 35 then
-				return project_los(GF_OLD_CONF, 10 + get_level(CONFUSE, 150))
-			elseif get_level(CONFUSE, 50) >= 15 then
-				local ret, dir = get_aim_dir()
-				if ret == FALSE then return end
-				return fire_ball(GF_OLD_CONF, dir, 10 + get_level(CONFUSE, 150), 3)
-			else
-				local ret, dir = get_aim_dir()
-				if ret == FALSE then return end
-				return fire_bolt(GF_OLD_CONF, dir, 10 + get_level(CONFUSE, 150))
-			end
-	end,
-	["info"] = 	function()
-			return "power "..(10 + get_level(CONFUSE, 150))
-	end,
-	["desc"] =	{
-			"Tries to manipulate the mind of a monster to confuse it",
-			"At level 15 it turns into a ball",
-			"At level 35 it affects all monsters in sight"
-	}
-}
-
-ARMOROFFEAR = add_spell
-{
-	["name"] = 	"Armor of Fear",
-	["school"] = 	SCHOOL_MIND,
-	["level"] = 	10,
-	["mana"] = 	10,
-	["mana_max"] = 	50,
-	["fail"] = 	35,
-	["inertia"] = 	{ 2, 20 },
-	["spell"] = 	function()
-			return set_shield(randint(10) + 10 + get_level(ARMOROFFEAR, 100), 10, SHIELD_FEAR, 1 + get_level(ARMOROFFEAR, 7), 5 + get_level(ARMOROFFEAR, 20))
-	end,
-	["info"] = 	function()
-			return "dur "..(10 + get_level(ARMOROFFEAR, 100)).." power "..(1 + get_level(ARMOROFFEAR, 7)).."d"..(5 + get_level(ARMOROFFEAR, 20))
-	end,
-	["desc"] =	{
-			"Creates a shield of pure fear around you. Any monster attempting to hit you",
-			"must save or flee",
-		}
-}
-
-STUN = add_spell
-{
-	["name"] = 	"Stun",
-	["school"] = 	{SCHOOL_MIND},
-	["level"] = 	15,
-	["mana"] = 	10,
-	["mana_max"] = 	90,
-	["fail"] = 	45,
-	["spell"] = 	function()
-			if get_level(STUN, 50) >= 20 then
-				local ret, dir = get_aim_dir()
-				if ret == FALSE then return end
-				return fire_ball(GF_STUN, dir, 10 + get_level(STUN, 150), 3)
-			else
-				local ret, dir = get_aim_dir()
-				if ret == FALSE then return end
-				return fire_bolt(GF_STUN, dir, 10 + get_level(STUN, 150))
-			end
-	end,
-	["info"] = 	function()
-			return "power "..(10 + get_level(STUN, 150))
-	end,
-	["desc"] =	{
-			"Tries to manipulate the mind of a monster to stun it",
-			"At level 20 it turns into a ball",
-	}
-}
diff --git a/lib/mods/theme/scpt/s_music.lua b/lib/mods/theme/scpt/s_music.lua
deleted file mode 100644
index 9da6393a..00000000
--- a/lib/mods/theme/scpt/s_music.lua
+++ /dev/null
@@ -1,443 +0,0 @@
--- handle the music school
--- *ALL* lasting spell must return the mana cost in the lasting function
-
-MUSIC_STOP = add_spell
-{
-	["name"] =      "Stop singing(I)",
-	["school"] =    {SCHOOL_MUSIC},
-	["level"] =     1,
-	["mana"] =      0,
-	["mana_max"] =  0,
-	["fail"] =      -400,
-	["stat"] =      A_CHR,
-	["random"] =    SKILL_MUSIC,
-	["pval"] =      1,
-	["blind"] =     FALSE,
-	["spell"] =     function()
-			player.start_lasting_spell(0)
-			return TRUE
-	end,
-	["info"] =      function()
-			return ""
-	end,
-	["desc"] =      {
-			"Stops the current song, if any."
-	}
-}
-
---- Drums
-MUSIC_HOLD = add_spell
-{
-	["name"] =      "Holding Pattern(I)",
-	["school"] =    {SCHOOL_MUSIC},
-	["level"] =     1,
-	["mana"] =      1,
-	["mana_max"] =  10,
-	["fail"] =      20,
-	["stat"] =      A_CHR,
-	["random"] =    SKILL_MUSIC,
-	["pval"] =      1,
-	["blind"] =     FALSE,
-	["lasting"] =   function()
-			project_los(GF_OLD_SLOW, 10 + get_level(MUSIC_HOLD, 100))
-			return get_mana(MUSIC_HOLD)
-	end,
-	["spell"] =     function()
-			player.start_lasting_spell(MUSIC_HOLD)
-			return TRUE
-	end,
-	["info"] =      function()
-			return "power "..(10 + get_level(MUSIC_HOLD, 100))
-	end,
-	["desc"] =      {
-			"Slows down all monsters listening the song.",
-			"Consumes the amount of mana each turn.",
-	}
-}
-
-MUSIC_CONF = add_spell
-{
-	["name"] =      "Illusion Pattern(II)",
-	["school"] =    {SCHOOL_MUSIC},
-	["level"] =     5,
-	["mana"] =      2,
-	["mana_max"] =  15,
-	["fail"] =      30,
-	["stat"] =      A_CHR,
-	["random"] =    SKILL_MUSIC,
-	["pval"] =      2,
-	["blind"] =     FALSE,
-	["lasting"] =   function()
-			project_los(GF_OLD_CONF, 10 + get_level(MUSIC_CONF, 100))
-			return get_mana(MUSIC_CONF)
-	end,
-	["spell"] =     function()
-			player.start_lasting_spell(MUSIC_CONF)
-			return TRUE
-	end,
-	["info"] =      function()
-			return "power "..(10 + get_level(MUSIC_CONF, 100))
-	end,
-	["desc"] =      {
-			"Tries to confuse all monsters listening the song.",
-			"Consumes the amount of mana each turn.",
-	}
-}
-
-MUSIC_STUN = add_spell
-{
-	["name"] =      "Stun Pattern(IV)",
-	["school"] =    {SCHOOL_MUSIC},
-	["level"] =     10,
-	["mana"] =      3,
-	["mana_max"] =  25,
-	["fail"] =      45,
-	["stat"] =      A_CHR,
-	["random"] =    SKILL_MUSIC,
-	["pval"] =      4,
-	["blind"] =     FALSE,
-	["lasting"] =   function()
-			project_los(GF_STUN, 10 + get_level(MUSIC_STUN, 90))
-			return get_mana(MUSIC_STUN)
-	end,
-	["spell"] =     function()
-			player.start_lasting_spell(MUSIC_STUN)
-			return TRUE
-	end,
-	["info"] =      function()
-			return "power "..(10 + get_level(MUSIC_STUN, 90))
-	end,
-	["desc"] =      {
-			"Stuns all monsters listening the song.",
-			"Consumes the amount of mana each turn.",
-	}
-}
-
---- Harps
-MUSIC_LITE = add_spell
-{
-	["name"] =      "Song of the Sun(I)",
-	["school"] =    {SCHOOL_MUSIC},
-	["level"] =     1,
-	["mana"] =      1,
-	["mana_max"] =  1,
-	["fail"] =      20,
-	["stat"] =      A_CHR,
-	["random"] =    SKILL_MUSIC,
-	["blind"] =     FALSE,
-	["pval"] =      1,
-	["lasting"] =   function()
-			set_lite(5)
-			return 1
-	end,
-	["spell"] =     function()
-			player.start_lasting_spell(MUSIC_LITE)
-			return TRUE
-	end,
-	["info"] =      function()
-			return ""
-	end,
-	["desc"] =      {
-			"Provides light as long as you sing.",
-			"Consumes the amount of mana each turn.",
-	}
-}
-
-MUSIC_HEAL = add_spell
-{
-	["name"] =      "Flow of Life(II)",
-	["school"] =    {SCHOOL_MUSIC},
-	["level"] =     7,
-	["mana"] =      5,
-	["mana_max"] =  30,
-	["fail"] =      35,
-	["stat"] =      A_CHR,
-	["random"] =    SKILL_MUSIC,
-	["pval"] =      2,
-	["lasting"] =   function()
-			hp_player(7 + get_level(MUSIC_HEAL, 100))
-			return get_mana(MUSIC_HEAL)
-	end,
-	["spell"] =     function()
-			player.start_lasting_spell(MUSIC_HEAL)
-			return TRUE
-	end,
-	["info"] =      function()
-			return "heal "..(7 + get_level(MUSIC_HEAL, 100)).."/turn"
-	end,
-	["desc"] =      {
-			"Heals you as long as you sing.",
-			"Consumes the amount of mana each turn.",
-	}
-}
-
-MUSIC_HERO = add_spell
-{
-	["name"] =      "Heroic Ballad(II)",
-	["school"] =    {SCHOOL_MUSIC},
-	["level"] =     10,
-	["mana"] =      4,
-	["mana_max"] =  14,
-	["fail"] =      45,
-	["stat"] =      A_CHR,
-	["random"] =    SKILL_MUSIC,
-	["pval"] =      2,
-	["lasting"] =   function()
-			set_hero(5)
-			if get_level(MUSIC_HERO) >= 10 then
-				set_shero(5)
-			end
-			if get_level(MUSIC_HERO) >= 20 then
-				set_strike(5)
-			end
-			if get_level(MUSIC_HERO) >= 25 then
-				set_oppose_cc(5)
-			end
-			return get_mana(MUSIC_HERO)
-	end,
-	["spell"] =     function()
-			player.start_lasting_spell(MUSIC_HERO)
-			return TRUE
-	end,
-	["info"] =      function()
-			return ""
-	end,
-	["desc"] =      {
-			"Increases melee accuracy",
-			"At level 10 it increases it even more and reduces armour a bit",
-			"At level 20 it increases it again",
-			"At level 25 it grants protection against chaos and confusion",
-			"Consumes the amount of mana each turn.",
-	}
-}
-
-MUSIC_TIME = add_spell
-{
-	["name"] =      "Hobbit Melodies(III)",
-	["school"] =    {SCHOOL_MUSIC},
-	["level"] =     20,
-	["mana"] =      10,
-	["mana_max"] =  30,
-	["fail"] =      70,
-	["stat"] =      A_CHR,
-	["random"] =    SKILL_MUSIC,
-	["pval"] =      3,
-	["lasting"] =   function()
-			set_shield(5, 10 + get_level(MUSIC_TIME, 50), 0, 0, 0)
-			if get_level(MUSIC_TIME) >= 15 then
-				set_fast(5, 7 + get_level(MUSIC_TIME, 10))
-			end
-			return get_mana(MUSIC_TIME)
-	end,
-	["spell"] =     function()
-			player.start_lasting_spell(MUSIC_TIME)
-			return TRUE
-	end,
-	["info"] =      function()
-			if get_level(MUSIC_TIME) >= 15 then
-				return "AC "..(10 + get_level(MUSIC_TIME, 50)).." speed "..(7 + get_level(MUSIC_TIME, 10))
-			else
-				return "AC "..(10 + get_level(MUSIC_TIME, 50))
-			end
-	end,
-	["desc"] =      {
-			"Greatly increases your reflexes allowing you to block more melee blows.",
-			"At level 15 it also makes you faster.",
-			"Consumes the amount of mana each turn.",
-	}
-}
-
-MUSIC_MIND = add_spell
-{
-	["name"] =      "Clairaudience(IV)",
-	["school"] =    {SCHOOL_MUSIC},
-	["level"] =     25,
-	["mana"] =      15,
-	["mana_max"] =  30,
-	["fail"] =      75,
-	["stat"] =      A_CHR,
-	["random"] =    SKILL_MUSIC,
-	["pval"] =      4,
-	["lasting"] =   function()
-			set_tim_esp(5)
-			if get_level(MUSIC_MIND) >= 10 then
-				fire_ball(GF_IDENTIFY, 0, 1, 1 + get_level(MUSIC_MIND, 3, 0))
-			end
-			return get_mana(MUSIC_MIND)
-	end,
-	["spell"] =     function()
-			player.start_lasting_spell(MUSIC_MIND)
-			return TRUE
-	end,
-	["info"] =      function()
-			if get_level(MUSIC_MIND) >= 10 then
-				return "rad "..(1 + get_level(MUSIC_MIND, 3, 0))
-			else
-				return ""
-			end
-	end,
-	["desc"] =      {
-			"Allows you to sense monster minds as long as you sing.",
-			"At level 10 it identifies all objects in a radius on the floor,",
-			"as well as probing monsters in that radius.",
-			"Consumes the amount of mana each turn.",
-	}
-}
-
---- Horns
-
-MUSIC_BLOW = add_spell
-{
-	["name"] =      "Blow(I)",
-	["school"] =    {SCHOOL_MUSIC},
-	["level"] =     4,
-	["mana"] =      3,
-	["mana_max"] =  30,
-	["fail"] =      20,
-	["stat"] =      A_CHR,
-	["random"] =    SKILL_MUSIC,
-	["pval"] =      1,
-	["spell"] =     function()
-			fire_ball(GF_SOUND,
-				  0,
-				  damroll(2 + get_level(MUSIC_BLOW, 10, 0), 4 + get_level(MUSIC_BLOW, 40, 0)),
-				  1 + get_level(MUSIC_BLOW, 12, 0)
-				 )
-			return TRUE
-	end,
-	["info"] =      function()
-			return "dam "..(2 + get_level(MUSIC_BLOW, 10, 0)).."d"..(4 + get_level(MUSIC_BLOW, 40, 0)).." rad "..(1 + get_level(MUSIC_BLOW, 12, 0))
-	end,
-	["desc"] =      {
-			"Produces a powerful, blowing, sound all around you.",
-	}
-}
-
-MUSIC_WIND = add_spell
-{
-	["name"] =      "Gush of Wind(II)",
-	["school"] =    {SCHOOL_MUSIC},
-	["level"] =     14,
-	["mana"] =      15,
-	["mana_max"] =  45,
-	["fail"] =      30,
-	["stat"] =      A_CHR,
-	["random"] =    SKILL_MUSIC,
-	["pval"] =      2,
-	["spell"] =     function()
-			fire_ball(GF_AWAY_ALL,
-				  0,
-				  10 + get_level(MUSIC_BLOW, 40, 0),
-				  1 + get_level(MUSIC_BLOW, 12, 0)
-				 )
-			return TRUE
-	end,
-	["info"] =      function()
-			return "dist "..(10 + get_level(MUSIC_BLOW, 40, 0)).." rad "..(1 + get_level(MUSIC_BLOW, 12, 0))
-	end,
-	["desc"] =      {
-			"Produces a outgoing gush of wind that sends monsters away.",
-	}
-}
-
-MUSIC_YLMIR = add_spell
-{
-	["name"] =      "Horns of Ylmir(III)",
-	["school"] =    {SCHOOL_MUSIC},
-	["level"] =     20,
-	["mana"] =      25,
-	["mana_max"] =  30,
-	["fail"] =      20,
-	["stat"] =      A_CHR,
-	["random"] =    SKILL_MUSIC,
-	["pval"] =      3,
-	["spell"] =     function()
-			earthquake(player.py, player.px, 2 + get_level(SHAKE, 10))
-			return TRUE
-	end,
-	["info"] =      function()
-			return "rad "..(2 + get_level(SHAKE, 10))
-	end,
-	["desc"] =      {
-			"Produces an earth shaking sound.",
-	}
-}
-
-MUSIC_AMBARKANTA = add_spell
-{
-	["name"] =      "Ambarkanta(IV)",
-	["school"] =    {SCHOOL_MUSIC},
-	["level"] =     25,
-	["mana"] =      70,
-	["mana_max"] =  70,
-	["fail"] =      60,
-	["stat"] =      A_CHR,
-	["random"] =    SKILL_MUSIC,
-	["pval"] =      4,
-	["spell"] =     function()
-			alter_reality()
-			return TRUE
-	end,
-	["info"] =      function()
-			return ""
-	end,
-	["desc"] =      {
-			"Produces a reality shaking sound that transports you to a nearly",
-			"identical reality.",
-	}
-}
-
-
---[[
-MUSIC_ = add_spell
-{
-	["name"] =      "(I)",
-	["school"] =    {SCHOOL_MUSIC},
-	["level"] =     1,
-	["mana"] =      0,
-	["mana_max"] =  0,
-	["fail"] =      20,
-	["stat"] =      A_CHR,
-	["random"] =    SKILL_MUSIC,
-	["pval"] =      1,
-	["lasting"] =   function()
-			return get_mana(MUSIC_)
-	end,
-	["spell"] =     function()
-			player.start_lasting_spell(MUSIC_)
-			return TRUE
-	end,
-	["info"] =      function()
-			return ""
-	end,
-	["desc"] =      {
-			"",
-			"Consumes the amount of mana each turn.",
-	}
-}
-
-or
-
-MUSIC_ = add_spell
-{
-	["name"] =      "(I)",
-	["school"] =    {SCHOOL_MUSIC},
-	["level"] =     1,
-	["mana"] =      0,
-	["mana_max"] =  0,
-	["fail"] =      20,
-	["stat"] =      A_CHR,
-	["random"] =    SKILL_MUSIC,
-	["pval"] =      1,
-	["spell"] =     function()
-
-			return TRUE
-	end,
-	["info"] =      function()
-			return ""
-	end,
-	["desc"] =      {
-			"",
-	}
-}
-]]
diff --git a/lib/mods/theme/scpt/s_nature.lua b/lib/mods/theme/scpt/s_nature.lua
deleted file mode 100644
index 3d44c569..00000000
--- a/lib/mods/theme/scpt/s_nature.lua
+++ /dev/null
@@ -1,184 +0,0 @@
--- handle the nature school
-
-GROWTREE = add_spell
-{
-	["name"] = 	"Grow Trees",
-	["school"] = 	{SCHOOL_NATURE, SCHOOL_TEMPORAL},
-	["level"] = 	6,
-	["mana"] = 	6,
-	["mana_max"] = 	30,
-	["fail"] = 	35,
-	["inertia"] = 	{ 5, 50 },
-	["spell"] = 	function()
-			grow_trees(2 + get_level(GROWTREE, 7))
-			return TRUE
-	end,
-	["info"] = 	function()
-			return "rad "..(2 + get_level(GROWTREE, 7))
-	end,
-	["desc"] =	{
-			"Makes trees grow extremely quickly around you",
-	}
-}
-
-HEALING = add_spell
-{
-	["name"] = 	"Healing",
-	["school"] = 	{SCHOOL_NATURE},
-	["level"] = 	10,
-	["mana"] = 	15,
-	["mana_max"] = 	50,
-	["fail"] = 	45,
-	["stick"] =
-	{
-			["charge"] =    { 2, 3 },
-			[TV_STAFF] =
-			{
-				["rarity"] = 		90,
-				["base_level"] =	{ 1, 5 },
-				["max_level"] =		{ 20, 40 },
-			},
-	},
-	["spell"] = 	function()
-			return hp_player(player.mhp * (15 + get_level(HEALING, 35)) / 100)
-	end,
-	["info"] = 	function()
-			return "heal "..(15 + get_level(HEALING, 35)).."% = "..(player.mhp * (15 + get_level(HEALING, 35)) / 100).."hp"
-	end,
-	["desc"] =	{
-			"Heals a percent of hitpoints",
-	}
-}
-
-RECOVERY = add_spell
-{
-	["name"] = 	"Recovery",
-	["school"] = 	{SCHOOL_NATURE},
-	["level"] = 	15,
-	["mana"] = 	10,
-	["mana_max"] = 	25,
-	["fail"] = 	60,
-	["stick"] =
-	{
-			["charge"] =    { 5, 10 },
-			[TV_STAFF] =
-			{
-				["rarity"] = 		50,
-				["base_level"] =	{ 1, 5 },
-				["max_level"] =		{ 10, 30 },
-			},
-	},
-	["inertia"] = 	{ 2, 100 },
-	["spell"] = 	function()
-			local obvious
-			obvious = set_poisoned(player.poisoned / 2)
-			if get_level(RECOVERY, 50) >= 5 then
-				obvious = is_obvious(set_poisoned(0), obvious)
-				obvious = is_obvious(set_cut(0), obvious)
-			end
-			if get_level(RECOVERY, 50) >= 10 then
-				obvious = is_obvious(do_res_stat(A_STR, TRUE), obvious)
-				obvious = is_obvious(do_res_stat(A_CON, TRUE), obvious)
-				obvious = is_obvious(do_res_stat(A_DEX, TRUE), obvious)
-				obvious = is_obvious(do_res_stat(A_WIS, TRUE), obvious)
-				obvious = is_obvious(do_res_stat(A_INT, TRUE), obvious)
-				obvious = is_obvious(do_res_stat(A_CHR, TRUE), obvious)
-			end
-			if get_level(RECOVERY, 50) >= 15 then
-				obvious = is_obvious(restore_level(), obvious)
-			end
-			return obvious
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"Reduces the length of time that you are poisoned",
-			"At level 5 it cures poison and cuts",
-			"At level 10 it restores drained stats",
-			"At level 15 it restores lost experience"
-	}
-}
-
-REGENERATION = add_spell
-{
-	["name"] = 	"Regeneration",
-	["school"] = 	{SCHOOL_NATURE},
-	["level"] = 	20,
-	["mana"] = 	30,
-	["mana_max"] = 	55,
-	["fail"] = 	70,
-	["inertia"] = 	{ 4, 40 },
-	["spell"] = 	function()
-			if player.tim_regen == 0 then return set_tim_regen(randint(10) + 5 + get_level(REGENERATION, 50), 300 + get_level(REGENERATION, 700)) end
-	end,
-	["info"] = 	function()
-			return "dur "..(5 + get_level(REGENERATION, 50)).."+d10 power "..(300 + get_level(REGENERATION, 700))
-	end,
-	["desc"] =	{
-			"Increases your body's regeneration rate",
-	}
-}
-
-
-SUMMONANNIMAL = add_spell
-{
-	["name"] =      "Summon Animal",
-	["school"] = 	{SCHOOL_NATURE},
-	["level"] = 	25,
-	["mana"] = 	25,
-	["mana_max"] = 	50,
-	["fail"] = 	90,
-	["stick"] =
-	{
-			["charge"] =    { 1, 3 },
-			[TV_WAND] =
-			{
-				["rarity"] = 		85,
-				["base_level"] =	{ 1, 5 },
-				["max_level"] =		{ 15, 45 },
-			},
-	},
-	["spell"] = 	function()
-			summon_specific_level = 25 + get_level(SUMMONANNIMAL, 50)
-			return summon_monster(player.py, player.px, dun_level, TRUE, SUMMON_ANIMAL)
-	end,
-	["info"] = 	function()
-			return "level "..(25 + get_level(SUMMONANNIMAL, 50))
-	end,
-	["desc"] =	{
-			"Summons a leveled animal to your aid",
-	}
-}
-
--- From T-Plus
-GROW_ATHELAS = add_spell { 
-    ["name"] =      "Grow Athelas", 
-    ["school"] =    {SCHOOL_NATURE}, 
-    ["level"] =     30, 
-    ["mana"] =     60, 
-    ["mana_max"] = 100, 
-    ["fail"] =      95, 
-	["stick"] =
-	{
-			["charge"] =    { 1, 3 },
-			[TV_WAND] =
-			{
-				["rarity"] = 		85,
-				["base_level"] =	{ 1, 5 },
-				["max_level"] =		{ 15, 45 },
-			},
-	},
-    ["spell"] =    function() 
-        if (player.black_breath == TRUE) then 
-            msg_print("The hold of the Black Breath on you is broken!") 
-            player.black_breath = FALSE 
-        end 
-    end, 
-    ["info"] =    function() 
-        return "" 
-    end, 
-    ["desc"] =   { 
-        "Cures the Black Breath", 
-    } 
-}
diff --git a/lib/mods/theme/scpt/s_stick.lua b/lib/mods/theme/scpt/s_stick.lua
deleted file mode 100644
index 9bbd641a..00000000
--- a/lib/mods/theme/scpt/s_stick.lua
+++ /dev/null
@@ -1,494 +0,0 @@
--- Spells that are stick or artifacts/... only
-
-DEVICE_HEAL_MONSTER = add_spell
-{
-	["name"] = 	"Heal Monster",
-	["school"] = 	{SCHOOL_DEVICE},
-	["level"] = 	3,
-	["mana"] = 	5,
-	["mana_max"] = 	20,
-	["fail"] = 	15,
-	["random"] =    -1,
-	["stick"] =
-	{
-			["charge"] =    { 10, 10 },
-			[TV_WAND] =
-			{
-				["rarity"] = 		17,
-				["base_level"] =	{ 1, 15 },
-				["max_level"] =		{ 20, 50 },
-			},
-	},
-	["spell"] = 	function()
-			local ret, dir = get_aim_dir()
-			if ret == FALSE then return end
-
-			return fire_ball(GF_OLD_HEAL, dir, 20 + get_level(DEVICE_HEAL_MONSTER, 380), 0)
-	end,
-	["info"] = 	function()
-			return "heal "..(20 + get_level(DEVICE_HEAL_MONSTER, 380))
-	end,
-	["desc"] =	{
-			"Heals a monster",
-	}
-}
-
-DEVICE_SPEED_MONSTER = add_spell
-{
-	["name"] = 	"Haste Monster",
-	["school"] = 	{SCHOOL_DEVICE},
-	["level"] = 	10,
-	["mana"] = 	10,
-	["mana_max"] = 	10,
-	["fail"] = 	30,
-	["random"] =    -1,
-	["stick"] =
-	{
-			["charge"] =    { 10, 5 },
-			[TV_WAND] =
-			{
-				["rarity"] = 		7,
-				["base_level"] =	{ 1, 1 },
-				["max_level"] =		{ 20, 50 },
-			},
-	},
-	["spell"] = 	function()
-			local ret, dir = get_aim_dir()
-			if ret == FALSE then return end
-
-			return fire_ball(GF_OLD_SPEED, dir, 1, 0)
-	end,
-	["info"] = 	function()
-			return "speed +10"
-	end,
-	["desc"] =	{
-			"Haste a monster",
-	}
-}
-
-DEVICE_WISH = add_spell
-{
-	["name"] = 	"Wish",
-	["school"] = 	{SCHOOL_DEVICE},
-	["level"] = 	50,
-	["mana"] = 	400,
-	["mana_max"] = 	400,
-	["fail"] = 	99,
-	["random"] =    -1,
-	["stick"] =
-	{
-			["charge"] =    { 1, 2 },
-			[TV_STAFF] =
-			{
-				["rarity"] = 		98,
-				["base_level"] =	{ 1, 1 },
-				["max_level"] =		{ 1, 1 },
-			},
-	},
-	["spell"] = 	function()
-			make_wish()
-			return TRUE
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"This grants you a wish, beware of what you ask for!",
-	}
-}
-
-DEVICE_SUMMON = add_spell
-{
-	["name"] = 	"Summon",
-	["school"] = 	{SCHOOL_DEVICE},
-	["level"] = 	5,
-	["mana"] = 	5,
-	["mana_max"] = 	25,
-	["fail"] = 	20,
-	["random"] =    -1,
-	["stick"] =
-	{
-			["charge"] =    { 1, 20 },
-			[TV_STAFF] =
-			{
-				["rarity"] = 		13,
-				["base_level"] =	{ 1, 40 },
-				["max_level"] =		{ 25, 50 },
-			},
-	},
-	["spell"] = 	function()
-			local i, obvious
-			obvious = nil
-			for i = 1, 4 + get_level(DEVICE_SUMMON, 30) do
-				obvious = is_obvious(summon_specific(player.py, player.px, dun_level, 0), obvious)
-			end
-			return obvious
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"Summons hostile monsters near you",
-	}
-}
-
-DEVICE_MANA = add_spell
-{
-	["name"] = 	"Mana",
-	["school"] = 	{SCHOOL_DEVICE},
-	["level"] = 	30,
-	["mana"] = 	1,
-	["mana_max"] = 	1,
-	["fail"] = 	80,
-	["random"] =    -1,
-	["stick"] =
-	{
-			["charge"] =    { 2, 3 },
-			[TV_STAFF] =
-			{
-				["rarity"] = 		78,
-				["base_level"] =	{ 1, 5 },
-				["max_level"] =		{ 20, 35 },
-			},
-	},
-	["spell"] = 	function()
-			increase_mana((player.msp * (20 + get_level(DEVICE_MANA, 50))) / 100)
-			return TRUE
-	end,
-	["info"] = 	function()
-			return "restore "..(20 + get_level(DEVICE_MANA, 50)).."%"
-	end,
-	["desc"] =	{
-			"Restores a part(or all) of your mana",
-	}
-}
-
-DEVICE_NOTHING = add_spell
-{
-	["name"] = 	"Nothing",
-	["school"] = 	{SCHOOL_DEVICE},
-	["level"] = 	1,
-	["mana"] = 	0,
-	["mana_max"] = 	0,
-	["fail"] = 	0,
-	["random"] =    -1,
-	["stick"] =
-	{
-			["charge"] =    { 0, 0 },
-			[TV_WAND] =
-			{
-				["rarity"] = 		3,
-				["base_level"] =	{ 1, 1 },
-				["max_level"] =		{ 1, 1 },
-			},
-			[TV_STAFF] =
-			{
-				["rarity"] = 		3,
-				["base_level"] =	{ 1, 1 },
-				["max_level"] =		{ 1, 1},
-			},
-	},
-	["spell"] = 	function()
-			return FALSE
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"It does nothing.",
-	}
-}
-
-DEVICE_MAGGOT = add_spell
-{
-	["name"] = 	"Artifact Maggot",
-	["school"] = 	{SCHOOL_DEVICE},
-	["level"] = 	1,
-	["mana"] = 	7,
-	["mana_max"] = 	7,
-	["fail"] = 	20,
-	["random"] =    -1,
-	["activate"] =  { 10, 50 },
-	["spell"] = 	function()
-			local ret, dir = get_aim_dir()
-			if ret == FALSE then return end
-			return fire_ball(GF_TURN_ALL, dir, 40, 2)
-	end,
-	["info"] = 	function()
-			return "power 40 rad 2"
-	end,
-	["desc"] =	{
-			"terrify",
-	}
-}
-
-DEVICE_HOLY_FIRE = add_spell
-{
-	["name"] = 	"Holy Fire of Mithrandir",
-	["school"] = 	{SCHOOL_DEVICE},
-	["level"] = 	30,
-	["mana"] = 	50,
-	["mana_max"] = 	150,
-	["fail"] = 	75,
-	["random"] =    -1,
-	["stick"] =
-	{
-			["charge"] =    { 2, 5 },
-			[TV_STAFF] =
-			{
-				-- Rarity higher than 100 to be sure to not have it generated randomly
-				["rarity"] = 		999,
-				["base_level"] =	{ 1, 1 },
-				["max_level"] =		{ 35, 35 },
-			},
-	},
-	["spell"] = 	function()
-			return project_los(GF_HOLY_FIRE, 50 + get_level(DEVICE_HOLY_FIRE, 300))
-	end,
-	["info"] = 	function()
-			return "dam "..(50 + get_level(DEVICE_HOLY_FIRE, 250))
-	end,
-	["desc"] =	{
-			"The Holy Fire created by this staff will deeply(double damage) burn",
-			"all that is evil.",
-	}
-}
-
--- Ok the Eternal Flame, to craete one of the 4 ultimate arts
--- needed to enter the last level of the Void
-DEVICE_ETERNAL_FLAME = add_spell
-{
-	["name"] = 	"Artifact Eternal Flame",
-	["school"] = 	{SCHOOL_DEVICE},
-	["level"] = 	1,
-	["mana"] = 	0,
-	["mana_max"] = 	0,
-	["fail"] = 	0,
-	["random"] =    -1,
-	["activate"] =  { 0, 0 },
-	["spell"] = 	function(flame_item)
-			local ret, item, obj
-
-			ret, item = get_item("Which object do you want to imbue?",
-					     "You have no objects to imbue.",
-					     bor(USE_INVEN),
-					     function (obj)
-						if obj.name1 > 0 or obj.name2 > 0 then return FALSE end
-					     	if (obj.tval == TV_SWORD) and (obj.sval == SV_LONG_SWORD) then
-							return TRUE
-					     	elseif (obj.tval == TV_MSTAFF) and (obj.sval == SV_MSTAFF) then
-							return TRUE
-					     	elseif (obj.tval == TV_BOW) and (obj.sval == SV_HEAVY_XBOW) then
-							return TRUE
-					     	elseif (obj.tval == TV_DRAG_ARMOR) and (obj.sval == SV_DRAGON_POWER) then
-							return TRUE
-					     	elseif (obj.tval == TV_HAFTED) and (obj.sval == SV_LUCERN_HAMMER) then
-							return TRUE
-					     	elseif (obj.tval == TV_POLEARM) and (obj.sval == SV_TRIDENT) then
-							return TRUE
-					     	elseif (obj.tval == TV_AXE) and (obj.sval == SV_BATTLE_AXE) then
-							return TRUE
-					     	elseif (obj.tval == TV_BOW) and (obj.sval == SV_LONG_BOW) then
-							return TRUE
-					     	elseif (obj.tval == TV_BOOMERANG) and (obj.sval == SV_BOOM_METAL) then
-							return TRUE
-					     	elseif (obj.tval == TV_BOW) and (obj.sval == SV_SLING) then
-							return TRUE
-					     	elseif (obj.tval == TV_SWORD) and (obj.sval == SV_RAPIER) then
-							return TRUE
-					     	elseif (obj.tval == TV_AMULET) and (obj.sval == SV_AMULET_SPELL) then
-							return TRUE
-					     	end
-						return FALSE
-					     end
-			)
-			if ret == FALSE then return FALSE end
-
-			obj = get_object(item)
-
-			if (obj.tval == TV_SWORD) and (obj.sval == SV_LONG_SWORD) then
-				obj.name1 = 147
-			elseif (obj.tval == TV_MSTAFF) and (obj.sval == SV_MSTAFF) then
-				obj.name1 = 127
-			elseif (obj.tval == TV_BOW) and (obj.sval == SV_HEAVY_XBOW) then
-				obj.name1 = 152
-			elseif (obj.tval == TV_DRAG_ARMOR) and (obj.sval == SV_DRAGON_POWER) then
-				obj.name1 = 17
-			elseif (obj.tval == TV_HAFTED) and (obj.sval == SV_LUCERN_HAMMER) then
-				obj.name1 = 241
-			elseif (obj.tval == TV_POLEARM) and (obj.sval == SV_TRIDENT) then
-				obj.name1 = 242
-			elseif (obj.tval == TV_AXE) and (obj.sval == SV_BROAD_AXE) then
-				obj.name1 = 243
-			elseif (obj.tval == TV_BOW) and (obj.sval == SV_LONG_BOW) then
-				obj.name1 = 245
-			elseif (obj.tval == TV_BOOMERANG) and (obj.sval == SV_BOOM_METAL) then
-				obj.name1 = 247
-			elseif (obj.tval == TV_BOW) and (obj.sval == SV_SLING) then
-				obj.name1 = 246
-			elseif (obj.tval == TV_SWORD) and (obj.sval == SV_RAPIER) then
-				obj.name1 = 244
-			elseif (obj.tval == TV_AMULET) and (obj.sval == SV_AMULET_SPELL) then
-				obj.name1 = 248
-			end
-			apply_magic(obj, -1, TRUE, TRUE, TRUE)
-
-			obj.found = OBJ_FOUND_SELFMADE
-
-			inven_item_increase(flame_item, -1)
-			inven_item_describe(flame_item)
-			inven_item_optimize(flame_item)
-
-			return TRUE
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"Imbuing an object with the eternal fire",
-	}
-}
-
-DEVICE_THUNDERLORDS = add_spell
-{
-	["name"] = 	"Artifact Thunderlords",
-	["school"] = 	{SCHOOL_DEVICE},
-	["level"] = 	1,
-	["mana"] = 	1,
-	["mana_max"] = 	1,
-	["fail"] = 	20,
-	["random"] =    -1,
-	["stick"] =
-	{
-			["charge"] =    { 5, 5 },
-			[TV_STAFF] =
-			{
-				-- Rarity higher than 100 to be sure to not have it generated randomly
-				["rarity"] = 		999,
-				["base_level"] =	{ 1, 1 },
-				["max_level"] =		{ 1, 1 },
-			},
-	},
-	["spell"] = 	function()
-			if dun_level > 0 then
-				msg_print("As you blow the horn, an Eagle of Manwe appears overhead.")
-				recall_player(0, 1)
-			else
-				msg_print("You cannot use it there.")
-			end
-			return TRUE
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"An Eagle of Manwe will appear to transport you quickly to the town.",
-	}
-}
-
--- Two new spells from T-Plus by Ingeborg S. Norden, for artifact activations:
-
-DEVICE_RADAGAST = add_spell
-{
-	["name"] = "Artifact Radagast",
-	["school"] = {SCHOOL_DEVICE},
-	["level"] = 1,
-	["mana"] = 0,
-	["mana_max"] = 0,
-	["fail"] = 10,
-	["random"] = -1,
-	["activate"] = 15000,
-	["spell"] = function()
-	msg_print(TERM_GREEN, "The staff's power cleanses you completely!")
-	remove_all_curse()
-	do_res_stat(A_STR, TRUE)
-	do_res_stat(A_CON, TRUE)
-	do_res_stat(A_DEX, TRUE)
-	do_res_stat(A_WIS, TRUE)
-	do_res_stat(A_INT, TRUE)
-	do_res_stat(A_CHR, TRUE)
-	restore_level()
-	clean_corruptions()
-	hp_player(5000)
-	heal_insanity(5000)
-	set_poisoned(0)
-	set_blind(0)
-	set_confused(0)
-	set_image(0)
-	set_stun(0)
-	set_cut(0)
-	set_parasite(0, 0)
-
-	if (player.black_breath) == TRUE then
-	msg_print("The hold of the Black Breath on you is broken!")
-	end
-	player.black_breath = FALSE
-
-	player.update = bor(player.update, PU_BONUS)
-	player.window = bor(player.window, PW_PLAYER)
-
-	return TRUE
-	end,
-
-	["info"] = function()
-	return ""
-	end,
-
-	["desc"] = {
-	"purity and health",
-	}
-}
-
-DEVICE_VALAROMA = add_spell
-{
-	["name"] = 	"Artifact Valaroma",
-	["school"] = 	{SCHOOL_DEVICE},
-	["level"] = 	1,
-	["mana"] = 	0,
-	["mana_max"] = 	0,
-	["fail"] = 	25,
-	["random"] =    -1,
-	["activate"] =  250,
-	["spell"] = 	function()
-				local power = 5 * player.lev
-				banish_evil(power)
-			return FALSE
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"banish evil (level x5)",
-	}
-}
---[[ Template
-DEVICE_ = add_spell
-{
-	["name"] = 	"",
-	["school"] = 	{SCHOOL_DEVICE},
-	["level"] = 	1,
-	["mana"] = 	2,
-	["mana_max"] = 	15,
-	["fail"] = 	10,
-	["random"] =    -1,
-	["stick"] =
-	{
-			["charge"] =    { 10, 5 },
-			[TV_STAFF] =
-			{
-				["rarity"] = 		7,
-				["base_level"] =	{ 1, 15 },
-				["max_level"] =		{ 25, 50 },
-			},
-	},
-	["spell"] = 	function()
-			return FALSE
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"",
-	}
-}
-]]
diff --git a/lib/mods/theme/scpt/s_tempo.lua b/lib/mods/theme/scpt/s_tempo.lua
deleted file mode 100644
index d3d2fbb5..00000000
--- a/lib/mods/theme/scpt/s_tempo.lua
+++ /dev/null
@@ -1,162 +0,0 @@
--- Handles thhe temporal school
-
-
-MAGELOCK = add_spell
-{
-	["name"] = 	"Magelock",
-	["school"] = 	{SCHOOL_TEMPORAL},
-	["level"] = 	1,
-	["mana"] = 	1,
-	["mana_max"] = 	35,
-	["fail"] = 	10,
-	["stick"] =
-	{
-			["charge"] =    { 7, 5 },
-			[TV_WAND] =
-			{
-				["rarity"] = 		30,
-				["base_level"] =	{ 1, 5 },
-				["max_level"] =		{ 15, 45 },
-			},
-	},
-	["spell"] = 	function()
-			if get_level(MAGELOCK, 50) >= 30 then
-				local ret, x, y, c_ptr
-
-				if get_level(MAGELOCK, 50) >= 40 then
-					ret, x, y = tgt_pt()
-					if ret == FALSE then return end
-					if cave_is(cave(y, x), FF1_FLOOR) == FALSE or cave_is(cave(y, x), FF1_PERMANENT) == TRUE or los(player.py, player.px, y, x) == FALSE then
-						msg_print("You cannot place it there.")
-						return TRUE
-					end
-				else
-					y = player.py
-					x = player.px
-				end
-				cave_set_feat(y, x, 3)
-				return TRUE
-			else
-				ret, dir = get_aim_dir()
-				if ret == FALSE then return end
-				return wizard_lock(dir)
-			end
-	end,
-	["info"] = 	function()
-		       	return ""
-	end,
-	["desc"] =	{
-			"Magically locks a door",
-			"At level 30 it creates a glyph of warding",
-			"At level 40 the glyph can be placed anywhere in the field of vision"
-	}
-}
-
-SLOWMONSTER = add_spell
-{
-	["name"] = 	"Slow Monster",
-	["school"] = 	{SCHOOL_TEMPORAL},
-	["level"] = 	10,
-	["mana"] = 	10,
-	["mana_max"] = 	15,
-	["fail"] = 	35,
-	["stick"] =
-	{
-			["charge"] =    { 5, 5 },
-			[TV_WAND] =
-			{
-				["rarity"] = 		23,
-				["base_level"] =	{ 1, 15 },
-				["max_level"] =		{ 20, 50 },
-			},
-	},
-	["spell"] = 	function()
-	       		local ret, dir
-
-			ret, dir = get_aim_dir()
-			if ret == FALSE then return end
-			if get_level(SLOWMONSTER, 50) >= 20 then
-				return fire_ball(GF_OLD_SLOW, dir, 40 + get_level(SLOWMONSTER, 160), 1)
-			else
-				return fire_bolt(GF_OLD_SLOW, dir, 40 + get_level(SLOWMONSTER, 160))
-			end
-	end,
-	["info"] = 	function()
-			if get_level(SLOWMONSTER, 50) >= 20 then
-			       	return "power "..(40 + get_level(SLOWMONSTER, 160)).." rad 1"
-			else
-			       	return "power "..(40 + get_level(SLOWMONSTER, 160))
-			end
-	end,
-	["desc"] =	{
-			"Magically slows down the passing of time around a monster",
-			"At level 20 it affects a zone"
-	}
-}
-
-ESSENCESPEED = add_spell
-{
-	["name"] = 	"Essence of Speed",
-	["school"] = 	{SCHOOL_TEMPORAL},
-	["level"] = 	15,
-	["mana"] = 	20,
-	["mana_max"] = 	40,
-	["fail"] = 	50,
-	["stick"] =
-	{
-			["charge"] =    { 3, 3 },
-			[TV_WAND] =
-			{
-				["rarity"] = 		80,
-				["base_level"] =	{ 1, 1 },
-				["max_level"] =		{ 10, 39 },
-			},
-	},
-	["inertia"] = 	{ 5, 20 },
-	["spell"] = 	function()
-			if player.fast == 0 then return set_fast(10 + randint(10) + get_level(ESSENCESPEED, 50), 5 + get_level(ESSENCESPEED, 20)) end
-	end,
-	["info"] = 	function()
-		       	return "dur "..(10 + get_level(ESSENCESPEED, 50)).."+d10 speed "..(5 + get_level(ESSENCESPEED, 20))
-	end,
-	["desc"] =	{
-			"Magically decreases the passing of time around you, making you move faster with",
-			"respect to the rest of the universe."
-	}
-}
-
-BANISHMENT = add_spell
-{
-	["name"] = 	"Banishment",
-	["school"] = 	{SCHOOL_TEMPORAL, SCHOOL_CONVEYANCE},
-	["level"] = 	30,
-	["mana"] = 	30,
-	["mana_max"] = 	40,
-	["fail"] = 	95,
-	["stick"] =
-	{
-			["charge"] =    { 1, 3 },
-			[TV_WAND] =
-			{
-				["rarity"] = 		98,
-				["base_level"] =	{ 1, 15 },
-				["max_level"] =		{ 10, 36 },
-			},
-	},
-	["inertia"] = 	{ 5, 50 },
-	["spell"] = 	function()
-			local obvious
-			obvious = project_los(GF_AWAY_ALL, 40 + get_level(BANISHMENT, 160))
-			if get_level(BANISHMENT, 50) >= 15 then
-				obvious = is_obvious(project_los(GF_STASIS, 20 + get_level(BANISHMENT, 120)), obvious)
-			end
-			return obvious
-	end,
-	["info"] = 	function()
-		     	return "power "..(40 + get_level(BANISHMENT, 160))
-	end,
-	["desc"] =	{
-			"Disrupts the space/time continuum in your area and teleports all monsters away.",
-			"At level 15 it may also lock them in a time bubble for a while."
-	}
-}
diff --git a/lib/mods/theme/scpt/s_tulkas.lua b/lib/mods/theme/scpt/s_tulkas.lua
deleted file mode 100644
index 4afa8082..00000000
--- a/lib/mods/theme/scpt/s_tulkas.lua
+++ /dev/null
@@ -1,81 +0,0 @@
--- Handle Tulkas magic school
-
-TULKAS_AIM = add_spell
-{
-	["name"] =      "Divine Aim",
-	["school"] =    {SCHOOL_TULKAS},
-	["level"] =     1,
-	["mana"] =      30,
-	["mana_max"] =  500,
-	["fail"] = 	20,
-	-- Uses piety to cast
-	["piety"] =     TRUE,
-	["stat"] =      A_WIS,
-	["random"] = 	SKILL_SPIRITUALITY,
-	["spell"] = 	function()
-			local dur = get_level(TULKAS_AIM, 50) + randint(10)
-			local obvious
-
-			obvious = set_strike(dur)
-			if get_level(TULKAS_AIM) >= 20 then
-				obvious = is_obvious(set_tim_deadly(dur), obvious)
-			end
-			return obvious
-	end,
-	["info"] = 	function()
-			return "dur "..(get_level(TULKAS_AIM, 50)).."+d10"
-	end,
-	["desc"] =	{
-			"It makes you more accurate in combat",
-			"At level 20 all your blows are critical hits",
-	}
-}
-
-TULKAS_WAVE = add_spell
-{
-	["name"] =      "Wave of Power",
-	["school"] =    {SCHOOL_TULKAS},
-	["level"] =     20,
-	["mana"] =      200,
-	["mana_max"] =  200,
-	["fail"] = 	75,
-	-- Uses piety to cast
-	["piety"] =     TRUE,
-	["stat"] =      A_WIS,
-	["random"] = 	SKILL_SPIRITUALITY,
-	["spell"] = 	function()
-			local ret, dir = get_aim_dir()
-			if ret == FALSE then return end
-
-			return fire_bolt(GF_ATTACK, dir, get_level(TULKAS_WAVE, player.num_blow))
-	end,
-	["info"] = 	function()
-			return "blows "..(get_level(TULKAS_WAVE, player.num_blow))
-	end,
-	["desc"] =	{
-			"It allows you to project a number of melee blows across a distance",
-	}
-}
-
-TULKAS_SPIN = add_spell
-{
-	["name"] =      "Whirlwind",
-	["school"] =    {SCHOOL_TULKAS},
-	["level"] =     10,
-	["mana"] =      100,
-	["mana_max"] =  100,
-	["fail"] = 	45,
-	-- Uses piety to cast
-	["piety"] =     TRUE,
-	["stat"] =      A_WIS,
-	["random"] = 	SKILL_SPIRITUALITY,
-	["spell"] = 	function()
-			return fire_ball(GF_ATTACK, 0, 1, 1)
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"It allows you to spin around and hit all monsters nearby",
-	}
-}
diff --git a/lib/mods/theme/scpt/s_udun.lua b/lib/mods/theme/scpt/s_udun.lua
deleted file mode 100644
index c4266239..00000000
--- a/lib/mods/theme/scpt/s_udun.lua
+++ /dev/null
@@ -1,180 +0,0 @@
--- handle the udun school
-
-DRAIN = add_spell
-{
-	["name"] = 	"Drain",
-	["school"] = 	{SCHOOL_UDUN, SCHOOL_MANA},
-	["level"] = 	1,
-	["mana"] = 	0,
-	["mana_max"] = 	0,
-	["fail"] = 	20,
-	["spell"] = 	function()
-			local ret, item, obj, o_name, add
-
-			-- Ask for an item
-			ret, item = get_item("What item to drain?", "You have nothing you can drain", USE_INVEN,
-				function (obj)
-					if (obj.tval == TV_WAND) or (obj.tval == TV_ROD_MAIN) or (obj.tval == TV_STAFF) then
-						return TRUE
-					end
-					return FALSE
-				end
-			)
-
-			if ret == TRUE then
-				-- get the item
-				obj = get_object(item)
-
-				add = 0
-				if (obj.tval == TV_STAFF) or (obj.tval == TV_WAND) then
-					local kind = get_kind(obj)
-
-					add = kind.level * obj.pval * obj.number
-
-					-- Destroy it!
-					inven_item_increase(item, -99)
-					inven_item_describe(item)
-					inven_item_optimize(item)
-				end
-				if obj.tval == TV_ROD_MAIN then
-					add = obj.timeout
-					obj.timeout = 0;
-
-					--Combine / Reorder the pack (later)
-					player.notice = bor(player.notice, PN_COMBINE, PN_REORDER)
-					player.window = bor(player.window, PW_INVEN, PW_EQUIP, PW_PLAYER)
-				end
-				increase_mana(add)
-			end
-			return TRUE
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"Drains the mana contained in wands, staves and rods to increase yours",
-	}
-}
-
-GENOCIDE = add_spell
-{
-	["name"] = 	"Genocide",
-	["school"] = 	{SCHOOL_UDUN, SCHOOL_NATURE},
-	["level"] = 	25,
-	["mana"] = 	50,
-	["mana_max"] = 	50,
-	["fail"] = 	90,
-	["stick"] =
-	{
-			["charge"] =    { 2, 2 },
-			[TV_STAFF] =
-			{
-				["rarity"] = 		85,
-				["base_level"] =	{ 1, 1 },
-				["max_level"] =		{ 5, 15 },
-			},
-	},
-	["spell"] = 	function()
-			local type
-
-			type = 0
-			if get_level(GENOCIDE) >= 10 then type = 1 end
-			if type == 0 then
-				genocide(TRUE)
-				return TRUE
-			else
-				if get_check("Genocide all monsters near you? ") == TRUE then
-					mass_genocide(TRUE)
-				else
-					genocide(TRUE)
-				end
-				return TRUE
-			end
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"Genocides all monsters of a race on the level",
-			"At level 10 it can genocide all monsters near you"
-	}
-}
-
-WRAITHFORM = add_spell
-{
-	["name"] = 	"Wraithform",
-	["school"] = 	{SCHOOL_UDUN, SCHOOL_CONVEYANCE},
-	["level"] = 	30,
-	["mana"] = 	20,
-	["mana_max"] = 	40,
-	["fail"] = 	95,
-	["inertia"] = 	{ 4, 30 },
-	["spell"] = 	function()
-		       	return set_shadow(randint(30) + 20 + get_level(WRAITHFORM, 40))
-	end,
-	["info"] = 	function()
-			return "dur "..(20 + get_level(WRAITHFORM, 40)).."+d30"
-	end,
-	["desc"] =	{
-			"Turns you into an immaterial being",
-	}
-}
-
-FLAMEOFUDUN = add_spell
-{
-	["name"] = 	"Flame of Udun",
-	["school"] = 	{SCHOOL_UDUN, SCHOOL_FIRE},
-	["level"] = 	35,
-	["mana"] = 	70,
-	["mana_max"] = 	100,
-	["fail"] = 	95,
-	["inertia"] = 	{ 7, 15 },
-	["spell"] = 	function()
-			return set_mimic(randint(15) + 5 + get_level(FLAMEOFUDUN, 30), resolve_mimic_name("Balrog"), get_level(FLAMEOFUDUN))
-	end,
-	["info"] = 	function()
-			return "dur "..(5 + get_level(FLAMEOFUDUN, 30)).."+d15"
-	end,
-	["desc"] =	{
-			"Turns you into a powerful Balrog",
-	}
-}
-
-
--- Return the number of Udun/Melkor spells in a given book
-function udun_in_book(sval, pval)
-	local i, y, index, sch, s
-
-	i = 0
-
-	-- Hack if the book is 255 it is a random book
-	if sval == 255 then
-		school_book[sval] = {pval}
-	end
-	-- Parse all spells
-	for index, s in school_book[sval] do
-		for index, sch in __spell_school[s] do
-			if sch == SCHOOL_UDUN then i = i + 1 end
-			if sch == SCHOOL_MELKOR then i = i + 1 end
-		end
-	end
-	return i
-end
-
--- Return the total level of spells
-function levels_in_book(sval, pval)
-	local i, y, index, sch, s
-
-	i = 0
-
-	-- Hack if the book is 255 it is a random book
-	if sval == 255 then
-		school_book[sval] = {pval}
-	end
-
-	-- Parse all spells
-	for index, s in school_book[sval] do
-		i = i + __tmp_spells[s].level
-	end
-	return i
-end
diff --git a/lib/mods/theme/scpt/s_ulmo.lua b/lib/mods/theme/scpt/s_ulmo.lua
deleted file mode 100644
index a2c24b29..00000000
--- a/lib/mods/theme/scpt/s_ulmo.lua
+++ /dev/null
@@ -1,147 +0,0 @@
--- Spells for Ulmo's school
-
-BOOK_ULMO = 65
-
--- "Song of Belegaer" copied from Geyser
-ULMO_BELEGAER = add_spell
-{
-	["name"] = "Song of Belegaer",
-	["school"] = SCHOOL_ULMO,
-	["level"] = 1,
-	["mana"] = 1,
-	["mana_max"] = 100,
-	["fail"] = 25,
-	["piety"] = TRUE,
-	["stat"] =      A_WIS,
-	["random"] =    SKILL_SPIRITUALITY,
-	["spell"] = function()
-		local ret, dir
-		ret, dir = get_aim_dir()
-		if ret == FALSE then return end
-		return fire_bolt_or_beam(2 * get_level(ULMO_BELEGAER, 85), GF_WATER, dir, damroll(get_geyser_damage()))
-	end,
-	["info"] = function()
-		local n, d
-		n, d = get_geyser_damage()
-		return "dam "..n.."d"..d
-	end,
-	["desc"] =
-	{
-		"Channels the power of the Great Sea into your fingertips.",
-		"Sometimes it can blast through its first target."
-	},
-}
-
--- "Draught of Ulmonan" copied with tweaks from T-Plus Nature spell "Restore Body"
-ULMO_DRAUGHT_ULMONAN = add_spell
-{
-	["name"] = 	"Draught of Ulmonan",
-	["school"] = 	{SCHOOL_ULMO},
-	["level"] = 	15,
-	["mana"] = 	25,
-	["mana_max"] = 	200,
-	["fail"] = 	50,
-	["piety"] = TRUE,
-	["stat"] =      A_WIS,
-	["random"] =    SKILL_SPIRITUALITY,
-	["spell"] = 	function()
-			local level = get_level(ULMO_DRAUGHT_ULMONAN, 50)
-			local obvious = hp_player(5 * level)
-			obvious = is_obvious(set_poisoned(0), obvious)
-			obvious = is_obvious(set_cut(0), obvious)
-			obvious = is_obvious(set_stun(0), obvious)
-			obvious = is_obvious(set_blind(0), obvious)
-			if level >= 10 then
-				obvious = is_obvious(do_res_stat(A_STR, TRUE), obvious)
-				obvious = is_obvious(do_res_stat(A_CON, TRUE), obvious)
-				obvious = is_obvious(do_res_stat(A_DEX, TRUE), obvious)
-			end
-			if level >= 20 then
-				obvious =  is_obvious(set_parasite(0, 0), obvious)
-				obvious = is_obvious(set_mimic(0, 0, 0), obvious)
-			end
-			return obvious
-	end,		
-	["info"] = 	function()
-			local level = get_level(ULMO_DRAUGHT_ULMONAN, 50)
-			return "cure "..(5 * level)
-	end,
-	["desc"] =	{
-			"Fills you with a draught with powerful curing effects,",
-			"prepared by Ulmo himself.",
-			"Level 1: blindness, poison, cuts and stunning",
-			"Level 10: drained STR, DEX and CON",
-			"Level 20: parasites and mimicry",
-	},
-}
-
--- "Call of the Ulumuri" based on Call Blessed Soul from T-Plus
-ULMO_CALL_ULUMURI = add_spell
-
-{
-	["name"] = 	"Call of the Ulumuri",
-	["school"] = 	{SCHOOL_ULMO},
-	["level"] = 	20,
-	["mana"] = 	50,
-	["mana_max"] = 	300,
-	["fail"] = 	75,
-	["piety"] = TRUE,
-	["stat"] =      A_WIS,
-	["random"] =    SKILL_SPIRITUALITY,
-	["spell"] =     function()
-			local y, x, m_idx
-			local summons =
-				{
-				test_monster_name("Water spirit"),
-				test_monster_name("Water elemental"),
-				}
-			y, x = find_position(player.py, player.px)
-			m_idx = place_monster_one(y, x, summons[rand_range(1, 2)], 0, FALSE, MSTATUS_FRIEND)
-			if m_idx ~= 0 then
-				monster_set_level(m_idx, 30 + get_level(ULMO_CALL_ULUMURI, 70, 0))
-				return TRUE
-			end
-	end,
-
-	["info"] = 	function()
-			return "level "..(get_level(ULMO_CALL_ULUMURI, 70))
-	end,
-	["desc"] =	{
-			"Summons a leveled water spirit or elemental",
-			"to fight for you",
-
-	},
-}
-
--- "Wrath of Ulmo" based on Firewall
-ULMO_WRATH = add_spell
-{
-	["name"] = 	"Wrath of Ulmo",
-	["school"] = 	{SCHOOL_ULMO},
-	["level"] = 	30,
-	["mana"] = 	100,
-	["mana_max"] = 	400,
-	["fail"] = 	95,
-	["piety"] = TRUE,
-	["stat"] =      A_WIS,
-	["random"] =    SKILL_SPIRITUALITY,
-	["spell"] =     function()
-		local ret, dir, type
-		if (get_level(ULMO_WRATH, 50) >= 30) then
-			type = GF_WAVE
-		else
-			type = GF_WATER
-		end
-		ret, dir = get_aim_dir()
-		if ret == FALSE then return end
-		fire_wall(type, dir, 40 + get_level(ULMO_WRATH, 150), 10 + get_level(ULMO_WRATH, 14))
-		return TRUE
-	end,
-	["info"] =      function()
-		return "dam "..(40 + get_level(ULMO_WRATH, 150)).." dur "..(10 + get_level(ULMO_WRATH, 14))
-	end,
-	["desc"] =      {
-			"Conjures up a sea storm.",
-			"At level 30 it turns into a more forceful storm."
-	}
-}
\ No newline at end of file
diff --git a/lib/mods/theme/scpt/s_varda.lua b/lib/mods/theme/scpt/s_varda.lua
deleted file mode 100644
index f4f46a83..00000000
--- a/lib/mods/theme/scpt/s_varda.lua
+++ /dev/null
@@ -1,140 +0,0 @@
--- Spells for Varda school (From Annals of Ea module)
-
-BOOK_VARDA = 64
-
--- Holy light spell copied from Globe of Light
-VARDA_LIGHT_VALINOR = add_spell 
-{ 
-	["name"] =	"Light of Valinor", 
-	["school"] =	{SCHOOL_VARDA}, 
-	["level"] =	1, 
-	["mana"] =	1, 
-	["mana_max"] =	100, 
-	["fail"] =	20, 
-	["piety"] =	TRUE, 
-	["stat"] =	A_WIS, 
-	["random"] =	SKILL_SPIRITUALITY, 
-	["spell"] =	function() 
-		local obvious
-		if get_level(VARDA_LIGHT_VALINOR, 50) >= 3 then
-			obvious = lite_area(10, 4)
-		else
-			lite_room(player.py, player.px)
-			obvious = TRUE
-		end
-		if get_level(VARDA_LIGHT_VALINOR, 50) >= 15 then
-			obvious = is_obvious(fire_ball(GF_LITE, 0, 10 + get_level(VARDA_LIGHT_VALINOR, 100), 5 + get_level(GLOBELIGHT, 6)), obvious)
-		end
-		return obvious
-	end, 
-	["info"] =	function() 
-		if get_level(VARDA_LIGHT_VALINOR, 50) >= 15 then
-			return "dam "..(10 + get_level(VARDA_LIGHT_VALINOR, 100)).." rad "..(5 + get_level(VARDA_LIGHT_VALINOR, 6))
-		else
-			return ""
-		end
-	end, 
-	["desc"] =	{ 
-		"Lights a room", 
-		"At level 3 it starts damaging monsters",
-		"At level 15 it starts creating a more powerful kind of light",
-	} 
-} 
-
-VARDA_CALL_ALMAREN = add_spell 
-{ 
-	["name"] =	"Call of Almaren", 
-	["school"] =	{SCHOOL_VARDA}, 
-	["level"] =	10, 
-	["mana"] =	5, 
-	["mana_max"] =	150, 
-	["fail"] =	20, 
-	["piety"] =	TRUE, 
-	["stat"] =	A_WIS, 
-	["random"] =	SKILL_SPIRITUALITY, 
-	["spell"] =	function() 
-			local power = 5 * player.lev
-			if (get_level(VARDA_CALL_ALMAREN) >= 20) then
-				dispel_evil(power)
-			else
-				banish_evil(power)
-			end
-			return FALSE
-	end, 
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{ 
-		"Banishes evil beings", 
-		"At level 20 it dispels evil beings",
-	} 
-} 
-
-VARDA_EVENSTAR = add_spell 
-{ 
-	["name"] =	"Evenstar", 
-	["school"] =	{SCHOOL_VARDA}, 
-	["level"] =	20, 
-	["mana"] =	20, 
-	["mana_max"] =	200, 
-	["fail"] =	20, 
-	["piety"] =	TRUE, 
-	["stat"] =	A_WIS, 
-	["random"] =	SKILL_SPIRITUALITY, 
-	["spell"] =	function() 
-			if (get_level(VARDA_EVENSTAR) >= 40) then
-				-- Enlightenment
-				wiz_lite_extra()
-				-- Identify
-				identify_pack()
-				-- Self knowledge
-				self_knowledge()
-			else
-				wiz_lite_extra()
-			end
-			return FALSE
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{ 
-		"Maps and lights the whole level.", 
-		"At level 40 it maps and lights the whole level,",
-		"in addition to letting you know yourself better",
-		"and identifying your whole pack.",
-	} 
-} 
-
-VARDA_STARKINDLER = add_spell 
-{ 
-	["name"] =	"Star Kindler", 
-	["school"] =	{SCHOOL_VARDA}, 
-	["level"] =	30, 
-	["mana"] =	50, 
-	["mana_max"] =	250, 
-	["fail"] =	20, 
-	["piety"] =	TRUE, 
-	["stat"] =	A_WIS, 
-	["random"] =	SKILL_SPIRITUALITY, 
-	["spell"] =	function() 
-			local power = player.lev / 5
-			local ret, dir
-
-			ret, dir = get_aim_dir()
-			
-			if ret == FALSE then return end
-			for i = 1, power do
-				fire_ball(GF_LITE, dir, 20 + get_level(VARDA_STARKINDLER, 100), 10)
-			end
-			
-			return FALSE
-	end,
-	["info"] = 	function()
-			local power = player.lev / 5
-			return "dam "..(20 + get_level(VARDA_STARKINDLER, 100)).." rad 10"
-	end,
-	["desc"] =	{ 
-		"Does multiple bursts of light damage.", 
-		"The damage increases with level.",
-	} 
-} 
\ No newline at end of file
diff --git a/lib/mods/theme/scpt/s_water.lua b/lib/mods/theme/scpt/s_water.lua
deleted file mode 100644
index 739b066b..00000000
--- a/lib/mods/theme/scpt/s_water.lua
+++ /dev/null
@@ -1,154 +0,0 @@
--- handle the water school
-
-TIDALWAVE = add_spell
-{
-	["name"] = 	"Tidal Wave",
-	["school"] = 	{SCHOOL_WATER},
-	["level"] = 	16,
-	["mana"] = 	16,
-	["mana_max"] = 	40,
-	["fail"] = 	65,
-	["stick"] =
-	{
-			["charge"] =    { 6, 5 },
-			[TV_WAND] =
-			{
-				["rarity"] = 		54,
-				["base_level"] =	{ 1, 10 },
-				["max_level"] =		{ 20, 50 },
-			},
-	},
-	["inertia"] = 	{ 4, 100 },
-	["spell"] = 	function()
-			fire_wave(GF_WAVE, 0, 40 + get_level(TIDALWAVE, 200), 0, 6 + get_level(TIDALWAVE, 10), EFF_WAVE)
-			return TRUE
-	end,
-	["info"] = 	function()
-			return "dam "..(40 + get_level(TIDALWAVE,  200)).." rad "..(6 + get_level(TIDALWAVE,  10))
-	end,
-	["desc"] =	{
-			"Summons a monstrous tidal wave that will expand and crush the",
-			"monsters under its mighty waves."
-	}
-}
-
-ICESTORM = add_spell
-{
-	["name"] = 	"Ice Storm",
-	["school"] = 	{SCHOOL_WATER},
-	["level"] = 	22,
-	["mana"] = 	30,
-	["mana_max"] = 	60,
-	["fail"] = 	80,
-	["stick"] =
-	{
-			["charge"] =    { 3, 7 },
-			[TV_WAND] =
-			{
-				["rarity"] = 		65,
-				["base_level"] =	{ 1, 5 },
-				["max_level"] =		{ 25, 45 },
-			},
-	},
-	["inertia"] = 	{ 3, 40 },
-	["spell"] = 	function()
-			local type
-	
-			if get_level(ICESTORM, 50) >= 10 then type = GF_ICE
-			else type = GF_COLD end
-			fire_wave(type, 0, 80 + get_level(ICESTORM, 200), 1 + get_level(ICESTORM, 3, 0), 20 + get_level(ICESTORM, 70), EFF_STORM)
-			return TRUE
-	end,
-	["info"] = 	function()
-			return "dam "..(80 + get_level(ICESTORM, 200)).." rad "..(1 + get_level(ICESTORM, 3, 0)).." dur "..(20 + get_level(ICESTORM, 70))
-	end,
-	["desc"] =	{
-			"Engulfs you in a storm of roaring cold that strikes your foes.",
-			"At level 10 it turns into shards of ice."
-	}
-}
-
-ENTPOTION = add_spell
-{
-	["name"] = 	"Ent's Potion",
-	["school"] = 	{SCHOOL_WATER},
-	["level"] = 	6,
-	["mana"] = 	7,
-	["mana_max"] = 	15,
-	["fail"] = 	35,
-	["inertia"] = 	{ 1, 30 },
-	["spell"] = 	function()
-			set_food(PY_FOOD_MAX - 1)
-			msg_print("The Ent's Potion fills your stomach.")
-			if get_level(ENTPOTION, 50) >= 5 then
-				set_afraid(0)
-			end
-			if get_level(ENTPOTION, 50) >= 12 then
-				set_hero(player.hero + randint(25) + 25 + get_level(ENTPOTION, 40))
-			end
-			return TRUE
-	end,
-	["info"] = 	function()
-			if get_level(ENTPOTION, 50) >= 12 then
-				return "dur "..(25 + get_level(ENTPOTION, 40)).."+d25"
-			else
-				return ""
-			end
-	end,
-	["desc"] =	{
-			"Fills up your stomach.",
-			"At level 5 it boldens your heart.",
-			"At level 12 it makes you heroic."
-	}
-}
-
-VAPOR = add_spell
-{
-	["name"] = 	"Vapor",
-	["school"] = 	{SCHOOL_WATER},
-	["level"] = 	2,
-	["mana"] = 	2,
-	["mana_max"] = 	12,
-	["fail"] = 	20,
-	["inertia"] = 	{ 1, 30 },
-	["spell"] = 	function()
-			fire_cloud(GF_WATER, 0, 3 + get_level(VAPOR, 20), 3 + get_level(VAPOR, 9, 0), 5)
-			return TRUE
-	end,
-	["info"] = 	function()
-       			return "dam "..(3 + get_level(VAPOR, 20)).." rad "..(3 + get_level(VAPOR, 9, 0)).." dur 5"
-	end,
-	["desc"] =	{
-			"Fills the air with toxic moisture to eradicate annoying critters."
-	}
-}
-
-function get_geyser_damage()
-	return get_level(GEYSER, 10), 3 + get_level(GEYSER, 35)
-end
-
-GEYSER = add_spell
-{
-	["name"] = "Geyser",
-	["school"] = SCHOOL_WATER,
-	["level"] = 1,
-	["mana"] = 1,
-	["mana_max"] = 35,
-	["fail"] = 5,
-	["spell"] = function()
-		local ret, dir
-		ret, dir = get_aim_dir()
-		if ret == FALSE then return end
-		return fire_bolt_or_beam(2 * get_level(GEYSER, 85), GF_WATER, dir, damroll(get_geyser_damage()))
-	end,
-	["info"] = function()
-		local n, d
-		n, d = get_geyser_damage()
-		return "dam "..n.."d"..d
-	end,
-	["desc"] =
-	{
-		"Shoots a geyser of water from your fingertips.",
-		"Sometimes it can blast through its first target."
-	},
-}
diff --git a/lib/mods/theme/scpt/s_yavann.lua b/lib/mods/theme/scpt/s_yavann.lua
deleted file mode 100644
index 2f594e85..00000000
--- a/lib/mods/theme/scpt/s_yavann.lua
+++ /dev/null
@@ -1,157 +0,0 @@
--- Handle Yavanna kementari magic school
-
-YAVANNA_CHARM_ANIMAL = add_spell
-{
-	["name"] =      "Charm Animal",
-	["school"] =    {SCHOOL_YAVANNA},
-	["level"] =     1,
-	["mana"] =      10,
-	["mana_max"] =  100,
-	["fail"] =      30,
-	-- Uses piety to cast
-	["piety"] =     TRUE,
-	["stat"] =      A_WIS,
-	["random"] =    SKILL_SPIRITUALITY,
-	["spell"] =     function()
-			local ret, dir = get_aim_dir()
-			if ret == FALSE then return end
-
-			return fire_ball(GF_CONTROL_ANIMAL, dir, 10 + get_level(YAVANNA_CHARM_ANIMAL, 170), get_level(YAVANNA_CHARM_ANIMAL, 2))
-	end,
-	["info"] =      function()
-			return "power "..(10 + get_level(YAVANNA_CHARM_ANIMAL, 170)).." rad "..(get_level(YAVANNA_CHARM_ANIMAL, 2))
-	end,
-	["desc"] =      {
-			"It tries to tame an animal",
-	}
-}
-
-YAVANNA_GROW_GRASS = add_spell
-{
-	["name"] =      "Grow Grass",
-	["school"] =    {SCHOOL_YAVANNA},
-	["level"] =     10,
-	["mana"] =      70,
-	["mana_max"] =  150,
-	["fail"] =      65,
-	-- Uses piety to cast
-	["piety"] =     TRUE,
-	["stat"] =      A_WIS,
-	["random"] =    SKILL_SPIRITUALITY,
-	["spell"] =     function()
-			grow_grass(get_level(YAVANNA_GROW_GRASS, 4))
-			return TRUE
-	end,
-	["info"] =      function()
-			return "rad "..(get_level(YAVANNA_GROW_GRASS, 4))
-	end,
-	["desc"] =      {
-			"Create a floor of grass around you. While on grass and praying",
-			"a worshipper of Yavanna will know a greater regeneration rate"
-	}
-}
-
-YAVANNA_TREE_ROOTS = add_spell
-{
-	["name"] =      "Tree Roots",
-	["school"] =    {SCHOOL_YAVANNA},
-	["level"] =     15,
-	["mana"] =      50,
-	["mana_max"] =  1000,
-	["fail"] =      70,
-	-- Uses piety to cast
-	["piety"] =     TRUE,
-	["stat"] =      A_WIS,
-	["random"] =    SKILL_SPIRITUALITY,
-	["spell"] =     function()
-			return set_roots(10 + get_level(YAVANNA_TREE_ROOTS, 30), 10 + get_level(YAVANNA_TREE_ROOTS, 60), 10 + get_level(YAVANNA_TREE_ROOTS, 20))
-	end,
-	["info"] =      function()
-			return "dur "..(10 + get_level(YAVANNA_TREE_ROOTS, 30)).." AC "..(10 + get_level(YAVANNA_TREE_ROOTS, 60)).." dam "..(10 + get_level(YAVANNA_TREE_ROOTS, 20))
-	end,
-	["desc"] =      {
-			"Creates roots deep in the floor from your feet, making you more stable and able",
-			"to make stronger attacks, but prevents any movement (even teleportation).",
-			"It also makes you recover from stunning almost immediately."
-	}
-}
-
-YAVANNA_WATER_BITE = add_spell
-{
-	["name"] =      "Water Bite",
-	["school"] =    {SCHOOL_YAVANNA},
-	["level"] =     20,
-	["mana"] =      150,
-	["mana_max"] =  300,
-	["fail"] =      90,
-	-- Uses piety to cast
-	["piety"] =     TRUE,
-	["stat"] =      A_WIS,
-	["random"] =    SKILL_SPIRITUALITY,
-	["spell"] =     function()
-			local rad
-
-			rad = 0
-			if get_level(YAVANNA_WATER_BITE) >= 25 then rad = 1 end
-
-			return set_project(randint(30) + 30 + get_level(YAVANNA_WATER_BITE, 150),
-				    GF_WATER,
-				    10 + get_level(YAVANNA_WATER_BITE),
-				    rad,
-				    bor(PROJECT_STOP, PROJECT_KILL))
-	end,
-	["info"] =      function()
-			return "dur "..(30 + get_level(YAVANNA_WATER_BITE, 150)).."+d30 dam "..(10 + get_level(YAVANNA_WATER_BITE)).."/blow"
-	end,
-	["desc"] =      {
-			"Imbues your melee weapon with a natural stream of water",
-			"At level 25, it spreads over a 1 radius zone around your target"
-	}
-}
-
-YAVANNA_UPROOT = add_spell
-{
-	["name"] =      "Uproot",
-	["school"] =    {SCHOOL_YAVANNA},
-	["level"] =     35,
-	["mana"] =      250,
-	["mana_max"] =  350,
-	["fail"] =      95,
-	-- Uses piety to cast
-	["piety"] =     TRUE,
-	["stat"] =      A_WIS,
-	["random"] =    SKILL_SPIRITUALITY,
-	["spell"] =     function()
-			local m_idx, x, y, c_ptr, ret, dir
-
-			ret, dir = get_rep_dir()
-			if ret == FALSE then return end
-			y, x = explode_dir(dir)
-			y, x = y + player.py, x + player.px
-			c_ptr = cave(y, x)
-
-			if c_ptr.feat == FEAT_TREES then
-				cave_set_feat(y, x, FEAT_GRASS);
-
-				-- Summon it
-				y, x = find_position(y, x)
-				m_idx = place_monster_one(y, x, test_monster_name("Ent"), 0, FALSE, MSTATUS_FRIEND)
-
-				-- level it
-				if m_idx ~= 0 then
-					monster_set_level(m_idx, 30 + get_level(YAVANNA_UPROOT, 70))
-				end
-
-				msg_print("The tree awakes!");
-			else
-				msg_print("There is no tree there.")
-			end
-			return TRUE
-	end,
-	["info"] =      function()
-			return "lev "..(30 + get_level(YAVANNA_UPROOT, 70))
-	end,
-	["desc"] =      {
-			"Awakes a tree to help you battle the forces of Morgoth",
-	}
-}
diff --git a/lib/mods/theme/scpt/spells.lua b/lib/mods/theme/scpt/spells.lua
deleted file mode 100644
index 838240a3..00000000
--- a/lib/mods/theme/scpt/spells.lua
+++ /dev/null
@@ -1,627 +0,0 @@
---
--- This file takes care of the schools of magic
---
-
--- Create the schools
-SCHOOL_MANA = add_school
-{
-	["name"] = "Mana", 
-	["skill"] = SKILL_MANA,
-	["spell_power"] = TRUE,
-	["sorcery"] = TRUE,
-	["gods"] =
-	{
-		-- Varda provides the Mana school at 1/4 the prayer skill
-		[GOD_VARDA] = 
-		{
-			["skill"] = SKILL_PRAY,
-			["mul"] = 1,
-			["div"] = 4,
-		},
-		-- Eru Iluvatar provides the Mana school at half the prayer skill
-		[GOD_ERU] =
-		{
-			["skill"] = SKILL_PRAY,
-			["mul"] = 1,
-			["div"] = 2,
-		},
-	},
-	["hooks"] =
-	{
-		[HOOK_CALC_MANA] = function(msp)
-			if get_skill(SKILL_MANA) >= 35 then
-				msp = msp + (msp * ((get_skill(SKILL_MANA) - 34)) / 100)
-				return TRUE, msp
-			end
-		end
-	},
-}
-SCHOOL_FIRE = add_school
-{
-	["name"] = "Fire", 
-	["skill"] = SKILL_FIRE,
-	["spell_power"] = TRUE,
-	["sorcery"] = TRUE,
-	["hooks"] =
-	{
-		[HOOK_CALC_BONUS] = function()
-			if get_skill(SKILL_FIRE) >= 35 then
-			end
-		end,
-		[HOOK_CALC_POWERS] = function()
-			if get_skill(SKILL_FIRE) >= 50 then
---				player.add_power(PWR_FIRE_SHAPE)
-			end
-		end,
-	},
-	["gods"] = 
-	{
-		-- Aule provides the Fire school at 3/5 the prayer skill
-		[GOD_AULE] = 
-		{
-			["skill"] = SKILL_PRAY,
-			["mul"] = 3,
-			["div"] = 5,
-		},
-	},
-}
-SCHOOL_AIR = add_school
-{
-	["name"] = "Air", 
-	["skill"] = SKILL_AIR,
-	["spell_power"] = TRUE,
-	["sorcery"] = TRUE,
-	["hooks"] =
-	{
-		[HOOK_CALC_BONUS] = function()
-			if get_skill(SKILL_AIR) >= 50 then
-				player.magical_breath = TRUE
-			end
-		end,
-		[HOOK_CALC_POWERS] = function()
-			if get_skill(SKILL_AIR) >= 50 then
---				player.add_powe(PWR_AIR_SHAPE)
-			end
-		end,
-	},
-	["gods"] =
-	{
-		-- Manwe Sulimo provides the Air school at 2/3 the prayer skill
-		[GOD_MANWE] =
-		{
-			["skill"] = SKILL_PRAY,
-			["mul"] = 2,
-			["div"] = 3,
-		},
-	},
-}
-SCHOOL_WATER = add_school
-{
-	["name"] = "Water", 
-	["skill"] = SKILL_WATER,
-	["spell_power"] = TRUE,
-	["sorcery"] = TRUE,
-	["hooks"] =
-	{
-		[HOOK_CALC_BONUS] = function()
-			if get_skill(SKILL_WATER) >= 30 then
-				player.water_breath = TRUE
-			end
-		end,
-		[HOOK_CALC_POWERS] = function()
-			if get_skill(SKILL_WATER) >= 50 then
---				player.add_powe(PWR_WATER_SHAPE)
-			end
-		end,
-	},
-	["gods"] =
-	{
-		-- Yavanna Kementari provides the Water school at 1/2 the prayer skill
-		[GOD_YAVANNA] =
-		{
-			["skill"] = SKILL_PRAY,
-			["mul"] = 1,
-			["div"] = 2,
-		},
-		-- Ulmo provides the Water school at 3/5 the prayer skill
-		[GOD_ULMO] =
-		{
-			["skill"] = SKILL_PRAY,
-			["mul"] = 3,
-			["div"] = 5,
-		},
-	},
-}
-SCHOOL_EARTH = add_school
-{
-	["name"] = "Earth", 
-	["skill"] = SKILL_EARTH,
-	["spell_power"] = TRUE,
-	["sorcery"] = TRUE,
-	["hooks"] =
-	{
-		[HOOK_CALC_POWERS] = function()
-			if get_skill(SKILL_EARTH) >= 50 then
---				player.add_powe(PWR_EARTH_SHAPE)
-			end
-		end,
-	},
-	["gods"] =
-	{
-		-- Tulkas provides the Earth school at 4/5 the prayer skill
-		[GOD_TULKAS] =
-		{
-			["skill"] = SKILL_PRAY,
-			["mul"] = 4,
-			["div"] = 5,
-		},
-		-- Yavanna Kementari provides the Earth school at 1/2 the prayer skill
-		[GOD_YAVANNA] =
-		{
-			["skill"] = SKILL_PRAY,
-			["mul"] = 1,
-			["div"] = 2,
-		},
-
-		-- Aule provides the Earth school at 1/3 the prayer skill
-		[GOD_AULE] = 
-		{
-			["skill"] = SKILL_PRAY,
-			["mul"] = 1,
-			["div"] = 3,
-		},
-	},
-}
-SCHOOL_CONVEYANCE = add_school
-{
-	["name"] = "Conveyance", 
-	["skill"] = SKILL_CONVEYANCE,
-	["spell_power"] = TRUE,
-	["sorcery"] = TRUE,
-	["gods"] =
-	{
-		-- Manwe Sulimo provides the Conveyance school at 1/2 the prayer skill
-		[GOD_MANWE] =
-		{
-			["skill"] = SKILL_PRAY,
-			["mul"] = 1,
-			["div"] = 2,
-		},
-	},
-}
-SCHOOL_GEOMANCY = add_school
-{
-	["name"] = "Geomancy",
-	["skill"] = SKILL_GEOMANCY,
-	["spell_power"] = TRUE,
-	-- Require to wield a Mage Staff, as the spells requries the caster to stomp the floor with it
-	["depend"] = function()
-		-- Require at least one point in each school
-		if get_skill(SKILL_FIRE) == 0 then return end
-		if get_skill(SKILL_AIR) == 0 then return end
-		if get_skill(SKILL_EARTH) == 0 then return end
-		if get_skill(SKILL_WATER) == 0 then return end
-
-		local obj = get_object(INVEN_WIELD)
-		if (obj.k_idx > 0) and (obj.tval == TV_MSTAFF) then return TRUE end
-	end,
-}
-SCHOOL_DIVINATION = add_school
-{
-	["name"] = "Divination", 
-	["skill"] = SKILL_DIVINATION,
-	["spell_power"] = TRUE,
-	["sorcery"] = TRUE,
-	["gods"] =
-	{
-		-- Eru Iluvatar provides the Divination school at 2/3 the prayer skill
-		[GOD_ERU] =
-		{
-			["skill"] = SKILL_PRAY,
-			["mul"] = 2,
-			["div"] = 3,
-		},
-		-- Mandos the Divination school at 1/3 the prayer skill
-		[GOD_MANDOS] =
-		{
-			["skill"] = SKILL_PRAY,
-			["mul"] = 1,
-			["div"] = 3,
-		},
-	},
-}
-SCHOOL_TEMPORAL = add_school
-{
-	["name"] = "Temporal", 
-	["skill"] = SKILL_TEMPORAL,
-	["spell_power"] = TRUE,
-	["sorcery"] = TRUE,
-	["gods"] =
-	{
-		-- Yavanna Kementari provides the Temporal school at 1/6 the prayer skill
-		[GOD_YAVANNA] =
-		{
-			["skill"] = SKILL_PRAY,
-			["mul"] = 1,
-			["div"] = 6,
-		},
-		-- Mandos provides the Temporal school at 1/4 the prayer skill
-		[GOD_MANDOS] =
-		{
-			["skill"] = SKILL_PRAY,
-			["mul"] = 1,
-			["div"] = 4,
-		},
-	},
-}
-SCHOOL_NATURE = add_school
-{
-	["name"] = "Nature", 
-	["skill"] = SKILL_NATURE,
-	["spell_power"] = TRUE,
-	["sorcery"] = TRUE,
-	["gods"] =
-	{
-		-- Yavanna Kementari provides the Nature school at 1/2 the prayer skill
-		[GOD_YAVANNA] =
-		{
-			["skill"] = SKILL_PRAY,
-			["mul"] = 1,
-			["div"] = 2,
-		},
-		-- Ulmo provides the Nature school at 1/2 the prayer skill
-		[GOD_ULMO] =
-		{
-			["skill"] = SKILL_PRAY,
-			["mul"] = 1,
-			["div"] = 2,
-		},
-	},
-}
-SCHOOL_META = add_school
-{
-	["name"] = "Meta", 
-	["skill"] = SKILL_META,
-	["spell_power"] = TRUE,
-	["sorcery"] = TRUE,
-	["gods"] =
-	{
-		-- Manwe Sulimo provides the Meta school at 1/3 the prayer skill
-		[GOD_MANWE] =
-		{
-			["skill"] = SKILL_PRAY,
-			["mul"] = 1,
-			["div"] = 3,
-		},
-		-- Varda provides the Meta school at 1/2 the prayer skill
-		[GOD_VARDA] =
-		{
-			["skill"] = SKILL_PRAY,
-			["mul"] = 1,
-			["div"] = 2,
-		},
-	},
-}
-SCHOOL_MIND = add_school
-{
-	["name"] = "Mind",
-	["skill"] = SKILL_MIND,
-	["spell_power"] = TRUE,
-	["sorcery"] = TRUE,
-	["gods"] =
-	{
-		-- Eru Iluvatar provides the Mind school at 1/3 the prayer skill
-		[GOD_ERU] =
-		{
-			["skill"] = SKILL_PRAY,
-			["mul"] = 1,
-			["div"] = 3,
-		},
-		-- Melkor Bauglir provides the Mind school at 1/3 the prayer skill
-		[GOD_MELKOR] =
-		{
-			["skill"] = SKILL_PRAY,
-			["mul"] = 1,
-			["div"] = 3,
-		},
-	},
-}
-SCHOOL_UDUN = add_school
-{
-	["name"] = 		"Udun",
-	["skill"] = 		SKILL_UDUN,
-	["bonus_level"] = 	function()
-					return ((player.lev * 2) / 3)
-				end,
-}
-SCHOOL_DEMON = add_school
-{
-	["name"] = "Demon",
-	["skill"] = SKILL_DAEMON,
-	["no_random"] = TRUE,
-}
-
--- The God specific schools, all tied to the prayer skill
-SCHOOL_ERU = add_school
-{
-	["name"] = "Eru Iluvatar",
-	["skill"] = SKILL_PRAY,
-	["spell_power"] = TRUE,
-	["god"] = GOD_ERU,
-}
-SCHOOL_MANWE = add_school
-{
-	["name"] = "Manwe Sulimo",
-	["skill"] = SKILL_PRAY,
-	["spell_power"] = TRUE,
-	["god"] = GOD_MANWE,
-}
-SCHOOL_TULKAS = add_school
-{
-	["name"] = "Tulkas",
-	["skill"] = SKILL_PRAY,
-	["spell_power"] = TRUE,
-	["god"] = GOD_TULKAS,
-}
-SCHOOL_MELKOR = add_school
-{
-	["name"] = "Melkor Bauglir",
-	["skill"] = SKILL_PRAY,
-	["spell_power"] = TRUE,
-	["god"] = GOD_MELKOR,
-}
-SCHOOL_YAVANNA = add_school
-{
-	["name"] = "Yavanna Kementari",
-	["skill"] = SKILL_PRAY,
-	["spell_power"] = TRUE,
-	["god"] = GOD_YAVANNA,
-}
-
--- New schools
-SCHOOL_AULE = add_school
-{
-	["name"] = "Aule the Smith",
-	["skill"] = SKILL_PRAY,
-	["spell_power"] = TRUE,
-	["god"] = GOD_AULE,
-}
-SCHOOL_VARDA = add_school
-{
-	["name"] = "Varda Elentari",
-	["skill"] = SKILL_PRAY,
-	["spell_power"] = TRUE,
-	["god"] = GOD_VARDA,
-}
-
-SCHOOL_ULMO = add_school
-{
-	["name"] = "Ulmo",
-	["skill"] = SKILL_PRAY,
-	["spell_power"] = TRUE,
-	["god"] = GOD_ULMO,
-}
-
-SCHOOL_MANDOS = add_school
-{
-	["name"] = "Mandos",
-	["skill"] = SKILL_PRAY,
-	["spell_power"] = TRUE,
-	["god"] = GOD_MANDOS,
-}
-
--- Not a real school, rather a palcehodler for stick only spells
-SCHOOL_DEVICE = add_school
-{
-	["name"] = "Device",
-	["skill"] = SKILL_DEVICE,
-}
-
--- Music "spells"
-SCHOOL_MUSIC = add_school
-{
-	["name"] = "Music",
-	["skill"] = SKILL_MUSIC,
-}
-
--- Put some spells
-tome_dofile("s_fire.lua")
-tome_dofile("s_mana.lua")
-tome_dofile("s_water.lua")
-tome_dofile("s_air.lua")
-tome_dofile("s_earth.lua")
-tome_dofile("s_convey.lua")
-tome_dofile("s_nature.lua")
-tome_dofile("s_divin.lua")
-tome_dofile("s_tempo.lua")
-tome_dofile("s_meta.lua")
-tome_dofile("s_mind.lua")
-tome_dofile("s_udun.lua")
-tome_dofile("s_geom.lua")
-
--- God's specific spells
-tome_dofile("s_eru.lua")
-tome_dofile("s_manwe.lua")
-tome_dofile("s_tulkas.lua")
-tome_dofile("s_melkor.lua")
-tome_dofile("s_yavann.lua")
-
--- New gods' spells
-tome_dofile("s_aule.lua")
-tome_dofile("s_varda.lua")
-tome_dofile("s_ulmo.lua")
-tome_dofile("s_mandos.lua")
-
--- Specific schools
-tome_dofile("s_demon.lua")
-
--- Device spells
-tome_dofile("s_stick.lua")
-
--- Musics
-tome_dofile("s_music.lua")
-
--- List of spellbooks
-
--- Create the crystal of mana
-school_book[0] = {
-	MANATHRUST, DELCURSES, RESISTS, MANASHIELD,
-}
-
--- The book of the eternal flame
-school_book[1] = {
-	GLOBELIGHT, FIREGOLEM, FIREFLASH, FIREWALL, FIERYAURA,
-}
-
--- The book of the blowing winds
-school_book[2] = {
-	NOXIOUSCLOUD, POISONBLOOD, INVISIBILITY, STERILIZE, AIRWINGS, THUNDERSTORM,
-}
-
--- The book of the impenetrable earth
-school_book[3] = {
-	STONESKIN, DIG, STONEPRISON, SHAKE, STRIKE,
-}
-
--- The book of the unstopable wave
-school_book[4] = {
-	GEYSER, VAPOR, ENTPOTION, TIDALWAVE, ICESTORM
-}
-
--- Create the book of translocation
-school_book[5] = {
-	BLINK, DISARM, TELEPORT, TELEAWAY, RECALL, PROBABILITY_TRAVEL,
-}
-
--- Create the book of the tree
-school_book[6] = {
-	GROWTREE, HEALING, RECOVERY, REGENERATION, SUMMONANNIMAL, GROW_ATHELAS,
-}
-
--- Create the book of Knowledge
-school_book[7] = {
-	SENSEMONSTERS, SENSEHIDDEN, REVEALWAYS, IDENTIFY, VISION, STARIDENTIFY,
-}
-
--- Create the book of the Time
-school_book[8] = {
-	MAGELOCK, SLOWMONSTER, ESSENCESPEED, BANISHMENT,
-}
-
--- Create the book of meta spells
-school_book[9] = {
-	RECHARGE, DISPERSEMAGIC, SPELLBINDER, TRACKER, INERTIA_CONTROL,
-}
-
--- Create the book of the mind
-school_book[10] = {
-	CHARM, CONFUSE, ARMOROFFEAR, STUN,
-}
-
--- Create the book of hellflame
-school_book[11] = {
-	DRAIN, GENOCIDE, WRAITHFORM, FLAMEOFUDUN,
-}
-
--- Create the book of eru
-school_book[20] = {
-	ERU_SEE, ERU_LISTEN, ERU_UNDERSTAND, ERU_PROT,
-}
-
--- Create the book of manwe
-school_book[21] = {
-	MANWE_BLESS, MANWE_SHIELD, MANWE_CALL, MANWE_AVATAR,
-}
-
--- Create the book of tulkas
-school_book[22] = {
-	TULKAS_AIM, TULKAS_SPIN, TULKAS_WAVE,
-}
-
--- Create the book of melkor
-school_book[23] = {
-	MELKOR_CURSE, MELKOR_CORPSE_EXPLOSION, MELKOR_MIND_STEAL,
-}
-
--- Create the book of yavanna
-school_book[24] = {
-	YAVANNA_CHARM_ANIMAL, YAVANNA_GROW_GRASS, YAVANNA_TREE_ROOTS, YAVANNA_WATER_BITE, YAVANNA_UPROOT,
-}
-
--- Create the book of beginner's cantrip
-school_book[50] = {
-	MANATHRUST, GLOBELIGHT, ENTPOTION, BLINK, SENSEMONSTERS, SENSEHIDDEN,
-}
-
--- Create the book of teleporatation
-school_book[51] = {
-	BLINK, TELEPORT, TELEAWAY
-}
-
--- Create the book of summoning
-school_book[52] = {
-	FIREGOLEM, SUMMONANNIMAL
-}
-
-
--- Create the Armageddon Demonblade
-school_book[55] = {
-	DEMON_BLADE, DEMON_MADNESS, DEMON_FIELD,
-}
-
--- Create the Shield Demonblade
-school_book[56] = {
-	DOOM_SHIELD, DEMON_CLOAK, UNHOLY_WORD,
-}
-
--- Create the Control Demonblade
-school_book[57] = {
-	DEMON_SUMMON, DISCHARGE_MINION, CONTROL_DEMON,
-}
-
--- Create the Drums
-school_book[58] = {
-	MUSIC_STOP, MUSIC_HOLD, MUSIC_CONF, MUSIC_STUN, 
-}
-
--- Create the Harps
-school_book[59] = {
-	MUSIC_STOP, MUSIC_LITE, MUSIC_HERO, MUSIC_HEAL, MUSIC_TIME, MUSIC_MIND,
-}
-
--- Create the Horns
-school_book[60] = {
-	MUSIC_STOP, MUSIC_BLOW, MUSIC_WIND, MUSIC_YLMIR, MUSIC_AMBARKANTA,
-}
-
--- Book of the Player, filled in by the Library Quest
-school_book[61] = { }
-
--- Geomancy spells, not a real book
-school_book[62] = {
-	CALL_THE_ELEMENTS, CHANNEL_ELEMENTS, ELEMENTAL_WAVE, VAPORIZE, GEOLYSIS, DRIPPING_TREAD, GROW_BARRIER, ELEMENTAL_MINION
-}
-
--- Aule book [63]
-school_book[BOOK_AULE] =
-{ 
-	AULE_FIREBRAND, AULE_ENCHANT_WEAPON, AULE_ENCHANT_ARMOUR, AULE_CHILD,
-} 
-
--- Varda book [64]
-school_book[BOOK_VARDA] =
-{ 
-	VARDA_LIGHT_VALINOR, VARDA_CALL_ALMAREN, VARDA_EVENSTAR, VARDA_STARKINDLER,
-} 
-
--- Ulmo book [65]
-school_book[BOOK_ULMO] =
-{ 	
-	ULMO_BELEGAER, ULMO_DRAUGHT_ULMONAN, ULMO_CALL_ULUMURI, ULMO_WRATH,
-} 
-
--- Mandos book [66]
-school_book[BOOK_MANDOS] =
-{ 
-	MANDOS_TEARS_LUTHIEN, MANDOS_SPIRIT_FEANTURI, MANDOS_TALE_DOOM, MANDOS_CALL_HALLS
-}
\ No newline at end of file
diff --git a/lib/mods/theme/scpt/stores.lua b/lib/mods/theme/scpt/stores.lua
deleted file mode 100644
index 4902c4d0..00000000
--- a/lib/mods/theme/scpt/stores.lua
+++ /dev/null
@@ -1,161 +0,0 @@
--- Whats shops can buy what
-store_buy_list
-{
-	["General Store"] =
-	{
-		TV_CORPSE,
-		TV_FOOD,
-		TV_LITE,
-		TV_FLASK,
-		TV_SPIKE,
-		TV_SHOT,
-		TV_ARROW,
-		TV_BOLT,
-		TV_DIGGING,
-		TV_CLOAK,
-		TV_BOTTLE,
-	},
-	["Armoury"] =
-	{
-		TV_BOOTS,
-		TV_GLOVES,
-		TV_CROWN,
-		TV_HELM,
-		TV_SHIELD,
-		TV_CLOAK,
-		TV_SOFT_ARMOR,
-		TV_HARD_ARMOR,
-		TV_DRAG_ARMOR,
-	},
-	["Weaponsmith"] =
-	{
-		TV_SHOT,
-		TV_BOLT,
-		TV_ARROW,
-		TV_BOOMERANG,
-		TV_BOW,
-		TV_DIGGING,
-		TV_HAFTED,
-		TV_POLEARM,
-		TV_SWORD,
-		TV_AXE,
-		TV_MSTAFF,
-	},
-	-- We use a function because we want to restrict to blessed weapons and god spells
-	["Temple"] = function (obj)
-		if obj.tval == TV_DRUID_BOOK then return TRUE
-		elseif obj.tval == TV_BOOK and obj.sval == 255 and (can_spell_random(obj.pval) == SKILL_SPIRITUALITY) then return TRUE
-		elseif obj.tval == TV_SCROLL then return TRUE
-		elseif obj.tval == TV_POTION2 then return TRUE
-		elseif obj.tval == TV_POTION then return TRUE
-		elseif obj.tval == TV_HAFTED then return TRUE
-		elseif obj.tval == TV_POLEARM and is_blessed(obj) == TRUE then return TRUE
-		elseif obj.tval == TV_SWORD and is_blessed(obj) == TRUE then return TRUE
-		elseif obj.tval == TV_AXE and is_blessed(obj) == TRUE then return TRUE
-		elseif obj.tval == TV_BOOMERANG and is_blessed(obj) == TRUE then return TRUE
-		end
-	end,
-	["Alchemy shop"] =
-	{
-		TV_SCROLL,
-		TV_POTION2,
-		TV_POTION,
-		TV_BATERIE,
-		TV_BOTTLE,
-	},
-	-- We use a function because we dont want god spells
-	["Magic shop"] = function (obj)
-		local buy =
-		{
-			[TV_SYMBIOTIC_BOOK] = TRUE,
-			[TV_AMULET] = TRUE,
-			[TV_RING] = TRUE,
-			[TV_STAFF] = TRUE,
-			[TV_WAND] = TRUE,
-			[TV_ROD] = TRUE,
-			[TV_ROD_MAIN] = TRUE,
-			[TV_SCROLL] = TRUE,
-			[TV_POTION2] = TRUE,
-			[TV_POTION] = TRUE,
-			[TV_MSTAFF] = TRUE,
-			[TV_RANDART] = TRUE,
-		}
-
-		if obj.tval == TV_BOOK and obj.sval == 255 and (can_spell_random(obj.pval) == SKILL_MAGIC) then return TRUE
-		elseif obj.tval == TV_BOOK and obj.sval ~= 255 then return TRUE
-		elseif buy[obj.tval] == TRUE then return TRUE
-		end
-	end,
-	-- Black markets wants ALL!
-	["Black Market"] = function (obj)
-		return TRUE
-	end,
-	["Book Store"] =
-	{
-		TV_BOOK,
-		TV_SYMBIOTIC_BOOK,
-		TV_MUSIC_BOOK,
-		TV_DAEMON_BOOK,
-		TV_DRUID_BOOK,
-	},
-	["Pet Shop"] =
-	{
-		TV_EGG,
-	},
--- Theme stores
-
-	["Hunting Supply Store"] =
-	{
-		TV_TRAPKIT,
-		TV_BOOMERANG,
-		TV_SHOT,
-		TV_BOLT,
-		TV_ARROW,
-		TV_BOW,
-		TV_POTION2,
-	},
-
-	["Runic Magic Shop"] = 
-	{
-		TV_RUNE1,
-		TV_RUNE2,
-	},
-
-	["Construction Supply Store"] = 
-	{
-		TV_LITE,
-		TV_DIGGING,
-	},
-
-	["Music Store"] = 
-	{
-		TV_INSTRUMENT,
-	},
-}
-
--- Take care to have Magic shop/Temple have specific spells only
-add_hooks
-{
-	[HOOK_STORE_STOCK] = function (index, name, level)
-			if name == "Magic shop" then
-				-- Books
-				if magik(20) == TRUE then
-					object_prep(obj_forge, lookup_kind(TV_BOOK, 255))
-					local spell = get_random_spell(SKILL_MAGIC, 20)
-					if spell > -1 then
-						obj_forge.pval = spell
-						return TRUE, obj_forge
-					end
-				end
-			elseif name == "Temple" then
-				if magik(20) == TRUE then
-					object_prep(obj_forge, lookup_kind(TV_BOOK, 255))
-					local spell = get_random_spell(SKILL_SPIRITUALITY, 20)
-					if spell > -1 then
-						obj_forge.pval = spell
-						return TRUE, obj_forge
-					end
-				end
-			end
-	end,
-}
diff --git a/lib/mods/theme/user/all.prf b/lib/mods/theme/user/all.prf
index 4e9dead3..b9554238 100644
--- a/lib/mods/theme/user/all.prf
+++ b/lib/mods/theme/user/all.prf
@@ -8,9 +8,6 @@ X:rogue_like_commands
 # Option 'Activate quick messages'
 Y:quick_messages
 
-# Option 'Prompt for various information'
-X:other_query_flag
-
 # Option 'Prompt before picking things up'
 X:carry_query_flag
 
@@ -26,36 +23,6 @@ Y:prompt_pickup_heavy
 # Option 'Repeat obvious commands'
 Y:always_repeat
 
-# Option 'Show dungeon level in feet'
-X:depth_in_feet
-
-# Option 'Merge inscriptions when stacking'
-Y:stack_force_notes
-
-# Option 'Merge discounts when stacking'
-Y:stack_force_costs
-
-# Option 'Show labels in object listings'
-Y:show_labels
-
-# Option 'Show weights in object listings'
-Y:show_weights
-
-# Option 'Show graphics in inventory list'
-Y:show_inven_graph
-
-# Option 'Show graphics in equipment list'
-Y:show_equip_graph
-
-# Option 'Show graphics in stores'
-Y:show_store_graph
-
-# Option 'Show choices in certain sub-windows'
-Y:show_choices
-
-# Option 'Show details in certain sub-windows'
-Y:show_details
-
 # Option 'Audible bell (on errors, etc)'
 X:ring_bell
 
@@ -83,9 +50,6 @@ Y:disturb_near
 # Option 'Disturb whenever map panel changes'
 Y:disturb_panel
 
-# Option 'Disturb whenever leaving trap-detected area'
-Y:disturb_detect
-
 # Option 'Disturb whenever player state changes'
 Y:disturb_state
 
@@ -95,21 +59,12 @@ X:disturb_minor
 # Option 'Disturb whenever random things happen'
 X:disturb_other
 
-# Option 'Alert user to critical hitpoints'
-Y:alert_hitpoint
-
 # Option 'Alert user to various failures'
 Y:alert_failure
 
 # Option 'Get last words when the character dies'
 Y:last_words
 
-# Option 'Allow shopkeepers and uniques to speak'
-Y:speak_unique
-
-# Option 'No query to destroy known worthless items'
-Y:auto_destroy
-
 # Option 'Confirm to wear/wield known cursed items'
 Y:confirm_wear
 
@@ -122,9 +77,6 @@ X:disturb_pets
 # Option 'Automatically open doors'
 Y:easy_open
 
-# Option 'Automatically disarm traps'
-Y:easy_disarm
-
 # Option 'Automatically tunnel walls'
 Y:easy_tunnel
 
@@ -134,12 +86,6 @@ Y:auto_haggle
 # Option 'Auto-scum for good levels'
 Y:auto_scum
 
-# Option 'Allow weapons and armour to stack'
-Y:stack_allow_items
-
-# Option 'Allow wands/staffs/rods to stack'
-Y:stack_allow_wands
-
 # Option 'Expand the power of the look command'
 Y:expand_look
 
@@ -164,21 +110,9 @@ Y:dungeon_stair
 # Option 'Monsters chase current location (v.slow)'
 X:flow_by_sound
 
-# Option 'Use special symbols for the player char'
-X:player_symbols
-
-# Option 'Plain object descriptions'
-Y:plain_descriptions
-
 # Option 'Monsters learn from their mistakes'
 X:smart_learn
 
-# Option 'Monsters exploit players weaknesses'
-X:smart_cheat
-
-# Option 'Monsters behave stupidly'
-X:stupid_monsters
-
 # Option 'Allow unusually small dungeon levels'
 Y:small_levels
 
@@ -188,9 +122,6 @@ Y:empty_levels
 # Option 'Reduce lite-radius when running'
 X:view_reduce_lite
 
-# Option 'Reduce view-radius in town'
-X:view_reduce_view
-
 # Option 'Avoid checking for user abort'
 X:avoid_abort
 
@@ -242,9 +173,6 @@ X:center_player
 # Option 'Ingame contextual help'
 X:ingame_help
 
-# Option 'Show the experience needed for next level'
-X:exp_need
-
 # Option 'Use the old(Z) coloring scheme(reload the game)'
 X:old_colors
 
diff --git a/lib/mods/theme/user/automat.atm b/lib/mods/theme/user/automat.atm
deleted file mode 100644
index 03e31974..00000000
--- a/lib/mods/theme/user/automat.atm
+++ /dev/null
@@ -1,667 +0,0 @@
--- This automatiser file was created by Feanor for the Annals of Ea module.
-clean_ruleset()
-add_ruleset
-[[
-<rule name="emptychest" type="destroy" module="Theme">
-    <and>
-        <and>
-            <tval>7</tval>
-        </and>
-        <status>empty</status>
-    </and>
-</rule>
-<rule name="junkmushrooms" type="destroy" module="Theme">
-    <and>
-        <tval>80</tval>
-        <sval min="0" max="11"></sval>
-    </and>
-</rule>
-<rule name="junkjewelry" type="destroy" module="Theme">
-    <and>
-        <or>
-		<and>
-			<tval>40</tval>
-			<sval min="0" max="0"></sval>
-		</and>
-		<and>
-			<tval>45</tval>
-			<sval min="0" max="4"></sval>
-		</and>
-		<and>
-			<tval>40</tval>
-			<status>bad</status>
-		</and>
-		<and>
-			<tval>45</tval>
-			<status>bad</status>
-		</and>
-        </or>
-    </and>
-</rule>
-<rule name="junkpotions" type="destroy" module="Theme">
-    <and>
-            <not>
-                <ability>Trapping</ability>
-            </not>
-        <or>
-		<and>
-			<tval>71</tval>
-			<sval min="4" max="7"></sval>
-		</and>
-		<and>
-			<tval>71</tval>
-			<sval min="9" max="11"></sval>
-		</and>
-		<and>
-			<tval>71</tval>
-			<sval min="13" max="13">13</sval>
-		</and>
-		<and>
-			<tval>71</tval>
-			<sval min="15" max="21"></sval>
-		</and>
-        </or>
-    </and>
-</rule>
-<rule name="junkwands" type="destroy" module="Theme">
-    <and>
-	<tval>65</tval>
-      <sval min="24" max="25"></sval>
-    </and>
-</rule>
-<rule name="junkscrolls" type="destroy" module="Theme">
-    <and>
-            <not>
-                <ability>Trapping</ability>
-            </not>
-        <or>
-		<and>
-			<tval>70</tval>
-			<sval min="0" max="0"></sval>
-                  <not>
-				<subrace>Vampire</subrace>
-			</not>
-		</and>
-		<and>
-        		<tval>70</tval>
-        		<sval min="1" max="5"></sval>
-	      </and>
-		<and>
-        		<tval>70</tval>
-        		<sval min="7" max="7"></sval>
-	      </and>
-        </or>
-    </and>
-</rule>
-<rule name="brokendagger" type="destroy" module="Theme">
-    <and>
-        <name>Broken Dagger</name>
-        <or>
-            <status>average</status>
-            <status>bad</status>
-            <status>very bad</status>
-        </or>
-    </and>
-</rule>
-<rule name="magestaffs" type="destroy" module="Theme">
-    <and>
-        <tval>6</tval>
-        <or>
-            <and>
-                <level min="0" max="50"></level>
-                <or>
-                    <status>very bad</status>
-                    <status>bad</status>
-                </or>
-            </and>
-            <and>
-                <level min="15" max="50"></level>
-                <status>average</status>
-            </and>
-            <and>
-                <level min="25" max="50"></level>
-                <status>good</status>
-            </and>
-        </or>
-    </and>
-</rule>
-<rule name="instruments" type="destroy" module="Theme">
-    <and>
-        <tval>14</tval>
-        <or>
-            <and>
-                <level min="0" max="50"></level>
-                <or>
-                    <status>very bad</status>
-                    <status>bad</status>
-                </or>
-            </and>
-            <and>
-                <level min="15" max="50"></level>
-                <status>average</status>
-            </and>
-            <and>
-                <level min="25" max="50"></level>
-                <status>good</status>
-            </and>
-        </or>
-    </and>
-</rule>
-<rule name="boomerangs" type="destroy" module="Theme">
-    <and>
-        <tval>15</tval>
-        <or>
-            <and>
-                <level min="0" max="50"></level>
-                <or>
-                    <status>very bad</status>
-                    <status>bad</status>
-                </or>
-            </and>
-            <and>
-                <level min="15" max="50"></level>
-                <status>average</status>
-            </and>
-            <and>
-                <level min="25" max="50"></level>
-                <status>good</status>
-            </and>
-        </or>
-    </and>
-</rule>
-<rule name="shots" type="destroy" module="Theme">
-    <and>
-        <tval>16</tval>
-        <or>
-            <and>
-                <level min="0" max="50"></level>
-                <or>
-                    <status>very bad</status>
-                    <status>bad</status>
-                </or>
-            </and>
-            <and>
-                <level min="35" max="50"></level>
-                <status>average</status>
-            </and>
-            <and>
-                <level min="45" max="50"></level>
-                <status>good</status>
-            </and>
-        </or>
-    </and>
-</rule>
-<rule name="arrows" type="destroy" module="Theme">
-    <and>
-        <tval>17</tval>
-        <or>
-            <and>
-                <level min="0" max="50"></level>
-                <or>
-                    <status>very bad</status>
-                    <status>bad</status>
-                </or>
-            </and>
-            <and>
-                <level min="35" max="50"></level>
-                <status>average</status>
-            </and>
-            <and>
-                <level min="45" max="50"></level>
-                <status>good</status>
-            </and>
-        </or>
-    </and>
-</rule>
-<rule name="bolts" type="destroy" module="Theme">
-    <and>
-        <tval>18</tval>
-        <or>
-            <and>
-                <level min="0" max="50"></level>
-                <or>
-                    <status>very bad</status>
-                    <status>bad</status>
-                </or>
-            </and>
-            <and>
-                <level min="35" max="50"></level>
-                <status>average</status>
-            </and>
-            <and>
-                <level min="45" max="50"></level>
-                <status>good</status>
-            </and>
-        </or>
-    </and>
-</rule>
-<rule name="missile" type="destroy" module="Theme">
-    <and>
-        <tval>19</tval>
-        <or>
-            <and>
-                <level min="0" max="50"></level>
-                <or>
-                    <status>very bad</status>
-                    <status>bad</status>
-                </or>
-            </and>
-            <and>
-                <level min="15" max="50"></level>
-                <status>average</status>
-            </and>
-            <and>
-                <level min="25" max="50"></level>
-                <status>good</status>
-            </and>
-        </or>
-    </and>
-</rule>
-<rule name="diggers" type="destroy" module="Theme">
-    <and>
-        <tval>20</tval>
-        <or>
-            <and>
-                <level min="0" max="50"></level>
-                <or>
-                    <status>very bad</status>
-                    <status>bad</status>
-                </or>
-            </and>
-            <and>
-                <level min="15" max="50"></level>
-                <status>average</status>
-            </and>
-            <and>
-                <level min="25" max="50"></level>
-                <status>good</status>
-            </and>
-        </or>
-    </and>
-</rule>
-<rule name="hafted" type="destroy" module="Theme">
-    <and>
-        <tval>21</tval>
-        <or>
-            <and>
-                <level min="0" max="50"></level>
-                <or>
-                    <status>very bad</status>
-                    <status>bad</status>
-                </or>
-            </and>
-            <and>
-                <level min="15" max="50"></level>
-                <status>average</status>
-            </and>
-            <and>
-                <level min="25" max="50"></level>
-                <status>good</status>
-            </and>
-        </or>
-    </and>
-</rule>
-<rule name="polearm" type="destroy" module="Theme">
-    <and>
-        <tval>22</tval>
-        <or>
-            <and>
-                <level min="0" max="50"></level>
-                <or>
-                    <status>very bad</status>
-                    <status>bad</status>
-                </or>
-            </and>
-            <and>
-                <level min="15" max="50"></level>
-                <status>average</status>
-            </and>
-            <and>
-                <level min="25" max="50"></level>
-                <status>good</status>
-            </and>
-        </or>
-    </and>
-</rule>
-<rule name="swords" type="destroy" module="Theme">
-    <and>
-        <tval>23</tval>
-        <or>
-            <and>
-                <level min="0" max="50"></level>
-                <or>
-                    <status>very bad</status>
-                    <status>bad</status>
-                </or>
-            </and>
-            <and>
-                <level min="15" max="50"></level>
-                <status>average</status>
-            </and>
-            <and>
-                <level min="25" max="50"></level>
-                <status>good</status>
-            </and>
-        </or>
-    </and>
-</rule>
-<rule name="axes" type="destroy" module="Theme">
-    <and>
-        <tval>24</tval>
-        <or>
-            <and>
-                <level min="0" max="50"></level>
-                <or>
-                    <status>very bad</status>
-                    <status>bad</status>
-                </or>
-            </and>
-            <and>
-                <level min="15" max="50"></level>
-                <status>average</status>
-            </and>
-            <and>
-                <level min="25" max="50"></level>
-                <status>good</status>
-            </and>
-        </or>
-    </and>
-</rule>
-<rule name="boots" type="destroy" module="Theme">
-    <and>
-        <tval>30</tval>
-        <or>
-            <and>
-                <level min="0" max="50"></level>
-                <or>
-                    <status>very bad</status>
-                    <status>bad</status>
-                </or>
-            </and>
-            <and>
-                <level min="15" max="50"></level>
-                <status>average</status>
-            </and>
-            <and>
-                <level min="25" max="50"></level>
-                <status>good</status>
-            </and>
-        </or>
-    </and>
-</rule>
-<rule name="gloves" type="destroy" module="Theme">
-    <and>
-        <tval>31</tval>
-        <or>
-            <and>
-                <level min="0" max="50"></level>
-                <or>
-                    <status>very bad</status>
-                    <status>bad</status>
-                </or>
-            </and>
-            <and>
-                <level min="15" max="50"></level>
-                <status>average</status>
-            </and>
-            <and>
-                <level min="25" max="50"></level>
-                <status>good</status>
-            </and>
-        </or>
-    </and>
-</rule>
-<rule name="helms" type="destroy" module="Theme">
-    <and>
-        <tval>32</tval>
-        <or>
-            <and>
-                <level min="0" max="50"></level>
-                <or>
-                    <status>very bad</status>
-                    <status>bad</status>
-                </or>
-            </and>
-            <and>
-                <level min="15" max="50"></level>
-                <status>average</status>
-            </and>
-            <and>
-                <level min="25" max="50"></level>
-                <status>good</status>
-            </and>
-        </or>
-    </and>
-</rule>
-<rule name="crowns" type="destroy" module="Theme">
-    <and>
-        <tval>33</tval>
-        <or>
-            <and>
-                <level min="0" max="50"></level>
-                <or>
-                    <status>very bad</status>
-                    <status>bad</status>
-                </or>
-            </and>
-            <and>
-                <level min="15" max="50"></level>
-                <status>average</status>
-            </and>
-            <and>
-                <level min="25" max="50"></level>
-                <status>good</status>
-            </and>
-        </or>
-    </and>
-</rule>
-<rule name="shields" type="destroy" module="Theme">
-    <and>
-        <tval>34</tval>
-        <or>
-            <and>
-                <level min="0" max="50"></level>
-                <or>
-                    <status>very bad</status>
-                    <status>bad</status>
-                </or>
-            </and>
-            <and>
-                <level min="15" max="50"></level>
-                <status>average</status>
-            </and>
-            <and>
-                <level min="25" max="50"></level>
-                <status>good</status>
-            </and>
-        </or>
-    </and>
-</rule>
-<rule name="cloaks" type="destroy" module="Theme">
-    <and>
-        <tval>35</tval>
-        <or>
-            <and>
-                <level min="0" max="50"></level>
-                <or>
-                    <status>very bad</status>
-                    <status>bad</status>
-                </or>
-            </and>
-            <and>
-                <level min="15" max="50"></level>
-                <status>average</status>
-            </and>
-            <and>
-                <level min="25" max="50"></level>
-                <status>good</status>
-            </and>
-        </or>
-    </and>
-</rule>
-<rule name="softarmour" type="destroy" module="Theme">
-    <and>
-        <tval>36</tval>
-        <or>
-            <and>
-                <level min="0" max="50"></level>
-                <or>
-                    <status>very bad</status>
-                    <status>bad</status>
-                </or>
-            </and>
-            <and>
-                <level min="15" max="50"></level>
-                <status>average</status>
-            </and>
-            <and>
-                <level min="25" max="50"></level>
-                <status>good</status>
-            </and>
-        </or>
-    </and>
-</rule>
-<rule name="hardarmour" type="destroy" module="Theme">
-    <and>
-        <tval>37</tval>
-        <or>
-            <and>
-                <level min="0" max="50"></level>
-                <or>
-                    <status>very bad</status>
-                    <status>bad</status>
-                </or>
-            </and>
-            <and>
-                <level min="15" max="50"></level>
-                <status>average</status>
-            </and>
-            <and>
-                <level min="25" max="50"></level>
-                <status>good</status>
-            </and>
-        </or>
-    </and>
-</rule>
-<rule name="dragonarmour" type="destroy" module="Theme">
-    <and>
-        <tval>38</tval>
-        <or>
-            <and>
-                <level min="0" max="50"></level>
-                <or>
-                    <status>very bad</status>
-                    <status>bad</status>
-                </or>
-            </and>
-            <and>
-                <level min="40" max="50"></level>
-                <status>average</status>
-            </and>
-            <and>
-                <level min="45" max="50"></level>
-                <status>good</status>
-            </and>
-        </or>
-    </and>
-</rule>
-<rule name="daemonbooks" type="destroy" module="Theme">
-	<and>
-		<and>
-			<tval>115</tval>
-			<sval min="55" max="57"></sval>
-		</and>
-		<or>
-            <and>
-                <level min="0" max="50"></level>
-                <or>
-                    <status>very bad</status>
-                    <status>bad</status>
-                </or>
-            </and>
-            <and>
-                <level min="15" max="50"></level>
-                <status>average</status>
-            </and>
-            <and>
-                <level min="25" max="50"></level>
-                <status>good</status>
-            </and>
-		</or>
-	</and>
-</rule>
-<rule name="trapkits" type="destroy" module="Theme">
-        <and>
-            <tval>46</tval>
-            <or>
-                <status>bad</status>
-                <status>very bad</status>
-            </or>
-        </and>
-</rule>
-<rule name="classitems" type="destroy" module="Theme">
-    <or>
-        <and>
-            <tval>9</tval>
-            <and>
-                <not>
-                    <skill min="1" max="50">Corpse-preservation</skill>
-                </not>
-                <not>
-                    <skill min="1" max="50">Possession</skill>
-                </not>
-		    <not>
-                    <skill min="1" max="50">Summoning</skill>
-                </not>
-            </and>
-        </and>
-        <and>
-            <or>
-                <tval>104</tval>
-                <tval>105</tval>
-            </or>
-            <not>
-                <skill min="1" max="50">Runecraft</skill>
-            </not>
-        </and>
-        <and>
-            <tval>46</tval>
-            <not>
-                <ability>Trapping</ability>
-            </not>
-            <or>
-                <status>average</status>
-                <status>good</status>
-            </or>
-        </and>
-        <and>
-            <and>
-                <not>
-                    <class>Archer</class>
-                </not>
-                <not>
-                    <class>Ranger</class>
-                </not>
-                <not>
-                    <class>Sniper</class>
-                </not>
-            </and>
-            <tval>11</tval>
-        </and>
-        <and>
-            <and>
-                <not>
-                    <class>Archer</class>
-                </not>
-                <not>
-                    <class>Ranger</class>
-                </not>
-                <not>
-                    <class>Sniper</class>
-                </not>
-            </and>
-            <tval>1</tval>
-        </and>
-    </or>
-</rule>
-]]
diff --git a/lib/mods/theme/user/fierce.atm b/lib/mods/theme/user/fierce.atm
deleted file mode 100644
index c49f7de3..00000000
--- a/lib/mods/theme/user/fierce.atm
+++ /dev/null
@@ -1,761 +0,0 @@
-clean_ruleset()
-add_ruleset
-[[
-<rule name="oilflask" type="destroy" module="Theme">
-    <name>flask of oil</name>
-</rule>
-<rule name="emptychest" type="destroy" module="Theme">
-    <and>
-        <and>
-            <tval>7</tval>
-        </and>
-        <status>empty</status>
-    </and>
-</rule>
-<rule name="junkmushrooms" type="destroy" module="Theme">
-    <and>
-        <tval>80</tval>
-        <sval min="0" max="11"></sval>
-    </and>
-</rule>
-<rule name="junkjewelry" type="destroy" module="Theme">
-    <and>
-        <or>
-            <and>
-                <tval>40</tval>
-                <sval min="0" max="0"></sval>
-            </and>
-            <and>
-                <tval>45</tval>
-                <sval min="0" max="4"></sval>
-            </and>
-		<and>
-			<tval>40</tval>
-			<status>bad</status>
-		</and>
-		<and>
-			<tval>45</tval>
-			<status>bad</status>
-		</and>
-        </or>
-    </and>
-</rule>
-<rule name="junkpotions" type="destroy" module="Theme">
-    <and>
-            <not>
-                <ability>Trapping</ability>
-            </not>
-        <or>
-            <and>
-                <tval>71</tval>
-                <sval min="4" max="7"></sval>
-            </and>
-            <and>
-                <tval>71</tval>
-                <sval min="9" max="11"></sval>
-            </and>
-            <and>
-                <tval>71</tval>
-                <sval min="13" max="13">13</sval>
-            </and>
-            <and>
-                <tval>71</tval>
-                <sval min="15" max="21"></sval>
-            </and>
-        </or>
-    </and>
-</rule>
-<rule name="junkwands" type="destroy" module="Theme">
-    <and>
-        <tval>65</tval>
-        <sval min="24" max="25"></sval>
-    </and>
-</rule>
-<rule name="junkscrolls" type="destroy" module="Theme">
-    <and>
-            <not>
-                <ability>Trapping</ability>
-            </not>
-        <or>
-            <and>
-                <tval>70</tval>
-                <sval min="0" max="0"></sval>
-                <not>
-                    <subrace>Vampire</subrace>
-                </not>
-            </and>
-		<and>
-        		<tval>70</tval>
-        		<sval min="1" max="5"></sval>
-	      </and>
-		<and>
-        		<tval>70</tval>
-        		<sval min="7" max="7"></sval>
-	      </and>
-        </or>
-    </and>
-</rule>
-<rule name="brokendagger" type="destroy" module="Theme">
-    <and>
-        <name>Broken Dagger</name>
-        <or>
-            <status>average</status>
-            <status>bad</status>
-            <status>very bad</status>
-            <and>
-                <level min="40" max="50"></level>
-                <status>very good</status>
-            </and>
-        </or>
-    </and>
-</rule>
-<rule name="magestaffs" type="destroy" module="Theme">
-    <and>
-        <tval>6</tval>
-        <or>
-            <and>
-                <level min="0" max="50"></level>
-                <or>
-                    <status>very bad</status>
-                    <status>bad</status>
-                </or>
-            </and>
-            <and>
-                <level min="15" max="50"></level>
-                <status>average</status>
-            </and>
-            <and>
-                <level min="25" max="50"></level>
-                <status>good</status>
-            </and>
-            <and>
-                <level min="40" max="50"></level>
-                <status>very good</status>
-            </and>
-        </or>
-    </and>
-</rule>
-<rule name="instruments" type="destroy" module="Theme">
-    <and>
-        <tval>14</tval>
-        <or>
-            <and>
-                <level min="0" max="50"></level>
-                <or>
-                    <status>very bad</status>
-                    <status>bad</status>
-                </or>
-            </and>
-            <and>
-                <level min="15" max="50"></level>
-                <status>average</status>
-            </and>
-            <and>
-                <level min="25" max="50"></level>
-                <status>good</status>
-            </and>
-            <and>
-                <level min="40" max="50"></level>
-                <status>very good</status>
-            </and>
-        </or>
-    </and>
-</rule>
-<rule name="boomerangs" type="destroy" module="Theme">
-    <and>
-        <tval>15</tval>
-        <or>
-            <and>
-                <level min="0" max="50"></level>
-                <or>
-                    <status>very bad</status>
-                    <status>bad</status>
-                </or>
-            </and>
-            <and>
-                <level min="15" max="50"></level>
-                <status>average</status>
-            </and>
-            <and>
-                <level min="25" max="50"></level>
-                <status>good</status>
-            </and>
-            <and>
-                <level min="40" max="50"></level>
-                <status>very good</status>
-            </and>
-        </or>
-    </and>
-</rule>
-<rule name="shots" type="destroy" module="Theme">
-    <and>
-        <tval>16</tval>
-        <or>
-            <and>
-                <level min="0" max="50"></level>
-                <or>
-                    <status>very bad</status>
-                    <status>bad</status>
-                </or>
-            </and>
-            <and>
-                <level min="25" max="50"></level>
-                <status>average</status>
-            </and>
-            <and>
-                <level min="35" max="50"></level>
-                <status>good</status>
-            </and>
-            <and>
-                <level min="40" max="50"></level>
-                <status>very good</status>
-            </and>
-        </or>
-    </and>
-</rule>
-<rule name="arrows" type="destroy" module="Theme">
-    <and>
-        <tval>17</tval>
-        <or>
-            <and>
-                <level min="0" max="50"></level>
-                <or>
-                    <status>very bad</status>
-                    <status>bad</status>
-                </or>
-            </and>
-            <and>
-                <level min="25" max="50"></level>
-                <status>average</status>
-            </and>
-            <and>
-                <level min="35" max="50"></level>
-                <status>good</status>
-            </and>
-            <and>
-                <level min="40" max="50"></level>
-                <status>very good</status>
-            </and>
-        </or>
-    </and>
-</rule>
-<rule name="bolts" type="destroy" module="Theme">
-    <and>
-        <tval>18</tval>
-        <or>
-            <and>
-                <level min="0" max="50"></level>
-                <or>
-                    <status>very bad</status>
-                    <status>bad</status>
-                </or>
-            </and>
-            <and>
-                <level min="25" max="50"></level>
-                <status>average</status>
-            </and>
-            <and>
-                <level min="35" max="50"></level>
-                <status>good</status>
-            </and>
-            <and>
-                <level min="40" max="50"></level>
-                <status>very good</status>
-            </and>
-        </or>
-    </and>
-</rule>
-<rule name="missile" type="destroy" module="Theme">
-    <and>
-        <tval>19</tval>
-        <or>
-            <and>
-                <level min="0" max="50"></level>
-                <or>
-                    <status>very bad</status>
-                    <status>bad</status>
-                </or>
-            </and>
-            <and>
-                <level min="15" max="50"></level>
-                <status>average</status>
-            </and>
-            <and>
-                <level min="25" max="50"></level>
-                <status>good</status>
-            </and>
-            <and>
-                <level min="40" max="50"></level>
-                <status>very good</status>
-            </and>
-        </or>
-    </and>
-</rule>
-<rule name="diggers" type="destroy" module="Theme">
-    <and>
-        <tval>20</tval>
-        <or>
-            <and>
-                <level min="0" max="50"></level>
-                <or>
-                    <status>very bad</status>
-                    <status>bad</status>
-                </or>
-            </and>
-            <and>
-                <level min="15" max="50"></level>
-                <status>average</status>
-            </and>
-            <and>
-                <level min="25" max="50"></level>
-                <status>good</status>
-            </and>
-            <and>
-                <level min="40" max="50"></level>
-                <status>very good</status>
-            </and>
-        </or>
-    </and>
-</rule>
-<rule name="hafted" type="destroy" module="Theme">
-    <and>
-        <tval>21</tval>
-        <or>
-            <and>
-                <level min="0" max="50"></level>
-                <or>
-                    <status>very bad</status>
-                    <status>bad</status>
-                </or>
-            </and>
-            <and>
-                <level min="15" max="50"></level>
-                <status>average</status>
-            </and>
-            <and>
-                <level min="25" max="50"></level>
-                <status>good</status>
-            </and>
-            <and>
-                <level min="40" max="50"></level>
-                <status>very good</status>
-            </and>
-        </or>
-    </and>
-</rule>
-<rule name="polearm" type="destroy" module="Theme">
-    <and>
-        <tval>22</tval>
-        <or>
-            <and>
-                <level min="0" max="50"></level>
-                <or>
-                    <status>very bad</status>
-                    <status>bad</status>
-                </or>
-            </and>
-            <and>
-                <level min="15" max="50"></level>
-                <status>average</status>
-            </and>
-            <and>
-                <level min="25" max="50"></level>
-                <status>good</status>
-            </and>
-            <and>
-                <level min="40" max="50"></level>
-                <status>very good</status>
-            </and>
-        </or>
-    </and>
-</rule>
-<rule name="swords" type="destroy" module="Theme">
-    <and>
-        <tval>23</tval>
-        <or>
-            <and>
-                <level min="0" max="50"></level>
-                <or>
-                    <status>very bad</status>
-                    <status>bad</status>
-                </or>
-            </and>
-            <and>
-                <level min="15" max="50"></level>
-                <status>average</status>
-            </and>
-            <and>
-                <level min="25" max="50"></level>
-                <status>good</status>
-            </and>
-            <and>
-                <level min="40" max="50"></level>
-                <status>very good</status>
-            </and>
-        </or>
-    </and>
-</rule>
-<rule name="axes" type="destroy" module="Theme">
-    <and>
-        <tval>24</tval>
-        <or>
-            <and>
-                <level min="0" max="50"></level>
-                <or>
-                    <status>very bad</status>
-                    <status>bad</status>
-                </or>
-            </and>
-            <and>
-                <level min="15" max="50"></level>
-                <status>average</status>
-            </and>
-            <and>
-                <level min="25" max="50"></level>
-                <status>good</status>
-            </and>
-            <and>
-                <level min="40" max="50"></level>
-                <status>very good</status>
-            </and>
-        </or>
-    </and>
-</rule>
-<rule name="boots" type="destroy" module="Theme">
-    <and>
-        <tval>30</tval>
-        <or>
-            <and>
-                <level min="0" max="50"></level>
-                <or>
-                    <status>very bad</status>
-                    <status>bad</status>
-                </or>
-            </and>
-            <and>
-                <level min="15" max="50"></level>
-                <status>average</status>
-            </and>
-            <and>
-                <level min="25" max="50"></level>
-                <status>good</status>
-            </and>
-            <and>
-                <level min="40" max="50"></level>
-                <status>very good</status>
-            </and>
-        </or>
-    </and>
-</rule>
-<rule name="gloves" type="destroy" module="Theme">
-    <and>
-        <tval>31</tval>
-        <or>
-            <and>
-                <level min="0" max="50"></level>
-                <or>
-                    <status>very bad</status>
-                    <status>bad</status>
-                </or>
-            </and>
-            <and>
-                <level min="15" max="50"></level>
-                <status>average</status>
-            </and>
-            <and>
-                <level min="25" max="50"></level>
-                <status>good</status>
-            </and>
-            <and>
-                <level min="40" max="50"></level>
-                <status>very good</status>
-            </and>
-        </or>
-    </and>
-</rule>
-<rule name="helms" type="destroy" module="Theme">
-    <and>
-        <tval>32</tval>
-        <or>
-            <and>
-                <level min="0" max="50"></level>
-                <or>
-                    <status>very bad</status>
-                    <status>bad</status>
-                </or>
-            </and>
-            <and>
-                <level min="15" max="50"></level>
-                <status>average</status>
-            </and>
-            <and>
-                <level min="25" max="50"></level>
-                <status>good</status>
-            </and>
-            <and>
-                <level min="40" max="50"></level>
-                <status>very good</status>
-            </and>
-        </or>
-    </and>
-</rule>
-<rule name="crowns" type="destroy" module="Theme">
-    <and>
-        <tval>33</tval>
-        <or>
-            <and>
-                <level min="0" max="50"></level>
-                <or>
-                    <status>very bad</status>
-                    <status>bad</status>
-                </or>
-            </and>
-            <and>
-                <level min="15" max="50"></level>
-                <status>average</status>
-            </and>
-            <and>
-                <level min="25" max="50"></level>
-                <status>good</status>
-            </and>
-            <and>
-                <level min="40" max="50"></level>
-                <status>very good</status>
-            </and>
-        </or>
-    </and>
-</rule>
-<rule name="shields" type="destroy" module="Theme">
-    <and>
-        <tval>34</tval>
-        <or>
-            <and>
-                <level min="0" max="50"></level>
-                <or>
-                    <status>very bad</status>
-                    <status>bad</status>
-                </or>
-            </and>
-            <and>
-                <level min="15" max="50"></level>
-                <status>average</status>
-            </and>
-            <and>
-                <level min="25" max="50"></level>
-                <status>good</status>
-            </and>
-            <and>
-                <level min="40" max="50"></level>
-                <status>very good</status>
-            </and>
-        </or>
-    </and>
-</rule>
-<rule name="cloaks" type="destroy" module="Theme">
-    <and>
-        <tval>35</tval>
-        <or>
-            <and>
-                <level min="0" max="50"></level>
-                <or>
-                    <status>very bad</status>
-                    <status>bad</status>
-                </or>
-            </and>
-            <and>
-                <level min="15" max="50"></level>
-                <status>average</status>
-            </and>
-            <and>
-                <level min="25" max="50"></level>
-                <status>good</status>
-            </and>
-            <and>
-                <level min="40" max="50"></level>
-                <status>very good</status>
-            </and>
-        </or>
-    </and>
-</rule>
-<rule name="softarmour" type="destroy" module="Theme">
-    <and>
-        <tval>36</tval>
-        <or>
-            <and>
-                <level min="0" max="50"></level>
-                <or>
-                    <status>very bad</status>
-                    <status>bad</status>
-                </or>
-            </and>
-            <and>
-                <level min="15" max="50"></level>
-                <status>average</status>
-            </and>
-            <and>
-                <level min="25" max="50"></level>
-                <status>good</status>
-            </and>
-            <and>
-                <level min="40" max="50"></level>
-                <status>very good</status>
-            </and>
-        </or>
-    </and>
-</rule>
-<rule name="hardarmour" type="destroy" module="Theme">
-    <and>
-        <tval>37</tval>
-        <or>
-            <and>
-                <level min="0" max="50"></level>
-                <or>
-                    <status>very bad</status>
-                    <status>bad</status>
-                </or>
-            </and>
-            <and>
-                <level min="15" max="50"></level>
-                <status>average</status>
-            </and>
-            <and>
-                <level min="25" max="50"></level>
-                <status>good</status>
-            </and>
-            <and>
-                <level min="40" max="50"></level>
-                <status>very good</status>
-            </and>
-        </or>
-    </and>
-</rule>
-<rule name="dragonarmour" type="destroy" module="Theme">
-    <and>
-        <tval>38</tval>
-        <or>
-            <and>
-                <level min="0" max="50"></level>
-                <or>
-                    <status>very bad</status>
-                    <status>bad</status>
-                </or>
-            </and>
-            <and>
-                <level min="40" max="50"></level>
-                <status>average</status>
-            </and>
-            <and>
-                <level min="45" max="50"></level>
-                <status>good</status>
-            </and>
-            <and>
-                <level min="49" max="50"></level>
-                <status>very good</status>
-            </and>
-        </or>
-    </and>
-</rule>
-<rule name="daemonbooks" type="destroy" module="Theme">
-	<and>
-		<and>
-			<tval>115</tval>
-			<sval min="55" max="57"></sval>
-		</and>
-		<or>
-            <and>
-                <level min="0" max="50"></level>
-                <or>
-                    <status>very bad</status>
-                    <status>bad</status>
-                </or>
-            </and>
-            <and>
-                <level min="15" max="50"></level>
-                <status>average</status>
-            </and>
-            <and>
-                <level min="25" max="50"></level>
-                <status>good</status>
-            </and>
-            <and>
-                <level min="49" max="50"></level>
-                <status>very good</status>
-            </and>
-		</or>
-	</and>
-</rule>
-<rule name="trapkits" type="destroy" module="Theme">
-        <and>
-            <tval>46</tval>
-            <or>
-                <status>bad</status>
-                <status>very bad</status>
-            </or>
-        </and>
-</rule>
-<rule name="classitems" type="destroy" module="Theme">
-    <or>
-        <and>
-            <tval>9</tval>
-            <and>
-                <not>
-                    <skill min="1" max="50">Corpse-preservation</skill>
-                </not>
-                <not>
-                    <skill min="1" max="50">Possession</skill>
-                </not>
-                <not>
-                    <skill min="1" max="50">Summoning</skill>
-                </not>
-            </and>
-        </and>
-        <and>
-            <or>
-                <tval>104</tval>
-                <tval>105</tval>
-            </or>
-            <not>
-                <skill min="1" max="50">Runecraft</skill>
-            </not>
-        </and>
-        <and>
-            <tval>46</tval>
-            <not>
-                <ability>Trapping</ability>
-            </not>
-            <or>
-                <status>average</status>
-                <status>good</status>
-            </or>
-        </and>
-        <and>
-            <and>
-                <not>
-                    <class>Archer</class>
-                </not>
-                <not>
-                    <class>Ranger</class>
-                </not>
-                <not>
-                    <class>Sniper</class>
-                </not>
-            </and>
-            <tval>11</tval>
-        </and>
-        <and>
-            <and>
-                <not>
-                    <class>Archer</class>
-                </not>
-                <not>
-                    <class>Ranger</class>
-                </not>
-                <not>
-                    <class>Sniper</class>
-                </not>
-            </and>
-            <tval>1</tval>
-        </and>
-    </or>
-</rule>
-]]
diff --git a/lib/module.lua b/lib/module.lua
deleted file mode 100644
index e3214205..00000000
--- a/lib/module.lua
+++ /dev/null
@@ -1,36 +0,0 @@
-add_module
-{
-	["name"]    = "ToME",
-	["version"] = { 2, 3, 11 },
-	["author"]  = { "DarkGod", "darkgod@t-o-m-e.net" },
-	["desc"] = {
-		"The Tales of Middle-earth, the standard and official game.",
-		"You are set on a quest to investigate the old tower of Dol Guldur.",
-		"But who knows what will happen...",
-	},
-
-	["rand_quest"] = TRUE,
-	["C_quest"] = TRUE,
-
-	["base_dungeon"] = 4,
-	["death_dungeon"] = 28,
-
-	["astral_dungeon"] = 8,
-	["astral_wild_x"] = 45,
-	["astral_wild_y"] = 19,
-
-	["random_artifact_weapon_chance"] = 30,
-	["random_artifact_armor_chance"] = 20,
-	["random_artifact_jewelry_chance"] = 20,
-
-	["max_plev"] = 50,
-	["max_skill_overage"] = 4,
-	["skill_per_level"] = function()
-		return 6
-	end,
-
-	["mod_savefiles"]=
-	{
-		"ToME",
-	},
-}
diff --git a/lib/patch/.cvsignore b/lib/patch/.cvsignore
deleted file mode 100644
index d287cd3e..00000000
--- a/lib/patch/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-debug
diff --git a/lib/pref/422color.prf b/lib/pref/422color.prf
deleted file mode 100644
index 309c36b0..00000000
--- a/lib/pref/422color.prf
+++ /dev/null
@@ -1,909 +0,0 @@
-# Agent of the black market
-R:14:0x08:0x74
-
-# Mean-looking mercenary
-R:17:0x0c:0x74
-
-# Battle-scarred veteran
-R:18:0x04:0x74
-
-# Small kobold
-R:29:0x0d:0x6b
-
-# Kobold
-R:30:0x05:0x6b
-
-# Floating eye
-R:32:0x06:0x65
-
-# Fruit bat
-R:37:0x0a:0x62
-
-# Blubbering icky thing
-R:41:0x05:0x69
-
-# Metallic green centipede
-R:42:0x0d:0x63
-
-# Novice warrior
-R:43:0x0f:0x70
-
-# Novice rogue
-R:44:0x08:0x70
-
-# Novice priest
-R:45:0x0e:0x70
-
-# Novice mage
-R:46:0x0c:0x70
-
-# Smeagol
-R:63:0x07:0x68
-
-# Metallic blue centipede
-R:67:0x0e:0x63
-
-# Metallic red centipede
-R:77:0x0c:0x63
-
-# Novice ranger
-R:83:0x05:0x70
-
-# Snotling
-R:87:0x0d:0x6f
-
-# Skeleton kobold
-R:91:0x01:0x73
-
-# Novice mage
-R:93:0x0c:0x70
-
-# Giant leech
-R:95:0x0a:0x77
-
-# Large kobold
-R:102:0x01:0x6b
-
-# Novice priest
-R:109:0x0e:0x70
-
-# Novice warrior
-R:110:0x0f:0x70
-
-# Novice rogue
-R:116:0x08:0x70
-
-# Snaga
-R:118:0x0d:0x6f
-
-# Giant pink frog
-R:121:0x0c:0x52
-
-# Cave orc
-R:126:0x0f:0x6f
-
-# Manes
-R:128:0x0c:0x75
-
-# Red naga
-R:130:0x0c:0x6e
-
-# Red jelly
-R:131:0x0c:0x6a
-
-# Green icky thing
-R:132:0x0d:0x69
-
-# Lost soul
-R:133:0x07:0x47
-
-# Mughash, the Kobold Lord
-R:135:0x06:0x6b
-
-# Skeleton orc
-R:136:0x01:0x73
-
-# Wormtongue, Agent of Saruman
-R:137:0x08:0x70
-
-# Nurgling
-R:139:0x0f:0x75
-
-# Lagduf, the Snaga
-R:140:0x07:0x6f
-
-# Novice ranger
-R:142:0x05:0x70
-
-# Giant salamander
-R:143:0x04:0x52
-
-# Lemure
-R:148:0x03:0x75
-
-# Hill orc
-R:149:0x02:0x6f
-
-# Bandit
-R:150:0x08:0x70
-
-# Orc shaman
-R:162:0x06:0x6f
-
-# Baby blue dragon
-R:163:0x0e:0x64
-
-# Baby white dragon
-R:164:0x09:0x64
-
-# Baby green dragon
-R:165:0x0d:0x64
-
-# Baby red dragon
-R:167:0x0c:0x64
-
-# Giant red ant
-R:168:0x0c:0x61
-
-# Brodda, the Easterling
-R:169:0x03:0x70
-
-# Giant spider
-R:175:0x02:0x53
-
-# Dark elven mage
-R:178:0x0a:0x68
-
-# Kamikaze yeek
-R:179:0x07:0x79
-
-# Dark elven warrior
-R:182:0x08:0x68
-
-# Sand-dweller
-R:183:0x0f:0x75
-
-# Clear mushroom patch
-R:184:0x01:0x2c
-
-# Grishnakh, the Hill Orc
-R:186:0x07:0x6f
-
-# Hairy mold
-R:190:0x0f:0x6d
-
-# Grizzly bear
-R:191:0x07:0x71
-
-# Pseudo dragon
-R:193:0x0a:0x64
-
-# Giant fruit fly
-R:197:0x0f:0x49
-
-# Golfimbul, the Hill Orc Chief
-R:215:0x07:0x6f
-
-# Swordsman
-R:216:0x0f:0x70
-
-# Priest
-R:225:0x0e:0x70
-
-# Dark elven priest
-R:226:0x06:0x68
-
-# Skeleton human
-R:228:0x01:0x73
-
-# Moaning spirit
-R:231:0x0f:0x47
-
-# Stegocentipede
-R:232:0x06:0x63
-
-# Spotted jelly
-R:233:0x02:0x6a
-
-# Illusionist
-R:240:0x0a:0x70
-
-# Druid
-R:241:0x05:0x70
-
-# Ochre jelly
-R:245:0x0b:0x6a
-
-# Vlasta
-R:249:0x06:0x52
-
-# Snaga sapper
-R:251:0x0d:0x6f
-
-# Flesh golem
-R:256:0x03:0x67
-
-# Dark naga
-R:265:0x08:0x6e
-
-# Giant tarantula
-R:275:0x0d:0x53
-
-# Giant clear centipede
-R:276:0x01:0x63
-
-# Mirkwood spider
-R:277:0x07:0x53
-
-# Umber hulk
-R:283:0x07:0x58
-
-# Orc captain
-R:285:0x05:0x6f
-
-# Gelatinous cube
-R:286:0x0e:0x6a
-
-# Lizard man
-R:290:0x0c:0x68
-
-# Ulfast, Son of Ulfang
-R:291:0x03:0x70
-
-# Quasit
-R:294:0x09:0x75
-
-# Imp
-R:296:0x04:0x75
-
-# Forest troll
-R:297:0x0d:0x54
-
-# Giant red scorpion
-R:304:0x0c:0x53
-
-# Earth spirit
-R:305:0x0f:0x45
-
-# Fire spirit
-R:306:0x0c:0x45
-
-# Cold hound
-R:308:0x09:0x5a
-
-# Energy hound
-R:309:0x0b:0x5a
-
-# Uruk
-R:313:0x01:0x6f
-
-# Shagrat, the Orc Captain
-R:314:0x07:0x6f
-
-# Gorbag, the Orc Captain
-R:315:0x07:0x6f
-
-# Stone giant
-R:321:0x02:0x50
-
-# Giant black dragon fly
-R:322:0x08:0x46
-
-# Stone golem
-R:323:0x02:0x67
-
-# Ghast
-R:327:0x0f:0x7a
-
-# Bolg, Son of Azog
-R:330:0x0c:0x6f
-
-# Lizard king
-R:332:0x0c:0x68
-
-# Wyvern
-R:334:0x0d:0x64
-
-# Air hound
-R:338:0x0e:0x5a
-
-# Quylthulg
-R:342:0x09:0x51
-
-# Dark elven lord
-R:348:0x08:0x68
-
-# Cloud giant
-R:349:0x0e:0x50
-
-# Ugluk, the Uruk
-R:350:0x07:0x6f
-
-# Blue dragon bat
-R:351:0x0e:0x62
-
-# Water vortex
-R:355:0x06:0x76
-
-# Cold vortex
-R:358:0x09:0x76
-
-# Energy vortex
-R:359:0x0b:0x76
-
-# Mummified orc
-R:362:0x07:0x7a
-
-# Serpent man
-R:364:0x05:0x4a
-
-# Killer stag beetle
-R:366:0x02:0x4b
-
-# Iron golem
-R:367:0x09:0x67
-
-# Azog, King of the Uruk-Hai
-R:373:0x04:0x6f
-
-# Master rogue
-R:376:0x08:0x70
-
-# Angamaite of Umbar
-R:380:0x07:0x70
-
-# Forest wight
-R:381:0x0d:0x57
-
-# 4-headed hydra
-R:387:0x0f:0x4d
-
-# Mummified human
-R:390:0x0f:0x7a
-
-# Sangahyando of Umbar
-R:392:0x03:0x70
-
-# Banshee
-R:394:0x09:0x47
-
-# Pukelman
-R:398:0x07:0x67
-
-# Disenchanter beast
-R:399:0x01:0x71
-
-# Stone troll
-R:401:0x08:0x54
-
-# Troll priest
-R:403:0x06:0x54
-
-# Khufu, the Mummified King
-R:409:0x07:0x7a
-
-# Beast of Nurgle
-R:422:0x03:0x71
-
-# Creeping adamantite coins
-R:423:0x0a:0x24
-
-# Algroth
-R:424:0x02:0x54
-
-# Flamer of Tzeentch
-R:425:0x0c:0x2c
-
-# Vibration hound
-R:428:0x0f:0x5a
-
-# Ogre mage
-R:430:0x03:0x4f
-
-# Lokkak, the Ogre Chieftain
-R:431:0x05:0x4f
-
-# Colbran
-R:435:0x06:0x67
-
-# Spirit naga
-R:436:0x0e:0x6e
-
-# Corpser
-R:437:0x05:0x2c
-
-# Black knight
-R:442:0x08:0x70
-
-# Clairvoyant
-R:445:0x0e:0x70
-
-# Basilisk
-R:453:0x08:0x52
-
-# Aklash
-R:463:0x09:0x54
-
-# Skeleton troll
-R:465:0x01:0x73
-
-# Shadow drake
-R:471:0x08:0x64
-
-# Manticore
-R:472:0x03:0x48
-
-# Killer slicer beetle
-R:474:0x03:0x4b
-
-# Gug
-R:476:0x08:0x50
-
-# Death watch beetle
-R:478:0x0e:0x4b
-
-# Doombat
-R:484:0x06:0x62
-
-# Ninja
-R:485:0x08:0x70
-
-# Storm giant
-R:487:0x06:0x50
-
-# Bokrug
-R:489:0x05:0x52
-
-# Half-troll
-R:491:0x03:0x54
-
-# Bert the Stone Troll
-R:493:0x09:0x54
-
-# Bill the Stone Troll
-R:494:0x09:0x54
-
-# Tom the Stone Troll
-R:495:0x09:0x54
-
-# Barrow wight
-R:499:0x09:0x57
-
-# Law drake
-R:502:0x09:0x64
-
-# Balance drake
-R:503:0x02:0x64
-
-# Groo, the Wanderer
-R:505:0x03:0x70
-
-# Spectre
-R:508:0x0d:0x47
-
-# Cherub
-R:511:0x09:0x41
-
-# Master thief
-R:516:0x08:0x70
-
-# Lich
-R:518:0x01:0x4c
-
-# Master vampire
-R:520:0x02:0x56
-
-# Oriental vampire
-R:521:0x05:0x56
-
-# Greater mummy
-R:522:0x09:0x7a
-
-# Eog golem
-R:530:0x08:0x67
-
-# Dagashi
-R:532:0x0b:0x70
-
-# Smoke elemental
-R:537:0x08:0x45
-
-# Olog
-R:538:0x05:0x54
-
-# Gravity hound
-R:540:0x02:0x5a
-
-# Acidic cytoplasm
-R:541:0x0d:0x6a
-
-# Ooze elemental
-R:545:0x0f:0x45
-
-# Young black dragon
-R:546:0x08:0x64
-
-# Xorn
-R:550:0x03:0x58
-
-# Colossus
-R:558:0x0b:0x67
-
-# Bodak
-R:566:0x08:0x75
-
-# Lorgan, Chief of the Easterlings
-R:573:0x0c:0x70
-
-# Chaos spawn
-R:574:0x07:0x65
-
-# Crypt thing
-R:577:0x0e:0x4c
-
-# Will o' the wisp
-R:582:0x0b:0x45
-
-# Crystal drake
-R:591:0x0e:0x64
-
-# Mature black dragon
-R:592:0x08:0x64
-
-# Draebor, the Imp
-R:595:0x05:0x75
-
-# Mother Hydra
-R:596:0x05:0x75
-
-# Death knight
-R:597:0x02:0x70
-
-# Time vortex
-R:599:0x0d:0x76
-
-# Shimmering vortex
-R:600:0x0a:0x76
-
-# Beholder
-R:603:0x05:0x65
-
-# Emperor wight
-R:604:0x0b:0x57
-
-# Vargo, Tyrant of Fire
-R:606:0x0c:0x45
-
-# Nether wraith
-R:612:0x0c:0x57
-
-# Waldern, King of Water
-R:615:0x02:0x45
-
-# Ettin
-R:621:0x0b:0x54
-
-# Night mare
-R:622:0x0a:0x71
-
-# Ancient black dragon
-R:624:0x08:0x44
-
-# Shadowfax, steed of Gandalf
-R:629:0x09:0x71
-
-# Spirit troll
-R:630:0x0a:0x47
-
-# War troll
-R:631:0x05:0x54
-
-# Rotting quylthulg
-R:633:0x0f:0x51
-
-# 9-headed hydra
-R:635:0x03:0x4d
-
-# Enchantress
-R:636:0x0b:0x70
-
-# Sorcerer
-R:638:0x03:0x70
-
-# Xaren
-R:639:0x0b:0x58
-
-# Medusa, the Gorgon
-R:642:0x03:0x6e
-
-# Death drake
-R:643:0x07:0x44
-
-# Great crystal drake
-R:646:0x0e:0x44
-
-# Wyrd sister
-R:647:0x0b:0x70
-
-# Death quasit
-R:649:0x01:0x75
-
-# Fallen angel
-R:652:0x08:0x41
-
-# Judge Fire
-R:654:0x04:0x73
-
-# Master lich
-R:658:0x09:0x4c
-
-# Eol, the Dark Elf
-R:660:0x02:0x68
-
-# Undead beholder
-R:664:0x02:0x65
-
-# Dark young of Shub-Niggurath
-R:677:0x08:0x55
-
-# Dreadmaster
-R:690:0x03:0x47
-
-# Scatha the Worm
-R:692:0x01:0x44
-
-# Zoth-Ommog
-R:695:0x07:0x52
-
-# Grand master thief
-R:696:0x0e:0x70
-
-# Leprechaun fanatic
-R:700:0x08:0x68
-
-# Dracolich
-R:701:0x0e:0x44
-
-# Greater titan
-R:702:0x0a:0x50
-
-# Dracolisk
-R:703:0x04:0x44
-
-# Itangast the Fire Drake
-R:710:0x04:0x44
-
-# Glaurung, Father of the Dragons
-R:715:0x04:0x44
-
-# Behemoth
-R:716:0x05:0x48
-
-# Garm, Guardian of Hel
-R:717:0x07:0x43
-
-# Maulotaur
-R:723:0x07:0x48
-
-# Nether hound
-R:724:0x08:0x5a
-
-# Time hound
-R:725:0x0d:0x5a
-
-# Demonic quylthulg
-R:727:0x0c:0x51
-
-# Ulik the Troll
-R:729:0x03:0x54
-
-# Baphomet the Minotaur Lord
-R:730:0x08:0x48
-
-# Hell knight
-R:731:0x02:0x70
-
-# Old Sorcerer
-R:738:0x0a:0x70
-
-# Keeper of Secrets
-R:746:0x0a:0x48
-
-# Hand druj
-R:748:0x08:0x73
-
-# Eye druj
-R:749:0x08:0x73
-
-# Skull druj
-R:750:0x08:0x73
-
-# Aether vortex
-R:752:0x0e:0x76
-
-# Draconic quylthulg
-R:759:0x0d:0x51
-
-# Fundin Bluecloak
-R:762:0x0d:0x68
-
-# Gabriel, the Messenger
-R:769:0x0a:0x41
-
-# Artsi, the Champion of Chaos
-R:770:0x0d:0x68
-
-# The Cat Lord
-R:777:0x04:0x66
-
-# Vlad Dracula, Prince of Darkness
-R:780:0x06:0x56
-
-# Great Wyrm of Law
-R:784:0x09:0x44
-
-# Great Wyrm of Balance
-R:785:0x02:0x44
-
-# Glaaki
-R:788:0x05:0x7e
-
-# Greater draconic quylthulg
-R:801:0x05:0x51
-
-# Greater rotting quylthulg
-R:802:0x07:0x51
-
-# Omarax the Eye Tyrant
-R:805:0x0b:0x65
-
-# Greater Balrog
-R:807:0x0c:0x55
-
-# Aether hound
-R:811:0x0e:0x5a
-
-# Yig, Father of Serpents
-R:814:0x05:0x4a
-
-# Hela, Queen of the Dead
-R:817:0x05:0x70
-
-# Master quylthulg
-R:821:0x06:0x51
-
-# Qlzqqlzuup, the Lord of Flesh
-R:822:0x0e:0x51
-
-# F'lar, rider of the Bronze Mnementh
-R:824:0x08:0x44
-
-# Cyaegha
-R:826:0x08:0x65
-
-# Pazuzu, Lord of Air
-R:827:0x01:0x55
-
-# Cantoras, the Skeletal Lord
-R:830:0x0e:0x73
-
-# Godzilla
-R:832:0x05:0x52
-
-# Loki, the Trickster
-R:835:0x05:0x50
-
-# Lungorthin, the Balrog of White Fire
-R:839:0x01:0x55
-
-# Draugluin, Sire of All Werewolves
-R:840:0x07:0x43
-
-# Vecna, the Emperor Lich
-R:844:0x0b:0x4c
-
-# Great Wyrm of Power
-R:847:0x0b:0x44
-
-# Nodens, Lord of the Great Abyss
-R:849:0x01:0x50
-
-# Jormungand the Midgard Serpent
-R:854:0x05:0x4a
-
-# The Destroyer
-R:855:0x09:0x67
-
-# Gothmog, the High Captain of Balrogs
-R:856:0x0c:0x55
-
-# Sauron, the Sorcerer
-R:860:0x03:0x70
-
-# Human Warrior
-R:863:0x01:0x70
-
-# Elven archer
-R:864:0x0d:0x68
-
-# Death
-R:875:0x02:0x47
-
-# Famine
-R:876:0x02:0x47
-
-# Pestilence
-R:877:0x02:0x47
-
-# War
-R:878:0x02:0x47
-
-# Giant piranha
-R:884:0x0d:0x7e
-
-# Octopus
-R:891:0x02:0x7e
-
-# Giant octopus
-R:892:0x0a:0x7e
-
-# Drowned soul
-R:895:0x02:0x47
-
-# Devilfish
-R:920:0x0a:0x7e
-
-# Undead devilfish
-R:921:0x0a:0x7e
-
-# Gandalf the Grey
-R:935:0x0a:0x70
-
-# Brown Firelizard
-R:942:0x0f:0x64
-
-# Bronze Firelizard
-R:943:0x01:0x64
-
-# Elder aranea
-R:964:0x04:0x53
-
-# Bullroarer the Hobbit
-R:985:0x06:0x68
-
-# Hezrou
-R:992:0x0a:0x55
-
-# Glabrezu
-R:993:0x03:0x55
-
-# Lesser Balrog
-R:996:0x0c:0x55
-
-# The Rat King
-R:1006:0x07:0x72
-
-# Vort the Kobold Queen
-R:1007:0x06:0x6b
-
-# Fire Phantom
-R:1009:0x0c:0x47
-
-# Bone golem
-R:1013:0x08:0x67
-
-# Snake of Yig
-R:1014:0x04:0x4a
-
-# Cultist
-R:1017:0x0e:0x70
-
-# Cult leader
-R:1018:0x06:0x70
-
-# Green dragon worm
-R:1025:0x05:0x77
-
-# Red dragon worm
-R:1027:0x04:0x77
-
diff --git a/lib/pref/font-ami.prf b/lib/pref/font-ami.prf
deleted file mode 100644
index 1c06dbb3..00000000
--- a/lib/pref/font-ami.prf
+++ /dev/null
@@ -1,28 +0,0 @@
-# File: font-ami.prf
-
-#
-# This file contains text remapping data
-# currently used in the Amiga version.
-#
-# Lars Haugseth <larshau@ifi.uio.no>
-#
-
-
-# Color palette - Text
-V:0:0x01:0x00:0x00:0x00
-V:1:0x01:0xFF:0xFF:0xFF
-V:2:0x01:0xC7:0xC7:0xC7
-V:3:0x01:0xFF:0x92:0x00
-V:4:0x01:0xFF:0x00:0x00
-V:5:0x01:0x00:0xCD:0x00
-V:6:0x01:0x00:0x00:0xFE
-V:7:0x01:0xC8:0x64:0x00
-V:8:0x01:0x8A:0x8A:0x8A
-V:9:0x01:0xE0:0xE0:0xE0
-V:10:0x01:0xA5:0x00:0xFF
-V:11:0x01:0xFF:0xFD:0x00
-V:12:0x01:0xFF:0x00:0xBC
-V:13:0x01:0x00:0xFF:0x00
-V:14:0x01:0x00:0xC8:0xFF
-V:15:0x01:0xFF:0xCC:0x80
-
diff --git a/lib/pref/font-dos.prf b/lib/pref/font-dos.prf
deleted file mode 100644
index 9cf1866f..00000000
--- a/lib/pref/font-dos.prf
+++ /dev/null
@@ -1,8 +0,0 @@
-# File: font-dos.prf
-
-#
-# This file is used by Angband (when it was compiled using "main-dos.c")
-# to specify simple attr/char remappings using a standard font, allowing
-# the use of special pseudo-graphic pictures for walls and such.
-#
-
diff --git a/lib/pref/font-mac.new b/lib/pref/font-mac.new
deleted file mode 100644
index 0d6dd8e1..00000000
--- a/lib/pref/font-mac.new
+++ /dev/null
@@ -1,108 +0,0 @@
-# File: font-mac.prf
-
-#
-# This file is used by Angband (when it was compiled using "main-mac.c")
-# to specify simple attr/char remappings using a standard font, allowing
-# the use of the Macintosh's special characters for some things.
-#
-
-
-##### Feature attr/char definitions #####
-
-# fountain
-F:2:0x01/0xBA
-
-# fountain
-F:15:0x08/0xBA
-
-# stream of shallow water
-F:84:0x0E/0xC5
-
-# pool of deep lava
-F:85:0x0C/0xC5
-
-# stream of shallow lava
-F:86:0x04/0xC5
-
-# dead tree
-F:92:0x08/0xB4
-
-# tree
-F:96:0x0D/0xB4
-
-# mountain chain
-F:97:0x0F/0xC6
-
-# high mountain chain
-F:101:0x09/0xC6
-
-# Void Jumpgate
-F:160:0x0A/0xBD
-
-# Altar of Being
-F:161:0x09/0xB9
-
-# Altar of Winds
-F:162:0x0E/0xB9
-
-# Altar of Force
-F:163:0x0C/0xB9
-
-# Altar of Darkness
-F:164:0x08/0xB9
-
-# stream of tainted water
-F:174:0x07/0xC5
-
-# Void Jumpgate
-F:176:0x0A/0xBD
-
-# Great Fire
-F:178:0x0A/0xC5
-
-# Ekkaia, the Encircling Sea
-F:182:0x06/0xC5
-
-# pool of deep water
-F:187:0x06/0xC5
-
-# small tree
-F:202:0x05/0xB4
-
-# a blazing fire
-F:205:0x0B/0xC5
-
-# condensing water
-F:209:0x0E/0xC5
-
-
-##### Monster attr/char definitions #####
-
-# Old Man Willow
-R:206:0x02/0xB4
-
-# Tangleweed
-R:248:0x05/0xB4
-
-# Poison ivy
-R:266:0x05/0xB4
-
-# Giant Venus Flytrap
-R:317:0x05/0xB4
-
-# Huorn
-R:329:0x05/0xB4
-
-# Xiclotlan
-R:396:0x08/0xB4
-
-# Ent
-R:708:0x0D/0xB4
-
-# Quickbeam, the Ent
-R:714:0x0D/0xB4
-
-# Fangorn the Treebeard, Lord of the Ents
-R:934:0x0D/0xB4
-
-
diff --git a/lib/pref/font-xxx.prf b/lib/pref/font-xxx.prf
index 298a8643..3e5d24ee 100644
--- a/lib/pref/font-xxx.prf
+++ b/lib/pref/font-xxx.prf
@@ -429,9 +429,6 @@ E:114:0x0D
 # DAEMON BOOK
 E:115:0x03
 
-# POWER BATERIES
-E:4:0x0D
-
 # MAGE STAFFS
 E:6:0x0E
 
diff --git a/lib/pref/font.prf b/lib/pref/font.prf
index 505964bd..38614683 100644
--- a/lib/pref/font.prf
+++ b/lib/pref/font.prf
@@ -28,33 +28,13 @@
 ?:[IOR [EQU $SYS xaw] [EQU $SYS x11] [EQU $SYS gtk]]
 %:font-x11.prf
 
-?:[EQU $SYS glu]
-%:font-glu.prf
-
 ?:[EQU $SYS gcu]
 %:font-gcu.prf
 
-?:[EQU $SYS ami]
-%:font-ami.prf
-
 ?:[EQU $SYS mac]
 %:font-mac.prf
 
 ?:[EQU $SYS win]
 %:font-win.prf
 
-?:[EQU $SYS dos]
-%:font-dos.prf
-
-?:[EQU $SYS ibm]
-%:font-ibm.prf
-
-?:[EQU $SYS emx]
-%:font-emx.prf
-
-?:[EQU $SYS acn]
-%:font-acn.prf
-
 ?:1
-
-
diff --git a/lib/pref/graf-ami.prf b/lib/pref/graf-ami.prf
deleted file mode 100644
index d9b1b356..00000000
--- a/lib/pref/graf-ami.prf
+++ /dev/null
@@ -1,64 +0,0 @@
-# File: graf-ami.prf
-
-#
-# This file contains color definitions and
-# graphics remapping for the Amiga version.
-#
-# Lars Haugseth <larshau@ifi.uio.no>
-#
-
-
-# Color palette - Graphics
-V:0:0x01:0x00:0x00:0x00
-V:1:0x01:0xF0:0xE0:0xD0
-V:2:0x01:0x80:0x80:0x80
-V:3:0x01:0x50:0x50:0x50
-V:4:0x01:0xE0:0xB0:0x00
-V:5:0x01:0xC0:0xA0:0x70
-V:6:0x01:0x80:0x60:0x40
-V:7:0x01:0x40:0x30:0x20
-V:8:0x01:0x00:0xA0:0xF0
-V:9:0x01:0x00:0x00:0xF0
-V:10:0x01:0x00:0x00:0x70
-V:11:0x01:0xF0:0x00:0x00
-V:12:0x01:0x80:0x00:0x00
-V:13:0x01:0x90:0x00:0xB0
-V:14:0x01:0x00:0x60:0x10
-V:15:0x01:0x60:0xF0:0x40
-
-
-# Color palette - Text
-V:16:0x01:0x00:0x00:0x00
-V:17:0x01:0xFF:0xFF:0xFF
-V:18:0x01:0xC7:0xC7:0xC7
-V:19:0x01:0xFF:0x92:0x00
-V:20:0x01:0xFF:0x00:0x00
-V:21:0x01:0x00:0xCD:0x00
-V:22:0x01:0x00:0x00:0xFE
-V:23:0x01:0xC8:0x64:0x00
-V:24:0x01:0x8A:0x8A:0x8A
-V:25:0x01:0xE0:0xE0:0xE0
-V:26:0x01:0xA5:0x00:0xFF
-V:27:0x01:0xFF:0xFD:0x00
-V:28:0x01:0xFF:0x00:0xBC
-V:29:0x01:0x00:0xFF:0x00
-V:30:0x01:0x00:0xC8:0xFF
-V:31:0x01:0xFF:0xCC:0x80
-
-
-# Standard file
-%:graf-xxx.prf
-
-
-### Feature attr/char definitions
-
-# nothing
-F:0:0x01/0x20
-
-# open floor
-F:1:0x81/0x8E
-
-# invis trap
-F:2:0x81/0x8E
-
-
diff --git a/lib/pref/graf-dos.prf b/lib/pref/graf-dos.prf
deleted file mode 100644
index 41f38c76..00000000
--- a/lib/pref/graf-dos.prf
+++ /dev/null
@@ -1,15 +0,0 @@
-# File: graf-win.prf
-
-#
-# This file defines special attr/char mappings for use in "graphics" mode
-#
-# See "lib/help/command.txt" and "src/files.c" for more information.
-#
-
-# Standard file
-?:[EQU $GRAF old]
-%:graf-xxx.prf
-
-# New tiles
-?:[EQU $GRAF new]
-%:graf-new.prf
diff --git a/lib/pref/graf-iso.prf b/lib/pref/graf-iso.prf
deleted file mode 100644
index 05bc8621..00000000
--- a/lib/pref/graf-iso.prf
+++ /dev/null
@@ -1,6878 +0,0 @@
-%:trap-iso.prf
-
-# General Store
-B:0:0x80:0xB1
-
-# Armoury
-B:1:0x80:0xB2
-
-# Weapon Smiths
-B:2:0x80:0xB3
-
-# Temple
-B:3:0x80:0xB4
-
-# Alchemy Shop
-B:4:0x80:0xB5
-
-# Magic Shop
-B:5:0x80:0xB6
-
-# Black Market
-B:6:0x80:0xB7
-
-# Home
-B:7:0x80:0xB8
-
-# Bookstore
-B:8:0x80:0xB9
-
-# Pet shop
-B:9:0x80:0xAB
-
-# Mayors office
-B:10:0x80:0xAB
-
-# Inn
-B:11:0x80:0xB0
-
-# The Soothsayer
-B:12:0x80:0xAB
-
-# Library
-B:13:0x80:0xAB
-
-# Castle
-B:14:0x80:0xAB
-
-# Casino
-B:15:0x80:0xAB
-
-# Beastmaster Shanty
-B:16:0x80:0xAB
-
-# Fighters Hall
-B:17:0x80:0xAB
-
-# Tower of Magery
-B:18:0x80:0xAB
-
-# Inner Temple
-B:19:0x80:0xAB
-
-# Paladins Guild
-B:20:0x80:0xAB
-
-# Rangers Guild
-B:21:0x80:0xAB
-
-# Thunderlords' Hide
-B:22:0x80:0xAB
-
-# The Mirror
-B:23:0x80:0xAB
-
-# Seat of Ruling
-B:24:0x80:0xAB
-
-# Wizards Spire
-B:25:0x80:0xAB
-
-# Priests Circle
-B:26:0x80:0xAB
-
-# Tower of the King
-B:27:0x80:0xAB
-
-# Library
-B:28:0x80:0xAB
-
-# The White Tree
-B:29:0x80:0xAB
-
-# Craftsmaster
-B:30:0x80:0xAB
-
-# Earth-Dome (Nature)
-B:31:0x80:0xAB
-
-# Minstrels Haven
-B:32:0x80:0xAB
-
-# Star-Dome
-B:33:0x80:0xAB
-
-# Valarin Temple
-B:34:0x80:0xAB
-
-# Sea-Dome
-B:35:0x80:0xAB
-
-# The Golden Flower
-B:36:0x80:0xAB
-
-# The Fountain
-B:37:0x80:0xAB
-
-# Axe Smith
-B:38:0x80:0xAB
-
-# Hafted Smith
-B:39:0x80:0xAB
-
-# Polearm Smith
-B:40:0x80:0xAB
-
-# Sword Smith
-B:41:0x80:0xAB
-
-# Rare Jewelry Shop
-B:42:0x80:0xAB
-
-# Jewelry Shop
-B:43:0x80:0xAB
-
-# Footwear Shop
-B:44:0x80:0xAB
-
-# Rare Footwear Shop
-B:45:0x80:0xAB
-
-# Library
-B:46:0x80:0xAB
-
-# Forbidden Library
-B:47:0x80:0xAB
-
-# Expensive Black Market
-B:48:0x80:0xAB
-
-# Common Shop
-B:49:0x80:0xAB
-
-# Dragon Hunter
-B:50:0x80:0xAB
-
-# Speed Ring Market
-B:51:0x80:0xAB
-
-# Scribe
-B:52:0x80:0xAB
-
-# Potion Store
-B:53:0x80:0xAB
-
-# Recaller
-B:54:0x80:0xAB
-
-# Master Archer
-B:55:0x80:0xAB
-
-# Merchants Guild
-B:56:0x80:0xAB
-
-# The Mathom-house
-B:57:0x80:0xAB
-
-# The Prancing Pony
-B:58:0x80:0xAB
-
-# nothing
-F:0:0x80:0xA0
-
-# open floor
-F:1:0x82:0xBC
-
-# fountain
-F:2:0x81:0x8D
-
-# glyph of warding
-F:3:0x8A:0xE1
-
-# open door
-F:4:0x80:0xA7
-
-# broken door
-F:5:0x80:0xA7
-
-# up staircase
-F:6:0x80:0xBC
-
-# down staircase
-F:7:0x80:0xBE
-
-# quest entrance
-F:8:0x80:0xBE
-
-# quest exit
-F:9:0x80:0xBC
-
-# quest down level
-F:10:0x80:0xBE
-
-# quest up level
-F:11:0x80:0xBC
-
-# town exit
-F:12:0x80:0xBE
-
-# shaft down
-F:13:0x80:0xBE
-
-# shaft up
-F:14:0x80:0xBC
-
-# fountain
-F:15:0x81:0x8D
-
-# web
-F:15:0x81:0x8D
-
-# trap
-F:17:0x8A:0xF9
-
-# visible trap -- spiked pit
-F:18:0x8A:0xF9
-
-# visible trap -- poison pit
-F:19:0x8A:0xF8
-
-# visible trap -- rune -- summon
-F:20:0x8A:0xF8
-
-# visible trap -- rune -- teleport
-F:21:0x8A:0xF8
-
-# visible trap -- spot -- fire
-F:22:0x8A:0xFD
-
-# visible trap -- spot -- acid
-F:23:0x8A:0xFA
-
-# visible trap -- dart -- slow
-F:24:0x8A:0xF3
-
-# visible trap -- dart -- lose str
-F:25:0x8A:0xF3
-
-# visible trap -- dart -- lose dex
-F:26:0x8A:0xF3
-
-# visible trap -- dart -- lose con
-F:27:0x8A:0xF3
-
-# visible trap -- gas -- blind
-F:28:0x8A:0xF6
-
-# visible trap -- gas -- confuse
-F:29:0x8A:0xF6
-
-# visible trap -- gas -- poison
-F:30:0x8A:0xF6
-
-# visible trap -- gas -- sleep
-F:31:0x8A:0xF6
-
-# door
-F:32:0x80:0xAB
-
-# locked door
-F:33:0x80:0xAB
-
-# locked door
-F:34:0x80:0xAB
-
-# locked door
-F:35:0x80:0xAB
-
-# locked door
-F:36:0x80:0xAB
-
-# locked door
-F:37:0x80:0xAB
-
-# locked door
-F:38:0x80:0xAB
-
-# locked door
-F:39:0x80:0xAB
-
-# jammed door
-F:40:0x80:0xAB
-
-# jammed door
-F:41:0x80:0xAB
-
-# jammed door
-F:42:0x80:0xAB
-
-# jammed door
-F:43:0x80:0xAB
-
-# jammed door
-F:44:0x80:0xAB
-
-# jammed door
-F:45:0x80:0xAB
-
-# jammed door
-F:46:0x80:0xAB
-
-# jammed door
-F:47:0x80:0xAB
-
-# secret door
-F:48:0x80:0xA3
-
-# pile of rubble
-F:49:0x8A:0xEF
-
-# magma vein
-F:50:0x80:0xA5
-
-# quartz vein
-F:51:0x81:0xF3
-
-# magma vein
-F:52:0x81:0xF3
-
-# quartz vein
-F:53:0x81:0xF3
-
-# magma vein with treasure
-F:54:0x80:0xAA
-
-# quartz vein with treasure
-F:55:0x80:0xAA
-
-# granite wall
-F:56:0x81:0xF0
-
-# granite wall
-F:57:0x81:0xF0
-
-# granite wall
-F:58:0x81:0xF0
-
-# granite wall
-F:59:0x81:0xF0
-
-# permanent wall
-F:60:0x81:0xF3
-
-# permanent wall
-F:61:0x81:0xF3
-
-# permanent wall
-F:62:0x81:0xF3
-
-# permanent wall
-F:63:0x81:0xF3
-
-# explosive rune
-F:64:0x80:0xAA
-
-# Straight Road startpoint
-F:65:0x80:0xAA
-
-# section of the Straight Road
-F:66:0x80:0xAA
-
-# section of the Straight Road
-F:67:0x80:0xAA
-
-# section of the Straight Road
-F:68:0x80:0xAA
-
-# section of the Straight Road
-F:69:0x80:0xAA
-
-# section of the Straight Road
-F:70:0x80:0xAA
-
-# section of the Straight Road (discharged)
-F:71:0x80:0xAA
-
-# Straight Road exit
-F:72:0x80:0xAA
-
-# corrupted section of the Straight Road
-F:73:0x80:0xAA
-
-# Building
-F:74:0x80:0xB1
-
-# permanent wall
-F:75:0x81:0xF3
-
-# permanent wall
-F:76:0x81:0xF3
-
-# permanent wall
-F:77:0x81:0xF3
-
-# permanent wall
-F:78:0x81:0xF3
-
-# stream of shallow water
-F:84:0x82:0xEB
-
-# pool of deep lava
-F:85:0x82:0xAB
-
-# stream of shallow lava
-F:86:0x82:0xAB
-
-# dark pit
-F:87:0x83:0x8B
-
-# dirt
-F:88:0x82:0xF3
-
-# patch of grass
-F:89:0x82:0xE8
-
-# ice
-F:90:0x80:0xAE
-
-# sand
-F:91:0x80:0xAE
-
-# dead tree
-F:92:0x80:0xA3
-
-# ash
-F:93:0x80:0xAE
-
-# mud
-F:94:0x80:0xAE
-
-# ice wall
-F:95:0x80:0x80
-
-# tree
-F:96:0x83:0x88
-
-# mountain chain
-F:97:0x81:0x9D
-
-# sandwall
-F:98:0x80:0xA3
-
-# sandwall
-F:99:0x80:0xA5
-
-# sandwall with treasure
-F:100:0x80:0xAA
-
-# high mountain chain
-F:101:0x80:0xDE
-
-# nether mist
-F:102:0x80:0x80
-
-# molten glass wall
-F:103:0x80:0xAE
-
-# Void Jumpgate
-F:160:0x81:0x8C
-
-# Altar of Being
-F:161:0x81:0x94
-
-# Altar of Winds
-F:162:0x81:0x94
-
-# Altar of Force
-F:163:0x81:0x94
-
-# Altar of Darkness
-F:164:0x81:0x94
-
-# Altar of Nature
-F:165:0x81:0x94
-
-# Altar of Sun
-F:166:0x81:0x94
-
-# Altar of Rage
-F:167:0x81:0x94
-
-# Altar of Winds
-F:168:0x81:0x94
-
-# Altar of Stars
-F:169:0x81:0x94
-
-# Altar of Being
-F:170:0x81:0x94
-
-# Altar of Randomness
-F:171:0x81:0x94
-
-# floor
-F:172:0x80:0x81
-
-# Underground Tunnel
-F:173:0x80:0x82
-
-# stream of tainted water
-F:174:0x80:0x80
-
-# monster trap
-F:175:0x81:0x9C
-
-# Void Jumpgate
-F:176:0x80:0x80
-
-# lava wall
-F:177:0x80:0x80
-
-# Great Fire
-F:178:0x80:0x80
-
-# Path to next area
-F:179:0x80:0xBE
-
-# Path to previous area
-F:180:0x80:0xBC
-
-# field
-F:181:0x80:0x80
-
-# Ekkaia, the Encircling Sea
-F:182:0x80:0x80
-
-# Altar of Energy
-F:183:0x80:0x80
-
-# Altar of Matter
-F:184:0x80:0x80
-
-# Altar of Being
-F:185:0x80:0x80
-
-# Altar of Unbeing
-F:186:0x80:0x80
-
-# pool of deep water
-F:187:0x82:0xF0
-
-# glass wall
-F:188:0x80:0xAE
-
-# illusion wall
-F:189:0x80:0xA3
-
-# Grass roof
-F:190:0x82:0xF6
-
-# grass roof top
-F:191:0x82:0xF6
-
-# grass roof chimney
-F:192:0x82:0xF7
-
-# brick roof
-F:193:0x82:0xEE
-
-# brick roof top
-F:194:0x82:0xEE
-
-# brick roof chimney
-F:195:0x82:0xF7
-
-# window
-F:196:0x80:0xA3
-
-# small window
-F:197:0x80:0xA3
-
-# rain barrel
-F:198:0x80:0xA3
-
-# grass with flowers
-F:199:0x82:0xF8
-
-# cobblestone road
-F:200:0x83:0x83
-
-# cobblestone with outlet
-F:201:0x80:0xAE
-
-# small tree
-F:202:0x83:0x88
-
-# town
-F:203:0x80:0xAA
-
-# Underground Tunnel
-F:204:0x80:0x82
-
-# a blazing fire
-F:205:0x80:0x80
-
-# pile of rubble
-F:206:0x8A:0xEF
-
-# rocky ground
-F:207:0x80:0x80
-
-# cloud-like vapour
-F:208:0x80:0x80
-
-# condensing water
-F:209:0x80:0x80
-
-# dense mist
-F:210:0x80:0x80
-
-# hail-stone wall
-F:211:0x80:0x80
-
-# dead small tree
-F:212:0x80:0x80
-
-# something
-K:0:0x80:0x80
-
-# Blindness
-K:1:0x86:0x8C
-
-# Paranoia
-K:2:0x86:0x8C
-
-# Confusion
-K:3:0x86:0x8C
-
-# Hallucination
-K:4:0x86:0x8C
-
-# Cure Poison
-K:5:0x86:0x8C
-
-# Cure Blindness
-K:6:0x86:0x8C
-
-# Cure Paranoia
-K:7:0xA6:0xBB
-
-# Cure Confusion
-K:8:0x86:0x8C
-
-# Weakness
-K:9:0x86:0x8C
-
-# Unhealth
-K:10:0x86:0x8C
-
-# Restore Constitution
-K:11:0x86:0x8C
-
-# Restoring
-K:12:0x86:0x8C
-
-# Stupidity
-K:13:0x86:0x8C
-
-# Naivety
-K:14:0x86:0x8C
-
-# Poison
-K:15:0x86:0x8C
-
-# Sickness
-K:16:0x86:0x8C
-
-# Paralysis
-K:17:0x86:0x8C
-
-# Restore Strength
-K:18:0x86:0x8C
-
-# Disease
-K:19:0x86:0x8C
-
-# Cure Serious Wounds
-K:20:0x86:0x8C
-
-# & Ration~ of Food
-K:21:0x8A:0xBC
-
-# & Hard Biscuit~
-K:22:0x8A:0xBA
-
-# & Strip~ of Venison
-K:23:0x8A:0xBB
-
-# & Slime Mold~
-K:24:0x8A:0xBD
-
-# & Lembas~
-K:25:0x8A:0xBE
-
-# & Pint~ of Fine Ale
-K:26:0x8A:0xB8
-
-# & Pint~ of Fine Wine
-K:27:0x8A:0xB8
-
-# & Mattock~
-K:28:0x9E:0xC4
-
-# & Blue Stone~
-K:29:0xA6:0x8B
-
-# & Broken Dagger~
-K:30:0x88:0xC5
-
-# & Bastard Sword~
-K:31:0x88:0xC6
-
-# & Scimitar~
-K:32:0x88:0xCF
-
-# & Tulwar~
-K:33:0x88:0xCD
-
-# & Broad Sword~
-K:34:0x88:0xD0
-
-# & Short Sword~
-K:35:0x88:0xCC
-
-# & Blade~ of Chaos
-K:36:0x88:0xD6
-
-# & Two-Handed Sword~
-K:37:0x88:0xD4
-
-# & Main Gauche~
-K:38:0x88:0xC8
-
-# & Cutlass~
-K:39:0x88:0xCE
-
-# & Executioner's Sword~
-K:40:0x88:0xD5
-
-# & Katana~
-K:41:0x88:0xD3
-
-# & Long Sword~
-K:42:0x88:0xD1
-
-# & Dagger~
-K:43:0x88:0xC7
-
-# & Rapier~
-K:44:0x88:0xC9
-
-# & Sabre~
-K:45:0x88:0xCB
-
-# & Small Sword~
-K:46:0x88:0xCA
-
-# & Broken Sword~
-K:47:0x88:0xC6
-
-# & Ball-and-Chain~
-K:48:0x88:0xFE
-
-# & Whip~
-K:49:0x88:0xD7
-
-# & Flail~
-K:50:0x88:0xFB
-
-# & Two-Handed Flail~
-K:51:0x88:0xFF
-
-# & Morning Star~
-K:52:0x88:0xFC
-
-# & Mace~
-K:53:0x88:0xF9
-
-# & Quarterstaff~
-K:54:0x88:0xFA
-
-# & War Hammer~
-K:55:0x88:0xF8
-
-# & Lead-Filled Mace~
-K:56:0x88:0xFD
-
-# & Mace~ of Disruption
-K:57:0x89:0x80
-
-# & Lucerne Hammer~
-K:58:0x89:0x85
-
-# & Beaked Axe~
-K:59:0x89:0x88
-
-# & Glaive~
-K:60:0x89:0x8A
-
-# & Halberd~
-K:61:0x89:0x8B
-
-# & Awl-Pike~
-K:62:0x89:0x83
-
-# & Pike~
-K:63:0x89:0x87
-
-# & Spear~
-K:64:0x89:0x81
-
-# & Trident~
-K:65:0x89:0x82
-
-# & Lance~
-K:66:0x89:0x84
-
-# & Great Axe~
-K:67:0x89:0x8D
-
-# & Battle Axe~
-K:68:0x89:0x86
-
-# & Lochaber Axe~
-K:69:0x89:0x8C
-
-# & Broad Axe~
-K:70:0x89:0x89
-
-# & Scythe~
-K:71:0x89:0x8E
-
-# & Scythe~ of Slicing
-K:72:0x89:0x8F
-
-# & Short Bow~
-K:73:0x89:0x90
-
-# & Long Bow~
-K:74:0x89:0x91
-
-# & Light Crossbow~
-K:75:0x89:0x92
-
-# & Heavy Crossbow~
-K:76:0x89:0x93
-
-# & Sling~
-K:77:0x89:0x94
-
-# & Arrow~
-K:78:0x89:0xB8
-
-# & Seeker Arrow~
-K:79:0x89:0xB9
-
-# & Bolt~
-K:80:0x89:0xBA
-
-# & Seeker Bolt~
-K:81:0x89:0xBB
-
-# & Rounded Pebble~
-K:82:0x89:0xBC
-
-# & Iron Shot~
-K:83:0x89:0xBD
-
-# & Shovel~
-K:84:0x8A:0xC7
-
-# & Gnomish Shovel~
-K:85:0x8A:0xC8
-
-# & Dwarven Shovel~
-K:86:0x8A:0xC9
-
-# & Pick~
-K:87:0x8A:0xC4
-
-# & Orcish Pick~
-K:88:0x8A:0xC5
-
-# & Dwarven Pick~
-K:89:0x8A:0xC9
-
-# & Elven Cloak~
-K:90:0x88:0x81
-
-# & Pair~ of Soft Leather Boots
-K:91:0x87:0xC6
-
-# & Pair~ of Hard Leather Boots
-K:92:0x87:0xC7
-
-# & Pair~ of Metal Shod Boots
-K:93:0x87:0xC8
-
-# & Hard Leather Cap~
-K:94:0x87:0x90
-
-# & Metal Cap~
-K:95:0x87:0x91
-
-# & Iron Helm~
-K:96:0x87:0x92
-
-# & Steel Helm~
-K:97:0x87:0x93
-
-# & Iron Crown~
-K:98:0x87:0x94
-
-# & Golden Crown~
-K:99:0x87:0x95
-
-# & Jewel Encrusted Crown~
-K:100:0x87:0x96
-
-# & Robe~
-K:101:0x88:0x84
-
-# & Filthy Rag~
-K:102:0x88:0x83
-
-# Soft Leather Armour~
-K:103:0x88:0x85
-
-# Soft Studded Leather~
-K:104:0x88:0x86
-
-# Hard Leather Armour~
-K:105:0x88:0x87
-
-# Hard Studded Leather~
-K:106:0x88:0x88
-
-# Leather Scale Mail~
-K:107:0x88:0x89
-
-# Metal Scale Mail~
-K:108:0x88:0x8A
-
-# Chain Mail~
-K:109:0x88:0x8C
-
-# Rusty Chain Mail~
-K:110:0x88:0x8B
-
-# Augmented Chain Mail~
-K:111:0x88:0x8E
-
-# Bar Chain Mail~
-K:112:0x88:0x8F
-
-# Metal Brigandine Armour~
-K:113:0x88:0x90
-
-# Partial Plate Armour~
-K:114:0x88:0x91
-
-# Metal Lamellar Armour~
-K:115:0x88:0x92
-
-# Full Plate Armour~
-K:116:0x88:0x93
-
-# Ribbed Plate Armour~
-K:117:0x88:0x94
-
-# Adamantite Plate Mail~
-K:118:0x88:0x97
-
-# Mithril Plate Mail~
-K:119:0x88:0x96
-
-# Mithril Chain Mail~
-K:120:0x88:0x95
-
-# Double Chain Mail~
-K:121:0x88:0x8D
-
-# & Shield~ of Deflection
-K:122:0x87:0xD0
-
-# & Cloak~
-K:123:0x88:0x80
-
-# & Shadow Cloak~
-K:124:0x88:0x81
-
-# & Set~ of Leather Gloves
-K:125:0x87:0xC9
-
-# & Set~ of Gauntlets
-K:126:0x87:0xCA
-
-# & Set~ of Cesti
-K:127:0x87:0xCB
-
-# & Small Leather Shield~
-K:128:0x87:0xCC
-
-# & Large Leather Shield~
-K:129:0x87:0xCD
-
-# & Small Metal Shield~
-K:130:0x87:0xCE
-
-# & Large Metal Shield~
-K:131:0x87:0xCF
-
-# Strength
-K:132:0x85:0xB9
-
-# Dexterity
-K:133:0x85:0xBB
-
-# Constitution
-K:134:0x85:0xBB
-
-# Intelligence
-K:135:0x85:0xBB
-
-# Speed
-K:136:0x85:0xBB
-
-# Searching
-K:137:0x85:0xBB
-
-# Teleportation
-K:138:0x85:0xBB
-
-# Slow Digestion
-K:139:0x85:0xBB
-
-# Fire Resistance
-K:140:0x85:0xBB
-
-# Cold Resistance
-K:141:0x85:0xBB
-
-# Levitation
-K:142:0x85:0xBB
-
-# Poison Resistance
-K:143:0x85:0xBB
-
-# Free Action
-K:144:0x85:0xBB
-
-# Weakness
-K:145:0x85:0xBB
-
-# Flames
-K:146:0x85:0xBB
-
-# Acid
-K:147:0x85:0xBB
-
-# Ice
-K:148:0x85:0xBB
-
-# Woe
-K:149:0x85:0xBB
-
-# Stupidity
-K:150:0x85:0xBB
-
-# Damage
-K:151:0x85:0xBB
-
-# Accuracy
-K:152:0x85:0xBB
-
-# Protection
-K:153:0x85:0xBB
-
-# Aggravate Monster
-K:154:0x85:0xBB
-
-# See Invisible
-K:155:0x85:0xBB
-
-# Sustain Strength
-K:156:0x85:0xBB
-
-# Sustain Intelligence
-K:157:0x85:0xBB
-
-# Sustain Wisdom
-K:158:0x85:0xBB
-
-# Sustain Constitution
-K:159:0x85:0xBB
-
-# Sustain Dexterity
-K:160:0x85:0xBB
-
-# Sustain Charisma
-K:161:0x85:0xBB
-
-# Slaying
-K:162:0x85:0xBB
-
-# Brilliance
-K:163:0x86:0xFB
-
-# Charisma
-K:164:0x86:0xFB
-
-# Searching
-K:165:0x86:0xFB
-
-# Teleportation
-K:166:0x86:0xFB
-
-# Slow Digestion
-K:167:0x86:0xFB
-
-# Acid Resistance
-K:168:0x86:0xFB
-
-# Adornment
-K:169:0x86:0xFB
-
-# Double Ring Mail~
-K:170:0x88:0x93
-
-# the Magi
-K:171:0x86:0xFB
-
-# Doom
-K:172:0x86:0xFB
-
-# Enchant Weapon To-Hit
-K:173:0x85:0x94
-
-# Enchant Weapon To-Dam
-K:174:0x85:0x94
-
-# Enchant Armor
-K:175:0x85:0x94
-
-# Identify
-K:176:0x85:0x94
-
-# *Identify*
-K:177:0x85:0x94
-
-# Rumour
-K:178:0x85:0x94
-
-# Chaos
-K:179:0x85:0x94
-
-# Remove Curse
-K:180:0x85:0x94
-
-# Light
-K:181:0x85:0x94
-
-# Fire
-K:182:0x85:0x94
-
-# Ice
-K:183:0x85:0x94
-
-# Summon Monster
-K:184:0x85:0x94
-
-# Phase Door
-K:185:0x85:0x94
-
-# Teleportation
-K:186:0x85:0x94
-
-# Teleport Level
-K:187:0x85:0x94
-
-# Monster Confusion
-K:188:0x85:0x94
-
-# Magic Mapping
-K:189:0x85:0x94
-
-# Rune of Protection
-K:190:0x85:0x94
-
-# *Remove Curse*
-K:191:0x85:0x94
-
-# Treasure Detection
-K:192:0x85:0x94
-
-# Object Detection
-K:193:0x85:0x94
-
-# Trap Detection
-K:194:0x85:0x94
-
-# & Sheaf Arrow~
-K:195:0x89:0xB9
-
-# & Mithril Shot~
-K:196:0x89:0xBD
-
-# Door
-K:197:0x85:0x94
-
-# Acquirement
-K:198:0x85:0x94
-
-# *Acquirement*
-K:199:0x85:0x94
-
-# Mass Genocide
-K:200:0x85:0x94
-
-# Detect Invisible
-K:201:0x85:0x94
-
-# Aggravate Monster
-K:202:0x85:0x94
-
-# Trap Creation
-K:203:0x85:0x94
-
-# Trap
-K:204:0x85:0x94
-
-# Artifact Creation
-K:205:0x85:0x94
-
-# Recharging
-K:206:0x85:0x94
-
-# Genocide
-K:207:0x85:0x94
-
-# Darkness
-K:208:0x85:0x94
-
-# Protection from Evil
-K:209:0x85:0x94
-
-# Satisfy Hunger
-K:210:0x85:0x94
-
-# Dispel Undead
-K:211:0x85:0x94
-
-# *Enchant Weapon*
-K:212:0x85:0x94
-
-# Curse Weapon
-K:213:0x85:0x94
-
-# *Enchant Armor*
-K:214:0x85:0x94
-
-# Curse Armor
-K:215:0x85:0x94
-
-# Summon Undead
-K:216:0x85:0x94
-
-# Blessing
-K:217:0x85:0x94
-
-# Holy Chant
-K:218:0x85:0x94
-
-# Holy Prayer
-K:219:0x85:0x94
-
-# Word of Recall
-K:220:0x85:0x94
-
-# *Destruction*
-K:221:0x85:0x94
-
-# Slime Mold Juice
-K:222:0x85:0xFD
-
-# Apple Juice
-K:223:0x85:0xFD
-
-# Water
-K:224:0x85:0xFD
-
-# Strength
-K:225:0x85:0xFD
-
-# Weakness
-K:226:0x85:0xFD
-
-# Restore Strength
-K:227:0x85:0xFD
-
-# Intelligence
-K:228:0x85:0xFD
-
-# Stupidity
-K:229:0x85:0xFD
-
-# Restore Intelligence
-K:230:0x85:0xFD
-
-# Wisdom
-K:231:0x85:0xFD
-
-# Naivety
-K:232:0x85:0xFD
-
-# Restore Wisdom
-K:233:0x85:0xFD
-
-# Charisma
-K:234:0x85:0xFD
-
-# Ugliness
-K:235:0x85:0xFD
-
-# Restore Charisma
-K:236:0x85:0xFD
-
-# Curing
-K:237:0x85:0xFD
-
-# Invulnerability
-K:238:0x85:0xFD
-
-# New Life
-K:239:0x85:0xFD
-
-# Cure Serious Wounds
-K:240:0x85:0xFD
-
-# Cure Critical Wounds
-K:241:0x85:0xFD
-
-# Healing
-K:242:0x85:0xFD
-
-# Constitution
-K:243:0x85:0xFD
-
-# Experience
-K:244:0x85:0xFD
-
-# Sleep
-K:245:0x85:0xFD
-
-# Blindness
-K:246:0x85:0xFD
-
-# Booze
-K:247:0x85:0xFD
-
-# Poison
-K:248:0x85:0xFD
-
-# Speed
-K:249:0x85:0xFD
-
-# Slowness
-K:250:0x85:0xFD
-
-# Dexterity
-K:251:0x85:0xFD
-
-# Restore Dexterity
-K:252:0x85:0xFD
-
-# Restore Constitution
-K:253:0x85:0xFD
-
-# Lose Memories
-K:254:0x85:0xFD
-
-# Salt Water
-K:255:0x85:0xFD
-
-# Enlightenment
-K:256:0x85:0xFD
-
-# Heroism
-K:257:0x85:0xFD
-
-# Berserk Strength
-K:258:0x85:0xFD
-
-# Boldness
-K:259:0x85:0xFD
-
-# Restore Life Levels
-K:260:0x85:0xFD
-
-# Resist Heat
-K:261:0x85:0xFD
-
-# Resist Cold
-K:262:0x85:0xFD
-
-# Detect Invisible
-K:263:0x85:0xFD
-
-# Slow Poison
-K:264:0x85:0xFD
-
-# Neutralise Poison
-K:265:0x85:0xFD
-
-# Restore Mana
-K:266:0x85:0xFD
-
-# Infra-vision
-K:267:0x85:0xFD
-
-# Resistance
-K:268:0x85:0xFD
-
-# Spell
-K:269:0x86:0xCB
-
-# Manathrust
-K:270:0x86:0xCB
-
-# Fireflash
-K:271:0x86:0xCB
-
-# Firewall
-K:272:0x86:0xCB
-
-# Tidal Wave
-K:273:0x86:0xCB
-
-# Ice Storm
-K:274:0x86:0xCB
-
-# Noxious Cloud
-K:275:0x86:0xCB
-
-# Poison Blood
-K:276:0x86:0xCB
-
-# Thunderstorm
-K:277:0x86:0xCB
-
-# Dig
-K:278:0x86:0xCB
-
-# Stone Prison
-K:279:0x86:0xCB
-
-# Strike
-K:280:0x86:0xCB
-
-# Teleport Away
-K:281:0x86:0xCB
-
-# Summon Animal
-K:282:0x86:0xCB
-
-# Magelock
-K:283:0x86:0xCB
-
-# Slow Monster
-K:284:0x86:0xCB
-
-# Essence of Speed
-K:285:0x9F:0x84
-
-# Banishment
-K:286:0x86:0xCB
-
-# Disperse Magic
-K:287:0x86:0xCB
-
-# Charm
-K:288:0x86:0xCB
-
-# Confuse
-K:289:0x86:0xCB
-
-# Demon Blade
-K:290:0x86:0xCB
-
-# Heal Monster
-K:291:0x86:0xCB
-
-# Haste Monster
-K:292:0x86:0xCB
-
-# & Flight Arrow~
-K:293:0x89:0xB9
-
-# Acid Bolts
-K:294:0x86:0xCB
-
-# Dragon's Flame
-K:295:0x86:0xCB
-
-# Dragon's Frost
-K:296:0x86:0xCB
-
-# Dragon's Breath
-K:297:0x86:0xCB
-
-# Annihilation
-K:298:0x86:0xCB
-
-# Rockets
-K:299:0x86:0xCB
-
-# Spell
-K:300:0x87:0x8A
-
-# Nothing
-K:301:0x87:0x8A
-
-# Globe of Light
-K:302:0x87:0x8A
-
-# Fiery Shield
-K:303:0x87:0x8A
-
-# Remove Curses
-K:304:0x87:0x8A
-
-# Wings of Winds
-K:305:0x87:0x8A
-
-# Shake
-K:306:0x87:0x8A
-
-# Disarm
-K:307:0x87:0x8A
-
-# Teleportation
-K:308:0x87:0x8A
-
-# Probability Travel
-K:309:0x87:0x8A
-
-# Recovery
-K:310:0x87:0x8A
-
-# Healing
-K:311:0x87:0x8A
-
-# Vision
-K:312:0x87:0x8A
-
-# Identify
-K:313:0x87:0x8A
-
-# Sense Hidden
-K:314:0x87:0x8A
-
-# Reveal Ways
-K:315:0x87:0x8A
-
-# Sense Monsters
-K:316:0x87:0x8A
-
-# Genocide
-K:317:0x87:0x8A
-
-# Summon
-K:318:0x87:0x8A
-
-# Curing
-K:319:0x87:0x8A
-
-# Wish
-K:320:0x87:0x8A
-
-# Mana
-K:321:0x87:0x8A
-
-# Darkness
-K:322:0x87:0x8A
-
-# Genocide
-K:323:0x87:0x8A
-
-# Power
-K:324:0x87:0x8A
-
-# the Magi
-K:325:0x87:0x8A
-
-# Perception
-K:326:0x87:0x8A
-
-# Holiness
-K:327:0x87:0x8A
-
-# Enlightenment
-K:328:0x87:0x8A
-
-# Healing
-K:329:0x87:0x8A
-
-# & Tome~ of Magical Energy
-K:330:0x8B:0xD8
-
-# & Tome~ of the Eternal Flame
-K:331:0x8B:0xD9
-
-# & Tome~ of the Blowing Wind
-K:332:0x8B:0xDA
-
-# & Tome~ of the Impenetrable Earth
-K:333:0x8B:0xDB
-
-# & Tome~ of the Everrunning Wave
-K:334:0x8B:0xDC
-
-# & Tome~ of Translocation
-K:335:0x8B:0xDD
-
-# & Tome~ of the Tree
-K:336:0x8B:0xDE
-
-# & Tome~ of Knowledge
-K:337:0x8B:0xDF
-
-# & Small wooden chest~
-K:338:0x85:0xD1
-
-# & Large wooden chest~
-K:339:0x85:0xD2
-
-# & Small iron chest~
-K:340:0x85:0xD3
-
-# & Large iron chest~
-K:341:0x85:0xD4
-
-# & Small steel chest~
-K:342:0x85:0xD5
-
-# & Large steel chest~
-K:343:0x85:0xD6
-
-# & Ruined chest~
-K:344:0x85:0xD7
-
-# & Iron Spike~
-K:345:0x8A:0xC1
-
-# & Wooden Torch~
-K:346:0x8A:0xC3
-
-# & Brass Lantern~
-K:347:0x8A:0xC2
-
-# & Flask~ of oil
-K:348:0x8A:0xC0
-
-# & Empty Bottle~
-K:349:0x8A:0xBF
-
-# Havoc
-K:350:0x86:0xBB
-
-# Door
-K:351:0x86:0xBB
-
-# Trap Location
-K:352:0x86:0xBB
-
-# Probing
-K:353:0x86:0xBB
-
-# Recall
-K:354:0x86:0xBB
-
-# Illumination
-K:355:0x86:0xBB
-
-# Light
-K:356:0x86:0xBB
-
-# Lightning Bolts
-K:357:0x86:0xBB
-
-# Frost Bolts
-K:358:0x86:0xBB
-
-# Fire Bolts
-K:359:0x86:0xBB
-
-# Polymorph
-K:360:0x86:0xBB
-
-# Slow Monster
-K:361:0x86:0xBB
-
-# Sleep Monster
-K:362:0x86:0xBB
-
-# Drain Life
-K:363:0x86:0xBB
-
-# Teleport Other
-K:364:0x86:0xBB
-
-# Disarming
-K:365:0x86:0xBB
-
-# Lightning Balls
-K:366:0x86:0xBB
-
-# Cold Balls
-K:367:0x86:0xBB
-
-# Fire Balls
-K:368:0x86:0xBB
-
-# Acid Balls
-K:369:0x86:0xBB
-
-# Acid Bolts
-K:370:0x86:0xBB
-
-# Enlightenment
-K:371:0x86:0xBB
-
-# Perception
-K:372:0x86:0xBB
-
-# Curing
-K:373:0x86:0xBB
-
-# Healing
-K:374:0x86:0xBB
-
-# Detection
-K:375:0x86:0xBB
-
-# Restoration
-K:376:0x86:0xBB
-
-# Speed
-K:377:0x86:0xBB
-
-# Spell
-K:378:0xA3:0xFC
-
-# Spell
-K:379:0x89:0xF8
-
-# [Beings of Darkness]
-K:380:0x89:0xF9
-
-# [Material Shadow]
-K:381:0x89:0xFA
-
-# [Nature's Wrath]
-K:382:0x89:0xFB
-
-# [Sign of Chaos]
-K:383:0x89:0xD0
-
-# [Chaos Mastery]
-K:384:0x89:0xD1
-
-# [Chaos Channels]
-K:385:0x89:0xD2
-
-# [Armageddon Tome]
-K:386:0x89:0xD3
-
-# [Nether Openings]
-K:387:0x8A:0x80
-
-# [Unholy Blessings]
-K:388:0x8A:0x81
-
-# & Firestone~
-K:389:0x8A:0xCA
-
-# & Small Firestone~
-K:390:0x8A:0xCB
-
-# & Broken Skull~
-K:391:0x8A:0xCC
-
-# & Broken Bone~
-K:392:0x8A:0xCD
-
-# & Canine Skeleton~
-K:393:0x8A:0xD2
-
-# & Rodent Skeleton~
-K:394:0x8A:0xD3
-
-# & Human Skeleton~
-K:395:0x8A:0xCE
-
-# & Dwarf Skeleton~
-K:396:0x8A:0xD0
-
-# & Elf Skeleton~
-K:397:0x8A:0xCF
-
-# & Gnome Skeleton~
-K:398:0x8A:0xD1
-
-# & Great Hammer~
-K:399:0x9E:0xC2
-
-# Black Dragon Scale Mail~
-K:400:0x88:0xBA
-
-# Blue Dragon Scale Mail~
-K:401:0x88:0xB8
-
-# White Dragon Scale Mail~
-K:402:0x88:0xB9
-
-# Red Dragon Scale Mail~
-K:403:0x88:0xBB
-
-# Green Dragon Scale Mail~
-K:404:0x88:0xBC
-
-# Multi-Hued Dragon Scale Mail~
-K:405:0x88:0xC3
-
-# Pseudo Dragon Scale Mail~
-K:406:0x88:0xBF
-
-# Law Dragon Scale Mail~
-K:407:0x88:0xC1
-
-# Bronze Dragon Scale Mail~
-K:408:0x88:0xBD
-
-# Gold Dragon Scale Mail~
-K:409:0x88:0xBE
-
-# Chaos Dragon Scale Mail~
-K:410:0x88:0xC0
-
-# Balance Dragon Scale Mail~
-K:411:0x88:0xC2
-
-# Power Dragon Scale Mail~
-K:412:0x88:0xC4
-
-# & Dragon Helm~
-K:413:0x87:0xBA
-
-# & Dragon Shield~
-K:414:0x87:0xD4
-
-# Death
-K:415:0x85:0xFD
-
-# Ruination
-K:416:0x85:0xFD
-
-# Detonations
-K:417:0x85:0xFD
-
-# Augmentation
-K:418:0x85:0xFD
-
-# *Healing*
-K:419:0x85:0xFD
-
-# Life
-K:420:0x85:0xFD
-
-# Self Knowledge
-K:421:0x85:0xFD
-
-# *Enlightenment*
-K:422:0x85:0xFD
-
-# [Necromantic Incantations]
-K:423:0x8A:0x82
-
-# [Curses of Angmar]
-K:424:0x8A:0x83
-
-# Fear Resistance
-K:425:0x85:0xBB
-
-# Light and Darkness Resistance
-K:426:0x85:0xBB
-
-# Nether Resistance
-K:427:0x85:0xBB
-
-# Nexus Resistance
-K:428:0x85:0xBB
-
-# Sound Resistance
-K:429:0x85:0xBB
-
-# Confusion Resistance
-K:430:0x85:0xBB
-
-# Shard Resistance
-K:431:0x85:0xBB
-
-# Disenchantment Resistance
-K:432:0x85:0xBB
-
-# Chaos Resistance
-K:433:0x85:0xBB
-
-# Blindness Resistance
-K:434:0x85:0xBB
-
-# Lordly Protection
-K:435:0x85:0xBB
-
-# Extra Attacks
-K:436:0x85:0xBB
-
-# Cure Light Wounds
-K:437:0x85:0xFD
-
-# Clumsiness
-K:438:0x85:0xFD
-
-# Sickliness
-K:439:0x85:0xFD
-
-# Map of Bree
-K:440:0xA5:0xB8
-
-# Map of Gondolin
-K:441:0xA5:0xB8
-
-# Map of Lothlorien
-K:442:0xA5:0xB8
-
-# Map of Minas Anor
-K:443:0xA5:0xB8
-
-# & Silver Arrow~
-K:465:0xA6:0xB9
-
-# & Silver Bolt~
-K:466:0xA6:0xBA
-
-# Lightning Resistance
-K:467:0x86:0xF8
-
-# Wisdom
-K:468:0x86:0xF8
-
-# Regeneration
-K:469:0x86:0xF8
-
-# Infravision
-K:470:0x86:0xF8
-
-# Devotion
-K:471:0x86:0xF8
-
-# Weaponmastery
-K:472:0x86:0xF8
-
-# Trickery
-K:473:0x86:0xF8
-
-# Telepathy
-K:474:0x86:0xF8
-
-# Sustenance
-K:475:0x86:0xF8
-
-# & Palantir~
-K:476:0xA6:0xBF
-
-# & Elfstone~
-K:477:0xA6:0xBB
-
-# & Jewel~
-K:478:0xA6:0xBC
-
-# & Ring~
-K:479:0xA6:0xBD
-
-# copper
-K:480:0x85:0x89
-
-# copper
-K:481:0x85:0x89
-
-# copper
-K:482:0x85:0x89
-
-# silver
-K:483:0x85:0x8A
-
-# silver
-K:484:0x85:0x8A
-
-# silver
-K:485:0x85:0x8A
-
-# garnets
-K:486:0x85:0x8E
-
-# garnets
-K:487:0x85:0x8E
-
-# gold
-K:488:0x85:0x8B
-
-# gold
-K:489:0x85:0x8B
-
-# gold
-K:490:0x85:0x8B
-
-# opals
-K:491:0x85:0x8F
-
-# sapphires
-K:492:0x85:0x90
-
-# rubies
-K:493:0x85:0x91
-
-# diamonds
-K:494:0x85:0x92
-
-# emeralds
-K:495:0x85:0x93
-
-# mithril
-K:496:0x85:0x8C
-
-# adamantite
-K:497:0x85:0x8D
-
-# & Mighty Hammer~
-K:498:0x9E:0xC2
-
-# & Massive Iron Crown~
-K:499:0x87:0x94
-
-# & Phial~
-K:500:0x8A:0xD5
-
-# & Star~
-K:501:0x8A:0xD6
-
-# & Arkenstone~
-K:502:0x8A:0xD7
-
-# & Amulet~
-K:503:0x85:0xCE
-
-# & Amulet~
-K:504:0x85:0xCF
-
-# & Necklace~
-K:505:0x85:0xD0
-
-# & Ring~
-K:506:0x85:0xC7
-
-# & Ring~
-K:507:0x85:0xC8
-
-# & Ring~
-K:508:0x85:0xCA
-
-# & Ring~
-K:509:0x85:0xCB
-
-# & Ring~
-K:510:0x85:0xCC
-
-# & Ring~
-K:511:0x85:0xCD
-
-# [Rites of Initiation]
-K:512:0x8A:0x88
-
-# [Ways of War]
-K:513:0x8A:0x89
-
-# [Divine Retribution]
-K:514:0x8A:0x8A
-
-# [Essence of Fury]
-K:515:0x8A:0x8B
-
-# [Novice Crafts]
-K:516:0x8A:0x84
-
-# [Arcane Channels]
-K:517:0x8A:0x85
-
-# [Sigils of Wizardry]
-K:518:0x8A:0x86
-
-# [Mana Focus]
-K:519:0x8A:0x87
-
-# Reflection
-K:520:0x86:0xFB
-
-# Anti-Magic
-K:521:0x86:0xFB
-
-# Anti-Teleportation
-K:522:0x86:0xFB
-
-# Resistance
-K:523:0x86:0xFB
-
-# & Zweihander~
-K:524:0x9E:0xC4
-
-# & Dwarven Lantern~
-K:525:0xA6:0x8C
-
-# Splint Mail~
-K:526:0x88:0x94
-
-# & Everburning Torch~
-K:527:0xA6:0x8D
-
-# & Trifurcate Spear~
-K:528:0x9E:0xBD
-
-# & Three Piece Rod~
-K:529:0x9E:0xB8
-
-# & Feanorian Lamp~
-K:530:0xA6:0x8E
-
-# & Fur Cloak~
-K:531:0x88:0x81
-
-# Water Curing
-K:532:0x9E:0xBE
-
-# & Hatchet~
-K:533:0x9E:0xC7
-
-# Rhino Hide Armour~
-K:535:0x88:0x90
-
-# Leather Jacket~
-K:536:0x88:0x87
-
-# & Sickle~
-K:537:0x9E:0xC8
-
-# [Psychoportation]
-K:538:0x9E:0xBF
-
-# [Clairsentience]
-K:539:0x9E:0xC9
-
-# [Telekinesis]
-K:540:0x9E:0xCB
-
-# [Empathy]
-K:541:0x9E:0xCA
-
-# & Club~
-K:542:0x9E:0xCA
-
-# & Broad Spear~
-K:543:0x9E:0xBC
-
-# & Khopesh~
-K:544:0x9E:0xCC
-
-# & Flamberge~
-K:545:0x9E:0xBB
-
-# & Claymore~
-K:546:0x9E:0xC5
-
-# & Espadon~
-K:547:0x9E:0xC6
-
-# & Great Scimitar~
-K:548:0x9E:0xC3
-
-# Arrow
-K:549:0x8A:0xD8
-
-# Bolt
-K:550:0x8A:0xD9
-
-# & Fauchard~
-K:551:0x9E:0xCD
-
-# & Guisarme~
-K:552:0x9E:0xCE
-
-# & Heavy Lance~
-K:553:0x9E:0xBA
-
-# & Basillard~
-K:554:0x9E:0xD1
-
-# Catapult
-K:555:0x8A:0xDA
-
-# Ring Mail~
-K:556:0x88:0x94
-
-# Cord Armour~
-K:557:0x88:0x88
-
-# Paper Armour~
-K:558:0x88:0xB9
-
-# Padded Armour~
-K:559:0x88:0x89
-
-# Fumes
-K:560:0x8A:0xDB
-
-# Stone and Hide Armour~
-K:561:0x88:0x8F
-
-# Magic
-K:562:0x8A:0xDC
-
-# Device
-K:563:0x8A:0xDD
-
-# Nothing
-K:564:0xA6:0xD4
-
-# Poison
-K:565:0x9E:0xF8
-
-# Nothing
-K:566:0xA6:0xD4
-
-# Nothing
-K:567:0xA6:0xD4
-
-# Nothing
-K:568:0xA6:0xD4
-
-# Nothing
-K:569:0xA6:0xD4
-
-# Explosion
-K:570:0x9E:0xF9
-
-# Teleport
-K:571:0x9E:0xFA
-
-# Nothing
-K:572:0xA6:0xD4
-
-# & Blood~ of Life
-K:573:0x85:0xFD
-
-# Cold
-K:574:0x9E:0xFB
-
-# Fire
-K:575:0x9E:0xFC
-
-# Acid
-K:576:0x9E:0xFD
-
-# & Mage Staff~
-K:577:0x9F:0xB8
-
-# Lightning
-K:578:0x85:0xB8
-
-# Life
-K:579:0x9E:0xFE
-
-# Confusion
-K:580:0x9E:0xFF
-
-# Light
-K:581:0x9F:0x80
-
-# & Ring~
-K:582:0x85:0xBD
-
-# Invisibility
-K:583:0x85:0xFD
-
-# Chaos
-K:584:0x9F:0x81
-
-# Corruption
-K:585:0x85:0xFD
-
-# Invisibility
-K:586:0x85:0xFD
-
-# Time
-K:587:0x9F:0x82
-
-# Deep Thoughts
-K:588:0x85:0x94
-
-# More Deep Thoughts
-K:589:0x85:0x95
-
-# Compendium of Deep Thoughts
-K:590:0x85:0x96
-
-# Artifact Lore Vol. I
-K:591:0x85:0x94
-
-# Artifact Lore Vol. II
-K:592:0x85:0x95
-
-# Artifact Lore Vol. III
-K:593:0x85:0x97
-
-# Monstrous Compendium 1
-K:594:0x85:0x97
-
-# Monstrous Compendium 2
-K:595:0x85:0x96
-
-# Monstrous Compendium 3
-K:596:0x85:0x95
-
-# Monstrous Compendium 4
-K:597:0x85:0x94
-
-# Monstrous Compendium 5
-K:598:0x85:0x97
-
-# Monstrous Compendium 6
-K:599:0x85:0x96
-
-# Monstrous Compendium 7
-K:600:0x85:0x95
-
-# Monstrous Compendium 8
-K:601:0x85:0x94
-
-# Monstrous Compendium 9
-K:602:0x85:0x95
-
-# Monstrous Compendium 10
-K:603:0x85:0x96
-
-# Monstrous Compendium 11
-K:604:0x85:0x97
-
-# Abomination
-K:605:0x85:0xFD
-
-# Shape of Wolf
-K:606:0x85:0xFD
-
-# Shape of Ape
-K:607:0x85:0xFD
-
-# Shape of Goat
-K:608:0x85:0xFD
-
-# Shape of Insect
-K:609:0x85:0xFD
-
-# Shape of Sparrow
-K:610:0x85:0xFD
-
-# Shape of Ent
-K:611:0x85:0xFD
-
-# Shape of Vampire
-K:612:0x85:0xFD
-
-# Shape of Spider
-K:613:0x85:0xFD
-
-# Shape of Mana ball
-K:614:0x85:0xFD
-
-# Shape of Fire cloud
-K:615:0x85:0xFD
-
-# Shape of Cold cloud
-K:616:0x85:0xFD
-
-# Shape of Chaos cloud
-K:617:0x85:0xFD
-
-# [Wolf]
-K:618:0x8B:0x98
-
-# [Ape]
-K:619:0x8B:0x99
-
-# [Goat]
-K:620:0x8B:0x9A
-
-# [Insect]
-K:621:0x8B:0x9B
-
-# [Sparrow]
-K:622:0x8B:0x9C
-
-# [Ent]
-K:623:0x8B:0x9D
-
-# [Vampire]
-K:624:0x8B:0x9E
-
-# [Spider]
-K:625:0x8B:0x9F
-
-# [Mana ball]
-K:626:0x8B:0xA0
-
-# [Fire cloud]
-K:627:0x8B:0xA1
-
-# [Cold cloud]
-K:628:0x8B:0xA2
-
-# [Chaos Cloud]
-K:629:0x8B:0xA3
-
-# [Ghost]
-K:630:0x8B:0xA4
-
-# [Kobold]
-K:631:0x8B:0xA5
-
-# [Dragon]
-K:632:0x8B:0xA6
-
-# [Demon]
-K:633:0x8B:0xA7
-
-# [Hound]
-K:634:0x8B:0xA8
-
-# [Quylthulg]
-K:635:0x8B:0xA9
-
-# [Maia]
-K:636:0x8B:0xAA
-
-# [Serpent]
-K:637:0x8B:0xAB
-
-# [Giant]
-K:638:0x8B:0xAC
-
-# [Vala]
-K:639:0x8B:0xAD
-
-# Magic
-K:640:0x9F:0x83
-
-# corpse
-K:641:0x9F:0xB9
-
-# skeleton
-K:642:0x8A:0xCE
-
-# head
-K:643:0x8A:0xCC
-
-# skull
-K:644:0x8A:0xCC
-
-# raw meat
-K:645:0x8A:0xBB
-
-# & Thunderlord Coat~
-K:646:0x88:0xBE
-
-# & Stone~
-K:647:0x8A:0xD4
-
-# & small wooden Boomerang~
-K:648:0x9F:0xBA
-
-# & wooden Boomerang~
-K:649:0x9F:0xBB
-
-# & small metal Boomerang~
-K:650:0x9F:0xBC
-
-# & metal Boomerang~
-K:651:0x9F:0xBD
-
-# & Anchor~
-K:652:0x8A:0x96
-
-# & ~
-K:653:0xA6:0xD4
-
-# Summon never-moving pet
-K:654:0x85:0x95
-
-# [Life in symbiosis]
-K:655:0x9F:0xBE
-
-# [Perfect Symbiosis]
-K:656:0x9F:0xBE
-
-# Cure Light Insanity
-K:657:0x85:0xFD
-
-# Cure Serious Insanity
-K:658:0x85:0xFD
-
-# Cure Critical Insanity
-K:659:0x85:0xFD
-
-# Cure Insanity
-K:660:0x85:0xFD
-
-# & Phial~
-K:661:0x8A:0xD5
-
-# Random Artifact
-K:662:0xA6:0xD4
-
-# Craftmanship
-K:663:0x85:0x97
-
-# The One Ring
-K:664:0x85:0x96
-
-# & Book~ of the Lays of the Heroes
-K:665:0x9F:0xBF
-
-# & Book~ of Sound Patterns
-K:666:0x9F:0xBF
-
-# [Harps of Rivendell]
-K:667:0x9F:0xBF
-
-# [Lays of Beleriand]
-K:668:0x9F:0xBF
-
-# & Flute~
-K:669:0x9F:0xC0
-
-# & Drum~
-K:670:0x9F:0xC1
-
-# & Harp~
-K:671:0x9F:0xC2
-
-# & Banjo~
-K:672:0x9F:0xC4
-
-# & Lute~
-K:673:0x9F:0xC3
-
-# & Mandolin~
-K:674:0x9F:0xC3
-
-# & Palantir~
-K:675:0x8A:0x97
-
-# Egg
-K:676:0x9F:0x85
-
-# Reset Recall
-K:677:0x85:0x95
-
-# Divination
-K:678:0x85:0x95
-
-# Self
-K:679:0x9F:0x86
-
-# Ray
-K:680:0x9F:0x87
-
-# Sphere
-K:681:0x9F:0x88
-
-# Knowledge
-K:682:0x9F:0x8C
-
-# Life
-K:683:0x9F:0x8D
-
-# Fire
-K:684:0x9F:0x8E
-
-# Cold
-K:685:0x9F:0x8F
-
-# Lightning
-K:686:0x9F:0x90
-
-# Acid
-K:687:0x9F:0x91
-
-# Element
-K:688:0x9F:0x92
-
-# Chaos
-K:689:0x9F:0x93
-
-# Mind
-K:690:0x9F:0x94
-
-# Holding
-K:691:0x9F:0x95
-
-# Arrow
-K:692:0x9F:0x89
-
-# Power Surge
-K:693:0x9F:0x8A
-
-# Armageddon
-K:694:0x9F:0x8B
-
-# Gravity
-K:695:0x9F:0x96
-
-# Extra Life
-K:696:0x9F:0x97
-
-# Undeath
-K:697:0x9E:0xD3
-
-# Protection
-K:698:0x9E:0xD4
-
-# & Horn~
-K:699:0x9F:0xC5
-
-# & Ring~ of Precognition
-K:700:0x85:0xBB
-
-# & Sprig~ of Athelas
-K:701:0x9F:0xC6
-
-# [Magic for Beginners]
-K:702:0x9F:0xC7
-
-# [Conjurings and Tricks]
-K:703:0x9F:0xC7
-
-# [Incantations and Illusions]
-K:704:0x9F:0xC7
-
-# [Sorcery and Evocations]
-K:705:0x9F:0xC7
-
-# [Beginners Handbook]
-K:706:0x9F:0xC8
-
-# [Words of Wisdom]
-K:707:0x9F:0xC8
-
-# [Chants and Blessings]
-K:708:0x9F:0xC8
-
-# [Exorcism and Dispelling]
-K:709:0x9F:0xC8
-
-# [Resistance of Scarabtarices]
-K:710:0x9F:0xCA
-
-# [Mordenkainen's Escapes]
-K:711:0x9F:0xCA
-
-# [Kelek's Grimoire of Power]
-K:712:0x9F:0xCA
-
-# [Tenser's Transformations]
-K:713:0x9F:0xCA
-
-# [Raal's Tome of Destruction]
-K:714:0x9F:0xCA
-
-# [Ethereal Openings]
-K:715:0x9F:0xCA
-
-# [Godly Insights]
-K:716:0x9F:0xC9
-
-# [Purifications and Healing]
-K:717:0x9F:0xC9
-
-# [Holy Infusions]
-K:718:0x9F:0xC9
-
-# [Wrath of God]
-K:719:0x9F:0xC9
-
-# & Old Scroll~ of Deincarnation
-K:720:0x85:0x97
-
-# & Dark Sword~
-K:721:0xA5:0xB9
-
-# Numenorean for beginners (I)
-K:722:0xA3:0xF8
-
-# Numenorean for beginners (II)
-K:723:0xA3:0xF9
-
-# Advanced lessons of Numenorean
-K:724:0xA3:0xF8
-
-# Advanced lessons of Sindarin
-K:725:0xA3:0xF9
-
-# & Shard~ of Pottery
-K:726:0x8A:0xCA
-
-# & Broken Stick~
-K:727:0x8A:0xCB
-
-# Wall Creation
-K:728:0x85:0x97
-
-# [Illusions for Beginners]
-K:729:0xA3:0xFA
-
-# [Tricks and Visions]
-K:730:0xA3:0xFA
-
-# [Phantasms and Illusions]
-K:731:0xA3:0xFA
-
-# [Shadows and Prisms]
-K:732:0xA3:0xFA
-
-# [Serten's Immunities]
-K:733:0xA3:0xFB
-
-# [Knowledge of Kenault]
-K:734:0xA3:0xFB
-
-# [Otiluke's Spheres]
-K:735:0xA3:0xFA
-
-# [Boccob's Book of Shadows]
-K:736:0xA3:0xFC
-
-# [Bigby's Handbook]
-K:737:0xA3:0xFC
-
-# & Book~ of Beginner Cantrips
-K:738:0xA3:0xFD
-
-# & Book~ of Teleportation
-K:739:0xA3:0xFE
-
-# & Book~ of Recall
-K:740:0xA3:0xFF
-
-# & Book~ of Summoning
-K:741:0xA3:0xF8
-
-# & Book~ of Fireflash
-K:742:0xA3:0xF9
-
-# & Potion~ of Learning
-K:743:0xA3:0xFA
-
-# [Eye of Sauron]
-K:744:0xA3:0xFB
-
-# [Flame of Udun]
-K:745:0xA3:0xFC
-
-# [Corruptions of Melkor]
-K:746:0xA3:0xFD
-
-# [Crescent of Morgul]
-K:747:0xA3:0xFE
-
-# [Morgoth's Ring]
-K:748:0xA3:0xFF
-
-# Spell
-K:749:0x86:0xC8
-
-# Wishing
-K:750:0x86:0xC8
-
-# Khuzdul - The hidden tongue of the Dwarves
-K:751:0x85:0x95
-
-# Nandorin for dummies
-K:752:0xA3:0xF9
-
-# Advanced lessons of Orcish
-K:753:0xA3:0xFA
-
-# & Ancient Tome~
-K:754:0xA3:0xFE
-
-# Flying
-K:755:0x85:0xC0
-
-# & Tome~ of the Time
-K:756:0xA3:0xF8
-
-# & Spellbook~ of #
-K:757:0x8C:0x9C
-
-# & Tome~ of Meta Spells
-K:758:0xA3:0xF9
-
-# & Tome~ of the Mind
-K:759:0xA3:0xFA
-
-# & Holy Tome~ of Eru Iluvatar
-K:760:0xA3:0xFB
-
-# & Holy Tome~ of Manwe Sulimo
-K:761:0xA3:0xFC
-
-# & War Tome~ of Tulkas
-K:762:0xA3:0xFD
-
-# & Unholy Tome~ of the Hellflame
-K:763:0xA3:0xFE
-
-# & Corrupted Tome~ of Melkor
-K:764:0xA3:0xFF
-
-# [Aiding Shades]
-K:765:0xA3:0xF8
-
-# [Morgoth's Space-Time Warpings]
-K:766:0xA3:0xF9
-
-# [Murazor's Tome of Conjuring & Dispelling]
-K:767:0xA3:0xFA
-
-# & Forest Tome~ of Yavanna
-K:768:0xA3:0xFB
-
-# [Sauron's Forgotten Tome]
-K:769:0xA3:0xFF
-
-# & Ring~
-K:770:0x85:0xBC
-
-# [Earth]
-K:771:0xA4:0x80
-
-# [Fire]
-K:772:0xA4:0x81
-
-# [Air]
-K:773:0xA4:0x82
-
-# [Water]
-K:774:0xA4:0x83
-
-# [Mana]
-K:775:0xA4:0x84
-
-# Home Summoning
-K:776:0x85:0x97
-
-# & Shadow Blade~
-K:777:0xA4:0x89
-
-# & Bluesteel Blade~
-K:778:0xA4:0x8A
-
-# the Serpents
-K:779:0xA5:0xC0
-
-# Darkness
-K:780:0xA5:0xC1
-
-# Knowledge
-K:781:0xA5:0xC2
-
-# Force
-K:782:0xA5:0xC3
-
-# Lightning
-K:783:0xA5:0xC4
-
-# Mana
-K:784:0xA5:0xC5
-
-# Ring~ of Power
-K:785:0xA5:0xC6
-
-# Climbing Set~
-K:786:0xA4:0x8B
-
-# Adventurer's guide to Middle-earth
-K:787:0x85:0x96
-
-# & Demonblade~
-K:788:0x8B:0xE0
-
-# & Demonshield~
-K:789:0x8B:0xE1
-
-# & Demonhorn~
-K:790:0x8B:0xE2
-
-# [Demonthoughts]
-K:791:0xA3:0xFB
-
-# [Hellfire Tome]
-K:792:0xA4:0x8C
-
-# & Wooden Rod~ of#
-K:793:0xA4:0x8D
-
-# & Copper Rod~ of#
-K:794:0xA4:0x8E
-
-# & Iron Rod~ of#
-K:795:0xA4:0x8F
-
-# & Moonstone Rod~ of#
-K:796:0xA4:0x90
-
-# & Silver Rod~ of#
-K:797:0xA4:0x91
-
-# & Golden Rod~ of#
-K:798:0xA4:0x93
-
-# & Mithril Rod~ of#
-K:799:0xA4:0x94
-
-# & Adamantite Rod~ of#
-K:800:0xA4:0x95
-
-# & Greater Ration~ of Health
-K:801:0xA5:0xBF
-
-# & Crumpled Scroll~ of Mass Resurrection
-K:802:0x85:0x96
-
-# & Cleaver~
-K:803:0xA5:0xBA
-
-# & Light War Axe~
-K:804:0xA5:0xBB
-
-# & Slaughter Axe~
-K:805:0xA5:0xBC
-
-# & Runestone~
-K:806:0xA5:0xBD
-
-# & Fortune cookie~
-K:807:0xA6:0xBE
-
-# Portable hole
-K:808:0xA6:0xC1
-
-# Critical Hits
-K:809:0xA6:0xD4
-
-# & Wand~ of Digging of Thrain
-K:810:0xA6:0xD4
-
-# & Gnarled Staff~ of Holy Fire of Mithrandir
-K:811:0xA6:0xD4
-
-# Partial Totem
-K:812:0xA6:0xD5
-
-# True Totem
-K:813:0xA6:0xD6
-
-# & piece~ of a Relic of Eru
-K:814:0x89:0xDA
-
-# & piece~ of a Relic of Manwe
-K:815:0x89:0xDB
-
-# & piece~ of a Relic of Tulkas
-K:816:0x89:0xDC
-
-# & piece~ of a Relic of Melkor
-K:817:0x89:0xDD
-
-# & piece~ of a Relic of Yavanna
-K:818:0x89:0xDE
-
-# Player
-R:0:0x80:0xC0
-
-# Filthy street urchin
-R:1:0x98:0xB8
-
-# Scrawny cat
-R:2:0x96:0xFA
-
-# Sparrow
-R:3:0x9D:0xD6
-
-# Chaffinch
-R:4:0x9D:0xD6
-
-# Wild rabbit
-R:5:0x9D:0xD7
-
-# Woodsman
-R:6:0x98:0xC9
-
-# Scruffy little dog
-R:7:0x92:0x92
-
-# Farmer Maggot
-R:8:0x98:0xB9
-
-# Blubbering idiot
-R:9:0x98:0xBA
-
-# Boil-covered wretch
-R:10:0x98:0xBB
-
-# Village idiot
-R:11:0x98:0xBC
-
-# Pitiful-looking beggar
-R:12:0x98:0xBD
-
-# Mangy-looking leper
-R:13:0x98:0xBE
-
-# Agent of the black market
-R:14:0x98:0xBF
-
-# Singing, happy drunk
-R:15:0x98:0xC0
-
-# Aimless-looking merchant
-R:16:0x98:0xC1
-
-# Mean-looking mercenary
-R:17:0x98:0xC2
-
-# Battle-scarred veteran
-R:18:0x98:0xC3
-
-# Martti Ihrasaari
-R:19:0x9B:0xB8
-
-# Grey mold
-R:20:0x97:0xD7
-
-# Large white snake
-R:21:0x94:0xBD
-
-# Grey mushroom patch
-R:22:0x9B:0xB9
-
-# Newt
-R:23:0x9B:0xBA
-
-# Giant white centipede
-R:24:0x96:0x8D
-
-# White icky thing
-R:25:0x97:0xBB
-
-# Clear icky thing
-R:26:0x97:0xBC
-
-# Giant white mouse
-R:27:0x99:0xBD
-
-# Large brown snake
-R:28:0x94:0xBC
-
-# Small kobold
-R:29:0x97:0xD1
-
-# Kobold
-R:30:0x97:0xD2
-
-# White worm mass
-R:31:0x99:0xD5
-
-# Floating eye
-R:32:0x96:0xD3
-
-# Rock lizard
-R:33:0x94:0xBE
-
-# Grid bug
-R:34:0x9B:0xBC
-
-# Jackal
-R:35:0x92:0x93
-
-# Soldier ant
-R:36:0x95:0xFF
-
-# Fruit bat
-R:37:0x96:0x87
-
-# Insect swarm
-R:38:0x9E:0x96
-
-# The Greater hell-beast
-R:39:0x9B:0xBB
-
-# Shrieker mushroom patch
-R:40:0x91:0xFE
-
-# Blubbering icky thing
-R:41:0x97:0xBD
-
-# Metallic green centipede
-R:42:0x96:0x8E
-
-# Novice warrior
-R:43:0x98:0xC4
-
-# Novice rogue
-R:44:0x98:0xC5
-
-# Novice priest
-R:45:0x98:0xC6
-
-# Novice mage
-R:46:0x98:0xC7
-
-# Yellow mushroom patch
-R:47:0x91:0xFF
-
-# White jelly
-R:48:0x97:0xC2
-
-# Giant black ant
-R:49:0x96:0x80
-
-# Salamander
-R:50:0x94:0xC0
-
-# White harpy
-R:51:0x93:0xC0
-
-# Blue yeek
-R:52:0x99:0xFF
-
-# Grip, Farmer Maggot's dog
-R:53:0x92:0x94
-
-# Wolf, Farmer Maggot's dog
-R:54:0x92:0x95
-
-# Fang, Farmer Maggot's dog
-R:55:0x92:0x95
-
-# Giant green frog
-R:56:0x94:0xBF
-
-# Freesia
-R:57:0x9B:0xBD
-
-# Green worm mass
-R:58:0x99:0xD6
-
-# Large yellow snake
-R:59:0x94:0xC1
-
-# Cave spider
-R:60:0x94:0xD5
-
-# Crow
-R:61:0x9E:0x97
-
-# Wild cat
-R:62:0x96:0xFB
-
-# Smeagol
-R:63:0x98:0xC8
-
-# Green ooze
-R:64:0x97:0xC3
-
-# Poltergeist
-R:65:0x93:0x91
-
-# Yellow jelly
-R:66:0x97:0xC5
-
-# Metallic blue centipede
-R:67:0x96:0x8F
-
-# Raven
-R:68:0x9E:0x97
-
-# Giant white louse
-R:69:0x97:0xD5
-
-# Giant yellow centipede
-R:70:0x96:0x8C
-
-# Black naga
-R:71:0x98:0x80
-
-# Spotted mushroom patch
-R:72:0x92:0x80
-
-# Silver jelly
-R:73:0x97:0xC4
-
-# Scruffy-looking hobbit
-R:74:0x97:0x8B
-
-# Giant white ant
-R:75:0x96:0x81
-
-# Yellow mold
-R:76:0x97:0xF8
-
-# Metallic red centipede
-R:77:0x96:0x90
-
-# Yellow worm mass
-R:78:0x99:0xD7
-
-# Clear worm mass
-R:79:0x99:0xF8
-
-# Radiation eye
-R:80:0x96:0xD4
-
-# Yellow light
-R:81:0x9F:0xCB
-
-# Cave lizard
-R:82:0x94:0xC2
-
-# Novice ranger
-R:83:0x98:0xC9
-
-# Blue jelly
-R:84:0x97:0xC6
-
-# Creeping copper coins
-R:85:0x91:0xF8
-
-# Giant white rat
-R:86:0x99:0xBE
-
-# Snotling
-R:87:0xA0:0x81
-
-# Swordfish
-R:88:0x9E:0xD6
-
-# Blue worm mass
-R:89:0x99:0xF9
-
-# Large grey snake
-R:90:0x94:0xC3
-
-# Skeleton kobold
-R:91:0x99:0xC1
-
-# Ewok
-R:92:0x9B:0xBE
-
-# Novice mage
-R:93:0x98:0xC7
-
-# Green naga
-R:94:0x98:0x81
-
-# Giant leech
-R:95:0x9F:0xCC
-
-# Barracuda
-R:96:0x9E:0xD7
-
-# Novice paladin
-R:97:0x98:0xCA
-
-# Zog
-R:98:0x93:0xF8
-
-# Blue ooze
-R:99:0x97:0xC7
-
-# Green glutton ghost
-R:100:0x93:0x92
-
-# Green jelly
-R:101:0x97:0xC8
-
-# Large kobold
-R:102:0x97:0xD3
-
-# Grey icky thing
-R:103:0x97:0xBE
-
-# Disenchanter eye
-R:104:0x96:0xD5
-
-# Red worm mass
-R:105:0x99:0xFA
-
-# Copperhead snake
-R:106:0x94:0xC4
-
-# Death sword
-R:107:0x9B:0xBF
-
-# Purple mushroom patch
-R:108:0x92:0x81
-
-# Novice priest
-R:109:0x98:0xC6
-
-# Novice warrior
-R:110:0x98:0xC4
-
-# Nibelung
-R:111:0x9B:0xC0
-
-# The disembodied hand that strangled people
-R:112:0x9B:0xC1
-
-# Brown mold
-R:113:0x97:0xF9
-
-# Giant brown bat
-R:114:0x96:0x88
-
-# Rat-thing
-R:115:0x99:0xC0
-
-# Novice rogue
-R:116:0x98:0xBF
-
-# Creeping silver coins
-R:117:0x91:0xF9
-
-# Snaga
-R:118:0x98:0x86
-
-# Rattlesnake
-R:119:0x94:0xC5
-
-# Giant slug
-R:120:0x9F:0xCC
-
-# Giant pink frog
-R:121:0x9F:0xCD
-
-# Dark elf
-R:122:0x8C:0xCC
-
-# Zombified kobold
-R:123:0x99:0xC1
-
-# Crypt creep
-R:124:0x9B:0xC2
-
-# Rotting corpse
-R:125:0x9B:0xC3
-
-# Cave orc
-R:126:0x98:0x87
-
-# Wood spider
-R:127:0x94:0xD6
-
-# Manes
-R:128:0x93:0xC9
-
-# Bloodshot eye
-R:129:0x96:0xD6
-
-# Red naga
-R:130:0x98:0x82
-
-# Red jelly
-R:131:0x97:0xC9
-
-# Green icky thing
-R:132:0x97:0xBF
-
-# Lost soul
-R:133:0x93:0x93
-
-# Night lizard
-R:134:0x94:0xC7
-
-# Mughash, the Kobold Lord
-R:135:0x97:0xD4
-
-# Skeleton orc
-R:136:0x99:0xC2
-
-# Wormtongue, Agent of Saruman
-R:137:0x98:0xD0
-
-# Robin Hood, the Outlaw
-R:138:0x9B:0xC4
-
-# Nurgling
-R:139:0x9F:0xCF
-
-# Lagduf, the Snaga
-R:140:0x98:0x88
-
-# Brown yeek
-R:141:0x9A:0x80
-
-# Novice ranger
-R:142:0x98:0xC9
-
-# Giant salamander
-R:143:0x94:0xC8
-
-# Space monster
-R:144:0x9B:0xC5
-
-# Carnivorous flying monkey
-R:145:0x9F:0xD0
-
-# Green mold
-R:146:0x97:0xFA
-
-# Novice paladin
-R:147:0x98:0xCA
-
-# Lemure
-R:148:0x93:0xCA
-
-# Hill orc
-R:149:0x98:0x89
-
-# Bandit
-R:150:0x98:0xD3
-
-# Hunting hawk
-R:151:0x9B:0xC6
-
-# Phantom warrior
-R:152:0x9B:0xC7
-
-# Gremlin
-R:153:0x9B:0xC8
-
-# Yeti
-R:154:0x95:0xC9
-
-# Bloodshot icky thing
-R:155:0x97:0xC0
-
-# Giant grey rat
-R:156:0x99:0xBF
-
-# Black harpy
-R:157:0x93:0xC1
-
-# Skaven
-R:158:0x9F:0xD1
-
-# The wounded bear
-R:159:0xA0:0xB8
-
-# Cave bear
-R:160:0xA5:0xC7
-
-# Rock mole
-R:161:0xA0:0xBA
-
-# Mindcrafter
-R:162:0x98:0xCB
-
-# Baby blue dragon
-R:163:0x96:0x95
-
-# Baby white dragon
-R:164:0x96:0x96
-
-# Baby green dragon
-R:165:0x96:0x97
-
-# Baby black dragon
-R:166:0x96:0xB8
-
-# Baby red dragon
-R:167:0x96:0xB9
-
-# Giant red ant
-R:168:0x96:0x85
-
-# Brodda, the Easterling
-R:169:0x98:0xD4
-
-# Bloodfang, the Wolf
-R:170:0xA0:0xBB
-
-# King cobra
-R:171:0x94:0xC9
-
-# Eagle
-R:172:0x9D:0xD6
-
-# War bear
-R:173:0x9B:0xC9
-
-# Killer bee
-R:174:0x9B:0xCA
-
-# Giant spider
-R:175:0x94:0xD7
-
-# Giant white tick
-R:176:0x97:0xD5
-
-# The Borshin
-R:177:0xA0:0xBC
-
-# Dark elven mage
-R:178:0x97:0x8E
-
-# Kamikaze yeek
-R:179:0xA0:0xCC
-
-# Orfax, Son of Boldor
-R:180:0x9A:0x81
-
-# Servant of Glaaki
-R:181:0xA0:0xBD
-
-# Dark elven warrior
-R:182:0x97:0x8F
-
-# Sand-dweller
-R:183:0xA0:0xBE
-
-# Clear mushroom patch
-R:184:0x9F:0xCE
-
-# Quiver slot
-R:185:0x9B:0xCB
-
-# Grishnakh, the Hill Orc
-R:186:0x98:0x8B
-
-# Giant tan bat
-R:187:0xA5:0xC8
-
-# Owlbear
-R:188:0xA0:0xBF
-
-# Blue horror
-R:189:0x9F:0xD2
-
-# Hairy mold
-R:190:0x97:0xFB
-
-# Grizzly bear
-R:191:0xA0:0xC0
-
-# Disenchanter mold
-R:192:0x97:0xFC
-
-# Pseudo dragon
-R:193:0x96:0xBA
-
-# Tengu
-R:194:0x93:0xCB
-
-# Creeping gold coins
-R:195:0x91:0xFA
-
-# Wolf
-R:196:0x92:0x96
-
-# Giant fruit fly
-R:197:0x93:0x89
-
-# Panther
-R:198:0x96:0xFC
-
-# Brigand
-R:199:0x9B:0xCC
-
-# Hobbes the Tiger
-R:200:0x9B:0xCD
-
-# Shadow Creature of Fiona
-R:201:0x9B:0xCE
-
-# Undead mass
-R:202:0x9B:0xCF
-
-# Chaos shapechanger
-R:203:0x9B:0xD0
-
-# Baby multi-hued dragon
-R:204:0x96:0xBB
-
-# Vorpal bunny
-R:205:0x9D:0xD7
-
-# Old Man Willow
-R:206:0xA0:0xC1
-
-# Hippocampus
-R:207:0xA0:0xC2
-
-# Zombified orc
-R:208:0x99:0xC4
-
-# Hippogriff
-R:209:0x93:0xC2
-
-# Black mamba
-R:210:0x94:0xCA
-
-# White wolf
-R:211:0x92:0x97
-
-# Grape jelly
-R:212:0x97:0xCA
-
-# Nether worm mass
-R:213:0x99:0xFB
-
-# Abyss worm mass
-R:214:0x9B:0xD1
-
-# Golfimbul, the Hill Orc Chief
-R:215:0x98:0x8C
-
-# Swordsman
-R:216:0x8E:0xF9
-
-# Skaven shaman
-R:217:0x90:0xBC
-
-# Baby bronze dragon
-R:218:0x96:0xBA
-
-# Baby gold dragon
-R:219:0x96:0xBA
-
-# Evil eye
-R:220:0xA5:0xC9
-
-# Mine-dog
-R:221:0xA0:0x83
-
-# Hellcat
-R:222:0x9B:0xD2
-
-# Moon beast
-R:223:0x9B:0xD3
-
-# Master yeek
-R:224:0x9A:0x82
-
-# Priest
-R:225:0x98:0xD6
-
-# Dark elven priest
-R:226:0x97:0x91
-
-# Air spirit
-R:227:0x92:0xD7
-
-# Skeleton human
-R:228:0x99:0xC3
-
-# Zombified human
-R:229:0x9A:0x86
-
-# Tiger
-R:230:0x96:0xFD
-
-# Moaning spirit
-R:231:0x93:0x94
-
-# Stegocentipede
-R:232:0x96:0x91
-
-# Spotted jelly
-R:233:0x97:0xCB
-
-# Drider
-R:234:0x94:0xF8
-
-# Mongbat
-R:235:0x9B:0xD4
-
-# Killer brown beetle
-R:236:0x93:0xD3
-
-# Boldor, King of the Yeeks
-R:237:0x9A:0x83
-
-# Ogre
-R:238:0x94:0x83
-
-# Creeping mithril coins
-R:239:0x91:0xFB
-
-# Illusionist
-R:240:0x98:0xF8
-
-# Druid
-R:241:0x98:0xF9
-
-# Pink horror
-R:242:0x9F:0xD3
-
-# Cloaker
-R:243:0x88:0x80
-
-# Black orc
-R:244:0x98:0x8D
-
-# Ochre jelly
-R:245:0x97:0xCC
-
-# Software bug
-R:246:0x9B:0xD5
-
-# Lurker
-R:247:0x83:0xB9
-
-# Tangleweed
-R:248:0xA5:0xCA
-
-# Vlasta
-R:249:0x95:0xFC
-
-# Giant white dragon fly
-R:250:0x93:0x8B
-
-# Snaga sapper
-R:251:0xA0:0x84
-
-# Blue icky thing
-R:252:0x97:0xC1
-
-# Gibbering mouther
-R:253:0x9B:0xD6
-
-# Wolfhound of Flora
-R:254:0x9B:0xD7
-
-# Hill giant
-R:255:0x94:0x89
-
-# Flesh golem
-R:256:0x97:0x81
-
-# Warg
-R:257:0x92:0xB8
-
-# Cheerful leprechaun
-R:258:0x9B:0xF8
-
-# Giant flea
-R:259:0x93:0x8A
-
-# Ufthak of Cirith Ungol
-R:260:0xA0:0xC4
-
-# Clay golem
-R:261:0x9F:0xD5
-
-# Black ogre
-R:262:0x94:0x84
-
-# Dweller on the threshold
-R:263:0xA0:0x85
-
-# Half-orc
-R:264:0xA0:0xC5
-
-# Dark naga
-R:265:0x9F:0xD6
-
-# Poison ivy
-R:266:0xA5:0xCB
-
-# Magic mushroom patch
-R:267:0x92:0x83
-
-# Plaguebearer of Nurgle
-R:268:0x9A:0x85
-
-# Guardian naga
-R:269:0x98:0x83
-
-# Wererat
-R:270:0xA0:0xC6
-
-# Light hound
-R:271:0x95:0xCB
-
-# Dark hound
-R:272:0x95:0xCC
-
-# Flying skull
-R:273:0x9B:0xF9
-
-# Mi-Go
-R:274:0x9B:0xFA
-
-# Giant tarantula
-R:275:0x94:0xF9
-
-# Giant clear centipede
-R:276:0x96:0x92
-
-# Mirkwood spider
-R:277:0x94:0xFA
-
-# Frost giant
-R:278:0x94:0x8A
-
-# Griffon
-R:279:0x93:0xC3
-
-# Homunculus
-R:280:0x93:0xCC
-
-# Gnome mage
-R:281:0x97:0x90
-
-# Clear hound
-R:282:0x95:0xCD
-
-# Umber hulk
-R:283:0x95:0x91
-
-# Rust monster
-R:284:0xA0:0x87
-
-# Ogrillon
-R:285:0x98:0x90
-
-# Gelatinous cube
-R:286:0x97:0xCD
-
-# Giant green dragon fly
-R:287:0x93:0x8C
-
-# Fire giant
-R:288:0x94:0x8B
-
-# Hummerhorn
-R:289:0xA0:0xC7
-
-# Lizard man
-R:290:0xA0:0x88
-
-# Ulfast, Son of Ulfang
-R:291:0x98:0xFA
-
-# Crebain
-R:292:0xA5:0xCC
-
-# Berserker
-R:293:0x98:0x8F
-
-# Quasit
-R:294:0x93:0xCD
-
-# Sphinx
-R:295:0xA0:0x89
-
-# Imp
-R:296:0x93:0xCE
-
-# Forest troll
-R:297:0x95:0x81
-
-# Freezing sphere
-R:298:0xA0:0xC9
-
-# Jumping fireball
-R:299:0xA0:0x8A
-
-# Ball lightning
-R:300:0xA0:0xCA
-
-# 2-headed hydra
-R:301:0x94:0xCB
-
-# Swamp thing
-R:302:0xA0:0x8B
-
-# Water spirit
-R:303:0x92:0xF8
-
-# Giant red scorpion
-R:304:0x94:0xFB
-
-# Earth spirit
-R:305:0x92:0xF9
-
-# Fire spirit
-R:306:0x92:0xFA
-
-# Fire hound
-R:307:0x95:0xCE
-
-# Cold hound
-R:308:0x95:0xCF
-
-# Energy hound
-R:309:0x95:0xD0
-
-# Lesser Mimic
-R:310:0x92:0x86
-
-# Door mimic
-R:311:0x84:0xBB
-
-# Blink dog
-R:312:0x92:0xB9
-
-# Uruk
-R:313:0x98:0x91
-
-# Shagrat, the Orc Captain
-R:314:0x98:0x92
-
-# Gorbag, the Orc Captain
-R:315:0x98:0x93
-
-# Shambling mound
-R:316:0x92:0x84
-
-# Giant Venus Flytrap
-R:317:0xA5:0xCD
-
-# Chaos beastman
-R:318:0xA0:0x8D
-
-# Daemonette of Slaanesh
-R:319:0xA0:0x8C
-
-# Giant bronze dragon fly
-R:320:0x93:0x90
-
-# Stone giant
-R:321:0x94:0x8C
-
-# Giant black dragon fly
-R:322:0x93:0x8E
-
-# Stone golem
-R:323:0x97:0x83
-
-# Red mold
-R:324:0x97:0xFD
-
-# Giant gold dragon fly
-R:325:0x93:0x8F
-
-# Stunwall
-R:326:0x83:0xCB
-
-# Ghast
-R:327:0xA0:0xCD
-
-# Neekerbreeker
-R:328:0xA5:0xCE
-
-# Huorn
-R:329:0xA0:0xCE
-
-# Bolg, Son of Azog
-R:330:0x98:0x94
-
-# Phase spider
-R:331:0x94:0xFC
-
-# Lizard king
-R:332:0xA0:0x8F
-
-# Landmine
-R:333:0xA0:0xCF
-
-# Wyvern
-R:334:0x9B:0xFB
-
-# Great eagle
-R:335:0xA0:0x90
-
-# Livingstone
-R:336:0x9B:0xFC
-
-# Earth hound
-R:337:0x95:0xD1
-
-# Air hound
-R:338:0x95:0xD2
-
-# Sabre-tooth tiger
-R:339:0x96:0xFE
-
-# Acid hound
-R:340:0x95:0xD3
-
-# Chimaera
-R:341:0x93:0xC4
-
-# Quylthulg
-R:342:0x94:0x92
-
-# Sasquatch
-R:343:0x95:0xCA
-
-# Weir
-R:344:0x9B:0xFD
-
-# Ranger
-R:345:0x98:0xCF
-
-# Paladin
-R:346:0x99:0x8A
-
-# Werewolf
-R:347:0xA0:0xD1
-
-# Dark elven lord
-R:348:0x97:0x94
-
-# Cloud giant
-R:349:0x94:0x8E
-
-# Ugluk, the Uruk
-R:350:0x98:0x95
-
-# Blue dragon bat
-R:351:0x96:0x89
-
-# Mimic
-R:352:0x85:0x95
-
-# Ultimate Mimic
-R:353:0x85:0xD6
-
-# Fire vortex
-R:354:0x99:0xCC
-
-# Acid vortex
-R:355:0x99:0xCD
-
-# Lugdush, the Uruk
-R:356:0xA0:0x92
-
-# Arch-vile
-R:357:0xA0:0xD2
-
-# Cold vortex
-R:358:0x99:0xCE
-
-# Energy vortex
-R:359:0x99:0xCF
-
-# Globefish
-R:360:0xA0:0x93
-
-# Giant firefly
-R:361:0x93:0x8D
-
-# Mummified orc
-R:362:0x94:0x80
-
-# Wolf chieftain
-R:363:0xA5:0xCF
-
-# Serpent man
-R:364:0xA0:0xD4
-
-# Vampiric mist
-R:365:0xA0:0x95
-
-# Killer stag beetle
-R:366:0x93:0xD5
-
-# Iron golem
-R:367:0x97:0x84
-
-# Auto-roller
-R:368:0x9B:0xFE
-
-# Giant yellow scorpion
-R:369:0x94:0xFD
-
-# Jade monk
-R:370:0xA0:0xD5
-
-# Black ooze
-R:371:0x97:0xCE
-
-# Hardened warrior
-R:372:0x98:0xFB
-
-# Azog, King of the Uruk-Hai
-R:373:0x98:0x97
-
-# Fleshhound of Khorne
-R:374:0xA0:0x96
-
-# Dark elven warlock
-R:375:0x9B:0xFF
-
-# Master rogue
-R:376:0x98:0xFC
-
-# Red dragon bat
-R:377:0x96:0x8A
-
-# Killer white beetle
-R:378:0xA0:0xD6
-
-# Ice skeleton
-R:379:0xA0:0x97
-
-# Angamaite of Umbar
-R:380:0xA0:0xF8
-
-# Forest wight
-R:381:0x9C:0x80
-
-# Khim, Son of Mim
-R:382:0x9C:0x81
-
-# Ibun, Son of Mim
-R:383:0x9C:0x82
-
-# Meneldor the Swift
-R:384:0xA0:0xF9
-
-# Phantom beast
-R:385:0x9C:0x83
-
-# Giant silver ant
-R:386:0x93:0xD4
-
-# 4-headed hydra
-R:387:0x94:0xCD
-
-# Lesser hell-beast
-R:388:0xA0:0xFB
-
-# Tyrannosaur
-R:389:0x9C:0x84
-
-# Mummified human
-R:390:0x94:0x81
-
-# Vampire bat
-R:391:0x96:0x8B
-
-# Sangahyando of Umbar
-R:392:0x98:0xFD
-
-# It
-R:393:0x9C:0x85
-
-# Banshee
-R:394:0x93:0x95
-
-# Carrion crawler
-R:395:0x96:0x93
-
-# Xiclotlan
-R:396:0xA0:0xFC
-
-# Silent watcher
-R:397:0x9C:0x86
-
-# Pukelman
-R:398:0x97:0x85
-
-# Disenchanter beast
-R:399:0xA0:0xD7
-
-# Dark elven druid
-R:400:0x97:0x97
-
-# Stone troll
-R:401:0x95:0x82
-
-# Black
-R:402:0x9B:0xC5
-
-# Hill troll
-R:403:0x95:0x83
-
-# Wereworm
-R:404:0x99:0xFC
-
-# Killer red beetle
-R:405:0x93:0xD7
-
-# Disenchanter bat
-R:406:0xA5:0xD0
-
-# Gnoph-Keh
-R:407:0xA0:0xFE
-
-# Giant grey ant
-R:408:0x96:0x84
-
-# Khufu, the Mummified King
-R:409:0x9C:0x87
-
-# Gwaihir the Windlord
-R:410:0xA0:0xF9
-
-# Giant fire tick
-R:411:0xA0:0xFF
-
-# Displacer beast
-R:412:0x96:0xFF
-
-# Ulwarth, Son of Ulfang
-R:413:0x98:0xD1
-
-# Werebear
-R:414:0xA5:0xC7
-
-# Cave ogre
-R:415:0x94:0x85
-
-# White wraith
-R:416:0x95:0x97
-
-# Angel
-R:417:0x92:0x87
-
-# Ghoul
-R:418:0x9D:0xC7
-
-# Mim, Betrayer of Turin
-R:419:0x9C:0x88
-
-# Hellblade
-R:420:0x9C:0x89
-
-# Killer fire beetle
-R:421:0x93:0xF8
-
-# Beast of Nurgle
-R:422:0xA1:0x80
-
-# Creeping adamantite coins
-R:423:0x91:0xFC
-
-# Algroth
-R:424:0x95:0x84
-
-# Flamer of Tzeentch
-R:425:0x9F:0xD7
-
-# Roper
-R:426:0x9F:0xF8
-
-# Headless
-R:427:0x9C:0x8A
-
-# Vibration hound
-R:428:0x95:0xD4
-
-# Nexus hound
-R:429:0x95:0xD5
-
-# Half-ogre
-R:430:0x94:0x86
-
-# Lokkak, the Ogre Chieftain
-R:431:0x94:0x88
-
-# Vampire
-R:432:0x95:0x92
-
-# Gorgimaera
-R:433:0x93:0xC5
-
-# Shantak
-R:434:0x9C:0x8B
-
-# Colbran
-R:435:0x97:0x86
-
-# Spirit naga
-R:436:0x98:0x84
-
-# Corpser
-R:437:0x9F:0xF9
-
-# Fiend of Slaanesh
-R:438:0x94:0xCF
-
-# Stairway to Hell
-R:439:0x9C:0x8C
-
-# 5-headed hydra
-R:440:0x94:0xCE
-
-# Barney the Dinosaur
-R:441:0x9C:0x8D
-
-# Black knight
-R:442:0x99:0x80
-
-# Seahorse
-R:443:0xA1:0x81
-
-# Cyclops
-R:444:0xA1:0x82
-
-# Clairvoyant
-R:445:0x98:0xFE
-
-# Purple worm
-R:446:0x9F:0xFA
-
-# Catoblepas
-R:447:0x99:0xB9
-
-# Lesser wall monster
-R:448:0x9C:0x8E
-
-# Mage
-R:449:0x99:0x82
-
-# Mind flayer
-R:450:0x99:0x83
-
-# The Ultimate Dungeon Cleaner
-R:451:0x9C:0x8F
-
-# Deep one
-R:452:0x95:0xBE
-
-# Basilisk
-R:453:0x94:0xCF
-
-# Ice troll
-R:454:0x95:0x85
-
-# Dhole
-R:455:0x9C:0x91
-
-# Archangel
-R:456:0x92:0x88
-
-# Greater Mimic
-R:457:0x9A:0x96
-
-# Chaos tile
-R:458:0x9C:0x92
-
-# Young blue dragon
-R:459:0x96:0xBC
-
-# Young white dragon
-R:460:0x96:0xBD
-
-# Young green dragon
-R:461:0x96:0xBE
-
-# Young bronze dragon
-R:462:0x96:0xBF
-
-# Aklash
-R:463:0xA4:0x96
-
-# Mithril golem
-R:464:0x97:0x87
-
-# Skeleton troll
-R:465:0x99:0xC5
-
-# Skeletal tyrannosaur
-R:466:0xA1:0x83
-
-# Beorn, the Shape-Changer
-R:467:0xA5:0xD1
-
-# Thorondor, Lord of Eagles
-R:468:0xA0:0xF9
-
-# Giant blue ant
-R:469:0x96:0x83
-
-# Grave wight
-R:470:0x9A:0x94
-
-# Shadow drake
-R:471:0x96:0xC0
-
-# Manticore
-R:472:0x93:0xC6
-
-# Giant army ant
-R:473:0x9A:0xB9
-
-# Killer slicer beetle
-R:474:0x93:0xF9
-
-# Gorgon
-R:475:0xA1:0x85
-
-# Gug
-R:476:0xA1:0x86
-
-# Ghost
-R:477:0x93:0x96
-
-# Death watch beetle
-R:478:0x93:0xFA
-
-# Mountain ogre
-R:479:0x94:0x87
-
-# Nexus quylthulg
-R:480:0x94:0x93
-
-# Shelob, Spider of Darkness
-R:481:0x94:0xFE
-
-# Giant squid
-R:482:0x9F:0xFB
-
-# Ghoulking
-R:483:0x9A:0x84
-
-# Doombat
-R:484:0x9F:0xFC
-
-# Ninja
-R:485:0x99:0x84
-
-# Memory moss
-R:486:0x97:0xFE
-
-# Storm giant
-R:487:0x94:0x8D
-
-# Spectator
-R:488:0x9C:0x93
-
-# Bokrug
-R:489:0xA1:0x87
-
-# Biclops
-R:490:0xA1:0x88
-
-# Half-troll
-R:491:0x98:0x96
-
-# Ivory monk
-R:492:0x98:0xCB
-
-# Bert the Stone Troll
-R:493:0x95:0x88
-
-# Bill the Stone Troll
-R:494:0x95:0x89
-
-# Tom the Stone Troll
-R:495:0x95:0x8A
-
-# Cave troll
-R:496:0x95:0x86
-
-# Anti-paladin
-R:497:0x9C:0x94
-
-# Chaos master
-R:498:0x9C:0x95
-
-# Barrow wight
-R:499:0x95:0xB9
-
-# Skeleton ettin
-R:500:0xA5:0xD2
-
-# Chaos drake
-R:501:0x96:0xC1
-
-# Law drake
-R:502:0x96:0xC2
-
-# Balance drake
-R:503:0x96:0xC3
-
-# Ethereal drake
-R:504:0x96:0xC4
-
-# Groo, the Wanderer
-R:505:0x9C:0x96
-
-# Fasolt the Giant
-R:506:0x9C:0x97
-
-# Shade
-R:507:0x95:0xC1
-
-# Spectre
-R:508:0x93:0xB8
-
-# Water troll
-R:509:0x95:0x8B
-
-# Fire elemental
-R:510:0x92:0xFB
-
-# Cherub
-R:511:0x92:0x89
-
-# Water elemental
-R:512:0x92:0xFC
-
-# Multi-hued hound
-R:513:0x9C:0xB9
-
-# Invisible stalker
-R:514:0x92:0xFD
-
-# Carrion crawler
-R:515:0x96:0x94
-
-# Master thief
-R:516:0x99:0x86
-
-# The Watcher in the Water
-R:517:0x9B:0x8D
-
-# Lich
-R:518:0x93:0xFB
-
-# Gas spore
-R:519:0x9C:0xC6
-
-# Master vampire
-R:520:0x95:0x93
-
-# Oriental vampire
-R:521:0x9C:0xBB
-
-# Greater mummy
-R:522:0x94:0x82
-
-# Bloodletter of Khorne
-R:523:0x93:0xD0
-
-# Giant grey scorpion
-R:524:0x94:0xFF
-
-# Earth elemental
-R:525:0x92:0xFE
-
-# Air elemental
-R:526:0x92:0xFF
-
-# Shimmering mold
-R:527:0x9A:0xF9
-
-# Gargoyle
-R:528:0xA1:0x89
-
-# Malicious leprechaun
-R:529:0x9C:0xBD
-
-# Eog golem
-R:530:0x97:0x88
-
-# Little Boy
-R:531:0x9F:0xFD
-
-# Dagashi
-R:532:0x99:0x88
-
-# Headless ghost
-R:533:0xA1:0x8A
-
-# Dread
-R:534:0x9F:0xFF
-
-# Leng spider
-R:535:0xA1:0x8B
-
-# Gauth
-R:536:0xA5:0xD3
-
-# Smoke elemental
-R:537:0x93:0x88
-
-# Olog
-R:538:0x95:0x8C
-
-# Halfling slinger
-R:539:0x9C:0xBE
-
-# Gravity hound
-R:540:0x95:0xD6
-
-# Acidic cytoplasm
-R:541:0x97:0xCF
-
-# Inertia hound
-R:542:0x95:0xD7
-
-# Impact hound
-R:543:0x95:0xF8
-
-# Shardstorm
-R:544:0xA5:0xD4
-
-# Ooze elemental
-R:545:0x93:0x80
-
-# Young black dragon
-R:546:0x96:0xC5
-
-# Mumak
-R:547:0x99:0xBC
-
-# Giant fire ant
-R:548:0x96:0x82
-
-# Mature white dragon
-R:549:0x96:0xC6
-
-# Xorn
-R:550:0x95:0xC7
-
-# Rogrog the Black Troll
-R:551:0x95:0x87
-
-# Mist giant
-R:552:0x97:0x89
-
-# Phantom
-R:553:0x9C:0xBF
-
-# Grey wraith
-R:554:0x95:0xBA
-
-# Revenant
-R:555:0x95:0xC0
-
-# Young multi-hued dragon
-R:556:0x96:0xC7
-
-# Raal's Tome of Destruction
-R:557:0x9C:0xC0
-
-# Colossus
-R:558:0x9C:0xC1
-
-# Young gold dragon
-R:559:0x96:0xC8
-
-# Mature blue dragon
-R:560:0x96:0xC9
-
-# Mature green dragon
-R:561:0x96:0xCA
-
-# Mature bronze dragon
-R:562:0x96:0xCB
-
-# Young red dragon
-R:563:0x96:0xCC
-
-# Nightblade
-R:564:0x9C:0xC2
-
-# Trapper
-R:565:0x9A:0x97
-
-# Bodak
-R:566:0x93:0xD0
-
-# Time bomb
-R:567:0xA1:0x8E
-
-# Mezzodaemon
-R:568:0x9A:0x88
-
-# Elder thing
-R:569:0x9C:0xC3
-
-# Ice elemental
-R:570:0x93:0x82
-
-# Necromancer
-R:571:0x9C:0xC4
-
-# The Greater hell magic mushroom were-quylthulg
-R:572:0x9F:0xFE
-
-# Lorgan, Chief of the Easterlings
-R:573:0x9C:0xC5
-
-# Chaos spawn
-R:574:0x9C:0xC6
-
-# Mummified troll
-R:575:0xA1:0x8F
-
-# Storm of Unmagic
-R:576:0xA5:0xD5
-
-# Crypt thing
-R:577:0x95:0xB8
-
-# Chaos butterfly
-R:578:0x80:0x80
-
-# Time elemental
-R:579:0x9C:0xC7
-
-# Flying polyp
-R:580:0xA1:0x91
-
-# The Queen Ant
-R:581:0x96:0x86
-
-# Will o' the wisp
-R:582:0x93:0x83
-
-# Shan
-R:583:0xA1:0x92
-
-# Magma elemental
-R:584:0x93:0x84
-
-# Black pudding
-R:585:0x97:0xD0
-
-# Killer iridescent beetle
-R:586:0x9D:0xC8
-
-# Nexus vortex
-R:587:0x9A:0xB8
-
-# Plasma vortex
-R:588:0x99:0xD0
-
-# Mature red dragon
-R:589:0x96:0xCD
-
-# Mature gold dragon
-R:590:0x96:0xCE
-
-# Crystal drake
-R:591:0x96:0xCF
-
-# Mature black dragon
-R:592:0x96:0xD0
-
-# Mature multi-hued dragon
-R:593:0x96:0xD1
-
-# Sky whale
-R:594:0xA1:0x93
-
-# Draebor, the Imp
-R:595:0xA4:0x97
-
-# Mother Hydra
-R:596:0x94:0xD0
-
-# Death knight
-R:597:0x99:0x8C
-
-# Castamir the Usurper
-R:598:0x9C:0xC8
-
-# Time vortex
-R:599:0x99:0xD1
-
-# Shimmering vortex
-R:600:0x99:0xD2
-
-# Ancient blue dragon
-R:601:0x92:0xC0
-
-# Ancient bronze dragon
-R:602:0x92:0xC1
-
-# Beholder
-R:603:0x96:0xD7
-
-# Emperor wight
-R:604:0x95:0xBB
-
-# Seraph
-R:605:0x92:0x8A
-
-# Vargo, Tyrant of Fire
-R:606:0x93:0x85
-
-# Black wraith
-R:607:0x95:0xBC
-
-# Nightgaunt
-R:608:0x9C:0xC9
-
-# Baron of hell
-R:609:0x9C:0xCA
-
-# Scylla
-R:610:0xA1:0x94
-
-# Monastic lich
-R:611:0x93:0xFF
-
-# Nether wraith
-R:612:0x95:0xBD
-
-# Hellhound
-R:613:0x9A:0x8E
-
-# 7-headed hydra
-R:614:0x94:0xD1
-
-# Waldern, King of Water
-R:615:0x93:0x86
-
-# Kavlax the Many-Headed
-R:616:0x96:0xD2
-
-# Ancient white dragon
-R:617:0x92:0xC2
-
-# Ancient green dragon
-R:618:0x92:0xC3
-
-# Chthonian
-R:619:0x9C:0xCB
-
-# Eldrak
-R:620:0x95:0x8F
-
-# Ettin
-R:621:0x95:0x8E
-
-# Night mare
-R:622:0x99:0xBB
-
-# Vampire lord
-R:623:0x95:0x94
-
-# Ancient black dragon
-R:624:0x92:0xC4
-
-# Weird fume
-R:625:0x9A:0xF8
-
-# Spawn of Ubbo-Sathla
-R:626:0xA1:0x95
-
-# Fat Man
-R:627:0x9F:0xFD
-
-# Malekith the Accursed
-R:628:0x97:0x8D
-
-# Shadowfax, steed of Gandalf
-R:629:0xA1:0x96
-
-# Spirit troll
-R:630:0x95:0x90
-
-# War troll
-R:631:0x9C:0xCC
-
-# Disenchanter worm mass
-R:632:0x99:0xFE
-
-# Rotting quylthulg
-R:633:0x94:0x94
-
-# Lesser titan
-R:634:0x94:0x8F
-
-# 9-headed hydra
-R:635:0x94:0xD1
-
-# Enchantress
-R:636:0x99:0x8E
-
-# Ranger chieftain
-R:637:0x99:0x8F
-
-# Sorcerer
-R:638:0x99:0x90
-
-# Xaren
-R:639:0x95:0xC8
-
-# Giant roc
-R:640:0x92:0x8F
-
-# Minotaur
-R:641:0x93:0xC7
-
-# Medusa, the Gorgon
-R:642:0x98:0x85
-
-# Death drake
-R:643:0x92:0xC5
-
-# Ancient red dragon
-R:644:0x92:0xC6
-
-# Ancient gold dragon
-R:645:0x92:0xC7
-
-# Great crystal drake
-R:646:0x92:0xC8
-
-# Wyrd sister
-R:647:0x97:0x95
-
-# Vrock
-R:648:0x9C:0xCD
-
-# Death quasit
-R:649:0x93:0xD1
-
-# Giganto, the Gargantuan
-R:650:0xA1:0x97
-
-# Strygalldwir
-R:651:0x9C:0xCE
-
-# Fallen angel
-R:652:0x98:0xC6
-
-# Giant headless
-R:653:0xA1:0xB8
-
-# Judge Fire
-R:654:0x99:0x8B
-
-# Ubbo-Sathla, the Unbegotten Source
-R:655:0xA1:0xB9
-
-# Judge Mortis
-R:656:0xA1:0xBA
-
-# Dark elven sorcerer
-R:657:0x97:0xB9
-
-# Master lich
-R:658:0x93:0xFC
-
-# Byakhee
-R:659:0x9C:0xCF
-
-# Eol, the Dark Elf
-R:660:0x9C:0xD1
-
-# Archon
-R:661:0x92:0x8B
-
-# Formless spawn of Tsathoggua
-R:662:0x9C:0xD2
-
-# Hunting horror
-R:663:0x9C:0xD3
-
-# Undead beholder
-R:664:0x96:0xF8
-
-# Shadow
-R:665:0x93:0xB9
-
-# Iron lich
-R:666:0x9C:0xD4
-
-# Dread
-R:667:0x9F:0xFF
-
-# Greater basilisk
-R:668:0xA1:0xBB
-
-# Charybdis
-R:669:0xA1:0xBC
-
-# Jack of Shadows
-R:670:0x99:0x94
-
-# Zephyr Lord
-R:671:0x99:0x89
-
-# Juggernaut of Khorne
-R:672:0xA1:0xBD
-
-# Mumak
-R:673:0x99:0xBA
-
-# Judge Fear
-R:674:0x97:0x80
-
-# Ancient multi-hued dragon
-R:675:0x92:0xC9
-
-# Ethereal dragon
-R:676:0x92:0xCA
-
-# Dark young of Shub-Niggurath
-R:677:0x9C:0xD5
-
-# Colour out of space
-R:678:0x8C:0x91
-
-# Quaker, Master of Earth
-R:679:0x93:0x87
-
-# Death leprechaun
-R:680:0x97:0x96
-
-# Chaugnar Faugn, Horror from the Hills
-R:681:0xA1:0xCC
-
-# Lloigor
-R:682:0xA1:0xCD
-
-# Utgard-Loke
-R:683:0xA1:0xCE
-
-# Quachil Uttaus, Treader of the Dust
-R:684:0xA1:0xCF
-
-# Shoggoth
-R:685:0xA1:0xD0
-
-# Judge Death
-R:686:0xA1:0xD1
-
-# Ariel, Queen of Air
-R:687:0x93:0x89
-
-# 11-headed hydra
-R:688:0x94:0xD2
-
-# Patriarch
-R:689:0x99:0x92
-
-# Dreadmaster
-R:690:0x93:0xBD
-
-# Drolem
-R:691:0x97:0x8A
-
-# Scatha the Worm
-R:692:0x9A:0x93
-
-# Warrior of the Dawn
-R:693:0x9C:0xD6
-
-# Lesser black reaver
-R:694:0x95:0xBF
-
-# Zoth-Ommog
-R:695:0xA2:0xC1
-
-# Grand master thief
-R:696:0xA4:0xC2
-
-# Smaug the Golden
-R:697:0x92:0xCB
-
-# The Stormbringer
-R:698:0x9C:0xF8
-
-# Knight Templar
-R:699:0x9C:0xF9
-
-# Leprechaun fanatic
-R:700:0x97:0xB8
-
-# Dracolich
-R:701:0x92:0xCD
-
-# Greater titan
-R:702:0x94:0x90
-
-# Dracolisk
-R:703:0x92:0xCC
-
-# Winged Horror
-R:704:0xA5:0xD6
-
-# Spectral tyrannosaur
-R:705:0x9C:0xFA
-
-# Yibb-Tstll, the Patient One
-R:706:0xA1:0xD3
-
-# Ghatanothoa
-R:707:0xA1:0xD4
-
-# Ent
-R:708:0xA1:0xBE
-
-# Hru
-R:709:0xA1:0xD5
-
-# Itangast the Fire Drake
-R:710:0x92:0xCE
-
-# Death mold
-R:711:0x97:0xFF
-
-# Fafner the Dragon
-R:712:0x9C:0xFB
-
-# Charon, Boatman of the Styx
-R:713:0xA1:0xD6
-
-# Quickbeam, the Ent
-R:714:0xA1:0xD7
-
-# Glaurung, Father of the Dragons
-R:715:0x9A:0x92
-
-# Behemoth
-R:716:0xA1:0xF8
-
-# Garm, Guardian of Hel
-R:717:0x92:0xBC
-
-# Greater wall monster
-R:718:0x9C:0xFC
-
-# Nycadaemon
-R:719:0x9A:0x89
-
-# Barbazu
-R:720:0x9A:0x8D
-
-# Goat of Mendes
-R:721:0x9C:0xFD
-
-# Nightwing
-R:722:0x9A:0x95
-
-# Maulotaur
-R:723:0x9C:0xFE
-
-# Nether hound
-R:724:0x95:0xF9
-
-# Time hound
-R:725:0x95:0xFA
-
-# Plasma hound
-R:726:0x95:0xFB
-
-# Demonic quylthulg
-R:727:0x94:0x95
-
-# Great Storm Wyrm
-R:728:0x92:0xCF
-
-# Ulik the Troll
-R:729:0xA1:0xF9
-
-# Baphomet the Minotaur Lord
-R:730:0x93:0xC8
-
-# Hell knight
-R:731:0xA1:0xFA
-
-# Bull Gates
-R:732:0x9C:0xFF
-
-# Santa Claus
-R:733:0x9D:0x80
-
-# Eihort, the Thing in the Labyrinth
-R:734:0xA2:0xC2
-
-# The King in Yellow
-R:735:0xA2:0xC3
-
-# Great unclean one
-R:736:0xA2:0xC4
-
-# Lord of Chaos
-R:737:0x9D:0x81
-
-# Old Sorcerer
-R:738:0x91:0xC2
-
-# Ethereal hound
-R:739:0x9D:0x82
-
-# Lesser kraken
-R:740:0xA1:0xFB
-
-# Great Ice Wyrm
-R:741:0x92:0xD0
-
-# Demilich
-R:742:0x95:0xC2
-
-# The Phoenix
-R:743:0x92:0x90
-
-# Nightcrawler
-R:744:0x95:0xC4
-
-# Lord of Change
-R:745:0xA1:0xBF
-
-# Keeper of Secrets
-R:746:0xA2:0xC5
-
-# Shudde M'ell
-R:747:0xA2:0xC6
-
-# Hand druj
-R:748:0x99:0xC6
-
-# Eye druj
-R:749:0x99:0xC7
-
-# Skull druj
-R:750:0x99:0xC8
-
-# Chaos vortex
-R:751:0x99:0xD3
-
-# Aether vortex
-R:752:0x99:0xD4
-
-# Nidhogg, the Hel-Drake
-R:753:0xA2:0xC7
-
-# The Lernaean Hydra
-R:754:0x94:0xD3
-
-# Thuringwethil, the Vampire Messenger
-R:755:0x95:0x95
-
-# Great Hell Wyrm
-R:756:0x92:0xD1
-
-# Hastur the Unspeakable
-R:757:0x9D:0x83
-
-# Bloodthirster
-R:758:0xA1:0xFC
-
-# Draconic quylthulg
-R:759:0x94:0x96
-
-# Nyogtha, the Thing that Should not Be
-R:760:0x9D:0x84
-
-# Ahtu, Avatar of Nyarlathotep
-R:761:0xA2:0xC8
-
-# Fundin Bluecloak
-R:762:0xA2:0xC9
-
-# Bile Demon
-R:763:0xA5:0xF8
-
-# Uriel, Angel of Fire
-R:764:0x92:0x8C
-
-# Azriel, Angel of Death
-R:765:0x92:0x8D
-
-# Ancalagon the Black
-R:766:0x92:0xD2
-
-# Daoloth, the Render of the Veils
-R:767:0xA2:0xCA
-
-# Nightwalker
-R:768:0xA1:0xFD
-
-# Gabriel, the Messenger
-R:769:0x92:0x8E
-
-# Artsi, the Champion of Chaos
-R:770:0xA2:0xCB
-
-# Saruman of Many Colours
-R:771:0x99:0x96
-
-# Harowen the Black Hand
-R:772:0xA2:0xCC
-
-# Osyluth
-R:773:0xA5:0xF9
-
-# Dreadlord
-R:774:0x93:0xBE
-
-# Greater kraken
-R:775:0xA1:0xFE
-
-# Archlich
-R:776:0x95:0xC5
-
-# The Cat Lord
-R:777:0x9D:0x87
-
-# Jabberwock
-R:778:0xA5:0xFA
-
-# Chaos hound
-R:779:0x95:0xFD
-
-# Vlad Dracula, Prince of Darkness
-R:780:0xA2:0xCD
-
-# Beholder hive-mother
-R:781:0xA2:0xCE
-
-# Leviathan
-R:782:0xA1:0xFF
-
-# Great Wyrm of Chaos
-R:783:0x92:0xD3
-
-# Great Wyrm of Law
-R:784:0x92:0xD4
-
-# Great Wyrm of Balance
-R:785:0x92:0xD5
-
-# Shambler
-R:786:0x9D:0x89
-
-# Gelugon
-R:787:0xA5:0xFB
-
-# Glaaki
-R:788:0xA0:0x80
-
-# T'ron, the Rebel Dragonrider
-R:789:0x9D:0x8A
-
-# Great Wyrm of Many Colours
-R:790:0x9D:0x8B
-
-# Mardra, rider of the Gold Loranth
-R:791:0x9D:0x8C
-
-# Tselakus, the Dreadlord
-R:792:0x93:0xBF
-
-# Sky Drake
-R:793:0x9D:0x8D
-
-# Eilinel the Entrapped
-R:794:0x93:0xBB
-
-# Horned Reaper
-R:795:0xA5:0xFC
-
-# The Norsa
-R:796:0x9D:0x8F
-
-# Rhan-Tegoth
-R:797:0xA2:0xD1
-
-# Black reaver
-R:798:0x93:0xFD
-
-# Master mindcrafter
-R:799:0x99:0x97
-
-# Greater demonic quylthulg
-R:800:0x94:0x97
-
-# Greater draconic quylthulg
-R:801:0x94:0xB8
-
-# Greater rotting quylthulg
-R:802:0x94:0xB9
-
-# Null, the Living Void
-R:803:0xA1:0xC0
-
-# Feagwath, the Undead Sorcerer
-R:804:0x93:0xFE
-
-# Omarax the Eye Tyrant
-R:805:0x96:0xF9
-
-# Tsathoggua, the Sleeper of N'kai
-R:806:0xA2:0xD2
-
-# Greater Balrog
-R:807:0x9A:0x8B
-
-# Ungoliant, the Unlight
-R:808:0x95:0x80
-
-# Atlach-Nacha, the Spider God
-R:809:0x9D:0x92
-
-# Y'golonac
-R:810:0xA2:0xD3
-
-# Aether hound
-R:811:0x95:0xFE
-
-# Pit Fiend
-R:812:0x9A:0x8A
-
-# The Serpent of Chaos
-R:813:0x9D:0xC5
-
-# Yig, Father of Serpents
-R:814:0xA2:0xD4
-
-# Unmaker
-R:815:0x9D:0x94
-
-# Cyberdemon
-R:816:0x9D:0x95
-
-# Hela, Queen of the Dead
-R:817:0xA2:0xD5
-
-# The Mouth of Sauron
-R:818:0xA2:0xD6
-
-# The Necromancer of Dol Guldur
-R:819:0x9D:0x96
-
-# Lessa, rider of the Gold Ramoth
-R:820:0x9D:0x97
-
-# Master quylthulg
-R:821:0x94:0xBA
-
-# Qlzqqlzuup, the Lord of Flesh
-R:822:0x94:0xBB
-
-# Cthugha, the Living Flame
-R:823:0xA2:0xD7
-
-# F'lar, rider of the Bronze Mnementh
-R:824:0x9D:0xB8
-
-# Maeglin, the Traitor of Gondolin
-R:825:0x95:0xC6
-
-# Cyaegha
-R:826:0xA2:0xF8
-
-# Pazuzu, Lord of Air
-R:827:0xA2:0xF9
-
-# Ithaqua the Windwalker
-R:828:0x9D:0xB9
-
-# Greater Hellhound
-R:829:0x92:0xBB
-
-# Cantoras, the Skeletal Lord
-R:830:0x99:0xC9
-
-# Mephistopheles, Lord of Hell
-R:831:0x9D:0xBA
-
-# Godzilla
-R:832:0x9D:0xBB
-
-# Abhoth, Source of Uncleanness
-R:833:0xA2:0xFA
-
-# Ymir, the Ice Giant
-R:834:0xA2:0xFB
-
-# Loki, the Trickster
-R:835:0xA2:0xFC
-
-# Star-spawn of Cthulhu
-R:836:0x9D:0xBC
-
-# Surtur, the Fire Giant
-R:837:0xA2:0xFD
-
-# The Tarrasque
-R:838:0xA1:0xCB
-
-# Lungorthin, the Balrog of White Fire
-R:839:0xA2:0xFE
-
-# Draugluin, Sire of All Werewolves
-R:840:0xA2:0xFF
-
-# Shuma-Gorath
-R:841:0xA3:0x80
-
-# Tulzscha, the Green Flame
-R:842:0xA1:0xCA
-
-# Oremorj, the Cyberdemon Lord
-R:843:0xA1:0xC9
-
-# Vecna, the Emperor Lich
-R:844:0x9D:0xBD
-
-# Yog-Sothoth, the All-in-One
-R:845:0x9D:0xBE
-
-# Fenris Wolf
-R:846:0xA1:0xC8
-
-# Great Wyrm of Power
-R:847:0x9D:0xBF
-
-# Shub-Niggurath, Black Goat of the Woods
-R:848:0x9D:0xC0
-
-# Nodens, Lord of the Great Abyss
-R:849:0x99:0x85
-
-# Carcharoth, the Jaws of Thirst
-R:850:0x92:0xBE
-
-# Nyarlathotep, the Crawling Chaos
-R:851:0x9D:0xC1
-
-# Azathoth, the Daemon Sultan
-R:852:0x9D:0xC2
-
-# Huan, Wolfhound of the Valar
-R:853:0x92:0xBF
-
-# Jormungand the Midgard Serpent
-R:854:0xA1:0xC7
-
-# The Destroyer
-R:855:0xA1:0xC6
-
-# Gothmog, the High Captain of Balrogs
-R:856:0x9A:0x90
-
-# Great Cthulhu
-R:857:0x9D:0xC3
-
-# Sorka, rider of the Gold Faranth
-R:858:0x9D:0xC4
-
-# The Unicorn of Order
-R:859:0xA1:0xC5
-
-# Sauron, the Sorcerer
-R:860:0x99:0xB8
-
-# DarkGod, the Mighty Coder of Hell
-R:861:0xA3:0xD5
-
-# Morgoth, Lord of Darkness
-R:862:0x9D:0xC6
-
-# Human Warrior
-R:863:0x9D:0xF8
-
-# Elven archer
-R:864:0x9D:0xF9
-
-# Dwarven warrior
-R:865:0x9D:0xFA
-
-# Elite uruk
-R:866:0x9D:0xFB
-
-# The Philosophy Teacher
-R:867:0xA1:0xC4
-
-# The Variant Maintainer
-R:868:0xA1:0xC3
-
-# Random Number Generator
-R:869:0xA1:0xC2
-
-# Rocket mine
-R:870:0xA2:0x80
-
-# Bouncing mine
-R:871:0xA2:0x81
-
-# Durin's Bane
-R:872:0xA3:0x81
-
-# The Icky Queen
-R:873:0xA3:0x82
-
-# Rot jelly
-R:874:0xA2:0x82
-
-# Death
-R:875:0xA2:0x83
-
-# Famine
-R:876:0xA2:0x85
-
-# Pestilence
-R:877:0xA2:0x84
-
-# War
-R:878:0xA2:0x86
-
-# Pike
-R:879:0xA2:0x87
-
-# Electric eel
-R:880:0xA2:0x88
-
-# Giant crayfish
-R:881:0xA2:0x89
-
-# Mermaid
-R:882:0xA2:0x8A
-
-# Box jellyfish
-R:883:0xA0:0xB9
-
-# Giant piranha
-R:884:0x9E:0xD5
-
-# Piranha
-R:885:0x9E:0xD5
-
-# Bullywug
-R:886:0xA2:0x8C
-
-# Bullywug warrior
-R:887:0xA2:0x8D
-
-# Bullywug shaman
-R:888:0xA2:0x8E
-
-# Whale
-R:889:0xA0:0xD0
-
-# Sand mite
-R:890:0xA2:0x90
-
-# Octopus
-R:891:0xA2:0x91
-
-# Giant octopus
-R:892:0xA2:0x92
-
-# Eye of the deep
-R:893:0xA2:0x93
-
-# Murk dweller
-R:894:0xA3:0x83
-
-# Drowned soul
-R:895:0xA3:0x84
-
-# Tiger shark
-R:896:0xA3:0x85
-
-# Hammerhead shark
-R:897:0xA0:0xC8
-
-# Great white shark
-R:898:0xA0:0xFA
-
-# Aquatic golem
-R:899:0xA3:0x86
-
-# Aquatic kobold
-R:900:0xA3:0x87
-
-# White shark
-R:901:0xA0:0xFA
-
-# Scrag
-R:902:0xA3:0x89
-
-# Jaws
-R:903:0xA1:0x84
-
-# Aquatic elf
-R:904:0xA3:0x8B
-
-# Aquatic elven warrior
-R:905:0xA3:0x8C
-
-# Aquatic elven shaman
-R:906:0xA3:0x8D
-
-# Stargazer
-R:907:0xA3:0x8E
-
-# Elder stargazer
-R:908:0xA3:0x8F
-
-# Flounder
-R:909:0xA3:0x90
-
-# Giant turtle
-R:910:0xA3:0x91
-
-# Baby dragon turtle
-R:911:0xA3:0x92
-
-# Young dragon turtle
-R:912:0xA3:0x93
-
-# Mature dragon turtle
-R:913:0xA3:0x94
-
-# Ancient dragon turtle
-R:914:0xA3:0x95
-
-# Fastitocalon
-R:915:0xA3:0x96
-
-# Undead stargazer
-R:916:0xA3:0x97
-
-# Killer whale
-R:917:0xA0:0x94
-
-# Merrow
-R:918:0xA5:0xFD
-
-# Water naga
-R:919:0xA3:0xB9
-
-# Devilfish
-R:920:0xA3:0xBA
-
-# Undead devilfish
-R:921:0xA3:0xBB
-
-# Moby Dick, the White Whale
-R:922:0xA3:0xB8
-
-# Aquatic hound
-R:923:0xA3:0xBD
-
-# Water demon
-R:924:0xA3:0xBE
-
-# Ixitxachitl
-R:925:0x9F:0xD4
-
-# Ixitxachitl priest
-R:926:0xA3:0xC0
-
-# Vampiric ixitxachitl
-R:927:0xA3:0xC1
-
-# Mathilde, the Science Student
-R:928:0xA2:0x94
-
-# Child spirit
-R:929:0xA2:0x95
-
-# Young spirit
-R:930:0xA2:0x96
-
-# Mature spirit
-R:931:0xA2:0x97
-
-# Experienced spirit
-R:932:0xA2:0xB8
-
-# Wise spirit
-R:933:0xA2:0xB9
-
-# Fangorn the Treebeard, Lord of the Ents
-R:934:0xA3:0xC2
-
-# Gandalf the Grey
-R:935:0xA3:0xC3
-
-# Nar, the Dwarf
-R:936:0xA3:0xC4
-
-# Novice mindcrafter
-R:937:0x98:0xD2
-
-# Great Swamp Wyrm
-R:938:0xA5:0xFE
-
-# Great Bile Wyrm
-R:939:0xA5:0xFF
-
-# Blue Firelizard
-R:940:0xA2:0xBA
-
-# Green Firelizard
-R:941:0xA2:0xBB
-
-# Brown Firelizard
-R:942:0xA2:0xBC
-
-# Bronze Firelizard
-R:943:0xA2:0xBD
-
-# Gold Firelizard
-R:944:0xA2:0xBE
-
-# High-elven ranger
-R:945:0xA2:0xBF
-
-# Uvatha the Horseman
-R:946:0xA3:0xC8
-
-# Adunaphel the Quiet
-R:947:0xA3:0xC9
-
-# Akhorahil the Blind
-R:948:0xA3:0xCA
-
-# Ren the Unclean
-R:949:0xA3:0xCB
-
-# Ji Indur Dawndeath
-R:950:0xA3:0xCC
-
-# Dwar, Dog Lord of Waw
-R:951:0xA3:0xCD
-
-# Hoarmurath of Dir
-R:952:0xA3:0xCE
-
-# Khamul, the Black Easterling
-R:953:0xA3:0xCF
-
-# The Witch-King of Angmar
-R:954:0xA3:0xD0
-
-# Green Dragonrider
-R:955:0x9D:0x8E
-
-# Blue Dragonrider
-R:956:0x9D:0x86
-
-# Brown Dragonrider
-R:957:0x9D:0x90
-
-# Bronze Dragonrider
-R:958:0x9D:0x90
-
-# Gold Dragonrider
-R:959:0x9D:0x8C
-
-# Thread
-R:960:0xA2:0xC0
-
-# Gorlim, Betrayer of Barahir
-R:961:0xA3:0xD1
-
-# The Blubbering idiot, agent of black market, Simon the weak
-R:962:0x98:0xBA
-
-# Aranea
-R:963:0xA4:0x92
-
-# Elder aranea
-R:964:0xA3:0xD2
-
-# Giant brown tick
-R:965:0xA6:0x80
-
-# Dolphiner
-R:966:0xA3:0xD4
-
-# Novice possessor (soul)
-R:967:0xA5:0xBE
-
-# Bat of Gorgoroth
-R:968:0xA6:0x8F
-
-# The Princess
-R:969:0xA6:0x90
-
-# Merton Proudfoot, the lost hobbit
-R:970:0xA6:0x91
-
-# The Wight-King of the Barrow-downs
-R:971:0xA6:0x92
-
-# Adventurer
-R:972:0xA6:0x93
-
-# Experienced possessor (soul)
-R:973:0xA6:0x94
-
-# Old possessor (soul)
-R:974:0xA6:0x95
-
-# Death orb
-R:975:0xA6:0x96
-
-# Bronze dragon worm
-R:976:0xA6:0xB8
-
-# Gold dragon worm
-R:977:0xA6:0x97
-
-# Moldoux, the Defenceless Mold
-R:978:0xA1:0xC1
-
-# The Physics Teacher
-R:979:0xA2:0xCF
-
-# Ar-Pharazon the Golden
-R:980:0xA3:0xD6
-
-# Doppelganger
-R:981:0x8F:0x84
-
-# Marylene, Heartbreakeress of the Netherworld
-R:982:0xA4:0x85
-
-# The Greater Lag Monster
-R:983:0xA4:0xC5
-
-# Hrungnir, the Stone Giant
-R:984:0x97:0x82
-
-# Bullroarer the Hobbit
-R:985:0x97:0x93
-
-# 3-headed hydra
-R:986:0x94:0xCC
-
-# Uldor the Accursed
-R:987:0x99:0x8D
-
-# Mystic
-R:988:0x99:0x93
-
-# Elder vampire
-R:989:0x94:0x91
-
-# Ulfang the Black
-R:990:0x98:0xCE
-
-# Demonologist
-R:991:0x97:0xBA
-
-# Hezrou
-R:992:0x94:0xD4
-
-# Glabrezu
-R:993:0x94:0xC6
-
-# Nalfeshnee
-R:994:0xA4:0xC6
-
-# Marilith
-R:995:0xA4:0xC7
-
-# Lesser Balrog
-R:996:0x9A:0x8D
-
-# Master mystic
-R:997:0x98:0xCC
-
-# Grand master mystic
-R:998:0x99:0x95
-
-# Erinyes
-R:999:0x93:0xBC
-
-# Novice mindcrafter
-R:1000:0x98:0xD2
-
-# Polyphemus, the Blind Cyclops
-R:1001:0xA6:0x81
-
-# Great Wyrm of Perplexity
-R:1002:0xA4:0xCA
-
-# Hound of Tindalos
-R:1003:0xA4:0xCB
-
-# Great Wyrm of Thunder
-R:1004:0xA6:0x82
-
-# Silver mouse
-R:1005:0xA6:0x83
-
-# The Rat King
-R:1006:0xA4:0xCE
-
-# Vort the Kobold Queen
-R:1007:0xA4:0xCF
-
-# Giant black louse
-R:1008:0xA4:0xD0
-
-# Fire Phantom
-R:1009:0xA4:0xD1
-
-# The Insane Player
-R:1010:0x8C:0xB9
-
-# Glaryssa, Succubus Queen
-R:1011:0xA4:0xD2
-
-# Vermicious Knid
-R:1012:0xA4:0xD3
-
-# Bone golem
-R:1013:0xA4:0xD4
-
-# Snake of Yig
-R:1014:0xA4:0xD5
-
-# Bronze golem
-R:1015:0xA6:0x84
-
-# Dimensional shambler
-R:1016:0xA4:0xD7
-
-# Cultist
-R:1017:0x8D:0xD1
-
-# Cult leader
-R:1018:0x90:0x8F
-
-# Servitor of the outer gods
-R:1019:0xA5:0x82
-
-# Avatar of Nyarlathotep
-R:1020:0xA5:0x83
-
-# Thiazi, the Storm Giant
-R:1021:0xA6:0x85
-
-# Hypnos, Lord of Sleep
-R:1022:0xA5:0x85
-
-# Blue dragon worm
-R:1023:0xA5:0x86
-
-# White dragon worm
-R:1024:0xA5:0x87
-
-# Green dragon worm
-R:1025:0xA5:0x8A
-
-# Black dragon worm
-R:1026:0xA5:0x89
-
-# Red dragon worm
-R:1027:0xA5:0x88
-
-# Multi-hued dragon worm
-R:1028:0xA5:0x8B
-
-# The Minotaur of the Labyrinth
-R:1029:0xA5:0x8C
-
-# The Sandworm Queen
-R:1030:0xA5:0x93
-
-# Sandworm
-R:1031:0xA5:0x94
-
-# Tik'srvzllat
-R:1032:0xA5:0x95
-
-# The Glass Golem
-R:1033:0xA6:0x86
-
-# The White Balrog
-R:1034:0xA6:0x87
-
-# Golgarach, the Living Rock
-R:1035:0x83:0xBC
-
-# Atlas, the Titan
-R:1036:0xA6:0x88
-
-# Kronos, Lord of the Titans
-R:1037:0xA6:0x89
-
-# Water hound
-R:1038:0xA6:0xC0
-
-# Improv, the mighty MoLD
-R:1039:0xA6:0xC6
-
-# Emperor Mimic
-R:1040:0xA6:0xD4
-
-# Melinda Proudfoot
-R:1041:0x87:0xE2
-
-# Thrain, the King Under the Mountain
-R:1042:0x87:0xE3
-
-# Fire golem
-R:1043:0x89:0xD8
-
-# Melkor, Lord of Darkness
-R:1044:0x89:0xD9
-
-# Spirit
-R:1045:0x8C:0xD7
-
-# Spirit
-R:1046:0x8C:0xD8
-
-# Spirit
-R:1047:0x8C:0xD9
-
-# Spirit
-R:1048:0x8C:0xDA
-
-# Spirit
-R:1049:0x8C:0xDB
-
-# Spirit
-R:1050:0x8C:0xDC
-
-# Spirit
-R:1051:0x8C:0xDD
-
-# Spirit
-R:1052:0x8C:0xDE
-
-# Spirit
-R:1053:0x8C:0xDF
-
-# Spirit
-R:1054:0x8C:0xE0
-
-# Spirit
-R:1055:0x8C:0xE1
-
-# Spirit
-R:1056:0x8C:0xE2
-
-# Spirit
-R:1057:0x8C:0xDB
-
-# Spirit
-R:1058:0x8C:0xE3
-
-# Spirit
-R:1059:0x8C:0xE4
-
-# Spirit
-R:1060:0x8C:0xE5
-
-# Spirit
-R:1061:0x8C:0xE6
-
-# Spirit
-R:1062:0x8C:0xE7
-
-# Spirit
-R:1063:0x8C:0xE8
-
-# Spirit
-R:1064:0x8C:0xE9
-
-# Spirit
-R:1065:0x8C:0xEA
-
-# Spirit
-R:1066:0x8C:0xEB
-
-# Spirit
-R:1067:0x8C:0xEC
-
-# Spirit
-R:1068:0x8C:0xED
-
-# Spirit
-R:1069:0x8C:0xEE
-
-# Spirit
-R:1070:0x8C:0xEF
-
-# Spirit
-R:1071:0x8C:0xF0
-
-# Spirit
-R:1072:0x8C:0xF1
-
-# Spirit
-R:1073:0x8C:0xF2
-
-# Spirit
-R:1074:0x8C:0xF3
-
-# Spirit
-R:1075:0x8C:0xF4
-
-# Spells (*)
-S:48:0x8C:0x80
-
-# Spells (*)
-S:49:0x8C:0x81
-
-# Spells (*)
-S:50:0x8C:0x82
-
-# Spells (*)
-S:51:0x8C:0x83
-
-# Spells (*)
-S:52:0x8C:0x84
-
-# Spells (*)
-S:53:0x8C:0x85
-
-# Spells (*)
-S:54:0x8C:0x86
-
-# Spells (*)
-S:55:0x8C:0x87
-
-# Spells (*)
-S:56:0x8C:0x88
-
-# Spells (*)
-S:57:0x8C:0x89
-
-# Spells (*)
-S:58:0x8C:0x8A
-
-# Spells (*)
-S:59:0x8C:0x8B
-
-# Spells (*)
-S:60:0x8C:0x8C
-
-# Spells (*)
-S:61:0x8C:0x8D
-
-# Spells (*)
-S:62:0x8C:0x8E
-
-# Spells (*)
-S:63:0x8C:0x8F
-
-# Spells (|)
-S:64:0x8A:0xF8
-
-# Spells (|)
-S:65:0x8A:0xFC
-
-# Spells (|)
-S:66:0x8B:0x80
-
-# Spells (|)
-S:67:0x8B:0x84
-
-# Spells (|)
-S:68:0x8B:0x88
-
-# Spells (|)
-S:69:0x8B:0x8C
-
-# Spells (|)
-S:70:0x8B:0x90
-
-# Spells (|)
-S:71:0x8B:0x94
-
-# Spells (|)
-S:72:0x8B:0xB8
-
-# Spells (|)
-S:73:0x8B:0xBC
-
-# Spells (|)
-S:74:0x8B:0xC0
-
-# Spells (|)
-S:75:0x8B:0xC4
-
-# Spells (|)
-S:76:0x8B:0xC8
-
-# Spells (|)
-S:77:0x8B:0xCC
-
-# Spells (|)
-S:78:0x8B:0xD0
-
-# Spells (|)
-S:79:0x8B:0xD4
-
-# Spells (-)
-S:80:0x8A:0xF9
-
-# Spells (-)
-S:81:0x8A:0xFD
-
-# Spells (-)
-S:82:0x8B:0x81
-
-# Spells (-)
-S:83:0x8B:0x85
-
-# Spells (-)
-S:84:0x8B:0x89
-
-# Spells (-)
-S:85:0x8B:0x8D
-
-# Spells (-)
-S:86:0x8B:0x91
-
-# Spells (-)
-S:87:0x8B:0x95
-
-# Spells (-)
-S:88:0x8B:0xB9
-
-# Spells (-)
-S:89:0x8B:0xBD
-
-# Spells (-)
-S:90:0x8B:0xC1
-
-# Spells (-)
-S:91:0x8B:0xC5
-
-# Spells (-)
-S:92:0x8B:0xC9
-
-# Spells (-)
-S:93:0x8B:0xCD
-
-# Spells (-)
-S:94:0x8B:0xD1
-
-# Spells (-)
-S:95:0x8B:0xD5
-
-# Spells (:)
-S:96:0x8A:0xFA
-
-# Spells (:)
-S:97:0x8A:0xFE
-
-# Spells (:)
-S:98:0x8B:0x82
-
-# Spells (:)
-S:99:0x8B:0x86
-
-# Spells (:)
-S:100:0x8B:0x8A
-
-# Spells (:)
-S:101:0x8B:0x8E
-
-# Spells (:)
-S:102:0x8B:0x92
-
-# Spells (:)
-S:103:0x8B:0x96
-
-# Spells (:)
-S:104:0x8B:0xBA
-
-# Spells (:)
-S:105:0x8B:0xBE
-
-# Spells (:)
-S:106:0x8B:0xC2
-
-# Spells (:)
-S:107:0x8B:0xC6
-
-# Spells (:)
-S:108:0x8B:0xCA
-
-# Spells (:)
-S:109:0x8B:0xCE
-
-# Spells (:)
-S:110:0x8B:0xD2
-
-# Spells (:)
-S:111:0x8B:0xD6
-
-# Spells (\)
-S:112:0x8A:0xFB
-
-# Spells (\)
-S:113:0x8A:0xFF
-
-# Spells (\)
-S:114:0x8B:0x83
-
-# Spells (\)
-S:115:0x8B:0x87
-
-# Spells (\)
-S:116:0x8B:0x8B
-
-# Spells (\)
-S:117:0x8B:0x8F
-
-# Spells (\)
-S:118:0x8B:0x93
-
-# Spells (\)
-S:119:0x8B:0x97
-
-# Spells (\)
-S:120:0x8B:0xBB
-
-# Spells (\)
-S:121:0x8B:0xBF
-
-# Spells (\)
-S:122:0x8B:0xC3
-
-# Spells (\)
-S:123:0x8B:0xC7
-
-# Spells (\)
-S:124:0x8B:0xCB
-
-# Spells (\)
-S:125:0x8B:0xCF
-
-# Spells (\)
-S:126:0x8B:0xD3
-
-# Spells (\)
-S:127:0x8B:0xD7
-
-# Amulets (
-S:128:0x86:0xFF
-
-# Amulets (
-S:129:0x86:0xF8
-
-# Amulets (
-S:130:0x87:0x80
-
-# Amulets (
-S:131:0x86:0xFA
-
-# Amulets (
-S:132:0x86:0xFB
-
-# Amulets (
-S:133:0x86:0xFC
-
-# Amulets (
-S:134:0x86:0xFD
-
-# Amulets (
-S:135:0x86:0xFE
-
-# Amulets (
-S:136:0x86:0xF9
-
-# Amulets (
-S:137:0x86:0xF9
-
-# Amulets (
-S:138:0x87:0x81
-
-# Amulets (
-S:139:0x87:0x82
-
-# Amulets (
-S:140:0x87:0x83
-
-# Amulets (
-S:141:0x87:0x84
-
-# Amulets (
-S:142:0x87:0x85
-
-# Amulets (
-S:143:0x87:0x86
-
-# Rings (=)
-S:144:0x85:0xBF
-
-# Rings (=)
-S:145:0x85:0xB8
-
-# Rings (=)
-S:146:0x85:0xC0
-
-# Rings (=)
-S:147:0x85:0xBA
-
-# Rings (=)
-S:148:0x85:0xBB
-
-# Rings (=)
-S:149:0x85:0xBC
-
-# Rings (=)
-S:150:0x85:0xBD
-
-# Rings (=)
-S:151:0x85:0xBE
-
-# Rings (=)
-S:152:0x85:0xB9
-
-# Rings (=)
-S:153:0x85:0xB9
-
-# Rings (=)
-S:154:0x85:0xC1
-
-# Rings (=)
-S:155:0x85:0xC2
-
-# Rings (=)
-S:156:0x85:0xC3
-
-# Rings (=)
-S:157:0x85:0xC4
-
-# Rings (=)
-S:158:0x85:0xC5
-
-# Rings (=)
-S:159:0x85:0xC6
-
-# Staffs (_)
-S:160:0x87:0x8E
-
-# Staffs (_)
-S:161:0x87:0x8D
-
-# Staffs (_)
-S:162:0x87:0x8D
-
-# Staffs (_)
-S:163:0x87:0x8A
-
-# Staffs (_)
-S:164:0x87:0x8A
-
-# Staffs (_)
-S:165:0x87:0x8B
-
-# Staffs (_)
-S:166:0x87:0x8D
-
-# Staffs (_)
-S:167:0x87:0x88
-
-# Staffs (_)
-S:168:0x87:0x8D
-
-# Staffs (_)
-S:169:0x87:0x8D
-
-# Staffs (_)
-S:170:0x87:0x8A
-
-# Staffs (_)
-S:171:0x87:0x8C
-
-# Staffs (_)
-S:172:0x87:0x8A
-
-# Staffs (_)
-S:173:0x87:0x8B
-
-# Staffs (_)
-S:174:0x87:0x8E
-
-# Staffs (_)
-S:175:0x87:0x88
-
-# Wands (-)
-S:176:0x86:0xCF
-
-# Wands (-)
-S:177:0x86:0xC8
-
-# Wands (-)
-S:178:0x86:0xD0
-
-# Wands (-)
-S:179:0x86:0xCA
-
-# Wands (-)
-S:180:0x86:0xCB
-
-# Wands (-)
-S:181:0x86:0xCC
-
-# Wands (-)
-S:182:0x86:0xCD
-
-# Wands (-)
-S:183:0x86:0xCE
-
-# Wands (-)
-S:184:0x86:0xC9
-
-# Wands (-)
-S:185:0x86:0xC9
-
-# Wands (-)
-S:186:0x86:0xD1
-
-# Wands (-)
-S:187:0x86:0xD2
-
-# Wands (-)
-S:188:0x86:0xD3
-
-# Wands (-)
-S:189:0x86:0xD4
-
-# Wands (-)
-S:190:0x86:0xD5
-
-# Wands (-)
-S:191:0x86:0xD6
-
-# Rods (-)
-S:192:0x86:0xBF
-
-# Rods (-)
-S:193:0x86:0xB8
-
-# Rods (-)
-S:194:0x86:0xC0
-
-# Rods (-)
-S:195:0x86:0xBA
-
-# Rods (-)
-S:196:0x86:0xBB
-
-# Rods (-)
-S:197:0x86:0xBC
-
-# Rods (-)
-S:198:0x86:0xBD
-
-# Rods (-)
-S:199:0x86:0xBE
-
-# Rods (-)
-S:200:0x86:0xB9
-
-# Rods (-)
-S:201:0x86:0xB9
-
-# Rods (-)
-S:202:0x86:0xC1
-
-# Rods (-)
-S:203:0x86:0xC2
-
-# Rods (-)
-S:204:0x86:0xC3
-
-# Rods (-)
-S:205:0x86:0xC4
-
-# Rods (-)
-S:206:0x86:0xC5
-
-# Rods (-)
-S:207:0x86:0xC6
-
-# Scrolls (?)
-S:208:0x85:0x94
-
-# Scrolls (?)
-S:209:0x85:0x95
-
-# Scrolls (?)
-S:210:0x85:0x96
-
-# Scrolls (?)
-S:211:0x85:0x97
-
-# Scrolls (?)
-S:212:0x85:0x94
-
-# Scrolls (?)
-S:213:0x85:0x95
-
-# Scrolls (?)
-S:214:0x85:0x96
-
-# Scrolls (?)
-S:215:0x85:0x97
-
-# Scrolls (?)
-S:216:0x85:0x94
-
-# Scrolls (?)
-S:217:0x85:0x95
-
-# Scrolls (?)
-S:218:0x85:0x96
-
-# Scrolls (?)
-S:219:0x85:0x97
-
-# Scrolls (?)
-S:220:0x85:0x94
-
-# Scrolls (?)
-S:221:0x85:0x95
-
-# Scrolls (?)
-S:222:0x85:0x96
-
-# Scrolls (?)
-S:223:0x85:0x97
-
-# Potions (!)
-S:224:0x85:0xFF
-
-# Potions (!)
-S:225:0x85:0xF8
-
-# Potions (!)
-S:226:0x86:0x80
-
-# Potions (!)
-S:227:0x85:0xFA
-
-# Potions (!)
-S:228:0x85:0xFB
-
-# Potions (!)
-S:229:0x85:0xFC
-
-# Potions (!)
-S:230:0x85:0xFD
-
-# Potions (!)
-S:231:0x85:0xFE
-
-# Potions (!)
-S:232:0x85:0xF9
-
-# Potions (!)
-S:233:0x85:0xF9
-
-# Potions (!)
-S:234:0x86:0x81
-
-# Potions (!)
-S:235:0x86:0x82
-
-# Potions (!)
-S:236:0x86:0x83
-
-# Potions (!)
-S:237:0x86:0x84
-
-# Potions (!)
-S:238:0x86:0x85
-
-# Potions (!)
-S:239:0x86:0x86
-
-# Food (,)
-S:240:0x86:0x8F
-
-# Food (,)
-S:241:0x86:0x88
-
-# Food (,)
-S:242:0x86:0x90
-
-# Food (,)
-S:243:0x86:0x8A
-
-# Food (,)
-S:244:0x86:0x8B
-
-# Food (,)
-S:245:0x86:0x8C
-
-# Food (,)
-S:246:0x86:0x8D
-
-# Food (,)
-S:247:0x86:0x8E
-
-# Food (,)
-S:248:0x86:0x89
-
-# Food (,)
-S:249:0x86:0x89
-
-# Food (,)
-S:250:0x86:0x91
-
-# Food (,)
-S:251:0x86:0x92
-
-# Food (,)
-S:252:0x86:0x93
-
-# Food (,)
-S:253:0x86:0x94
-
-# Food (,)
-S:254:0x86:0x95
-
-# Food (,)
-S:255:0x86:0x96
-
diff --git a/lib/pref/graf-mac.prf b/lib/pref/graf-mac.prf
deleted file mode 100644
index 7bb84141..00000000
--- a/lib/pref/graf-mac.prf
+++ /dev/null
@@ -1,15 +0,0 @@
-# File: graf-mac.prf
-
-#
-# This file defines special attr/char mappings for use in "graphics" mode
-#
-# See "lib/help/command.txt" and "src/files.c" for more information.
-#
-
-# Standard file
-?:[EQU $GRAF old]
-%:graf-xxx.prf
-
-# New tiles
-?:[EQU $GRAF new]
-%:graf-new.prf
diff --git a/lib/pref/graf-new.prf b/lib/pref/graf-new.prf
deleted file mode 100644
index ca806ca7..00000000
--- a/lib/pref/graf-new.prf
+++ /dev/null
@@ -1,6847 +0,0 @@
-# PRF file generated by Andreas Koch`s Tile Assigner
-# 23/06/2004 Edited manually
-
-# 2460 items 
-# 2312 probably mapped correctly
-# 147 imported but not yet defined
-# 1 defined to value(s) lower than 0x80
-# Old header :
-# File: graf-new.prf
-#
-# This file defines special attr/char mappings for use in "graphics" mode
-# with Adam Bolt's 16x16 tiles.
-#
-# By Robert Ruehlmann < rr9@angband.org >
-#
-# See "lib/help/command.txt" and "src/files.c" for more information.
-#
-
-# General Store
-B:0:0x82/0x87
-
-# Armoury
-B:1:0x82/0x88
-
-# Weaponsmith
-B:2:0x82/0x89
-
-# Temple
-B:3:0x82/0x8A
-
-# Alchemy shop
-B:4:0x82/0x8B
-
-# Magic shop
-B:5:0x82/0x8C
-
-# Black Market
-B:6:0x82/0x8D
-
-# Home
-B:7:0x82/0x8E
-
-# Book Store
-B:8:0x82/0x8F
-
-# Pet Shop
-B:9:0x82/0x90
-
-# Mayor's Office
-B:10:0x86/0xA0
-
-# Inn
-B:11:0x86/0xA1
-
-# The Soothsayer
-B:12:0x86/0xA2
-
-# Library
-B:13:0x86/0xA3
-
-# Castle
-B:14:0x86/0xA4
-
-# Casino
-B:15:0x86/0xA5
-
-# Beastmaster Shanty
-B:16:0x86/0xA6
-
-# Fighters Hall
-B:17:0x86/0xA7
-
-# Tower of Magery
-B:18:0x86/0xA8
-
-# Inner Temple
-B:19:0x86/0xA9
-
-# Paladins Guild
-B:20:0x86/0xAA
-
-# Rangers Guild
-B:21:0x86/0xAB
-
-# Thunderlords' Hide
-B:22:0x86/0xAC
-
-# The Mirror
-B:23:0x86/0xAD
-
-# Seat of Ruling
-B:24:0x86/0xAE
-
-# Wizards Spire
-B:25:0x86/0xAF
-
-# Priests Circle
-B:26:0x86/0xB0
-
-# Tower of the King
-B:27:0x86/0xB1
-
-# Library
-B:28:0x86/0xA3
-
-# The White Tree
-B:29:0x86/0xB2
-
-# Craftsmaster
-B:30:0x86/0xB3
-
-# Earth-Dome (Nature)
-B:31:0x86/0xB4
-
-# Minstrels Haven
-B:32:0x86/0xB5
-
-# Star-Dome
-B:33:0x86/0xB6
-
-# Valarin Temple
-B:34:0x86/0xB7
-
-# Sea-Dome
-B:35:0x86/0xB8
-
-# The Golden Flower
-B:36:0x86/0xB9
-
-# The Fountain
-B:37:0x86/0xBA
-
-# Axe Smith
-B:38:0x86/0xBB
-
-# Hafted Smith
-B:39:0x86/0xBC
-
-# Polearm Smith
-B:40:0x86/0xBD
-
-# Sword Smith
-B:41:0x86/0xBE
-
-# Rare Jewelry Shop
-B:42:0x86/0xBF
-
-# Jewelry Shop
-B:43:0x87/0xA0
-
-# Footwear Shop
-B:44:0x87/0xA1
-
-# Rare Footwear Shop
-B:45:0x87/0xA2
-
-# Library
-B:46:0x86/0xA3
-
-# Forbidden Library
-B:47:0x87/0xA3
-
-# Expensive Black Market
-B:48:0x87/0xA4
-
-# Common Shop
-B:49:0x87/0xA5
-
-# Dragon Hunter
-B:50:0x87/0xA6
-
-# Speed Ring Market
-B:51:0x87/0xA7
-
-# Scribe
-B:52:0x87/0xA8
-
-# Potion Store
-B:53:0x87/0xA9
-
-# Recaller
-B:54:0x87/0xAA
-
-# Master Archer
-B:55:0x87/0xAB
-
-# Merchants Guild
-B:56:0x87/0xAC
-
-# The Mathom-house
-B:57:0x87/0xAD
-
-# The Prancing Pony
-B:58:0x86/0xA1
-
-# nothing
-F:0:0x80/0x80
-
-# open floor
-F:1:0x80/0x81
-
-# fountain
-F:2:0xC3/0x9A
-
-# glyph of warding
-F:3:0x8D/0x95
-
-# open door
-F:4:0x82/0x84
-
-# broken door
-F:5:0x82/0x85
-
-# up staircase
-F:6:0x80/0x96
-
-# down staircase
-F:7:0x80/0x99
-
-# quest entrance
-F:8:0x80/0x9A
-
-# quest exit
-F:9:0x80/0x97
-
-# quest down level
-F:10:0x80/0x9B
-
-# quest up level
-F:11:0x80/0x98
-
-# town exit
-F:12:0x82/0x84
-
-# shaft down
-F:13:0xC3/0x84
-
-# shaft up
-F:14:0xC3/0x85
-
-# fountain
-F:15:0xC3/0x99
-
-# web
-F:16:0x81/0x8C
-
-# trap
-F:17:0x81/0x89
-
-# visible trap -- spiked pit
-F:18:0x81/0x89
-
-# visible trap -- poison pit
-F:19:0x81/0x89
-
-# visible trap -- rune -- summon
-F:20:0x81/0x8F
-
-# visible trap -- rune -- teleport
-F:21:0x81/0x92
-
-# visible trap -- spot -- fire
-F:22:0x81/0x86
-
-# visible trap -- spot -- acid
-F:23:0x81/0x86
-
-# visible trap -- dart -- slow
-F:24:0x81/0x80
-
-# visible trap -- dart -- lose str
-F:25:0x81/0x80
-
-# visible trap -- dart -- lose dex
-F:26:0x81/0x80
-
-# visible trap -- dart -- lose con
-F:27:0x81/0x80
-
-# visible trap -- gas -- blind
-F:28:0x81/0x83
-
-# visible trap -- gas -- confuse
-F:29:0x81/0x83
-
-# visible trap -- gas -- poison
-F:30:0x81/0x83
-
-# visible trap -- gas -- sleep
-F:31:0x81/0x83
-
-# door
-F:32:0x82/0x83
-
-# locked door
-F:33:0x82/0x83
-F:34:0x82/0x83
-F:35:0x82/0x83
-F:36:0x82/0x83
-F:37:0x82/0x83
-F:38:0x82/0x86
-F:39:0x82/0x86
-
-# jammed door
-F:40:0x82/0x83
-F:41:0x82/0x83
-F:42:0x82/0x83
-F:43:0x82/0x83
-F:44:0x82/0x83
-F:45:0x82/0x86
-F:46:0x82/0x86
-F:47:0x82/0x86
-
-# secret door
-F:48:0x80/0x84
-
-# pile of rubble
-F:49:0x80/0x9C
-
-# magma vein
-F:50:0x80/0x8D
-
-# quartz vein
-F:51:0x80/0x87
-
-# magma vein
-F:52:0x80/0x90
-
-# quartz vein
-F:53:0x80/0x87
-
-# magma vein with treasure
-F:54:0x80/0x90
-
-# quartz vein with treasure
-F:55:0x80/0x8A
-
-# granite wall
-F:56:0x80/0x84
-F:57:0x80/0x84
-F:58:0x80/0x84
-F:59:0x80/0x84
-
-# permanent wall
-F:60:0x80/0x93
-F:61:0x80/0x93
-F:62:0x80/0x93
-F:63:0x80/0x93
-
-# explosive rune
-F:64:0x8D/0x9E
-
-# Straight Road startpoint
-F:65:0x81/0x95
-
-# section of the Straight Road
-F:66:0x81/0x95
-F:67:0x81/0x95
-F:68:0x81/0x95
-F:69:0x81/0x95
-F:70:0x81/0x95
-
-# section of the Straight Road (discharged)
-F:71:0x81/0x98
-
-# Straight Road exit
-F:72:0x81/0x9B
-
-# corrupted section of the Straight Road
-F:73:0x81/0x9E
-
-# Building
-F:74:0x82/0x93
-
-# permanent wall
-F:75:0x82/0x93
-F:76:0x82/0x94
-F:77:0x82/0x95
-F:78:0x82/0x96
-
-# stream of shallow water
-F:84:0xB4/0x97
-
-# pool of deep lava
-F:85:0x83/0x8D
-
-# stream of shallow lava
-F:86:0xB4/0x9A
-
-# dark pit
-F:87:0x80/0x80
-
-# dirt
-F:88:0xB4/0x91
-
-# patch of grass
-F:89:0xB4/0x94
-
-# ice
-F:90:0xC3/0x83
-
-# sand
-F:91:0xC3/0x88
-
-# dead tree
-F:92:0xC3/0x98
-
-# ash
-F:93:0xC3/0x97
-
-# mud
-F:94:0xC3/0x96
-
-# ice wall
-F:95:0xC5/0x92
-
-# tree
-F:96:0x82/0x9A
-
-# mountain chain
-F:97:0x8D/0x98
-
-# sandwall
-F:98:0xC3/0x86
-F:99:0xC3/0x86
-
-# sandwall with treasure
-F:100:0xC3/0x87
-
-# high mountain chain
-F:101:0xC3/0x9E
-
-# nether mist
-F:102:0xC3/0x9F
-
-# molten glass wall
-F:103:0xC0/0x9F
-
-# Void Jumpgate
-F:160:0x91/0x84
-
-# Altar of Being
-F:161:0xC1/0x8E
-
-# Altar of Winds
-F:162:0xB5/0x8A
-
-# Altar of Force
-F:163:0xB5/0x86
-
-# Altar of Darkness
-F:164:0xB5/0x86
-
-# Altar of Nature
-F:165:0xB5/0x91
-
-# Altar of Sun
-F:166:0xB5/0x8F
-
-# Altar of Rage
-F:167:0xB5/0x8C
-
-# Altar of Winds
-F:168:0xB5/0x92
-
-# Altar of Stars
-F:169:0xC1/0x8F
-
-# Altar of Being
-F:170:0xB5/0x8D
-
-# Altar of Randomness
-F:171:0xB5/0x88
-
-# floor
-F:172:0x80/0x81
-
-# Underground Tunnel
-F:173:0x80/0x82
-
-# stream of tainted water
-F:174:0xAF/0x8E
-
-# monster trap
-F:175:0x81/0x9C
-
-# Void Jumpgate
-F:176:0xAF/0x8C
-
-# lava wall
-F:177:0xC6/0x8C
-
-# Great Fire
-F:178:0xC6/0x8A
-
-# path to the next area
-F:179:0x88/0xA1
-
-# path to the previous area
-F:180:0x88/0xA0
-
-# field
-F:181:0x88/0xA2
-
-# Ekkaia, the Encircling Sea
-F:182:0x88/0xA3
-
-# Altar of Energy
-F:183:0xB5/0x9A
-
-# Altar of Matter
-F:184:0xB5/0x9B
-
-# Altar of Being
-F:185:0xB5/0x9C
-
-# Altar of Unbeing
-F:186:0xB5/0x9D
-
-# pool of deep water
-F:187:0x83/0x80
-
-# glass wall
-F:188:0xC0/0x9F
-
-# illusion wall
-F:189:0x80/0x84
-
-# Grass roof
-F:190:0xC2/0x80
-
-# grass roof top
-F:191:0xC2/0x81
-
-# grass roof chimney
-F:192:0xC2/0x82
-
-# brick roof
-F:193:0xC3/0x80
-
-# brick roof top
-F:194:0xC3/0x81
-
-# brick roof chimney
-F:195:0xC3/0x82
-
-# window
-F:196:0xC2/0x83
-
-# small window
-F:197:0xC2/0x84
-
-# rain barrel
-F:198:0xC2/0x85
-
-# grass with flowers
-F:199:0xC2/0x86
-
-# cobblestone road
-F:200:0xC2/0x87
-
-# cobblestone with outlet
-F:201:0xC2/0x88
-
-# small tree
-F:202:0x82/0x9D
-
-# town
-F:203:0xC3/0x95
-
-# Underground Tunnel
-F:204:0x80/0x82
-
-# a blazing fire
-F:205:0xC6/0x8A
-
-# pile of rubble
-F:206:0xC6/0x8B
-
-# ethereal wall
-F:214:0x80/0x81
-
-# glacial wall
-F:215:0xC5/0x92
-
-# Skeleton
-G:M:1:0xC6/0x91
-
-# Zombie
-G:M:2:0xC6/0x92
-
-# Lich
-G:M:3:0xC6/0x93
-
-# Spectral
-G:M:4:0xC6/0x94
-
-# Captain
-G:M:5:0xC6/0x95
-
-# Chieftain
-G:M:6:0xC6/0x96
-
-# Shaman
-G:M:7:0xC6/0x97
-
-# Priest
-G:M:8:0xC6/0x98
-
-# Mage
-G:M:9:0xC6/0x99
-
-# Archer
-G:M:10:0xC6/0x9A
-
-# Rogue
-G:M:11:0xC6/0x9B
-
-# Vampire
-G:P:1:0x88/0xA4
-
-# Spectre
-G:P:2:0x88/0xA5
-
-# Skeleton
-G:P:3:0xC6/0x91
-
-# Zombie
-G:P:4:0xC6/0x92
-
-# Barbarian
-G:P:5:0x88/0xA6
-
-# Hermit
-G:P:6:0x88/0xA7
-
-# Corrupted
-G:P:7:0x88/0xA8
-
-# LostSoul
-G:P:8:0x88/0xA9
-
-# something
-K:0:0x01/0x20
-
-# Blindness
-K:1:0x85/0x94
-
-# Paranoia
-K:2:0x85/0x94
-
-# Confusion
-K:3:0x85/0x94
-
-# Hallucination
-K:4:0x85/0x94
-
-# Cure Poison
-K:5:0x85/0x94
-
-# Cure Blindness
-K:6:0x85/0x94
-
-# Cure Paranoia
-K:7:0xC6/0x83
-
-# Cure Confusion
-K:8:0x85/0x94
-
-# Weakness
-K:9:0x85/0x94
-
-# Unhealth
-K:10:0x85/0x94
-
-# Restore Constitution
-K:11:0x85/0x94
-
-# Restoring
-K:12:0x85/0x94
-
-# Stupidity
-K:13:0x85/0x94
-
-# Naivety
-K:14:0x85/0x94
-
-# Poison
-K:15:0x85/0x94
-
-# Sickness
-K:16:0x85/0x94
-
-# Paralysis
-K:17:0x85/0x94
-
-# Restore Strength
-K:18:0x85/0x94
-
-# Disease
-K:19:0x85/0x94
-
-# Cure Serious Wounds
-K:20:0x85/0x94
-
-# & Ration~ of Food
-K:21:0x8E/0x84
-
-# & Hard Biscuit~
-K:22:0x8E/0x82
-
-# & Strip~ of Venison
-K:23:0x8E/0x83
-
-# & Slime Mold~
-K:24:0x8E/0x85
-
-# & Lembas~
-K:25:0x8E/0x86
-
-# & Pint~ of Fine Ale
-K:26:0x8E/0x80
-
-# & Pint~ of Fine Wine
-K:27:0x8E/0x80
-
-# & Mattock~
-K:28:0xB6/0x8C
-
-# & Blue Stone~
-K:29:0xC5/0x93
-
-# & Broken Dagger~
-K:30:0x8A/0x8D
-
-# & Bastard Sword~
-K:31:0x8A/0x8E
-
-# & Scimitar~
-K:32:0x8A/0x97
-
-# & Tulwar~
-K:33:0x8A/0x95
-
-# & Broad Sword~
-K:34:0x8A/0x98
-
-# & Short Sword~
-K:35:0x8A/0x94
-
-# & Blade~ of Chaos
-K:36:0x8A/0x9E
-
-# & Two-Handed Sword~
-K:37:0x8A/0x9C
-
-# & Main Gauche~
-K:38:0x8A/0x90
-
-# & Cutlass~
-K:39:0x8A/0x96
-
-# & Executioner's Sword~
-K:40:0x8A/0x9D
-
-# & Katana~
-K:41:0x8A/0x9B
-
-# & Long Sword~
-K:42:0x8A/0x99
-
-# & Dagger~
-K:43:0x8A/0x8F
-
-# & Rapier~
-K:44:0x8A/0x91
-
-# & Sabre~
-K:45:0x8A/0x93
-
-# & Small Sword~
-K:46:0x8A/0x92
-
-# & Broken Sword~
-K:47:0x8A/0x8E
-
-# & Ball-and-Chain~
-K:48:0x8B/0x86
-
-# & Whip~
-K:49:0x8A/0x9F
-
-# & Flail~
-K:50:0x8B/0x83
-
-# & Two-Handed Flail~
-K:51:0x8B/0x87
-
-# & Morning Star~
-K:52:0x8B/0x84
-
-# & Mace~
-K:53:0x8B/0x81
-
-# & Quarterstaff~
-K:54:0x8B/0x82
-
-# & War Hammer~
-K:55:0x8B/0x80
-
-# & Lead-Filled Mace~
-K:56:0x8B/0x85
-
-# & Mace~ of Disruption
-K:57:0x8B/0x88
-
-# & Lucerne Hammer~
-K:58:0x8B/0x8D
-
-# & Beaked Axe~
-K:59:0x8B/0x90
-
-# & Glaive~
-K:60:0x8B/0x92
-
-# & Halberd~
-K:61:0x8B/0x93
-
-# & Awl-Pike~
-K:62:0x8B/0x8B
-
-# & Pike~
-K:63:0x8B/0x8F
-
-# & Spear~
-K:64:0x8B/0x89
-
-# & Trident~
-K:65:0x8B/0x8A
-
-# & Lance~
-K:66:0x8B/0x8C
-
-# & Great Axe~
-K:67:0x8B/0x95
-
-# & Battle Axe~
-K:68:0x8B/0x8E
-
-# & Lochaber Axe~
-K:69:0x8B/0x94
-
-# & Broad Axe~
-K:70:0x8B/0x91
-
-# & Scythe~
-K:71:0x8B/0x96
-
-# & Scythe~ of Slicing
-K:72:0x8B/0x97
-
-# & Short Bow~
-K:73:0x8B/0x98
-
-# & Long Bow~
-K:74:0x8B/0x99
-
-# & Light Crossbow~
-K:75:0x8B/0x9A
-
-# & Heavy Crossbow~
-K:76:0x8B/0x9B
-
-# & Sling~
-K:77:0x8B/0x9C
-
-# & Arrow~
-K:78:0x8C/0x80
-
-# & Seeker Arrow~
-K:79:0x8C/0x81
-
-# & Bolt~
-K:80:0x8C/0x82
-
-# & Seeker Bolt~
-K:81:0x8C/0x83
-
-# & Rounded Pebble~
-K:82:0x8C/0x84
-
-# & Iron Shot~
-K:83:0x8C/0x85
-
-# & Shovel~
-K:84:0x8E/0x8F
-
-# & Gnomish Shovel~
-K:85:0x8E/0x90
-
-# & Dwarven Shovel~
-K:86:0x8E/0x91
-
-# & Pick~
-K:87:0x8E/0x8C
-
-# & Orcish Pick~
-K:88:0x8E/0x8D
-
-# & Dwarven Pick~
-K:89:0x8E/0x91
-
-# & Elven Cloak~
-K:90:0x89/0x89
-
-# & Pair~ of Soft Leather Boots
-K:91:0x88/0x8E
-
-# & Pair~ of Hard Leather Boots
-K:92:0x88/0x8F
-
-# & Pair~ of Metal Shod Boots
-K:93:0x88/0x90
-
-# & Hard Leather Cap~
-K:94:0x87/0x98
-
-# & Metal Cap~
-K:95:0x87/0x99
-
-# & Iron Helm~
-K:96:0x87/0x9A
-
-# & Steel Helm~
-K:97:0x87/0x9B
-
-# & Iron Crown~
-K:98:0x87/0x9C
-
-# & Golden Crown~
-K:99:0x87/0x9D
-
-# & Jewel Encrusted Crown~
-K:100:0x87/0x9E
-
-# & Robe~
-K:101:0x89/0x8C
-
-# & Filthy Rag~
-K:102:0x89/0x8B
-
-# Soft Leather Armour~
-K:103:0x89/0x8D
-
-# Soft Studded Leather~
-K:104:0x89/0x8E
-
-# Hard Leather Armour~
-K:105:0x89/0x8F
-
-# Hard Studded Leather~
-K:106:0x89/0x90
-
-# Leather Scale Mail~
-K:107:0x89/0x91
-
-# Metal Scale Mail~
-K:108:0x89/0x92
-
-# Chain Mail~
-K:109:0x89/0x94
-
-# Rusty Chain Mail~
-K:110:0x89/0x93
-
-# Augmented Chain Mail~
-K:111:0x89/0x96
-
-# Bar Chain Mail~
-K:112:0x89/0x97
-
-# Metal Brigandine Armour~
-K:113:0x89/0x98
-
-# Partial Plate Armour~
-K:114:0x89/0x99
-
-# Metal Lamellar Armour~
-K:115:0x89/0x9A
-
-# Full Plate Armour~
-K:116:0x89/0x9B
-
-# Ribbed Plate Armour~
-K:117:0x89/0x9C
-
-# Adamantite Plate Mail~
-K:118:0x89/0x9F
-
-# Mithril Plate Mail~
-K:119:0x89/0x9E
-
-# Mithril Chain Mail~
-K:120:0x89/0x9D
-
-# Double Chain Mail~
-K:121:0x89/0x95
-
-# & Shield~ of Deflection
-K:122:0x88/0x98
-
-# & Cloak~
-K:123:0x89/0x88
-
-# & Shadow Cloak~
-K:124:0x89/0x89
-
-# & Set~ of Leather Gloves
-K:125:0x88/0x91
-
-# & Set~ of Gauntlets
-K:126:0x88/0x92
-
-# & Set~ of Cesti
-K:127:0x88/0x93
-
-# & Small Leather Shield~
-K:128:0x88/0x94
-
-# & Large Leather Shield~
-K:129:0x88/0x95
-
-# & Small Metal Shield~
-K:130:0x88/0x96
-
-# & Large Metal Shield~
-K:131:0x88/0x97
-
-# Strength
-K:132:0x84/0x81
-
-# Dexterity
-K:133:0x84/0x83
-
-# Constitution
-K:134:0x84/0x83
-
-# Intelligence
-K:135:0x84/0x83
-
-# Speed
-K:136:0x84/0x83
-
-# Searching
-K:137:0x84/0x83
-
-# Teleportation
-K:138:0x84/0x83
-
-# Slow Digestion
-K:139:0x84/0x83
-
-# Fire Resistance
-K:140:0x84/0x83
-
-# Cold Resistance
-K:141:0x84/0x83
-
-# Levitation
-K:142:0x84/0x83
-
-# Poison Resistance
-K:143:0x84/0x83
-
-# Free Action
-K:144:0x84/0x83
-
-# Weakness
-K:145:0x84/0x83
-
-# Flames
-K:146:0x84/0x83
-
-# Acid
-K:147:0x84/0x83
-
-# Ice
-K:148:0x84/0x83
-
-# Woe
-K:149:0x84/0x83
-
-# Stupidity
-K:150:0x84/0x83
-
-# Damage
-K:151:0x84/0x83
-
-# Accuracy
-K:152:0x84/0x83
-
-# Protection
-K:153:0x84/0x83
-
-# Aggravate Monster
-K:154:0x84/0x83
-
-# See Invisible
-K:155:0x84/0x83
-
-# Sustain Strength
-K:156:0x84/0x83
-
-# Sustain Intelligence
-K:157:0x84/0x83
-
-# Sustain Wisdom
-K:158:0x84/0x83
-
-# Sustain Constitution
-K:159:0x84/0x83
-
-# Sustain Dexterity
-K:160:0x84/0x83
-
-# Sustain Charisma
-K:161:0x84/0x83
-
-# Slaying
-K:162:0x84/0x83
-
-# Brilliance
-K:163:0x87/0x83
-
-# Charisma
-K:164:0x87/0x83
-
-# Searching
-K:165:0x87/0x83
-
-# Teleportation
-K:166:0x87/0x83
-
-# Slow Digestion
-K:167:0x87/0x83
-
-# Acid Resistance
-K:168:0x87/0x83
-
-# Adornment
-K:169:0x87/0x83
-
-# Double Ring Mail~
-K:170:0x89/0x9B
-
-# the Magi
-K:171:0x87/0x83
-
-# Doom
-K:172:0x87/0x83
-
-# Enchant Weapon To-Hit
-K:173:0x83/0x9C
-
-# Enchant Weapon To-Dam
-K:174:0x83/0x9C
-
-# Enchant Armor
-K:175:0x83/0x9C
-
-# Identify
-K:176:0x83/0x9C
-
-# *Identify*
-K:177:0x83/0x9C
-
-# Rumour
-K:178:0x83/0x9C
-
-# Chaos
-K:179:0x83/0x9C
-
-# Remove Curse
-K:180:0x83/0x9C
-
-# Light
-K:181:0x83/0x9C
-
-# Fire
-K:182:0x83/0x9C
-
-# Ice
-K:183:0x83/0x9C
-
-# Summon Monster
-K:184:0x83/0x9C
-
-# Phase Door
-K:185:0x83/0x9C
-
-# Teleportation
-K:186:0x83/0x9C
-
-# Teleport Level
-K:187:0x83/0x9C
-
-# Monster Confusion
-K:188:0x83/0x9C
-
-# Magic Mapping
-K:189:0x83/0x9C
-
-# Rune of Protection
-K:190:0x83/0x9C
-
-# *Remove Curse*
-K:191:0x83/0x9C
-
-# Treasure Detection
-K:192:0x83/0x9C
-
-# Object Detection
-K:193:0x83/0x9C
-
-# Trap Detection
-K:194:0x83/0x9C
-
-# & Sheaf Arrow~
-K:195:0x8C/0x81
-
-# & Mithril Shot~
-K:196:0x8C/0x85
-
-# Door
-K:197:0x83/0x9C
-
-# Acquirement
-K:198:0x83/0x9C
-
-# *Acquirement*
-K:199:0x83/0x9C
-
-# Mass Genocide
-K:200:0x83/0x9C
-
-# Detect Invisible
-K:201:0x83/0x9C
-
-# Aggravate Monster
-K:202:0x83/0x9C
-
-# Trap Creation
-K:203:0x83/0x9C
-
-# Trap
-K:204:0x83/0x9C
-
-# Artifact Creation
-K:205:0x83/0x9C
-
-# Recharging
-K:206:0x83/0x9C
-
-# Genocide
-K:207:0x83/0x9C
-
-# Darkness
-K:208:0x83/0x9C
-
-# Protection from Evil
-K:209:0x83/0x9C
-
-# Satisfy Hunger
-K:210:0x83/0x9C
-
-# Dispel Undead
-K:211:0x83/0x9C
-
-# *Enchant Weapon*
-K:212:0x83/0x9C
-
-# Curse Weapon
-K:213:0x83/0x9C
-
-# *Enchant Armor*
-K:214:0x83/0x9C
-
-# Curse Armor
-K:215:0x83/0x9C
-
-# Summon Undead
-K:216:0x83/0x9C
-
-# Blessing
-K:217:0x83/0x9C
-
-# Holy Chant
-K:218:0x83/0x9C
-
-# Holy Prayer
-K:219:0x83/0x9C
-
-# Word of Recall
-K:220:0x83/0x9C
-
-# *Destruction*
-K:221:0x83/0x9C
-
-# Slime Mold Juice
-K:222:0x85/0x85
-
-# Apple Juice
-K:223:0x85/0x85
-
-# Water
-K:224:0x85/0x85
-
-# Strength
-K:225:0x85/0x85
-
-# Weakness
-K:226:0x85/0x85
-
-# Restore Strength
-K:227:0x85/0x85
-
-# Intelligence
-K:228:0x85/0x85
-
-# Stupidity
-K:229:0x85/0x85
-
-# Restore Intelligence
-K:230:0x85/0x85
-
-# Wisdom
-K:231:0x85/0x85
-
-# Naivety
-K:232:0x85/0x85
-
-# Restore Wisdom
-K:233:0x85/0x85
-
-# Charisma
-K:234:0x85/0x85
-
-# Ugliness
-K:235:0x85/0x85
-
-# Restore Charisma
-K:236:0x85/0x85
-
-# Curing
-K:237:0x85/0x85
-
-# Invulnerability
-K:238:0x85/0x85
-
-# New Life
-K:239:0x85/0x85
-
-# Cure Serious Wounds
-K:240:0x85/0x85
-
-# Cure Critical Wounds
-K:241:0x85/0x85
-
-# Healing
-K:242:0x85/0x85
-
-# Constitution
-K:243:0x85/0x85
-
-# Experience
-K:244:0x85/0x85
-
-# Sleep
-K:245:0x85/0x85
-
-# Blindness
-K:246:0x85/0x85
-
-# Booze
-K:247:0x85/0x85
-
-# Poison
-K:248:0x85/0x85
-
-# Speed
-K:249:0x85/0x85
-
-# Slowness
-K:250:0x85/0x85
-
-# Dexterity
-K:251:0x85/0x85
-
-# Restore Dexterity
-K:252:0x85/0x85
-
-# Restore Constitution
-K:253:0x85/0x85
-
-# Lose Memories
-K:254:0x85/0x85
-
-# Salt Water
-K:255:0x85/0x85
-
-# Enlightenment
-K:256:0x85/0x85
-
-# Heroism
-K:257:0x85/0x85
-
-# Berserk Strength
-K:258:0x85/0x85
-
-# Boldness
-K:259:0x85/0x85
-
-# Restore Life Levels
-K:260:0x85/0x85
-
-# Resist Heat
-K:261:0x85/0x85
-
-# Resist Cold
-K:262:0x85/0x85
-
-# Detect Invisible
-K:263:0x85/0x85
-
-# Slow Poison
-K:264:0x85/0x85
-
-# Neutralise Poison
-K:265:0x85/0x85
-
-# Restore Mana
-K:266:0x85/0x85
-
-# Infra-vision
-K:267:0x85/0x85
-
-# Resistance
-K:268:0x85/0x85
-
-# Spell
-K:269:0x86/0x93
-
-# Manathrust
-K:270:0x86/0x93
-
-# Fireflash
-K:271:0x86/0x93
-
-# Firewall
-K:272:0x86/0x93
-
-# Tidal Wave
-K:273:0x86/0x93
-
-# Ice Storm
-K:274:0x86/0x93
-
-# Noxious Cloud
-K:275:0x86/0x93
-
-# Poison Blood
-K:276:0x86/0x93
-
-# Thunderstorm
-K:277:0x86/0x93
-
-# Dig
-K:278:0x86/0x93
-
-# Stone Prison
-K:279:0x86/0x93
-
-# Strike
-K:280:0x86/0x93
-
-# Teleport Away
-K:281:0x86/0x93
-
-# Summon Animal
-K:282:0x86/0x93
-
-# Magelock
-K:283:0x86/0x93
-
-# Slow Monster
-K:284:0x86/0x93
-
-# Essence of Speed
-K:285:0xB7/0x8C
-
-# Banishment
-K:286:0x86/0x93
-
-# Disperse Magic
-K:287:0x86/0x93
-
-# Charm
-K:288:0x86/0x93
-
-# Confuse
-K:289:0x86/0x93
-
-# Demon Blade
-K:290:0x86/0x93
-
-# Heal Monster
-K:291:0x86/0x93
-
-# Haste Monster
-K:292:0x86/0x93
-
-# & Flight Arrow~
-K:293:0x8C/0x81
-
-# Acid Bolts
-K:294:0x86/0x93
-
-# Dragon's Flame
-K:295:0x86/0x93
-
-# Dragon's Frost
-K:296:0x86/0x93
-
-# Dragon's Breath
-K:297:0x86/0x93
-
-# Annihilation
-K:298:0x86/0x93
-
-# Rockets
-K:299:0x86/0x93
-
-# Spell
-K:300:0x87/0x92
-
-# Nothing
-K:301:0x87/0x92
-
-# Globe of Light
-K:302:0x87/0x92
-
-# Fiery Shield
-K:303:0x87/0x92
-
-# Remove Curses
-K:304:0x87/0x92
-
-# Wings of Winds
-K:305:0x87/0x92
-
-# Shake
-K:306:0x87/0x92
-
-# Disarm
-K:307:0x87/0x92
-
-# Teleportation
-K:308:0x87/0x92
-
-# Probability Travel
-K:309:0x87/0x92
-
-# Recovery
-K:310:0x87/0x92
-
-# Healing
-K:311:0x87/0x92
-
-# Vision
-K:312:0x87/0x92
-
-# Identify
-K:313:0x87/0x92
-
-# Sense Hidden
-K:314:0x87/0x92
-
-# Reveal Ways
-K:315:0x87/0x92
-
-# Sense Monsters
-K:316:0x87/0x92
-
-# Genocide
-K:317:0x87/0x92
-
-# Summon
-K:318:0x87/0x92
-
-# Curing
-K:319:0x87/0x92
-
-# Wish
-K:320:0x87/0x92
-
-# Mana
-K:321:0x87/0x92
-
-# Darkness
-K:322:0x87/0x92
-
-# Genocide
-K:323:0x87/0x92
-
-# Power
-K:324:0x87/0x92
-
-# the Magi
-K:325:0x87/0x92
-
-# Perception
-K:326:0x87/0x92
-
-# Holiness
-K:327:0x87/0x92
-
-# Enlightenment
-K:328:0x87/0x92
-
-# Healing
-K:329:0x87/0x92
-
-# & Tome~ of Magical Energy
-K:330:0x90/0xA0
-
-# & Tome~ of the Eternal Flame
-K:331:0x90/0xA1
-
-# & Tome~ of the Blowing Wind
-K:332:0x90/0xA2
-
-# & Tome~ of the Impenetrable Earth
-K:333:0x90/0xA3
-
-# & Tome~ of the Everrunning Wave
-K:334:0x90/0xA4
-
-# & Tome~ of Translocation
-K:335:0x90/0xA5
-
-# & Tome~ of the Tree
-K:336:0x90/0xA6
-
-# & Tome~ of Knowledge
-K:337:0x90/0xA7
-
-# & Small wooden chest~
-K:338:0x84/0x99
-
-# & Large wooden chest~
-K:339:0x84/0x9A
-
-# & Small iron chest~
-K:340:0x84/0x9B
-
-# & Large iron chest~
-K:341:0x84/0x9C
-
-# & Small steel chest~
-K:342:0x84/0x9D
-
-# & Large steel chest~
-K:343:0x84/0x9E
-
-# & Ruined chest~
-K:344:0x84/0x9F
-
-# & Iron Spike~
-K:345:0x8E/0x89
-
-# & Wooden Torch~
-K:346:0x8E/0x8B
-
-# & Brass Lantern~
-K:347:0x8E/0x8A
-
-# & Flask~ of oil
-K:348:0x8E/0x88
-
-# & Empty Bottle~
-K:349:0x8E/0x87
-
-# Havoc
-K:350:0x86/0x83
-
-# Door
-K:351:0x86/0x83
-
-# Trap Location
-K:352:0x86/0x83
-
-# Probing
-K:353:0x86/0x83
-
-# Recall
-K:354:0x86/0x83
-
-# Illumination
-K:355:0x86/0x83
-
-# Light
-K:356:0x86/0x83
-
-# Lightning Bolts
-K:357:0x86/0x83
-
-# Frost Bolts
-K:358:0x86/0x83
-
-# Fire Bolts
-K:359:0x86/0x83
-
-# Polymorph
-K:360:0x86/0x83
-
-# Slow Monster
-K:361:0x86/0x83
-
-# Sleep Monster
-K:362:0x86/0x83
-
-# Drain Life
-K:363:0x86/0x83
-
-# Teleport Other
-K:364:0x86/0x83
-
-# Disarming
-K:365:0x86/0x83
-
-# Lightning Balls
-K:366:0x86/0x83
-
-# Cold Balls
-K:367:0x86/0x83
-
-# Fire Balls
-K:368:0x86/0x83
-
-# Acid Balls
-K:369:0x86/0x83
-
-# Acid Bolts
-K:370:0x86/0x83
-
-# Enlightenment
-K:371:0x86/0x83
-
-# Perception
-K:372:0x86/0x83
-
-# Curing
-K:373:0x86/0x83
-
-# Healing
-K:374:0x86/0x83
-
-# Detection
-K:375:0x86/0x83
-
-# Restoration
-K:376:0x86/0x83
-
-# Speed
-K:377:0x86/0x83
-
-# Spell
-K:378:0xC1/0x84
-K:379:0x8D/0x80
-
-# [Beings of Darkness]
-K:380:0x8D/0x81
-
-# [Material Shadow]
-K:381:0x8D/0x82
-
-# [Nature's Wrath]
-K:382:0x8D/0x83
-
-# [Sign of Chaos]
-K:383:0x8C/0x98
-
-# [Chaos Mastery]
-K:384:0x8C/0x99
-
-# [Chaos Channels]
-K:385:0x8C/0x9A
-
-# [Armageddon Tome]
-K:386:0x8C/0x9B
-
-# [Nether Openings]
-K:387:0x8D/0x88
-
-# [Unholy Blessings]
-K:388:0x8D/0x89
-
-# & Firestone~
-K:389:0x8E/0x92
-
-# & Small Firestone~
-K:390:0x8E/0x93
-
-# & Broken Skull~
-K:391:0x8E/0x94
-
-# & Broken Bone~
-K:392:0x8E/0x95
-
-# & Canine Skeleton~
-K:393:0x8E/0x9A
-
-# & Rodent Skeleton~
-K:394:0x8E/0x9B
-
-# & Human Skeleton~
-K:395:0x8E/0x96
-
-# & Dwarf Skeleton~
-K:396:0x8E/0x98
-
-# & Elf Skeleton~
-K:397:0x8E/0x97
-
-# & Gnome Skeleton~
-K:398:0x8E/0x99
-
-# & Great Hammer~
-K:399:0xB6/0x8A
-
-# Black Dragon Scale Mail~
-K:400:0x8A/0x82
-
-# Blue Dragon Scale Mail~
-K:401:0x8A/0x80
-
-# White Dragon Scale Mail~
-K:402:0x8A/0x81
-
-# Red Dragon Scale Mail~
-K:403:0x8A/0x83
-
-# Green Dragon Scale Mail~
-K:404:0x8A/0x84
-
-# Multi-Hued Dragon Scale Mail~
-K:405:0x8A/0x8B
-
-# Pseudo Dragon Scale Mail~
-K:406:0x8A/0x87
-
-# Law Dragon Scale Mail~
-K:407:0x8A/0x89
-
-# Bronze Dragon Scale Mail~
-K:408:0x8A/0x85
-
-# Gold Dragon Scale Mail~
-K:409:0x8A/0x86
-
-# Chaos Dragon Scale Mail~
-K:410:0x8A/0x88
-
-# Balance Dragon Scale Mail~
-K:411:0x8A/0x8A
-
-# Power Dragon Scale Mail~
-K:412:0x8A/0x8C
-
-# & Dragon Helm~
-K:413:0x88/0x82
-
-# & Dragon Shield~
-K:414:0x88/0x9C
-
-# Death
-K:415:0x85/0x85
-
-# Ruination
-K:416:0x85/0x85
-
-# Detonations
-K:417:0x85/0x85
-
-# Augmentation
-K:418:0x85/0x85
-
-# *Healing*
-K:419:0x85/0x85
-
-# Life
-K:420:0x85/0x85
-
-# Self Knowledge
-K:421:0x85/0x85
-
-# *Enlightenment*
-K:422:0x85/0x85
-
-# [Necromantic Incantations]
-K:423:0x8D/0x8A
-
-# [Curses of Angmar]
-K:424:0x8D/0x8B
-
-# Fear Resistance
-K:425:0x84/0x83
-
-# Light and Darkness Resistance
-K:426:0x84/0x83
-
-# Nether Resistance
-K:427:0x84/0x83
-
-# Nexus Resistance
-K:428:0x84/0x83
-
-# Sound Resistance
-K:429:0x84/0x83
-
-# Confusion Resistance
-K:430:0x84/0x83
-
-# Shard Resistance
-K:431:0x84/0x83
-
-# Disenchantment Resistance
-K:432:0x84/0x83
-
-# Chaos Resistance
-K:433:0x84/0x83
-
-# Blindness Resistance
-K:434:0x84/0x83
-
-# Lordly Protection
-K:435:0x84/0x83
-
-# Extra Attacks
-K:436:0x84/0x83
-
-# Cure Light Wounds
-K:437:0x85/0x85
-
-# Clumsiness
-K:438:0x85/0x85
-
-# Sickliness
-K:439:0x85/0x85
-
-# Map of Bree
-K:440:0xC4/0x80
-
-# Map of Gondolin
-K:441:0xC4/0x80
-
-# Map of Lothlorien
-K:442:0xC4/0x80
-
-# Map of Minas Anor
-K:443:0xC4/0x80
-
-# & Silver Arrow~
-K:465:0xC6/0x81
-
-# & Silver Bolt~
-K:466:0xC6/0x82
-
-# Lightning Resistance
-K:467:0x87/0x80
-
-# Wisdom
-K:468:0x87/0x80
-
-# Regeneration
-K:469:0x87/0x80
-
-# Infravision
-K:470:0x87/0x80
-
-# Devotion
-K:471:0x87/0x80
-
-# Weaponmastery
-K:472:0x87/0x80
-
-# Trickery
-K:473:0x87/0x80
-
-# Telepathy
-K:474:0x87/0x80
-
-# Sustenance
-K:475:0x87/0x80
-
-# & Palantir~
-K:476:0xC6/0x87
-
-# & Elfstone~
-K:477:0xC6/0x83
-
-# & Jewel~
-K:478:0xC6/0x84
-
-# & Ring~
-K:479:0xC6/0x85
-
-# copper
-K:480:0x83/0x91
-K:481:0x83/0x91
-K:482:0x83/0x91
-
-# silver
-K:483:0x83/0x92
-K:484:0x83/0x92
-K:485:0x83/0x92
-
-# garnets
-K:486:0x83/0x96
-K:487:0x83/0x96
-
-# gold
-K:488:0x83/0x93
-K:489:0x83/0x93
-K:490:0x83/0x93
-
-# opals
-K:491:0x83/0x97
-
-# sapphires
-K:492:0x83/0x98
-
-# rubies
-K:493:0x83/0x99
-
-# diamonds
-K:494:0x83/0x9A
-
-# emeralds
-K:495:0x83/0x9B
-
-# mithril
-K:496:0x83/0x94
-
-# adamantite
-K:497:0x83/0x95
-
-# & Mighty Hammer~
-K:498:0xB6/0x8A
-
-# & Massive Iron Crown~
-K:499:0x87/0x9C
-
-# & Phial~
-K:500:0x8E/0x9D
-
-# & Star~
-K:501:0x8E/0x9E
-
-# & Arkenstone~
-K:502:0x8E/0x9F
-
-# & Amulet~
-K:503:0x84/0x96
-K:504:0x84/0x97
-
-# & Necklace~
-K:505:0x84/0x98
-
-# & Ring~
-K:506:0x84/0x8F
-K:507:0x84/0x90
-K:508:0x84/0x92
-K:509:0x84/0x93
-K:510:0x84/0x94
-K:511:0x84/0x95
-
-# [Rites of Initiation]
-K:512:0x8D/0x90
-
-# [Ways of War]
-K:513:0x8D/0x91
-
-# [Divine Retribution]
-K:514:0x8D/0x92
-
-# [Essence of Fury]
-K:515:0x8D/0x93
-
-# [Novice Crafts]
-K:516:0x8D/0x8C
-
-# [Arcane Channels]
-K:517:0x8D/0x8D
-
-# [Sigils of Wizardry]
-K:518:0x8D/0x8E
-
-# [Mana Focus]
-K:519:0x8D/0x8F
-
-# Reflection
-K:520:0x87/0x83
-
-# Anti-Magic
-K:521:0x87/0x83
-
-# Anti-Teleportation
-K:522:0x87/0x83
-
-# Resistance
-K:523:0x87/0x83
-
-# & Zweihander~
-K:524:0xB6/0x8C
-
-# & Dwarven Lantern~
-K:525:0xC5/0x94
-
-# Splint Mail~
-K:526:0x89/0x9C
-
-# & Everburning Torch~
-K:527:0xC5/0x95
-
-# & Trifurcate Spear~
-K:528:0xB6/0x85
-
-# & Three Piece Rod~
-K:529:0xB6/0x80
-
-# & Feanorian Lamp~
-K:530:0xC5/0x96
-
-# & Fur Cloak~
-K:531:0x89/0x89
-
-# Water Curing
-K:532:0xB6/0x86
-
-# & Hatchet~
-K:533:0xB6/0x8F
-
-# Rhino Hide Armour~
-K:535:0x89/0x98
-
-# Leather Jacket~
-K:536:0x89/0x8F
-
-# & Sickle~
-K:537:0xB6/0x90
-
-# [Psychoportation]
-K:538:0xB6/0x87
-
-# [Clairsentience]
-K:539:0xB6/0x91
-
-# [Telekinesis]
-K:540:0xB6/0x93
-
-# [Empathy]
-K:541:0xB6/0x92
-
-# & Club~
-K:542:0xB6/0x92
-
-# & Broad Spear~
-K:543:0xB6/0x84
-
-# & Khopesh~
-K:544:0xB6/0x94
-
-# & Flamberge~
-K:545:0xB6/0x83
-
-# & Claymore~
-K:546:0xB6/0x8D
-
-# & Espadon~
-K:547:0xB6/0x8E
-
-# & Great Scimitar~
-K:548:0xB6/0x8B
-
-# Arrow
-K:549:0x8E/0xA0
-
-# Bolt
-K:550:0x8E/0xA1
-
-# & Fauchard~
-K:551:0xB6/0x95
-
-# & Guisarme~
-K:552:0xB6/0x96
-
-# & Heavy Lance~
-K:553:0xB6/0x82
-
-# & Basillard~
-K:554:0xB6/0x99
-
-# Catapult
-K:555:0x8E/0xA2
-
-# Ring Mail~
-K:556:0x89/0x9C
-
-# Cord Armour~
-K:557:0x89/0x90
-
-# Paper Armour~
-K:558:0x8A/0x81
-
-# Padded Armour~
-K:559:0x89/0x91
-
-# Fumes
-K:560:0x8E/0xA3
-
-# Stone and Hide Armour~
-K:561:0x89/0x97
-
-# Magic
-K:562:0x8E/0xA4
-
-# Device
-K:563:0x8E/0xA5
-
-# Nothing
-K:564:0xC6/0x9C
-
-# Poison
-K:565:0xB7/0x80
-
-# Nothing
-K:566:0xC6/0x9C
-K:567:0xC6/0x9C
-K:568:0xC6/0x9C
-K:569:0xC6/0x9C
-
-# Explosion
-K:570:0xB7/0x81
-
-# Teleport
-K:571:0xB7/0x82
-
-# Nothing
-K:572:0xC6/0x9C
-
-# & Blood~ of Life
-K:573:0x85/0x85
-
-# Cold
-K:574:0xB7/0x83
-
-# Fire
-K:575:0xB7/0x84
-
-# Acid
-K:576:0xB7/0x85
-
-# & Mage Staff~
-K:577:0xB8/0x80
-
-# Lightning
-K:578:0x84/0x80
-
-# Life
-K:579:0xB7/0x86
-
-# Confusion
-K:580:0xB7/0x87
-
-# Light
-K:581:0xB7/0x88
-
-# & Ring~
-K:582:0x84/0x85
-
-# Invisibility
-K:583:0x85/0x85
-
-# Chaos
-K:584:0xB7/0x89
-
-# Corruption
-K:585:0x85/0x85
-
-# Invisibility
-K:586:0x85/0x85
-
-# Time
-K:587:0xB7/0x8A
-
-# Deep Thoughts
-K:588:0x83/0x9C
-
-# More Deep Thoughts
-K:589:0x83/0x9D
-
-# Compendium of Deep Thoughts
-K:590:0x83/0x9E
-
-# Artifact Lore Vol. I
-K:591:0x83/0x9C
-
-# Artifact Lore Vol. II
-K:592:0x83/0x9D
-
-# Artifact Lore Vol. III
-K:593:0x83/0x9F
-
-# Monstrous Compendium 1
-K:594:0x83/0x9F
-
-# Monstrous Compendium 2
-K:595:0x83/0x9E
-
-# Monstrous Compendium 3
-K:596:0x83/0x9D
-
-# Monstrous Compendium 4
-K:597:0x83/0x9C
-
-# Monstrous Compendium 5
-K:598:0x83/0x9F
-
-# Monstrous Compendium 6
-K:599:0x83/0x9E
-
-# Monstrous Compendium 7
-K:600:0x83/0x9D
-
-# Monstrous Compendium 8
-K:601:0x83/0x9C
-
-# Monstrous Compendium 9
-K:602:0x83/0x9D
-
-# Monstrous Compendium 10
-K:603:0x83/0x9E
-
-# Monstrous Compendium 11
-K:604:0x83/0x9F
-
-# Abomination
-K:605:0x85/0x85
-
-# Shape of Wolf
-K:606:0x85/0x85
-
-# Shape of Ape
-K:607:0x85/0x85
-
-# Shape of Goat
-K:608:0x85/0x85
-
-# Shape of Insect
-K:609:0x85/0x85
-
-# Shape of Sparrow
-K:610:0x85/0x85
-
-# Shape of Ent
-K:611:0x85/0x85
-
-# Shape of Vampire
-K:612:0x85/0x85
-
-# Shape of Spider
-K:613:0x85/0x85
-
-# Shape of Mana ball
-K:614:0x85/0x85
-
-# Shape of Fire cloud
-K:615:0x85/0x85
-
-# Shape of Cold cloud
-K:616:0x85/0x85
-
-# Shape of Chaos cloud
-K:617:0x85/0x85
-
-# [Wolf]
-K:618:0x8F/0xA0
-
-# [Ape]
-K:619:0x8F/0xA1
-
-# [Goat]
-K:620:0x8F/0xA2
-
-# [Insect]
-K:621:0x8F/0xA3
-
-# [Sparrow]
-K:622:0x8F/0xA4
-
-# [Ent]
-K:623:0x8F/0xA5
-
-# [Vampire]
-K:624:0x8F/0xA6
-
-# [Spider]
-K:625:0x8F/0xA7
-
-# [Mana ball]
-K:626:0x8F/0xA8
-
-# [Fire cloud]
-K:627:0x8F/0xA9
-
-# [Cold cloud]
-K:628:0x8F/0xAA
-
-# [Chaos Cloud]
-K:629:0x8F/0xAB
-
-# [Ghost]
-K:630:0x8F/0xAC
-
-# [Kobold]
-K:631:0x8F/0xAD
-
-# [Dragon]
-K:632:0x8F/0xAE
-
-# [Demon]
-K:633:0x8F/0xAF
-
-# [Hound]
-K:634:0x8F/0xB0
-
-# [Quylthulg]
-K:635:0x8F/0xB1
-
-# [Maia]
-K:636:0x8F/0xB2
-
-# [Serpent]
-K:637:0x8F/0xB3
-
-# [Giant]
-K:638:0x8F/0xB4
-
-# [Vala]
-K:639:0x8F/0xB5
-
-# Magic
-K:640:0xB7/0x8B
-
-# corpse
-K:641:0xB8/0x81
-
-# skeleton
-K:642:0x8E/0x96
-
-# head
-K:643:0x8E/0x94
-
-# skull
-K:644:0x8E/0x94
-
-# raw meat
-K:645:0x8E/0x83
-
-# & Thunderlord Coat~
-K:646:0x8A/0x86
-
-# & Stone~
-K:647:0x8E/0x9C
-
-# & small wooden Boomerang~
-K:648:0xB8/0x82
-
-# & wooden Boomerang~
-K:649:0xB8/0x83
-
-# & small metal Boomerang~
-K:650:0xB8/0x84
-
-# & metal Boomerang~
-K:651:0xB8/0x85
-
-# & Anchor~
-K:652:0x8D/0x9E
-
-# & ~
-K:653:0xC6/0x9C
-
-# Summon never-moving pet
-K:654:0x83/0x9D
-
-# [Life in symbiosis]
-K:655:0xB8/0x86
-
-# [Perfect Symbiosis]
-K:656:0xB8/0x86
-
-# Cure Light Insanity
-K:657:0x85/0x85
-
-# Cure Serious Insanity
-K:658:0x85/0x85
-
-# Cure Critical Insanity
-K:659:0x85/0x85
-
-# Cure Insanity
-K:660:0x85/0x85
-
-# & Phial~
-K:661:0x8E/0x9D
-
-# Random Artifact
-K:662:0xC6/0x9C
-
-# Craftmanship
-K:663:0x83/0x9F
-
-# The One Ring
-K:664:0x83/0x9E
-
-# & Book~ of the Lays of the Heroes
-K:665:0xB8/0x87
-
-# & Book~ of Sound Patterns
-K:666:0xB8/0x87
-
-# [Harps of Rivendell]
-K:667:0xB8/0x87
-
-# [Lays of Beleriand]
-K:668:0xB8/0x87
-
-# & Flute~
-K:669:0xB8/0x88
-
-# & Drum~
-K:670:0xB8/0x89
-
-# & Harp~
-K:671:0xB8/0x8A
-
-# & Banjo~
-K:672:0xB8/0x8C
-
-# & Lute~
-K:673:0xB8/0x8B
-
-# & Mandolin~
-K:674:0xB8/0x8B
-
-# & Palantir~
-K:675:0x8D/0x9F
-
-# Egg
-K:676:0xB7/0x8D
-
-# Reset Recall
-K:677:0x83/0x9D
-
-# Divination
-K:678:0x83/0x9D
-
-# Self
-K:679:0xB7/0x8E
-
-# Ray
-K:680:0xB7/0x8F
-
-# Sphere
-K:681:0xB7/0x90
-
-# Knowledge
-K:682:0xB7/0x94
-
-# Life
-K:683:0xB7/0x95
-
-# Fire
-K:684:0xB7/0x96
-
-# Cold
-K:685:0xB7/0x97
-
-# Lightning
-K:686:0xB7/0x98
-
-# Acid
-K:687:0xB7/0x99
-
-# Element
-K:688:0xB7/0x9A
-
-# Chaos
-K:689:0xB7/0x9B
-
-# Mind
-K:690:0xB7/0x9C
-
-# Holding
-K:691:0xB7/0x9D
-
-# Arrow
-K:692:0xB7/0x91
-
-# Power Surge
-K:693:0xB7/0x92
-
-# Armageddon
-K:694:0xB7/0x93
-
-# Gravity
-K:695:0xB7/0x9E
-
-# Extra Life
-K:696:0xB7/0x9F
-
-# Undeath
-K:697:0xB6/0x9B
-
-# Protection
-K:698:0xB6/0x9C
-
-# & Horn~
-K:699:0xB8/0x8D
-
-# & Ring~ of Precognition
-K:700:0x84/0x83
-
-# & Sprig~ of Athelas
-K:701:0xB8/0x8E
-
-# [Magic for Beginners]
-K:702:0xB8/0x8F
-
-# [Conjurings and Tricks]
-K:703:0xB8/0x8F
-
-# [Incantations and Illusions]
-K:704:0xB8/0x8F
-
-# [Sorcery and Evocations]
-K:705:0xB8/0x8F
-
-# [Beginners Handbook]
-K:706:0xB8/0x90
-
-# [Words of Wisdom]
-K:707:0xB8/0x90
-
-# [Chants and Blessings]
-K:708:0xB8/0x90
-
-# [Exorcism and Dispelling]
-K:709:0xB8/0x90
-
-# [Resistance of Scarabtarices]
-K:710:0xB8/0x92
-
-# [Mordenkainen's Escapes]
-K:711:0xB8/0x92
-
-# [Kelek's Grimoire of Power]
-K:712:0xB8/0x92
-
-# [Tenser's Transformations]
-K:713:0xB8/0x92
-
-# [Raal's Tome of Destruction]
-K:714:0xB8/0x92
-
-# [Ethereal Openings]
-K:715:0xB8/0x92
-
-# [Godly Insights]
-K:716:0xB8/0x91
-
-# [Purifications and Healing]
-K:717:0xB8/0x91
-
-# [Holy Infusions]
-K:718:0xB8/0x91
-
-# [Wrath of God]
-K:719:0xB8/0x91
-
-# & Old Scroll~ of Deincarnation
-K:720:0x83/0x9F
-
-# & Dark Sword~
-K:721:0xC4/0x81
-
-# Numenorean for beginners (I)
-K:722:0xC1/0x80
-
-# Numenorean for beginners (II)
-K:723:0xC1/0x81
-
-# Advanced lessons of Numenorean
-K:724:0xC1/0x80
-
-# Advanced lessons of Sindarin
-K:725:0xC1/0x81
-
-# & Shard~ of Pottery
-K:726:0x8E/0x92
-
-# & Broken Stick~
-K:727:0x8E/0x93
-
-# Wall Creation
-K:728:0x83/0x9F
-
-# [Illusions for Beginners]
-K:729:0xC1/0x82
-
-# [Tricks and Visions]
-K:730:0xC1/0x82
-
-# [Phantasms and Illusions]
-K:731:0xC1/0x82
-
-# [Shadows and Prisms]
-K:732:0xC1/0x82
-
-# [Serten's Immunities]
-K:733:0xC1/0x83
-
-# [Knowledge of Kenault]
-K:734:0xC1/0x83
-
-# [Otiluke's Spheres]
-K:735:0xC1/0x82
-
-# [Boccob's Book of Shadows]
-K:736:0xC1/0x84
-
-# [Bigby's Handbook]
-K:737:0xC1/0x84
-
-# & Book~ of Beginner Cantrips
-K:738:0xC1/0x85
-
-# & Book~ of Teleportation
-K:739:0xC1/0x86
-
-# & Book~ of Recall
-K:740:0xC1/0x87
-
-# & Book~ of Summoning
-K:741:0xC1/0x80
-
-# & Book~ of Fireflash
-K:742:0xC1/0x81
-
-# & Potion~ of Learning
-K:743:0xC1/0x82
-
-# [Eye of Sauron]
-K:744:0xC1/0x83
-
-# [Flame of Udun]
-K:745:0xC1/0x84
-
-# [Corruptions of Melkor]
-K:746:0xC1/0x85
-
-# [Crescent of Morgul]
-K:747:0xC1/0x86
-
-# [Morgoth's Ring]
-K:748:0xC1/0x87
-
-# Spell
-K:749:0x86/0x90
-
-# Wishing
-K:750:0x86/0x90
-
-# Khuzdul - The hidden tongue of the Dwarves
-K:751:0x83/0x9D
-
-# Nandorin for dummies
-K:752:0xC1/0x81
-
-# Advanced lessons of Orcish
-K:753:0xC1/0x82
-
-# & Ancient Tome~
-K:754:0xC1/0x86
-
-# Flying
-K:755:0x84/0x88
-
-# & Tome~ of the Time
-K:756:0xC1/0x80
-
-# & Tome~ of Meta Spells
-K:758:0xC1/0x81
-
-# & Tome~ of the Mind
-K:759:0xC1/0x82
-
-# & Holy Tome~ of Eru Iluvatar
-K:760:0xC1/0x83
-
-# & Holy Tome~ of Manwe Sulimo
-K:761:0xC1/0x84
-
-# & War Tome~ of Tulkas
-K:762:0xC1/0x85
-
-# & Unholy Tome~ of the Hellflame
-K:763:0xC1/0x86
-
-# & Corrupted Tome~ of Melkor
-K:764:0xC1/0x87
-
-# [Aiding Shades]
-K:765:0xC1/0x80
-
-# [Morgoth's Space-Time Warpings]
-K:766:0xC1/0x81
-
-# [Murazor's Tome of Conjuring & Dispelling]
-K:767:0xC1/0x82
-
-# & Forest Tome~ of Yavanna
-K:768:0xC1/0x83
-
-# [Sauron's Forgotten Tome]
-K:769:0xC1/0x87
-
-# & Ring~
-K:770:0x84/0x84
-
-# [Earth]
-K:771:0xC1/0x88
-
-# [Fire]
-K:772:0xC1/0x89
-
-# [Air]
-K:773:0xC1/0x8A
-
-# [Water]
-K:774:0xC1/0x8B
-
-# [Mana]
-K:775:0xC1/0x8C
-
-# Home Summoning
-K:776:0x83/0x9F
-
-# & Shadow Blade~
-K:777:0xC1/0x91
-
-# & Bluesteel Blade~
-K:778:0xC1/0x92
-
-# the Serpents
-K:779:0xC4/0x88
-
-# Darkness
-K:780:0xC4/0x89
-
-# Knowledge
-K:781:0xC4/0x8A
-
-# Force
-K:782:0xC4/0x8B
-
-# Lightning
-K:783:0xC4/0x8C
-
-# Mana
-K:784:0xC4/0x8D
-
-# Ring~ of Power
-K:785:0xC4/0x8E
-
-# Climbing Set~
-K:786:0xC1/0x93
-
-# Adventurer's guide to Middle-earth
-K:787:0x83/0x9E
-
-# & Demonblade~
-K:788:0x90/0xA8
-
-# & Demonshield~
-K:789:0x90/0xA9
-
-# & Demonhorn~
-K:790:0x90/0xAA
-
-# [Demonthoughts]
-K:791:0xC1/0x83
-
-# [Hellfire Tome]
-K:792:0xC1/0x94
-
-# & Wooden Rod~ of#
-K:793:0xC1/0x95
-
-# & Copper Rod~ of#
-K:794:0xC1/0x96
-
-# & Iron Rod~ of#
-K:795:0xC1/0x97
-
-# & Moonstone Rod~ of#
-K:796:0xC1/0x98
-
-# & Silver Rod~ of#
-K:797:0xC1/0x99
-
-# & Golden Rod~ of#
-K:798:0xC1/0x9B
-
-# & Mithril Rod~ of#
-K:799:0xC1/0x9C
-
-# & Adamantite Rod~ of#
-K:800:0xC1/0x9D
-
-# & Greater Ration~ of Health
-K:801:0xC4/0x87
-
-# & Crumpled Scroll~ of Mass Resurrection
-K:802:0x83/0x9E
-
-# & Cleaver~
-K:803:0xC4/0x82
-
-# & Light War Axe~
-K:804:0xC4/0x83
-
-# & Slaughter Axe~
-K:805:0xC4/0x84
-
-# & Runestone~
-K:806:0xC4/0x85
-
-# & Fortune cookie~
-K:807:0xC6/0x86
-
-# Portable hole
-K:808:0xC6/0x89
-
-# Critical Hits
-K:809:0xC6/0x9C
-
-# & Wand~ of Digging of Thrain
-K:810:0xC6/0x9C
-
-# & Gnarled Staff~ of Holy Fire of Mithrandir
-K:811:0xC6/0x9C
-
-# Partial Totem
-K:812:0xC6/0x9D
-
-# True Totem
-K:813:0xC6/0x9E
-
-# Player
-R:0:0x8E/0x80
-
-# Filthy street urchin
-R:1:0xAA/0x80
-
-# Scrawny cat
-R:2:0xA7/0x82
-
-# Sparrow
-R:3:0xB4/0x9E
-
-# Chaffinch
-R:4:0xB4/0x9E
-
-# Wild rabbit
-R:5:0xB4/0x9F
-
-# Woodsman
-R:6:0xAA/0x91
-
-# Scruffy little dog
-R:7:0x9D/0x9A
-
-# Farmer Maggot
-R:8:0xAA/0x81
-
-# Blubbering idiot
-R:9:0xAA/0x82
-
-# Boil-covered wretch
-R:10:0xAA/0x83
-
-# Village idiot
-R:11:0xAA/0x84
-
-# Pitiful-looking beggar
-R:12:0xAA/0x85
-
-# Mangy-looking leper
-R:13:0xAA/0x86
-
-# Agent of the black market
-R:14:0xAA/0x87
-
-# Singing, happy drunk
-R:15:0xAA/0x88
-
-# Aimless-looking merchant
-R:16:0xAA/0x89
-
-# Mean-looking mercenary
-R:17:0xAA/0x8A
-
-# Battle-scarred veteran
-R:18:0xAA/0x8B
-
-# Martti Ihrasaari
-R:19:0xB0/0x80
-
-# Grey mold
-R:20:0xA8/0x9F
-
-# Large white snake
-R:21:0xA2/0x85
-
-# Grey mushroom patch
-R:22:0xB0/0x81
-
-# Newt
-R:23:0xB0/0x82
-
-# Giant white centipede
-R:24:0xA5/0x95
-
-# White icky thing
-R:25:0xA8/0x83
-
-# Clear icky thing
-R:26:0xA8/0x84
-
-# Giant white mouse
-R:27:0xAC/0x85
-
-# Large brown snake
-R:28:0xA2/0x84
-
-# Small kobold
-R:29:0xA8/0x99
-
-# Kobold
-R:30:0xA8/0x9A
-
-# White worm mass
-R:31:0xAC/0x9D
-
-# Floating eye
-R:32:0xA6/0x9B
-
-# Rock lizard
-R:33:0xA2/0x86
-
-# Grid bug
-R:34:0xB0/0x84
-
-# Jackal
-R:35:0x9D/0x9B
-
-# Soldier ant
-R:36:0xA5/0x87
-
-# Fruit bat
-R:37:0xA5/0x8F
-
-# Insect swarm
-R:38:0xB5/0x9E
-
-# The Greater hell-beast
-R:39:0xB0/0x83
-
-# Shrieker mushroom patch
-R:40:0x9D/0x86
-
-# Blubbering icky thing
-R:41:0xA8/0x85
-
-# Metallic green centipede
-R:42:0xA5/0x96
-
-# Novice warrior
-R:43:0xAA/0x8C
-
-# Novice rogue
-R:44:0xAA/0x8D
-
-# Novice priest
-R:45:0xAA/0x8E
-
-# Novice mage
-R:46:0xAA/0x8F
-
-# Yellow mushroom patch
-R:47:0x9D/0x87
-
-# White jelly
-R:48:0xA8/0x8A
-
-# Giant black ant
-R:49:0xA5/0x88
-
-# Salamander
-R:50:0xA2/0x88
-
-# White harpy
-R:51:0xA0/0x88
-
-# Blue yeek
-R:52:0xAD/0x87
-
-# Grip, Farmer Maggot's dog
-R:53:0x9D/0x9C
-
-# Wolf, Farmer Maggot's dog
-R:54:0x9D/0x9D
-
-# Fang, Farmer Maggot's dog
-R:55:0x9D/0x9D
-
-# Giant green frog
-R:56:0xA2/0x87
-
-# Freesia
-R:57:0xB0/0x85
-
-# Green worm mass
-R:58:0xAC/0x9E
-
-# Large yellow snake
-R:59:0xA2/0x89
-
-# Cave spider
-R:60:0xA2/0x9D
-
-# Crow
-R:61:0xB5/0x9F
-
-# Wild cat
-R:62:0xA7/0x83
-
-# Smeagol
-R:63:0xAA/0x90
-
-# Green ooze
-R:64:0xA8/0x8B
-
-# Poltergeist
-R:65:0x9F/0x99
-
-# Yellow jelly
-R:66:0xA8/0x8D
-
-# Metallic blue centipede
-R:67:0xA5/0x97
-
-# Raven
-R:68:0xB5/0x9F
-
-# Giant white louse
-R:69:0xA8/0x9D
-
-# Giant yellow centipede
-R:70:0xA5/0x94
-
-# Black naga
-R:71:0xA9/0x88
-
-# Spotted mushroom patch
-R:72:0x9D/0x88
-
-# Silver jelly
-R:73:0xA8/0x8C
-
-# Scruffy-looking hobbit
-R:74:0xA7/0x93
-
-# Giant white ant
-R:75:0xA5/0x89
-
-# Yellow mold
-R:76:0xA9/0x80
-
-# Metallic red centipede
-R:77:0xA5/0x98
-
-# Yellow worm mass
-R:78:0xAC/0x9F
-
-# Clear worm mass
-R:79:0xAD/0x80
-
-# Radiation eye
-R:80:0xA6/0x9C
-
-# Yellow light
-R:81:0xB8/0x93
-
-# Cave lizard
-R:82:0xA2/0x8A
-
-# Novice ranger
-R:83:0xAA/0x91
-
-# Blue jelly
-R:84:0xA8/0x8E
-
-# Creeping copper coins
-R:85:0x9D/0x80
-
-# Giant white rat
-R:86:0xAC/0x86
-
-# Snotling
-R:87:0xB9/0x89
-
-# Swordfish
-R:88:0xB6/0x9E
-
-# Blue worm mass
-R:89:0xAD/0x81
-
-# Large grey snake
-R:90:0xA2/0x8B
-
-# Skeleton kobold
-R:91:0xAC/0x89
-
-# Ewok
-R:92:0xB0/0x86
-
-# Novice mage
-R:93:0xAA/0x8F
-
-# Green naga
-R:94:0xA9/0x89
-
-# Giant leech
-R:95:0xB8/0x94
-
-# Barracuda
-R:96:0xB6/0x9F
-
-# Novice paladin
-R:97:0xAA/0x92
-
-# Zog
-R:98:0xA1/0x80
-
-# Blue ooze
-R:99:0xA8/0x8F
-
-# Green glutton ghost
-R:100:0x9F/0x9A
-
-# Green jelly
-R:101:0xA8/0x90
-
-# Large kobold
-R:102:0xA8/0x9B
-
-# Grey icky thing
-R:103:0xA8/0x86
-
-# Disenchanter eye
-R:104:0xA6/0x9D
-
-# Red worm mass
-R:105:0xAD/0x82
-
-# Copperhead snake
-R:106:0xA2/0x8C
-
-# Death sword
-R:107:0xB0/0x87
-
-# Purple mushroom patch
-R:108:0x9D/0x89
-
-# Novice priest
-R:109:0xAA/0x8E
-
-# Novice warrior
-R:110:0xAA/0x8C
-
-# Nibelung
-R:111:0xB0/0x88
-
-# The disembodied hand that strangled people
-R:112:0xB0/0x89
-
-# Brown mold
-R:113:0xA9/0x81
-
-# Giant brown bat
-R:114:0xA5/0x90
-
-# Rat-thing
-R:115:0xAC/0x88
-
-# Novice rogue
-R:116:0xAA/0x87
-
-# Creeping silver coins
-R:117:0x9D/0x81
-
-# Snaga
-R:118:0xA9/0x8E
-
-# Rattlesnake
-R:119:0xA2/0x8D
-
-# Giant slug
-R:120:0xB8/0x94
-
-# Giant pink frog
-R:121:0xB8/0x95
-
-# Dark elf
-R:122:0x92/0x94
-
-# Zombified kobold
-R:123:0xAC/0x89
-
-# Crypt creep
-R:124:0xB0/0x8A
-
-# Rotting corpse
-R:125:0xB0/0x8B
-
-# Cave orc
-R:126:0xA9/0x8F
-
-# Wood spider
-R:127:0xA2/0x9E
-
-# Manes
-R:128:0xA0/0x91
-
-# Bloodshot eye
-R:129:0xA6/0x9E
-
-# Red naga
-R:130:0xA9/0x8A
-
-# Red jelly
-R:131:0xA8/0x91
-
-# Green icky thing
-R:132:0xA8/0x87
-
-# Lost soul
-R:133:0x9F/0x9B
-
-# Night lizard
-R:134:0xA2/0x8F
-
-# Mughash, the Kobold Lord
-R:135:0xA8/0x9C
-
-# Skeleton orc
-R:136:0xAC/0x8A
-
-# Wormtongue, Agent of Saruman
-R:137:0xAA/0x98
-
-# Robin Hood, the Outlaw
-R:138:0xB0/0x8C
-
-# Nurgling
-R:139:0xB8/0x97
-
-# Lagduf, the Snaga
-R:140:0xA9/0x90
-
-# Brown yeek
-R:141:0xAD/0x88
-
-# Novice ranger
-R:142:0xAA/0x91
-
-# Giant salamander
-R:143:0xA2/0x90
-
-# Space monster
-R:144:0xB0/0x8D
-
-# Carnivorous flying monkey
-R:145:0xB8/0x98
-
-# Green mold
-R:146:0xA9/0x82
-
-# Novice paladin
-R:147:0xAA/0x92
-
-# Lemure
-R:148:0xA0/0x92
-
-# Hill orc
-R:149:0xA9/0x91
-
-# Bandit
-R:150:0xAA/0x9B
-
-# Hunting hawk
-R:151:0xB0/0x8E
-
-# Phantom warrior
-R:152:0xB0/0x8F
-
-# Gremlin
-R:153:0xB0/0x90
-
-# Yeti
-R:154:0xA4/0x91
-
-# Bloodshot icky thing
-R:155:0xA8/0x88
-
-# Giant grey rat
-R:156:0xAC/0x87
-
-# Black harpy
-R:157:0xA0/0x89
-
-# Skaven
-R:158:0xB8/0x99
-
-# The wounded bear
-R:159:0xBA/0x80
-
-# Cave bear
-R:160:0xC4/0x8F
-
-# Rock mole
-R:161:0xBA/0x82
-
-# Mindcrafter
-R:162:0xAA/0x93
-
-# Baby blue dragon
-R:163:0xA5/0x9D
-
-# Baby white dragon
-R:164:0xA5/0x9E
-
-# Baby green dragon
-R:165:0xA5/0x9F
-
-# Baby black dragon
-R:166:0xA6/0x80
-
-# Baby red dragon
-R:167:0xA6/0x81
-
-# Giant red ant
-R:168:0xA5/0x8D
-
-# Brodda, the Easterling
-R:169:0xAA/0x9C
-
-# Bloodfang, the Wolf
-R:170:0xBA/0x83
-
-# King cobra
-R:171:0xA2/0x91
-
-# Eagle
-R:172:0xB4/0x9E
-
-# War bear
-R:173:0xB0/0x91
-
-# Killer bee
-R:174:0xB0/0x92
-
-# Giant spider
-R:175:0xA2/0x9F
-
-# Giant white tick
-R:176:0xA8/0x9D
-
-# The Borshin
-R:177:0xBA/0x84
-
-# Dark elven mage
-R:178:0xA7/0x96
-
-# Kamikaze yeek
-R:179:0xBA/0x94
-
-# Orfax, Son of Boldor
-R:180:0xAD/0x89
-
-# Servant of Glaaki
-R:181:0xBA/0x85
-
-# Dark elven warrior
-R:182:0xA7/0x97
-
-# Sand-dweller
-R:183:0xBA/0x86
-
-# Clear mushroom patch
-R:184:0xB8/0x96
-
-# Quiver slot
-R:185:0xB0/0x93
-
-# Grishnakh, the Hill Orc
-R:186:0xA9/0x93
-
-# Giant tan bat
-R:187:0xC4/0x90
-
-# Owlbear
-R:188:0xBA/0x87
-
-# Blue horror
-R:189:0xB8/0x9A
-
-# Hairy mold
-R:190:0xA9/0x83
-
-# Grizzly bear
-R:191:0xBA/0x88
-
-# Disenchanter mold
-R:192:0xA9/0x84
-
-# Pseudo dragon
-R:193:0xA6/0x82
-
-# Tengu
-R:194:0xA0/0x93
-
-# Creeping gold coins
-R:195:0x9D/0x82
-
-# Wolf
-R:196:0x9D/0x9E
-
-# Giant fruit fly
-R:197:0x9F/0x91
-
-# Panther
-R:198:0xA7/0x84
-
-# Brigand
-R:199:0xB0/0x94
-
-# Hobbes the Tiger
-R:200:0xB0/0x95
-
-# Shadow Creature of Fiona
-R:201:0xB0/0x96
-
-# Undead mass
-R:202:0xB0/0x97
-
-# Chaos shapechanger
-R:203:0xB0/0x98
-
-# Baby multi-hued dragon
-R:204:0xA6/0x83
-
-# Vorpal bunny
-R:205:0xB4/0x9F
-
-# Old Man Willow
-R:206:0xBA/0x89
-
-# Hippocampus
-R:207:0xBA/0x8A
-
-# Zombified orc
-R:208:0xAC/0x8C
-
-# Hippogriff
-R:209:0xA0/0x8A
-
-# Black mamba
-R:210:0xA2/0x92
-
-# White wolf
-R:211:0x9D/0x9F
-
-# Grape jelly
-R:212:0xA8/0x92
-
-# Nether worm mass
-R:213:0xAD/0x83
-
-# Abyss worm mass
-R:214:0xB0/0x99
-
-# Golfimbul, the Hill Orc Chief
-R:215:0xA9/0x94
-
-# Swordsman
-R:216:0x97/0x81
-
-# Skaven shaman
-R:217:0x9A/0x84
-
-# Baby bronze dragon
-R:218:0xA6/0x82
-
-# Baby gold dragon
-R:219:0xA6/0x82
-
-# Evil eye
-R:220:0xC4/0x91
-
-# Mine-dog
-R:221:0xB9/0x8B
-
-# Hellcat
-R:222:0xB0/0x9A
-
-# Moon beast
-R:223:0xB0/0x9B
-
-# Master yeek
-R:224:0xAD/0x8A
-
-# Priest
-R:225:0xAA/0x9E
-
-# Dark elven priest
-R:226:0xA7/0x99
-
-# Air spirit
-R:227:0x9E/0x9F
-
-# Skeleton human
-R:228:0xAC/0x8B
-
-# Zombified human
-R:229:0xAD/0x8E
-
-# Tiger
-R:230:0xA7/0x85
-
-# Moaning spirit
-R:231:0x9F/0x9C
-
-# Stegocentipede
-R:232:0xA5/0x99
-
-# Spotted jelly
-R:233:0xA8/0x93
-
-# Drider
-R:234:0xA3/0x80
-
-# Mongbat
-R:235:0xB0/0x9C
-
-# Killer brown beetle
-R:236:0xA0/0x9B
-
-# Boldor, King of the Yeeks
-R:237:0xAD/0x8B
-
-# Ogre
-R:238:0xA1/0x8B
-
-# Creeping mithril coins
-R:239:0x9D/0x83
-
-# Illusionist
-R:240:0xAB/0x80
-
-# Druid
-R:241:0xAB/0x81
-
-# Pink horror
-R:242:0xB8/0x9B
-
-# Cloaker
-R:243:0x89/0x88
-
-# Black orc
-R:244:0xA9/0x95
-
-# Ochre jelly
-R:245:0xA8/0x94
-
-# Software bug
-R:246:0xB0/0x9D
-
-# Lurker
-R:247:0x80/0x81
-
-# Tangleweed
-R:248:0xC4/0x92
-
-# Vlasta
-R:249:0xA5/0x84
-
-# Giant white dragon fly
-R:250:0x9F/0x93
-
-# Snaga sapper
-R:251:0xB9/0x8C
-
-# Blue icky thing
-R:252:0xA8/0x89
-
-# Gibbering mouther
-R:253:0xB0/0x9E
-
-# Wolfhound of Flora
-R:254:0xB0/0x9F
-
-# Hill giant
-R:255:0xA1/0x91
-
-# Flesh golem
-R:256:0xA7/0x89
-
-# Warg
-R:257:0x9E/0x80
-
-# Cheerful leprechaun
-R:258:0xB1/0x80
-
-# Giant flea
-R:259:0x9F/0x92
-
-# Ufthak of Cirith Ungol
-R:260:0xBA/0x8C
-
-# Clay golem
-R:261:0xB8/0x9D
-
-# Black ogre
-R:262:0xA1/0x8C
-
-# Dweller on the threshold
-R:263:0xB9/0x8D
-
-# Half-orc
-R:264:0xBA/0x8D
-
-# Dark naga
-R:265:0xB8/0x9E
-
-# Poison ivy
-R:266:0xC4/0x93
-
-# Magic mushroom patch
-R:267:0x9D/0x8B
-
-# Plaguebearer of Nurgle
-R:268:0xAD/0x8D
-
-# Guardian naga
-R:269:0xA9/0x8B
-
-# Wererat
-R:270:0xBA/0x8E
-
-# Light hound
-R:271:0xA4/0x93
-
-# Dark hound
-R:272:0xA4/0x94
-
-# Flying skull
-R:273:0xB1/0x81
-
-# Mi-Go
-R:274:0xB1/0x82
-
-# Giant tarantula
-R:275:0xA3/0x81
-
-# Giant clear centipede
-R:276:0xA5/0x9A
-
-# Mirkwood spider
-R:277:0xA3/0x82
-
-# Frost giant
-R:278:0xA1/0x92
-
-# Griffon
-R:279:0xA0/0x8B
-
-# Homunculus
-R:280:0xA0/0x94
-
-# Gnome mage
-R:281:0xA7/0x98
-
-# Clear hound
-R:282:0xA4/0x95
-
-# Umber hulk
-R:283:0xA3/0x99
-
-# Rust monster
-R:284:0xB9/0x8F
-
-# Ogrillon
-R:285:0xA9/0x98
-
-# Gelatinous cube
-R:286:0xA8/0x95
-
-# Giant green dragon fly
-R:287:0x9F/0x94
-
-# Fire giant
-R:288:0xA1/0x93
-
-# Hummerhorn
-R:289:0xBA/0x8F
-
-# Lizard man
-R:290:0xB9/0x90
-
-# Ulfast, Son of Ulfang
-R:291:0xAB/0x82
-
-# Crebain
-R:292:0xC4/0x94
-
-# Berserker
-R:293:0xA9/0x97
-
-# Quasit
-R:294:0xA0/0x95
-
-# Sphinx
-R:295:0xB9/0x91
-
-# Imp
-R:296:0xA0/0x96
-
-# Forest troll
-R:297:0xA3/0x89
-
-# Freezing sphere
-R:298:0xBA/0x91
-
-# Jumping fireball
-R:299:0xB9/0x92
-
-# Ball lightning
-R:300:0xBA/0x92
-
-# 2-headed hydra
-R:301:0xA2/0x93
-
-# Swamp thing
-R:302:0xB9/0x93
-
-# Water spirit
-R:303:0x9F/0x80
-
-# Giant red scorpion
-R:304:0xA3/0x83
-
-# Earth spirit
-R:305:0x9F/0x81
-
-# Fire spirit
-R:306:0x9F/0x82
-
-# Fire hound
-R:307:0xA4/0x96
-
-# Cold hound
-R:308:0xA4/0x97
-
-# Energy hound
-R:309:0xA4/0x98
-
-# Lesser Mimic
-R:310:0x9D/0x8E
-
-# Door mimic
-R:311:0x82/0x83
-
-# Blink dog
-R:312:0x9E/0x81
-
-# Uruk
-R:313:0xA9/0x99
-
-# Shagrat, the Orc Captain
-R:314:0xA9/0x9A
-
-# Gorbag, the Orc Captain
-R:315:0xA9/0x9B
-
-# Shambling mound
-R:316:0x9D/0x8C
-
-# Giant Venus Flytrap
-R:317:0xC4/0x95
-
-# Chaos beastman
-R:318:0xB9/0x95
-
-# Daemonette of Slaanesh
-R:319:0xB9/0x94
-
-# Giant bronze dragon fly
-R:320:0x9F/0x98
-
-# Stone giant
-R:321:0xA1/0x94
-
-# Giant black dragon fly
-R:322:0x9F/0x96
-
-# Stone golem
-R:323:0xA7/0x8B
-
-# Red mold
-R:324:0xA9/0x85
-
-# Giant gold dragon fly
-R:325:0x9F/0x97
-
-# Stunwall
-R:326:0x80/0x93
-
-# Ghast
-R:327:0xBA/0x95
-
-# Neekerbreeker
-R:328:0xC4/0x96
-
-# Huorn
-R:329:0xBA/0x96
-
-# Bolg, Son of Azog
-R:330:0xA9/0x9C
-
-# Phase spider
-R:331:0xA3/0x84
-
-# Lizard king
-R:332:0xB9/0x97
-
-# Landmine
-R:333:0xBA/0x97
-
-# Wyvern
-R:334:0xB1/0x83
-
-# Great eagle
-R:335:0xB9/0x98
-
-# Livingstone
-R:336:0xB1/0x84
-
-# Earth hound
-R:337:0xA4/0x99
-
-# Air hound
-R:338:0xA4/0x9A
-
-# Sabre-tooth tiger
-R:339:0xA7/0x86
-
-# Acid hound
-R:340:0xA4/0x9B
-
-# Chimaera
-R:341:0xA0/0x8C
-
-# Quylthulg
-R:342:0xA1/0x9A
-
-# Sasquatch
-R:343:0xA4/0x92
-
-# Weir
-R:344:0xB1/0x85
-
-# Ranger
-R:345:0xAA/0x97
-
-# Paladin
-R:346:0xAB/0x92
-
-# Werewolf
-R:347:0xBA/0x99
-
-# Dark elven lord
-R:348:0xA7/0x9C
-
-# Cloud giant
-R:349:0xA1/0x96
-
-# Ugluk, the Uruk
-R:350:0xA9/0x9D
-
-# Blue dragon bat
-R:351:0xA5/0x91
-
-# Mimic
-R:352:0x83/0x9D
-
-# Ultimate Mimic
-R:353:0x84/0x9E
-
-# Fire vortex
-R:354:0xAC/0x94
-
-# Acid vortex
-R:355:0xAC/0x95
-
-# Lugdush, the Uruk
-R:356:0xB9/0x9A
-
-# Arch-vile
-R:357:0xBA/0x9A
-
-# Cold vortex
-R:358:0xAC/0x96
-
-# Energy vortex
-R:359:0xAC/0x97
-
-# Globefish
-R:360:0xB9/0x9B
-
-# Giant firefly
-R:361:0x9F/0x95
-
-# Mummified orc
-R:362:0xA1/0x88
-
-# Wolf chieftain
-R:363:0xC4/0x97
-
-# Serpent man
-R:364:0xBA/0x9C
-
-# Vampiric mist
-R:365:0xB9/0x9D
-
-# Killer stag beetle
-R:366:0xA0/0x9D
-
-# Iron golem
-R:367:0xA7/0x8C
-
-# Auto-roller
-R:368:0xB1/0x86
-
-# Giant yellow scorpion
-R:369:0xA3/0x85
-
-# Jade monk
-R:370:0xBA/0x9D
-
-# Black ooze
-R:371:0xA8/0x96
-
-# Hardened warrior
-R:372:0xAB/0x83
-
-# Azog, King of the Uruk-Hai
-R:373:0xA9/0x9F
-
-# Fleshhound of Khorne
-R:374:0xB9/0x9E
-
-# Dark elven warlock
-R:375:0xB1/0x87
-
-# Master rogue
-R:376:0xAB/0x84
-
-# Red dragon bat
-R:377:0xA5/0x92
-
-# Killer white beetle
-R:378:0xBA/0x9E
-
-# Ice skeleton
-R:379:0xB9/0x9F
-
-# Angamaite of Umbar
-R:380:0xBB/0x80
-
-# Forest wight
-R:381:0xB1/0x88
-
-# Khim, Son of Mim
-R:382:0xB1/0x89
-
-# Ibun, Son of Mim
-R:383:0xB1/0x8A
-
-# Meneldor the Swift
-R:384:0xBB/0x81
-
-# Phantom beast
-R:385:0xB1/0x8B
-
-# Giant silver ant
-R:386:0xA0/0x9C
-
-# 4-headed hydra
-R:387:0xA2/0x95
-
-# Lesser hell-beast
-R:388:0xBB/0x83
-
-# Tyrannosaur
-R:389:0xB1/0x8C
-
-# Mummified human
-R:390:0xA1/0x89
-
-# Vampire bat
-R:391:0xA5/0x93
-
-# Sangahyando of Umbar
-R:392:0xAB/0x85
-
-# It
-R:393:0xB1/0x8D
-
-# Banshee
-R:394:0x9F/0x9D
-
-# Carrion crawler
-R:395:0xA5/0x9B
-
-# Xiclotlan
-R:396:0xBB/0x84
-
-# Silent watcher
-R:397:0xB1/0x8E
-
-# Pukelman
-R:398:0xA7/0x8D
-
-# Disenchanter beast
-R:399:0xBA/0x9F
-
-# Dark elven druid
-R:400:0xA7/0x9F
-
-# Stone troll
-R:401:0xA3/0x8A
-
-# Black
-R:402:0xB0/0x8D
-
-# Hill troll
-R:403:0xA3/0x8B
-
-# Wereworm
-R:404:0xAD/0x84
-
-# Killer red beetle
-R:405:0xA0/0x9F
-
-# Disenchanter bat
-R:406:0xC4/0x98
-
-# Gnoph-Keh
-R:407:0xBB/0x86
-
-# Giant grey ant
-R:408:0xA5/0x8C
-
-# Khufu, the Mummified King
-R:409:0xB1/0x8F
-
-# Gwaihir the Windlord
-R:410:0xBB/0x81
-
-# Giant fire tick
-R:411:0xBB/0x87
-
-# Displacer beast
-R:412:0xA7/0x87
-
-# Ulwarth, Son of Ulfang
-R:413:0xAA/0x99
-
-# Werebear
-R:414:0xC4/0x8F
-
-# Cave ogre
-R:415:0xA1/0x8D
-
-# White wraith
-R:416:0xA3/0x9F
-
-# Angel
-R:417:0x9D/0x8F
-
-# Ghoul
-R:418:0xB4/0x8F
-
-# Mim, Betrayer of Turin
-R:419:0xB1/0x90
-
-# Hellblade
-R:420:0xB1/0x91
-
-# Killer fire beetle
-R:421:0xA1/0x80
-
-# Beast of Nurgle
-R:422:0xBB/0x88
-
-# Creeping adamantite coins
-R:423:0x9D/0x84
-
-# Algroth
-R:424:0xA3/0x8C
-
-# Flamer of Tzeentch
-R:425:0xB8/0x9F
-
-# Roper
-R:426:0xB9/0x80
-
-# Headless
-R:427:0xB1/0x92
-
-# Vibration hound
-R:428:0xA4/0x9C
-
-# Nexus hound
-R:429:0xA4/0x9D
-
-# Half-ogre
-R:430:0xA1/0x8E
-
-# Lokkak, the Ogre Chieftain
-R:431:0xA1/0x90
-
-# Vampire
-R:432:0xA3/0x9A
-
-# Gorgimaera
-R:433:0xA0/0x8D
-
-# Shantak
-R:434:0xB1/0x93
-
-# Colbran
-R:435:0xA7/0x8E
-
-# Spirit naga
-R:436:0xA9/0x8C
-
-# Corpser
-R:437:0xB9/0x81
-
-# Fiend of Slaanesh
-R:438:0xA2/0x97
-
-# Stairway to Hell
-R:439:0xB1/0x94
-
-# 5-headed hydra
-R:440:0xA2/0x96
-
-# Barney the Dinosaur
-R:441:0xB1/0x95
-
-# Black knight
-R:442:0xAB/0x88
-
-# Seahorse
-R:443:0xBB/0x89
-
-# Cyclops
-R:444:0xBB/0x8A
-
-# Clairvoyant
-R:445:0xAB/0x86
-
-# Purple worm
-R:446:0xB9/0x82
-
-# Catoblepas
-R:447:0xAC/0x81
-
-# Lesser wall monster
-R:448:0xB1/0x96
-
-# Mage
-R:449:0xAB/0x8A
-
-# Mind flayer
-R:450:0xAB/0x8B
-
-# The Ultimate Dungeon Cleaner
-R:451:0xB1/0x97
-
-# Deep one
-R:452:0xA4/0x86
-
-# Basilisk
-R:453:0xA2/0x97
-
-# Ice troll
-R:454:0xA3/0x8D
-
-# Dhole
-R:455:0xB1/0x99
-
-# Archangel
-R:456:0x9D/0x90
-
-# Greater Mimic
-R:457:0xAD/0x9E
-
-# Chaos tile
-R:458:0xB1/0x9A
-
-# Young blue dragon
-R:459:0xA6/0x84
-
-# Young white dragon
-R:460:0xA6/0x85
-
-# Young green dragon
-R:461:0xA6/0x86
-
-# Young bronze dragon
-R:462:0xA6/0x87
-
-# Aklash
-R:463:0xC1/0x9E
-
-# Mithril golem
-R:464:0xA7/0x8F
-
-# Skeleton troll
-R:465:0xAC/0x8D
-
-# Skeletal tyrannosaur 
-R:466:0xBB/0x8B
-
-# Beorn, the Shape-Changer
-R:467:0xC4/0x99
-
-# Thorondor, Lord of Eagles
-R:468:0xBB/0x81
-
-# Giant blue ant
-R:469:0xA5/0x8B
-
-# Grave wight
-R:470:0xAD/0x9C
-
-# Shadow drake
-R:471:0xA6/0x88
-
-# Manticore
-R:472:0xA0/0x8E
-
-# Giant army ant
-R:473:0xAE/0x81
-
-# Killer slicer beetle
-R:474:0xA1/0x81
-
-# Gorgon
-R:475:0xBB/0x8D
-
-# Gug
-R:476:0xBB/0x8E
-
-# Ghost
-R:477:0x9F/0x9E
-
-# Death watch beetle
-R:478:0xA1/0x82
-
-# Mountain ogre
-R:479:0xA1/0x8F
-
-# Nexus quylthulg
-R:480:0xA1/0x9B
-
-# Shelob, Spider of Darkness
-R:481:0xA3/0x86
-
-# Giant squid
-R:482:0xB9/0x83
-
-# Ghoulking
-R:483:0xAD/0x8C
-
-# Doombat
-R:484:0xB9/0x84
-
-# Ninja
-R:485:0xAB/0x8C
-
-# Memory moss
-R:486:0xA9/0x86
-
-# Storm giant
-R:487:0xA1/0x95
-
-# Spectator
-R:488:0xB1/0x9B
-
-# Bokrug
-R:489:0xBB/0x8F
-
-# Biclops
-R:490:0xBB/0x90
-
-# Half-troll
-R:491:0xA9/0x9E
-
-# Ivory monk
-R:492:0xAA/0x93
-
-# Bert the Stone Troll
-R:493:0xA3/0x90
-
-# Bill the Stone Troll
-R:494:0xA3/0x91
-
-# Tom the Stone Troll
-R:495:0xA3/0x92
-
-# Cave troll
-R:496:0xA3/0x8E
-
-# Anti-paladin
-R:497:0xB1/0x9C
-
-# Chaos master
-R:498:0xB1/0x9D
-
-# Barrow wight
-R:499:0xA4/0x81
-
-# Skeleton ettin
-R:500:0xC4/0x9A
-
-# Chaos drake
-R:501:0xA6/0x89
-
-# Law drake
-R:502:0xA6/0x8A
-
-# Balance drake
-R:503:0xA6/0x8B
-
-# Ethereal drake
-R:504:0xA6/0x8C
-
-# Groo, the Wanderer
-R:505:0xB1/0x9E
-
-# Fasolt the Giant
-R:506:0xB1/0x9F
-
-# Shade
-R:507:0xA4/0x89
-
-# Spectre
-R:508:0xA0/0x80
-
-# Water troll
-R:509:0xA3/0x93
-
-# Fire elemental
-R:510:0x9F/0x83
-
-# Cherub
-R:511:0x9D/0x91
-
-# Water elemental
-R:512:0x9F/0x84
-
-# Multi-hued hound
-R:513:0xB2/0x81
-
-# Invisible stalker
-R:514:0x9F/0x85
-
-# Carrion crawler
-R:515:0xA5/0x9C
-
-# Master thief
-R:516:0xAB/0x8E
-
-# The Watcher in the Water
-R:517:0xAF/0x95
-
-# Lich
-R:518:0xA1/0x83
-
-# Gas spore
-R:519:0xB2/0x8E
-
-# Master vampire
-R:520:0xA3/0x9B
-
-# Oriental vampire
-R:521:0xB2/0x83
-
-# Greater mummy
-R:522:0xA1/0x8A
-
-# Bloodletter of Khorne
-R:523:0xA0/0x98
-
-# Giant grey scorpion
-R:524:0xA3/0x87
-
-# Earth elemental
-R:525:0x9F/0x86
-
-# Air elemental
-R:526:0x9F/0x87
-
-# Shimmering mold
-R:527:0xAF/0x81
-
-# Gargoyle
-R:528:0xBB/0x91
-
-# Malicious leprechaun
-R:529:0xB2/0x85
-
-# Eog golem
-R:530:0xA7/0x90
-
-# Little Boy
-R:531:0xB9/0x85
-
-# Dagashi
-R:532:0xAB/0x90
-
-# Headless ghost
-R:533:0xBB/0x92
-
-# Dread
-R:534:0xB9/0x87
-
-# Leng spider
-R:535:0xBB/0x93
-
-# Gauth
-R:536:0xC4/0x9B
-
-# Smoke elemental
-R:537:0x9F/0x90
-
-# Olog
-R:538:0xA3/0x94
-
-# Halfling slinger
-R:539:0xB2/0x86
-
-# Gravity hound
-R:540:0xA4/0x9E
-
-# Acidic cytoplasm
-R:541:0xA8/0x97
-
-# Inertia hound
-R:542:0xA4/0x9F
-
-# Impact hound
-R:543:0xA5/0x80
-
-# Shardstorm
-R:544:0xC4/0x9C
-
-# Ooze elemental
-R:545:0x9F/0x88
-
-# Young black dragon
-R:546:0xA6/0x8D
-
-# Mumak
-R:547:0xAC/0x84
-
-# Giant fire ant
-R:548:0xA5/0x8A
-
-# Mature white dragon
-R:549:0xA6/0x8E
-
-# Xorn
-R:550:0xA4/0x8F
-
-# Rogrog the Black Troll
-R:551:0xA3/0x8F
-
-# Mist giant
-R:552:0xA7/0x91
-
-# Phantom
-R:553:0xB2/0x87
-
-# Grey wraith
-R:554:0xA4/0x82
-
-# Revenant
-R:555:0xA4/0x88
-
-# Young multi-hued dragon
-R:556:0xA6/0x8F
-
-# Raal's Tome of Destruction
-R:557:0xB2/0x88
-
-# Colossus
-R:558:0xB2/0x89
-
-# Young gold dragon
-R:559:0xA6/0x90
-
-# Mature blue dragon
-R:560:0xA6/0x91
-
-# Mature green dragon
-R:561:0xA6/0x92
-
-# Mature bronze dragon
-R:562:0xA6/0x93
-
-# Young red dragon
-R:563:0xA6/0x94
-
-# Nightblade
-R:564:0xB2/0x8A
-
-# Trapper
-R:565:0xAD/0x9F
-
-# Bodak
-R:566:0xA0/0x98
-
-# Time bomb
-R:567:0xBB/0x96
-
-# Mezzodaemon
-R:568:0xAD/0x90
-
-# Elder thing
-R:569:0xB2/0x8B
-
-# Ice elemental
-R:570:0x9F/0x8A
-
-# Necromancer
-R:571:0xB2/0x8C
-
-# The Greater hell magic mushroom were-quylthulg
-R:572:0xB9/0x86
-
-# Lorgan, Chief of the Easterlings
-R:573:0xB2/0x8D
-
-# Chaos spawn
-R:574:0xB2/0x8E
-
-# Mummified troll
-R:575:0xBB/0x97
-
-# Storm of Unmagic
-R:576:0xC4/0x9D
-
-# Crypt thing
-R:577:0xA4/0x80
-
-# Chaos butterfly
-R:578:0xBB/0x98
-
-# Time elemental
-R:579:0xB2/0x8F
-
-# Flying polyp
-R:580:0xBB/0x99
-
-# The Queen Ant
-R:581:0xA5/0x8E
-
-# Will o' the wisp
-R:582:0x9F/0x8B
-
-# Shan
-R:583:0xBB/0x9A
-
-# Magma elemental
-R:584:0x9F/0x8C
-
-# Black pudding
-R:585:0xA8/0x98
-
-# Killer iridescent beetle
-R:586:0xB4/0x90
-
-# Nexus vortex
-R:587:0xAE/0x80
-
-# Plasma vortex
-R:588:0xAC/0x98
-
-# Mature red dragon
-R:589:0xA6/0x95
-
-# Mature gold dragon
-R:590:0xA6/0x96
-
-# Crystal drake
-R:591:0xA6/0x97
-
-# Mature black dragon
-R:592:0xA6/0x98
-
-# Mature multi-hued dragon
-R:593:0xA6/0x99
-
-# Sky whale
-R:594:0xBB/0x9B
-
-# Draebor, the Imp
-R:595:0xC1/0x9F
-
-# Mother Hydra
-R:596:0xA2/0x98
-
-# Death knight
-R:597:0xAB/0x94
-
-# Castamir the Usurper
-R:598:0xB2/0x90
-
-# Time vortex
-R:599:0xAC/0x99
-
-# Shimmering vortex
-R:600:0xAC/0x9A
-
-# Ancient blue dragon
-R:601:0x9E/0x88
-
-# Ancient bronze dragon
-R:602:0x9E/0x89
-
-# Beholder
-R:603:0xA6/0x9F
-
-# Emperor wight
-R:604:0xA4/0x83
-
-# Seraph
-R:605:0x9D/0x92
-
-# Vargo, Tyrant of Fire
-R:606:0x9F/0x8D
-
-# Black wraith
-R:607:0xA4/0x84
-
-# Nightgaunt
-R:608:0xB2/0x91
-
-# Baron of hell
-R:609:0xB2/0x92
-
-# Scylla
-R:610:0xBB/0x9C
-
-# Monastic lich
-R:611:0xA1/0x87
-
-# Nether wraith
-R:612:0xA4/0x85
-
-# Hellhound
-R:613:0xAD/0x96
-
-# 7-headed hydra
-R:614:0xA2/0x99
-
-# Waldern, King of Water
-R:615:0x9F/0x8E
-
-# Kavlax the Many-Headed
-R:616:0xA6/0x9A
-
-# Ancient white dragon
-R:617:0x9E/0x8A
-
-# Ancient green dragon
-R:618:0x9E/0x8B
-
-# Chthonian
-R:619:0xB2/0x93
-
-# Eldrak
-R:620:0xA3/0x97
-
-# Ettin
-R:621:0xA3/0x96
-
-# Night mare
-R:622:0xAC/0x83
-
-# Vampire lord
-R:623:0xA3/0x9C
-
-# Ancient black dragon
-R:624:0x9E/0x8C
-
-# Weird fume
-R:625:0xAF/0x80
-
-# Spawn of Ubbo-Sathla
-R:626:0xBB/0x9D
-
-# Fat Man
-R:627:0xB9/0x85
-
-# Malekith the Accursed
-R:628:0xA7/0x95
-
-# Shadowfax, steed of Gandalf
-R:629:0xBB/0x9E
-
-# Spirit troll
-R:630:0xA3/0x98
-
-# War troll
-R:631:0xB2/0x94
-
-# Disenchanter worm mass
-R:632:0xAD/0x86
-
-# Rotting quylthulg
-R:633:0xA1/0x9C
-
-# Lesser titan
-R:634:0xA1/0x97
-
-# 9-headed hydra
-R:635:0xA2/0x99
-
-# Enchantress
-R:636:0xAB/0x96
-
-# Ranger chieftain
-R:637:0xAB/0x97
-
-# Sorcerer
-R:638:0xAB/0x98
-
-# Xaren
-R:639:0xA4/0x90
-
-# Giant roc
-R:640:0x9D/0x97
-
-# Minotaur
-R:641:0xA0/0x8F
-
-# Medusa, the Gorgon
-R:642:0xA9/0x8D
-
-# Death drake
-R:643:0x9E/0x8D
-
-# Ancient red dragon
-R:644:0x9E/0x8E
-
-# Ancient gold dragon
-R:645:0x9E/0x8F
-
-# Great crystal drake
-R:646:0x9E/0x90
-
-# Wyrd sister
-R:647:0xA7/0x9D
-
-# Vrock
-R:648:0xB2/0x95
-
-# Death quasit
-R:649:0xA0/0x99
-
-# Giganto, the Gargantuan
-R:650:0xBB/0x9F
-
-# Strygalldwir
-R:651:0xB2/0x96
-
-# Fallen angel
-R:652:0xAA/0x8E
-
-# Giant headless
-R:653:0xBC/0x80
-
-# Judge Fire
-R:654:0xAB/0x93
-
-# Ubbo-Sathla, the Unbegotten Source
-R:655:0xBC/0x81
-
-# Judge Mortis
-R:656:0xBC/0x82
-
-# Dark elven sorcerer
-R:657:0xA8/0x81
-
-# Master lich
-R:658:0xA1/0x84
-
-# Byakhee
-R:659:0xB2/0x97
-
-# Eol, the Dark Elf
-R:660:0xB2/0x99
-
-# Archon
-R:661:0x9D/0x93
-
-# Formless spawn of Tsathoggua
-R:662:0xB2/0x9A
-
-# Hunting horror
-R:663:0xB2/0x9B
-
-# Undead beholder
-R:664:0xA7/0x80
-
-# Shadow
-R:665:0xA0/0x81
-
-# Iron lich
-R:666:0xB2/0x9C
-
-# Dread
-R:667:0xB9/0x87
-
-# Greater basilisk
-R:668:0xBC/0x83
-
-# Charybdis
-R:669:0xBC/0x84
-
-# Jack of Shadows
-R:670:0xAB/0x9C
-
-# Zephyr Lord
-R:671:0xAB/0x91
-
-# Juggernaut of Khorne
-R:672:0xBC/0x85
-
-# Mumak
-R:673:0xAC/0x82
-
-# Judge Fear
-R:674:0xA7/0x88
-
-# Ancient multi-hued dragon
-R:675:0x9E/0x91
-
-# Ethereal dragon
-R:676:0x9E/0x92
-
-# Dark young of Shub-Niggurath
-R:677:0xB2/0x9D
-
-# Colour out of space
-R:678:0x91/0x99
-
-# Quaker, Master of Earth
-R:679:0x9F/0x8F
-
-# Death leprechaun
-R:680:0xA7/0x9E
-
-# Chaugnar Faugn, Horror from the Hills
-R:681:0xBC/0x94
-
-# Lloigor
-R:682:0xBC/0x95
-
-# Utgard-Loke
-R:683:0xBC/0x96
-
-# Quachil Uttaus, Treader of the Dust
-R:684:0xBC/0x97
-
-# Shoggoth
-R:685:0xBC/0x98
-
-# Judge Death
-R:686:0xBC/0x99
-
-# Ariel, Queen of Air
-R:687:0x9F/0x91
-
-# 11-headed hydra
-R:688:0xA2/0x9A
-
-# Patriarch
-R:689:0xAB/0x9A
-
-# Dreadmaster
-R:690:0xA0/0x85
-
-# Drolem
-R:691:0xA7/0x92
-
-# Scatha the Worm
-R:692:0xAD/0x9B
-
-# Warrior of the Dawn
-R:693:0xB2/0x9E
-
-# Lesser black reaver
-R:694:0xA4/0x87
-
-# Zoth-Ommog
-R:695:0xBE/0x89
-
-# Grand master thief
-R:696:0xC2/0x8A
-
-# Smaug the Golden
-R:697:0x9E/0x93
-
-# The Stormbringer
-R:698:0xB3/0x80
-
-# Knight Templar
-R:699:0xB3/0x81
-
-# Leprechaun fanatic
-R:700:0xA8/0x80
-
-# Dracolich
-R:701:0x9E/0x95
-
-# Greater titan
-R:702:0xA1/0x98
-
-# Dracolisk
-R:703:0x9E/0x94
-
-# Winged Horror
-R:704:0xC4/0x9E
-
-# Spectral tyrannosaur
-R:705:0xB3/0x82
-
-# Yibb-Tstll, the Patient One
-R:706:0xBC/0x9B
-
-# Ghatanothoa
-R:707:0xBC/0x9C
-
-# Ent
-R:708:0xBC/0x86
-
-# Hru
-R:709:0xBC/0x9D
-
-# Itangast the Fire Drake
-R:710:0x9E/0x96
-
-# Death mold
-R:711:0xA9/0x87
-
-# Fafner the Dragon
-R:712:0xB3/0x83
-
-# Charon, Boatman of the Styx
-R:713:0xBC/0x9E
-
-# Quickbeam, the Ent
-R:714:0xBC/0x9F
-
-# Glaurung, Father of the Dragons
-R:715:0xAD/0x9A
-
-# Behemoth
-R:716:0xBD/0x80
-
-# Garm, Guardian of Hel
-R:717:0x9E/0x84
-
-# Greater wall monster
-R:718:0xB3/0x84
-
-# Nycadaemon
-R:719:0xAD/0x91
-
-# Barbazu
-R:720:0xAD/0x95
-
-# Goat of Mendes
-R:721:0xB3/0x85
-
-# Nightwing
-R:722:0xAD/0x9D
-
-# Maulotaur
-R:723:0xB3/0x86
-
-# Nether hound
-R:724:0xA5/0x81
-
-# Time hound
-R:725:0xA5/0x82
-
-# Plasma hound
-R:726:0xA5/0x83
-
-# Demonic quylthulg
-R:727:0xA1/0x9D
-
-# Great Storm Wyrm
-R:728:0x9E/0x97
-
-# Ulik the Troll
-R:729:0xBD/0x81
-
-# Baphomet the Minotaur Lord
-R:730:0xA0/0x90
-
-# Hell knight
-R:731:0xBD/0x82
-
-# Bull Gates
-R:732:0xB3/0x87
-
-# Santa Claus
-R:733:0xB3/0x88
-
-# Eihort, the Thing in the Labyrinth
-R:734:0xBE/0x8A
-
-# The King in Yellow
-R:735:0xBE/0x8B
-
-# Great unclean one
-R:736:0xBE/0x8C
-
-# Lord of Chaos
-R:737:0xB3/0x89
-
-# Old Sorcerer
-R:738:0x9C/0x8A
-
-# Ethereal hound
-R:739:0xB3/0x8A
-
-# Lesser kraken
-R:740:0xBD/0x83
-
-# Great Ice Wyrm
-R:741:0x9E/0x98
-
-# Demilich
-R:742:0xA4/0x8A
-
-# The Phoenix
-R:743:0x9D/0x98
-
-# Nightcrawler
-R:744:0xA4/0x8C
-
-# Lord of Change
-R:745:0xBC/0x87
-
-# Keeper of Secrets
-R:746:0xBE/0x8D
-
-# Shudde M'ell
-R:747:0xBE/0x8E
-
-# Hand druj
-R:748:0xAC/0x8E
-
-# Eye druj
-R:749:0xAC/0x8F
-
-# Skull druj
-R:750:0xAC/0x90
-
-# Chaos vortex
-R:751:0xAC/0x9B
-
-# Aether vortex
-R:752:0xAC/0x9C
-
-# Nidhogg, the Hel-Drake
-R:753:0xBE/0x8F
-
-# The Lernaean Hydra
-R:754:0xA2/0x9B
-
-# Thuringwethil, the Vampire Messenger
-R:755:0xA3/0x9D
-
-# Great Hell Wyrm
-R:756:0x9E/0x99
-
-# Hastur the Unspeakable
-R:757:0xB3/0x8B
-
-# Bloodthirster
-R:758:0xBD/0x84
-
-# Draconic quylthulg
-R:759:0xA1/0x9E
-
-# Nyogtha, the Thing that Should not Be
-R:760:0xB3/0x8C
-
-# Ahtu, Avatar of Nyarlathotep
-R:761:0xBE/0x90
-
-# Fundin Bluecloak
-R:762:0xBE/0x91
-
-# Bile Demon
-R:763:0xC5/0x80
-
-# Uriel, Angel of Fire
-R:764:0x9D/0x94
-
-# Azriel, Angel of Death
-R:765:0x9D/0x95
-
-# Ancalagon the Black
-R:766:0x9E/0x9A
-
-# Daoloth, the Render of the Veils
-R:767:0xBE/0x92
-
-# Nightwalker
-R:768:0xBD/0x85
-
-# Gabriel, the Messenger
-R:769:0x9D/0x96
-
-# Artsi, the Champion of Chaos
-R:770:0xBE/0x93
-
-# Saruman of Many Colours
-R:771:0xAB/0x9E
-
-# Harowen the Black Hand
-R:772:0xBE/0x94
-
-# Osyluth
-R:773:0xC5/0x81
-
-# Dreadlord
-R:774:0xA0/0x86
-
-# Greater kraken
-R:775:0xBD/0x86
-
-# Archlich
-R:776:0xA4/0x8D
-
-# The Cat Lord
-R:777:0xB3/0x8F
-
-# Jabberwock
-R:778:0xC5/0x82
-
-# Chaos hound
-R:779:0xA5/0x85
-
-# Vlad Dracula, Prince of Darkness
-R:780:0xBE/0x95
-
-# Beholder hive-mother
-R:781:0xBE/0x96
-
-# Leviathan
-R:782:0xBD/0x87
-
-# Great Wyrm of Chaos
-R:783:0x9E/0x9B
-
-# Great Wyrm of Law
-R:784:0x9E/0x9C
-
-# Great Wyrm of Balance
-R:785:0x9E/0x9D
-
-# Shambler
-R:786:0xB3/0x91
-
-# Gelugon
-R:787:0xC5/0x83
-
-# Glaaki
-R:788:0xB9/0x88
-
-# T'ron, the Rebel Dragonrider
-R:789:0xB3/0x92
-
-# Great Wyrm of Many Colours
-R:790:0xB3/0x93
-
-# Mardra, rider of the Gold Loranth
-R:791:0xB3/0x94
-
-# Tselakus, the Dreadlord
-R:792:0xA0/0x87
-
-# Sky Drake
-R:793:0xB3/0x95
-
-# Eilinel the Entrapped
-R:794:0xA0/0x83
-
-# Horned Reaper
-R:795:0xC5/0x84
-
-# The Norsa
-R:796:0xB3/0x97
-
-# Rhan-Tegoth
-R:797:0xBE/0x99
-
-# Black reaver
-R:798:0xA1/0x85
-
-# Master mindcrafter
-R:799:0xAB/0x9F
-
-# Greater demonic quylthulg
-R:800:0xA1/0x9F
-
-# Greater draconic quylthulg
-R:801:0xA2/0x80
-
-# Greater rotting quylthulg
-R:802:0xA2/0x81
-
-# Null, the Living Void
-R:803:0xBC/0x88
-
-# Feagwath, the Undead Sorcerer
-R:804:0xA1/0x86
-
-# Omarax the Eye Tyrant
-R:805:0xA7/0x81
-
-# Tsathoggua, the Sleeper of N'kai
-R:806:0xBE/0x9A
-
-# Greater Balrog
-R:807:0xAD/0x93
-
-# Ungoliant, the Unlight
-R:808:0xA3/0x88
-
-# Atlach-Nacha, the Spider God
-R:809:0xB3/0x9A
-
-# Y'golonac
-R:810:0xBE/0x9B
-
-# Aether hound
-R:811:0xA5/0x86
-
-# Pit Fiend
-R:812:0xAD/0x92
-
-# The Serpent of Chaos
-R:813:0xB4/0x8D
-
-# Yig, Father of Serpents
-R:814:0xBE/0x9C
-
-# Unmaker
-R:815:0xB3/0x9C
-
-# Cyberdemon
-R:816:0xB3/0x9D
-
-# Hela, Queen of the Dead
-R:817:0xBE/0x9D
-
-# The Mouth of Sauron
-R:818:0xBE/0x9E
-
-# The Necromancer of Dol Guldur
-R:819:0xB3/0x9E
-
-# Lessa, rider of the Gold Ramoth
-R:820:0xB3/0x9F
-
-# Master quylthulg
-R:821:0xA2/0x82
-
-# Qlzqqlzuup, the Lord of Flesh
-R:822:0xA2/0x83
-
-# Cthugha, the Living Flame
-R:823:0xBE/0x9F
-
-# F'lar, rider of the Bronze Mnementh
-R:824:0xB4/0x80
-
-# Maeglin, the Traitor of Gondolin
-R:825:0xA4/0x8E
-
-# Cyaegha
-R:826:0xBF/0x80
-
-# Pazuzu, Lord of Air
-R:827:0xBF/0x81
-
-# Ithaqua the Windwalker
-R:828:0xB4/0x81
-
-# Greater Hellhound
-R:829:0x9E/0x83
-
-# Cantoras, the Skeletal Lord
-R:830:0xAC/0x91
-
-# Mephistopheles, Lord of Hell
-R:831:0xB4/0x82
-
-# Godzilla
-R:832:0xB4/0x83
-
-# Abhoth, Source of Uncleanness
-R:833:0xBF/0x82
-
-# Ymir, the Ice Giant
-R:834:0xBF/0x83
-
-# Loki, the Trickster
-R:835:0xBF/0x84
-
-# Star-spawn of Cthulhu
-R:836:0xB4/0x84
-
-# Surtur, the Fire Giant
-R:837:0xBF/0x85
-
-# The Tarrasque
-R:838:0xBC/0x93
-
-# Lungorthin, the Balrog of White Fire
-R:839:0xBF/0x86
-
-# Draugluin, Sire of All Werewolves
-R:840:0xBF/0x87
-
-# Shuma-Gorath
-R:841:0xBF/0x88
-
-# Tulzscha, the Green Flame
-R:842:0xBC/0x92
-
-# Oremorj, the Cyberdemon Lord
-R:843:0xBC/0x91
-
-# Vecna, the Emperor Lich
-R:844:0xB4/0x85
-
-# Yog-Sothoth, the All-in-One
-R:845:0xB4/0x86
-
-# Fenris Wolf
-R:846:0xBC/0x90
-
-# Great Wyrm of Power
-R:847:0xB4/0x87
-
-# Shub-Niggurath, Black Goat of the Woods
-R:848:0xB4/0x88
-
-# Nodens, Lord of the Great Abyss
-R:849:0xAB/0x8D
-
-# Carcharoth, the Jaws of Thirst
-R:850:0x9E/0x86
-
-# Nyarlathotep, the Crawling Chaos
-R:851:0xB4/0x89
-
-# Azathoth, the Daemon Sultan
-R:852:0xB4/0x8A
-
-# Huan, Wolfhound of the Valar
-R:853:0x9E/0x87
-
-# Jormungand the Midgard Serpent
-R:854:0xBC/0x8F
-
-# The Destroyer
-R:855:0xBC/0x8E
-
-# Gothmog, the High Captain of Balrogs
-R:856:0xAD/0x98
-
-# Great Cthulhu
-R:857:0xB4/0x8B
-
-# Sorka, rider of the Gold Faranth
-R:858:0xB4/0x8C
-
-# The Unicorn of Order
-R:859:0xBC/0x8D
-
-# Sauron, the Sorcerer
-R:860:0xAC/0x80
-
-# DarkGod, the Mighty Coder of Hell
-R:861:0xC0/0x9D
-
-# Morgoth, Lord of Darkness
-R:862:0xB4/0x8E
-
-# Human Warrior
-R:863:0xB5/0x80
-
-# Elven archer
-R:864:0xB5/0x81
-
-# Dwarven warrior
-R:865:0xB5/0x82
-
-# Elite uruk
-R:866:0xB5/0x83
-
-# The Philosophy Teacher
-R:867:0xBC/0x8C
-
-# The Variant Maintainer
-R:868:0xBC/0x8B
-
-# Random Number Generator
-R:869:0xBC/0x8A
-
-# Rocket mine
-R:870:0xBD/0x88
-
-# Bouncing mine
-R:871:0xBD/0x89
-
-# Durin's Bane
-R:872:0xBF/0x89
-
-# The Icky Queen
-R:873:0xBF/0x8A
-
-# Rot jelly
-R:874:0xBD/0x8A
-
-# Death
-R:875:0xBD/0x8B
-
-# Famine
-R:876:0xBD/0x8D
-
-# Pestilence
-R:877:0xBD/0x8C
-
-# War
-R:878:0xBD/0x8E
-
-# Pike
-R:879:0xBD/0x8F
-
-# Electric eel
-R:880:0xBD/0x90
-
-# Giant crayfish
-R:881:0xBD/0x91
-
-# Mermaid
-R:882:0xBD/0x92
-
-# Box jellyfish
-R:883:0xBA/0x81
-
-# Giant piranha
-R:884:0xB6/0x9D
-
-# Piranha
-R:885:0xB6/0x9D
-
-# Bullywug
-R:886:0xBD/0x94
-
-# Bullywug warrior
-R:887:0xBD/0x95
-
-# Bullywug shaman
-R:888:0xBD/0x96
-
-# Whale
-R:889:0xBA/0x98
-
-# Sand mite
-R:890:0xBD/0x98
-
-# Octopus
-R:891:0xBD/0x99
-
-# Giant octopus
-R:892:0xBD/0x9A
-
-# Eye of the deep
-R:893:0xBD/0x9B
-
-# Murk dweller
-R:894:0xBF/0x8B
-
-# Drowned soul
-R:895:0xBF/0x8C
-
-# Tiger shark
-R:896:0xBF/0x8D
-
-# Hammerhead shark
-R:897:0xBA/0x90
-
-# Great white shark
-R:898:0xBB/0x82
-
-# Aquatic golem
-R:899:0xBF/0x8E
-
-# Aquatic kobold
-R:900:0xBF/0x8F
-
-# White shark
-R:901:0xBB/0x82
-
-# Scrag
-R:902:0xBF/0x91
-
-# Jaws
-R:903:0xBB/0x8C
-
-# Aquatic elf
-R:904:0xBF/0x93
-
-# Aquatic elven warrior
-R:905:0xBF/0x94
-
-# Aquatic elven shaman
-R:906:0xBF/0x95
-
-# Stargazer
-R:907:0xBF/0x96
-
-# Elder stargazer
-R:908:0xBF/0x97
-
-# Flounder
-R:909:0xBF/0x98
-
-# Giant turtle
-R:910:0xBF/0x99
-
-# Baby dragon turtle
-R:911:0xBF/0x9A
-
-# Young dragon turtle
-R:912:0xBF/0x9B
-
-# Mature dragon turtle
-R:913:0xBF/0x9C
-
-# Ancient dragon turtle
-R:914:0xBF/0x9D
-
-# Fastitocalon
-R:915:0xBF/0x9E
-
-# Undead stargazer
-R:916:0xBF/0x9F
-
-# Killer whale
-R:917:0xB9/0x9C
-
-# Merrow
-R:918:0xC5/0x85
-
-# Water naga
-R:919:0xC0/0x81
-
-# Devilfish
-R:920:0xC0/0x82
-
-# Undead devilfish
-R:921:0xC0/0x83
-
-# Moby Dick, the White Whale
-R:922:0xC0/0x80
-
-# Aquatic hound
-R:923:0xC0/0x85
-
-# Water demon
-R:924:0xC0/0x86
-
-# Ixitxachitl
-R:925:0xB8/0x9C
-
-# Ixitxachitl priest
-R:926:0xC0/0x88
-
-# Vampiric ixitxachitl
-R:927:0xC0/0x89
-
-# Mathilde, the Science Student
-R:928:0xBD/0x9C
-
-# Child spirit
-R:929:0xBD/0x9D
-
-# Young spirit
-R:930:0xBD/0x9E
-
-# Mature spirit
-R:931:0xBD/0x9F
-
-# Experienced spirit
-R:932:0xBE/0x80
-
-# Wise spirit
-R:933:0xBE/0x81
-
-# Fangorn the Treebeard, Lord of the Ents
-R:934:0xC0/0x8A
-
-# Gandalf the Grey
-R:935:0xC0/0x8B
-
-# Nar, the Dwarf
-R:936:0xC0/0x8C
-
-# Novice mindcrafter
-R:937:0xAA/0x9A
-
-# Great Swamp Wyrm
-R:938:0xC5/0x86
-
-# Great Bile Wyrm
-R:939:0xC5/0x87
-
-# Blue Firelizard
-R:940:0xBE/0x82
-
-# Green Firelizard
-R:941:0xBE/0x83
-
-# Brown Firelizard
-R:942:0xBE/0x84
-
-# Bronze Firelizard
-R:943:0xBE/0x85
-
-# Gold Firelizard
-R:944:0xBE/0x86
-
-# High-elven ranger
-R:945:0xBE/0x87
-
-# Uvatha the Horseman
-R:946:0xC0/0x90
-
-# Adunaphel the Quiet
-R:947:0xC0/0x91
-
-# Akhorahil the Blind
-R:948:0xC0/0x92
-
-# Ren the Unclean
-R:949:0xC0/0x93
-
-# Ji Indur Dawndeath
-R:950:0xC0/0x94
-
-# Dwar, Dog Lord of Waw
-R:951:0xC0/0x95
-
-# Hoarmurath of Dir
-R:952:0xC0/0x96
-
-# Khamul, the Black Easterling
-R:953:0xC0/0x97
-
-# The Witch-King of Angmar
-R:954:0xC0/0x98
-
-# Green Dragonrider
-R:955:0xB3/0x96
-
-# Blue Dragonrider
-R:956:0xB3/0x8E
-
-# Brown Dragonrider
-R:957:0xB3/0x98
-
-# Bronze Dragonrider
-R:958:0xB3/0x98
-
-# Gold Dragonrider
-R:959:0xB3/0x94
-
-# Thread
-R:960:0xBE/0x88
-
-# Gorlim, Betrayer of Barahir
-R:961:0xC0/0x99
-
-# The Blubbering idiot, agent of black market, Simon the weak
-R:962:0xAA/0x82
-
-# Aranea
-R:963:0xC1/0x9A
-
-# Elder aranea
-R:964:0xC0/0x9A
-
-# Giant brown tick
-R:965:0xC5/0x88
-
-# Dolphiner
-R:966:0xC0/0x9C
-
-# Novice possessor (soul)
-R:967:0xC4/0x86
-
-# Bat of Gorgoroth
-R:968:0xC5/0x97
-
-# The Princess
-R:969:0xC5/0x98
-
-# Merton Proudfoot, the lost hobbit
-R:970:0xC5/0x99
-
-# The Wight-King of the Barrow-downs
-R:971:0xC5/0x9A
-
-# Adventurer
-R:972:0xC5/0x9B
-
-# Experienced possessor (soul)
-R:973:0xC5/0x9C
-
-# Old possessor (soul)
-R:974:0xC5/0x9D
-
-# Death orb
-R:975:0xC5/0x9E
-
-# Bronze dragon worm
-R:976:0xC6/0x80
-
-# Gold dragon worm
-R:977:0xC5/0x9F
-
-# Moldoux, the Defenceless Mold
-R:978:0xBC/0x89
-
-# The Physics Teacher
-R:979:0xBE/0x97
-
-# Ar-Pharazon the Golden
-R:980:0xC0/0x9E
-
-# Doppelganger
-R:981:0x97/0x8C
-
-# Marylene, Heartbreakeress of the Netherworld
-R:982:0xC1/0x8D
-
-# The Greater Lag Monster
-R:983:0xC2/0x8D
-
-# Hrungnir, the Stone Giant
-R:984:0xA7/0x8A
-
-# Bullroarer the Hobbit
-R:985:0xA7/0x9B
-
-# 3-headed hydra
-R:986:0xA2/0x94
-
-# Uldor the Accursed
-R:987:0xAB/0x95
-
-# Mystic
-R:988:0xAB/0x9B
-
-# Elder vampire
-R:989:0xA1/0x99
-
-# Ulfang the Black
-R:990:0xAA/0x96
-
-# Demonologist
-R:991:0xA8/0x82
-
-# Hezrou
-R:992:0xA2/0x9C
-
-# Glabrezu
-R:993:0xA2/0x8E
-
-# Nalfeshnee
-R:994:0xC2/0x8E
-
-# Marilith
-R:995:0xC2/0x8F
-
-# Lesser Balrog
-R:996:0xAD/0x95
-
-# Master mystic
-R:997:0xAA/0x94
-
-# Grand master mystic
-R:998:0xAB/0x9D
-
-# Erinyes
-R:999:0xA0/0x84
-
-# Novice mindcrafter
-R:1000:0xAA/0x9A
-
-# Polyphemus, the Blind Cyclops
-R:1001:0xC5/0x89
-
-# Great Wyrm of Perplexity
-R:1002:0xC2/0x92
-
-# Hound of Tindalos
-R:1003:0xC2/0x93
-
-# Great Wyrm of Thunder
-R:1004:0xC5/0x8A
-
-# Silver mouse
-R:1005:0xC5/0x8B
-
-# The Rat King
-R:1006:0xC2/0x96
-
-# Vort the Kobold Queen
-R:1007:0xC2/0x97
-
-# Giant black louse
-R:1008:0xC2/0x98
-
-# Fire Phantom
-R:1009:0xC2/0x99
-
-# The Insane Player
-R:1010:0x92/0x81
-
-# Glaryssa, Succubus Queen
-R:1011:0xC2/0x9A
-
-# Vermicious Knid
-R:1012:0xC2/0x9B
-
-# Bone golem
-R:1013:0xC2/0x9C
-
-# Snake of Yig
-R:1014:0xC2/0x9D
-
-# Bronze golem
-R:1015:0xC5/0x8C
-
-# Dimensional shambler
-R:1016:0xC2/0x9F
-
-# Cultist
-R:1017:0x94/0x99
-
-# Cult leader
-R:1018:0x99/0x97
-
-# Servitor of the outer gods
-R:1019:0xC3/0x8A
-
-# Avatar of Nyarlathotep
-R:1020:0xC3/0x8B
-
-# Thiazi, the Storm Giant
-R:1021:0xC5/0x8D
-
-# Hypnos, Lord of Sleep
-R:1022:0xC3/0x8D
-
-# Blue dragon worm
-R:1023:0xC3/0x8E
-
-# White dragon worm
-R:1024:0xC3/0x8F
-
-# Green dragon worm
-R:1025:0xC3/0x92
-
-# Black dragon worm
-R:1026:0xC3/0x91
-
-# Red dragon worm
-R:1027:0xC3/0x90
-
-# Multi-hued dragon worm
-R:1028:0xC3/0x93
-
-# The Minotaur of the Labyrinth
-R:1029:0xC3/0x94
-
-# The Sandworm Queen
-R:1030:0xC3/0x9B
-
-# Sandworm
-R:1031:0xC3/0x9C
-
-# Tik'srvzllat
-R:1032:0xC3/0x9D
-
-# The Glass Golem
-R:1033:0xC5/0x8E
-
-# The White Balrog
-R:1034:0xC5/0x8F
-
-# Golgarach, the Living Rock
-R:1035:0x80/0x84
-
-# Atlas, the Titan
-R:1036:0xC5/0x90
-
-# Kronos, Lord of the Titans
-R:1037:0xC5/0x91
-
-# Water hound
-R:1038:0xC6/0x88
-
-# Improv, the mighty MoLD
-R:1039:0xC6/0x8E
-
-# Emperor Mimic
-R:1040:0xC6/0x9C
-
-# Melinda Proudfoot
-R:1041:0x88/0xAA
-
-# Thrain, the King Under the Mountain
-R:1042:0x88/0xAB
-
-# Spells (*)
-S:48:0x91/0x88
-S:49:0x91/0x89
-S:50:0x91/0x8A
-S:51:0x91/0x8B
-S:52:0x91/0x8C
-S:53:0x91/0x8D
-S:54:0x91/0x8E
-S:55:0x91/0x8F
-S:56:0x91/0x90
-S:57:0x91/0x91
-S:58:0x91/0x92
-S:59:0x91/0x93
-S:60:0x91/0x94
-S:61:0x91/0x95
-S:62:0x91/0x96
-S:63:0x91/0x97
-
-# Spells (|)
-S:64:0x8F/0x80
-S:65:0x8F/0x84
-S:66:0x8F/0x88
-S:67:0x8F/0x8C
-S:68:0x8F/0x90
-S:69:0x8F/0x94
-S:70:0x8F/0x98
-S:71:0x8F/0x9C
-S:72:0x90/0x80
-S:73:0x90/0x84
-S:74:0x90/0x88
-S:75:0x90/0x8C
-S:76:0x90/0x90
-S:77:0x90/0x94
-S:78:0x90/0x98
-S:79:0x90/0x9C
-
-# Spells (-)
-S:80:0x8F/0x81
-S:81:0x8F/0x85
-S:82:0x8F/0x89
-S:83:0x8F/0x8D
-S:84:0x8F/0x91
-S:85:0x8F/0x95
-S:86:0x8F/0x99
-S:87:0x8F/0x9D
-S:88:0x90/0x81
-S:89:0x90/0x85
-S:90:0x90/0x89
-S:91:0x90/0x8D
-S:92:0x90/0x91
-S:93:0x90/0x95
-S:94:0x90/0x99
-S:95:0x90/0x9D
-
-# Spells (/)
-S:96:0x8F/0x82
-S:97:0x8F/0x86
-S:98:0x8F/0x8A
-S:99:0x8F/0x8E
-S:100:0x8F/0x92
-S:101:0x8F/0x96
-S:102:0x8F/0x9A
-S:103:0x8F/0x9E
-S:104:0x90/0x82
-S:105:0x90/0x86
-S:106:0x90/0x8A
-S:107:0x90/0x8E
-S:108:0x90/0x92
-S:109:0x90/0x96
-S:110:0x90/0x9A
-S:111:0x90/0x9E
-
-# Spells (\)
-S:112:0x8F/0x83
-S:113:0x8F/0x87
-S:114:0x8F/0x8B
-S:115:0x8F/0x8F
-S:116:0x8F/0x93
-S:117:0x8F/0x97
-S:118:0x8F/0x9B
-S:119:0x8F/0x9F
-S:120:0x90/0x83
-S:121:0x90/0x87
-S:122:0x90/0x8B
-S:123:0x90/0x8F
-S:124:0x90/0x93
-S:125:0x90/0x97
-S:126:0x90/0x9B
-S:127:0x90/0x9F
-
-# Amulets (")
-S:128:0x87/0x87
-S:129:0x87/0x80
-S:130:0x87/0x88
-S:131:0x87/0x82
-S:132:0x87/0x83
-S:133:0x87/0x84
-S:134:0x87/0x85
-S:135:0x87/0x86
-S:136:0x87/0x81
-S:137:0x87/0x81
-S:138:0x87/0x89
-S:139:0x87/0x8A
-S:140:0x87/0x8B
-S:141:0x87/0x8C
-S:142:0x87/0x8D
-S:143:0x87/0x8E
-
-# Rings (=)
-S:144:0x84/0x87
-S:145:0x84/0x80
-S:146:0x84/0x88
-S:147:0x84/0x82
-S:148:0x84/0x83
-S:149:0x84/0x84
-S:150:0x84/0x85
-S:151:0x84/0x86
-S:152:0x84/0x81
-S:153:0x84/0x81
-S:154:0x84/0x89
-S:155:0x84/0x8A
-S:156:0x84/0x8B
-S:157:0x84/0x8C
-S:158:0x84/0x8D
-S:159:0x84/0x8E
-
-# Staffs (_)
-S:160:0x87/0x96
-S:161:0x87/0x95
-S:162:0x87/0x95
-S:163:0x87/0x92
-S:164:0x87/0x92
-S:165:0x87/0x93
-S:166:0x87/0x95
-S:167:0x87/0x90
-S:168:0x87/0x95
-S:169:0x87/0x95
-S:170:0x87/0x92
-S:171:0x87/0x94
-S:172:0x87/0x92
-S:173:0x87/0x93
-S:174:0x87/0x96
-S:175:0x87/0x90
-
-# Wands (-)
-S:176:0x86/0x97
-S:177:0x86/0x90
-S:178:0x86/0x98
-S:179:0x86/0x92
-S:180:0x86/0x93
-S:181:0x86/0x94
-S:182:0x86/0x95
-S:183:0x86/0x96
-S:184:0x86/0x91
-S:185:0x86/0x91
-S:186:0x86/0x99
-S:187:0x86/0x9A
-S:188:0x86/0x9B
-S:189:0x86/0x9C
-S:190:0x86/0x9D
-S:191:0x86/0x9E
-
-# Rods (-)
-S:192:0x86/0x87
-S:193:0x86/0x80
-S:194:0x86/0x88
-S:195:0x86/0x82
-S:196:0x86/0x83
-S:197:0x86/0x84
-S:198:0x86/0x85
-S:199:0x86/0x86
-S:200:0x86/0x81
-S:201:0x86/0x81
-S:202:0x86/0x89
-S:203:0x86/0x8A
-S:204:0x86/0x8B
-S:205:0x86/0x8C
-S:206:0x86/0x8D
-S:207:0x86/0x8E
-
-# Scrolls (?)
-S:208:0x83/0x9C
-S:209:0x83/0x9D
-S:210:0x83/0x9E
-S:211:0x83/0x9F
-S:212:0x83/0x9C
-S:213:0x83/0x9D
-S:214:0x83/0x9E
-S:215:0x83/0x9F
-S:216:0x83/0x9C
-S:217:0x83/0x9D
-S:218:0x83/0x9E
-S:219:0x83/0x9F
-S:220:0x83/0x9C
-S:221:0x83/0x9D
-S:222:0x83/0x9E
-S:223:0x83/0x9F
-
-# Potions (!)
-S:224:0x85/0x87
-S:225:0x85/0x80
-S:226:0x85/0x88
-S:227:0x85/0x82
-S:228:0x85/0x83
-S:229:0x85/0x84
-S:230:0x85/0x85
-S:231:0x85/0x86
-S:232:0x85/0x81
-S:233:0x85/0x81
-S:234:0x85/0x89
-S:235:0x85/0x8A
-S:236:0x85/0x8B
-S:237:0x85/0x8C
-S:238:0x85/0x8D
-S:239:0x85/0x8E
-
-# Food (,)
-S:240:0x85/0x97
-S:241:0x85/0x90
-S:242:0x85/0x98
-S:243:0x85/0x92
-S:244:0x85/0x93
-S:245:0x85/0x94
-S:246:0x85/0x95
-S:247:0x85/0x96
-S:248:0x85/0x91
-S:249:0x85/0x91
-S:250:0x85/0x99
-S:251:0x85/0x9A
-S:252:0x85/0x9B
-S:253:0x85/0x9C
-S:254:0x85/0x9D
-S:255:0x85/0x9E
-
-# Fire golem
-R:1043:0x8C/0xA0
-
-# Melkor, Lord of Darkness
-R:1044:0x8C/0xA1
-
-# & piece~ of a Relic of Eru
-K:814:0x8C/0xA2
-
-# & piece~ of a Relic of Manwe
-K:815:0x8C/0xA3
-
-# & piece~ of a Relic of Tulkas
-K:816:0x8C/0xA4
-
-# & piece~ of a Relic of Melkor
-K:817:0x8C/0xA5
-
-# rocky ground
-F:207:0x8D/0xA0
-
-# cloud-like vapour
-F:208:0x8D/0xA1
-
-# condensing water
-F:209:0x8D/0xA2
-
-# dense mist
-F:210:0x8D/0xA3
-
-# hail-stone wall
-F:211:0x8D/0xA4
-
-# Mining Supply store
-B:59:0x87/0xAE
-
-# & piece~ of a Relic of Yavanna
-K:818:0x8C/0xA6
-
-# Elven
-G:M:12:0x91/0xA1
-
-# Dwarven
-G:M:13:0x91/0xA0
-
-# Spirit
-R:1045:0x92/0x9F
-R:1046:0x92/0xA0
-R:1047:0x92/0xA1
-R:1048:0x92/0xA2
-R:1049:0x92/0xA3
-R:1050:0x92/0xA4
-R:1051:0x92/0xA5
-R:1052:0x92/0xA6
-R:1053:0x92/0xA7
-R:1054:0x92/0xA8
-R:1055:0x92/0xA9
-R:1056:0x92/0xAA
-R:1057:0x92/0xA3
-R:1058:0x92/0xAB
-R:1059:0x92/0xAC
-R:1060:0x92/0xAD
-R:1061:0x92/0xAE
-R:1062:0x92/0xAF
-R:1063:0x92/0xB0
-R:1064:0x92/0xB1
-R:1065:0x92/0xB2
-R:1066:0x92/0xB3
-R:1067:0x92/0xB4
-R:1068:0x92/0xB5
-R:1069:0x92/0xB6
-R:1070:0x92/0xB7
-R:1071:0x92/0xB8
-R:1072:0x92/0xB9
-R:1073:0x92/0xBA
-R:1074:0x92/0xBB
-R:1075:0x92/0xBC
-
-# & Spellbook~ of #
-K:757:0x91/0xA4
-
-# Weakness Trap
-#G:T:1:0xFF/0xFF
-#G:T:2:0xFF/0xFF
-#G:T:3:0xFF/0xFF
-
-# Intelligence Trap
-#G:T:4:0xFF/0xFF
-#G:T:5:0xFF/0xFF
-#G:T:6:0xFF/0xFF
-
-# Wisdom Trap
-#G:T:7:0xFF/0xFF
-#G:T:8:0xFF/0xFF
-#G:T:9:0xFF/0xFF
-
-# Fumbling Fingers Trap
-#G:T:10:0xFF/0xFF
-#G:T:11:0xFF/0xFF
-#G:T:12:0xFF/0xFF
-
-# Wasting Trap
-#G:T:13:0xFF/0xFF
-#G:T:14:0xFF/0xFF
-#G:T:15:0xFF/0xFF
-
-# Beauty Trap
-#G:T:16:0xFF/0xFF
-#G:T:17:0xFF/0xFF
-#G:T:18:0xFF/0xFF
-
-# Trap of Curse Weapon
-#G:T:20:0xFF/0xFF
-
-# Trap of Curse Armor
-#G:T:21:0xFF/0xFF
-
-# Earthquake Trap
-#G:T:22:0xFF/0xFF
-
-# Poison Needle Trap
-#G:T:23:0xFF/0xFF
-
-# Summon Monster Trap
-#G:T:24:0xFF/0xFF
-
-# Summon Undead Trap
-#G:T:25:0xFF/0xFF
-
-# Summon Greater Undead Trap
-#G:T:26:0xFF/0xFF
-
-# Teleport Trap
-#G:T:27:0xFF/0xFF
-
-# Paralyzing Trap
-#G:T:28:0xFF/0xFF
-
-# Explosive Device
-#G:T:29:0xFF/0xFF
-
-# Teleport Item Trap
-#G:T:30:0xFF/0xFF
-
-# Lose Memory Trap
-#G:T:31:0xFF/0xFF
-
-# Bitter Regret Trap
-#G:T:32:0xFF/0xFF
-
-# Bowel Cramps Trap
-#G:T:33:0xFF/0xFF
-
-# Blindness
-#G:T:34:0xFF/0xFF
-
-# Aggravation Trap
-#G:T:35:0xFF/0xFF
-
-# Multiplication Trap
-#G:T:36:0xFF/0xFF
-
-# Steal Item Trap
-#G:T:37:0xFF/0xFF
-
-# Summon Fast Quylthulgs Trap
-#G:T:38:0xFF/0xFF
-
-# Trap of Sinking
-#G:T:39:0xFF/0xFF
-
-# Trap of Mana Drain
-#G:T:40:0xFF/0xFF
-
-# Trap of Missing Money
-#G:T:41:0xFF/0xFF
-
-# Trap of No Return
-#G:T:42:0xFF/0xFF
-
-# Trap of Silent Switching
-#G:T:43:0xFF/0xFF
-
-# Trap of Walls
-#G:T:44:0xFF/0xFF
-
-# Trap of Calling Out
-#G:T:45:0xFF/0xFF
-
-# Trap of Sliding
-#G:T:46:0xFF/0xFF
-
-# Trap of Charges Drain
-#G:T:47:0xFF/0xFF
-
-# Trap of Stair Movement
-#G:T:48:0xFF/0xFF
-
-# Trap of New Trap
-#G:T:49:0xFF/0xFF
-
-# Trap of Scatter Items
-#G:T:50:0xFF/0xFF
-
-# Trap of Decay
-#G:T:51:0xFF/0xFF
-
-# Trap of Wasting Wands
-#G:T:52:0xFF/0xFF
-
-# Trap of Filling
-#G:T:53:0xFF/0xFF
-
-# Trap of Drain Speed
-#G:T:54:0xFF/0xFF
-
-# Lightning Bolt Trap
-#G:T:60:0xFF/0xFF
-
-# Poison Bolt Trap
-#G:T:61:0xFF/0xFF
-
-# Acid Bolt Trap
-#G:T:62:0xFF/0xFF
-
-# Cold Bolt Trap
-#G:T:63:0xFF/0xFF
-
-# Fire Bolt Trap
-#G:T:64:0xFF/0xFF
-
-# Plasma Bolt Trap
-#G:T:65:0xFF/0xFF
-
-# Water Bolt Trap
-#G:T:66:0xFF/0xFF
-
-# Lite Bolt Trap
-#G:T:67:0xFF/0xFF
-
-# Dark Bolt Trap
-#G:T:68:0xFF/0xFF
-
-# Shards Bolt Trap
-#G:T:69:0xFF/0xFF
-
-# Sound Bolt Trap
-#G:T:70:0xFF/0xFF
-
-# Confusion Bolt Trap
-#G:T:71:0xFF/0xFF
-
-# Force Bolt Trap
-#G:T:72:0xFF/0xFF
-
-# Inertia Bolt Trap
-#G:T:73:0xFF/0xFF
-
-# Mana Bolt Trap
-#G:T:74:0xFF/0xFF
-
-# Ice Bolt Trap
-#G:T:75:0xFF/0xFF
-
-# Chaos Bolt Trap
-#G:T:76:0xFF/0xFF
-
-# Nether Bolt Trap
-#G:T:77:0xFF/0xFF
-
-# Disenchantment Bolt Trap
-#G:T:78:0xFF/0xFF
-
-# Nexus Bolt Trap
-#G:T:79:0xFF/0xFF
-
-# Time Bolt Trap
-#G:T:80:0xFF/0xFF
-
-# Gravity Bolt Trap
-#G:T:81:0xFF/0xFF
-
-# Lightning Ball Trap
-#G:T:82:0xFF/0xFF
-
-# Poison Ball Trap
-#G:T:83:0xFF/0xFF
-
-# Acid Ball Trap
-#G:T:84:0xFF/0xFF
-
-# Cold Ball Trap
-#G:T:85:0xFF/0xFF
-
-# Fire Ball Trap
-#G:T:86:0xFF/0xFF
-
-# Plasma Ball Trap
-#G:T:87:0xFF/0xFF
-
-# Water Ball Trap
-#G:T:88:0xFF/0xFF
-
-# Light Ball Trap
-#G:T:89:0xFF/0xFF
-
-# Darkness Ball Trap
-#G:T:90:0xFF/0xFF
-
-# Shards Ball Trap
-#G:T:91:0xFF/0xFF
-
-# Sound Ball Trap
-#G:T:92:0xFF/0xFF
-
-# Confusion Ball Trap
-#G:T:93:0xFF/0xFF
-
-# Force Ball Trap
-#G:T:94:0xFF/0xFF
-
-# Inertia Ball Trap
-#G:T:95:0x82/0xBF
-
-# Mana Ball Trap
-#G:T:96:0xFF/0xFF
-
-# Ice Ball Trap
-#G:T:97:0xFF/0xFF
-
-# Chaos Ball Trap
-#G:T:98:0xFF/0xFF
-
-# Nether Ball Trap
-#G:T:99:0xFF/0xFF
-
-# Disenchantment Ball Trap
-#G:T:100:0xFF/0xFF
-
-# Nexus Ball Trap
-#G:T:101:0xFF/0xFF
-
-# Time Ball Trap
-#G:T:102:0xFF/0xFF
-
-# Gravity Ball Trap
-#G:T:103:0xFF/0xFF
-
-# Arrow Trap
-#G:T:110:0xFF/0xFF
-
-# Bolt Trap
-#G:T:111:0xFF/0xFF
-
-# Seeker Arrow Trap
-#G:T:112:0xFF/0xFF
-
-# Seeker Bolt Trap
-#G:T:113:0xFF/0xFF
-
-# Poison Arrow Trap
-#G:T:114:0xFF/0xFF
-
-# Poison Bolt Trap
-#G:T:115:0xFF/0xFF
-
-# Poison Seeker Arrow Trap
-#G:T:116:0xFF/0xFF
-
-# Poison Seeker Bolt Trap
-#G:T:117:0xFF/0xFF
-
-# Broken Dagger Trap
-#G:T:118:0xFF/0xFF
-
-# Dagger Trap
-#G:T:119:0xFF/0xFF
-
-# Poison Broken Dagger Trap
-#G:T:120:0xFF/0xFF
-
-# Poison Dagger Trap
-#G:T:121:0xFF/0xFF
-
-# Arrows Trap
-#G:T:122:0xFF/0xFF
-
-# Bolts Trap
-#G:T:123:0xFF/0xFF
-
-# Seeker Arrow Trap
-#G:T:124:0xFF/0xFF
-
-# Seeker Bolt Trap
-#G:T:125:0xFF/0xFF
-
-# Poison Arrows Trap
-#G:T:126:0xFF/0xFF
-
-# Poison Bolt Trap
-#G:T:127:0xFF/0xFF
-
-# Poison Seeker Arrows Trap
-#G:T:128:0xFF/0xFF
-
-# Poison Seeker Bolts Trap
-#G:T:129:0xFF/0xFF
-
-# Broken Daggers Trap
-#G:T:130:0xFF/0xFF
-
-# Dagger Trap
-#G:T:131:0xFF/0xFF
-
-# Poison Broken Daggers Trap
-#G:T:132:0xFF/0xFF
-
-# Poison Daggers Trap
-#G:T:133:0xFF/0xFF
-
-# Trap of Drop Item
-#G:T:140:0xFF/0xFF
-
-# Trap of Drop Items
-#G:T:141:0xFF/0xFF
-
-# Trap of Drop Everything
-#G:T:142:0xFF/0xFF
-
-# Trap of Femininity
-#G:T:150:0xFF/0xFF
-
-# Trap of Masculinity
-#G:T:151:0xFF/0xFF
-
-# Trap of Neutrality
-#G:T:152:0xFF/0xFF
-
-# Trap of Aging
-#G:T:153:0xFF/0xFF
-
-# Trap of Growing
-#G:T:154:0xFF/0xFF
-
-# Trap of Shrinking
-#G:T:155:0xFF/0xFF
-
-# Trap of Tanker Drain
-#G:T:157:0xFF/0xFF
-
-# Trap of Divine Anger
-#G:T:158:0xFF/0xFF
-
-# Trap of Divine Wrath
-#G:T:159:0xFF/0xFF
-
-# Hallucination Trap
-#G:T:160:0xFF/0xFF
-
-# Greater Magic Missile Trap
-#G:T:161:0xFF/0xFF
-
-# Foulness Trap
-#G:T:162:0xFF/0xFF
-
-# Trap of Holy Fire
-#G:T:164:0xFF/0xFF
-
-# Trap of Hell Fire
-#G:T:165:0xFF/0xFF
-
-# Psi Bolt Trap
-#G:T:166:0xFF/0xFF
-
-# Psi Drain Trap
-#G:T:167:0xFF/0xFF
-
-# Plasma Ball Trap
-#G:T:168:0xFF/0xFF
-
-# Psi Ball Trap
-#G:T:169:0xFF/0xFF
-
-# Acquirement Trap
-#G:T:170:0xFF/0xFF
-
-# Greater Lightning Bolt Trap
-#G:T:171:0xFF/0xFF
-
-# Greater Poison Bolt Trap
-#G:T:172:0xFF/0xFF
-
-# Greater Acid Bolt Trap
-#G:T:173:0xFF/0xFF
-
-# Greater Cold Bolt Trap
-#G:T:174:0xFF/0xFF
-
-# Greater Fire Bolt Trap
-#G:T:175:0xFF/0xFF
-# non-defines encountered :
-# Load the special player pictures
-%:xtra-new.prf
diff --git a/lib/pref/graf-sdl.prf b/lib/pref/graf-sdl.prf
deleted file mode 100644
index 818f876a..00000000
--- a/lib/pref/graf-sdl.prf
+++ /dev/null
@@ -1,37 +0,0 @@
-# File: graf-x11.prf
-
-
-# Font stuff
-%:font-x11.prf
-
-
-# Color palette - Graphics
-
-#V:16:0x01:0x00:0x00:0x00
-#V:17:0x01:0xF0:0xE0:0xD0
-#V:18:0x01:0x80:0x80:0x80
-#V:19:0x01:0x50:0x50:0x50
-#V:20:0x01:0xE0:0xB0:0x00
-#V:21:0x01:0xC0:0xA0:0x70
-#V:22:0x01:0x80:0x60:0x40
-#V:23:0x01:0x50:0x3C:0x28
-#V:24:0x01:0x00:0xA0:0xF0
-#V:25:0x01:0x00:0x00:0xF0
-#V:26:0x01:0x00:0x00:0x70
-#V:27:0x01:0xF0:0x00:0x00
-#V:28:0x01:0x80:0x00:0x00
-#V:29:0x01:0x90:0x00:0xB0
-#V:30:0x01:0x00:0x60:0x10
-#V:31:0x01:0x60:0xF0:0x40
-
-
-# Standard file
-?:[EQU $GRAF old]
-%:graf-xxx.prf
-
-# New tiles
-?:[EQU $GRAF new]
-%:graf-new.prf
-
-?:1
-
diff --git a/lib/pref/graf-win.prf b/lib/pref/graf-win.prf
deleted file mode 100644
index f59edb35..00000000
--- a/lib/pref/graf-win.prf
+++ /dev/null
@@ -1,16 +0,0 @@
-# File: graf-win.prf
-
-#
-# This file defines special attr/char mappings for use in "graphics" mode
-#
-# See "lib/help/command.txt" and "src/files.c" for more information.
-#
-
-
-# Standard file
-?:[EQU $GRAF old]
-%:graf-xxx.prf
-
-# New tiles
-?:[EQU $GRAF new]
-%:graf-new.prf
diff --git a/lib/pref/graf-x11.prf b/lib/pref/graf-x11.prf
deleted file mode 100644
index 818f876a..00000000
--- a/lib/pref/graf-x11.prf
+++ /dev/null
@@ -1,37 +0,0 @@
-# File: graf-x11.prf
-
-
-# Font stuff
-%:font-x11.prf
-
-
-# Color palette - Graphics
-
-#V:16:0x01:0x00:0x00:0x00
-#V:17:0x01:0xF0:0xE0:0xD0
-#V:18:0x01:0x80:0x80:0x80
-#V:19:0x01:0x50:0x50:0x50
-#V:20:0x01:0xE0:0xB0:0x00
-#V:21:0x01:0xC0:0xA0:0x70
-#V:22:0x01:0x80:0x60:0x40
-#V:23:0x01:0x50:0x3C:0x28
-#V:24:0x01:0x00:0xA0:0xF0
-#V:25:0x01:0x00:0x00:0xF0
-#V:26:0x01:0x00:0x00:0x70
-#V:27:0x01:0xF0:0x00:0x00
-#V:28:0x01:0x80:0x00:0x00
-#V:29:0x01:0x90:0x00:0xB0
-#V:30:0x01:0x00:0x60:0x10
-#V:31:0x01:0x60:0xF0:0x40
-
-
-# Standard file
-?:[EQU $GRAF old]
-%:graf-xxx.prf
-
-# New tiles
-?:[EQU $GRAF new]
-%:graf-new.prf
-
-?:1
-
diff --git a/lib/pref/graf-xxx.prf b/lib/pref/graf-xxx.prf
deleted file mode 100644
index bea696d9..00000000
--- a/lib/pref/graf-xxx.prf
+++ /dev/null
@@ -1,6348 +0,0 @@
-# PRF file generated by Andreas Koch`s Tile Assigner
-# 23/06/2004 : Edited manually
-
-# 2185 items 
-# 2185 probably mapped correctly
-# 0 imported but not yet defined
-# 0 defined to value(s) lower than 0x80
-# Old header :
-### Special attr:char values ###
-# # Unused (@)
-# S:0x00:0x00:0x40
-# S:0x01:0x01:0x40
-# S:0x02:0x02:0x40
-# S:0x03:0x03:0x40
-# S:0x04:0x04:0x40
-# S:0x05:0x05:0x40
-# S:0x06:0x06:0x40
-# S:0x07:0x07:0x40
-# S:0x08:0x08:0x40
-# S:0x09:0x09:0x40
-# S:0x0A:0x0A:0x40
-# S:0x0B:0x0B:0x40
-# S:0x0C:0x0C:0x40
-# S:0x0D:0x0D:0x40
-# S:0x0E:0x0E:0x40
-# S:0x0F:0x0F:0x40
-# # Unused (@)
-# S:0x10:0x00:0x40
-# S:0x11:0x01:0x40
-# S:0x12:0x02:0x40
-# S:0x13:0x03:0x40
-# S:0x14:0x04:0x40
-# S:0x15:0x05:0x40
-# S:0x16:0x06:0x40
-# S:0x17:0x07:0x40
-# S:0x18:0x08:0x40
-# S:0x19:0x09:0x40
-# S:0x1A:0x0A:0x40
-# S:0x1B:0x0B:0x40
-# S:0x1C:0x0C:0x40
-# S:0x1D:0x0D:0x40
-# S:0x1E:0x0E:0x40
-# S:0x1F:0x0F:0x40
-# # Unused (@)
-# S:0x20:0x00:0x40
-# S:0x21:0x01:0x40
-# S:0x22:0x02:0x40
-# S:0x23:0x03:0x40
-# S:0x24:0x04:0x40
-# S:0x25:0x05:0x40
-# S:0x26:0x06:0x40
-# S:0x27:0x07:0x40
-# S:0x28:0x08:0x40
-# S:0x29:0x09:0x40
-# S:0x2A:0x0A:0x40
-# S:0x2B:0x0B:0x40
-# S:0x2C:0x0C:0x40
-# S:0x2D:0x0D:0x40
-# S:0x2E:0x0E:0x40
-# S:0x2F:0x0F:0x40
-
-# General Store
-B:0:0x81/0x91
-
-# Armoury
-B:1:0x81/0x92
-
-# Weapon Smiths
-B:2:0x81/0x93
-
-# Temple
-B:3:0x81/0x94
-
-# Alchemy Shop
-B:4:0x81/0x95
-
-# Magic Shop
-B:5:0x81/0x96
-
-# Black Market
-B:6:0x81/0x97
-
-# Home
-B:7:0x81/0x98
-
-# Bookstore
-B:8:0x82/0x93
-
-# Pet Shop
-B:9:0xCB/0x96
-
-# Mayor's Office
-B:10:0xCB/0x92
-
-# Inn
-B:11:0xCB/0x95
-
-# The Soothsayer
-B:12:0xD4/0x85
-
-# Library
-B:13:0xD4/0x89
-
-# Castle
-B:14:0xCB/0x92
-
-# Casino
-B:15:0xD5/0x81
-
-# Beastmaster Shanty
-B:16:0xD3/0x8B
-
-# Fighters Hall
-B:17:0xD3/0x8C
-
-# Tower of Magery
-B:18:0xD4/0x8B
-
-# Inner Temple
-B:19:0xD4/0x9D
-
-# Paladins Guild
-B:20:0xCB/0x8F
-
-# Rangers Guild
-B:21:0xD3/0x83
-
-# Weyr
-B:22:0xCB/0x93
-
-# The Mirror
-B:23:0xD4/0x89
-
-# Seat of Ruling
-B:24:0xCB/0x92
-
-# Wizards Spire
-B:25:0xD4/0x8A
-
-# Priests Circle
-B:26:0xD4/0x92
-
-# Tower of the King
-B:27:0xCB/0x92
-
-# Library
-B:28:0xD4/0x89
-
-# The White Tree
-B:29:0xCB/0x95
-
-# Craftsmaster
-B:30:0xCB/0x97
-
-# Earth-Dome (Nature)
-B:31:0xCB/0x9A
-
-# Minstrels Haven
-B:32:0xD3/0x9F
-
-# Star-Dome
-B:33:0xD4/0x8C
-
-# Valarin Temple
-B:34:0xD4/0x90
-
-# Sea-Dome
-B:35:0xD4/0x91
-
-# The Golden Flower
-B:36:0xD3/0x83
-
-# The Fountain
-B:37:0xD4/0x9D
-
-# Axe Smith
-B:38:0xCC/0x96
-
-# Hafted Smith
-B:39:0xCC/0x97
-
-# Polearm Smith
-B:40:0xCC/0x98
-
-# Sword Smith
-B:41:0xCC/0x80
-
-# Rare Jewelry Shop
-B:42:0xD3/0x96
-
-# Jewelry Shop
-B:43:0xD3/0x93
-
-# Footwear Shop
-B:44:0xD3/0x9D
-
-# Rare Footwear Shop
-B:45:0xD3/0x9E
-
-# Library
-B:46:0xD3/0x9C
-
-# Forbidden Library
-B:47:0xD4/0x8F
-
-# Expensive Black Market
-B:48:0xD4/0x95
-
-# Common Shop
-B:49:0xD4/0x93
-
-# Dragon Hunter
-B:50:0xCC/0x89
-
-# Speed Ring Market
-B:51:0xD3/0x97
-
-# Scribe
-B:52:0xD4/0x86
-
-# Potion Store
-B:53:0xD4/0x80
-
-# Recaller
-B:54:0xD4/0x88
-
-# Master Archer
-B:55:0xD3/0x85
-
-# Merchants Guild
-B:56:0xD4/0x9B
-
-# The Mathom-house
-B:57:0xCB/0x9B
-
-# The Prancing Pony
-B:58:0xCB/0x95
-
-# nothing
-F:0:0x81/0x80
-
-# open floor
-F:1:0x80/0x80
-
-# fountain - wet
-F:2:0xD1/0x83
-
-# glyph of warding
-F:3:0xA2/0x88
-
-# open door
-F:4:0x81/0x87
-
-# broken door
-F:5:0x81/0x87
-
-# up staircase
-F:6:0x81/0x9C
-
-# down staircase
-F:7:0x81/0x9E
-
-# quest entrance
-F:8:0x82/0x8E
-
-# quest exit
-F:9:0x82/0x8B
-
-# quest down level
-F:10:0x82/0x8F
-
-# quest up level
-F:11:0x82/0x8C
-
-# town exit
-F:12:0x82/0x91
-
-# shaft down
-F:13:0x82/0x90
-
-# shaft up
-F:14:0x82/0x8D
-
-# fountain
-F:15:0xD1/0x82
-
-# web
-F:16:0x82/0x92
-
-# Open pit
-F:17:0xA2/0x96
-
-# Spiked Pit
-F:18:0xA2/0x96
-
-# Poison Pit
-F:19:0xA2/0x96
-
-# Summon Rune
-F:20:0x8A/0x9C
-
-# Teleport Rune
-F:21:0x8A/0x9C
-
-# Fire spot
-F:22:0x8A/0x9B
-
-# Acid spot
-F:23:0x8A/0x9B
-
-# Slow dart trap
-F:24:0x82/0x9E
-
-# Lose str dart
-F:25:0xA2/0x89
-
-# Lose dex dart
-F:26:0xA2/0x8D
-
-# Lose con dart
-F:27:0xA2/0x92
-
-# gas trap - blind
-F:28:0xA2/0x8E
-
-# gas trap - confuse
-F:29:0xA2/0x8F
-
-# gas trap - poison
-F:30:0xA2/0x90
-
-# gas trap - sleep
-F:31:0xA2/0x91
-
-# door
-F:32:0x81/0x8B
-
-# locked door
-F:33:0x81/0x8B
-F:34:0x81/0x8B
-F:35:0x81/0x8B
-F:36:0x81/0x8B
-F:37:0x81/0x8B
-F:38:0x81/0x8B
-F:39:0x81/0x8B
-
-# jammed door
-F:40:0x81/0x8B
-F:41:0x81/0x8B
-F:42:0x81/0x8B
-F:43:0x81/0x8B
-F:44:0x81/0x8B
-F:45:0x81/0x8B
-F:46:0x81/0x8B
-F:47:0x81/0x8B
-
-# secret door
-F:48:0x80/0x82
-
-# pile of rubble
-F:49:0x81/0x9A
-
-# magma vein
-F:50:0x81/0x83
-
-# quartz vein
-F:51:0x80/0x83
-
-# magma vein
-F:52:0x81/0x83
-
-# quartz vein
-F:53:0x80/0x83
-
-# magma vein with treasure
-F:54:0x80/0x84
-
-# quartz vein with treasure
-F:55:0x80/0x84
-
-# granite wall
-F:56:0x80/0x82
-F:57:0x80/0x82
-F:58:0x80/0x82
-F:59:0x80/0x82
-
-# permanent wall
-F:60:0x80/0x95
-F:61:0x80/0x95
-F:62:0x80/0x95
-F:63:0x80/0x95
-
-# explosive rune
-F:64:0xA2/0x87
-
-# Straight Road startpoint
-F:65:0xA3/0x9D
-
-# section of the Straight Road
-F:66:0xA3/0x97
-F:67:0xA3/0x9C
-F:68:0xA3/0x9B
-F:69:0xA3/0x9A
-F:70:0xA3/0x98
-
-# section of the Straight Road (discharged)
-F:71:0xA3/0x98
-
-# Straight Road exit
-F:72:0xA3/0x9D
-
-# corrupted section of the Straight Road
-F:73:0xA3/0x99
-
-# Building
-F:74:0x81/0x91
-
-# permanent wall
-F:75:0x80/0x95
-F:76:0x80/0x95
-F:77:0x80/0x95
-F:78:0x80/0x95
-
-# Deep water
-F:83:0xD2/0x83
-
-# stream of shallow water
-F:84:0xD2/0x81
-
-# pool of deep lava
-F:85:0xCB/0x89
-
-# stream of shallow lava
-F:86:0xCB/0x88
-
-# dark pit
-F:87:0x81/0x80
-
-# dirt
-F:88:0xCB/0x84
-
-# patch of grass
-F:89:0xD0/0x8E
-
-# ice
-F:90:0xCF/0x81
-
-# sand
-F:91:0xCF/0x8E
-
-# dead tree
-F:92:0xCF/0x85
-
-# ash
-F:93:0xCF/0x95
-
-# mud
-F:94:0xCF/0x8D
-
-# ice wall
-F:95:0xD0/0x88
-
-# tree
-F:96:0xCB/0x86
-
-# mountain chain
-F:97:0xCB/0x87
-
-# sandwall
-F:98:0xD0/0x87
-F:99:0xD0/0x87
-
-# sandwall with treasure
-F:100:0xD0/0x8A
-
-# high mountain chain
-F:101:0xCB/0x87
-
-# nether mist
-F:102:0xC5/0x8C
-
-# molten glass wall
-F:103:0xD0/0x89
-
-# Between gate
-F:160:0x8A/0x9D
-
-# Altar of Forests
-F:161:0xD1/0x85
-
-# Altar of Water
-F:162:0xD1/0x86
-
-# Altar of Earth
-F:163:0xD1/0x8E
-
-# Altar of Darkness
-F:164:0xD1/0x88
-
-# Altar of Moon
-F:165:0xD1/0x89
-
-# Altar of Sun
-F:166:0xD1/0x8C
-
-# Altar of Rage
-F:167:0xD1/0x8A
-
-# Altar of Winds
-F:168:0xD1/0x8B
-
-# Altar of Stars
-F:169:0xD1/0x8D
-
-# Altar of Being
-F:170:0xD1/0x87
-
-# Altar of Randomness
-F:171:0xD1/0x8F
-
-# floor
-F:172:0x80/0x80
-
-# Underground Tunnel
-F:173:0xCF/0x97
-
-# stream of tainted water
-F:174:0xD2/0x82
-
-# monster trap
-F:175:0x82/0x94
-
-# Between gate
-F:176:0x8A/0x9D
-
-# lava wall
-F:177:0xD0/0x86
-
-# Great Fire
-F:178:0xD1/0x90
-
-# Path to next area
-F:179:0xCF/0x9C
-
-# Path to previous area
-F:180:0xCF/0x9B
-
-# field
-F:181:0xCF/0x8A
-
-# Ekkaia, the Encircling Sea
-F:182:0xD2/0x84
-
-# pool of deep water
-F:187:0xD2/0x80
-
-# glass wall
-F:188:0xD0/0x89
-
-# illusion wall
-F:189:0xD0/0x8C
-
-# Grass roof
-F:190:0xD0/0x8F
-
-# grass roof top
-F:191:0xD0/0x8F
-
-# grass roof chimney
-F:192:0xD0/0x8F
-
-# brick roof
-F:193:0xD0/0x90
-
-# brick roof top
-F:194:0xD0/0x90
-
-# brick roof chimney
-F:195:0xD0/0x90
-
-# window
-F:196:0xD0/0x91
-
-# small window
-F:197:0xD0/0x92
-
-# rain barrel
-F:198:0xD0/0x93
-
-# grass with flowers
-F:199:0xD0/0x8D
-
-# cobblestone road
-F:200:0x82/0x8A
-
-# cobblestone with outlet
-F:201:0x82/0x8A
-
-# small tree
-F:202:0xD0/0x8B
-
-# town
-F:203:0xD0/0x94
-
-# Underground Tunnel
-F:204:0xD0/0x95
-
-# a blazing fire
-F:205:0xD1/0x84
-
-# pile of rubble
-F:206:0x81/0x9A
-
-# ethereal wall
-F:214:0x80/0x80
-
-# glacial wall
-F:215:0xD0/0x88
-
-# something
-K:0:0x80/0x80
-
-# Blindness
-K:1:0xBA/0x81
-
-# Paranoia
-K:2:0xBA/0x81
-
-# Confusion
-K:3:0xBA/0x81
-
-# Hallucination
-K:4:0xBA/0x81
-
-# Cure Poison
-K:5:0xBA/0x81
-
-# Cure Blindness
-K:6:0xBA/0x81
-
-# Cure Paranoia
-K:7:0xBA/0x81
-
-# Cure Confusion
-K:8:0xBA/0x81
-
-# Weakness
-K:9:0xBA/0x81
-
-# Unhealth
-K:10:0xBA/0x81
-
-# Restore Constitution
-K:11:0xBA/0x81
-
-# Restoring
-K:12:0xBA/0x81
-
-# Stupidity
-K:13:0xBA/0x81
-
-# Naivety
-K:14:0xBA/0x81
-
-# Poison
-K:15:0xBA/0x81
-
-# Sickness
-K:16:0xBA/0x81
-
-# Paralysis
-K:17:0xBA/0x81
-
-# Restore Strength
-K:18:0xBA/0x81
-
-# Disease
-K:19:0xBA/0x81
-
-# Cure Serious Wounds
-K:20:0xBA/0x81
-
-# & Ration~ of Food
-K:21:0x8B/0x82
-
-# & Hard Biscuit~
-K:22:0x8B/0x82
-
-# & Strip~ of Venison
-K:23:0x8B/0x82
-
-# & Slime Mold~
-K:24:0x8A/0x9F
-
-# & Piece~ of Elvish Waybread
-K:25:0x8B/0x80
-
-# & Pint~ of Fine Ale
-K:26:0x8A/0x95
-
-# & Pint~ of Fine Wine
-K:27:0x8A/0x96
-
-# & Mattock~
-K:28:0xCD/0x80
-
-# The Blue Stone 'Toris Mejistos'
-K:29:0xB6/0x89
-
-# & Broken Dagger~
-K:30:0x89/0x83
-
-# & Bastard Sword~
-K:31:0x89/0x85
-
-# & Scimitar~
-K:32:0x89/0x85
-
-# & Tulwar~
-K:33:0x89/0x84
-
-# & Broad Sword~
-K:34:0x89/0x85
-
-# & Short Sword~
-K:35:0x89/0x84
-
-# & Blade~ of Chaos
-K:36:0x89/0x87
-
-# & Two-Handed Sword~
-K:37:0x89/0x85
-
-# & Main Gauche~
-K:38:0x89/0x83
-
-# & Cutlass~
-K:39:0x89/0x84
-
-# & Executioner's Sword~
-K:40:0x89/0x86
-
-# & Katana~
-K:41:0x89/0x85
-
-# & Long Sword~
-K:42:0x89/0x85
-
-# & Dagger~
-K:43:0x89/0x83
-
-# & Rapier~
-K:44:0x89/0x84
-
-# & Sabre~
-K:45:0x89/0x84
-
-# & Small Sword~
-K:46:0x89/0x84
-
-# & Broken Sword~
-K:47:0x89/0x83
-
-# & Ball-and-Chain~
-K:48:0x89/0x88
-
-# & Whip~
-K:49:0x89/0x89
-
-# & Flail~
-K:50:0x89/0x8B
-
-# & Two-Handed Flail~
-K:51:0x89/0x8B
-
-# & Morning Star~
-K:52:0x89/0x8B
-
-# & Mace~
-K:53:0x89/0x8C
-
-# & Quarterstaff~
-K:54:0x89/0x8E
-
-# & War Hammer~
-K:55:0x89/0x8F
-
-# & Lead-Filled Mace~
-K:56:0x89/0x8C
-
-# & Mace~ of Disruption
-K:57:0x89/0x8D
-
-# & Lucerne Hammer~
-K:58:0x89/0x90
-
-# & Beaked Axe~
-K:59:0x89/0x90
-
-# & Glaive~
-K:60:0x89/0x90
-
-# & Halberd~
-K:61:0x89/0x90
-
-# & Awl-Pike~
-K:62:0x89/0x91
-
-# & Pike~
-K:63:0x89/0x91
-
-# & Spear~
-K:64:0x89/0x91
-
-# & Trident~
-K:65:0x89/0x92
-
-# & Lance~
-K:66:0x89/0x93
-
-# & Great Axe~
-K:67:0x89/0x90
-
-# & Battle Axe~
-K:68:0x89/0x90
-
-# & Lochaber Axe~
-K:69:0x89/0x90
-
-# & Broad Axe~
-K:70:0x89/0x90
-
-# & Scythe~
-K:71:0x89/0x94
-
-# & Scythe~ of Slicing
-K:72:0x89/0x94
-
-# & Short Bow~
-K:73:0x89/0x95
-
-# & Long Bow~
-K:74:0x89/0x96
-
-# & Light Crossbow~
-K:75:0x89/0x97
-
-# & Heavy Crossbow~
-K:76:0x89/0x98
-
-# & Sling~
-K:77:0x89/0x99
-
-# & Arrow~
-K:78:0x89/0x9A
-
-# & Seeker Arrow~
-K:79:0x89/0x9B
-
-# & Bolt~
-K:80:0x89/0x9C
-
-# & Seeker Bolt~
-K:81:0x89/0x9D
-
-# & Rounded Pebble~
-K:82:0x89/0x9E
-
-# & Iron Shot~
-K:83:0x89/0x9F
-
-# & Shovel~
-K:84:0x8A/0x98
-
-# & Gnomish Shovel~
-K:85:0x8B/0x8F
-
-# & Dwarven Shovel~
-K:86:0x8B/0x90
-
-# & Pick~
-K:87:0x8A/0x97
-
-# & Orcish Pick~
-K:88:0x8B/0x8D
-
-# & Dwarven Pick~
-K:89:0x8B/0x8E
-
-# & Elven Cloak~
-K:90:0x88/0x81
-
-# & Pair~ of Soft Leather Boots
-K:91:0x88/0x89
-
-# & Pair~ of Hard Leather Boots
-K:92:0x88/0x8A
-
-# & Pair~ of Metal Shod Boots
-K:93:0x88/0x8B
-
-# & Hard Leather Cap~
-K:94:0x88/0x82
-
-# & Metal Cap~
-K:95:0x88/0x83
-
-# & Iron Helm~
-K:96:0x88/0x84
-
-# & Steel Helm~
-K:97:0x88/0x85
-
-# & Iron Crown~
-K:98:0x88/0x86
-
-# & Golden Crown~
-K:99:0x88/0x87
-
-# & Jewel Encrusted Crown~
-K:100:0x88/0x88
-
-# & Robe~
-K:101:0x88/0x95
-
-# & Filthy Rag~
-K:102:0x88/0x94
-
-# Soft Leather Armour~
-K:103:0x88/0x96
-
-# Soft Studded Leather~
-K:104:0x88/0x96
-
-# Hard Leather Armour~
-K:105:0x88/0x97
-
-# Hard Studded Leather~
-K:106:0x88/0x97
-
-# Leather Scale Mail~
-K:107:0x88/0x98
-
-# Metal Scale Mail~
-K:108:0x88/0x98
-
-# Chain Mail~
-K:109:0x88/0x99
-
-# Rusty Chain Mail~
-K:110:0x88/0x9A
-
-# Augmented Chain Mail~
-K:111:0x88/0x99
-
-# Bar Chain Mail~
-K:112:0x88/0x99
-
-# Metal Brigandine Armour~
-K:113:0x88/0x99
-
-# Partial Plate Armour~
-K:114:0x88/0x9B
-
-# Metal Lamellar Armour~
-K:115:0x88/0x9B
-
-# Full Plate Armour~
-K:116:0xCD/0x82
-
-# Ribbed Plate Armour~
-K:117:0x88/0x9B
-
-# Adamantite Plate Mail~
-K:118:0xA3/0x96
-
-# Mithril Plate Mail~
-K:119:0x88/0x9C
-
-# Mithril Chain Mail~
-K:120:0x88/0x9C
-
-# Double Chain Mail~
-K:121:0x88/0x99
-
-# & Shield~ of Deflection
-K:122:0x88/0x93
-
-# & Cloak~
-K:123:0x88/0x80
-
-# & Shadow Cloak~
-K:124:0x88/0x81
-
-# & Set~ of Leather Gloves
-K:125:0x88/0x8C
-
-# & Set~ of Gauntlets
-K:126:0x88/0x8D
-
-# & Set~ of Cesti
-K:127:0x88/0x8E
-
-# & Small Leather Shield~
-K:128:0x88/0x8F
-
-# & Large Leather Shield~
-K:129:0x88/0x90
-
-# & Small Metal Shield~
-K:130:0x88/0x91
-
-# & Large Metal Shield~
-K:131:0x88/0x92
-
-# Strength
-K:132:0xB5/0x81
-
-# Dexterity
-K:133:0xB5/0x81
-
-# Constitution
-K:134:0xB5/0x81
-
-# Intelligence
-K:135:0xB5/0x81
-
-# Speed
-K:136:0xB5/0x83
-
-# Searching
-K:137:0xB5/0x80
-
-# Teleportation
-K:138:0xB5/0x80
-
-# Slow Digestion
-K:139:0xB5/0x80
-
-# Fire Resistance
-K:140:0xB5/0x80
-
-# Cold Resistance
-K:141:0xB5/0x80
-
-# Levitation
-K:142:0xB5/0x80
-
-# Poison Resistance
-K:143:0xB5/0x82
-
-# Free Action
-K:144:0xB5/0x80
-
-# Weakness
-K:145:0xB5/0x80
-
-# Flames
-K:146:0xB5/0x82
-
-# Acid
-K:147:0xB5/0x82
-
-# Ice
-K:148:0xB5/0x82
-
-# Woe
-K:149:0xB5/0x82
-
-# Stupidity
-K:150:0xB5/0x80
-
-# Damage
-K:151:0xB5/0x81
-
-# Accuracy
-K:152:0xB5/0x81
-
-# Protection
-K:153:0xB5/0x80
-
-# Aggravate Monster
-K:154:0xB5/0x80
-
-# See Invisible
-K:155:0xB5/0x81
-
-# Sustain Strength
-K:156:0xB5/0x81
-
-# Sustain Intelligence
-K:157:0xB5/0x81
-
-# Sustain Wisdom
-K:158:0xB5/0x81
-
-# Sustain Constitution
-K:159:0xB5/0x81
-
-# Sustain Dexterity
-K:160:0xB5/0x81
-
-# Sustain Charisma
-K:161:0xB5/0x81
-
-# Slaying
-K:162:0xB5/0x81
-
-# Brilliance
-K:163:0xB6/0x9F
-
-# Charisma
-K:164:0xB6/0x9F
-
-# Searching
-K:165:0xB6/0x9E
-
-# Teleportation
-K:166:0xB6/0x9E
-
-# Slow Digestion
-K:167:0xB6/0x9E
-
-# Acid Resistance
-K:168:0xB6/0x9E
-
-# Adornment
-K:169:0xB6/0x9E
-
-# Double Ring Mail~
-K:170:0xCD/0x83
-
-# the Magi
-K:171:0xB6/0x80
-
-# Doom
-K:172:0xB6/0x80
-
-# Enchant Weapon To-Hit
-K:173:0x86/0x80
-
-# Enchant Weapon To-Dam
-K:174:0x86/0x80
-
-# Enchant Armor
-K:175:0x86/0x80
-
-# Identify
-K:176:0x86/0x80
-
-# *Identify*
-K:177:0x86/0x82
-
-# Rumour
-K:178:0x86/0x80
-
-# Chaos
-K:179:0x86/0x80
-
-# Remove Curse
-K:180:0x86/0x80
-
-# Light
-K:181:0x86/0x80
-
-# Fire
-K:182:0x86/0x80
-
-# Ice
-K:183:0x86/0x80
-
-# Summon Monster
-K:184:0x86/0x80
-
-# Phase Door
-K:185:0x86/0x80
-
-# Teleportation
-K:186:0x86/0x80
-
-# Teleport Level
-K:187:0x86/0x80
-
-# Monster Confusion
-K:188:0x86/0x80
-
-# Magic Mapping
-K:189:0x86/0x80
-
-# Rune of Protection
-K:190:0x86/0x82
-
-# *Remove Curse*
-K:191:0x86/0x82
-
-# Treasure Detection
-K:192:0x86/0x80
-
-# Object Detection
-K:193:0x86/0x80
-
-# Trap Detection
-K:194:0x86/0x80
-
-# & Sheaf Arrow~
-K:195:0xCD/0x84
-
-# & Mithril Shot~
-K:196:0xCD/0x85
-
-# Door
-K:197:0x86/0x80
-
-# Acquirement
-K:198:0x86/0x80
-
-# *Acquirement*
-K:199:0x86/0x82
-
-# Mass Genocide
-K:200:0x86/0x82
-
-# Detect Invisible
-K:201:0x86/0x80
-
-# Aggravate Monster
-K:202:0x86/0x80
-
-# Trap Creation
-K:203:0x86/0x80
-
-# Trap
-K:204:0x86/0x80
-
-# Artifact Creation
-K:205:0x86/0x82
-
-# Recharging
-K:206:0x86/0x81
-
-# Genocide
-K:207:0x86/0x81
-
-# Darkness
-K:208:0x86/0x80
-
-# Protection from Evil
-K:209:0x86/0x81
-
-# Satisfy Hunger
-K:210:0x86/0x80
-
-# Dispel Undead
-K:211:0x86/0x81
-
-# *Enchant Weapon*
-K:212:0x86/0x82
-
-# Curse Weapon
-K:213:0x86/0x82
-
-# *Enchant Armor*
-K:214:0x86/0x82
-
-# Curse Armor
-K:215:0x86/0x82
-
-# Summon Undead
-K:216:0x86/0x80
-
-# Blessing
-K:217:0x86/0x80
-
-# Holy Chant
-K:218:0x86/0x80
-
-# Holy Prayer
-K:219:0x86/0x81
-
-# Word of Recall
-K:220:0x86/0x80
-
-# *Destruction*
-K:221:0x86/0x82
-
-# Slime Mold Juice
-K:222:0xBC/0x85
-
-# Apple Juice
-K:223:0xBC/0x85
-
-# Water
-K:224:0xBC/0x85
-
-# Strength
-K:225:0xBC/0x86
-
-# Weakness
-K:226:0xBC/0x85
-
-# Restore Strength
-K:227:0xBC/0x86
-
-# Intelligence
-K:228:0xBC/0x86
-
-# Stupidity
-K:229:0xBC/0x85
-
-# Restore Intelligence
-K:230:0xBC/0x86
-
-# Wisdom
-K:231:0xBC/0x86
-
-# Naivety
-K:232:0xBC/0x85
-
-# Restore Wisdom
-K:233:0xBC/0x86
-
-# Charisma
-K:234:0xBC/0x86
-
-# Ugliness
-K:235:0xBC/0x86
-
-# Restore Charisma
-K:236:0xBC/0x86
-
-# Curing
-K:237:0xBC/0x86
-
-# Invulnerability
-K:238:0xBC/0x86
-
-# New Life
-K:239:0xBC/0x86
-
-# Cure Serious Wounds
-K:240:0xBC/0x85
-
-# Cure Critical Wounds
-K:241:0xBC/0x85
-
-# Healing
-K:242:0xBC/0x85
-
-# Constitution
-K:243:0xBC/0x86
-
-# Experience
-K:244:0xBC/0x87
-
-# Sleep
-K:245:0xBC/0x85
-
-# Blindness
-K:246:0xBC/0x85
-
-# Booze
-K:247:0xBC/0x85
-
-# Poison
-K:248:0xBC/0x85
-
-# Speed
-K:249:0xBC/0x85
-
-# Slowness
-K:250:0xBC/0x85
-
-# Dexterity
-K:251:0xBC/0x86
-
-# Restore Dexterity
-K:252:0xBC/0x86
-
-# Restore Constitution
-K:253:0xBC/0x86
-
-# Lose Memories
-K:254:0xBC/0x85
-
-# Salt Water
-K:255:0xBC/0x85
-
-# Enlightenment
-K:256:0xBC/0x85
-
-# Heroism
-K:257:0xBC/0x85
-
-# Berserk Strength
-K:258:0xBC/0x85
-
-# Boldness
-K:259:0xBC/0x85
-
-# Restore Life Levels
-K:260:0xBC/0x87
-
-# Resist Heat
-K:261:0xBC/0x85
-
-# Resist Cold
-K:262:0xBC/0x85
-
-# Detect Invisible
-K:263:0xBC/0x85
-
-# Slow Poison
-K:264:0xBC/0x85
-
-# Neutralise Poison
-K:265:0xBC/0x85
-
-# Restore Mana
-K:266:0xBC/0x86
-
-# Infra-vision
-K:267:0xBC/0x85
-
-# Resistance
-K:268:0xBC/0x85
-
-# Light
-K:269:0xB7/0x8F
-
-# Tame Monster
-K:270:0xB7/0x8F
-
-# Frost Bolts
-K:271:0xB7/0x8F
-
-# Fire Bolts
-K:272:0xB7/0x90
-
-# Stone to Mud
-K:273:0xB7/0x8F
-
-# Polymorph
-K:274:0xB7/0x8F
-
-# Heal Monster
-K:275:0xB7/0x8F
-
-# Haste Monster
-K:276:0xB7/0x8F
-
-# Slow Monster
-K:277:0xB7/0x8F
-
-# Confuse Monster
-K:278:0xB7/0x8F
-
-# Sleep Monster
-K:279:0xB7/0x8F
-
-# Drain Life
-K:280:0xB7/0x91
-
-# Trap
-K:281:0xB7/0x8F
-
-# Magic Missile
-K:282:0xB7/0x8F
-
-# Clone Monster
-K:283:0xB7/0x90
-
-# Scare Monster
-K:284:0xB7/0x90
-
-# Teleport Other
-K:285:0xB7/0x8F
-
-# Disarming
-K:286:0xB7/0x8F
-
-# Lightning Balls
-K:287:0xB7/0x90
-
-# Cold Balls
-K:288:0xB7/0x90
-
-# Fire Balls
-K:289:0xB7/0x91
-
-# Stinking Cloud
-K:290:0xB7/0x8F
-
-# Acid Balls
-K:291:0xB7/0x91
-
-# Wonder
-K:292:0xB7/0x8F
-
-# & Flight Arrow~
-K:293:0xCD/0x86
-
-# Acid Bolts
-K:294:0xB7/0x90
-
-# Dragon's Flame
-K:295:0xB7/0x91
-
-# Dragon's Frost
-K:296:0xB7/0x91
-
-# Dragon's Breath
-K:297:0xB7/0x91
-
-# Annihilation
-K:298:0xB7/0x91
-
-# Rockets
-K:299:0xB7/0x91
-
-# Trap Location
-K:300:0xB9/0x99
-
-# Treasure Location
-K:301:0xB9/0x99
-
-# Object Location
-K:302:0xB9/0x99
-
-# Teleportation
-K:303:0xB9/0x99
-
-# Earthquakes
-K:304:0xB9/0x9A
-
-# Summoning
-K:305:0xB9/0x99
-
-# Light
-K:306:0xB9/0x99
-
-# *Destruction*
-K:307:0xB9/0x9B
-
-# Starlight
-K:308:0xB9/0x99
-
-# Haste Monsters
-K:309:0xB9/0x99
-
-# Slow Monsters
-K:310:0xB9/0x99
-
-# Sleep Monsters
-K:311:0xB9/0x99
-
-# Cure Light Wounds
-K:312:0xB9/0x99
-
-# Detect Invisible
-K:313:0xB9/0x99
-
-# Speed
-K:314:0xB9/0x9A
-
-# Slowness
-K:315:0xB9/0x99
-
-# Door
-K:316:0xB9/0x99
-
-# Remove Curse
-K:317:0xB9/0x9A
-
-# Detect Evil
-K:318:0xB9/0x99
-
-# Curing
-K:319:0xB9/0x9A
-
-# Dispel Evil
-K:320:0xB9/0x9B
-
-# Probing
-K:321:0xB9/0x9A
-
-# Darkness
-K:322:0xB9/0x99
-
-# Genocide
-K:323:0xB9/0x9B
-
-# Power
-K:324:0xB9/0x9C
-
-# the Magi
-K:325:0xB9/0x9C
-
-# Perception
-K:326:0xB9/0x99
-
-# Holiness
-K:327:0xB9/0x9C
-
-# Enlightenment
-K:328:0xB9/0x9A
-
-# Healing
-K:329:0xB9/0x9C
-
-# [Call of the West]
-K:330:0xA3/0x8A
-
-# [Light of Valinor]
-K:331:0xA3/0x8A
-
-# [Divine Mastery]
-K:332:0xA3/0x8A
-
-# [Words of Power]
-K:333:0xA3/0x8A
-
-# [Apprentice Handbook]
-K:334:0xA3/0x8C
-
-# [Mystical Words]
-K:335:0xA3/0x8C
-
-# [Arcane Chants]
-K:336:0xA3/0x8C
-
-# [Locus of Force]
-K:337:0xA3/0x8C
-
-# & Small wooden chest~
-K:338:0x80/0x96
-
-# & Large wooden chest~
-K:339:0x80/0x97
-
-# & Small iron chest~
-K:340:0x80/0x98
-
-# & Large iron chest~
-K:341:0x80/0x99
-
-# & Small steel chest~
-K:342:0x80/0x9A
-
-# & Large steel chest~
-K:343:0x80/0x9B
-
-# & Ruined chest~
-K:344:0x80/0x9C
-
-# & Iron Spike~
-K:345:0x8B/0x84
-
-# & Wooden Torch~
-K:346:0x8B/0x86
-
-# & Brass Lantern~
-K:347:0x8B/0x85
-
-# & Flask~ of oil
-K:348:0xBC/0x90
-
-# & Empty Bottle~
-K:349:0x8A/0x99
-
-# Havoc
-K:350:0xB8/0x94
-
-# Door
-K:351:0xB8/0x94
-
-# Trap Location
-K:352:0xB8/0x94
-
-# Probing
-K:353:0xB8/0x97
-
-# Recall
-K:354:0xB8/0x96
-
-# Illumination
-K:355:0xB8/0x95
-
-# Light
-K:356:0xB8/0x94
-
-# Lightning Bolts
-K:357:0xB8/0x94
-
-# Frost Bolts
-K:358:0xB8/0x95
-
-# Fire Bolts
-K:359:0xB8/0x95
-
-# Polymorph
-K:360:0xB8/0x95
-
-# Slow Monster
-K:361:0xB8/0x95
-
-# Sleep Monster
-K:362:0xB8/0x95
-
-# Drain Life
-K:363:0xB8/0x97
-
-# Teleport Other
-K:364:0xB8/0x96
-
-# Disarming
-K:365:0xB8/0x95
-
-# Lightning Balls
-K:366:0xB8/0x96
-
-# Cold Balls
-K:367:0xB8/0x96
-
-# Fire Balls
-K:368:0xB8/0x97
-
-# Acid Balls
-K:369:0xB8/0x97
-
-# Acid Bolts
-K:370:0xB8/0x95
-
-# Enlightenment
-K:371:0xB8/0x97
-
-# Perception
-K:372:0xB8/0x96
-
-# Curing
-K:373:0xB8/0x97
-
-# Healing
-K:374:0xB8/0x97
-
-# Detection
-K:375:0xB8/0x95
-
-# Restoration
-K:376:0xB8/0x97
-
-# Speed
-K:377:0xB8/0x97
-
-# [Inner Void]
-K:378:0xA3/0x8E
-
-# [Lurkings of the Night]
-K:379:0xA3/0x8E
-
-# [Beings of Darkness]
-K:380:0xA3/0x8E
-
-# [Material Shadow]
-K:381:0xA3/0x8E
-
-# [Sign of Chaos]
-K:383:0xA3/0x90
-
-# [Chaos Mastery]
-K:384:0xA3/0x90
-
-# [Chaos Channels]
-K:385:0xA3/0x91
-
-# [Armageddon Tome]
-K:386:0xA3/0x91
-
-# [Nether Openings]
-K:387:0xA3/0x92
-
-# [Unholy Blessings]
-K:388:0xA3/0x92
-
-# & Firestone~
-K:389:0x8B/0x88
-
-# & Small Firestone~
-K:390:0x8B/0x89
-
-# & Broken Skull~
-K:391:0x8B/0x8A
-
-# & Broken Bone~
-K:392:0x8B/0x8B
-
-# & Canine Skeleton~
-K:393:0x8B/0x87
-
-# & Rodent Skeleton~
-K:394:0x8B/0x87
-
-# & Human Skeleton~
-K:395:0x8B/0x87
-
-# & Dwarf Skeleton~
-K:396:0x8B/0x87
-
-# & Elf Skeleton~
-K:397:0x8B/0x87
-
-# & Gnome Skeleton~
-K:398:0x8B/0x87
-
-# & Great Hammer~
-K:399:0xCD/0x87
-
-# Black Dragon Scale Mail~
-K:400:0x88/0x9F
-
-# Blue Dragon Scale Mail~
-K:401:0x88/0x9D
-
-# White Dragon Scale Mail~
-K:402:0x88/0x9E
-
-# Red Dragon Scale Mail~
-K:403:0x89/0x81
-
-# Green Dragon Scale Mail~
-K:404:0x89/0x80
-
-# Multi-Hued Dragon Scale Mail~
-K:405:0x89/0x82
-
-# Pseudo Dragon Scale Mail~
-K:406:0xBB/0x9C
-
-# Law Dragon Scale Mail~
-K:407:0x88/0x9F
-
-# Bronze Dragon Scale Mail~
-K:408:0x88/0x96
-
-# Gold Dragon Scale Mail~
-K:409:0x88/0x9C
-
-# Chaos Dragon Scale Mail~
-K:410:0x89/0x80
-
-# Balance Dragon Scale Mail~
-K:411:0x88/0x99
-
-# Power Dragon Scale Mail~
-K:412:0xA2/0x9E
-
-# & Dragon Helm~
-K:413:0xA2/0x9D
-
-# & Dragon Shield~
-K:414:0xA2/0x9C
-
-# Death
-K:415:0xBC/0x88
-
-# Ruination
-K:416:0xBC/0x87
-
-# Detonations
-K:417:0xBC/0x87
-
-# Augmentation
-K:418:0xBC/0x87
-
-# *Healing*
-K:419:0xBC/0x87
-
-# Life
-K:420:0xBC/0x88
-
-# Self Knowledge
-K:421:0xBC/0x87
-
-# *Enlightenment*
-K:422:0xBC/0x88
-
-# [Necromantic Incantations]
-K:423:0xA3/0x92
-
-# [Curses of Angmar]
-K:424:0xA3/0x92
-
-# Fear Resistance
-K:425:0xB5/0x81
-
-# Light and Darkness Resistance
-K:426:0xB5/0x81
-
-# Nether Resistance
-K:427:0xB5/0x81
-
-# Nexus Resistance
-K:428:0xB5/0x81
-
-# Sound Resistance
-K:429:0xB5/0x81
-
-# Confusion Resistance
-K:430:0xB5/0x81
-
-# Shard Resistance
-K:431:0xB5/0x81
-
-# Disenchantment Resistance
-K:432:0xB5/0x81
-
-# Chaos Resistance
-K:433:0xB5/0x81
-
-# Blindness Resistance
-K:434:0xB5/0x81
-
-# Lordly Protection
-K:435:0xB5/0x81
-
-# Extra Attacks
-K:436:0xB5/0x81
-
-# Cure Light Wounds
-K:437:0xBC/0x85
-
-# Clumsiness
-K:438:0xBC/0x85
-
-# Sickliness
-K:439:0xBC/0x85
-
-# Map of Bree
-K:440:0xD8/0x81
-
-# Map of Gondolin
-K:441:0xD8/0x81
-
-# Map of Lothlorien
-K:442:0xD8/0x81
-
-# Map of Minas Anor
-K:443:0xD8/0x81
-
-# & Silver Arrow~
-K:465:0xCE/0x91
-
-# & Silver Bolt~
-K:466:0xCE/0x92
-
-# Lightning Resistance
-K:467:0x87/0x80
-
-# Wisdom
-K:468:0x87/0x80
-
-# Regeneration
-K:469:0x87/0x80
-
-# Infravision
-K:470:0x87/0x80
-
-# Devotion
-K:471:0x87/0x80
-
-# Weaponmastery
-K:472:0x87/0x80
-
-# Trickery
-K:473:0x87/0x80
-
-# ESP
-K:474:0x87/0x80
-
-# Sustenance
-K:475:0x87/0x80
-
-# Palantir
-K:476:0xD8/0x8F
-
-# Elfstone 'Elessar'
-K:477:0xB6/0x8F
-
-# Jewel 'Evenstar'
-K:478:0xB6/0x90
-
-# Ring of Durin
-K:479:0xB5/0x8E
-
-# copper
-K:480:0x80/0x8B
-K:481:0x80/0x8B
-K:482:0x80/0x8B
-
-# silver
-K:483:0x80/0x8C
-K:484:0x80/0x8C
-K:485:0x80/0x8C
-
-# garnets
-K:486:0x80/0x8F
-K:487:0x80/0x8F
-
-# gold
-K:488:0x80/0x8D
-K:489:0x80/0x8D
-K:490:0x80/0x8D
-
-# opals
-K:491:0x80/0x90
-
-# sapphires
-K:492:0x80/0x91
-
-# rubies
-K:493:0x80/0x92
-
-# diamonds
-K:494:0x80/0x93
-
-# emeralds
-K:495:0x80/0x94
-
-# mithril
-K:496:0x80/0x8E
-
-# adamantite
-K:497:0xA3/0x95
-
-# & Mighty Hammer~
-K:498:0x87/0x9A
-
-# & Massive Iron Crown~
-K:499:0x87/0x9B
-
-# & Phial~
-K:500:0x87/0x9D
-
-# & Star~
-K:501:0x87/0x9E
-
-# & Arkenstone~
-K:502:0x87/0x9F
-
-# & Amulet~
-K:503:0xB6/0x82
-K:504:0xB6/0x83
-
-# & Necklace~
-K:505:0xB6/0x84
-
-# & Ring~
-K:506:0xB5/0x83
-K:507:0xB5/0x83
-K:508:0xB5/0x84
-K:509:0xB5/0x85
-K:510:0xB5/0x86
-K:511:0xB5/0x87
-
-# [Rites of Initiation]
-K:512:0xBC/0x91
-
-# [Ways of War]
-K:513:0xBC/0x91
-
-# [Divine Retribution]
-K:514:0xBC/0x92
-
-# [Essence of Fury]
-K:515:0xBC/0x92
-
-# [Novice Crafts]
-K:516:0xBC/0x95
-
-# [Arcane Channels]
-K:517:0xBC/0x95
-
-# [Sigils of Wizardry]
-K:518:0xBC/0x95
-
-# [Mana Focus]
-K:519:0xBC/0x95
-
-# Reflection
-K:520:0xB6/0x80
-
-# Anti-Magic
-K:521:0xB6/0x80
-
-# Anti-Teleportation
-K:522:0xB6/0x80
-
-# Resistance
-K:523:0xB6/0x80
-
-# & Zweihander~
-K:524:0xCD/0x88
-
-# & Dwarven Lantern~
-K:525:0xD8/0x86
-
-# Splint Mail~
-K:526:0xCD/0x8A
-
-# & Everburning Torch~
-K:527:0xD8/0x87
-
-# & Trifurcate Spear~
-K:528:0xCD/0x96
-
-# & Three Piece Rod~
-K:529:0xCD/0x8C
-
-# & Feanorian Lamp~
-K:530:0xD8/0x85
-
-# & Fur Cloak~
-K:531:0xCD/0x8E
-
-# Potion: Water Curing
-K:532:0xBC/0x84
-
-# & Hatchet~
-K:533:0xCD/0x90
-
-# Rhino Hide Armour~
-K:535:0xCD/0x91
-
-# Leather Jacket~
-K:536:0xCD/0x92
-
-# & Sickle~
-K:537:0xCD/0x93
-
-# [Psychoportation]
-K:538:0xA3/0x88
-
-# [Clairsentience]
-K:539:0xA3/0x88
-
-# [Telekinesis]
-K:540:0xA3/0x89
-
-# [Empathy]
-K:541:0xA3/0x89
-
-# & Club~
-K:542:0xCD/0x99
-
-# & Broad Spear~
-K:543:0xCD/0x9A
-
-# & Khopesh~
-K:544:0xCD/0x9B
-
-# & Flamberge~
-K:545:0xCD/0x9C
-
-# & Claymore~
-K:546:0xCD/0x9D
-
-# & Espadon~
-K:547:0xCD/0x9E
-
-# & Great Scimitar~
-K:548:0xCD/0x9F
-
-# Trapping Kit: Arrow
-K:549:0xD7/0x84
-
-# Trapping Kit: Bolt
-K:550:0xD7/0x83
-
-# & Fauchard~
-K:551:0xCE/0x82
-
-# & Guisarme~
-K:552:0xCE/0x83
-
-# & Heavy Lance~
-K:553:0xCE/0x84
-
-# & Basillard~
-K:554:0xCE/0x85
-
-# Trapping Kit: Catapult
-K:555:0xD7/0x82
-
-# Ring Mail~
-K:556:0xCE/0x87
-
-# Cord Armour~
-K:557:0xCE/0x88
-
-# Paper Armour~
-K:558:0xCE/0x89
-
-# Padded Armour~
-K:559:0xCE/0x8A
-
-# Trap Kit: Fumes
-K:560:0xD7/0x80
-
-# Stone and Hide Armour~
-K:561:0xCE/0x8C
-
-# Trap Kit: Magic
-K:562:0xD7/0x81
-
-# Trap Kit: Device
-K:563:0xD7/0x85
-
-# Scroll: Nothing
-K:564:0x86/0x80
-
-# Poison
-K:565:0xD9/0x82
-
-# Wand: Nothing
-K:566:0xB7/0x90
-
-# Ring: Nothing
-K:567:0xB5/0x80
-
-# Staff: Nothing
-K:568:0xB8/0x96
-
-# Rod Tip: Nothing
-K:569:0xB8/0x95
-
-# Explosion
-K:570:0xD9/0x82
-
-# Teleport
-K:571:0xD9/0x82
-
-# Amulet: Nothing
-K:572:0x87/0x80
-
-# & Blood~ of Life
-K:573:0x87/0x88
-
-# Cold
-K:574:0xD9/0x82
-
-# Fire
-K:575:0xD9/0x82
-
-# Acid
-K:576:0xD9/0x82
-
-# Mage Staff
-K:577:0xCE/0x97
-
-# Lightning
-K:578:0xB5/0x81
-
-# Life
-K:579:0xD9/0x82
-
-# Confusion
-K:580:0xD9/0x82
-
-# Light
-K:581:0xD9/0x82
-
-# Ring of F'Lar
-K:582:0xB5/0x8F
-
-# Invisibility
-K:583:0xB8/0x85
-
-# Chaos
-K:584:0xD9/0x82
-
-# Corruption
-K:585:0xB8/0x85
-
-# Invisibility
-K:586:0xB5/0x81
-
-# Time
-K:587:0xD9/0x82
-
-# Deep Thoughts
-K:588:0xD8/0x80
-
-# More Deep Thoughts
-K:589:0xD8/0x80
-
-# Compendium of Deep Thoughts
-K:590:0xD8/0x80
-
-# Artifact Lore Vol. I
-K:591:0xD8/0x80
-
-# Artifact Lore Vol. II
-K:592:0xD8/0x80
-
-# Artifact Lore Vol. III
-K:593:0xD8/0x80
-
-# Monstrous Compendium 1
-K:594:0xD8/0x80
-
-# Monstrous Compendium 2
-K:595:0xD8/0x80
-
-# Monstrous Compendium 3
-K:596:0xD8/0x80
-
-# Monstrous Compendium 4
-K:597:0xD8/0x80
-
-# Monstrous Compendium 5
-K:598:0xD8/0x80
-
-# Monstrous Compendium 6
-K:599:0xD8/0x80
-
-# Monstrous Compendium 7
-K:600:0xD8/0x80
-
-# Monstrous Compendium 8
-K:601:0xD8/0x80
-
-# Monstrous Compendium 9
-K:602:0xD8/0x80
-
-# Monstrous Compendium 10
-K:603:0xD8/0x80
-
-# Monstrous Compendium 11
-K:604:0xD8/0x80
-
-# Abomination
-K:605:0xBC/0x85
-
-# Shape of Wolf
-K:606:0xBC/0x85
-
-# Shape of Ape
-K:607:0xBC/0x85
-
-# Shape of Goat
-K:608:0xBC/0x85
-
-# Shape of Insect
-K:609:0xBC/0x85
-
-# Shape of Sparrow
-K:610:0xBC/0x85
-
-# Shape of Ent
-K:611:0xBC/0x85
-
-# Shape of Vampire
-K:612:0xBC/0x85
-
-# Shape of Spider
-K:613:0xBC/0x85
-
-# Shape of Mana ball
-K:614:0xBC/0x85
-
-# Shape of Fire cloud
-K:615:0xBC/0x85
-
-# Shape of Cold cloud
-K:616:0xBC/0x85
-
-# Shape of Chaos cloud
-K:617:0xBC/0x85
-
-# [Wolf]
-K:618:0xCE/0x93
-
-# [Ape]
-K:619:0xCE/0x93
-
-# [Goat]
-K:620:0xCE/0x93
-
-# [Insect]
-K:621:0xCE/0x93
-
-# [Sparrow]
-K:622:0xCE/0x93
-
-# [Ent]
-K:623:0xCE/0x93
-
-# [Vampire]
-K:624:0xCE/0x93
-
-# [Spider]
-K:625:0xCE/0x93
-
-# [Mana ball]
-K:626:0xCE/0x93
-
-# [Fire cloud]
-K:627:0xCE/0x93
-
-# [Cold cloud]
-K:628:0xCE/0x93
-
-# [Chaos Cloud]
-K:629:0xCE/0x93
-
-# [Ghost]
-K:630:0xCE/0x93
-
-# [Kobold]
-K:631:0xCE/0x93
-
-# [Dragon]
-K:632:0xCE/0x93
-
-# [Demon]
-K:633:0xCE/0x93
-
-# [Hound]
-K:634:0xCE/0x93
-
-# [Quylthulg]
-K:635:0xCE/0x93
-
-# [Maia]
-K:636:0xCE/0x93
-
-# [Serpent]
-K:637:0xCE/0x93
-
-# [Giant]
-K:638:0xCE/0x93
-
-# [Vala]
-K:639:0xCE/0x93
-
-# Magic
-K:640:0xD9/0x82
-
-# corpse
-K:641:0xB4/0x90
-
-# skeleton
-K:642:0xB4/0x8B
-
-# head
-K:643:0xB4/0x8E
-
-# skull
-K:644:0xB4/0x8F
-
-# raw meat
-K:645:0xB4/0x8C
-
-# Dragonrider Coat
-K:646:0xCE/0x98
-
-# Stone of Lore
-K:647:0xD8/0x90
-
-# small wooden boomerang
-K:648:0xCE/0x99
-
-# large wooden boomerang
-K:649:0xCE/0x9A
-
-# small metal boomerang
-K:650:0xCE/0x9B
-
-# large metal boomerang
-K:651:0xCE/0x9C
-
-# The Space-Time Anchor
-K:652:0xD8/0x91
-
-# Summon never-moving pet
-K:654:0x86/0x80
-
-# [Life in symbiosis]
-K:655:0xA3/0x84
-
-# [Perfect Symbiosis]
-K:656:0xA3/0x85
-
-# Cure Light Insanity
-K:657:0xBC/0x85
-
-# Cure Serious Insanity
-K:658:0xBC/0x85
-
-# Cure Critical Insanity
-K:659:0xBC/0x85
-
-# Cure Insanity
-K:660:0xBC/0x85
-
-# & Phial~
-K:661:0x87/0x9D
-
-# Craftmanship
-K:663:0x86/0x82
-
-# The One Ring
-K:664:0xD8/0x81
-
-# [Apprentice Handbook]
-K:665:0xA3/0x81
-
-# [Minstrel's Music]
-K:666:0xA3/0x81
-
-# [Harps of Rivendell]
-K:667:0x8A/0x90
-
-# [Lays of Beleriand]
-K:668:0x8A/0x90
-
-# & Flute~
-K:669:0xD8/0x88
-
-# & Drum~
-K:670:0xD8/0x89
-
-# & Harp~
-K:671:0xD8/0x8A
-
-# & Banjo~
-K:672:0xD8/0x8B
-
-# & Lute~
-K:673:0xD8/0x8C
-
-# & Mandolin~
-K:674:0xD8/0x8D
-
-# Palantir of Orthanc
-K:675:0xD8/0x8F
-
-# Egg
-K:676:0xD8/0x84
-
-# Reset Recall
-K:677:0x86/0x81
-
-# Divination
-K:678:0x86/0x81
-
-# Rune: Self
-K:679:0xDA/0x80
-
-# Rune: Ray
-K:680:0xDA/0x80
-
-# Rune: Sphere
-K:681:0xDA/0x80
-
-# Rune: Knowledge
-K:682:0xDA/0x80
-
-# Rune: Life
-K:683:0xDA/0x84
-
-# Rune: Fire
-K:684:0xDA/0x81
-
-# Rune: Cold
-K:685:0xDA/0x80
-
-# Rune: Lightning
-K:686:0xDA/0x85
-
-# Rune: Acid
-K:687:0xDA/0x88
-
-# Rune: Element
-K:688:0xDA/0x89
-
-# Rune: Chaos
-K:689:0xDA/0x83
-
-# Rune: Mind
-K:690:0xDA/0x84
-
-# Rune: Holding
-K:691:0xDA/0x84
-
-# Rune: Arrow
-K:692:0xDA/0x80
-
-# Rune: Power Surge
-K:693:0xDA/0x80
-
-# Rune: Armageddon
-K:694:0xDA/0x80
-
-# Rune: Gravity
-K:695:0xDA/0x82
-
-# Essence: Extra Life
-K:696:0xD9/0x82
-
-# Rune: Undeath
-K:697:0xDA/0x82
-
-# Rune: Protection
-K:698:0xDA/0x82
-
-# Horn
-K:699:0xD8/0x8E
-
-# The Ring of Precognition
-K:700:0xB5/0x8E
-
-# Sprig of Athelas
-K:701:0xCE/0x96
-
-# [Magic for Beginners]
-K:702:0x8A/0x80
-
-# [Conjurings and Tricks]
-K:703:0x8A/0x80
-
-# [Incantations and Illusions]
-K:704:0x8A/0x80
-
-# [Sorcery and Evocations]
-K:705:0x8A/0x80
-
-# [Beginners Handbook]
-K:706:0x8A/0x89
-
-# [Words of Wisdom]
-K:707:0x8A/0x89
-
-# [Chants and Blessings]
-K:708:0x8A/0x89
-
-# [Exorcism and Dispelling]
-K:709:0x8A/0x89
-
-# [Resistance of Scarabtarices]
-K:710:0x8A/0x88
-
-# [Mordenkainen's Escapes]
-K:711:0x8A/0x88
-
-# [Kelek's Grimoire of Power]
-K:712:0x8A/0x88
-
-# [Tenser's Transformations]
-K:713:0x8A/0x88
-
-# [Raal's Tome of Destruction]
-K:714:0x8A/0x88
-
-# [Ethereal Openings]
-K:715:0x8A/0x85
-
-# [Godly Insights]
-K:716:0x8A/0x85
-
-# [Purifications and Healing]
-K:717:0x8A/0x85
-
-# [Holy Infusions]
-K:718:0x8A/0x85
-
-# [Wrath of God]
-K:719:0x8A/0x85
-
-# & Old Scroll~ of Deincarnation
-K:720:0x85/0x80
-
-# Dark Sword
-K:721:0xCE/0x9D
-
-# Numenorean for beginners (I)
-K:722:0xD8/0x81
-
-# Numenorean for beginners (II)
-K:723:0xD8/0x81
-
-# Advanced lessons of Numenorean
-K:724:0xD8/0x81
-
-# Advanced lessons of Sindarin
-K:725:0xD8/0x81
-
-# & Shard~ of Pottery
-K:726:0x8B/0x88
-
-# & Broken Stick~
-K:727:0x8B/0x89
-
-# Wall Creation
-K:728:0xB5/0x80
-
-# [Illusions for Beginners]
-K:729:0xA3/0x86
-
-# [Tricks and Visions]
-K:730:0xA3/0x86
-
-# [Phantasms and Illusions]
-K:731:0xA3/0x86
-
-# [Shadows and Prisms]
-K:732:0xA3/0x86
-
-# [Serten's Immunities]
-K:733:0xA3/0x87
-
-# [Knowledge of Kenault]
-K:734:0xA3/0x87
-
-# [Otiluke's Spheres]
-K:735:0xA3/0x87
-
-# [Boccob's Book of Shadows]
-K:736:0xA3/0x87
-
-# [Bigby's Handbook]
-K:737:0xA3/0x87
-
-# [Hunt of Orome]
-K:738:0xA3/0x8B
-
-# [Holy Sanctifications]
-K:739:0xA3/0x8B
-
-# [Secrets of the Feanturi]
-K:740:0xA3/0x8B
-
-# [War of Wrath]
-K:741:0xA3/0x8B
-
-# [Gifts of Iluvatar]
-K:742:0xA3/0x8B
-
-# & Potion~ of Learning
-K:743:0x87/0x86
-
-# [Eye of Sauron]
-K:744:0xA3/0x93
-
-# [Flame of Udun]
-K:745:0xA3/0x93
-
-# [Corruptions of Melkor]
-K:746:0xA3/0x93
-
-# [Crescent of Morgul]
-K:747:0xA3/0x93
-
-# [Morgoth's Ring]
-K:748:0xA3/0x93
-
-# Scroll: Spell
-K:749:0x86/0x82
-
-# Staff: Wishing
-K:750:0xB9/0x9B
-
-# Khuzdul - The hidden tongue of the Dwarves
-K:751:0xD8/0x81
-
-# Nandorin for dummies
-K:752:0xD8/0x81
-
-# Advanced lessons of Orcish
-K:753:0xD8/0x81
-
-# Ring: Flying
-K:755:0xB5/0x80
-
-# [Powerful Sigils]
-K:756:0xA3/0x8D
-
-# [Disruptive Forces]
-K:758:0xA3/0x8D
-
-# [Forces of the Mind]
-K:759:0xA3/0x8D
-
-# [Power of Ancient Sorcerors]
-K:760:0xA3/0x8D
-
-# [Tricks of the Wild]
-K:761:0xBC/0x93
-
-# [Mastering the Rituals]
-K:762:0xBC/0x93
-
-# [Rites of Power]
-K:763:0xBC/0x94
-
-# [Tribal Power]
-K:764:0xBC/0x94
-
-# [Aiding Shades]
-K:765:0xA3/0x8F
-
-# [Morgoth's Space-Time Warpings]
-K:766:0xA3/0x8F
-
-# [Murazor's Tome of Conjuring & Dispelling]
-K:767:0xA3/0x8F
-
-# [Channeling the Void]
-K:768:0xA3/0x8F
-
-# [Sauron's Forgotten Tome]
-K:769:0xA3/0x8F
-
-# Ring of Phasing
-K:770:0xB5/0x8E
-
-# [Earth]
-K:771:0xD8/0x82
-
-# [Fire]
-K:772:0xD8/0x82
-
-# [Air]
-K:773:0xD8/0x83
-
-# [Water]
-K:774:0xD8/0x83
-
-# [Mana]
-K:775:0xD8/0x83
-
-# Rod Tip: Home Summoning
-K:776:0xB8/0x84
-
-# Shadow Blade
-K:777:0xCD/0x9C
-
-# Bluesteel Blade
-K:778:0xCE/0x9E
-
-# Amulet: of the Serpents
-K:779:0xB6/0x9F
-
-# Darkness
-K:780:0xD9/0x82
-
-# Knowledge
-K:781:0xD9/0x82
-
-# Force
-K:782:0xD9/0x82
-
-# Lightning
-K:783:0xD9/0x82
-
-# Mana
-K:784:0xD9/0x82
-
-# Nazgul Ring
-K:785:0xB5/0x85
-
-# Climbing Set
-K:786:0xD8/0x92
-
-# Adventurer's guide to Middle-earth
-K:787:0xD8/0x80
-
-# [Dark Incantations]
-K:788:0xCE/0x94
-
-# [Immortal Rituals]
-K:789:0xCE/0x94
-
-# [Minions of Azathoth]
-K:790:0xCE/0x95
-
-# [Demonthoughts]
-K:791:0xCE/0x95
-
-# [Hellfire Tome]
-K:792:0xCE/0x95
-
-# Rod: Wooden
-K:793:0xDB/0x80
-
-# Rod: Copper
-K:794:0xDB/0x81
-
-# Rod: Iron
-K:795:0xDB/0x82
-
-# Rod: Aluminium
-K:796:0xDB/0x83
-
-# Rod: Silver
-K:797:0xDB/0x84
-
-# Rod: Golden
-K:798:0xDB/0x85
-
-# Rod: Mithril
-K:799:0xDB/0x86
-
-# Rod: Adamantite
-K:800:0xDB/0x87
-
-# Greater Ration of Health
-K:801:0x8A/0x9E
-
-# Scroll of Mass Ressurrection
-K:802:0x86/0x82
-
-# Cleaver
-K:803:0xD8/0x93
-
-# Light War Axe
-K:804:0xD8/0x94
-
-# Slaughter Axe
-K:805:0xD8/0x95
-
-# Runestone
-K:806:0xDA/0x83
-
-# Fortune Cookie
-K:807:0x8A/0x93
-
-# Portable Hole
-K:808:0xD8/0x96
-
-# Ring: Critical Hits
-K:809:0xB5/0x82
-
-# Wand of Digging of Thrain
-K:810:0xB8/0x97
-
-# Gnarled Staff of Holy Fire of Mithrandir
-K:811:0xCE/0x9F
-
-# Partial Totem
-K:812:0xB4/0x82
-
-# True Totem
-K:813:0xB4/0x85
-
-# Player
-R:0:0x8C/0x81
-
-# Filthy street urchin
-R:1:0x9B/0x8A
-
-# Scrawny cat
-R:2:0x98/0x8B
-
-# Sparrow
-R:3:0xBD/0x87
-
-# Chaffinch
-R:4:0xBD/0x86
-
-# Wild rabbit
-R:5:0xBF/0x85
-
-# Woodsman
-R:6:0xBD/0x88
-
-# Scruffy little dog
-R:7:0x8E/0x9D
-
-# Farmer Maggot
-R:8:0x9B/0x8B
-
-# Blubbering idiot
-R:9:0x9B/0x8C
-
-# Boil-covered wretch
-R:10:0x9B/0x8D
-
-# Village idiot
-R:11:0x9B/0x8E
-
-# Pitiful-looking beggar
-R:12:0xBB/0x82
-
-# Mangy-looking leper
-R:13:0x9B/0x90
-
-# Agent of the black market
-R:14:0xA2/0x94
-
-# Singing, happy drunk
-R:15:0x9B/0x92
-
-# Aimless-looking merchant
-R:16:0x9B/0x93
-
-# Mean-looking mercenary
-R:17:0x9B/0x94
-
-# Battle-scarred veteran
-R:18:0x9B/0x95
-
-# Martti Ihrasaari
-R:19:0xA1/0x8D
-
-# Grey mold
-R:20:0x9A/0x88
-
-# Large white snake
-R:21:0x93/0x8A
-
-# Grey mushroom patch
-R:22:0x8E/0x85
-
-# Newt
-R:23:0xA0/0x86
-
-# Giant white centipede
-R:24:0x96/0x9E
-
-# White icky thing
-R:25:0x99/0x8C
-
-# Clear icky thing
-R:26:0x99/0x8D
-
-# Giant white mouse
-R:27:0x9D/0x8F
-
-# Large brown snake
-R:28:0x93/0x92
-
-# Small kobold
-R:29:0x9A/0x82
-
-# Kobold
-R:30:0x9A/0x83
-
-# White worm mass
-R:31:0x9E/0x88
-
-# Floating eye
-R:32:0x98/0x84
-
-# Rock lizard
-R:33:0x93/0x8B
-
-# Grid bug
-R:34:0xA2/0x9B
-
-# Jackal
-R:35:0x8E/0x9E
-
-# Soldier ant
-R:36:0x96/0x8F
-
-# Fruit bat
-R:37:0x96/0x98
-
-# Insect swarm
-R:38:0xBD/0x89
-
-# The Greater hell-beast
-R:39:0xA2/0x82
-
-# Shrieker mushroom patch
-R:40:0x8E/0x86
-
-# Blubbering icky thing
-R:41:0x99/0x8E
-
-# Metallic green centipede
-R:42:0x96/0x9F
-
-# Novice warrior
-R:43:0x9B/0x96
-
-# Novice rogue
-R:44:0x9B/0x97
-
-# Novice priest
-R:45:0x9B/0x98
-
-# Novice mage
-R:46:0x9B/0x99
-
-# Yellow mushroom patch
-R:47:0x8E/0x87
-
-# White jelly
-R:48:0x99/0x93
-
-# Giant black ant
-R:49:0x96/0x90
-
-# Salamander
-R:50:0x93/0x8D
-
-# White harpy
-R:51:0x91/0x8C
-
-# Blue yeek
-R:52:0x9E/0x92
-
-# Grip, Farmer Maggot's dog
-R:53:0x8E/0x9F
-
-# Wolf, Farmer Maggot's dog
-R:54:0xBD/0x8A
-
-# Fang, Farmer Maggot's dog
-R:55:0x8F/0x80
-
-# Giant green frog
-R:56:0x93/0x8C
-
-# Freesia
-R:57:0xBC/0x98
-
-# Green worm mass
-R:58:0x9E/0x89
-
-# Large yellow snake
-R:59:0x93/0x91
-
-# Cave spider
-R:60:0x94/0x82
-
-# Crow
-R:61:0xBD/0x8B
-
-# Wild cat
-R:62:0x98/0x8C
-
-# Smeagol
-R:63:0x9B/0x9A
-
-# Green ooze
-R:64:0x99/0x94
-
-# Poltergeist
-R:65:0x90/0x9D
-
-# Yellow jelly
-R:66:0x99/0x96
-
-# Metallic blue centipede
-R:67:0x97/0x80
-
-# Raven
-R:68:0xBD/0x8C
-
-# Giant white louse
-R:69:0x9A/0x86
-
-# Giant yellow centipede
-R:70:0x96/0x9D
-
-# Black naga
-R:71:0x9A/0x91
-
-# Spotted mushroom patch
-R:72:0x8E/0x88
-
-# Silver jelly
-R:73:0x99/0x95
-
-# Scruffy-looking hobbit
-R:74:0x98/0x9C
-
-# Giant white ant
-R:75:0x96/0x91
-
-# Yellow mold
-R:76:0x9A/0x89
-
-# Metallic red centipede
-R:77:0x97/0x81
-
-# Yellow worm mass
-R:78:0x9E/0x8A
-
-# Clear worm mass
-R:79:0x9E/0x8B
-
-# Radiation eye
-R:80:0x98/0x85
-
-# Yellow light
-R:81:0xBD/0x92
-
-# Cave lizard
-R:82:0x93/0x8F
-
-# Novice ranger
-R:83:0x9B/0x9B
-
-# Blue jelly
-R:84:0x99/0x97
-
-# Creeping copper coins
-R:85:0x8E/0x80
-
-# Giant white rat
-R:86:0x9D/0x90
-
-# Snotling
-R:87:0xBD/0x8D
-
-# Swordfish
-R:88:0xBE/0x81
-
-# Blue worm mass
-R:89:0x9E/0x8C
-
-# Large grey snake
-R:90:0x93/0x90
-
-# Skeleton kobold
-R:91:0x9D/0x93
-
-# Ewok
-R:92:0xBB/0x90
-
-# Novice mage
-R:93:0x9B/0x9D
-
-# Green naga
-R:94:0x9A/0x92
-
-# Giant leech
-R:95:0xBD/0x8E
-
-# Barracuda
-R:96:0xBE/0x82
-
-# Novice paladin
-R:97:0x9B/0x9C
-
-# Zog
-R:98:0xBD/0x8F
-
-# Blue ooze
-R:99:0x99/0x98
-
-# Green glutton ghost
-R:100:0x90/0x9E
-
-# Green jelly
-R:101:0x99/0x99
-
-# Large kobold
-R:102:0x9A/0x84
-
-# Grey icky thing
-R:103:0x99/0x8F
-
-# Disenchanter eye
-R:104:0x98/0x86
-
-# Red worm mass
-R:105:0x9E/0x8D
-
-# Copperhead snake
-R:106:0x93/0x91
-
-# Death sword
-R:107:0x89/0x85
-
-# Purple mushroom patch
-R:108:0x8E/0x89
-
-# Novice priest
-R:109:0x9B/0x9E
-
-# Novice warrior
-R:110:0x9B/0x9F
-
-# Nibelung
-R:111:0xBB/0x8E
-
-# The disembodied hand that strangled people
-R:112:0x9F/0x87
-
-# Brown mold
-R:113:0x9A/0x8A
-
-# Giant brown bat
-R:114:0x96/0x99
-
-# Rat-thing
-R:115:0xBD/0x90
-
-# Novice rogue
-R:116:0x9C/0x81
-
-# Creeping silver coins
-R:117:0x8E/0x81
-
-# Snaga
-R:118:0x9A/0x97
-
-# Rattlesnake
-R:119:0x93/0x92
-
-# Giant slug
-R:120:0xBD/0x93
-
-# Giant pink frog
-R:121:0x93/0x93
-
-# Dark elf
-R:122:0x98/0x9E
-
-# Zombified kobold
-R:123:0x9E/0x97
-
-# Crypt creep
-R:124:0x9F/0x93
-
-# Rotting corpse
-R:125:0xBB/0x8B
-
-# Cave orc
-R:126:0x9A/0x98
-
-# Wood spider
-R:127:0x94/0x83
-
-# Manes
-R:128:0x91/0x96
-
-# Bloodshot eye
-R:129:0x98/0x87
-
-# Red naga
-R:130:0x9A/0x93
-
-# Red jelly
-R:131:0x99/0x9A
-
-# Green icky thing
-R:132:0x99/0x90
-
-# Lost soul
-R:133:0x90/0x9F
-
-# Night lizard
-R:134:0x93/0x94
-
-# Mughash, the Kobold Lord
-R:135:0x9A/0x85
-
-# Skeleton orc
-R:136:0x9D/0x94
-
-# Wormtongue, Agent of Saruman
-R:137:0xBC/0x9A
-
-# Robin Hood, the Outlaw
-R:138:0xBB/0x88
-
-# Nurgling
-R:139:0xBD/0x94
-
-# Lagduf, the Snaga
-R:140:0x9A/0x99
-
-# Brown yeek
-R:141:0x9E/0x93
-
-# Novice ranger
-R:142:0x9B/0x9B
-
-# Giant salamander
-R:143:0x93/0x95
-
-# Space monster
-R:144:0x8A/0x9B
-
-# Carnivorous flying monkey
-R:145:0xBD/0x95
-
-# Green mold
-R:146:0x9A/0x8B
-
-# Novice paladin
-R:147:0x9B/0x9C
-
-# Lemure
-R:148:0x91/0x97
-
-# Hill orc
-R:149:0x9A/0x9A
-
-# Bandit
-R:150:0x9C/0x85
-
-# Hunting hawk
-R:151:0x96/0x99
-
-# Phantom warrior
-R:152:0xA0/0x83
-
-# Gremlin
-R:153:0xA1/0x86
-
-# Yeti
-R:154:0x95/0x99
-
-# Bloodshot icky thing
-R:155:0x99/0x91
-
-# Giant grey rat
-R:156:0x9D/0x91
-
-# Black harpy
-R:157:0x91/0x8D
-
-# Skaven
-R:158:0xBD/0x96
-
-# The wounded bear
-R:159:0xBD/0x98
-
-# Cave bear
-R:160:0xB0/0x82
-
-# Rock mole
-R:161:0xBD/0x99
-
-# Mindcrafter
-R:162:0xB0/0x85
-
-# Baby blue dragon
-R:163:0x97/0x86
-
-# Baby white dragon
-R:164:0x97/0x87
-
-# Baby green dragon
-R:165:0x97/0x88
-
-# Baby black dragon
-R:166:0x97/0x89
-
-# Baby red dragon
-R:167:0x97/0x8A
-
-# Giant red ant
-R:168:0x96/0x96
-
-# Brodda, the Easterling
-R:169:0x9C/0x86
-
-# Bloodfang, the Wolf
-R:170:0xBD/0x9A
-
-# King cobra
-R:171:0x93/0x96
-
-# Eagle
-R:172:0xBD/0x9B
-
-# War bear
-R:173:0x9F/0x9D
-
-# Killer bee
-R:174:0xA0/0x88
-
-# Giant spider
-R:175:0x94/0x87
-
-# Giant white tick
-R:176:0x9D/0x9C
-
-# The Borshin
-R:177:0xBD/0x9C
-
-# Dark elven mage
-R:178:0x98/0x9F
-
-# Kamikaze yeek
-R:179:0xBD/0x9D
-
-# Orfax, Son of Boldor
-R:180:0x9E/0x94
-
-# Servant of Glaaki
-R:181:0xBD/0x9E
-
-# Dark elven warrior
-R:182:0x99/0x80
-
-# Sand-dweller
-R:183:0xBF/0x80
-
-# Clear mushroom patch
-R:184:0x8E/0x8A
-
-# Quiver slot
-R:185:0x89/0x9A
-
-# Grishnakh, the Hill Orc
-R:186:0x9A/0x9C
-
-# Giant tan bat
-R:187:0x96/0x99
-
-# Owlbear
-R:188:0xBF/0x81
-
-# Blue horror
-R:189:0xBF/0x82
-
-# Hairy mold
-R:190:0x9A/0x8C
-
-# Grizzly bear
-R:191:0xBF/0x83
-
-# Disenchanter mold
-R:192:0x9A/0x8D
-
-# Pseudo dragon
-R:193:0xBB/0x9B
-
-# Tengu
-R:194:0x91/0x98
-
-# Creeping gold coins
-R:195:0x8E/0x82
-
-# Wolf
-R:196:0x8F/0x81
-
-# Giant fruit fly
-R:197:0x90/0x95
-
-# Panther
-R:198:0x98/0x8D
-
-# Brigand
-R:199:0x9C/0x87
-
-# Hobbes the Tiger
-R:200:0x98/0x8E
-
-# Shadow Creature of Fiona
-R:201:0xBB/0x8F
-
-# Undead mass
-R:202:0xA0/0x89
-
-# Chaos shapechanger
-R:203:0xA0/0x8E
-
-# Baby multi-hued dragon
-R:204:0x97/0x8C
-
-# Vorpal bunny
-R:205:0xBF/0x84
-
-# Old Man Willow
-R:206:0xBF/0x86
-
-# Hippocampus
-R:207:0xBE/0x85
-
-# Zombified orc
-R:208:0x9E/0x98
-
-# Hippogriff
-R:209:0x91/0x8E
-
-# Black mamba
-R:210:0x93/0x97
-
-# White wolf
-R:211:0x8F/0x82
-
-# Grape jelly
-R:212:0x99/0x9B
-
-# Nether worm mass
-R:213:0x9E/0x8E
-
-# Abyss worm mass
-R:214:0xA0/0x8C
-
-# Golfimbul, the Hill Orc Chief
-R:215:0x9A/0x9D
-
-# Swordsman
-R:216:0x9C/0x89
-
-# Skaven shaman
-R:217:0xBD/0x97
-
-# Baby bronze dragon
-R:218:0xB0/0x89
-
-# Baby gold dragon
-R:219:0xB0/0x8A
-
-# Evil eye
-R:220:0xB0/0x8B
-
-# Mine-dog
-R:221:0xBF/0x88
-
-# Hellcat
-R:222:0xBC/0x97
-
-# Moon beast
-R:223:0xBB/0x9E
-
-# Master yeek
-R:224:0x9E/0x95
-
-# Priest
-R:225:0x9C/0x88
-
-# Dark elven priest
-R:226:0x99/0x82
-
-# Air spirit
-R:227:0x90/0x83
-
-# Skeleton human
-R:228:0x9D/0x95
-
-# Zombified human
-R:229:0x9E/0x99
-
-# Tiger
-R:230:0x98/0x8E
-
-# Moaning spirit
-R:231:0x91/0x80
-
-# Stegocentipede
-R:232:0x97/0x82
-
-# Spotted jelly
-R:233:0x99/0x9C
-
-# Drider
-R:234:0x94/0x85
-
-# Mongbat
-R:235:0xC4/0x80
-
-# Killer brown beetle
-R:236:0x92/0x80
-
-# Boldor, King of the Yeeks
-R:237:0x9E/0x96
-
-# Ogre
-R:238:0x92/0x90
-
-# Creeping mithril coins
-R:239:0x8E/0x83
-
-# Illusionist
-R:240:0x9C/0x8A
-
-# Druid
-R:241:0x9C/0x8B
-
-# Pink horror
-R:242:0xBF/0x89
-
-# Cloaker
-R:243:0xBF/0x8A
-
-# Black orc
-R:244:0x9A/0x9E
-
-# Ochre jelly
-R:245:0x99/0x9D
-
-# Software bug
-R:246:0xA0/0x92
-
-# Lurker
-R:247:0x80/0x80
-
-# Tangleweed
-R:248:0xBE/0x9E
-
-# Vlasta
-R:249:0xBF/0x8C
-
-# Giant white dragon fly
-R:250:0x90/0x97
-
-# Snaga sapper
-R:251:0xBF/0x8D
-
-# Blue icky thing
-R:252:0x99/0x92
-
-# Gibbering mouther
-R:253:0xA0/0x8A
-
-# Wolfhound of Flora
-R:254:0xA0/0x91
-
-# Hill giant
-R:255:0x92/0x96
-
-# Flesh golem
-R:256:0x98/0x92
-
-# Warg
-R:257:0x8F/0x83
-
-# Cheerful leprechaun
-R:258:0xA0/0x93
-
-# Giant flea
-R:259:0x90/0x96
-
-# Ufthak of Cirith Ungol
-R:260:0x9A/0x9F
-
-# Clay golem
-R:261:0x98/0x93
-
-# Black ogre
-R:262:0x92/0x91
-
-# Dweller on the threshold
-R:263:0xC4/0x83
-
-# Half-orc
-R:264:0x9B/0x80
-
-# Dark naga
-R:265:0xBF/0x8E
-
-# Poison ivy
-R:266:0xBE/0x9C
-
-# Magic mushroom patch
-R:267:0x8E/0x8B
-
-# Plaguebearer of Nurgle
-R:268:0xBF/0x8F
-
-# Guardian naga
-R:269:0x9A/0x94
-
-# Wererat
-R:270:0x9D/0x92
-
-# Light hound
-R:271:0x95/0x9B
-
-# Dark hound
-R:272:0x95/0x9C
-
-# Flying skull
-R:273:0xA0/0x95
-
-# Mi-Go
-R:274:0x9F/0x9F
-
-# Giant tarantula
-R:275:0x94/0x86
-
-# Giant clear centipede
-R:276:0x97/0x83
-
-# Mirkwood spider
-R:277:0x94/0x84
-
-# Frost giant
-R:278:0x92/0x97
-
-# Griffon
-R:279:0x91/0x8F
-
-# Homunculus
-R:280:0x91/0x99
-
-# Gnome mage
-R:281:0x99/0x83
-
-# Clear hound
-R:282:0x95/0x9D
-
-# Umber hulk
-R:283:0x94/0x9E
-
-# Rust monster
-R:284:0xBF/0x90
-
-# Ogrillon
-R:285:0xB0/0x8C
-
-# Gelatinous cube
-R:286:0x99/0x9E
-
-# Giant green dragon fly
-R:287:0x90/0x98
-
-# Fire giant
-R:288:0x92/0x98
-
-# Hummerhorn
-R:289:0x90/0x99
-
-# Lizard man
-R:290:0xBF/0x91
-
-# Ulfast, Son of Ulfang
-R:291:0x9C/0x8C
-
-# Crebain
-R:292:0xC4/0x94
-
-# Berserker
-R:293:0xBF/0x92
-
-# Quasit
-R:294:0x91/0x9A
-
-# Sphinx
-R:295:0xBF/0x93
-
-# Imp
-R:296:0x91/0x9B
-
-# Forest troll
-R:297:0x94/0x8E
-
-# Freezing sphere
-R:298:0xBF/0x94
-
-# Jumping fireball
-R:299:0xBF/0x95
-
-# Ball lightning
-R:300:0xBF/0x96
-
-# 2-headed hydra
-R:301:0x93/0x98
-
-# Swamp thing
-R:302:0xBF/0x97
-
-# Water spirit
-R:303:0x90/0x84
-
-# Giant red scorpion
-R:304:0x94/0x8C
-
-# Earth spirit
-R:305:0x90/0x85
-
-# Fire spirit
-R:306:0x90/0x86
-
-# Fire hound
-R:307:0x95/0x9E
-
-# Cold hound
-R:308:0x95/0x9F
-
-# Energy hound
-R:309:0x96/0x80
-
-# Lesser Mimic
-R:310:0x8E/0x8F
-
-# Door mimic
-R:311:0xBF/0x98
-
-# Blink dog
-R:312:0x8F/0x84
-
-# Uruk
-R:313:0x9B/0x82
-
-# Shagrat, the Orc Captain
-R:314:0x9B/0x83
-
-# Gorbag, the Orc Captain
-R:315:0x9B/0x84
-
-# Shambling mound
-R:316:0x8E/0x8C
-
-# Giant Venus Flytrap
-R:317:0xBE/0x9D
-
-# Chaos beastman
-R:318:0xBF/0x99
-
-# Daemonette of Slaanesh
-R:319:0xBF/0x9A
-
-# Giant bronze dragon fly
-R:320:0x90/0x9C
-
-# Stone giant
-R:321:0x92/0x99
-
-# Giant black dragon fly
-R:322:0x90/0x9A
-
-# Stone golem
-R:323:0x98/0x94
-
-# Red mold
-R:324:0x9A/0x8E
-
-# Giant gold dragon fly
-R:325:0x90/0x9B
-
-# Stunwall
-R:326:0xBF/0x9B
-
-# Ghast
-R:327:0xBF/0x9C
-
-# Neekerbreeker
-R:328:0xBE/0x86
-
-# Huorn
-R:329:0xBF/0x9D
-
-# Bolg, Son of Azog
-R:330:0x9B/0x85
-
-# Phase spider
-R:331:0x94/0x89
-
-# Lizard king
-R:332:0xBF/0x9E
-
-# Landmine
-R:333:0xBF/0x9F
-
-# Wyvern
-R:334:0xA0/0x97
-
-# Great eagle
-R:335:0xC0/0x80
-
-# Livingstone
-R:336:0x80/0x82
-
-# Earth hound
-R:337:0x96/0x81
-
-# Air hound
-R:338:0x96/0x82
-
-# Sabre-tooth tiger
-R:339:0x98/0x8F
-
-# Acid hound
-R:340:0x96/0x83
-
-# Chimaera
-R:341:0x91/0x90
-
-# Quylthulg
-R:342:0x92/0x9F
-
-# Sasquatch
-R:343:0x95/0x9A
-
-# Weir
-R:344:0xA0/0x96
-
-# Ranger
-R:345:0x9C/0x83
-
-# Paladin
-R:346:0x8D/0x9C
-
-# Werewolf
-R:347:0x8F/0x85
-
-# Dark elven lord
-R:348:0x99/0x85
-
-# Cloud giant
-R:349:0x92/0x9A
-
-# Ugluk, the Uruk
-R:350:0x9B/0x86
-
-# Blue dragon bat
-R:351:0x96/0x9A
-
-# Mimic
-R:352:0x86/0x82
-
-# Ultimate Mimic
-R:353:0xC0/0x83
-
-# Fire vortex
-R:354:0x9D/0x9E
-
-# Acid vortex
-R:355:0x9D/0x9F
-
-# Lugdush, the Uruk
-R:356:0x9B/0x87
-
-# Arch-vile
-R:357:0xC0/0x84
-
-# Cold vortex
-R:358:0x9E/0x80
-
-# Energy vortex
-R:359:0x9E/0x81
-
-# Globefish
-R:360:0xBE/0x8D
-
-# Giant firefly
-R:361:0xB0/0x8D
-
-# Mummified orc
-R:362:0x92/0x8D
-
-# Wolf chieftain
-R:363:0xBE/0x8E
-
-# Serpent man
-R:364:0xC0/0x85
-
-# Vampiric mist
-R:365:0xC0/0x86
-
-# Killer stag beetle
-R:366:0x92/0x81
-
-# Iron golem
-R:367:0x98/0x95
-
-# Auto-roller
-R:368:0xA0/0x98
-
-# Giant yellow scorpion
-R:369:0x94/0x8A
-
-# Jade monk
-R:370:0xC0/0x87
-
-# Black ooze
-R:371:0x99/0x9F
-
-# Hardened warrior
-R:372:0x9C/0x8D
-
-# Azog, King of the Uruk-Hai
-R:373:0x9B/0x88
-
-# Fleshhound of Khorne
-R:374:0xC0/0x89
-
-# Dark elven warlock
-R:375:0xA0/0x81
-
-# Master rogue
-R:376:0x9C/0x8E
-
-# Red dragon bat
-R:377:0x96/0x9B
-
-# Killer white beetle
-R:378:0x96/0x91
-
-# Ice skeleton
-R:379:0xC0/0x8A
-
-# Angamaite of Umbar
-R:380:0x9C/0x90
-
-# Forest wight
-R:381:0x95/0x83
-
-# Khim, Son of Mim
-R:382:0x99/0x87
-
-# Ibun, Son of Mim
-R:383:0x99/0x86
-
-# Meneldor the Swift
-R:384:0xC0/0x8B
-
-# Phantom beast
-R:385:0xA0/0x84
-
-# Giant silver ant
-R:386:0xB0/0x87
-
-# 4-headed hydra
-R:387:0x93/0x9A
-
-# Lesser hell-beast
-R:388:0xC0/0x8C
-
-# Tyrannosaur
-R:389:0x9F/0x94
-
-# Mummified human
-R:390:0x92/0x8E
-
-# Vampire bat
-R:391:0x96/0x9C
-
-# Sangahyando of Umbar
-R:392:0x9C/0x8F
-
-# It
-R:393:0x80/0x80
-
-# Banshee
-R:394:0x91/0x81
-
-# Carrion crawler
-R:395:0x97/0x84
-
-# Xiclotlan
-R:396:0xC0/0x8D
-
-# Silent watcher
-R:397:0xA0/0x9A
-
-# Pukelman
-R:398:0x98/0x96
-
-# Disenchanter beast
-R:399:0xC0/0x8E
-
-# Dark elven druid
-R:400:0x99/0x88
-
-# Stone troll
-R:401:0x94/0x9A
-
-# Black
-R:402:0xC0/0x8F
-
-# Hill troll
-R:403:0xB0/0x8F
-
-# Wereworm
-R:404:0x9E/0x8F
-
-# Killer red beetle
-R:405:0x92/0x83
-
-# Disenchanter bat
-R:406:0xB0/0x9B
-
-# Gnoph-Keh
-R:407:0xC0/0x90
-
-# Giant grey ant
-R:408:0x96/0x95
-
-# Khufu, the Mummified King
-R:409:0xA0/0x9C
-
-# Gwaihir the Windlord
-R:410:0xC0/0x91
-
-# Giant fire tick
-R:411:0x9D/0x9D
-
-# Displacer beast
-R:412:0x98/0x90
-
-# Ulwarth, Son of Ulfang
-R:413:0x9C/0x91
-
-# Werebear
-R:414:0xB1/0x96
-
-# Cave ogre
-R:415:0x92/0x92
-
-# White wraith
-R:416:0x95/0x84
-
-# Angel
-R:417:0x8E/0x92
-
-# Ghoul
-R:418:0xBB/0x8C
-
-# Mim, Betrayer of Turin
-R:419:0x99/0x89
-
-# Hellblade
-R:420:0x89/0x87
-
-# Killer fire beetle
-R:421:0x92/0x84
-
-# Beast of Nurgle
-R:422:0xC0/0x92
-
-# Creeping adamantite coins
-R:423:0x8E/0x84
-
-# Algroth
-R:424:0x94/0x91
-
-# Flamer of Tzeentch
-R:425:0xC0/0x93
-
-# Roper
-R:426:0xC0/0x94
-
-# Headless
-R:427:0x9F/0x86
-
-# Vibration hound
-R:428:0x96/0x84
-
-# Nexus hound
-R:429:0x96/0x8A
-
-# Half-ogre
-R:430:0xB0/0x9E
-
-# Lokkak, the Ogre Chieftain
-R:431:0xA1/0x80
-
-# Vampire
-R:432:0x94/0x9F
-
-# Gorgimaera
-R:433:0x91/0x91
-
-# Shantak
-R:434:0xA0/0x9D
-
-# Colbran
-R:435:0x98/0x97
-
-# Spirit naga
-R:436:0x9A/0x95
-
-# Corpser
-R:437:0xC0/0x95
-
-# Fiend of Slaanesh
-R:438:0xC0/0x96
-
-# Stairway to Hell
-R:439:0x81/0x9E
-
-# 5-headed hydra
-R:440:0x93/0x9B
-
-# Barney the Dinosaur
-R:441:0x9F/0x96
-
-# Black knight
-R:442:0x9C/0x92
-
-# Seahorse
-R:443:0xBE/0x91
-
-# Cyclops
-R:444:0xC0/0x97
-
-# Clairvoyant
-R:445:0xC0/0x98
-
-# Purple worm
-R:446:0x9E/0x90
-
-# Catoblepas
-R:447:0x9D/0x8B
-
-# Lesser wall monster
-R:448:0x80/0x82
-
-# Mage
-R:449:0x9C/0x94
-
-# Mind flayer
-R:450:0x9C/0x95
-
-# The Ultimate Dungeon Cleaner
-R:451:0xA0/0x99
-
-# Deep one
-R:452:0xC0/0x99
-
-# Basilisk
-R:453:0xBB/0x9F
-
-# Ice troll
-R:454:0x94/0x92
-
-# Dhole
-R:455:0xA1/0x82
-
-# Archangel
-R:456:0x8E/0x93
-
-# Greater Mimic
-R:457:0x82/0x81
-
-# Chaos tile
-R:458:0xA2/0x86
-
-# Young blue dragon
-R:459:0x97/0x8D
-
-# Young white dragon
-R:460:0x97/0x8E
-
-# Young green dragon
-R:461:0x97/0x8F
-
-# Young bronze dragon
-R:462:0x97/0x90
-
-# Aklash
-R:463:0xC0/0x9A
-
-# Mithril golem
-R:464:0x98/0x98
-
-# Skeleton troll
-R:465:0x9D/0x96
-
-# Skeletal tyrannosaur 
-R:466:0xC0/0x9B
-
-# Beorn, the Shape-Changer
-R:467:0xA1/0x92
-
-# Thorondor, Lord of Eagles
-R:468:0xC0/0x9C
-
-# Giant blue ant
-R:469:0x96/0x94
-
-# Grave wight
-R:470:0x95/0x85
-
-# Shadow drake
-R:471:0x97/0x91
-
-# Manticore
-R:472:0x91/0x92
-
-# Giant army ant
-R:473:0x96/0x95
-
-# Killer slicer beetle
-R:474:0x92/0x85
-
-# Gorgon
-R:475:0xC0/0x9D
-
-# Gug
-R:476:0xC0/0x9E
-
-# Ghost
-R:477:0x91/0x82
-
-# Death watch beetle
-R:478:0x92/0x86
-
-# Mountain ogre
-R:479:0x92/0x95
-
-# Nexus quylthulg
-R:480:0x93/0x80
-
-# Shelob, Spider of Darkness
-R:481:0x94/0x8B
-
-# Giant squid
-R:482:0xBE/0x87
-
-# Ghoulking
-R:483:0xC0/0x9F
-
-# Doombat
-R:484:0xC1/0x80
-
-# Ninja
-R:485:0x9C/0x96
-
-# Memory moss
-R:486:0x9A/0x8F
-
-# Storm giant
-R:487:0x92/0x9B
-
-# Spectator
-R:488:0xA0/0x85
-
-# Bokrug
-R:489:0xC1/0x81
-
-# Biclops
-R:490:0xC1/0x82
-
-# Half-troll
-R:491:0x94/0x94
-
-# Ivory monk
-R:492:0xC0/0x88
-
-# Bert the Stone Troll
-R:493:0x94/0x95
-
-# Bill the Stone Troll
-R:494:0x94/0x96
-
-# Tom the Stone Troll
-R:495:0x94/0x97
-
-# Cave troll
-R:496:0x94/0x93
-
-# Anti-paladin
-R:497:0xA1/0x84
-
-# Chaos master
-R:498:0xBB/0x84
-
-# Barrow wight
-R:499:0x95/0x86
-
-# Skeleton ettin
-R:500:0x9D/0x97
-
-# Chaos drake
-R:501:0xBB/0x9A
-
-# Law drake
-R:502:0x97/0x93
-
-# Balance drake
-R:503:0x97/0x94
-
-# Ethereal drake
-R:504:0x97/0x95
-
-# Groo, the Wanderer
-R:505:0xA1/0x81
-
-# Fasolt the Giant
-R:506:0xBB/0x83
-
-# Shade
-R:507:0x91/0x83
-
-# Spectre
-R:508:0xA2/0x85
-
-# Water troll
-R:509:0x94/0x98
-
-# Fire elemental
-R:510:0x90/0x87
-
-# Cherub
-R:511:0x8E/0x94
-
-# Water elemental
-R:512:0x90/0x88
-
-# Multi-hued hound
-R:513:0xA2/0x83
-
-# Invisible stalker
-R:514:0x90/0x89
-
-# Carrion crawler
-R:515:0x97/0x85
-
-# Master thief
-R:516:0x9C/0x98
-
-# The Watcher in the Water
-R:517:0xBB/0x87
-
-# Lich
-R:518:0x92/0x88
-
-# Gas spore
-R:519:0xC1/0x83
-
-# Master vampire
-R:520:0x95/0x80
-
-# Oriental vampire
-R:521:0xA1/0x88
-
-# Greater mummy
-R:522:0xC1/0x84
-
-# Bloodletter of Khorne
-R:523:0xC1/0x85
-
-# Giant grey scorpion
-R:524:0xBB/0x9D
-
-# Earth elemental
-R:525:0x90/0x8A
-
-# Air elemental
-R:526:0x90/0x8B
-
-# Shimmering mold
-R:527:0xA2/0x93
-
-# Gargoyle
-R:528:0xC1/0x86
-
-# Malicious leprechaun
-R:529:0xA0/0x94
-
-# Eog golem
-R:530:0x98/0x99
-
-# Little Boy
-R:531:0xC0/0x81
-
-# Dagashi
-R:532:0x9C/0x9A
-
-# Headless ghost
-R:533:0xC1/0x87
-
-# Dread
-R:534:0x91/0x85
-
-# Gauth
-R:536:0xC5/0x8D
-
-# Leng spider
-R:535:0xC1/0x88
-
-# Smoke elemental
-R:537:0x90/0x8D
-
-# Olog
-R:538:0x94/0x99
-
-# Halfling slinger
-R:539:0xBB/0x91
-
-# Gravity hound
-R:540:0x96/0x86
-
-# Acidic cytoplasm
-R:541:0x9A/0x80
-
-# Inertia hound
-R:542:0x96/0x87
-
-# Impact hound
-R:543:0x96/0x88
-
-# Shardstorm
-R:544:0xB0/0x9F
-
-# Ooze elemental
-R:545:0x90/0x8C
-
-# Young black dragon
-R:546:0x97/0x96
-
-# Mumak
-R:547:0x9D/0x8C
-
-# Giant fire ant
-R:548:0x96/0x96
-
-# Mature white dragon
-R:549:0x97/0x97
-
-# Xorn
-R:550:0x95/0x97
-
-# Rogrog the Black Troll
-R:551:0x94/0x9A
-
-# Mist giant
-R:552:0xC1/0x8A
-
-# Phantom
-R:553:0x91/0x87
-
-# Grey wraith
-R:554:0x95/0x87
-
-# Revenant
-R:555:0xC1/0x8B
-
-# Young multi-hued dragon
-R:556:0x97/0x98
-
-# Raal's Tome of Destruction
-R:557:0xA3/0x91
-
-# Colossus
-R:558:0xA0/0x80
-
-# Young gold dragon
-R:559:0x97/0x99
-
-# Mature blue dragon
-R:560:0x97/0x9A
-
-# Mature green dragon
-R:561:0x97/0x9B
-
-# Mature bronze dragon
-R:562:0x97/0x9C
-
-# Young red dragon
-R:563:0x97/0x9D
-
-# Nightblade
-R:564:0xBB/0x92
-
-# Trapper
-R:565:0x8E/0x8E
-
-# Bodak
-R:566:0x91/0x9D
-
-# Time bomb
-R:567:0xC1/0x8C
-
-# Mezzodaemon
-R:568:0xC1/0x8D
-
-# Elder thing
-R:569:0x9F/0x9E
-
-# Ice elemental
-R:570:0x90/0x8E
-
-# Necromancer
-R:571:0x9C/0x9B
-
-# The Greater hell magic mushroom were-quylthulg
-R:572:0xB1/0x97
-
-# Lorgan, Chief of the Easterlings
-R:573:0x9C/0x9C
-
-# Chaos spawn
-R:574:0x9F/0x85
-
-# Mummified troll
-R:575:0x92/0x8F
-
-# Storm of Unmagic
-R:576:0xB1/0x98
-
-# Crypt thing
-R:577:0xC1/0x90
-
-# Chaos butterfly
-R:578:0xC1/0x92
-
-# Time elemental
-R:579:0xA2/0x84
-
-# Flying polyp
-R:580:0xC1/0x93
-
-# The Queen Ant
-R:581:0x96/0x97
-
-# Will o' the wisp
-R:582:0x90/0x8F
-
-# Shan
-R:583:0xC1/0x94
-
-# Magma elemental
-R:584:0x90/0x90
-
-# Black pudding
-R:585:0x9A/0x81
-
-# Killer iridescent beetle
-R:586:0xA3/0x94
-
-# Nexus vortex
-R:587:0xA1/0x9D
-
-# Plasma vortex
-R:588:0x9E/0x83
-
-# Mature red dragon
-R:589:0x97/0x9E
-
-# Mature gold dragon
-R:590:0x97/0x9F
-
-# Crystal drake
-R:591:0xBB/0x99
-
-# Mature black dragon
-R:592:0x98/0x81
-
-# Mature multi-hued dragon
-R:593:0x98/0x82
-
-# Sky whale
-R:594:0xC1/0x95
-
-# Draebor, the Imp
-R:595:0x91/0x9C
-
-# Mother Hydra
-R:596:0xC1/0x97
-
-# Death knight
-R:597:0x9C/0x9E
-
-# Castamir the Usurper
-R:598:0x9C/0x9F
-
-# Time vortex
-R:599:0x9E/0x82
-
-# Shimmering vortex
-R:600:0x9E/0x85
-
-# Ancient blue dragon
-R:601:0x8F/0x8B
-
-# Ancient bronze dragon
-R:602:0x8F/0x8C
-
-# Beholder
-R:603:0x98/0x88
-
-# Emperor wight
-R:604:0x95/0x88
-
-# Seraph
-R:605:0x8E/0x95
-
-# Vargo, Tyrant of Fire
-R:606:0x90/0x91
-
-# Black wraith
-R:607:0x95/0x89
-
-# Nightgaunt
-R:608:0xA0/0x9E
-
-# Baron of hell
-R:609:0x9F/0x8F
-
-# Scylla
-R:610:0xC1/0x98
-
-# Monastic lich
-R:611:0xC1/0x91
-
-# Nether wraith
-R:612:0x95/0x8A
-
-# Hellhound
-R:613:0x8F/0x87
-
-# 7-headed hydra
-R:614:0x93/0x9D
-
-# Waldern, King of Water
-R:615:0x90/0x92
-
-# Kavlax the Many-Headed
-R:616:0x98/0x83
-
-# Ancient white dragon
-R:617:0x8F/0x8D
-
-# Ancient green dragon
-R:618:0x8F/0x8E
-
-# Chthonian
-R:619:0xA1/0x83
-
-# Eldrak
-R:620:0x94/0x9B
-
-# Ettin
-R:621:0x94/0x9C
-
-# Night mare
-R:622:0x9D/0x8D
-
-# Vampire lord
-R:623:0x95/0x81
-
-# Ancient black dragon
-R:624:0x8F/0x8F
-
-# Weird fume
-R:625:0xC1/0x9A
-
-# Spawn of Ubbo-Sathla
-R:626:0xC1/0x9B
-
-# Fat Man
-R:627:0xC0/0x82
-
-# Malekith the Accursed
-R:628:0xBD/0x91
-
-# Shadowfax, steed of Gandalf
-R:629:0xC1/0x9C
-
-# Spirit troll
-R:630:0xC4/0x84
-
-# War troll
-R:631:0xA1/0x8C
-
-# Disenchanter worm mass
-R:632:0x9E/0x91
-
-# Rotting quylthulg
-R:633:0x93/0x81
-
-# Lesser titan
-R:634:0x92/0x9C
-
-# 9-headed hydra
-R:635:0x93/0x9E
-
-# Enchantress
-R:636:0xBB/0x81
-
-# Ranger chieftain
-R:637:0xB1/0x99
-
-# Sorcerer
-R:638:0x9D/0x82
-
-# Xaren
-R:639:0x95/0x98
-
-# Giant roc
-R:640:0x8E/0x9A
-
-# Minotaur
-R:641:0x91/0x93
-
-# Medusa, the Gorgon
-R:642:0x9A/0x96
-
-# Death drake
-R:643:0xBB/0x98
-
-# Ancient red dragon
-R:644:0x8F/0x91
-
-# Ancient gold dragon
-R:645:0x8F/0x92
-
-# Great crystal drake
-R:646:0xBB/0x97
-
-# Wyrd sister
-R:647:0xC1/0x9D
-
-# Vrock
-R:648:0x9E/0x9D
-
-# Death quasit
-R:649:0x91/0x9E
-
-# Giganto, the Gargantuan
-R:650:0xBE/0x95
-
-# Strygalldwir
-R:651:0x8E/0x9C
-
-# Fallen angel
-R:652:0xC1/0x9E
-
-# Giant headless
-R:653:0xC1/0x9F
-
-# Judge Fire
-R:654:0xC2/0x80
-
-# Ubbo-Sathla, the Unbegotten Source
-R:655:0xC2/0x81
-
-# Judge Mortis
-R:656:0xC2/0x82
-
-# Dark elven sorcerer
-R:657:0x99/0x8A
-
-# Master lich
-R:658:0x92/0x89
-
-# Byakhee
-R:659:0xA0/0x9F
-
-# Eol, the Dark Elf
-R:660:0xB2/0x8A
-
-# Archon
-R:661:0x8E/0x96
-
-# Formless spawn of Tsathoggua
-R:662:0x9F/0x9C
-
-# Hunting horror
-R:663:0x9F/0x98
-
-# Undead beholder
-R:664:0x98/0x89
-
-# Shadow
-R:665:0x91/0x86
-
-# Iron lich
-R:666:0xA1/0x8B
-
-# Dread
-R:667:0x91/0x85
-
-# Greater basilisk
-R:668:0xC2/0x83
-
-# Charybdis
-R:669:0xBE/0x96
-
-# Jack of Shadows
-R:670:0xC2/0x84
-
-# Zephyr Lord
-R:671:0xC2/0x85
-
-# Juggernaut of Khorne
-R:672:0xC2/0x86
-
-# Mumak
-R:673:0x9D/0x8E
-
-# Judge Fear
-R:674:0xC2/0x87
-
-# Ancient multi-hued dragon
-R:675:0x8F/0x94
-
-# Ethereal dragon
-R:676:0x8F/0x95
-
-# Dark young of Shub-Niggurath
-R:677:0xA1/0x8F
-
-# Colour out of space
-R:678:0xC2/0x88
-
-# Quaker, Master of Earth
-R:679:0x90/0x93
-
-# Death leprechaun
-R:680:0xBD/0x82
-
-# Chaugnar Faugn, Horror from the Hills
-R:681:0xC2/0x89
-
-# Lloigor
-R:682:0xC2/0x8A
-
-# Utgard-Loke
-R:683:0xC2/0x8B
-
-# Quachil Uttaus, Treader of the Dust
-R:684:0xC2/0x8C
-
-# Shoggoth
-R:685:0xA1/0x8E
-
-# Judge Death
-R:686:0xC2/0x8D
-
-# Ariel, Queen of Air
-R:687:0x90/0x94
-
-# 11-headed hydra
-R:688:0x93/0x9F
-
-# Patriarch
-R:689:0x9D/0x84
-
-# Dreadmaster
-R:690:0x91/0x89
-
-# Drolem
-R:691:0x98/0x9B
-
-# Scatha the Worm
-R:692:0x8F/0x93
-
-# Warrior of the Dawn
-R:693:0xA1/0x8A
-
-# Lesser black reaver
-R:694:0xC2/0x8E
-
-# Zoth-Ommog
-R:695:0xC2/0x8F
-
-# Grand master thief
-R:696:0x9C/0x84
-
-# Smaug the Golden
-R:697:0xBB/0x96
-
-# The Stormbringer
-R:698:0xA0/0x9B
-
-# Knight Templar
-R:699:0xB1/0x9A
-
-# Leprechaun fanatic
-R:700:0xC2/0x90
-
-# Dracolich
-R:701:0x8F/0x98
-
-# Greater titan
-R:702:0x92/0x9D
-
-# Dracolisk
-R:703:0x8F/0x9E
-
-# Winged Horror
-R:704:0xC4/0x85
-
-# Spectral tyrannosaur
-R:705:0x9F/0x95
-
-# Yibb-Tstll, the Patient One
-R:706:0xC2/0x91
-
-# Ghatanothoa
-R:707:0xC2/0x92
-
-# Ent
-R:708:0xC2/0x93
-
-# Hru
-R:709:0xC2/0x94
-
-# Itangast the Fire Drake
-R:710:0x8F/0x99
-
-# Death mold
-R:711:0x9A/0x90
-
-# Fafner the Dragon
-R:712:0xA1/0x90
-
-# Charon, Boatman of the Styx
-R:713:0xB1/0x9B
-
-# Quickbeam, the Ent
-R:714:0xB1/0x9C
-
-# Glaurung, Father of the Dragons
-R:715:0x8F/0x99
-
-# Behemoth
-R:716:0xC2/0x97
-
-# Garm, Guardian of Hel
-R:717:0xC2/0x98
-
-# Greater wall monster
-R:718:0x80/0x82
-
-# Nycadaemon
-R:719:0xC2/0x99
-
-# Barbazu
-R:720:0xB2/0x9D
-
-# Goat of Mendes
-R:721:0x9F/0x8D
-
-# Nightwing
-R:722:0x95/0x91
-
-# Maulotaur
-R:723:0xA0/0x8B
-
-# Nether hound
-R:724:0x96/0x89
-
-# Time hound
-R:725:0x96/0x85
-
-# Plasma hound
-R:726:0x96/0x8B
-
-# Demonic quylthulg
-R:727:0x93/0x82
-
-# Great Storm Wyrm
-R:728:0x8F/0x9B
-
-# Ulik the Troll
-R:729:0xC2/0x9A
-
-# Baphomet the Minotaur Lord
-R:730:0x91/0x95
-
-# Hell knight
-R:731:0xC2/0x9B
-
-# Bull Gates
-R:732:0xBC/0x9B
-
-# Santa Claus
-R:733:0x9F/0x89
-
-# Eihort, the Thing in the Labyrinth
-R:734:0xC2/0x9C
-
-# The King in Yellow
-R:735:0xC2/0x9D
-
-# Great unclean one
-R:736:0xC2/0x9E
-
-# Lord of Chaos
-R:737:0xBB/0x85
-
-# Old Sorcerer
-R:738:0xB1/0x9E
-
-# Ethereal hound
-R:739:0x96/0x8C
-
-# Lesser kraken
-R:740:0xBE/0x98
-
-# Great Ice Wyrm
-R:741:0x8F/0x9C
-
-# Demilich
-R:742:0xC2/0x9F
-
-# The Phoenix
-R:743:0x8E/0x9B
-
-# Nightcrawler
-R:744:0x95/0x94
-
-# Lord of Change
-R:745:0xC3/0x80
-
-# Keeper of Secrets
-R:746:0xC3/0x81
-
-# Shudde M'ell
-R:747:0xC3/0x82
-
-# Hand druj
-R:748:0x9D/0x98
-
-# Eye druj
-R:749:0x9D/0x99
-
-# Skull druj
-R:750:0x9D/0x9A
-
-# Chaos vortex
-R:751:0xBB/0x93
-
-# Aether vortex
-R:752:0x9E/0x87
-
-# Nidhogg, the Hel-Drake
-R:753:0xC3/0x83
-
-# The Lernaean Hydra
-R:754:0x94/0x80
-
-# Thuringwethil, the Vampire Messenger
-R:755:0x95/0x82
-
-# Great Hell Wyrm
-R:756:0x8F/0x9D
-
-# Hastur the Unspeakable
-R:757:0x9F/0x8C
-
-# Bloodthirster
-R:758:0xC3/0x84
-
-# Draconic quylthulg
-R:759:0x93/0x83
-
-# Nyogtha, the Thing that Should not Be
-R:760:0xA1/0x91
-
-# Ahtu, Avatar of Nyarlathotep
-R:761:0xC3/0x85
-
-# Fundin Bluecloak
-R:762:0x99/0x8B
-
-# Bile Demon
-R:763:0xB1/0x9F
-
-# Uriel, Angel of Fire
-R:764:0x8E/0x97
-
-# Azriel, Angel of Death
-R:765:0x8E/0x98
-
-# Ancalagon the Black
-R:766:0x8F/0x90
-
-# Daoloth, the Render of the Veils
-R:767:0xC3/0x86
-
-# Nightwalker
-R:768:0x95/0x95
-
-# Gabriel, the Messenger
-R:769:0x8E/0x99
-
-# Artsi, the Champion of Chaos
-R:770:0xC3/0x87
-
-# Saruman of Many Colours
-R:771:0x9D/0x88
-
-# Harowen the Black Hand
-R:772:0x9D/0x86
-
-# Osyluth
-R:773:0xB2/0x8E
-
-# Dreadlord
-R:774:0x91/0x8A
-
-# Greater kraken
-R:775:0xBE/0x99
-
-# Archlich
-R:776:0xC3/0x89
-
-# The Cat Lord
-R:777:0x98/0x91
-
-# Jabberwock
-R:778:0x91/0x9F
-
-# Chaos hound
-R:779:0xBB/0x94
-
-# Vlad Dracula, Prince of Darkness
-R:780:0xC3/0x8B
-
-# Beholder hive-mother
-R:781:0xC3/0x8C
-
-# Leviathan
-R:782:0xBE/0x9A
-
-# Great Wyrm of Chaos
-R:783:0xBB/0x95
-
-# Great Wyrm of Law
-R:784:0x90/0x80
-
-# Great Wyrm of Balance
-R:785:0x90/0x81
-
-# Shambler
-R:786:0x9F/0x92
-
-# Gelugon
-R:787:0xB2/0x8B
-
-# Glaaki
-R:788:0xC3/0x8E
-
-# T'ron, the Rebel Dragonrider
-R:789:0xB2/0x88
-
-# Great Wyrm of Many Colours
-R:790:0xA2/0x95
-
-# Mardra, rider of the Gold Loranth
-R:791:0xB2/0x85
-
-# Tselakus, the Dreadlord
-R:792:0x91/0x8B
-
-# Sky Drake
-R:793:0xA2/0x80
-
-# Eilinel the Entrapped
-R:794:0xB2/0x80
-
-# Horned Reaper
-R:795:0xB2/0x81
-
-# The Norsa
-R:796:0xBB/0x80
-
-# Rhan-Tegoth
-R:797:0xC3/0x8F
-
-# Black reaver
-R:798:0x92/0x8A
-
-# Master mindcrafter
-R:799:0xB0/0x86
-
-# Greater demonic quylthulg
-R:800:0x93/0x87
-
-# Greater draconic quylthulg
-R:801:0x93/0x85
-
-# Greater rotting quylthulg
-R:802:0x93/0x86
-
-# Null, the Living Void
-R:803:0xC3/0x90
-
-# Feagwath, the Undead Sorcerer
-R:804:0x92/0x8C
-
-# Omarax the Eye Tyrant
-R:805:0x98/0x8A
-
-# Tsathoggua, the Sleeper of N'kai
-R:806:0xC3/0x91
-
-# Greater Balrog
-R:807:0xB2/0x9E
-
-# Ungoliant, the Unlight
-R:808:0x94/0x8D
-
-# Atlach-Nacha, the Spider God
-R:809:0x94/0x8D
-
-# Y'golonac
-R:810:0xC3/0x92
-
-# Aether hound
-R:811:0x96/0x8E
-
-# Pit Fiend
-R:812:0xB2/0x9F
-
-# The Serpent of Chaos
-R:813:0x9F/0x8E
-
-# Yig, Father of Serpents
-R:814:0xC3/0x94
-
-# Unmaker
-R:815:0xA1/0x9E
-
-# Cyberdemon
-R:816:0x9F/0x91
-
-# Hela, Queen of the Dead
-R:817:0xC3/0x95
-
-# The Mouth of Sauron
-R:818:0x9D/0x89
-
-# The Necromancer of Dol Guldur
-R:819:0xC5/0x8B
-
-# Lessa, rider of the Gold Ramoth
-R:820:0xB2/0x86
-
-# Master quylthulg
-R:821:0x93/0x84
-
-# Qlzqqlzuup, the Lord of Flesh
-R:822:0x93/0x88
-
-# Cthugha, the Living Flame
-R:823:0xC3/0x96
-
-# F'lar, rider of the Bronze Mnementh
-R:824:0xB2/0x87
-
-# Maeglin, the Traitor of Gondolin
-R:825:0xA1/0x9C
-
-# Cyaegha
-R:826:0xBD/0x81
-
-# Pazuzu, Lord of Air
-R:827:0x8E/0x9C
-
-# Ithaqua the Windwalker
-R:828:0xA0/0x82
-
-# Hellhound
-R:829:0x8F/0x87
-
-# Cantoras, the Skeletal Lord
-R:830:0x9D/0x9B
-
-# Mephistopheles, Lord of Hell
-R:831:0x9F/0x90
-
-# Godzilla
-R:832:0x9F/0x97
-
-# Abhoth, Source of Uncleanness
-R:833:0xC3/0x97
-
-# Ymir, the Ice Giant
-R:834:0xBD/0x84
-
-# Loki, the Trickster
-R:835:0xC3/0x98
-
-# Star-spawn of Cthulhu
-R:836:0x9F/0x8A
-
-# Surtur, the Fire Giant
-R:837:0xBD/0x85
-
-# The Tarrasque
-R:838:0x94/0x81
-
-# Lungorthin, the Balrog of White Fire
-R:839:0x9F/0x82
-
-# Draugluin, Sire of All Werewolves
-R:840:0x8F/0x88
-
-# Shuma-Gorath
-R:841:0xBD/0x80
-
-# Tulzscha, the Green Flame
-R:842:0xC3/0x99
-
-# Oremorj, the Cyberdemon Lord
-R:843:0xC3/0x9A
-
-# Vecna, the Emperor Lich
-R:844:0x92/0x8B
-
-# Yog-Sothoth, the All-in-One
-R:845:0x9F/0x8B
-
-# Fenris Wolf
-R:846:0xC3/0x9B
-
-# Great Wyrm of Power
-R:847:0xA2/0x81
-
-# Shub-Niggurath, Black Goat of the Woods
-R:848:0x9F/0x99
-
-# Nodens, Lord of the Great Abyss
-R:849:0xC3/0x9C
-
-# Carcharoth, the Jaws of Thirst
-R:850:0x8F/0x89
-
-# Nyarlathotep, the Crawling Chaos
-R:851:0x9F/0x9B
-
-# Azathoth, the Daemon Sultan
-R:852:0xC4/0x8C
-
-# Huan, Wolfhound of the Valar
-R:853:0xB2/0x83
-
-# Jormungand the Midgard Serpent
-R:854:0xBE/0x9B
-
-# The Destroyer
-R:855:0xBD/0x83
-
-# Gothmog, the High Captain of Balrogs
-R:856:0x9F/0x81
-
-# Great Cthulhu
-R:857:0x9F/0x84
-
-# Sorka, rider of the Gold Faranth
-R:858:0xB2/0x84
-
-# The Unicorn of Order
-R:859:0xC3/0x9D
-
-# Sauron, the Sorcerer
-R:860:0x9D/0x8A
-
-# DarkGod, the Mighty Coder of Hell
-R:861:0xA1/0x93
-
-# Morgoth, Lord of Darkness
-R:862:0x92/0x9E
-
-# Human Warrior
-R:863:0xB2/0x82
-
-# Elven archer
-R:864:0x9C/0x81
-
-# Dwarven warrior
-R:865:0xB2/0x89
-
-# Elite uruk
-R:866:0x9B/0x81
-
-# The Philosophy Teacher
-R:867:0xC4/0x82
-
-# The Variant Maintainer
-R:868:0xA1/0x99
-
-# Random Number Generator
-R:869:0xBD/0x9F
-
-# Rocket mine
-R:870:0xB2/0x8C
-
-# Bouncing mine
-R:871:0xB2/0x8D
-
-# The Balrog of Moria
-R:872:0xB2/0x8F
-
-# The Icky Queen
-R:873:0xB2/0x90
-
-# Rot jelly
-R:874:0xB1/0x91
-
-# Death
-R:875:0xB2/0x91
-
-# Famine
-R:876:0xB2/0x92
-
-# Pestilence
-R:877:0xB2/0x93
-
-# War
-R:878:0xB2/0x94
-
-# Pike
-R:879:0xB2/0x95
-
-# Electric eel
-R:880:0xBE/0x8C
-
-# Giant crayfish
-R:881:0xB2/0x96
-
-# Mermaid
-R:882:0xB1/0x9D
-
-# Box jellyfish
-R:883:0xBE/0x83
-
-# Giant piranha
-R:884:0xBE/0x84
-
-# Piranha
-R:885:0xBE/0x80
-
-# Bullywug
-R:886:0xB2/0x97
-
-# Bullywug warrior
-R:887:0xB2/0x98
-
-# Bullywug shaman
-R:888:0xB2/0x99
-
-# Whale
-R:889:0xBE/0x8B
-
-# Sand mite
-R:890:0xB0/0x9D
-
-# Octopus
-R:891:0xB2/0x9A
-
-# Giant octopus
-R:892:0xBE/0x93
-
-# Eye of the deep
-R:893:0xB2/0x9B
-
-# Murk dweller
-R:894:0xB2/0x9C
-
-# Drowned soul
-R:895:0xC5/0x8F
-
-# Tiger shark
-R:896:0xC5/0x8E
-
-# Hammerhead shark
-R:897:0xBE/0x88
-
-# Great white shark
-R:898:0xBE/0x8F
-
-# Aquatic golem
-R:899:0xC5/0x95
-
-# Aquatic kobold
-R:900:0xC5/0x96
-
-# White shark
-R:901:0xBE/0x89
-
-# Scrag
-R:902:0xC5/0x97
-
-# Jaws
-R:903:0xBE/0x92
-
-# Aquatic elf
-R:904:0xC5/0x98
-
-# Aquatic elven warrior
-R:905:0xC5/0x99
-
-# Aquatic elven shaman
-R:906:0xC5/0x9A
-
-# Stargazer
-R:907:0xC5/0x9E
-
-# Elder stargazer
-R:908:0xC5/0x9F
-
-# Flounder
-R:909:0xC6/0x81
-
-# Giant turtle
-R:910:0xC6/0x82
-
-# Baby dragon turtle
-R:911:0xC6/0x83
-
-# Young dragon turtle
-R:912:0xC6/0x84
-
-# Mature dragon turtle
-R:913:0xC6/0x85
-
-# Ancient dragon turtle
-R:914:0xC6/0x86
-
-# Fastitocalon
-R:915:0xBE/0x97
-
-# Undead stargazer
-R:916:0xC6/0x80
-
-# Killer whale
-R:917:0xBE/0x8E
-
-# Merrow
-R:918:0xC5/0x9D
-
-# Water naga
-R:919:0xC6/0x87
-
-# Devilfish
-R:920:0xC6/0x88
-
-# Undead devilfish
-R:921:0xC6/0x89
-
-# Moby Dick, the White Whale
-R:922:0xC5/0x9C
-
-# Aquatic hound
-R:923:0xC4/0x9E
-
-# Water demon
-R:924:0xC6/0x8B
-
-# Ixitxachitl
-R:925:0xBE/0x86
-
-# Ixitxachitl priest
-R:926:0xBE/0x8A
-
-# Vampiric ixitxachitl
-R:927:0xBE/0x90
-
-# Mathilde, the Science Student
-R:928:0x9D/0x80
-
-# Child spirit
-R:929:0xC5/0x90
-
-# Young spirit
-R:930:0xC5/0x91
-
-# Mature spirit
-R:931:0xC5/0x92
-
-# Experienced spirit
-R:932:0xC5/0x93
-
-# Wise spirit
-R:933:0xC5/0x94
-
-# Fangorn the Treebeard, Lord of the Ents
-R:934:0xC2/0x95
-
-# Gandalf the Grey
-R:935:0xC3/0x88
-
-# Nar, the Dwarf
-R:936:0x99/0x84
-
-# Novice mindcrafter
-R:937:0xB0/0x84
-
-# Great Swamp Wyrm
-R:938:0x8F/0x9A
-
-# Great Bile Wyrm
-R:939:0x8F/0x9F
-
-# Blue Firelizard
-R:940:0xB0/0x99
-
-# Green Firelizard
-R:941:0xB0/0x98
-
-# Brown Firelizard
-R:942:0xB0/0x97
-
-# Bronze Firelizard
-R:943:0xB0/0x96
-
-# Gold Firelizard
-R:944:0xB0/0x95
-
-# High-elven ranger
-R:945:0xC6/0x93
-
-# Uvatha the Horseman
-R:946:0x95/0x8B
-
-# Adunaphel the Quiet
-R:947:0x95/0x8C
-
-# Akhorahil the Blind
-R:948:0x95/0x8D
-
-# Ren the Unclean
-R:949:0x95/0x82
-
-# Ji Indur Dawndeath
-R:950:0x95/0x8F
-
-# Dwar, Dog Lord of Waw
-R:951:0x95/0x8F
-
-# Hoarmurath of Dir
-R:952:0x95/0x92
-
-# Khamul, the Black Easterling
-R:953:0x95/0x93
-
-# The Witch-King of Angmar
-R:954:0x95/0x96
-
-# Green Dragonrider
-R:955:0xB0/0x91
-
-# Blue Dragonrider
-R:956:0xB0/0x94
-
-# Brown Dragonrider
-R:957:0xB0/0x92
-
-# Bronze Dragonrider
-R:958:0xB0/0x93
-
-# Gold Dragonrider
-R:959:0xB0/0x90
-
-# Thread
-R:960:0xB0/0x9A
-
-# Gorlim, Betrayer of Barahir
-R:961:0x9D/0x83
-
-# The Blubbering idiot, agent of black market, Simon the weak
-R:962:0x9B/0x8F
-
-# Aranea
-R:963:0xB0/0x80
-
-# Elder aranea
-R:964:0xB0/0x81
-
-# Giant brown tick
-R:965:0xC5/0x9B
-
-# Dolphiner
-R:966:0xC6/0x98
-
-# Novice possessor (soul)
-R:967:0xC6/0x8E
-
-# Bat of Gorgoroth
-R:968:0xC6/0x94
-
-# The Princess
-R:969:0xA2/0x9F
-
-# Merton Proudfoot, the lost hobbit
-R:970:0xC6/0x9E
-
-# The Wight-King of the Barrow-downs
-R:971:0xC6/0x91
-
-# Adventurer
-R:972:0xA9/0x86
-
-# Experienced possessor (soul)
-R:973:0xC6/0x8F
-
-# Old possessor (soul)
-R:974:0xC6/0x90
-
-# Death orb
-R:975:0xC6/0x99
-
-# Bronze dragon worm
-R:976:0xB1/0x80
-
-# Gold dragon worm
-R:977:0xB1/0x81
-
-# Moldoux, the Defenceless Mold
-R:978:0xB1/0x8A
-
-# The Physics Teacher
-R:979:0xC6/0x9A
-
-# Ar-Pharazon the Golden
-R:980:0xA1/0x9B
-
-# Doppelganger
-R:981:0x8C/0x81
-
-# Marylene, Heartbreakeress of the Netherworld
-R:982:0xA3/0x9E
-
-# The Greater Lag Monster
-R:983:0xC6/0x96
-
-# Hrungnir, the Stone Giant
-R:984:0xB1/0x8B
-
-# Bullroarer the Hobbit
-R:985:0x98/0x9D
-
-# 3-headed hydra
-R:986:0x93/0x99
-
-# Uldor the Accursed
-R:987:0x9C/0x93
-
-# Mystic
-R:988:0x9C/0x97
-
-# Elder vampire
-R:989:0xA1/0x9F
-
-# Ulfang the Black
-R:990:0x9C/0x99
-
-# Demonologist
-R:991:0x9C/0x9D
-
-# Hezrou
-R:992:0x9E/0x9C
-
-# Glabrezu
-R:993:0x9E/0x9D
-
-# Nalfeshnee
-R:994:0x9E/0x9E
-
-# Marilith
-R:995:0x9E/0x9F
-
-# Lesser Balrog
-R:996:0x9F/0x80
-
-# Master mystic
-R:997:0x9D/0x85
-
-# Grand master mystic
-R:998:0x9D/0x87
-
-# Erinyes
-R:999:0x9E/0x9A
-
-# Novice mindcrafter
-R:1000:0xB0/0x84
-
-# Polyphemus, the Blind Cyclops
-R:1001:0xC6/0x92
-
-# Great Wyrm of Perplexity
-R:1002:0xB1/0x8C
-
-# Hound of Tindalos
-R:1003:0xB0/0x8E
-
-# Great Wyrm of Thunder
-R:1004:0xB1/0x8D
-
-# Silver mouse
-R:1005:0xB0/0x83
-
-# The Rat King
-R:1006:0xB1/0x8E
-
-# Vort the Kobold Queen
-R:1007:0xB0/0x88
-
-# Giant black louse
-R:1008:0x9A/0x87
-
-# Fire Phantom
-R:1009:0xB1/0x8F
-
-# The Insane Player
-R:1010:0xBC/0x99
-
-# Glaryssa, Succubus Queen
-R:1011:0xA3/0x9F
-
-# Vermicious Knid
-R:1012:0xB1/0x90
-
-# Bone golem
-R:1013:0xB1/0x92
-
-# Snake of Yig
-R:1014:0xC6/0x8A
-
-# Bronze golem
-R:1015:0xB1/0x93
-
-# Dimensional shambler
-R:1016:0xB0/0x9C
-
-# Cultist
-R:1017:0xC6/0x8C
-
-# Cult leader
-R:1018:0xC6/0x8D
-
-# Servitor of the outer gods
-R:1019:0xC6/0x95
-
-# Avatar of Nyarlathotep
-R:1020:0xC3/0x85
-
-# Thiazi, the Storm Giant
-R:1021:0xB1/0x94
-
-# Hypnos, Lord of Sleep
-R:1022:0xC3/0x8D
-
-# Blue dragon worm
-R:1023:0xB1/0x82
-
-# White dragon worm
-R:1024:0xB1/0x83
-
-# Green dragon worm
-R:1025:0xB1/0x84
-
-# Black dragon worm
-R:1026:0xB1/0x85
-
-# Red dragon worm
-R:1027:0xB1/0x86
-
-# Multi-hued dragon worm
-R:1028:0xB1/0x87
-
-# The Minotaur of the Labyrinth
-R:1029:0x91/0x95
-
-# The Sandworm Queen
-R:1030:0xB1/0x88
-
-# Sandworm
-R:1031:0xB1/0x89
-
-# Tik'srvzllat
-R:1032:0xC6/0x9B
-
-# The Glass Golem
-R:1033:0xB1/0x95
-
-# The White Balrog
-R:1034:0x9F/0x82
-
-# Golgarach, the Living Rock
-R:1035:0x80/0x95
-
-# Atlas, the Titan
-R:1036:0xC6/0x9C
-
-# Kronos, Lord of the Titans
-R:1037:0xC6/0x9D
-
-# Water hound
-R:1038:0x96/0x83
-
-# Improv, the mighty MoLD
-R:1039:0xB1/0x8A
-
-# Emperor Mimic
-R:1040:0xA3/0x8D
-
-# Melinda Proudfoot
-R:1041:0xC6/0x9F
-
-# Thrain, the King Under the Mountain
-R:1042:0xC6/0x97
-
-## Fire golem
-R:1043:0xBC/0x9C
-
-# Spells (*)
-S:0x30:0x85/0x93
-S:0x31:0x85/0x92
-S:0x32:0x85/0x92
-S:0x33:0x85/0x8D
-S:0x34:0x85/0x8C
-S:0x35:0x85/0x8F
-S:0x36:0x85/0x90
-S:0x37:0x85/0x95
-S:0x38:0x85/0x93
-S:0x39:0x85/0x92
-S:0x3A:0x85/0x91
-S:0x3B:0x85/0x8E
-S:0x3C:0x85/0x8D
-S:0x3D:0x85/0x8F
-S:0x3E:0x85/0x90
-S:0x3F:0x85/0x95
-
-# Spells (|)
-S:0x40:0x84/0x9C
-S:0x41:0x84/0x98
-S:0x42:0x84/0x98
-S:0x43:0x85/0x88
-S:0x44:0x84/0x80
-S:0x45:0x84/0x8C
-S:0x46:0x84/0x90
-S:0x47:0x85/0x84
-S:0x48:0x84/0x9C
-S:0x49:0x84/0x98
-S:0x4A:0x84/0x94
-S:0x4B:0x84/0x88
-S:0x4C:0x85/0x88
-S:0x4D:0x84/0x8C
-S:0x4E:0x84/0x90
-S:0x4F:0x85/0x84
-
-# Spells (-)
-S:0x50:0x84/0x9D
-S:0x51:0x84/0x99
-S:0x52:0x84/0x99
-S:0x53:0x85/0x89
-S:0x54:0x84/0x81
-S:0x55:0x84/0x8D
-S:0x56:0x84/0x91
-S:0x57:0x85/0x85
-S:0x58:0x84/0x9D
-S:0x59:0x84/0x99
-S:0x5A:0x84/0x95
-S:0x5B:0x84/0x89
-S:0x5C:0x85/0x89
-S:0x5D:0x84/0x8D
-S:0x5E:0x84/0x91
-S:0x5F:0x85/0x85
-
-# Spells (:)
-S:0x60:0x84/0x9E
-S:0x61:0x84/0x9A
-S:0x62:0x84/0x9A
-S:0x63:0x85/0x8A
-S:0x64:0x84/0x82
-S:0x65:0x84/0x8E
-S:0x66:0x84/0x92
-S:0x67:0x85/0x86
-S:0x68:0x84/0x9E
-S:0x69:0x84/0x9A
-S:0x6A:0x84/0x96
-S:0x6B:0x84/0x8A
-S:0x6C:0x85/0x8A
-S:0x6D:0x84/0x8E
-S:0x6E:0x84/0x92
-S:0x6F:0x85/0x86
-
-# Spells (\)
-S:0x70:0x84/0x9F
-S:0x71:0x84/0x9B
-S:0x72:0x84/0x9B
-S:0x73:0x85/0x8B
-S:0x74:0x84/0x83
-S:0x75:0x84/0x8F
-S:0x76:0x84/0x93
-S:0x77:0x85/0x87
-S:0x78:0x84/0x9F
-S:0x79:0x84/0x9B
-S:0x7A:0x84/0x97
-S:0x7B:0x84/0x8B
-S:0x7C:0x85/0x8B
-S:0x7D:0x84/0x8F
-S:0x7E:0x84/0x93
-S:0x7F:0x85/0x87
-
-# Amulets (")
-S:0x80:0xB6/0x87
-S:0x81:0xB6/0x88
-S:0x82:0xB6/0x85
-S:0x83:0xB6/0x86
-S:0x84:0xB6/0x81
-S:0x85:0xB6/0x82
-S:0x86:0xB6/0x83
-S:0x87:0xB6/0x84
-S:0x88:0xB6/0x87
-S:0x89:0xB6/0x88
-S:0x8A:0xB6/0x8E
-S:0x8B:0xB6/0x86
-S:0x8C:0xB6/0x81
-S:0x8D:0xB6/0x82
-S:0x8E:0xB6/0x8B
-S:0x8F:0xB6/0x8C
-
-# Rings (=)
-S:0x90:0xB5/0x8B
-S:0x91:0xB5/0x8C
-S:0x92:0xB5/0x89
-S:0x93:0xB5/0x8A
-S:0x94:0xB5/0x81
-S:0x95:0xB5/0x82
-S:0x96:0xB5/0x83
-S:0x97:0xB5/0x88
-S:0x98:0xB5/0x8B
-S:0x99:0xB5/0x8C
-S:0x9A:0xB5/0x80
-S:0x9B:0xB5/0x8A
-S:0x9C:0xB5/0x81
-S:0x9D:0xB5/0x82
-S:0x9E:0xB5/0x83
-S:0x9F:0xB5/0x88
-
-# Staffs (_)
-S:0xA0:0xB9/0x84
-S:0xA1:0xB9/0x85
-S:0xA2:0xB9/0x85
-S:0xA3:0xB9/0x81
-S:0xA4:0xB9/0x81
-S:0xA5:0xB9/0x82
-S:0xA6:0xB9/0x80
-S:0xA7:0xB9/0x87
-S:0xA8:0xB9/0x84
-S:0xA9:0xB9/0x85
-S:0xAA:0xB9/0x83
-S:0xAB:0xB9/0x87
-S:0xAC:0xB9/0x81
-S:0xAD:0xB9/0x82
-S:0xAE:0xB9/0x80
-S:0xAF:0xB9/0x87
-
-# Wands (-)
-S:0xB0:0xB7/0x84
-S:0xB1:0xB7/0x85
-S:0xB2:0xB7/0x85
-S:0xB3:0xB7/0x86
-S:0xB4:0xB7/0x81
-S:0xB5:0xB7/0x82
-S:0xB6:0xB7/0x80
-S:0xB7:0xB7/0x87
-S:0xB8:0xB7/0x84
-S:0xB9:0xB7/0x85
-S:0xBA:0xB7/0x83
-S:0xBB:0xB7/0x86
-S:0xBC:0xB7/0x81
-S:0xBD:0xB7/0x82
-S:0xBE:0xB7/0x80
-S:0xBF:0xB7/0x87
-
-# Rods (-)
-S:0xC0:0xB8/0x84
-S:0xC1:0xB8/0x85
-S:0xC2:0xB8/0x85
-S:0xC3:0xB8/0x86
-S:0xC4:0xB8/0x81
-S:0xC5:0xB8/0x82
-S:0xC6:0xB8/0x80
-S:0xC7:0xB8/0x87
-S:0xC8:0xB8/0x84
-S:0xC9:0xB8/0x85
-S:0xCA:0xB8/0x83
-S:0xCB:0xB8/0x86
-S:0xCC:0xB8/0x81
-S:0xCD:0xB8/0x82
-S:0xCE:0xB8/0x80
-S:0xCF:0xB8/0x87
-
-# Scrolls (?)
-S:0xD0:0x86/0x82
-S:0xD1:0x86/0x82
-S:0xD2:0x86/0x82
-S:0xD3:0x86/0x82
-S:0xD4:0x86/0x82
-S:0xD5:0x86/0x82
-S:0xD6:0x86/0x82
-S:0xD7:0x86/0x82
-S:0xD8:0x86/0x82
-S:0xD9:0x86/0x82
-S:0xDA:0x86/0x82
-S:0xDB:0x86/0x82
-S:0xDC:0x86/0x82
-S:0xDD:0x86/0x82
-S:0xDE:0x86/0x82
-S:0xDF:0x86/0x82
-
-# Potions (!)
-S:0xE0:0xBC/0x84
-S:0xE1:0xBC/0x83
-S:0xE2:0xBC/0x8A
-S:0xE3:0xBC/0x8B
-S:0xE4:0xBC/0x87
-S:0xE5:0xBC/0x86
-S:0xE6:0xBC/0x85
-S:0xE7:0xBC/0x89
-S:0xE8:0xBC/0x84
-S:0xE9:0xBC/0x83
-S:0xEA:0xBC/0x8E
-S:0xEB:0xBC/0x88
-S:0xEC:0xBC/0x8B
-S:0xED:0xBC/0x8C
-S:0xEE:0xBC/0x8D
-S:0xEF:0xBC/0x89
-
-# Food (,)
-S:0xF0:0xBA/0x84
-S:0xF1:0xBA/0x85
-S:0xF2:0xBA/0x85
-S:0xF3:0xBA/0x86
-S:0xF4:0xBA/0x81
-S:0xF5:0xBA/0x82
-S:0xF6:0xBA/0x80
-S:0xF7:0xBA/0x87
-S:0xF8:0xBA/0x84
-S:0xF9:0xBA/0x85
-S:0xFA:0xBA/0x83
-S:0xFB:0xBA/0x86
-S:0xFC:0xBA/0x81
-S:0xFD:0xBA/0x82
-S:0xFE:0xBA/0x80
-S:0xFF:0xBA/0x87
-
-# Unknown Amulet
-U:40:0xB6/0x81
-
-# Unknown Ring
-U:45:0xB5/0x81
-
-# Unknown Staff
-U:55:0xB9/0x81
-
-# Unknown Wand
-U:65:0xB7/0x81
-
-# Unknown Rod
-U:66:0xB8/0x81
-
-# Unknown Scroll
-U:70:0x86/0x82
-
-# Unknown Potion
-U:75:0xBC/0x85
-
-# Unknown Food
-U:80:0x8B/0x81
-# non-defines encountered :
-# Load the special player pictures
-%:xtra-xxx.prf
-# Load the Trap image definitions
-%:trap-xxx.prf
diff --git a/lib/pref/graf.prf b/lib/pref/graf.prf
deleted file mode 100644
index a82ce364..00000000
--- a/lib/pref/graf.prf
+++ /dev/null
@@ -1,51 +0,0 @@
-# File: graf.prf
-
-#
-# This file defines special attr/char mappings for use in "graphics" mode
-#
-# This file includes, if appropriate, various "sub-files"
-#
-# See "lib/help/command.txt" and "src/files.c" for more information.
-#
-
-
-##### Standard font file #####
-
-%:font-xxx.prf
-
-
-##### System Specific Subfiles #####
-
-?:[IOR [EQU $SYS xaw] [EQU $SYS x11] [EQU $SYS gtk]]
-%:graf-x11.prf
-
-?:[EQU $SYS gcu]
-%:graf-gcu.prf
-
-?:[EQU $SYS ami]
-%:graf-ami.prf
-
-?:[EQU $SYS mac]
-%:graf-mac.prf
-
-?:[EQU $SYS dos]
-%:graf-dos.prf
-
-?:[EQU $SYS win]
-%:graf-win.prf
-
-?:[EQU $SYS ibm]
-%:graf-ibm.prf
-
-?:[EQU $SYS emx]
-%:graf-emx.prf
-
-?:[EQU $SYS acn]
-%:graf-acn.prf
-
-?:[EQU $SYS sdl]
-%:graf-sdl.prf
-
-?:1
-
-
diff --git a/lib/pref/pref-acn.prf b/lib/pref/pref-acn.prf
deleted file mode 100644
index ae95fe26..00000000
--- a/lib/pref/pref-acn.prf
+++ /dev/null
@@ -1,24 +0,0 @@
-# File: pref-acn.prf
-
-# This is a minimal "pref" file for RISC OS
-
-
-# Map cursor keys onto keypad
-
-A:4
-P:^_18C\r
-
-A:6
-P:^_18D\r
-
-A:2
-P:^_18E\r
-
-A:8
-P:^_18F\r
-
-
-# Map F3 to ^S (to be a bit RISC OS-ey)
-
-A:^S
-P:^_183\r
diff --git a/lib/pref/pref-ami.prf b/lib/pref/pref-ami.prf
deleted file mode 100644
index 08a1c310..00000000
--- a/lib/pref/pref-ami.prf
+++ /dev/null
@@ -1,7 +0,0 @@
-# File: pref-ami.prf
-
-#
-# This file contains various default macros for use with
-# the executable built from "main-ami.c".
-#
-
diff --git a/lib/pref/pref-emx.prf b/lib/pref/pref-emx.prf
deleted file mode 100644
index 555c0dbc..00000000
--- a/lib/pref/pref-emx.prf
+++ /dev/null
@@ -1,19 +0,0 @@
-# File: pref-emx.prf
-
-#
-# Include "pref-ibm.prf" to get the default macros.
-#
-# Note that, while most key-to-trigger mappings are the same as DOS/Win,
-# some few odd keys will be different or not available at all.
-#
-# Examples: Ctrl-Escape, Alt-PrintScreen
-#
-# What's NOT working: color palette redefinitions.
-#
-
-%:pref-win.prf
-
-
-# shift-5 - rest
-A:R\r
-P:^_Sx4C\r
diff --git a/lib/pref/pref-iso.prf b/lib/pref/pref-iso.prf
deleted file mode 100644
index a6bad2e3..00000000
--- a/lib/pref/pref-iso.prf
+++ /dev/null
@@ -1,118 +0,0 @@
-# File: pref-sdl.prf
-
-#
-# This file provides some macros for use with versions of Angband compiled
-# using the "main-x11.c" (or "main-xaw.c") file.
-#
-# Note the use of "\e\e\e\e" (four escapes) to allow the macros to work
-# even if the game is not yet ready for a command.
-#
-# Note the use of "\\." (for "run") and "\\+" (for "alter"), to make sure
-# that the macros will work regardless of the "keymap" being used.
-#
-
-
-
-# Keypad (0-9)
-
-A:0
-P:^__100\r
-
-A:1
-P:^__101\r
-
-A:2
-P:^__112\r
-P:^__102\r
-
-A:3
-P:^__103\r
-
-A:4
-P:^__114\r
-P:^__104\r
-
-A:5
-P:^__105\r
-
-A:6
-P:^__113\r
-P:^__106\r
-
-A:7
-P:^__107\r
-
-A:8
-P:^__111\r
-P:^__108\r
-
-A:9
-P:^__109\r
-
-
-# Shift-Keypad (0-9)
-
-A:\e\e\e\e\\.0
-P:^_S_100\r
-
-A:\e\e\e\e\\.1
-P:^_S_101\r
-
-A:\e\e\e\e\\.2
-P:^_S_102\r
-
-A:\e\e\e\e\\.3
-P:^_S_103\r
-
-A:\e\e\e\e\\.4
-P:^_S_104\r
-
-A:\e\e\e\e\\.5
-P:^_S_105\r
-
-A:\e\e\e\e\\.6
-P:^_S_106\r
-
-A:\e\e\e\e\\.7
-P:^_S_107\r
-
-A:\e\e\e\e\\.8
-P:^_S_108\r
-
-A:\e\e\e\e\\.9
-P:^_S_109\r
-
-
-
-# Control-Keypad (0-9)
-
-A:\e\e\e\e\\+0
-P:^_N_100\r
-
-A:\e\e\e\e\\+1
-P:^_N_101\r
-
-A:\e\e\e\e\\+2
-P:^_N_102\r
-
-A:\e\e\e\e\\+3
-P:^_N_103\r
-
-A:\e\e\e\e\\+4
-P:^_N_104\r
-
-A:\e\e\e\e\\+5
-P:^_N_105\r
-
-A:\e\e\e\e\\+6
-P:^_N_106\r
-
-A:\e\e\e\e\\+7
-P:^_N_107\r
-
-A:\e\e\e\e\\+8
-P:^_N_108\r
-
-A:\e\e\e\e\\+9
-P:^_N_109\r
-
diff --git a/lib/pref/pref.prf b/lib/pref/pref.prf
index a6bfdbe1..310e5b8a 100644
--- a/lib/pref/pref.prf
+++ b/lib/pref/pref.prf
@@ -285,27 +285,13 @@ L:j:jam:Jam a door
 ?:[EQU $SYS gcu]
 %:pref-gcu.prf
 
-?:[EQU $SYS ami]
-%:pref-ami.prf
-
 ?:[EQU $SYS mac]
 %:pref-mac.prf
 
-?:[IOR [EQU $SYS win] [EQU $SYS dos] [EQU $SYS ibm]]
+?:[EQU $SYS win]
 %:pref-win.prf
 
-?:[EQU $SYS emx]
-%:pref-emx.prf
-
-?:[EQU $SYS acn]
-%:pref-acn.prf
-
 ?:[EQU $SYS sdl]
 %:pref-sdl.prf
 
-?:[EQU $SYS pgu]
-%:pref-pgu.prf
-
 ?:1
-
-
diff --git a/lib/pref/trap-iso.prf b/lib/pref/trap-iso.prf
deleted file mode 100644
index a2b77aec..00000000
--- a/lib/pref/trap-iso.prf
+++ /dev/null
@@ -1,429 +0,0 @@
-# Prf file for use with the 8x8 tiles to define 
-# trap image locations. Separated out from main 
-# graphics definitions due to the G:T:num:y:x 
-# instead of T:num:y:x  (major problems if this
-# file is opened in the TileAssigner)
-
-# Weakness Traps
-G:T:1:0x8A:0xF6
-G:T:2:0x8A:0xF6
-G:T:3:0x8A:0xF6
-
-# Intelligence Traps
-G:T:4:0x8A:0xF6
-G:T:5:0x8A:0xF6
-G:T:6:0x8A:0xF6
-
-# Wisdom Traps
-G:T:7:0x8A:0xF6
-G:T:8:0x8A:0xF6
-G:T:9:0x8A:0xF6
-
-# Fumbling Fingers Traps
-G:T:10:0x8A:0xF6
-G:T:11:0x8A:0xF6
-G:T:12:0x8A:0xF6
-
-# Wasting Traps
-G:T:13:0x8A:0xF6
-G:T:14:0x8A:0xF6
-G:T:15:0x8A:0xF6
-
-# Beauty Traps
-G:T:16:0x8A:0xF6
-G:T:17:0x8A:0xF6
-G:T:18:0x8A:0xF6
-
-# Trap of Curse Weapon
-G:T:20:0x8A:0xF7
-
-# Trap of Curse Armor
-G:T:21:0x8A:0xF7
-
-# Earthquake Trap
-G:T:22:0x8A:0xFC
-
-# Poison Needle Trap
-G:T:23:0x8A:0xF8
-
-# Summon Monster Trap
-G:T:24:0x8A:0xFA
-
-# Summon Undead Trap
-G:T:25:0x8A:0xFA
-
-# Summon Greater Undead Trap
-G:T:26:0x8A:0xFA
-
-# Teleport Trap
-G:T:27:0x8A:0xFA
-
-# Paralyzing Trap
-G:T:28:0x8A:0xF8
-
-# Explosive Device
-G:T:29:0x8A:0xF8
-
-# Teleport Item Trap
-G:T:30:0x8A:0xFA
-
-# Lose Memory Trap
-G:T:31:0x8A:0xF8
-
-# Bitter Regret Trap
-G:T:32:0x8A:0xF8
-
-# Bowel Cramps Trap
-G:T:33:0x8A:0xF8
-
-# Blindness/Confusion Trap
-G:T:34:0x8A:0xF8
-
-# Aggravation Trap
-G:T:35:0x8A:0xFC
-
-# Multiplication Trap
-G:T:36:0x8A:0xFC
-
-# Steal Item Trap
-G:T:37:0x8A:0xF7
-
-# Summon Fast Quylthulgs Trap
-G:T:38:0x8A:0xFA
-
-# Trap of Sinking
-G:T:39:0x8A:0xFA
-
-# Trap of Mana Drain
-G:T:40:0x8A:0xF8
-
-# Trap of Missing Money
-#G:T:41:0x8A:0xF7
-G:T:41:0x8A:0xF9
-
-# Trap of No Return
-G:T:42:0x8A:0xF7
-
-# Trap of Silent Switching
-G:T:43:0x8A:0xF7
-
-# Trap of Walls
-G:T:44:0x8A:0xFC
-
-# Trap of Calling Out
-G:T:45:0x8A:0xFA
-
-# Trap of Sliding
-G:T:46:0x8A:0xF8
-
-# Trap of Charges Drain
-G:T:47:0x8A:0xF7
-
-# Trap of Stair Movement
-G:T:48:0x8A:0xFC
-
-# Trap of New Trap
-G:T:49:0x8A:0xFC
-
-# Trap of Scatter Items
-G:T:50:0x8A:0xFA
-
-# Trap of Decay
-G:T:51:0x8A:0xF8
-
-# Trap of Wasting Wands
-G:T:52:0x8A:0xF7
-
-# Trap of Filling
-G:T:53:0x8A:0xFC
-
-# Trap of Drain Speed
-G:T:54:0x8A:0xF7
-
-# Lightning Bolt Trap
-G:T:60:0x8A:0xF9
-
-# Poison Bolt Trap
-G:T:61:0x8A:0xF9
-
-# Acid Bolt Trap
-G:T:62:0x8A:0xF9
-
-# Cold Bolt Trap
-G:T:63:0x8A:0xF9
-
-# Fire Bolt Trap
-G:T:64:0x8A:0xF9
-
-# Plasma Bolt Trap
-G:T:65:0x8A:0xF9
-
-# Water Bolt Trap
-G:T:66:0x8A:0xF9
-
-# Lite Bolt Trap
-G:T:67:0x8A:0xF9
-
-# Dark Bolt Trap
-G:T:68:0x8A:0xF9
-
-# Shards Bolt Trap
-G:T:69:0x8A:0xF9
-
-# Sound Bolt Trap
-G:T:70:0x8A:0xF9
-
-# Confusion Bolt Trap
-G:T:71:0x8A:0xF9
-
-# Force Bolt Trap
-G:T:72:0x8A:0xF9
-
-# Inertia Bolt Trap
-G:T:73:0x8A:0xF9
-
-# Mana Bolt Trap
-G:T:74:0x8A:0xF9
-
-# Ice Bolt Trap
-G:T:75:0x8A:0xF9
-
-# Chaos Bolt Trap
-G:T:76:0x8A:0xF9
-
-# Nether Bolt Trap
-G:T:77:0x8A:0xF9
-
-# Disenchantment Bolt Trap
-G:T:78:0x8A:0xF9
-
-# Nexus  Bolt Trap
-G:T:79:0x8A:0xF9
-
-# Time Bolt Trap
-G:T:80:0x8A:0xF9
-
-# Gravity Bolt Trap
-G:T:81:0x8A:0xF9
-
-# Lightning Ball Trap
-G:T:82:0x8A:0xFA
-
-# Poison Ball Trap
-G:T:83:0x8A:0xFA
-
-# Acid Ball Trap
-G:T:84:0x8A:0xFA
-
-# Cold Ball Trap
-G:T:85:0x8A:0xFA
-
-# Fire Ball Trap
-G:T:86:0x8A:0xFA
-
-# Plasma Ball Trap
-G:T:87:0x8A:0xFA
-
-# Water Ball Trap
-G:T:88:0x8A:0xFA
-
-# Light Ball Trap
-G:T:89:0x8A:0xFA
-
-# Darkness Ball Trap
-G:T:90:0x8A:0xFA
-
-# Shards Ball Trap
-G:T:91:0x8A:0xFA
-
-# Sound Ball Trap
-G:T:92:0x8A:0xFA
-
-# Confusion Ball Trap
-G:T:93:0x8A:0xFA
-
-# Force Ball Trap
-G:T:94:0x8A:0xFA
-
-# Inertia Ball Trap
-G:T:95:0x8A:0xFA
-
-# Mana Ball Trap
-G:T:96:0x8A:0xFA
-
-# Ice Ball Trap
-G:T:97:0x8A:0xFA
-
-# Chaos Ball Trap
-G:T:98:0x8A:0xFA
-
-# Nether Ball Trap
-G:T:99:0x8A:0xFA
-
-# Disenchantment Ball Trap
-G:T:100:0x8A:0xFA
-
-# Nexus Ball Trap
-G:T:101:0x8A:0xFA
-
-# Time Ball Trap
-G:T:102:0x8A:0xFA
-
-# Gravity Ball Trap
-G:T:103:0x8A:0xFA
-
-# Arrow Trap
-G:T:110:0x8A:0xFC
-
-# Bolt Trap
-G:T:111:0x8A:0xFC
-
-# Seeker Arrow Trap
-G:T:112:0x8A:0xFC
-
-# Seeker Bolt Trap
-G:T:113:0x8A:0xFC
-
-# Poison Arrow Trap
-G:T:114:0x8A:0xFC
-
-# Poison Bolt Trap
-G:T:115:0x8A:0xFC
-
-# Poison Seeker Arrow Trap
-G:T:116:0x8A:0xFC
-
-# Poison Seeker Bolt Trap
-G:T:117:0x8A:0xFC
-
-# Broken Dagger Trap
-G:T:118:0x8A:0xFC
-
-# Dagger Trap
-G:T:119:0x8A:0xFC
-
-# Poison Broken Dagger Trap
-G:T:120:0x8A:0xFC
-
-# Poison Dagger Trap
-G:T:121:0x8A:0xFC
-
-# Arrows Trap
-G:T:122:0x8A:0xFC
-
-# Bolts Trap
-G:T:123:0x8A:0xFC
-
-# Seeker Arrow Trap
-G:T:124:0x8A:0xFC
-
-# Seeker Bolt Trap
-G:T:125:0x8A:0xFC
-
-# Poison Arrows Trap
-G:T:126:0x8A:0xFC
-
-# Poison Bolt Trap
-G:T:127:0x8A:0xFC
-
-# Poison Seeker Arrows Trap
-G:T:128:0x8A:0xFC
-
-# Poison Seeker Bolts Trap
-G:T:129:0x8A:0xFC
-
-# Broken Daggers Trap
-G:T:130:0x8A:0xFC
-
-# Dagger Trap
-G:T:131:0x8A:0xFC
-
-# Poison Broken Daggers Trap
-G:T:132:0x8A:0xFC
-
-# Poison Daggers Trap
-G:T:133:0x8A:0xFC
-
-# Trap of Drop Item
-G:T:140:0x8A:0xF7
-
-# Trap of Drop Items
-G:T:141:0x8A:0xF7
-
-# Trap of Drop Everything
-G:T:142:0x8A:0xF7
-
-# Trap of Femininity
-G:T:150:0x8A:0xF8
-
-# Trap of Masculinity
-G:T:151:0x8A:0xF8
-
-# Trap of Neutrality
-G:T:152:0x8A:0xF8
-
-# Trap of Aging
-G:T:153:0x8A:0xF8
-
-# Trap of Growing
-G:T:154:0x8A:0xF8
-
-# Trap of Shrinking
-G:T:155:0x8A:0xF8
-
-# Trap of Tanker Drain
-G:T:157:0x8A:0xF8
-
-# Trap of Divine Anger
-G:T:158:0x8A:0xFB
-
-# Trap of Divine Wrath
-G:T:159:0x8A:0xFB
-
-# Hallucination Trap
-G:T:160:0x8A:0xF8
-
-# Greater Magic Missile Trap
-G:T:161:0x8A:0xF9
-
-# Foulness Trap
-G:T:162:0x8A:0xF9
-
-# Trap of Death Ray
-G:T:163:0x8A:0xF9
-
-# Trap of Holy Fire
-G:T:164:0x8A:0xF9
-
-# Trap of Hell Fire
-G:T:165:0x8A:0xF9
-
-# Psi Bolt Trap
-G:T:166:0x8A:0xF9
-
-# Psi Drain Trap
-G:T:167:0x8A:0xF8
-
-# Plasma (Nuke) Ball Trap
-G:T:168:0x8A:0xFA
-
-# Psi Ball Trap
-G:T:169:0x8A:0xFA
-
-# Aquirement Trap
-G:T:170:0x8A:0xFA
-
-# Greater Lightning Bolt Trap
-G:T:171:0x8A:0xF9
-
-# Greater Poison Bolt Trap
-G:T:172:0x8A:0xF9
-
-# Greater Acid Bolt Trap
-G:T:173:0x8A:0xF9
-
-# Greater Cold Bolt Trap
-G:T:174:0x8A:0xF9
-
-# Greater Fire Bolt Trap
-G:T:175:0x8A:0xF9
diff --git a/lib/pref/trap-xxx.prf b/lib/pref/trap-xxx.prf
deleted file mode 100644
index f4d699a0..00000000
--- a/lib/pref/trap-xxx.prf
+++ /dev/null
@@ -1,428 +0,0 @@
-# Prf file for use with the 8x8 tiles to define 
-# trap image locations. Separated out from main 
-# graphics definitions due to the G:T:num:y:x 
-# instead of T:num:y:x  (major problems if this
-# file is opened in the TileAssigner)
-
-# Weakness Traps
-G:T:1:0x82:0x9E
-G:T:2:0x82:0x9E
-G:T:3:0x82:0x9E
-
-# Intelligence Traps
-G:T:4:0x82:0x9E
-G:T:5:0x82:0x9E
-G:T:6:0x82:0x9E
-
-# Wisdom Traps
-G:T:7:0x82:0x9E
-G:T:8:0x82:0x9E
-G:T:9:0x82:0x9E
-
-# Fumbling Fingers Traps
-G:T:10:0x82:0x9E
-G:T:11:0x82:0x9E
-G:T:12:0x82:0x9E
-
-# Wasting Traps
-G:T:13:0x82:0x9E
-G:T:14:0x82:0x9E
-G:T:15:0x82:0x9E
-
-# Beauty Traps
-G:T:16:0x82:0x9E
-G:T:17:0x82:0x9E
-G:T:18:0x82:0x9E
-
-# Trap of Curse Weapon
-G:T:20:0xA2:0x92
-
-# Trap of Curse Armor
-G:T:21:0xA2:0x92
-
-# Earthquake Trap
-G:T:22:0xA2:0x87
-
-# Poison Needle Trap
-G:T:23:0xA2:0x8B
-
-# Summon Monster Trap
-G:T:24:0xA2:0x89
-
-# Summon Undead Trap
-G:T:25:0xA2:0x89
-
-# Summon Greater Undead Trap
-G:T:26:0xA2:0x89
-
-# Teleport Trap
-G:T:27:0x8A:0x9C
-
-# Paralyzing Trap
-G:T:28:0xA2:0x8B
-
-# Explosive Device
-G:T:29:0xA2:0x8B
-
-# Teleport Item Trap
-G:T:30:0x8A:0x9C
-
-# Lose Memory Trap
-G:T:31:0xA2:0x8B
-
-# Bitter Regret Trap
-G:T:32:0xA2:0x8B
-
-# Bowel Cramps Trap
-G:T:33:0xA2:0x8B
-
-# Blindness/Confusion Trap
-G:T:34:0xA2:0x8B
-
-# Aggravation Trap
-G:T:35:0xA2:0x87
-
-# Multiplication Trap
-G:T:36:0xA2:0x87
-
-# Steal Item Trap
-G:T:37:0xA2:0x92
-
-# Summon Fast Quylthulgs Trap
-G:T:38:0xA2:0x89
-
-# Trap of Sinking
-G:T:39:0x8A:0x9C
-
-# Trap of Mana Drain
-G:T:40:0xA2:0x8B
-
-# Trap of Missing Money
-G:T:41:0xA2:0x92
-
-# Trap of No Return
-G:T:42:0xA2:0x92
-
-# Trap of Silent Switching
-G:T:43:0xA2:0x92
-
-# Trap of Walls
-G:T:44:0xA2:0x87
-
-# Trap of Calling Out
-G:T:45:0xA2:0x89
-
-# Trap of Sliding
-G:T:46:0xA2:0x8B
-
-# Trap of Charges Drain
-G:T:47:0xA2:0x92
-
-# Trap of Stair Movement
-G:T:48:0xA2:0x87
-
-# Trap of New Trap
-G:T:49:0xA2:0x87
-
-# Trap of Scatter Items
-G:T:50:0x8A:0x9C
-
-# Trap of Decay
-G:T:51:0xA2:0x8B
-
-# Trap of Wasting Wands
-G:T:52:0xA2:0x92
-
-# Trap of Filling
-G:T:53:0xA2:0x87
-
-# Trap of Drain Speed
-G:T:54:0xA2:0x92
-
-# Lightning Bolt Trap
-G:T:60:0xA2:0x8C
-
-# Poison Bolt Trap
-G:T:61:0xA2:0x8C
-
-# Acid Bolt Trap
-G:T:62:0xA2:0x8C
-
-# Cold Bolt Trap
-G:T:63:0xA2:0x8C
-
-# Fire Bolt Trap
-G:T:64:0xA2:0x8C
-
-# Plasma Bolt Trap
-G:T:65:0xA2:0x8C
-
-# Water Bolt Trap
-G:T:66:0xA2:0x8C
-
-# Lite Bolt Trap
-G:T:67:0xA2:0x8C
-
-# Dark Bolt Trap
-G:T:68:0xA2:0x8C
-
-# Shards Bolt Trap
-G:T:69:0xA2:0x8C
-
-# Sound Bolt Trap
-G:T:70:0xA2:0x8C
-
-# Confusion Bolt Trap
-G:T:71:0xA2:0x8C
-
-# Force Bolt Trap
-G:T:72:0xA2:0x8C
-
-# Inertia Bolt Trap
-G:T:73:0xA2:0x8C
-
-# Mana Bolt Trap
-G:T:74:0xA2:0x8C
-
-# Ice Bolt Trap
-G:T:75:0xA2:0x8C
-
-# Chaos Bolt Trap
-G:T:76:0xA2:0x8C
-
-# Nether Bolt Trap
-G:T:77:0xA2:0x8C
-
-# Disenchantment Bolt Trap
-G:T:78:0xA2:0x8C
-
-# Nexus  Bolt Trap
-G:T:79:0xA2:0x8C
-
-# Time Bolt Trap
-G:T:80:0xA2:0x8C
-
-# Gravity Bolt Trap
-G:T:81:0xA2:0x8C
-
-# Lightning Ball Trap
-G:T:82:0xA2:0x8D
-
-# Poison Ball Trap
-G:T:83:0xA2:0x8D
-
-# Acid Ball Trap
-G:T:84:0xA2:0x8D
-
-# Cold Ball Trap
-G:T:85:0xA2:0x8D
-
-# Fire Ball Trap
-G:T:86:0xA2:0x8D
-
-# Plasma Ball Trap
-G:T:87:0xA2:0x8D
-
-# Water Ball Trap
-G:T:88:0xA2:0x8D
-
-# Light Ball Trap
-G:T:89:0xA2:0x8D
-
-# Darkness Ball Trap
-G:T:90:0xA2:0x8D
-
-# Shards Ball Trap
-G:T:91:0xA2:0x8D
-
-# Sound Ball Trap
-G:T:92:0xA2:0x8D
-
-# Confusion Ball Trap
-G:T:93:0xA2:0x8D
-
-# Force Ball Trap
-G:T:94:0xA2:0x8D
-
-# Inertia Ball Trap
-G:T:95:0xA2:0x8D
-
-# Mana Ball Trap
-G:T:96:0xA2:0x8D
-
-# Ice Ball Trap
-G:T:97:0xA2:0x8D
-
-# Chaos Ball Trap
-G:T:98:0xA2:0x8D
-
-# Nether Ball Trap
-G:T:99:0xA2:0x8D
-
-# Disenchantment Ball Trap
-G:T:100:0xA2:0x8D
-
-# Nexus Ball Trap
-G:T:101:0xA2:0x8D
-
-# Time Ball Trap
-G:T:102:0xA2:0x8D
-
-# Gravity Ball Trap
-G:T:103:0xA2:0x8D
-
-# Arrow Trap
-G:T:110:0xA2:0x8E
-
-# Bolt Trap
-G:T:111:0xA2:0x8E
-
-# Seeker Arrow Trap
-G:T:112:0xA2:0x8E
-
-# Seeker Bolt Trap
-G:T:113:0xA2:0x8E
-
-# Poison Arrow Trap
-G:T:114:0xA2:0x8E
-
-# Poison Bolt Trap
-G:T:115:0xA2:0x8E
-
-# Poison Seeker Arrow Trap
-G:T:116:0xA2:0x8E
-
-# Poison Seeker Bolt Trap
-G:T:117:0xA2:0x8E
-
-# Broken Dagger Trap
-G:T:118:0xA2:0x8E
-
-# Dagger Trap
-G:T:119:0xA2:0x8E
-
-# Poison Broken Dagger Trap
-G:T:120:0xA2:0x8E
-
-# Poison Dagger Trap
-G:T:121:0xA2:0x8E
-
-# Arrows Trap
-G:T:122:0xA2:0x8E
-
-# Bolts Trap
-G:T:123:0xA2:0x8E
-
-# Seeker Arrow Trap
-G:T:124:0xA2:0x8E
-
-# Seeker Bolt Trap
-G:T:125:0xA2:0x8E
-
-# Poison Arrows Trap
-G:T:126:0xA2:0x8E
-
-# Poison Bolt Trap
-G:T:127:0xA2:0x8E
-
-# Poison Seeker Arrows Trap
-G:T:128:0xA2:0x8E
-
-# Poison Seeker Bolts Trap
-G:T:129:0xA2:0x8E
-
-# Broken Daggers Trap
-G:T:130:0xA2:0x8E
-
-# Dagger Trap
-G:T:131:0xA2:0x8E
-
-# Poison Broken Daggers Trap
-G:T:132:0xA2:0x8E
-
-# Poison Daggers Trap
-G:T:133:0xA2:0x8E
-
-# Trap of Drop Item
-G:T:140:0xA2:0x92
-
-# Trap of Drop Items
-G:T:141:0xA2:0x92
-
-# Trap of Drop Everything
-G:T:142:0xA2:0x92
-
-# Trap of Femininity
-G:T:150:0xA2:0x8B
-
-# Trap of Masculinity
-G:T:151:0xA2:0x8B
-
-# Trap of Neutrality
-G:T:152:0xA2:0x8B
-
-# Trap of Aging
-G:T:153:0xA2:0x8B
-
-# Trap of Growing
-G:T:154:0xA2:0x8B
-
-# Trap of Shrinking
-G:T:155:0xA2:0x8B
-
-# Trap of Tanker Drain
-G:T:157:0xA2:0x8B
-
-# Trap of Divine Anger
-G:T:158:0xA2:0x88
-
-# Trap of Divine Wrath
-G:T:159:0xA2:0x88
-
-# Hallucination Trap
-G:T:160:0xA2:0x8B
-
-# Greater Magic Missile Trap
-G:T:161:0xA2:0x8C
-
-# Foulness Trap
-G:T:162:0xA2:0x8C
-
-# Trap of Death Ray
-G:T:163:0xA2:0x8C
-
-# Trap of Holy Fire
-G:T:164:0xA2:0x8C
-
-# Trap of Hell Fire
-G:T:165:0xA2:0x8C
-
-# Psi Bolt Trap
-G:T:166:0xA2:0x8C
-
-# Psi Drain Trap
-G:T:167:0xA2:0x8B
-
-# Plasma (Nuke) Ball Trap
-G:T:168:0xA2:0x8D
-
-# Psi Ball Trap
-G:T:169:0xA2:0x8D
-
-# Aquirement Trap
-G:T:170:0xA2:0x89
-
-# Greater Lightning Bolt Trap
-G:T:171:0xA2:0x8C
-
-# Greater Poison Bolt Trap
-G:T:172:0xA2:0x8C
-
-# Greater Acid Bolt Trap
-G:T:173:0xA2:0x8C
-
-# Greater Cold Bolt Trap
-G:T:174:0xA2:0x8C
-
-# Greater Fire Bolt Trap
-G:T:175:0xA2:0x8C
\ No newline at end of file
diff --git a/lib/pref/user.prf b/lib/pref/user.prf
index 9e10b2ac..04715ebc 100644
--- a/lib/pref/user.prf
+++ b/lib/pref/user.prf
@@ -24,27 +24,10 @@
 ?:[EQU $SYS gcu]
 %:user-gcu.prf
 
-?:[EQU $SYS ami]
-%:user-ami.prf
-
 ?:[EQU $SYS mac]
 %:user-mac.prf
 
-?:[EQU $SYS dos]
-%:user-dos.prf
-
-?:[EQU $SYS ibm]
-%:user-ibm.prf
-
 ?:[EQU $SYS win]
 %:user-win.prf
 
-?:[EQU $SYS emx]
-%:user-emx.prf
-
-?:[EQU $SYS acn]
-%:user-acn.prf
-
 ?:1
-
-
diff --git a/lib/pref/xtra-new.prf b/lib/pref/xtra-new.prf
deleted file mode 100644
index de82b976..00000000
--- a/lib/pref/xtra-new.prf
+++ /dev/null
@@ -1,1128 +0,0 @@
-# File: xtra-new.prf
-
-#
-# This file defines special attr/char mappings for use in "graphics" mode
-#
-# Edited for use with Adam Bolt's new graphics by Robert Ruehlmann < rr9@angband.org >
-#
-# See "lib/help/command.txt" and "src/files.c" for more information.
-#
-
-
-##### AK 20011216 Default pictures for all races that
-#     are not handled below, without caring for class
-
-
-?:[EQU $RACE Human]
-R:0:0x89/0xA0
-?:[EQU $RACE Half-Elf]
-R:0:0x89/0xA1
-?:[EQU $RACE Elf]
-R:0:0x89/0xA2
-?:[EQU $RACE Hobbit]
-R:0:0x89/0xA3
-?:[EQU $RACE Gnome]
-R:0:0x89/0xA4
-?:[EQU $RACE Dwarf]
-R:0:0x89/0xA5
-?:[EQU $RACE Orc]
-R:0:0x89/0xA6
-?:[EQU $RACE Troll]
-R:0:0x89/0xA7
-?:[EQU $RACE Dunadan]
-R:0:0x89/0xA8
-?:[EQU $RACE High-Elf]
-R:0:0x89/0xA9
-?:[EQU $RACE Half-Ogre]
-R:0:0x89/0xAA
-?:[EQU $RACE Beorning]
-R:0:0x89/0xAB
-?:[EQU $RACE Kobold]
-R:0:0x89/0xAC
-?:[EQU $RACE Petty-Dwarf]
-R:0:0x89/0xAD
-?:[EQU $RACE Dark-Elf]
-R:0:0x89/0xAE
-?:[EQU $RACE Ent]
-R:0:0x89/0xAF
-?:[EQU $RACE RohanKnight]
-R:0:0x89/0xB0
-?:[EQU $RACE Thunderlord]
-R:0:0x89/0xB1
-?:[EQU $RACE DeathMold]
-R:0:0x89/0xB2
-?:[EQU $RACE Yeek]
-R:0:0x89/0xB3
-?:[EQU $RACE Wood-Elf]
-R:0:0x89/0xB4
-?:[EQU $RACE Maia]
-R:0:0x89/0xB5
-
-##### Remap the player icon #####
-
-?:[AND [EQU $CLASS Warrior] [EQU $RACE Human] ]
-R:0:0x92/0x80
-?:[AND [EQU $CLASS Warrior] [EQU $RACE Half-Elf] ]
-R:0:0x92/0x81
-?:[AND [EQU $CLASS Warrior] [EQU $RACE Elf] ]
-R:0:0x92/0x82
-?:[AND [EQU $CLASS Warrior] [EQU $RACE Hobbit] ]
-R:0:0x92/0x83
-?:[AND [EQU $CLASS Warrior] [EQU $RACE Gnome] ]
-R:0:0x92/0x84
-?:[AND [EQU $CLASS Warrior] [EQU $RACE Dwarf] ]
-R:0:0x92/0x85
-?:[AND [EQU $CLASS Warrior] [EQU $RACE Half-Orc] ]
-R:0:0x92/0x86
-?:[AND [EQU $CLASS Warrior] [EQU $RACE Half-Troll] ]
-R:0:0x92/0x87
-?:[AND [EQU $CLASS Warrior] [EQU $RACE Dunadan] ]
-R:0:0x92/0x88
-?:[AND [EQU $CLASS Warrior] [EQU $RACE High-Elf] ]
-R:0:0x92/0x89
-?:[AND [EQU $CLASS Warrior] [EQU $RACE Dunadan] ]
-R:0:0x92/0x8A
-?:[AND [EQU $CLASS Warrior] [EQU $RACE Barbarian] ]
-R:0:0x92/0x8B
-?:[AND [EQU $CLASS Warrior] [EQU $RACE Ogre] ]
-R:0:0x92/0x8C
-?:[AND [EQU $CLASS Warrior] [EQU $RACE Half-Giant] ]
-R:0:0x92/0x8D
-?:[AND [EQU $CLASS Warrior] [EQU $RACE Half-Titan] ]
-R:0:0x92/0x8E
-?:[AND [EQU $CLASS Warrior] [EQU $RACE Kobold] ]
-R:0:0x92/0x92
-?:[AND [EQU $CLASS Warrior] [EQU $RACE Nibelung] ]
-R:0:0x92/0x93
-?:[AND [EQU $CLASS Warrior] [EQU $RACE Dark Elf] ]
-R:0:0x92/0x94
-?:[AND [EQU $CLASS Warrior] [EQU $RACE RohanKnight] ]
-R:0:0x93/0x91
-?:[AND [EQU $CLASS Warrior] [EQU $RACE Thunderlord] ]
-R:0:0x92/0x95
-?:[AND [EQU $CLASS Warrior] [EQU $RACE Mindflayer] ]
-R:0:0x92/0x96
-?:[AND [EQU $CLASS Warrior] [EQU $RACE Imp] ]
-R:0:0x92/0x97
-?:[AND [EQU $CLASS Warrior] [EQU $RACE Ent] ]
-R:0:0x92/0x98
-?:[AND [EQU $CLASS Warrior] [EQU $RACE Skeleton] ]
-R:0:0x92/0x99
-?:[AND [EQU $CLASS Warrior] [EQU $RACE Zombie] ]
-R:0:0x92/0x9A
-?:[AND [EQU $CLASS Warrior] [EQU $RACE Vampire] ]
-R:0:0x92/0x9B
-?:[AND [EQU $CLASS Warrior] [EQU $RACE Spectre] ]
-R:0:0x92/0x9C
-?:[AND [EQU $CLASS Warrior] [EQU $RACE Sprite] ]
-R:0:0x92/0x9D
-?:[AND [EQU $CLASS Warrior] [EQU $RACE DeathMold] ]
-R:0:0x92/0x9E
-
-?:[AND [EQU $CLASS Mage] [EQU $RACE Human] ]
-R:0:0x93/0x80
-?:[AND [EQU $CLASS Mage] [EQU $RACE Half-Elf] ]
-R:0:0x93/0x81
-?:[AND [EQU $CLASS Mage] [EQU $RACE Elf] ]
-R:0:0x93/0x82
-?:[AND [EQU $CLASS Mage] [EQU $RACE Hobbit] ]
-R:0:0x93/0x83
-?:[AND [EQU $CLASS Mage] [EQU $RACE Gnome] ]
-R:0:0x93/0x84
-?:[AND [EQU $CLASS Mage] [EQU $RACE Dwarf] ]
-R:0:0x93/0x85
-?:[AND [EQU $CLASS Mage] [EQU $RACE Half-Orc] ]
-R:0:0x93/0x86
-?:[AND [EQU $CLASS Mage] [EQU $RACE Half-Troll] ]
-R:0:0x93/0x87
-?:[AND [EQU $CLASS Mage] [EQU $RACE Dunadan] ]
-R:0:0x93/0x88
-?:[AND [EQU $CLASS Mage] [EQU $RACE High-Elf] ]
-R:0:0x93/0x89
-?:[AND [EQU $CLASS Mage] [EQU $RACE Dunadan] ]
-R:0:0x93/0x8A
-?:[AND [EQU $CLASS Mage] [EQU $RACE Barbarian] ]
-R:0:0x93/0x8B
-?:[AND [EQU $CLASS Mage] [EQU $RACE Ogre] ]
-R:0:0x93/0x8C
-?:[AND [EQU $CLASS Mage] [EQU $RACE Half-Giant] ]
-R:0:0x93/0x8D
-?:[AND [EQU $CLASS Mage] [EQU $RACE Half-Titan] ]
-R:0:0x93/0x8E
-?:[AND [EQU $CLASS Mage] [EQU $RACE Cyclops] ]
-R:0:0x93/0x8F
-?:[AND [EQU $CLASS Mage] [EQU $RACE Yeek] ]
-R:0:0x93/0x90
-?:[AND [EQU $CLASS Mage] [EQU $RACE RohanKnight] ]
-R:0:0x93/0x91
-?:[AND [EQU $CLASS Mage] [EQU $RACE Kobold] ]
-R:0:0x93/0x92
-?:[AND [EQU $CLASS Mage] [EQU $RACE Nibelung] ]
-R:0:0x93/0x93
-?:[AND [EQU $CLASS Mage] [EQU $RACE Dark Elf] ]
-R:0:0x93/0x94
-?:[AND [EQU $CLASS Mage] [EQU $RACE Thunderlord] ]
-R:0:0x93/0x95
-?:[AND [EQU $CLASS Mage] [EQU $RACE Mindflayer] ]
-R:0:0x93/0x96
-?:[AND [EQU $CLASS Mage] [EQU $RACE Imp] ]
-R:0:0x93/0x97
-?:[AND [EQU $CLASS Mage] [EQU $RACE Ent] ]
-R:0:0x93/0x98
-?:[AND [EQU $CLASS Mage] [EQU $RACE Skeleton] ]
-R:0:0x93/0x99
-?:[AND [EQU $CLASS Mage] [EQU $RACE Zombie] ]
-R:0:0x93/0x9A
-?:[AND [EQU $CLASS Mage] [EQU $RACE Vampire] ]
-R:0:0x93/0x9B
-?:[AND [EQU $CLASS Mage] [EQU $RACE Spectre] ]
-R:0:0x93/0x9C
-?:[AND [EQU $CLASS Mage] [EQU $RACE Sprite] ]
-R:0:0x93/0x9D
-?:[AND [EQU $CLASS Mage] [EQU $RACE DeathMold] ]
-R:0:0x93/0x9E
-
-?:[AND [EQU $CLASS Priest] [EQU $RACE Human] ]
-R:0:0x94/0x80
-?:[AND [EQU $CLASS Priest] [EQU $RACE Half-Elf] ]
-R:0:0x94/0x81
-?:[AND [EQU $CLASS Priest] [EQU $RACE Elf] ]
-R:0:0x94/0x82
-?:[AND [EQU $CLASS Priest] [EQU $RACE Hobbit] ]
-R:0:0x94/0x83
-?:[AND [EQU $CLASS Priest] [EQU $RACE Gnome] ]
-R:0:0x94/0x84
-?:[AND [EQU $CLASS Priest] [EQU $RACE Dwarf] ]
-R:0:0x94/0x85
-?:[AND [EQU $CLASS Priest] [EQU $RACE Half-Orc] ]
-R:0:0x94/0x86
-?:[AND [EQU $CLASS Priest] [EQU $RACE Half-Troll] ]
-R:0:0x94/0x87
-?:[AND [EQU $CLASS Priest] [EQU $RACE Dunadan] ]
-R:0:0x94/0x88
-?:[AND [EQU $CLASS Priest] [EQU $RACE High-Elf] ]
-R:0:0x94/0x89
-?:[AND [EQU $CLASS Priest] [EQU $RACE Dunadan] ]
-R:0:0x94/0x8A
-?:[AND [EQU $CLASS Priest] [EQU $RACE Barbarian] ]
-R:0:0x94/0x8B
-?:[AND [EQU $CLASS Priest] [EQU $RACE Ogre] ]
-R:0:0x94/0x8C
-?:[AND [EQU $CLASS Priest] [EQU $RACE Half-Giant] ]
-R:0:0x94/0x8D
-?:[AND [EQU $CLASS Priest] [EQU $RACE Half-Titan] ]
-R:0:0x94/0x8E
-?:[AND [EQU $CLASS Priest] [EQU $RACE Cyclops] ]
-R:0:0x94/0x8F
-?:[AND [EQU $CLASS Priest] [EQU $RACE Yeek] ]
-R:0:0x94/0x90
-?:[AND [EQU $CLASS Priest] [EQU $RACE RohanKnight] ]
-R:0:0x94/0x91
-?:[AND [EQU $CLASS Priest] [EQU $RACE Kobold] ]
-R:0:0x94/0x92
-?:[AND [EQU $CLASS Priest] [EQU $RACE Nibelung] ]
-R:0:0x94/0x93
-?:[AND [EQU $CLASS Priest] [EQU $RACE Dark Elf] ]
-R:0:0x94/0x94
-?:[AND [EQU $CLASS Priest] [EQU $RACE Thunderlord] ]
-R:0:0x94/0x95
-?:[AND [EQU $CLASS Priest] [EQU $RACE Mindflayer] ]
-R:0:0x94/0x96
-?:[AND [EQU $CLASS Priest] [EQU $RACE Imp] ]
-R:0:0x94/0x97
-?:[AND [EQU $CLASS Priest] [EQU $RACE Ent] ]
-R:0:0x94/0x98
-?:[AND [EQU $CLASS Priest] [EQU $RACE Skeleton] ]
-R:0:0x94/0x99
-?:[AND [EQU $CLASS Priest] [EQU $RACE Zombie] ]
-R:0:0x94/0x9A
-?:[AND [EQU $CLASS Priest] [EQU $RACE Vampire] ]
-R:0:0x94/0x9B
-?:[AND [EQU $CLASS Priest] [EQU $RACE Spectre] ]
-R:0:0x94/0x9C
-?:[AND [EQU $CLASS Priest] [EQU $RACE Sprite] ]
-R:0:0x94/0x9D
-?:[AND [EQU $CLASS Priest] [EQU $RACE DeathMold] ]
-R:0:0x94/0x9E
-
-?:[AND [EQU $CLASS Rogue] [EQU $RACE Human] ]
-R:0:0x95/0x80
-?:[AND [EQU $CLASS Rogue] [EQU $RACE Half-Elf] ]
-R:0:0x95/0x81
-?:[AND [EQU $CLASS Rogue] [EQU $RACE Elf] ]
-R:0:0x95/0x82
-?:[AND [EQU $CLASS Rogue] [EQU $RACE Hobbit] ]
-R:0:0x95/0x83
-?:[AND [EQU $CLASS Rogue] [EQU $RACE Gnome] ]
-R:0:0x95/0x84
-?:[AND [EQU $CLASS Rogue] [EQU $RACE Dwarf] ]
-R:0:0x95/0x85
-?:[AND [EQU $CLASS Rogue] [EQU $RACE Half-Orc] ]
-R:0:0x95/0x86
-?:[AND [EQU $CLASS Rogue] [EQU $RACE Half-Troll] ]
-R:0:0x95/0x87
-?:[AND [EQU $CLASS Rogue] [EQU $RACE Dunadan] ]
-R:0:0x95/0x88
-?:[AND [EQU $CLASS Rogue] [EQU $RACE High-Elf] ]
-R:0:0x95/0x89
-?:[AND [EQU $CLASS Rogue] [EQU $RACE Dunadan] ]
-R:0:0x95/0x8A
-?:[AND [EQU $CLASS Rogue] [EQU $RACE Barbarian] ]
-R:0:0x95/0x8B
-?:[AND [EQU $CLASS Rogue] [EQU $RACE Ogre] ]
-R:0:0x95/0x8C
-?:[AND [EQU $CLASS Rogue] [EQU $RACE Half-Giant] ]
-R:0:0x95/0x8D
-?:[AND [EQU $CLASS Rogue] [EQU $RACE Half-Titan] ]
-R:0:0x95/0x8E
-?:[AND [EQU $CLASS Rogue] [EQU $RACE Cyclops] ]
-R:0:0x95/0x8F
-?:[AND [EQU $CLASS Rogue] [EQU $RACE Yeek] ]
-R:0:0x95/0x90
-?:[AND [EQU $CLASS Rogue] [EQU $RACE RohanKnight] ]
-R:0:0x95/0x91
-?:[AND [EQU $CLASS Rogue] [EQU $RACE Kobold] ]
-R:0:0x95/0x92
-?:[AND [EQU $CLASS Rogue] [EQU $RACE Nibelung] ]
-R:0:0x95/0x93
-?:[AND [EQU $CLASS Rogue] [EQU $RACE Dark Elf] ]
-R:0:0x95/0x94
-?:[AND [EQU $CLASS Rogue] [EQU $RACE Thunderlord] ]
-R:0:0x95/0x95
-?:[AND [EQU $CLASS Rogue] [EQU $RACE Mindflayer] ]
-R:0:0x95/0x96
-?:[AND [EQU $CLASS Rogue] [EQU $RACE Imp] ]
-R:0:0x95/0x97
-?:[AND [EQU $CLASS Rogue] [EQU $RACE Ent] ]
-R:0:0x95/0x98
-?:[AND [EQU $CLASS Rogue] [EQU $RACE Skeleton] ]
-R:0:0x95/0x99
-?:[AND [EQU $CLASS Rogue] [EQU $RACE Zombie] ]
-R:0:0x95/0x9A
-?:[AND [EQU $CLASS Rogue] [EQU $RACE Vampire] ]
-R:0:0x95/0x9B
-?:[AND [EQU $CLASS Rogue] [EQU $RACE Spectre] ]
-R:0:0x95/0x9C
-?:[AND [EQU $CLASS Rogue] [EQU $RACE Sprite] ]
-R:0:0x95/0x9D
-?:[AND [EQU $CLASS Rogue] [EQU $RACE DeathMold] ]
-R:0:0x95/0x9E
-
-?:[AND [EQU $CLASS Ranger] [EQU $RACE Human] ]
-R:0:0x96/0x80
-?:[AND [EQU $CLASS Ranger] [EQU $RACE Half-Elf] ]
-R:0:0x96/0x81
-?:[AND [EQU $CLASS Ranger] [EQU $RACE Elf] ]
-R:0:0x96/0x82
-?:[AND [EQU $CLASS Ranger] [EQU $RACE Hobbit] ]
-R:0:0x96/0x83
-?:[AND [EQU $CLASS Ranger] [EQU $RACE Gnome] ]
-R:0:0x96/0x84
-?:[AND [EQU $CLASS Ranger] [EQU $RACE Dwarf] ]
-R:0:0x96/0x85
-?:[AND [EQU $CLASS Ranger] [EQU $RACE Half-Orc] ]
-R:0:0x96/0x86
-?:[AND [EQU $CLASS Ranger] [EQU $RACE Half-Troll] ]
-R:0:0x96/0x87
-?:[AND [EQU $CLASS Ranger] [EQU $RACE Dunadan] ]
-R:0:0x96/0x88
-?:[AND [EQU $CLASS Ranger] [EQU $RACE High-Elf] ]
-R:0:0x96/0x89
-?:[AND [EQU $CLASS Ranger] [EQU $RACE Dunadan] ]
-R:0:0x96/0x8A
-?:[AND [EQU $CLASS Ranger] [EQU $RACE Barbarian] ]
-R:0:0x96/0x8B
-?:[AND [EQU $CLASS Ranger] [EQU $RACE Ogre] ]
-R:0:0x96/0x8C
-?:[AND [EQU $CLASS Ranger] [EQU $RACE Half-Giant] ]
-R:0:0x96/0x8D
-?:[AND [EQU $CLASS Ranger] [EQU $RACE Half-Titan] ]
-R:0:0x96/0x8E
-?:[AND [EQU $CLASS Ranger] [EQU $RACE Cyclops] ]
-R:0:0x96/0x8F
-?:[AND [EQU $CLASS Ranger] [EQU $RACE Yeek] ]
-R:0:0x96/0x90
-?:[AND [EQU $CLASS Ranger] [EQU $RACE RohanKnight] ]
-R:0:0x96/0x91
-?:[AND [EQU $CLASS Ranger] [EQU $RACE Kobold] ]
-R:0:0x96/0x92
-?:[AND [EQU $CLASS Ranger] [EQU $RACE Nibelung] ]
-R:0:0x96/0x93
-?:[AND [EQU $CLASS Ranger] [EQU $RACE Dark Elf] ]
-R:0:0x96/0x94
-?:[AND [EQU $CLASS Ranger] [EQU $RACE Thunderlord] ]
-R:0:0x96/0x95
-?:[AND [EQU $CLASS Ranger] [EQU $RACE Mindflayer] ]
-R:0:0x96/0x96
-?:[AND [EQU $CLASS Ranger] [EQU $RACE Imp] ]
-R:0:0x96/0x97
-?:[AND [EQU $CLASS Ranger] [EQU $RACE Ent] ]
-R:0:0x96/0x98
-?:[AND [EQU $CLASS Ranger] [EQU $RACE Skeleton] ]
-R:0:0x96/0x99
-?:[AND [EQU $CLASS Ranger] [EQU $RACE Zombie] ]
-R:0:0x96/0x9A
-?:[AND [EQU $CLASS Ranger] [EQU $RACE Vampire] ]
-R:0:0x96/0x9B
-?:[AND [EQU $CLASS Ranger] [EQU $RACE Spectre] ]
-R:0:0x96/0x9C
-?:[AND [EQU $CLASS Ranger] [EQU $RACE Sprite] ]
-R:0:0x96/0x9D
-?:[AND [EQU $CLASS Ranger] [EQU $RACE DeathMold] ]
-R:0:0x96/0x9E
-
-?:[AND [EQU $CLASS Paladin] [EQU $RACE Human] ]
-R:0:0x97/0x80
-?:[AND [EQU $CLASS Paladin] [EQU $RACE Half-Elf] ]
-R:0:0x97/0x81
-?:[AND [EQU $CLASS Paladin] [EQU $RACE Elf] ]
-R:0:0x97/0x82
-?:[AND [EQU $CLASS Paladin] [EQU $RACE Hobbit] ]
-R:0:0x97/0x83
-?:[AND [EQU $CLASS Paladin] [EQU $RACE Gnome] ]
-R:0:0x97/0x84
-?:[AND [EQU $CLASS Paladin] [EQU $RACE Dwarf] ]
-R:0:0x97/0x85
-?:[AND [EQU $CLASS Paladin] [EQU $RACE Half-Orc] ]
-R:0:0x97/0x86
-?:[AND [EQU $CLASS Paladin] [EQU $RACE Half-Troll] ]
-R:0:0x97/0x87
-?:[AND [EQU $CLASS Paladin] [EQU $RACE Dunadan] ]
-R:0:0x97/0x88
-?:[AND [EQU $CLASS Paladin] [EQU $RACE High-Elf] ]
-R:0:0x97/0x89
-?:[AND [EQU $CLASS Paladin] [EQU $RACE Dunadan] ]
-R:0:0x97/0x8A
-?:[AND [EQU $CLASS Paladin] [EQU $RACE Barbarian] ]
-R:0:0x97/0x8B
-?:[AND [EQU $CLASS Paladin] [EQU $RACE Ogre] ]
-R:0:0x97/0x8C
-?:[AND [EQU $CLASS Paladin] [EQU $RACE Half-Giant] ]
-R:0:0x97/0x8D
-?:[AND [EQU $CLASS Paladin] [EQU $RACE Half-Titan] ]
-R:0:0x97/0x8E
-?:[AND [EQU $CLASS Paladin] [EQU $RACE Cyclops] ]
-R:0:0x97/0x8F
-?:[AND [EQU $CLASS Paladin] [EQU $RACE Yeek] ]
-R:0:0x97/0x90
-?:[AND [EQU $CLASS Paladin] [EQU $RACE RohanKnight] ]
-R:0:0x97/0x91
-?:[AND [EQU $CLASS Paladin] [EQU $RACE Kobold] ]
-R:0:0x97/0x92
-?:[AND [EQU $CLASS Paladin] [EQU $RACE Nibelung] ]
-R:0:0x97/0x93
-?:[AND [EQU $CLASS Paladin] [EQU $RACE Dark Elf] ]
-R:0:0x97/0x94
-?:[AND [EQU $CLASS Paladin] [EQU $RACE Thunderlord] ]
-R:0:0x97/0x95
-?:[AND [EQU $CLASS Paladin] [EQU $RACE Mindflayer] ]
-R:0:0x97/0x96
-?:[AND [EQU $CLASS Paladin] [EQU $RACE Imp] ]
-R:0:0x97/0x97
-?:[AND [EQU $CLASS Paladin] [EQU $RACE Ent] ]
-R:0:0x97/0x98
-?:[AND [EQU $CLASS Paladin] [EQU $RACE Skeleton] ]
-R:0:0x97/0x99
-?:[AND [EQU $CLASS Paladin] [EQU $RACE Zombie] ]
-R:0:0x97/0x9A
-?:[AND [EQU $CLASS Paladin] [EQU $RACE Vampire] ]
-R:0:0x97/0x9B
-?:[AND [EQU $CLASS Paladin] [EQU $RACE Spectre] ]
-R:0:0x97/0x9C
-?:[AND [EQU $CLASS Paladin] [EQU $RACE Sprite] ]
-R:0:0x97/0x9D
-?:[AND [EQU $CLASS Paladin] [EQU $RACE DeathMold] ]
-R:0:0x97/0x9E
-
-?:[AND [EQU $CLASS Warrior-Mage] [EQU $RACE Human] ]
-R:0:0x98/0x80
-?:[AND [EQU $CLASS Warrior-Mage] [EQU $RACE Half-Elf] ]
-R:0:0x98/0x81
-?:[AND [EQU $CLASS Warrior-Mage] [EQU $RACE Elf] ]
-R:0:0x98/0x82
-?:[AND [EQU $CLASS Warrior-Mage] [EQU $RACE Hobbit] ]
-R:0:0x98/0x83
-?:[AND [EQU $CLASS Warrior-Mage] [EQU $RACE Gnome] ]
-R:0:0x98/0x84
-?:[AND [EQU $CLASS Warrior-Mage] [EQU $RACE Dwarf] ]
-R:0:0x98/0x85
-?:[AND [EQU $CLASS Warrior-Mage] [EQU $RACE Half-Orc] ]
-R:0:0x98/0x86
-?:[AND [EQU $CLASS Warrior-Mage] [EQU $RACE Half-Troll] ]
-R:0:0x98/0x87
-?:[AND [EQU $CLASS Warrior-Mage] [EQU $RACE Dunadan] ]
-R:0:0x98/0x88
-?:[AND [EQU $CLASS Warrior-Mage] [EQU $RACE High-Elf] ]
-R:0:0x98/0x89
-?:[AND [EQU $CLASS Warrior-Mage] [EQU $RACE Dunadan] ]
-R:0:0x98/0x8A
-?:[AND [EQU $CLASS Warrior-Mage] [EQU $RACE Barbarian] ]
-R:0:0x98/0x8B
-?:[AND [EQU $CLASS Warrior-Mage] [EQU $RACE Ogre] ]
-R:0:0x98/0x8C
-?:[AND [EQU $CLASS Warrior-Mage] [EQU $RACE Half-Giant] ]
-R:0:0x98/0x8D
-?:[AND [EQU $CLASS Warrior-Mage] [EQU $RACE Half-Titan] ]
-R:0:0x98/0x8E
-?:[AND [EQU $CLASS Warrior-Mage] [EQU $RACE Cyclops] ]
-R:0:0x98/0x8F
-?:[AND [EQU $CLASS Warrior-Mage] [EQU $RACE Yeek] ]
-R:0:0x98/0x90
-?:[AND [EQU $CLASS Warrior-Mage] [EQU $RACE RohanKnight] ]
-R:0:0x98/0x91
-?:[AND [EQU $CLASS Warrior-Mage] [EQU $RACE Kobold] ]
-R:0:0x98/0x92
-?:[AND [EQU $CLASS Warrior-Mage] [EQU $RACE Nibelung] ]
-R:0:0x98/0x93
-?:[AND [EQU $CLASS Warrior-Mage] [EQU $RACE Dark Elf] ]
-R:0:0x98/0x94
-?:[AND [EQU $CLASS Warrior-Mage] [EQU $RACE Thunderlord] ]
-R:0:0x98/0x95
-?:[AND [EQU $CLASS Warrior-Mage] [EQU $RACE Mindflayer] ]
-R:0:0x98/0x96
-?:[AND [EQU $CLASS Warrior-Mage] [EQU $RACE Imp] ]
-R:0:0x98/0x97
-?:[AND [EQU $CLASS Warrior-Mage] [EQU $RACE Ent] ]
-R:0:0x98/0x98
-?:[AND [EQU $CLASS Warrior-Mage] [EQU $RACE Skeleton] ]
-R:0:0x98/0x99
-?:[AND [EQU $CLASS Warrior-Mage] [EQU $RACE Zombie] ]
-R:0:0x98/0x9A
-?:[AND [EQU $CLASS Warrior-Mage] [EQU $RACE Vampire] ]
-R:0:0x98/0x9B
-?:[AND [EQU $CLASS Warrior-Mage] [EQU $RACE Spectre] ]
-R:0:0x98/0x9C
-?:[AND [EQU $CLASS Warrior-Mage] [EQU $RACE Sprite] ]
-R:0:0x98/0x9D
-?:[AND [EQU $CLASS Warrior-Mage] [EQU $RACE DeathMold] ]
-R:0:0x98/0x9E
-
-?:[AND [EQU $CLASS Chaos-Warrior] [EQU $RACE Human] ]
-R:0:0x99/0x80
-?:[AND [EQU $CLASS Chaos-Warrior] [EQU $RACE Half-Elf] ]
-R:0:0x99/0x81
-?:[AND [EQU $CLASS Chaos-Warrior] [EQU $RACE Elf] ]
-R:0:0x99/0x82
-?:[AND [EQU $CLASS Chaos-Warrior] [EQU $RACE Hobbit] ]
-R:0:0x99/0x83
-?:[AND [EQU $CLASS Chaos-Warrior] [EQU $RACE Gnome] ]
-R:0:0x99/0x84
-?:[AND [EQU $CLASS Chaos-Warrior] [EQU $RACE Dwarf] ]
-R:0:0x99/0x85
-?:[AND [EQU $CLASS Chaos-Warrior] [EQU $RACE Half-Orc] ]
-R:0:0x99/0x86
-?:[AND [EQU $CLASS Chaos-Warrior] [EQU $RACE Half-Troll] ]
-R:0:0x99/0x87
-?:[AND [EQU $CLASS Chaos-Warrior] [EQU $RACE Dunadan] ]
-R:0:0x99/0x88
-?:[AND [EQU $CLASS Chaos-Warrior] [EQU $RACE High-Elf] ]
-R:0:0x99/0x89
-?:[AND [EQU $CLASS Chaos-Warrior] [EQU $RACE Dunadan] ]
-R:0:0x99/0x8A
-?:[AND [EQU $CLASS Chaos-Warrior] [EQU $RACE Barbarian] ]
-R:0:0x99/0x8B
-?:[AND [EQU $CLASS Chaos-Warrior] [EQU $RACE Ogre] ]
-R:0:0x99/0x8C
-?:[AND [EQU $CLASS Chaos-Warrior] [EQU $RACE Half-Giant] ]
-R:0:0x99/0x8D
-?:[AND [EQU $CLASS Chaos-Warrior] [EQU $RACE Half-Titan] ]
-R:0:0x99/0x8E
-?:[AND [EQU $CLASS Chaos-Warrior] [EQU $RACE Cyclops] ]
-R:0:0x99/0x8F
-?:[AND [EQU $CLASS Chaos-Warrior] [EQU $RACE Yeek] ]
-R:0:0x99/0x90
-?:[AND [EQU $CLASS Chaos-Warrior] [EQU $RACE RohanKnight] ]
-R:0:0x99/0x91
-?:[AND [EQU $CLASS Chaos-Warrior] [EQU $RACE Kobold] ]
-R:0:0x99/0x92
-?:[AND [EQU $CLASS Chaos-Warrior] [EQU $RACE Nibelung] ]
-R:0:0x99/0x93
-?:[AND [EQU $CLASS Chaos-Warrior] [EQU $RACE Dark Elf] ]
-R:0:0x99/0x94
-?:[AND [EQU $CLASS Chaos-Warrior] [EQU $RACE Thunderlord] ]
-R:0:0x99/0x95
-?:[AND [EQU $CLASS Chaos-Warrior] [EQU $RACE Mindflayer] ]
-R:0:0x99/0x96
-?:[AND [EQU $CLASS Chaos-Warrior] [EQU $RACE Imp] ]
-R:0:0x99/0x97
-?:[AND [EQU $CLASS Chaos-Warrior] [EQU $RACE Ent] ]
-R:0:0x99/0x98
-?:[AND [EQU $CLASS Chaos-Warrior] [EQU $RACE Skeleton] ]
-R:0:0x99/0x99
-?:[AND [EQU $CLASS Chaos-Warrior] [EQU $RACE Zombie] ]
-R:0:0x99/0x9A
-?:[AND [EQU $CLASS Chaos-Warrior] [EQU $RACE Vampire] ]
-R:0:0x99/0x9B
-?:[AND [EQU $CLASS Chaos-Warrior] [EQU $RACE Spectre] ]
-R:0:0x99/0x9C
-?:[AND [EQU $CLASS Chaos-Warrior] [EQU $RACE Sprite] ]
-R:0:0x99/0x9D
-?:[AND [EQU $CLASS Chaos-Warrior] [EQU $RACE DeathMold] ]
-R:0:0x99/0x9E
-
-?:[AND [EQU $CLASS Monk] [EQU $RACE Human] ]
-R:0:0x9A/0x80
-?:[AND [EQU $CLASS Monk] [EQU $RACE Half-Elf] ]
-R:0:0x9A/0x81
-?:[AND [EQU $CLASS Monk] [EQU $RACE Elf] ]
-R:0:0x9A/0x82
-?:[AND [EQU $CLASS Monk] [EQU $RACE Hobbit] ]
-R:0:0x9A/0x83
-?:[AND [EQU $CLASS Monk] [EQU $RACE Gnome] ]
-R:0:0x9A/0x84
-?:[AND [EQU $CLASS Monk] [EQU $RACE Dwarf] ]
-R:0:0x9A/0x85
-?:[AND [EQU $CLASS Monk] [EQU $RACE Half-Orc] ]
-R:0:0x9A/0x86
-?:[AND [EQU $CLASS Monk] [EQU $RACE Half-Troll] ]
-R:0:0x9A/0x87
-?:[AND [EQU $CLASS Monk] [EQU $RACE Dunadan] ]
-R:0:0x9A/0x88
-?:[AND [EQU $CLASS Monk] [EQU $RACE High-Elf] ]
-R:0:0x9A/0x89
-?:[AND [EQU $CLASS Monk] [EQU $RACE Dunadan] ]
-R:0:0x9A/0x8A
-?:[AND [EQU $CLASS Monk] [EQU $RACE Barbarian] ]
-R:0:0x9A/0x8B
-?:[AND [EQU $CLASS Monk] [EQU $RACE Ogre] ]
-R:0:0x9A/0x8C
-?:[AND [EQU $CLASS Monk] [EQU $RACE Half-Giant] ]
-R:0:0x9A/0x8D
-?:[AND [EQU $CLASS Monk] [EQU $RACE Half-Titan] ]
-R:0:0x9A/0x8E
-?:[AND [EQU $CLASS Monk] [EQU $RACE Cyclops] ]
-R:0:0x9A/0x8F
-?:[AND [EQU $CLASS Monk] [EQU $RACE Yeek] ]
-R:0:0x9A/0x90
-?:[AND [EQU $CLASS Monk] [EQU $RACE RohanKnight] ]
-R:0:0x9A/0x91
-?:[AND [EQU $CLASS Monk] [EQU $RACE Kobold] ]
-R:0:0x9A/0x92
-?:[AND [EQU $CLASS Monk] [EQU $RACE Nibelung] ]
-R:0:0x9A/0x93
-?:[AND [EQU $CLASS Monk] [EQU $RACE Dark Elf] ]
-R:0:0x9A/0x94
-?:[AND [EQU $CLASS Monk] [EQU $RACE Thunderlord] ]
-R:0:0x9A/0x95
-?:[AND [EQU $CLASS Monk] [EQU $RACE Mindflayer] ]
-R:0:0x9A/0x96
-?:[AND [EQU $CLASS Monk] [EQU $RACE Imp] ]
-R:0:0x9A/0x97
-?:[AND [EQU $CLASS Monk] [EQU $RACE Ent] ]
-R:0:0x9A/0x98
-?:[AND [EQU $CLASS Monk] [EQU $RACE Skeleton] ]
-R:0:0x9A/0x99
-?:[AND [EQU $CLASS Monk] [EQU $RACE Zombie] ]
-R:0:0x9A/0x9A
-?:[AND [EQU $CLASS Monk] [EQU $RACE Vampire] ]
-R:0:0x9A/0x9B
-?:[AND [EQU $CLASS Monk] [EQU $RACE Spectre] ]
-R:0:0x9A/0x9C
-?:[AND [EQU $CLASS Monk] [EQU $RACE Sprite] ]
-R:0:0x9A/0x9D
-?:[AND [EQU $CLASS Monk] [EQU $RACE DeathMold] ]
-R:0:0x9A/0x9E
-
-?:[AND [EQU $CLASS Mindcrafter] [EQU $RACE Human] ]
-R:0:0x9B/0x80
-?:[AND [EQU $CLASS Mindcrafter] [EQU $RACE Half-Elf] ]
-R:0:0x9B/0x81
-?:[AND [EQU $CLASS Mindcrafter] [EQU $RACE Elf] ]
-R:0:0x9B/0x82
-?:[AND [EQU $CLASS Mindcrafter] [EQU $RACE Hobbit] ]
-R:0:0x9B/0x83
-?:[AND [EQU $CLASS Mindcrafter] [EQU $RACE Gnome] ]
-R:0:0x9B/0x84
-?:[AND [EQU $CLASS Mindcrafter] [EQU $RACE Dwarf] ]
-R:0:0x9B/0x85
-?:[AND [EQU $CLASS Mindcrafter] [EQU $RACE Half-Orc] ]
-R:0:0x9B/0x86
-?:[AND [EQU $CLASS Mindcrafter] [EQU $RACE Half-Troll] ]
-R:0:0x9B/0x87
-?:[AND [EQU $CLASS Mindcrafter] [EQU $RACE Dunadan] ]
-R:0:0x9B/0x88
-?:[AND [EQU $CLASS Mindcrafter] [EQU $RACE High-Elf] ]
-R:0:0x9B/0x89
-?:[AND [EQU $CLASS Mindcrafter] [EQU $RACE Dunadan] ]
-R:0:0x9B/0x8A
-?:[AND [EQU $CLASS Mindcrafter] [EQU $RACE Barbarian] ]
-R:0:0x9B/0x8B
-?:[AND [EQU $CLASS Mindcrafter] [EQU $RACE Ogre] ]
-R:0:0x9B/0x8C
-?:[AND [EQU $CLASS Mindcrafter] [EQU $RACE Half-Giant] ]
-R:0:0x9B/0x8D
-?:[AND [EQU $CLASS Mindcrafter] [EQU $RACE Half-Titan] ]
-R:0:0x9B/0x8E
-?:[AND [EQU $CLASS Mindcrafter] [EQU $RACE Cyclops] ]
-R:0:0x9B/0x8F
-?:[AND [EQU $CLASS Mindcrafter] [EQU $RACE Yeek] ]
-R:0:0x9B/0x90
-?:[AND [EQU $CLASS Mindcrafter] [EQU $RACE RohanKnight] ]
-R:0:0x9B/0x91
-?:[AND [EQU $CLASS Mindcrafter] [EQU $RACE Kobold] ]
-R:0:0x9B/0x92
-?:[AND [EQU $CLASS Mindcrafter] [EQU $RACE Nibelung] ]
-R:0:0x9B/0x93
-?:[AND [EQU $CLASS Mindcrafter] [EQU $RACE Dark Elf] ]
-R:0:0x9B/0x94
-?:[AND [EQU $CLASS Mindcrafter] [EQU $RACE Thunderlord] ]
-R:0:0x9B/0x95
-?:[AND [EQU $CLASS Mindcrafter] [EQU $RACE Mindflayer] ]
-R:0:0x9B/0x96
-?:[AND [EQU $CLASS Mindcrafter] [EQU $RACE Imp] ]
-R:0:0x9B/0x97
-?:[AND [EQU $CLASS Mindcrafter] [EQU $RACE Ent] ]
-R:0:0x9B/0x98
-?:[AND [EQU $CLASS Mindcrafter] [EQU $RACE Skeleton] ]
-R:0:0x9B/0x99
-?:[AND [EQU $CLASS Mindcrafter] [EQU $RACE Zombie] ]
-R:0:0x9B/0x9A
-?:[AND [EQU $CLASS Mindcrafter] [EQU $RACE Vampire] ]
-R:0:0x9B/0x9B
-?:[AND [EQU $CLASS Mindcrafter] [EQU $RACE Spectre] ]
-R:0:0x9B/0x9C
-?:[AND [EQU $CLASS Mindcrafter] [EQU $RACE Sprite] ]
-R:0:0x9B/0x9D
-?:[AND [EQU $CLASS Mindcrafter] [EQU $RACE DeathMold] ]
-R:0:0x9B/0x9E
-
-?:[AND [EQU $CLASS High-Mage] [EQU $RACE Human] ]
-R:0:0x9C/0x80
-?:[AND [EQU $CLASS High-Mage] [EQU $RACE Half-Elf] ]
-R:0:0x9C/0x81
-?:[AND [EQU $CLASS High-Mage] [EQU $RACE Elf] ]
-R:0:0x9C/0x82
-?:[AND [EQU $CLASS High-Mage] [EQU $RACE Hobbit] ]
-R:0:0x9C/0x83
-?:[AND [EQU $CLASS High-Mage] [EQU $RACE Gnome] ]
-R:0:0x9C/0x84
-?:[AND [EQU $CLASS High-Mage] [EQU $RACE Dwarf] ]
-R:0:0x9C/0x85
-?:[AND [EQU $CLASS High-Mage] [EQU $RACE Half-Orc] ]
-R:0:0x9C/0x86
-?:[AND [EQU $CLASS High-Mage] [EQU $RACE Half-Troll] ]
-R:0:0x9C/0x87
-?:[AND [EQU $CLASS High-Mage] [EQU $RACE Dunadan] ]
-R:0:0x9C/0x88
-?:[AND [EQU $CLASS High-Mage] [EQU $RACE High-Elf] ]
-R:0:0x9C/0x89
-?:[AND [EQU $CLASS High-Mage] [EQU $RACE Dunadan] ]
-R:0:0x9C/0x8A
-?:[AND [EQU $CLASS High-Mage] [EQU $RACE Barbarian] ]
-R:0:0x9C/0x8B
-?:[AND [EQU $CLASS High-Mage] [EQU $RACE Ogre] ]
-R:0:0x9C/0x8C
-?:[AND [EQU $CLASS High-Mage] [EQU $RACE Half-Giant] ]
-R:0:0x9C/0x8D
-?:[AND [EQU $CLASS High-Mage] [EQU $RACE Half-Titan] ]
-R:0:0x9C/0x8E
-?:[AND [EQU $CLASS High-Mage] [EQU $RACE Cyclops] ]
-R:0:0x9C/0x8F
-?:[AND [EQU $CLASS High-Mage] [EQU $RACE Yeek] ]
-R:0:0x9C/0x90
-?:[AND [EQU $CLASS High-Mage] [EQU $RACE RohanKnight] ]
-R:0:0x9C/0x91
-?:[AND [EQU $CLASS High-Mage] [EQU $RACE Kobold] ]
-R:0:0x9C/0x92
-?:[AND [EQU $CLASS High-Mage] [EQU $RACE Nibelung] ]
-R:0:0x9C/0x93
-?:[AND [EQU $CLASS High-Mage] [EQU $RACE Dark Elf] ]
-R:0:0x9C/0x94
-?:[AND [EQU $CLASS High-Mage] [EQU $RACE Thunderlord] ]
-R:0:0x9C/0x95
-?:[AND [EQU $CLASS High-Mage] [EQU $RACE Mindflayer] ]
-R:0:0x9C/0x96
-?:[AND [EQU $CLASS High-Mage] [EQU $RACE Imp] ]
-R:0:0x9C/0x97
-?:[AND [EQU $CLASS High-Mage] [EQU $RACE Ent] ]
-R:0:0x9C/0x98
-?:[AND [EQU $CLASS High-Mage] [EQU $RACE Skeleton] ]
-R:0:0x9C/0x99
-?:[AND [EQU $CLASS High-Mage] [EQU $RACE Zombie] ]
-R:0:0x9C/0x9A
-?:[AND [EQU $CLASS High-Mage] [EQU $RACE Vampire] ]
-R:0:0x9C/0x9B
-?:[AND [EQU $CLASS High-Mage] [EQU $RACE Spectre] ]
-R:0:0x9C/0x9C
-?:[AND [EQU $CLASS High-Mage] [EQU $RACE Sprite] ]
-R:0:0x9C/0x9D
-?:[AND [EQU $CLASS High-Mage] [EQU $RACE DeathMold] ]
-R:0:0x9C/0x9E
-
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Human] ]
-R:0:0x9C/0x80
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Half-Elf] ]
-R:0:0x9C/0x81
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Elf] ]
-R:0:0x9C/0x82
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Hobbit] ]
-R:0:0x9C/0x83
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Gnome] ]
-R:0:0x9C/0x84
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Dwarf] ]
-R:0:0x9C/0x85
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Half-Orc] ]
-R:0:0x9C/0x86
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Half-Troll] ]
-R:0:0x9C/0x87
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Dunadan] ]
-R:0:0x9C/0x88
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE High-Elf] ]
-R:0:0x9C/0x89
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Dunadan] ]
-R:0:0x9C/0x8A
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Barbarian] ]
-R:0:0x9C/0x8B
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Ogre] ]
-R:0:0x9C/0x8C
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Half-Giant] ]
-R:0:0x9C/0x8D
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Half-Titan] ]
-R:0:0x9C/0x8E
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Cyclops] ]
-R:0:0x9C/0x8F
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Yeek] ]
-R:0:0x9C/0x90
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE RohanKnight] ]
-R:0:0x9C/0x91
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Kobold] ]
-R:0:0x9C/0x92
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Nibelung] ]
-R:0:0x9C/0x93
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Dark Elf] ]
-R:0:0x9C/0x94
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Thunderlord] ]
-R:0:0x9C/0x95
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Mindflayer] ]
-R:0:0x9C/0x96
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Imp] ]
-R:0:0x9C/0x97
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Ent] ]
-R:0:0x9C/0x98
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Skeleton] ]
-R:0:0x9C/0x99
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Zombie] ]
-R:0:0x9C/0x9A
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Vampire] ]
-R:0:0x9C/0x9B
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Spectre] ]
-R:0:0x9C/0x9C
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Sprite] ]
-R:0:0x9C/0x9D
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE DeathMold] ]
-R:0:0x9C/0x9E
-
-?:[AND [EQU $CLASS BeastMaster] [EQU $RACE Human] ]
-R:0:0x96/0x80
-?:[AND [EQU $CLASS BeastMaster] [EQU $RACE Half-Elf] ]
-R:0:0x96/0x81
-?:[AND [EQU $CLASS BeastMaster] [EQU $RACE Elf] ]
-R:0:0x96/0x82
-?:[AND [EQU $CLASS BeastMaster] [EQU $RACE Hobbit] ]
-R:0:0x96/0x83
-?:[AND [EQU $CLASS BeastMaster] [EQU $RACE Gnome] ]
-R:0:0x96/0x84
-?:[AND [EQU $CLASS BeastMaster] [EQU $RACE Dwarf] ]
-R:0:0x96/0x85
-?:[AND [EQU $CLASS BeastMaster] [EQU $RACE Half-Orc] ]
-R:0:0x96/0x86
-?:[AND [EQU $CLASS BeastMaster] [EQU $RACE Half-Troll] ]
-R:0:0x96/0x87
-?:[AND [EQU $CLASS BeastMaster] [EQU $RACE Dunadan] ]
-R:0:0x96/0x88
-?:[AND [EQU $CLASS BeastMaster] [EQU $RACE High-Elf] ]
-R:0:0x96/0x89
-?:[AND [EQU $CLASS BeastMaster] [EQU $RACE Dunadan] ]
-R:0:0x96/0x8A
-?:[AND [EQU $CLASS BeastMaster] [EQU $RACE Barbarian] ]
-R:0:0x96/0x8B
-?:[AND [EQU $CLASS BeastMaster] [EQU $RACE Ogre] ]
-R:0:0x96/0x8C
-?:[AND [EQU $CLASS BeastMaster] [EQU $RACE Half-Giant] ]
-R:0:0x96/0x8D
-?:[AND [EQU $CLASS BeastMaster] [EQU $RACE Half-Titan] ]
-R:0:0x96/0x8E
-?:[AND [EQU $CLASS BeastMaster] [EQU $RACE Cyclops] ]
-R:0:0x96/0x8F
-?:[AND [EQU $CLASS BeastMaster] [EQU $RACE Yeek] ]
-R:0:0x96/0x90
-?:[AND [EQU $CLASS BeastMaster] [EQU $RACE RohanKnight] ]
-R:0:0x96/0x91
-?:[AND [EQU $CLASS BeastMaster] [EQU $RACE Kobold] ]
-R:0:0x96/0x92
-?:[AND [EQU $CLASS BeastMaster] [EQU $RACE Nibelung] ]
-R:0:0x96/0x93
-?:[AND [EQU $CLASS BeastMaster] [EQU $RACE Dark Elf] ]
-R:0:0x96/0x94
-?:[AND [EQU $CLASS BeastMaster] [EQU $RACE Thunderlord] ]
-R:0:0x96/0x95
-?:[AND [EQU $CLASS BeastMaster] [EQU $RACE Mindflayer] ]
-R:0:0x96/0x96
-?:[AND [EQU $CLASS BeastMaster] [EQU $RACE Imp] ]
-R:0:0x96/0x97
-?:[AND [EQU $CLASS BeastMaster] [EQU $RACE Ent] ]
-R:0:0x96/0x98
-?:[AND [EQU $CLASS BeastMaster] [EQU $RACE Skeleton] ]
-R:0:0x96/0x99
-?:[AND [EQU $CLASS BeastMaster] [EQU $RACE Zombie] ]
-R:0:0x96/0x9A
-?:[AND [EQU $CLASS BeastMaster] [EQU $RACE Vampire] ]
-R:0:0x96/0x9B
-?:[AND [EQU $CLASS BeastMaster] [EQU $RACE Spectre] ]
-R:0:0x96/0x9C
-?:[AND [EQU $CLASS BeastMaster] [EQU $RACE Sprite] ]
-R:0:0x96/0x9D
-?:[AND [EQU $CLASS BeastMaster] [EQU $RACE DeathMold] ]
-R:0:0x96/0x9E
-
-?:[EQU $CLASS Mimic]
-R:0:0x91/0x95
-
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Human] ]
-R:0:0x93/0x80
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Half-Elf] ]
-R:0:0x93/0x81
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Elf] ]
-R:0:0x93/0x82
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Hobbit] ]
-R:0:0x93/0x83
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Gnome] ]
-R:0:0x93/0x84
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Dwarf] ]
-R:0:0x93/0x85
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Half-Orc] ]
-R:0:0x93/0x86
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Half-Troll] ]
-R:0:0x93/0x87
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Dunadan] ]
-R:0:0x93/0x88
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE High-Elf] ]
-R:0:0x93/0x89
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Dunadan] ]
-R:0:0x93/0x8A
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Barbarian] ]
-R:0:0x93/0x8B
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Ogre] ]
-R:0:0x93/0x8C
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Half-Giant] ]
-R:0:0x93/0x8D
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Half-Titan] ]
-R:0:0x93/0x8E
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Cyclops] ]
-R:0:0x93/0x8F
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Yeek] ]
-R:0:0x93/0x90
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE RohanKnight] ]
-R:0:0x93/0x91
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Kobold] ]
-R:0:0x93/0x92
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Nibelung] ]
-R:0:0x93/0x93
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Dark Elf] ]
-R:0:0x93/0x94
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Thunderlord] ]
-R:0:0x93/0x95
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Mindflayer] ]
-R:0:0x93/0x96
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Imp] ]
-R:0:0x93/0x97
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Ent] ]
-R:0:0x93/0x98
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Skeleton] ]
-R:0:0x93/0x99
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Zombie] ]
-R:0:0x93/0x9A
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Vampire] ]
-R:0:0x93/0x9B
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Spectre] ]
-R:0:0x93/0x9C
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE Sprite] ]
-R:0:0x93/0x9D
-?:[AND [EQU $CLASS Alchemist] [EQU $RACE DeathMold] ]
-R:0:0x93/0x9E
-
-?:[AND [EQU $CLASS Wizard] [EQU $RACE Human] ]
-R:0:0x93/0x80
-?:[AND [EQU $CLASS Wizard] [EQU $RACE Half-Elf] ]
-R:0:0x93/0x81
-?:[AND [EQU $CLASS Wizard] [EQU $RACE Elf] ]
-R:0:0x93/0x82
-?:[AND [EQU $CLASS Wizard] [EQU $RACE Hobbit] ]
-R:0:0x93/0x83
-?:[AND [EQU $CLASS Wizard] [EQU $RACE Gnome] ]
-R:0:0x93/0x84
-?:[AND [EQU $CLASS Wizard] [EQU $RACE Dwarf] ]
-R:0:0x93/0x85
-?:[AND [EQU $CLASS Wizard] [EQU $RACE Half-Orc] ]
-R:0:0x93/0x86
-?:[AND [EQU $CLASS Wizard] [EQU $RACE Half-Troll] ]
-R:0:0x93/0x87
-?:[AND [EQU $CLASS Wizard] [EQU $RACE Dunadan] ]
-R:0:0x93/0x88
-?:[AND [EQU $CLASS Wizard] [EQU $RACE High-Elf] ]
-R:0:0x93/0x89
-?:[AND [EQU $CLASS Wizard] [EQU $RACE Dunadan] ]
-R:0:0x93/0x8A
-?:[AND [EQU $CLASS Wizard] [EQU $RACE Barbarian] ]
-R:0:0x93/0x8B
-?:[AND [EQU $CLASS Wizard] [EQU $RACE Ogre] ]
-R:0:0x93/0x8C
-?:[AND [EQU $CLASS Wizard] [EQU $RACE Half-Giant] ]
-R:0:0x93/0x8D
-?:[AND [EQU $CLASS Wizard] [EQU $RACE Half-Titan] ]
-R:0:0x93/0x8E
-?:[AND [EQU $CLASS Wizard] [EQU $RACE Cyclops] ]
-R:0:0x93/0x8F
-?:[AND [EQU $CLASS Wizard] [EQU $RACE Yeek] ]
-R:0:0x93/0x90
-?:[AND [EQU $CLASS Wizard] [EQU $RACE RohanKnight] ]
-R:0:0x93/0x91
-?:[AND [EQU $CLASS Wizard] [EQU $RACE Kobold] ]
-R:0:0x93/0x92
-?:[AND [EQU $CLASS Wizard] [EQU $RACE Nibelung] ]
-R:0:0x93/0x93
-?:[AND [EQU $CLASS Wizard] [EQU $RACE Dark Elf] ]
-R:0:0x93/0x94
-?:[AND [EQU $CLASS Wizard] [EQU $RACE Thunderlord] ]
-R:0:0x93/0x95
-?:[AND [EQU $CLASS Wizard] [EQU $RACE Mindflayer] ]
-R:0:0x93/0x96
-?:[AND [EQU $CLASS Wizard] [EQU $RACE Imp] ]
-R:0:0x93/0x97
-?:[AND [EQU $CLASS Wizard] [EQU $RACE Ent] ]
-R:0:0x93/0x98
-?:[AND [EQU $CLASS Wizard] [EQU $RACE Skeleton] ]
-R:0:0x93/0x99
-?:[AND [EQU $CLASS Wizard] [EQU $RACE Zombie] ]
-R:0:0x93/0x9A
-?:[AND [EQU $CLASS Wizard] [EQU $RACE Vampire] ]
-R:0:0x93/0x9B
-?:[AND [EQU $CLASS Wizard] [EQU $RACE Spectre] ]
-R:0:0x93/0x9C
-?:[AND [EQU $CLASS Wizard] [EQU $RACE Sprite] ]
-R:0:0x93/0x9D
-?:[AND [EQU $CLASS Wizard] [EQU $RACE DeathMold] ]
-R:0:0x93/0x9E
-
-?:[AND [EQU $CLASS Prior] [EQU $RACE Human] ]
-R:0:0x94/0x80
-?:[AND [EQU $CLASS Prior] [EQU $RACE Half-Elf] ]
-R:0:0x94/0x81
-?:[AND [EQU $CLASS Prior] [EQU $RACE Elf] ]
-R:0:0x94/0x82
-?:[AND [EQU $CLASS Prior] [EQU $RACE Hobbit] ]
-R:0:0x94/0x83
-?:[AND [EQU $CLASS Prior] [EQU $RACE Gnome] ]
-R:0:0x94/0x84
-?:[AND [EQU $CLASS Prior] [EQU $RACE Dwarf] ]
-R:0:0x94/0x85
-?:[AND [EQU $CLASS Prior] [EQU $RACE Half-Orc] ]
-R:0:0x94/0x86
-?:[AND [EQU $CLASS Prior] [EQU $RACE Half-Troll] ]
-R:0:0x94/0x87
-?:[AND [EQU $CLASS Prior] [EQU $RACE Dunadan] ]
-R:0:0x94/0x88
-?:[AND [EQU $CLASS Prior] [EQU $RACE High-Elf] ]
-R:0:0x94/0x89
-?:[AND [EQU $CLASS Prior] [EQU $RACE Dunadan] ]
-R:0:0x94/0x8A
-?:[AND [EQU $CLASS Prior] [EQU $RACE Barbarian] ]
-R:0:0x94/0x8B
-?:[AND [EQU $CLASS Prior] [EQU $RACE Ogre] ]
-R:0:0x94/0x8C
-?:[AND [EQU $CLASS Prior] [EQU $RACE Half-Giant] ]
-R:0:0x94/0x8D
-?:[AND [EQU $CLASS Prior] [EQU $RACE Half-Titan] ]
-R:0:0x94/0x8E
-?:[AND [EQU $CLASS Prior] [EQU $RACE Cyclops] ]
-R:0:0x94/0x8F
-?:[AND [EQU $CLASS Prior] [EQU $RACE Yeek] ]
-R:0:0x94/0x90
-?:[AND [EQU $CLASS Prior] [EQU $RACE RohanKnight] ]
-R:0:0x94/0x91
-?:[AND [EQU $CLASS Prior] [EQU $RACE Kobold] ]
-R:0:0x94/0x92
-?:[AND [EQU $CLASS Prior] [EQU $RACE Nibelung] ]
-R:0:0x94/0x93
-?:[AND [EQU $CLASS Prior] [EQU $RACE Dark Elf] ]
-R:0:0x94/0x94
-?:[AND [EQU $CLASS Prior] [EQU $RACE Thunderlord] ]
-R:0:0x94/0x95
-?:[AND [EQU $CLASS Prior] [EQU $RACE Mindflayer] ]
-R:0:0x94/0x96
-?:[AND [EQU $CLASS Prior] [EQU $RACE Imp] ]
-R:0:0x94/0x97
-?:[AND [EQU $CLASS Prior] [EQU $RACE Ent] ]
-R:0:0x94/0x98
-?:[AND [EQU $CLASS Prior] [EQU $RACE Skeleton] ]
-R:0:0x94/0x99
-?:[AND [EQU $CLASS Prior] [EQU $RACE Zombie] ]
-R:0:0x94/0x9A
-?:[AND [EQU $CLASS Prior] [EQU $RACE Vampire] ]
-R:0:0x94/0x9B
-?:[AND [EQU $CLASS Prior] [EQU $RACE Spectre] ]
-R:0:0x94/0x9C
-?:[AND [EQU $CLASS Prior] [EQU $RACE Sprite] ]
-R:0:0x94/0x9D
-?:[AND [EQU $CLASS Prior] [EQU $RACE DeathMold] ]
-R:0:0x94/0x9E
-
-?:[AND [EQU $CLASS Possessor] [EQU $RACE Human] ]
-R:0:0x92/0x80
-?:[AND [EQU $CLASS Possessor] [EQU $RACE Half-Elf] ]
-R:0:0x92/0x81
-?:[AND [EQU $CLASS Possessor] [EQU $RACE Elf] ]
-R:0:0x92/0x82
-?:[AND [EQU $CLASS Possessor] [EQU $RACE Hobbit] ]
-R:0:0x92/0x83
-?:[AND [EQU $CLASS Possessor] [EQU $RACE Gnome] ]
-R:0:0x92/0x84
-?:[AND [EQU $CLASS Possessor] [EQU $RACE Dwarf] ]
-R:0:0x92/0x85
-?:[AND [EQU $CLASS Possessor] [EQU $RACE Half-Orc] ]
-R:0:0x92/0x86
-?:[AND [EQU $CLASS Possessor] [EQU $RACE Half-Troll] ]
-R:0:0x92/0x87
-?:[AND [EQU $CLASS Possessor] [EQU $RACE Dunadan] ]
-R:0:0x92/0x88
-?:[AND [EQU $CLASS Possessor] [EQU $RACE High-Elf] ]
-R:0:0x92/0x89
-?:[AND [EQU $CLASS Possessor] [EQU $RACE Dunadan] ]
-R:0:0x92/0x8A
-?:[AND [EQU $CLASS Possessor] [EQU $RACE Barbarian] ]
-R:0:0x92/0x8B
-?:[AND [EQU $CLASS Possessor] [EQU $RACE Ogre] ]
-R:0:0x92/0x8C
-?:[AND [EQU $CLASS Possessor] [EQU $RACE Half-Giant] ]
-R:0:0x92/0x8D
-?:[AND [EQU $CLASS Possessor] [EQU $RACE Half-Titan] ]
-R:0:0x92/0x8E
-?:[AND [EQU $CLASS Possessor] [EQU $RACE Kobold] ]
-R:0:0x92/0x92
-?:[AND [EQU $CLASS Possessor] [EQU $RACE Nibelung] ]
-R:0:0x92/0x93
-?:[AND [EQU $CLASS Possessor] [EQU $RACE Dark Elf] ]
-R:0:0x92/0x94
-?:[AND [EQU $CLASS Possessor] [EQU $RACE RohanKnight] ]
-R:0:0x93/0x91
-?:[AND [EQU $CLASS Possessor] [EQU $RACE Thunderlord] ]
-R:0:0x92/0x95
-?:[AND [EQU $CLASS Possessor] [EQU $RACE Mindflayer] ]
-R:0:0x92/0x96
-?:[AND [EQU $CLASS Possessor] [EQU $RACE Imp] ]
-R:0:0x92/0x97
-?:[AND [EQU $CLASS Possessor] [EQU $RACE Ent] ]
-R:0:0x92/0x98
-?:[AND [EQU $CLASS Possessor] [EQU $RACE Skeleton] ]
-R:0:0x92/0x99
-?:[AND [EQU $CLASS Possessor] [EQU $RACE Zombie] ]
-R:0:0x92/0x9A
-?:[AND [EQU $CLASS Possessor] [EQU $RACE Vampire] ]
-R:0:0x92/0x9B
-?:[AND [EQU $CLASS Possessor] [EQU $RACE Spectre] ]
-R:0:0x92/0x9C
-?:[AND [EQU $CLASS Possessor] [EQU $RACE Sprite] ]
-R:0:0x92/0x9D
-?:[AND [EQU $CLASS Possessor] [EQU $RACE DeathMold] ]
-R:0:0x92/0x9E
-
diff --git a/lib/scpt/.cvsignore b/lib/scpt/.cvsignore
deleted file mode 100644
index 908e5b42..00000000
--- a/lib/scpt/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-debug.lua
diff --git a/lib/scpt/bounty.lua b/lib/scpt/bounty.lua
deleted file mode 100644
index 94c15598..00000000
--- a/lib/scpt/bounty.lua
+++ /dev/null
@@ -1,90 +0,0 @@
--- The bounty quest! bring back corpses to increase your monster lore skill
-
-add_quest
-{
-	["global"] =    "BOUNTY_QUEST",
-	["name"] =      "Bounty quest",
-	["desc"] =      function()
-		if quest(BOUNTY_QUEST).status == QUEST_STATUS_TAKEN then
-			print_hook("#####yBounty quest!\n")
-			print_hook("You must bring back "..monster_race_desc(bounty_quest_monster, 0).." corpse to the beastmaster.\n")
-			print_hook("\n")
-		end
-	end,
-	["level"] =     -1,
-	["data"] =      {
-			["bounty_quest_monster"] = 0,
-	},
-	["hooks"] =     {
-		-- Start the game without the quest, need to request it
-		[HOOK_BIRTH_OBJECTS] = function()
-			quest(BOUNTY_QUEST).status = QUEST_STATUS_UNTAKEN
-		end,
-	},
-}
-
-add_building_action
-{
-	-- Index is used in ba_info.txt to set the actions
-	["index"] =     54,
-	["action"] =    function()
-		if quest(BOUNTY_QUEST).status == QUEST_STATUS_UNTAKEN then
-			quest(BOUNTY_QUEST).status = QUEST_STATUS_TAKEN
-			bounty_quest_monster = get_new_bounty_monster(3 + ((player.lev * 3) / 2))
-
-			msg_print("You must bring me back "..monster_race_desc(bounty_quest_monster, 0).." corpse.")
-		else
-			msg_print("You still must bring me back "..monster_race_desc(bounty_quest_monster, 0).." corpse.")
-		end
-	end
-}
-
-add_building_action
-{
-	-- Index is used in ba_info.txt to set the actions
-	["index"] =     55,
-	["action"] =    function()
-		if quest(BOUNTY_QUEST).status == QUEST_STATUS_TAKEN then
-			local ret, item
-	
-			-- Ask for an item
-			ret, item = get_item("What corpse to return?",
-					     "You have no corpse to return.",
-					     bor(USE_INVEN),
-					     function (obj)
-					     	if (obj.tval == TV_CORPSE) and (obj.pval2 == bounty_quest_monster) then
-							return TRUE
-						end
-						return FALSE
-					     end
-			)
-
-			-- Ok we got the corpse!
-			if ret == TRUE then
-				-- Take the corpse from the inventory
-				inven_item_increase(item, -1)
-				inven_item_optimize(item)
-
-				msg_print("Ah well done adventurer!")
-				msg_print("As a reward I will teach you a bit of monster lore.")
-
-				if skill(SKILL_LORE).mod == 0 then
-					skill(SKILL_LORE).mod = 900
-					skill(SKILL_LORE).dev = TRUE
-				end
-				skill(SKILL_LORE).value = skill(SKILL_LORE).value + skill(SKILL_LORE).mod
-				if skill(SKILL_PRESERVATION).mod == 0 then
-					skill(SKILL_PRESERVATION).value = 800
-					skill(SKILL_PRESERVATION).mod = 800
-					skill(SKILL_PRESERVATION).dev = TRUE
-					msg_print("I see you don't know the corpse preservation skill, I shall teach you it too.")
-				end
-
-				quest(BOUNTY_QUEST).status = QUEST_STATUS_UNTAKEN
-				bounty_quest_monster = 0
-			end
-		else
-			msg_print("You do not have any bounty quest yet.")
-		end
-	end
-}
diff --git a/lib/scpt/corrupt.lua b/lib/scpt/corrupt.lua
deleted file mode 100644
index 550f8bc0..00000000
--- a/lib/scpt/corrupt.lua
+++ /dev/null
@@ -1,433 +0,0 @@
--- Definition of the corruptions
-
--- The Balrog corruptions
-CORRUPT_BALROG_AURA = add_corruption
-{
-	["color"]       = TERM_ORANGE,
-	["name"]	= "Balrog Aura",
-	["get_text"]    = "A corrupted wall of flames surrounds you.",
-	["lose_text"]   = "The wall of corrupted flames abandons you.",
-	["desc"]	=
-	{
-			  "  Surrounds you with a fiery aura",
-			  "  But it can burn scrolls when you read them"
-	},
-	["hooks"]       =
-	{
-		[HOOK_CALC_BONUS] = function()
-			player.xtra_f3 = bor(player.xtra_f3, TR3_SH_FIRE)
-			player.xtra_f3 = bor(player.xtra_f3, TR3_LITE1)
-		end,
-		[HOOK_READ] = function(obj)
-			if magik(5) == TRUE then
-				msg_print("Your demon aura burns the scroll before you read it!")
-				return TRUE, TRUE, FALSE
-			else
-				return FALSE
-			end
-		end,
-	},
-}
-
-CORRUPT_BALROG_WINGS = add_corruption
-{
-	["color"]       = TERM_ORANGE,
-	["name"]	= "Balrog Wings",
-	["get_text"]    = "Wings of shadow grow in your back.",
-	["lose_text"]   = "The wings in your back fall apart.",
-	["desc"]	=
-	{
-			  "  Creates ugly, but working, wings allowing you to fly",
-			  "  But it reduces charisma by 4 and dexterity by 2"
-	},
-	["hooks"]       =
-	{
-		[HOOK_CALC_BONUS] = function()
-			player.xtra_f4 = bor(player.xtra_f4, TR4_FLY)
-			player.modify_stat(A_CHR, -4)
-			player.modify_stat(A_DEX, -2)
-		end,
-	},
-}
-
-CORRUPT_BALROG_STRENGTH = add_corruption
-{
-	["color"]       = TERM_ORANGE,
-	["name"]	= "Balrog Strength",
-	["get_text"]    = "Your muscles get unnatural strength.",
-	["lose_text"]   = "Your muscles get weaker again.",
-	["desc"]	=
-	{
-			  "  Provides 3 strength and 1 constitution",
-			  "  But it reduces charisma by 1 and dexterity by 3"
-	},
-	["hooks"]       =
-	{
-		[HOOK_CALC_BONUS] = function()
-			player.modify_stat(A_STR, 3)
-			player.modify_stat(A_CON, 1)
-			player.modify_stat(A_DEX, -3)
-			player.modify_stat(A_CHR, -1)
-		end,
-	},
-}
-
-CORRUPT_BALROG_FORM = add_corruption
-{
-	["color"]       = TERM_YELLOW,
-	["name"]	= "Balrog Form",
-	["get_text"]    = "You feel the might of a Balrog inside you.",
-	["lose_text"]   = "The presence of the Balrog seems to abandon you.",
-	["desc"]	=
-	{
-			  "  Allows you to turn into a Balrog at will",
-			  "  You need Balrog Wings, Balrog Aura and Balrog Strength to activate it"
-	},
-	["depends"]     =
-	{
-			[CORRUPT_BALROG_AURA] = TRUE,
-			[CORRUPT_BALROG_WINGS] = TRUE,
-			[CORRUPT_BALROG_STRENGTH] = TRUE
-	},
-	["hooks"]       =
-	{
-		[HOOK_CALC_POWERS] = function()
-			player.add_power(PWR_BALROG)
-		end,
-	},
-}
-
-
--- The Demon corruptions
-CORRUPT_DEMON_SPIRIT = add_corruption
-{
-	["color"]       = TERM_RED,
-	["name"]	= "Demon Spirit",
-	["get_text"]    = "Your spirit opens to corrupted thoughts.",
-	["lose_text"]   = "Your spirit closes again to the corrupted thoughts.",
-	["desc"]	=
-	{
-			  "  Increases your intelligence by 1",
-			  "  But reduce your charisma by 2",
-	},
-	["hooks"]       =
-	{
-		[HOOK_CALC_BONUS] = function()
-			player.modify_stat(A_INT, 1)
-			player.modify_stat(A_CHR, -2)
-		end,
-	},
-}
-
-CORRUPT_DEMON_HIDE = add_corruption
-{
-	["color"]       = TERM_RED,
-	["name"]	= "Demon Hide",
-	["get_text"]    = "Your skin grows into a thick hide.",
-	["lose_text"]   = "Your skin returns to a natural state.",
-	["desc"]	=
-	{
-			  "  Increases your armour class by your level",
-			  "  Provides immunity to fire at level 40",
-			  "  But reduces speed by your level / 7",
-	},
-	["hooks"]       =
-	{
-		[HOOK_CALC_BONUS] = function()
-			player.to_a = player.to_a + player.lev
-			player.dis_to_a = player.dis_to_a + player.lev
-			player.pspeed = player.pspeed - (player.lev / 7)
-			if player.lev >= 40 then player.xtra_f2 = bor(player.xtra_f2, TR2_IM_FIRE) end
-		end,
-	},
-}
-
-CORRUPT_DEMON_BREATH = add_corruption
-{
-	["color"]       = TERM_RED,
-	["name"]	= "Demon Breath",
-	["get_text"]    = "Your breath becomes mephitic.",
-	["lose_text"]   = "Your breath is once again normal.",
-	["desc"]	=
-	{
-			  "  Provides fire breath",
-			  "  But gives a small chance to spoil potions when you quaff them",
-	},
-	["hooks"]       =
-	{
-		[HOOK_CALC_POWERS] = function()
-			player.add_power(PWR_BR_FIRE)
-		end,
-		[HOOK_QUAFF] = function(obj)
-			if magik(9) == TRUE then
-				msg_print("Your demon breath spoils the potion!")
-				return TRUE, FALSE
-			else
-				return FALSE
-			end
-		end,
-	},
-}
-
-CORRUPT_DEMON_REALM = add_corruption
-{
-	["color"]       = TERM_L_RED,
-	["name"]	= "Demon Realm",
-	["get_text"]    = "You feel more attuned to the demon realm.",
-	["lose_text"]   = "You lose your attunement to the demon realm.",
-	["desc"]	=
-	{
-			  "  Provides access to the demon school skill and the use of demonic equipment",
-			  "  You need Demon Spirit, Demon Hide and Demon Breath to activate it"
-	},
-	["depends"]     =
-	{
-			[CORRUPT_DEMON_SPIRIT] = TRUE,
-			[CORRUPT_DEMON_HIDE] = TRUE,
-			[CORRUPT_DEMON_BREATH] = TRUE
-	},
-	["hooks"]       =
-	{
-		[HOOK_CALC_BONUS] = function()
-			-- 1500 may seem a lot, but people are rather unlikely to get the corruption very soon
-			-- due to the dependencies
-			if s_info[SKILL_DAEMON + 1].mod == 0 then s_info[SKILL_DAEMON + 1].mod = 1500 end
-			s_info[SKILL_DAEMON + 1].hidden = FALSE;
-		end,
-	},
-}
-
-
--- Teleportation corruptions
-
--- Random teleportation will ask for confirmation 70% of the time
--- But 30% of the time it will teleport, without asking
-CORRUPT_RANDOM_TELEPORT = add_corruption
-{
-	["color"]       = TERM_GREEN,
-	["name"]	= "Random teleportation",
-	["get_text"]    = "Space seems to fizzle around you.",
-	["lose_text"]   = "Space solidify again around you.",
-	["desc"]	=
-	{
-			  "  Randomly teleports you around",
-	},
-	-- No oppose field, it will be automatically set when we declare the anti-telep corruption to oppose us
-	["hooks"]       =
-	{
-		[HOOK_CALC_BONUS] = function()
-			player.xtra_f3 = bor(player.xtra_f3, TR3_TELEPORT)
-		end,
-		[HOOK_PROCESS_WORLD] = function()
-			if rand_int(300) == 1 then
-				if magik(70) == TRUE then
-					if get_check("Teleport?") == TRUE then
-						teleport_player(50)
-					end
-				else
-					disturb(0, 0)
-					msg_print("Your corruption takes over you, you teleport!")
-					teleport_player(50)
-				end
-			end
-		end,
-	},
-}
-
--- Anti-teleportation corruption, can be stopped with this power
-CORRUPT_ANTI_TELEPORT = add_corruption
-{
-	["color"]       = TERM_GREEN,
-	["name"]	= "Anti-teleportation",
-	["get_text"]    = "Space continuum freezes around you.",
-	["lose_text"]   = "Space continuum can once more be altered around you.",
-	["desc"]	=
-	{
-			  "  Prevents all teleportations, be it of you or monsters",
-	},
-	["oppose"]     	=
-	{
-			[CORRUPT_RANDOM_TELEPORT] = TRUE
-	},
-	["hooks"]       =
-	{
-		[HOOK_BIRTH_OBJECTS] = function()
-			player.corrupt_anti_teleport_stopped = FALSE
-		end,
-		[HOOK_CALC_POWERS] = function()
-			player.add_power(POWER_COR_SPACE_TIME)
-		end,
-		[HOOK_CALC_BONUS] = function()
-			if player.corrupt_anti_teleport_stopped == FALSE then
-				player.resist_continuum = TRUE
-			end
-		end,
-		[HOOK_PROCESS_WORLD] = function()
-			if player.corrupt_anti_teleport_stopped == TRUE then
-				local amt = player.msp + player.csp
-				amt = amt / 100
-				if (amt < 1) then amt = 1 end
-				increase_mana(-amt)
-				if player.csp == 0 then
-					player.corrupt_anti_teleport_stopped = FALSE
-					msg_print("You stop controlling your corruption.")
-					player.update = bor(player.update, PU_BONUS)
-				end
-			end
-		end,
-	},
-}
-
-
--- Troll blood
-CORRUPT_TROLL_BLOOD = add_corruption
-{
-	["color"]       = TERM_GREEN,
-	["name"]	= "Troll Blood",
-	["get_text"]    = "Your blood thickens, you sense corruption in it.",
-	["lose_text"]   = "Your blood returns to a normal state.",
-	["desc"]	=
-	{
-			  "  Troll blood flows in your veins, granting increased regeneration",
-			  "  It also enables you to feel the presence of other troll beings",
-			  "  But it will make your presence more noticeable and aggravating",
-	},
-	["can_gain"] =	function()
-			-- Ok trolls should not get this one. never.
-			if get_race_name() == "Troll" then
-				return nil
-			else
-				return not nil
-			end
-	end,
-	["hooks"]       =
-	{
-		[HOOK_CALC_BONUS] = function()
-			player.xtra_f3 = bor(player.xtra_f3, TR3_REGEN, TR3_AGGRAVATE)
-			player.xtra_esp = bor(player.xtra_esp, ESP_TROLL)
-		end,
-	},
-}
-
--- The vampire corruption set
-CORRUPT_VAMPIRE_TEETH = add_corruption
-{
-	["group"]       = "Vampire",
-	["removable"]   = FALSE,
-	["color"]       = TERM_L_DARK,
-	["name"]	= "Vampiric Teeth",
-	["get_text"]    = "You grow vampiric teeth!",
-	["lose_text"]   = "BUG! this should not happen",
-	["desc"]	=
-	{
-			  "  Your teeth allow you to drain blood to feed yourself",
-			  "  However your stomach now only accepts blood.",
-	},
-	["allow"]       = function()
-		if test_race_flags(1, PR1_NO_SUBRACE_CHANGE) == FALSE then return not nil else return nil end
-	end,
-	["gain"]	= function()
-		switch_subrace(SUBRACE_SAVE, TRUE);
-
-		subrace_add_power(subrace(SUBRACE_SAVE), PWR_VAMPIRISM)
-		subrace(SUBRACE_SAVE).flags1 = bor(subrace(SUBRACE_SAVE).flags1, PR1_VAMPIRE, PR1_UNDEAD, PR1_NO_SUBRACE_CHANGE)
-	end,
-	["hooks"]       =
-	{
-	},
-}
-CORRUPT_VAMPIRE_STRENGTH = add_corruption
-{
-	["group"]       = "Vampire",
-	["removable"]   = FALSE,
-	["color"]       = TERM_L_DARK,
-	["name"]	= "Vampiric Strength",
-	["get_text"]    = "Your body seems more dead than alive.",
-	["lose_text"]   = "BUG! this should not happen",
-	["desc"]	=
-	{
-			  "  Your body seems somewhat dead",
-			  "  In this near undead state it has improved strength, constitution and intelligence",
-			  "  But reduced dexterity, wisdom and charisma.",
-	},
-	["depends"]     =
-	{
-			[CORRUPT_VAMPIRE_TEETH] = TRUE,
-	},
-	["gain"]	= function()
-		-- Apply the bonuses/penalities
-		subrace(SUBRACE_SAVE).r_mhp = subrace(SUBRACE_SAVE).r_mhp + 1
-		subrace(SUBRACE_SAVE).r_exp = subrace(SUBRACE_SAVE).r_exp + 100
-
-		subrace(SUBRACE_SAVE).r_adj[A_STR + 1] = subrace(SUBRACE_SAVE).r_adj[A_STR + 1] + 3
-		subrace(SUBRACE_SAVE).r_adj[A_INT + 1] = subrace(SUBRACE_SAVE).r_adj[A_INT + 1] + 2
-		subrace(SUBRACE_SAVE).r_adj[A_WIS + 1] = subrace(SUBRACE_SAVE).r_adj[A_WIS + 1] - 3
-		subrace(SUBRACE_SAVE).r_adj[A_DEX + 1] = subrace(SUBRACE_SAVE).r_adj[A_DEX + 1] - 2
-		subrace(SUBRACE_SAVE).r_adj[A_CON + 1] = subrace(SUBRACE_SAVE).r_adj[A_CON + 1] + 1
-		subrace(SUBRACE_SAVE).r_adj[A_CHR + 1] = subrace(SUBRACE_SAVE).r_adj[A_CHR + 1] - 4
-
-		-- be reborn!
-		do_rebirth()
-		cmsg_print(TERM_L_DARK, "You feel death slipping inside.")
-	end,
-	["hooks"]       =
-	{
-	},
-}
-CORRUPT_VAMPIRE_VAMPIRE = add_corruption
-{
-	["group"]       = "Vampire",
-	["removable"]   = FALSE,
-	["color"]       = TERM_L_DARK,
-	["name"]	= "Vampire",
-	["get_text"]    = "You die to be reborn in a Vampire form.",
-	["lose_text"]   = "BUG! this should not happen",
-	["desc"]	=
-	{
-			  "  You are a Vampire. As such you resist cold, poison, darkness and nether.",
-			  "  Your life is sustained, but you cannot stand the light of the sun."
-	},
-	["depends"]     =
-	{
-			[CORRUPT_VAMPIRE_STRENGTH] = TRUE,
-	},
-	["gain"]	= function()
-		-- Be a Vampire and be proud of it
-		local title = get_subrace_title(SUBRACE_SAVE)
-		if title == " " or title == "Vampire" then
-			title = "Vampire"
-			subrace(SUBRACE_SAVE).place = FALSE
-		else
-			title = "Vampire "..title
-		end
-		set_subrace_title(SUBRACE_SAVE, title)
-
-		-- Bonus/and .. not bonus :)
-		subrace(SUBRACE_SAVE).flags1 = bor(subrace(SUBRACE_SAVE).flags1, PR1_HURT_LITE)
-		subrace(SUBRACE_SAVE).oflags2[2] = bor(subrace(SUBRACE_SAVE).oflags2[2], TR2_RES_POIS, TR2_RES_NETHER, TR2_RES_COLD, TR2_RES_DARK, TR2_HOLD_LIFE)
-		subrace(SUBRACE_SAVE).oflags3[2] = bor(subrace(SUBRACE_SAVE).oflags3[2], TR3_LITE1)
-	end,
-	["hooks"]       =
-	{
-	},
-}
-
-
---[[
-CORRUPT_ = add_corruption
-{
-	["color"]       = TERM_GREEN,
-	["name"]	= "",
-	["get_text"]    = "",
-	["lose_text"]   = "",
-	["desc"]	=
-	{
-			  "  ",
-	},
-	["hooks"]       =
-	{
-		[HOOK_CALC_BONUS] = function()
-		end,
-	},
-}
-]]
diff --git a/lib/scpt/drunk.lua b/lib/scpt/drunk.lua
deleted file mode 100644
index 7d90af8d..00000000
--- a/lib/scpt/drunk.lua
+++ /dev/null
@@ -1,21 +0,0 @@
--- silly function that allows a drunk to take a bottle of wine/ale from the player
-
-function drunk_takes_wine(m_idx, item)
-
-	m_ptr = monster(m_idx)
-	o_ptr = get_object(item)
-
-	if (m_ptr.r_idx == test_monster_name("Singing, happy drunk")) 
-			and (o_ptr.tval == TV_FOOD) and ((o_ptr.sval == 38) or (o_ptr.sval == 39)) then
-
-		cmsg_print(TERM_YELLOW, "'Hic!'")
-
-		inven_item_increase(item, -1)
-		inven_item_optimize(item)
-		return TRUE
-	else
-		return FALSE
-	end
-end
-
-add_hook_script(HOOK_GIVE, "drunk_takes_wine", "drunk_takes_wine")
diff --git a/lib/scpt/fireprof.lua b/lib/scpt/fireprof.lua
deleted file mode 100644
index 0a3aad28..00000000
--- a/lib/scpt/fireprof.lua
+++ /dev/null
@@ -1,415 +0,0 @@
--- The Old Mages/Fireproofing quest: Bring back an essence from a fiery cave and get some books/scrolls/staves fireproofed in return
-
-fireproof_quest = {}
-
-
--- change this constant (and the FOO_POINTS ones) to adjust the no of items fire-proofed as a reward
-fireproof_quest.TOTAL_ITEM_POINTS = 12
-
--- These constants are how many 'points' each type of item will take up. So currently, you can fireproof 3 books, 4 staves or 12 scrolls.
-fireproof_quest.BOOK_POINTS = 4
-fireproof_quest.STAFF_POINTS = 3
-fireproof_quest.SCROLL_POINTS = 1
-
-add_quest
-{
-	["global"] =    "FIREPROOF_QUEST",
-	["name"] =      "Old Mages quest",
-	["desc"] =      function()
-			local num_books, num_staff, num_scroll
-
-			num_books = fireproof_quest.item_points_remaining / fireproof_quest.BOOK_POINTS
-			num_staff = fireproof_quest.item_points_remaining / fireproof_quest.STAFF_POINTS
-			num_scroll = fireproof_quest.item_points_remaining / fireproof_quest.SCROLL_POINTS
-
-			-- Quest taken
-			if (quest(FIREPROOF_QUEST).status == QUEST_STATUS_TAKEN)  then
-				print_hook("#####yAn Old Mages Quest!\n")
-				print_hook("Retrieve the strange essence for the old mage in Lothlorien.\n")
-				print_hook("\n")			
-			-- essence retrieved, not taken to mage
-			elseif (quest(FIREPROOF_QUEST).status == QUEST_STATUS_COMPLETED) then
-				print_hook("#####yAn Old Mages Quest!\n")
-				print_hook("You have retrieved the essence for the old mage in Lothlorien. Perhaps you \n")
-				print_hook("should see about a reward.\n")
-				print_hook("\n")
-			-- essence returned, not all books fireproofed
-			elseif (quest(FIREPROOF_QUEST).status == QUEST_STATUS_FINISHED) and (fireproof_quest.item_points_remaining > 0) then
-				print_hook("#####yAn Old Mages Quest!\n")
-				print_hook("You have retrieved the essence for the old mage in Lothlorien. He will still \n")
-				print_hook("fireproof "..num_books.." book(s) or "..num_staff.." staff/staves or "..num_scroll.." scroll(s) for you.\n")
-				print_hook("\n")
-			end
-	end,
-	["level"] =     20,
-	["data"] =      {
-			-- store some variables
-			["fireproof_quest.item_points_remaining"] = fireproof_quest.TOTAL_ITEM_POINTS, 
-			["fireproof_quest.essence"] = 0,
-	},
-	["hooks"] =     {
-			-- Start the game without the quest, need to request it
-			[HOOK_BIRTH_OBJECTS] = function()
-				quest(FIREPROOF_QUEST).status = QUEST_STATUS_UNTAKEN
-
-				-- reset some variables on birth
-				fireproof_quest.item_points_remaining = fireproof_quest.TOTAL_ITEM_POINTS
-				fireproof_quest.essence = 0
-			end,
-			[HOOK_GEN_QUEST] = function()
-				local essence, y, x, traps, tries, trap_y, trap_x, grid
-
-				-- Only if player doing this quest
-				if (player.inside_quest ~= FIREPROOF_QUEST) then
-					return FALSE
-				else
-					-- load the map
-					load_map("fireprof.map", 2, 2)
-
-					-- no teleport
-					level_flags2 = DF2_NO_TELEPORT
-
-					-- determine type of essence
-					fireproof_quest.essence = randint(18)
-
-					-- create essence
-					essence = create_object(TV_BATERIE, fireproof_quest.essence)
-
-					-- mark essence
-					essence.pval2 = fireproof_quest.essence
-					essence.note = quark_add("quest")
-
-					-- roll for co-ordinates in top half of map
-					y = randint(3) + 2
-					x = randint(45) + 2
-
-					-- drop it
-					drop_near(essence, -1, y, x)
-
-					-- how many traps to generate
-					traps = rand_range(10, 30)
-					
-					-- generate the traps
-					while (traps > 0) do
-
-						-- initialise tries variable
-						tries = 0
-						
-						-- make sure it's a safe place				  
-						while (tries == 0) do
-
-							-- get grid coordinates
-							trap_y = randint(19) + 2
-							trap_x = randint(45) + 2
-							grid = cave(trap_y, trap_x)
-	
-							-- are the coordinates on a stair, or a wall?
-							if (cave_is(grid, FF1_PERMANENT) ~= 0) or (cave_is(grid, FF1_FLOOR) == 0) then
-		
-								-- try again
-								tries = 0
-							else
-								-- not a stair, then stop this 'while'
-								tries = 1
-							end
-						end
-	
-						-- randomise level of trap
-						trap_level = rand_range(20, 40)
-
-						-- put the trap there
-						place_trap(trap_y, trap_x, trap_level)
-
-						-- that's one less trap to place
-						traps = traps - 1
-					end
-					return TRUE
-				end
-			end,
-			[HOOK_STAIR] = function()
-				local ret
-
-				-- only ask this if player about to go up stairs of quest and hasn;t retrieved essence
-				if (player.inside_quest ~= FIREPROOF_QUEST) or 
-				(quest(FIREPROOF_QUEST).status == QUEST_STATUS_COMPLETED) then
-					return FALSE
-				else
-					if cave(player.py, player.px).feat ~= FEAT_LESS then return end
-
-					-- flush all pending input
-					flush()
-
-					-- confirm
-					ret = get_check("Really abandon the quest?")
-
-					-- if yes, then
-					if  (ret == TRUE) then
-
-						-- fail the quest
-						quest(FIREPROOF_QUEST).status = QUEST_STATUS_FAILED
-						return FALSE
-					else 
-						-- if no, they stay in the quest
-						return TRUE
-					end
-				end
-			end,
-			[HOOK_GET] = function(o_ptr)
-
-				-- if they're in the quest and haven't picked up the essence already, continue
-				if (player.inside_quest ~= FIREPROOF_QUEST) or 
-				(quest(FIREPROOF_QUEST).status == QUEST_STATUS_COMPLETED) then
-					return FALSE
-				else
-
-					-- check that it's the real essence and not another one generated via the random object placing in fireproof.map
-					if (o_ptr.pval2 == fireproof_quest.essence) then
-
-						-- ok mark the quest 'completed'
-						quest(FIREPROOF_QUEST).status = QUEST_STATUS_COMPLETED
-						msg_print(TERM_YELLOW, "Fine! Looks like you've found it.")
-					end
-				end
-			end,
-				
-	},
-}
-
--- add the bit that determines what happens when the request 'q'uest bit is done in the wizard spire
-add_building_action
-{
-	-- Index is used in ba_info.txt to set the actions
-	["index"] =     56,
-	["action"] =    function()
-
-			local num_books, num_staff, num_scroll
-
-			num_books = fireproof_quest.item_points_remaining / fireproof_quest.BOOK_POINTS
-			num_staff = fireproof_quest.item_points_remaining / fireproof_quest.STAFF_POINTS
-			num_scroll = fireproof_quest.item_points_remaining / fireproof_quest.SCROLL_POINTS
-
-			-- the quest hasn;t been requested already, right?
-			if quest(FIREPROOF_QUEST).status == QUEST_STATUS_UNTAKEN then
-
-				-- quest has been taken now
-				quest(FIREPROOF_QUEST).status = QUEST_STATUS_TAKEN
-				fireproof_quest.item_points_remaining = fireproof_quest.TOTAL_ITEM_POINTS
-
-				-- issue instructions
-				msg_print("I need a very special essence for a spell I am working on. I am too old to ")
-				msg_print("fetch it myself. Please bring it back to me. You can find it north of here.")
-				msg_print("Be careful with it, it's fragile and might be destroyed easily.")
-
-				return TRUE, FALSE, TRUE
-			-- if quest completed (essence was retrieved)
-			elseif (quest(FIREPROOF_QUEST).status == QUEST_STATUS_COMPLETED) then
-
-				-- ask for essence
-				ret, item = get_item("Which essence?",
-						     "You have no essences to return",
-						     bor(USE_INVEN),
-						     function (obj)
-
-							-- check it's the 'marked' essence
-							if (obj.tval == TV_BATERIE) and (obj.sval == fireproof_quest.essence) and (obj.pval2 == fireproof_quest.essence) then
-								return TRUE
-							end
-							return FALSE
-						     end
-				)
-
-				-- didn't get the essence?
-				if (ret == FALSE) then 
-					return TRUE
-
-				-- got the essence!
-				else
-
-					-- take essence
-					inven_item_increase(item, -1)
-					inven_item_optimize(item)
-					msg_print("Great! Let me fireproof some of your items in thanks. I can do "..num_books.." books, ")
-					msg_print(num_staff.." staves, or "..num_scroll.." scrolls.")
-
-					-- how many items to proof?
-					local items = fireproof_quest.item_points_remaining
-
-					-- repeat till up to 3 (value defined as TOTAL_ITEM_POINTS constant) books fireproofed
-					while items > 0 do
-						ret = fireproof()
-
-						-- don't loop the fireproof if there's nothing to fireproof
-						if ret == FALSE then 
-							break 
-						end
-
-						-- subtract item points
-						items = fireproof_quest.item_points_remaining
-					end
-
-					-- have they all been done?
-					if (fireproof_quest.item_points_remaining == 0) then 
-						-- mark quest to make sure no more quests are given
-						quest(FIREPROOF_QUEST).status = QUEST_STATUS_REWARDED 
-					else
-						-- mark in preparation of anymore books to fireproof
-						quest(FIREPROOF_QUEST).status = QUEST_STATUS_FINISHED
-					end
-
-
-				end	     
-
-			-- if the player asks for a quest when they already have it, but haven't failed it, give them some extra instructions
-			elseif (quest(FIREPROOF_QUEST).status == QUEST_STATUS_TAKEN) then
-				msg_print("The essence is in a cave just behind the shop.")
-
-			-- ok not all books have been fireproofed... lets do the rest
-			elseif (quest(FIREPROOF_QUEST).status == QUEST_STATUS_FINISHED) then
-
-				-- how many books still to proof?
-				local items = fireproof_quest.item_points_remaining
-
-				-- repeat as necessary
-				while items > 0 do
-					ret = fireproof()
-
-					-- don't loop the fireproof if there's nothing to fireproof
-					if ret == FALSE then 
-						break 
-					else 
-						-- have they all been done?
-						if (fireproof_quest.item_points_remaining == 0) then quest(FIREPROOF_QUEST).status = QUEST_STATUS_REWARDED end
-					end
-
-					-- subtract item points
-					items = fireproof_quest.item_points_remaining
-				end
-
-			-- quest failed or completed, then give no more quests
-			elseif (quest(FIREPROOF_QUEST).status == QUEST_STATUS_FAILED) or (quest(FIREPROOF_QUEST).status == QUEST_STATUS_REWARDED) then
-				msg_print("I have no more quests for you")
-			end
-			return TRUE
-	end,
-}
-
--- the routine that checks for a book and actually fireproofs it
-function fireproof()
-
-	local ret, item, obj2, stack, obj3, carry_it
-
-	ret, item = get_item("Which item shall I fireproof?",
-			"You have no more items I can fireproof, come back when you have some.",
-			bor(USE_INVEN),
-			function (obj)
-
-				-- get some flags
-				local f1, f2, f3, f4, f5, esp = object_flags(obj)
-
-				-- is it a book/staff/scroll, is it already fireproof?
-				if ((obj.tval == TV_BOOK) or (obj.tval == TV_SCROLL) or (obj.tval == TV_STAFF)) and (band(f3, TR3_IGNORE_FIRE) == 0) then
-					return TRUE
-				end
-				return FALSE
-			end
-		)
-
-	-- get the object type from the number
-	obj2 = get_object(item)
-
-	-- check we have enough points (if we 'got' an item)
-	if (ret == TRUE) then 
-		ret2, stack = enough_points(obj2)
-	end
-
-	-- did either routine fail?
-	if (ret == FALSE) or (ret2 == FALSE)  then 
-		return FALSE
-	else
-
-		-- are we part of the items from a stack?
-		if (obj2.number ~= stack) then 
-
-			-- make a new object to handle
-			object_copy(obj_forge, obj2)
-
-			-- give it the right number of items
-			obj_forge.number = stack
-
-			-- adjust for number of items in pack not to be fireproofed 
-			obj2.number = obj2.number - stack
-			obj3 = obj_forge
-
-			-- we'll need to add this to the inventory after fireproofing
-			carry_it = TRUE
-		else
-
-			-- use the whole stack
-			obj3 = obj2
-
-			-- we'll be dealing this while it's still in the inventory
-			carry_it = FALSE
-		end
-
-		-- make it fireproof
-		obj3.name2 = 149
-
-		-- apply it, making sure the pvals don't change with apply_magic (it would change the type of book!)
-		local oldpval = obj3.pval
-		local oldpval2 = obj3.pval2
-		local oldpval3 = obj3.pval3
-		apply_magic(obj3, -1, FALSE, FALSE, FALSE)
-		obj3.pval = oldpval
-		obj3.pval2 = oldpval2
-		obj3.pval3 = oldpval3
-
-		-- put it in the inventory if it's only part of a stack
-		if (carry_it == TRUE) then
-			inven_carry(obj3, TRUE)
-		end
-
-		-- id and notice it
-		set_known(obj3)
-		set_aware(obj3)
-
-		return TRUE
-	end
-end
-
--- This function makes sure the player has enough 'points' left to fireproof stuff.
-function enough_points(obj)
-	local item_value, stack
-
-	-- are the items in a stack?
-	if (obj.number > 1) then 
-
-		-- how many to fireproof?
-		stack = get_quantity("How many would you like fireproofed?", obj.number)
-	else 
-		stack = 1
-	end
-	
-	-- check for item type and multiply number in the stack by the amount of points per item of that type
-	if (obj.tval == TV_BOOK) then
-		item_value = fireproof_quest.BOOK_POINTS * stack
-	elseif (obj.tval == TV_STAFF) then
-		item_value = fireproof_quest.STAFF_POINTS * stack
-	elseif (obj.tval == TV_SCROLL) then
-		item_value = fireproof_quest.SCROLL_POINTS * stack
-	end
-
-	-- do we have enough points?
-	if (item_value > fireproof_quest.item_points_remaining) then
-		msg_print("I do not have enough fireproofing material for that.")
-		return FALSE
-	else 
-		-- if so then subtract those points before we do the fireproofing
-		fireproof_quest.item_points_remaining = fireproof_quest.item_points_remaining - item_value
-	end
-
-	-- Used all the points? the quest is completely rewarded.
-	if fireproof_quest.item_points_remaining == 0 then quest(FIREPROOF_QUEST).status = QUEST_STATUS_REWARDED end
-
-	return TRUE, stack
-end
-
diff --git a/lib/scpt/god.lua b/lib/scpt/god.lua
deleted file mode 100644
index 3f32888b..00000000
--- a/lib/scpt/god.lua
+++ /dev/null
@@ -1,640 +0,0 @@
--- The god quest: find randomly placed relic in a randomly placed dungeon!
-
--- set some global variables (stored in the save file via the ["data"] key)
-god_quest = {}
-
--- increase this number to make god quests more common, to a max value of 100
-god_quest.CHANCE_OF_GOD_QUEST = 21
-
--- increase this number to make more quests
-god_quest.MAX_NUM_GOD_QUESTS = 5
-
--- d_idx of the god_quest (Lost Temple) dungeon
-god_quest.DUNGEON_GOD = 30
-
-add_quest
-{
-	["global"] =    "GOD_QUEST",
-	["name"] =      "God quest",
-	["desc"] =      function()
-
-			if quest(GOD_QUEST).status == QUEST_STATUS_TAKEN then
-
-				-- get the direction that the dungeon lies from lothlorien/angband
-				local home, home_axis, home_distance, home2, home2_axis, home2_distance = get_god_quest_axes()
-
-				print_hook("#####yGod quest "..god_quest.quests_given.."!\n")
-				print_hook("Thou art to find the lost temple of thy God and\n");
-				print_hook("to retrieve the lost part of the relic for thy God! \n")
-				if home_axis ~= "close" then
-					print_hook("The temple lies "..home_distance.." to the "..home_axis.." of "..home..", \n")
-				else
-					print_hook("The temple lies very close to "..home..", \n")
-				end
-				if home2_axis ~= "close" then
-					print_hook( "and "..home2_distance.." to the "..home2_axis.." of "..home2..".\n")
-				else
-					print_hook("and very close to "..home2..".\n")
-				end					
-				print_hook("\n")
-			end
-	end,
-	["level"] =     -1,
-	["data"] =      {
-		["god_quest.relic_num"] = 1,
-		["god_quest.quests_given"] = 0,
-		["god_quest.relics_found"] = 0,
-		["god_quest.dun_mindepth"] = 1,
-		["god_quest.dun_maxdepth"] = 4,
-		["god_quest.dun_minplev"] = 0,
-		["god_quest.relic_gen_tries"] = 0,
-		["god_quest.relic_generated"] = FALSE,
-		["god_quest.dung_x"] = 1,
-		["god_quest.dung_y"] = 1,
-		["god_quest.player_x"] = 0,
-		["god_quest.player_y"] = 0,
-	},
-	["hooks"] =     {
-		-- Start the game without the quest, given it by chance
-		[HOOK_BIRTH_OBJECTS] = function()
-			quest(GOD_QUEST).status = QUEST_STATUS_UNTAKEN
-
-			-- initialise save-file stored variables when new character is created
-			god_quest.relic_num = 1
-			god_quest.quests_given = 0
-			god_quest.relics_found = 0
-			god_quest.dun_mindepth = 1
-			god_quest.dun_maxdepth = 4
-			god_quest.dun_minplev = 0
-			god_quest.relic_gen_tries = 0
-			god_quest.relic_generated = FALSE
-		end,
-		[HOOK_PLAYER_LEVEL] = function(gained)
-			local home_axis, home
-
-			if gained > 0 then
-				-- roll for chance of quest
-				local give_god_quest = magik(god_quest.CHANCE_OF_GOD_QUEST)
-
-				-- check player is worshipping a god, not already on a god quest.
-				if (player.astral ~= FALSE) or (player.pgod <= 0) 
-				or (quest(GOD_QUEST).status == QUEST_STATUS_TAKEN) or (quest(GOD_QUEST).status == QUEST_STATUS_FAILED)
-				or (god_quest.quests_given >= god_quest.MAX_NUM_GOD_QUESTS) or (give_god_quest == FALSE)
-				or ((current_dungeon_idx == god_quest.DUNGEON_GOD) and (dun_level > 0)) or (player.lev <= god_quest.dun_minplev) then
-					-- Don't let a player get quests with trickery
-					if player.lev > god_quest.dun_minplev then
-						god_quest.dun_minplev = player.lev
-					end
-					return
-				else
-					-- each god has different characteristics, so the quests are differnet depending on your god
-					if player.pgod == GOD_ERU then
-						god_quest.relic_num = 7
-					elseif player.pgod == GOD_MANWE then
-						god_quest.relic_num = 8
-					elseif player.pgod == GOD_TULKAS then
-						god_quest.relic_num = 9
-					elseif player.pgod == GOD_MELKOR then
-						god_quest.relic_num = 10
-					elseif player.pgod == GOD_YAVANNA then
-						god_quest.relic_num =11
-					end
-
-					-- This var will need resetting
-					god_quest.relic_generated = FALSE
-					quest(GOD_QUEST).status = QUEST_STATUS_TAKEN
-					god_quest.quests_given = god_quest.quests_given + 1
-
-					-- actually place the dungeon in a random place
-					place_rand_dung()
-
-					-- store the variables of the coords where the player was given the quest
-					god_quest.player_y, god_quest.player_x = player.get_wild_coord()
-
-					-- establish direction of player and 'home' from dungeon
-					local home, home_axis, home_distance, home2, home2_axis, home2_distance = get_god_quest_axes()
-
-					-- God issues instructions
-					cmsg_print(TERM_L_BLUE, "The voice of "..deity(player.pgod).name.." booms in your head:")
-
-					cmsg_print(TERM_YELLOW, "'I have a task for thee.")
-					cmsg_print(TERM_YELLOW, "Centuries ago an ancient relic of mine was broken apart.")
-					cmsg_print(TERM_YELLOW, "The pieces of it have been lost in fallen temples.")
-					cmsg_print(TERM_YELLOW, "Thou art to find my lost temple and retrieve a piece of the relic.")
-					cmsg_print(TERM_YELLOW, "When thy task is done, thou art to lift it in the air and call upon my name.")
-					cmsg_print(TERM_YELLOW, "I shall then come to reclaim what is mine!")
-					if home_axis ~= "close" then
-						cmsg_print(TERM_YELLOW, "The temple lies "..home_distance.." to the "..home_axis.." of "..home..", ")
-					else
-						cmsg_print(TERM_YELLOW, "The temple lies very close to "..home..",")
-					end
-
-					if home2_axis ~= "close" then
-						cmsg_print(TERM_YELLOW, "and "..home2_distance.." to the "..home2_axis.." of "..home2..", I can feel it.'")
-					else
-						cmsg_print(TERM_YELLOW, "and very close to "..home2..", I can feel it.'")
-					end
-
-					-- Prepare depth of dungeon. If this was generated in set_god_dungeon_attributes(),
-					-- then we'd have trouble if someone levelled up in the dungeon!
-					god_quest.dun_mindepth = player.lev*2/3
-					god_quest.dun_maxdepth = god_quest.dun_mindepth + 4
-				end
-			end
-		end,
-		[HOOK_LEVEL_END_GEN] = function()
-			local chance
-
-			-- Check for dungeon
-			if (current_dungeon_idx ~= god_quest.DUNGEON_GOD) or (quest(GOD_QUEST).status == QUEST_STATUS_UNTAKEN) then
-				return
-			-- if the relic has been created at this point, then it was created on the *PREVIOUS* call of HOOK_LEVEL_END_GEN, and 
-			-- therefore the player has caused another level generation in the temple and hence failed the quest.
-			elseif (god_quest.relic_generated == TRUE) and quest(GOD_QUEST).status ~= QUEST_STATUS_FAILED then 
-				
-					-- fail the quest, don't give another one, don't give this message again
-					quest(GOD_QUEST).status = QUEST_STATUS_FAILED
-					-- God issues instructions
-					cmsg_print(TERM_L_BLUE, "The voice of "..deity(player.pgod).name.." booms in your head:")
-
-					cmsg_print(TERM_YELLOW, "'Thou art a fool!")
-					cmsg_print(TERM_YELLOW, "I told thee to look carefully for the relic. It appears thou hast missed the")
-					cmsg_print(TERM_YELLOW, "opportunity to claim it in my name, as I sense that those monsters who ")
-					cmsg_print(TERM_YELLOW, "have overrun my temple have destroyed it themselves.")
-					cmsg_print(TERM_YELLOW, "I shall not ask thee to do such a thing again, as thou hast failed me in this")
-					cmsg_print(TERM_YELLOW, "simple task!'")					
-			else
-				-- Force relic generation on 5th attempt if others have been unsuccessful.
-				if (god_quest.relic_gen_tries == 4) and (god_quest.relic_generated == FALSE) then
-					generate_relic()
-				else
-					-- 1/5 chance of generation
-					chance = randint(5)
-					if (chance == 5) then
-						generate_relic()
-					else
-						god_quest.relic_gen_tries = god_quest.relic_gen_tries + 1
-					end
-				end
-			end
-		end,
-		[HOOK_ENTER_DUNGEON] = function(d_idx)
-			-- call the function to set the dungeon variables (dependant on pgod) the first time we enter the dungeon
-			if d_idx ~= god_quest.DUNGEON_GOD then
-				return
-			else
-				set_god_dungeon_attributes()
-			end
-		end,
-		[HOOK_GEN_LEVEL_BEGIN] = function()
-			-- call the function to set the dungeon variables (dependant on pgod) when we WoR back into the dungeon
-			if current_dungeon_idx ~= god_quest.DUNGEON_GOD then
-				return
-			else
-				set_god_dungeon_attributes()
-			end
-		end,
-		[HOOK_STAIR] = function()
-			-- call the function to set the dungeon variables (dependant on pgod) every time we go down a level
-			if current_dungeon_idx ~= god_quest.DUNGEON_GOD then
-				return
-			else
-				set_god_dungeon_attributes()
-			end
-		end,
-		[HOOK_GET] = function(o_ptr, item)
-				-- Is it the relic, and check to make sure the relic hasn't already been identified
-			if (quest(GOD_QUEST).status == QUEST_STATUS_TAKEN) and (o_ptr.tval == TV_JUNK) and (o_ptr.sval == god_quest.relic_num)
-			and (o_ptr.pval ~= TRUE)  and (god_quest.relics_found < god_quest.quests_given) then
-
-				-- more God talky-talky
-				cmsg_print(TERM_L_BLUE, deity(player.pgod).name.." speaks to you:")
-
-				-- Is it the last piece of the relic?
-				if (god_quest.quests_given == god_quest.MAX_NUM_GOD_QUESTS) then
-					cmsg_print(TERM_YELLOW, "'At last! Thou hast found all of the relic pieces.")
-
-					-- reward player by increasing prayer skill
-					cmsg_print(TERM_YELLOW, "Thou hast done exceptionally well! I shall increase thy prayer skill even more!'")
-					skill(SKILL_PRAY).value = skill(SKILL_PRAY).value + (10 * (skill(SKILL_PRAY).mod))
-
-					-- Take the relic piece
-					floor_item_increase(item, -1)
-					floor_item_optimize(item)
-				else
-					cmsg_print(TERM_YELLOW, "'Well done! Thou hast found part of the relic.")
-					cmsg_print(TERM_YELLOW, "I shall surely ask thee to find more of it later!")
-					cmsg_print(TERM_YELLOW, "I will take it from thee for now'")
-
-					-- Take the relic piece
-					floor_item_increase(item, -1)
-					floor_item_optimize(item)
-
-					-- reward player by increasing prayer skill
-					cmsg_print(TERM_YELLOW, "'As a reward, I shall teach thee how to pray better'")
-					skill(SKILL_PRAY).value = skill(SKILL_PRAY).value + (5 * (skill(SKILL_PRAY).mod))
-				end
-
-				-- relic piece has been identified
-				o_ptr.pval = TRUE
-				god_quest.relics_found = god_quest.relics_found + 1
-
-				-- Make sure quests can be given again if neccesary
-				quest(GOD_QUEST).status = QUEST_STATUS_UNTAKEN
-				return TRUE
-			end
-		end,
-		[HOOK_CHAR_DUMP] = function()
-
-			if (god_quest.quests_given > 0) then
-
-				local relics = god_quest.relics_found
-				local append_text = ""
-				if (god_quest.relics_found == god_quest.MAX_NUM_GOD_QUESTS) then
-					relics = "all"
-					append_text = " and pleased your god"
-				else
-					if (god_quest.relics_found == 0) then
-						relics = "none"
-					end
-					if (quest(GOD_QUEST).status == QUEST_STATUS_FAILED) then
-						append_text = " and failed in your quest"
-					end
-				end
-
-				print_hook("\n You found "..(relics).." of the relic pieces"..(append_text)..".")
-
-			end
-		end,
-	},
-}
-
--- this function places the lost temple at a randomly determined place.
-function place_rand_dung()
-	local tries, grid
-
-	-- erase old dungeon
-		if (god_quest.quests_given > 0) then 
-		place_dungeon(god_quest.dung_y, god_quest.dung_x)
-		
-		-- erase old recall level
-		max_dlv[god_quest.DUNGEON_GOD + 1] = 0
-	end
-
-	-- initialise tries variable
-	tries = 1000
-
-	while tries > 0 do
-
-		tries = tries - 1
-		-- get grid coordinates, within a range which prevents dungeon being generated at the very edge of the wilderness (would crash the game).
-		god_quest.dung_x = rand_range(1, max_wild_x-2)
-		god_quest.dung_y = rand_range(1, max_wild_y-2)
-
-		-- Is there a town/dungeon/potentially impassable feature there, ?
-		if (wild_map(god_quest.dung_y, god_quest.dung_x).entrance ~= 0)
-		or (wild_feat(wild_map(god_quest.dung_y, god_quest.dung_x)).entrance ~= 0)
-		or (wild_feat(wild_map(god_quest.dung_y, god_quest.dung_x)).terrain_idx == TERRAIN_EDGE)
-		or (wild_feat(wild_map(god_quest.dung_y, god_quest.dung_x)).terrain_idx == TERRAIN_DEEP_WATER)
-		or (wild_feat(wild_map(god_quest.dung_y, god_quest.dung_x)).terrain_idx == TERRAIN_TREES)
-		or (wild_feat(wild_map(god_quest.dung_y, god_quest.dung_x)).terrain_idx == TERRAIN_SHALLOW_LAVA)
-		or (wild_feat(wild_map(god_quest.dung_y, god_quest.dung_x)).terrain_idx == TERRAIN_DEEP_LAVA)
-		or (wild_feat(wild_map(god_quest.dung_y, god_quest.dung_x)).terrain_idx == TERRAIN_MOUNTAIN) then
-			-- try again
-		else
-			--neither player, nor wall, then stop this 'while'
-			break
-		end
-	end
-
-	-- Uhuh BAD ! lets use the default location up bree
-	if tries == 0 then
-		god_quest.dung_x = 32
-		god_quest.dung_y = 19
-	end
-
-	-- create god dungeon in that place
-	place_dungeon(god_quest.dung_y, god_quest.dung_x, god_quest.DUNGEON_GOD)
-
-end
-
--- this function generates the relic at a randomly determined place in the temple.
-function generate_relic()
-	local tries, grid, x, y, relic
-
-	-- initialise tries variable
-	tries = 1000
-
-	while (tries > 0) do
-
-		tries = tries - 1
-		-- get grid coordinates from current height/width, minus one to prevent relic being generated in outside wall. (would crash the game)
-		y = randint(cur_hgt-1)
-		x = randint(cur_wid-1)
-		grid = cave(y, x)
-
-		-- are the coordinates on a floor, not on a permanent feature (eg stairs), and not on a trap ?
-		if (cave_is(grid, FF1_FLOOR) == TRUE) and (cave_is(grid, FF1_PERMANENT) == FALSE) and (grid.t_idx == 0) then break end
-
-	end 
-	
-	-- create relic
-	relic = create_object(TV_JUNK, god_quest.relic_num)
-
-	-- inscribe it to prevent automatizer 'accidents'
-	relic.note = quark_add("quest")
-
-	-- If no safe co-ords were found, put it in the players backpack
-	if tries == 0 then
-
-		-- explain it
-		msg_print(TERM_L_BLUE, "You luckily stumble across the relic on the stairs!")
-
-		if (inven_carry_okay(relic)) then
-			inven_carry(relic, FALSE)
-		else
-		-- no place found, drop it on the stairs
-			drop_near(relic, -1, player.py, player.px)
-		end
-
-	else
-		-- drop it
-		drop_near(relic, -1, y, x)
-	end
-
-	-- Only generate once!
-	god_quest.relic_generated = TRUE
-
-	-- Reset some variables
-	god_quest.relic_gen_tries = 0
-
-end
-
-
-
-
-function set_god_dungeon_attributes()
-
-	-- dungeon properties altered according to which god player is worshipping,
-	if player.pgod == GOD_ERU then
-
-		-- The Eru temple is based on Meneltarma.
-		-- W: Not too many monsters (they'll be tough though, with big levels)
-		dungeon(god_quest.DUNGEON_GOD).min_m_alloc_level = 14
-		dungeon(god_quest.DUNGEON_GOD).min_m_alloc_chance = 200
-
-		-- L: Dirt and grass. More dirt at bottom, more grass at top. rocky ground would be nice
-		dungeon(god_quest.DUNGEON_GOD).floor1 = 88
-		dungeon(god_quest.DUNGEON_GOD).floor2 = 89
-		dungeon(god_quest.DUNGEON_GOD).floor_percent1[1] = 70
-		dungeon(god_quest.DUNGEON_GOD).floor_percent2[1] = 30
-		dungeon(god_quest.DUNGEON_GOD).floor_percent1[2] = 10
-		dungeon(god_quest.DUNGEON_GOD).floor_percent2[2] = 90
-
-		-- A: Outer wall mountain chain. other walls granite
-		dungeon(god_quest.DUNGEON_GOD).fill_type1 = 97
-		dungeon(god_quest.DUNGEON_GOD).fill_percent1[1] = 100
-		dungeon(god_quest.DUNGEON_GOD).outer_wall = 57
-		dungeon(god_quest.DUNGEON_GOD).inner_wall = 97
-		dungeon(god_quest.DUNGEON_GOD).fill_method = 2
-
-		-- O: "At Meneltarma no weapon or tool had ever been borne" (but invaders would have left a small number)
-		dungeon(god_quest.DUNGEON_GOD).objs.treasure = 45
-		dungeon(god_quest.DUNGEON_GOD).objs.combat = 5
-		dungeon(god_quest.DUNGEON_GOD).objs.magic = 45
-		dungeon(god_quest.DUNGEON_GOD).objs.tools = 5
-
-		-- F: A large pillar, with stairs created at edges. (You can't climb a rock through the middle, can you?)
-		dungeon(god_quest.DUNGEON_GOD).flags1 = bor(DF1_BIG, DF1_NO_DOORS, DF1_CIRCULAR_ROOMS, DF1_EMPTY, DF1_TOWER, DF1_FLAT, DF1_ADJUST_LEVEL_2)
-		dungeon(god_quest.DUNGEON_GOD).flags2 = bor(DF2_ADJUST_LEVEL_1_2, DF2_NO_SHAFT, DF2_ADJUST_LEVEL_PLAYER)
-
-		-- R:
-		dungeon(god_quest.DUNGEON_GOD).rules[1].mode = 3
-		dungeon(god_quest.DUNGEON_GOD).rules[1].percent = 50
-
-		-- M: We want evil or flying characters
-		dungeon(god_quest.DUNGEON_GOD).rules[1].mflags3 = RF3_EVIL
-
-		dungeon(god_quest.DUNGEON_GOD).rules[2].mode = 3
-		dungeon(god_quest.DUNGEON_GOD).rules[2].percent = 50
-
-		-- M: We want evil or flying characters
-		dungeon(god_quest.DUNGEON_GOD).rules[2].mflags7 = RF7_CAN_FLY
-
-
-	elseif player.pgod == GOD_MANWE then
-
-		-- Manwe's lost temple is high in the clouds
-		-- W: Has average number of monsters.
-		dungeon(god_quest.DUNGEON_GOD).min_m_alloc_level = 18
-		dungeon(god_quest.DUNGEON_GOD).min_m_alloc_chance = 160
-
-
-		-- L: floor will be 'cloud-like vapour' and pools of 'condensing water'
-		dungeon(god_quest.DUNGEON_GOD).floor1 = 208
-		dungeon(god_quest.DUNGEON_GOD).floor2 = 209
-		dungeon(god_quest.DUNGEON_GOD).floor_percent1[1] = 85
-		dungeon(god_quest.DUNGEON_GOD).floor_percent2[1] = 15
-
-		-- A: Outer wall is 'hail stone wall', inner wall 'dense fog'. FIlled at max smoothing, like islands.
-		dungeon(god_quest.DUNGEON_GOD).fill_type1 = 211
-		dungeon(god_quest.DUNGEON_GOD).fill_percent1[1] = 100
-		dungeon(god_quest.DUNGEON_GOD).outer_wall = 210
-		dungeon(god_quest.DUNGEON_GOD).inner_wall = 211
-		dungeon(god_quest.DUNGEON_GOD).fill_method = 4
-
-		-- O: Can't imagine Manwe having much treasure. Little need for tools in a cloud temple. lots of magical stuff though...
-		dungeon(god_quest.DUNGEON_GOD).objs.treasure = 15
-		dungeon(god_quest.DUNGEON_GOD).objs.combat = 25
-		dungeon(god_quest.DUNGEON_GOD).objs.magic = 55
-		dungeon(god_quest.DUNGEON_GOD).objs.tools = 5
-
-		-- F: It's open, goes up like a tower, give it a few interesting rooms, make the monsters hard(ish).
-		dungeon(god_quest.DUNGEON_GOD).flags1 = bor(DF1_NO_DOORS, DF1_TOWER, DF1_CAVERN,  DF1_ADJUST_LEVEL_2)
-		dungeon(god_quest.DUNGEON_GOD).flags2 = bor(DF2_NO_SHAFT, DF2_ADJUST_LEVEL_PLAYER)
-
-		-- R:
-		dungeon(god_quest.DUNGEON_GOD).rules[1].mode = 3
-		dungeon(god_quest.DUNGEON_GOD).rules[1].percent = 20
-		dungeon(god_quest.DUNGEON_GOD).rules[2].mode = 3
-		dungeon(god_quest.DUNGEON_GOD).rules[2].percent = 20
-		dungeon(god_quest.DUNGEON_GOD).rules[3].mode = 3
-		dungeon(god_quest.DUNGEON_GOD).rules[3].percent = 20
-		dungeon(god_quest.DUNGEON_GOD).rules[4].mode = 3
-		dungeon(god_quest.DUNGEON_GOD).rules[4].percent = 20
-		dungeon(god_quest.DUNGEON_GOD).rules[5].mode = 3
-		dungeon(god_quest.DUNGEON_GOD).rules[5].percent = 20
-
-		-- M: We want air(poison-type) or flying characters. Orcs too. They would have ransacked his elf-loving temple :)
-		dungeon(god_quest.DUNGEON_GOD).rules[1].mflags2 = RF2_INVISIBLE
-		dungeon(god_quest.DUNGEON_GOD).rules[2].mflags3 = bor(RF3_ORC, RF3_IM_POIS)
-		dungeon(god_quest.DUNGEON_GOD).rules[3].mflags4 = bor(RF4_BR_POIS, RF4_BR_GRAV)
-		dungeon(god_quest.DUNGEON_GOD).rules[4].mflags5 = RF5_BA_POIS
-		dungeon(god_quest.DUNGEON_GOD).rules[5].mflags7 = RF7_CAN_FLY
-
-
-	elseif player.pgod == GOD_TULKAS then
-
-		-- Tulkas dungeon is quite normal, possibly a bit boring to be honest. Maybe I should add something radical to it.
-		-- 'The house of Tulkas in the midmost of  Valmar was a house of mirth and revelry. It sprang into the air with many storeys,
-		-- and had a tower of bronze and pillars of copper in a wide arcade'
-		-- W: but with lots of monsters
-		dungeon(god_quest.DUNGEON_GOD).min_m_alloc_level = 20
-		dungeon(god_quest.DUNGEON_GOD).min_m_alloc_chance = 120
-
-		-- L: floor is normal
-		dungeon(god_quest.DUNGEON_GOD).floor1 = 1
-		dungeon(god_quest.DUNGEON_GOD).floor_percent1[1] = 100
-
-		-- A: Granite walls
-		dungeon(god_quest.DUNGEON_GOD).fill_type1 = 56
-		dungeon(god_quest.DUNGEON_GOD).fill_percent1[1] = 100
-		dungeon(god_quest.DUNGEON_GOD).outer_wall = 58
-		dungeon(god_quest.DUNGEON_GOD).inner_wall = 57
-		dungeon(god_quest.DUNGEON_GOD).fill_method = 0
-
-		-- O: Loads of combat drops
-		dungeon(god_quest.DUNGEON_GOD).objs.treasure = 10
-		dungeon(god_quest.DUNGEON_GOD).objs.combat = 70
-		dungeon(god_quest.DUNGEON_GOD).objs.magic = 5
-		dungeon(god_quest.DUNGEON_GOD).objs.tools = 15
-
-		-- F: fairly standard
-		dungeon(god_quest.DUNGEON_GOD).flags1 = bor(DF1_NO_DESTROY, DF1_ADJUST_LEVEL_2)
-		dungeon(god_quest.DUNGEON_GOD).flags2 = DF2_ADJUST_LEVEL_PLAYER
-
-		-- R:
-		dungeon(god_quest.DUNGEON_GOD).rules[1].mode = 3
-		dungeon(god_quest.DUNGEON_GOD).rules[1].percent = 100
-
-		-- M: plenty demons please
-		dungeon(god_quest.DUNGEON_GOD).rules[1].mflags3 = bor(RF3_DEMON, RF3_EVIL)
-
-
-	elseif player.pgod == GOD_MELKOR then
-
-		-- Melkors dungeon will be dark, fiery and stuff
-		-- Many many monsters! (but prob ADJUST_LEVEL_1_2)
-		dungeon(god_quest.DUNGEON_GOD).min_m_alloc_level = 24
-		dungeon(god_quest.DUNGEON_GOD).min_m_alloc_chance = 80
-
-
-		-- L: floor is dirt/mud/nether
-		dungeon(god_quest.DUNGEON_GOD).floor1 = 88
-		dungeon(god_quest.DUNGEON_GOD).floor2 = 94
-		dungeon(god_quest.DUNGEON_GOD).floor3 = 102
-		dungeon(god_quest.DUNGEON_GOD).floor_percent1[1] = 45
-		dungeon(god_quest.DUNGEON_GOD).floor_percent2[1] = 45
-		dungeon(god_quest.DUNGEON_GOD).floor_percent3[1] = 10
-		dungeon(god_quest.DUNGEON_GOD).floor_percent1[2] = 35
-		dungeon(god_quest.DUNGEON_GOD).floor_percent2[2] = 35
-		dungeon(god_quest.DUNGEON_GOD).floor_percent3[2] = 30
-
-		-- A: Granite walls to fill but glass walls for room perimeters (you can see the nasty monsters coming)
-		dungeon(god_quest.DUNGEON_GOD).fill_type1 = 188
-		dungeon(god_quest.DUNGEON_GOD).fill_percent1[1] = 100
-		dungeon(god_quest.DUNGEON_GOD).outer_wall = 188
-		dungeon(god_quest.DUNGEON_GOD).inner_wall = 57
-		dungeon(god_quest.DUNGEON_GOD).fill_method = 1
-
-		-- O: Even drops
-		dungeon(god_quest.DUNGEON_GOD).objs.treasure = 25
-		dungeon(god_quest.DUNGEON_GOD).objs.combat = 25
-		dungeon(god_quest.DUNGEON_GOD).objs.magic = 25
-		dungeon(god_quest.DUNGEON_GOD).objs.tools = 25
-
-		-- F: Small, lava rivers, nasty monsters hehehehehe
-		dungeon(god_quest.DUNGEON_GOD).flags1 = bor(DF1_SMALL, DF1_LAVA_RIVERS, DF1_ADJUST_LEVEL_1)
-		dungeon(god_quest.DUNGEON_GOD).flags2 = bor(DF2_ADJUST_LEVEL_1_2, DF2_ADJUST_LEVEL_PLAYER)
-
-		-- R: No restrictions on monsters here
-		dungeon(god_quest.DUNGEON_GOD).rules[1].mode = 0
-		dungeon(god_quest.DUNGEON_GOD).rules[1].percent = 80
-
-		-- R: Apart from making sure we have some GOOD ones
-		dungeon(god_quest.DUNGEON_GOD).rules[2].mode = 3
-		dungeon(god_quest.DUNGEON_GOD).rules[2].percent = 20
-
-		-- M:
-		dungeon(god_quest.DUNGEON_GOD).rules[2].mflags3 = RF3_GOOD
-
-	elseif player.pgod == GOD_YAVANNA then
-
-		-- Yavannas dungeon will be very natural, tress and stuff.
-		dungeon(god_quest.DUNGEON_GOD).min_m_alloc_level = 22
-		dungeon(god_quest.DUNGEON_GOD).min_m_alloc_chance = 100
-
-		-- L: floor is grass/flowers, plus dirt so not always regenerating quick!
-		dungeon(god_quest.DUNGEON_GOD).floor1 = 89
-		dungeon(god_quest.DUNGEON_GOD).floor2 = 199
-		dungeon(god_quest.DUNGEON_GOD).floor3 = 88
-		dungeon(god_quest.DUNGEON_GOD).floor_percent1[1] = 40
-		dungeon(god_quest.DUNGEON_GOD).floor_percent2[1] = 15
-		dungeon(god_quest.DUNGEON_GOD).floor_percent3[1] = 45
-
-		-- A: Tree walls to fill, small trees for inner walls
-		dungeon(god_quest.DUNGEON_GOD).fill_type1 = 96
-		dungeon(god_quest.DUNGEON_GOD).fill_percent1[1] = 100
-		dungeon(god_quest.DUNGEON_GOD).outer_wall = 202
-		dungeon(god_quest.DUNGEON_GOD).inner_wall = 96
-		dungeon(god_quest.DUNGEON_GOD).fill_method = 1
-
-		-- O: nt much combat.. tools where ransackers have tried to chop trees down.
-		dungeon(god_quest.DUNGEON_GOD).objs.treasure = 20
-		dungeon(god_quest.DUNGEON_GOD).objs.combat = 10
-		dungeon(god_quest.DUNGEON_GOD).objs.magic = 30
-		dungeon(god_quest.DUNGEON_GOD).objs.tools = 40
-
-		-- F: Natural looking
-		dungeon(god_quest.DUNGEON_GOD).flags1 = bor(DF1_NO_DOORS, DF1_WATER_RIVERS, DF1_NO_DESTROY, DF1_ADJUST_LEVEL_1, DF1_NO_RECALL)
-		dungeon(god_quest.DUNGEON_GOD).flags2 = bor(DF2_ADJUST_LEVEL_1_2, DF2_NO_SHAFT, DF2_NO_GENO, DF2_ADJUST_LEVEL_PLAYER)
-
-		-- R: Demons, Undead, non-living
-		dungeon(god_quest.DUNGEON_GOD).rules[1].mode = 3
-		dungeon(god_quest.DUNGEON_GOD).rules[1].percent = 100
-
-		-- M:
-		dungeon(god_quest.DUNGEON_GOD).rules[1].mflags3 = bor(RF3_DEMON, RF3_UNDEAD, RF3_NONLIVING)
-
-	end
-
-	-- W: All dungeons are 5 levels deep, and created at 2/3 of the player clvl when the quest is given
-	dungeon(god_quest.DUNGEON_GOD).mindepth = god_quest.dun_mindepth
-	dungeon(god_quest.DUNGEON_GOD).maxdepth = god_quest.dun_maxdepth
-	dungeon(god_quest.DUNGEON_GOD).minplev = god_quest.dun_minplev
-
-end
-
--- Calling this function returns the direction the dungeon is in from the players position at the time
--- the quest was given, and also the direction from angband (if the player is worshipping Melkor) or lothlorien.
-function get_god_quest_axes()
-	local home, home_y_coord, home_x_coord, home_axis, home2, home2_y_coord, home2_x_coord, home2_axis, mydistance
-
-	-- different values for different gods...
-	if player.pgod ~= GOD_MELKOR then
-
-		-- one of the valar, "home" is lothlorien, home2 is Minas Arnor
-		home = "Bree"
-		home_y_coord = 21
-		home_x_coord = 34
-		home2 = "Minas Anor"
-		home2_y_coord = 56
-		home2_x_coord = 60
-	else
-		-- Melkor, "home" is angband, home2 is Barad-dur
-		home = "the Pits of Angband"
-		home_y_coord = 7
-		home_x_coord = 34
-		home2 = "the Land of Mordor"
-		home2_y_coord = 58
-		home2_x_coord = 65	
-	end
-
-	home_axis = compass(home_y_coord, home_x_coord, god_quest.dung_y, god_quest.dung_x)
-	home2_axis = compass(home2_y_coord, home2_x_coord, god_quest.dung_y, god_quest.dung_x)
-
-	home_distance = approximate_distance(home_y_coord, home_x_coord, god_quest.dung_y, god_quest.dung_x)
-	home2_distance = approximate_distance(home2_y_coord, home2_x_coord, god_quest.dung_y, god_quest.dung_x)
-
-	return home, home_axis, home_distance, home2, home2_axis, home2_distance
-end
diff --git a/lib/scpt/gods.lua b/lib/scpt/gods.lua
deleted file mode 100644
index 014a4423..00000000
--- a/lib/scpt/gods.lua
+++ /dev/null
@@ -1,26 +0,0 @@
-add_hooks
-{
-	[HOOK_FOLLOW_GOD] = function(god, action)
-		if action == "ask" then
-			if not (god == GOD_MELKOR) then
-				local i = INVEN_WIELD
-				while i < INVEN_TOTAL do
-					-- 13 is ART_POWER
-					if player.inventory(i).name1 == 13 then
-						msg_print("The One Ring has corrupted you, and you are rejected.")
-						return TRUE
-					end
-					i = i + 1
-				end
-			end
-		end
-		return FALSE
-	end,
-	[HOOK_RECALC_SKILLS] = function()
-		if not (player.pgod == GOD_NONE) and (get_skill(SKILL_ANTIMAGIC) > 0) then
-			msg_print("You no longer believe.")
-			abandon_god(GOD_ALL)
-		end
-		return FALSE
-	end,
-}
diff --git a/lib/scpt/help.lua b/lib/scpt/help.lua
deleted file mode 100644
index 5350fec8..00000000
--- a/lib/scpt/help.lua
+++ /dev/null
@@ -1,411 +0,0 @@
--- Ingame contextual help
-
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
------------------------Here comes the definition of help-----------------------
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
-
-ingame_help
-{
-	["hook"] =      HOOK_MOVE,
-	["event"] =     function(y, x) if cave(y, x).feat == FEAT_BETWEEN then return TRUE end end,
-	["desc"] =
-	{
-		"Void Jumpgates can be entered by pressing the > key. They will transport",
-		"you to another jumpgate, but beware of the cold damage that might kill you.",
-	}
-}
-
-ingame_help
-{
-	["hook"] =      HOOK_MOVE,
-	["event"] =     function(y, x) if cave(y, x).feat == FEAT_FOUNTAIN then return TRUE end end,
-	["desc"] =
-	{
-		"Fountains are always magical. You can quaff from them by pressing H.",
-		"Beware that unlike potions they cannot be identified.",
-	}
-}
-
-ingame_help
-{
-	["hook"] =      HOOK_MOVE,
-	["event"] =     function(y, x) if cave(y, x).o_idx ~= 0 then return TRUE end end,
-	["desc"] =
-	{
-		"So you found your first item! Nice, eh? Now when you stumble across",
-		"objects, you can pick them up by pressing g, and if you are wondering",
-		"what they do, press I (then *, then the letter for the item) to get",
-		"some basic information. You may also want to identify them with scrolls,",
-		"staves, rods or spells.",
-	}
-}
-
-ingame_help
-{
-	["hook"] =      HOOK_MOVE,
-	["event"] =     function(y, x) if (cave(y, x).feat >= FEAT_ALTAR_HEAD) and (cave(y, x).feat <= FEAT_ALTAR_TAIL) then return TRUE end end,
-	["desc"] =
-	{
-		"Altars are the way to reach the Valar, powers of the world,",
-		"usualy called Gods. You can press O to become a follower.",
-		"Beware that once you follow a god, you are not allowed to change.",
-		"For an exact description of what gods do and want, read the documentation."
-	}
-}
-
--- Beware this one, if Bree is moved from 21, 34 (y, x) on the wilderness map it will break
-ingame_help
-{
-	["hook"] =      HOOK_END_TURN,
-	["event"] =     function(y, x)
-		if ((player.wilderness_x ~= 34) or (player.wilderness_y ~= 21) and (player.astral == FALSE)) then return TRUE end
-	end,
-	["desc"] =
-	{
-		"Ahh wilderness travel... The overview mode will allow you to travel",
-		"fast, but that comes to the cost of GREATLY increased food consumption.",
-		"So you should bring lots of food and really watch your hunger status.",
-		"To enter the overview mode, press < while in the wilderness.",
-	}
-}
-
-ingame_help
-{
-	["hook"] =      HOOK_PLAYER_LEVEL,
-	["event"] =     function(y, x) if player.lev > 1 then return TRUE end end,
-	["desc"] =
-	{
-		"Ok, so you now gained a level, and you have skill points to spend.",
-		"To do so simply press G to learn skills. Reading the documentation",
-		"about skills and abilities is also strongly recommended.",
-	}
-}
-
-ingame_help
-{
-	["hook"] =      HOOK_MOVE,
-	["event"] =     function(y, x) if cave(y, x).feat == FEAT_MORE then return TRUE end end,
-	["desc"] =
-	{
-		"Ah, this is a stair, or a way into something. Press > to enter it.",
-		"But be ready to fight what lies within, for it might not be too friendly.",
-	}
-}
-
-ingame_help
-{
-	["callback"] =  "monster_chat",
-	["desc"] =
-	{
-		"Somebody is speaking to you it seems. You can talk back with the Y key.",
-		"This can lead to quests. You can also give items to 'monsters' with the y key.",
-	}
-}
-
-ingame_help
-{
-	["hook"] =      HOOK_END_TURN,
-	["event"] =     function(y, x) return TRUE end,
-	["desc"] =
-	{
-		"Welcome to ToME! I am the spirit of knowledge and my task is to help you",
-		"to get used to how to play. I have prepared a #vparchment#y for you to #vread#y.",
-		"Press r, then space then select it. You can also check the documentation",
-		"by pressing ? at (nearly) any time.",
-		"The first place you can explore is Barrow-downs. Go to the west of town",
-		"and you should see a #v>#y there.",
-		"If you miss any of this you can press ctrl+p to see your message log.",
-		"Now I must reveal your task here. You are on a quest to investigate",
-		"the dreadful tower of Dol Guldur in the Mirkwood forest to see what evil",
-		"lurks there, but beware, you are not yet ready.",
-		"If you do not want me to bother you any more with tips, press = then go",
-		"into the ToME options and deactivate the ingame_help option.",
-		"You can see your quest log by pressing ctrl+q. Now go to your destiny!",
-	}
-}
-
-ingame_help
-{
-	["no_test"] =   TRUE,
-	["callback"] =  "select_context",
-	["fct"] =       function(typ, name)
-			-- list of files for classes, { filename, anchor }
-			local t =
-			{
-				["race"] =
-				{
-					["Beorning"] = { "r_beorn.txt", 0 },
-					["DeathMold"] = { "r_deathm.txt", 0 },
-					["Dark-Elf"] = { "r_drkelf.txt", 0 },
-					["Dunadan"] = { "r_dunad.txt", 0 },
-					["Dwarf"] = { "r_dwarf.txt", 0 },
-					["Elf"] = { "r_elf.txt", 0 },
-					["Ent"] = { "r_ent.txt", 0 },
-					["Gnome"] = { "r_gnome.txt", 0 },
-					["Half-Elf"] = { "r_hafelf.txt", 0 },
-					["Half-Ogre"] = { "r_hafogr.txt", 0 },
-					["High-Elf"] = { "r_hielf.txt", 0 },
-					["Hobbit"] = { "r_hobbit.txt", 0 },
-					["Human"] = { "r_human.txt", 0 },
-					["Kobold"] = { "r_kobold.txt", 0 },
-					["Maia"] = { "r_maia.txt", 0 },
-					["Orc"] = { "r_orc.txt", 0 },
-					["Petty-Dwarf"] = { "r_pettyd.txt", 0 },
-					["RohanKnight"] = { "r_rohank.txt", 0 },
-					["Thunderlord"] = { "r_thlord.txt", 0 },
-					["Troll"] = { "r_troll.txt", 0 },
-					["Wood-Elf"] = { "r_wodelf.txt", 0 },
-					["Yeek"] = { "r_yeek.txt", 0 },
-				},
-				["subrace"] =
-				{
-					["Barbarian"] = { "rm_barb.txt", 0 },
-					["Classical"] = { "rm_class.txt", 0 },
-					["Corrupted"] = { "rm_corru.txt", 0 },
-					["Hermit"] = { "rm_herm.txt", 0 },
-					["LostSoul"] = { "rm_lsoul.txt", 0 },
-					["Skeleton"] = { "rm_skel.txt", 0 },
-					["Spectre"] = { "rm_spec.txt", 0 },
-					["Vampire"] = { "rm_vamp.txt", 0 },
-					["Zombie"] = { "rm_zomb.txt", 0 },
-				},
-				["class"] =
-				{
-					["Alchemist"] = { "c_alchem.txt", 0 },
-					["Archer"] = { "c_archer.txt", 0 },
-					["Assassin"] = { "c_assass.txt", 0 },
-					["Axemaster"] = { "c_axemas.txt", 0 },
-					["Bard"] = { "c_bard.txt", 0 },
-					["Dark-Priest"] = { "c_pr_drk.txt", 0 },
-					["Demonologist"] = { "c_demono.txt", 0 },
-					["Druid"] = { "c_druid.txt", 0 },
-					["Geomancer"] = { "c_geoman.txt", 0 },
-					["Haftedmaster"] = { "c_hafted.txt", 0 },
-					["Loremaster"] = { "c_lorema.txt", 0 },
-					["Mage"] = { "c_mage.txt", 0 },
-					["Mimic"] = { "c_mimic.txt", 0 },
-					["Mindcrafter"] = { "c_mindcr.txt", 0 },
-					["Monk"] = { "c_monk.txt", 0 },
-					["Necromancer"] = { "c_necro.txt", 0 },
-					["Paladin"] = { "c_palad.txt", 0 },
-					["Polearmmaster"] = { "c_polear.txt", 0 },
-					["Possessor"] = { "c_posses.txt", 0 },
-					["Priest"] = { "c_priest.txt", 0 },
-					["Priest(Eru)"] = { "c_pr_eru.txt", 0 },
-					["Priest(Manwe)"] = { "c_pr_man.txt", 0 },
-					["Ranger"] = { "c_ranger.txt", 0 },
-					["Rogue"] = { "c_rogue.txt", 0 },
-					["Runecrafter"] = { "c_runecr.txt", 0 },
-					["Sorceror"] = { "c_sorcer.txt", 0 },
-					["Summoner"] = { "c_summon.txt", 0 },
-					["Swordmaster"] = { "c_swordm.txt", 0 },
-					["Symbiant"] = { "c_symbia.txt", 0 },
-					["Thaumaturgist"] = { "c_thaum.txt", 0 },
-					["Unbeliever"] = { "c_unbel.txt", 0 },
-					["Warper"] = { "c_warper.txt", 0 },
-					["Warrior"] = { "c_warrio.txt", 0 },
-				},
-				["god"] =
-				{
-					["Eru Iluvatar"] = { "g_eru.txt", 0 },
-					["Manwe Sulimo"] = { "g_manwe.txt", 0 },
-					["Tulkas"] = { "g_tulkas.txt", 0 },
-					["Melkor Bauglir"] = { "g_melkor.txt", 0 },
-					["Yavanna Kementari"] = { "g_yavann.txt", 0 },  
-				},
-				["skill"] =
-				{
-					["Air"] = { "skills.txt", 27 },
-					["Alchemy"] = { "skills.txt", 49 },
-					["Antimagic"] = { "skills.txt", 50 },
-					["Archery"] = { "skills.txt", 08 },
-					["Axe-mastery"] = { "skills.txt", 05 },
-					["Backstab"] = { "skills.txt", 18 },
-					["Barehand-combat"] = { "skills.txt", 13 },
-					["Boomerang-mastery"] = { "skills.txt", 12 },
-					["Boulder-throwing"] = { "skills.txt", 58 },
-					["Bow-mastery"] = { "skills.txt", 10 },
-					["Combat"] = { "skills.txt", 01 },
-					["Conveyance"] = { "skills.txt", 30 },
-					["Corpse-preservation"] = { "skills.txt", 44 },
-					["Critical-hits"] = { "skills.txt", 04 },
-					["Crossbow-mastery"] = { "skills.txt", 11 },
-					["Demonology"] = { "skills.txt", 52 },
-					["Disarming"] = { "skills.txt", 16 },
-					["Divination"] = { "skills.txt", 31 },
-					["Dodging"] = { "skills.txt", 20 },
-					["Druidistic"] = { "skills.txt", 40 },
-					["Earth"] = { "skills.txt", 28 },
-					["Fire"] = { "skills.txt", 25 },
-					["Geomancy"] = { "skills.txt", 60 },
-					["Hafted-mastery"] = { "skills.txt", 06 },
-					["Magic"] = { "skills.txt", 21 },
-					["Magic-Device"] = { "skills.txt", 54 },
-					["Mana"] = { "skills.txt", 24 },
-					["Meta"] = { "skills.txt", 29 },
-					["Mimicry"] = { "skills.txt", 47 },
-					["Mind"] = { "skills.txt", 33 },
-					["Mindcraft"] = { "skills.txt", 41 },
-					["Monster-lore"] = { "skills.txt", 42 },
-					["Music"] = { "skills.txt", 59 },
-					["Nature"] = { "skills.txt", 34 },
-					["Necromancy"] = { "skills.txt", 35 },
-					["Polearm-mastery"] = { "skills.txt", 07 },
-					["Possession"] = { "skills.txt", 45 },
-					["Prayer"] = { "skills.txt", 39 },
-					["Runecraft"] = { "skills.txt", 36 },
-					["Sling-mastery"] = { "skills.txt", 09 },
-					["Sneakiness"] = { "skills.txt", 14 },
-					["Spell-power"] = { "skills.txt", 22 },
-					["Spirituality"] = { "skills.txt", 38 },
-					["Sorcery"] = { "skills.txt", 23 },
-					["Stealing"] = { "skills.txt", 19 },
-					["Stealth"] = { "skills.txt", 15 },
-					["Stunning-blows"] = { "skills.txt", 53 },
-					["Summoning"] = { "skills.txt", 43 },
-					["Sword-mastery"] = { "skills.txt", 03 },
-					["Symbiosis"] = { "skills.txt", 46 },
-					["Temporal"] = { "skills.txt", 32 },
-					["Thaumaturgy"] = { "skills.txt", 37 },
-					["Udun"] = { "skills.txt", 48 },
-					["Weaponmastery"] = { "skills.txt", 02 },
-					["Water"] = { "skills.txt", 26 },
-				},
-				["ability"] = 
-				{
-				    ["Spread blows"] = { "ability.txt", 02 },
-				    ["Tree walking"] = { "ability.txt", 03 },
-				    ["Perfect casting"] = { "ability.txt", 04 },
-				    ["Extra Max Blow(1)"] = { "ability.txt", 05 },
-				    ["Extra Max Blow(2)"] = { "ability.txt", 06 },
-				    ["Ammo creation"] = { "ability.txt", 07 },
-				    ["Touch of death"] = { "ability.txt", 08 },
-				    ["Artifact Creation"] = { "ability.txt", 09 },
-				    ["Far reaching attack"] = { "ability.txt", 10 },
-				    ["Trapping"] = { "ability.txt", 11 },
-				    ["Undead Form"] = { "ability.txt", 12 },
-				},
-			}
-
-			if t[typ][name] then ingame_help_doc(t[typ][name][1], t[typ][name][2])
-			else ingame_help_doc("help.hlp", 0)
-			end
-	end,
-}
-
-ingame_help
-{
-	["hook"] =      HOOK_IDENTIFY,
-	["event"] =     function(i, mode)
-				if mode == "full" then
-					local obj = get_object(i)
-					local f1, f2, f3, f4, f5, esp = object_flags(obj)
-					if band(f5, TR5_SPELL_CONTAIN) ~= 0 then return TRUE end
-				end
-			end,
-	["desc"] =
-	{
-		"Ah, an item that can contain a spell. To use it you must have some levels of",
-		"Magic skill and then you get the option to copy a spell when pressing m.",
-		"Then just select which spell to copy and to which object. Note that doing so",
-		"is permanent; the spell cannot be removed or changed later.",
-	}
-}
-
-ingame_help
-{
-	["hook"] =      HOOK_GET,
-	["event"] =     function(obj, idx) if obj.tval == TV_BATERIE then return TRUE end end,
-	["desc"] =
-	{
-		"Ah, an essence! Those magical containers stores energies. They are used",
-		"with the Alchemy skill to create or modify the powers of items.",
-	}
-}
-
-ingame_help
-{
-	["hook"] =      HOOK_GET,
-	["event"] =     function(obj, idx) if obj.tval == TV_RUNE1 or obj.tval == TV_RUNE2 then return TRUE end end,
-	["desc"] =
-	{
-		"Ah, a rune! Runes are used with the Runecraft skill to allow you to",
-		"create spells on your own.",
-	}
-}
-
-ingame_help
-{
-	["hook"] =      HOOK_GET,
-	["event"] =     function(obj, idx) if obj.tval == TV_ROD_MAIN then return TRUE end end,
-	["desc"] =
-	{
-		"This is a rod. You will need to attach a rod tip to it before you",
-		"can use it. This main part of the rod may give the rod bonuses",
-		"like quicker charging time, or a larger capacity for charges.",
-	}
-}
-
-ingame_help
-{
-	["hook"] =      HOOK_GET,
-	["event"] =     function(obj, idx) if obj.tval == TV_ROD then return TRUE end end,
-	["desc"] =
-	{
-		"You've found a rod-tip! You will need to attach it to a rod base",
-		"before you can use it. Once it has been attatched (use the 'z' key)",
-		"you cannot unattach it! The rod tip will determine the effect of",
-		"the rod. To use your rod, 'z'ap it once it has been assembled.",
-	}
-}
-
-ingame_help
-{
-	["hook"] =      HOOK_GET,
-	["event"] =     function(obj, idx) if obj.tval == TV_TRAPKIT then return TRUE end end,
-	["desc"] =
-	{
-		"Ooooh, a trapping kit. If you have ability in the trapping skill,",
-		"you can lay this trap (via the 'm' key) to harm unsuspecting foes.",
-		"You'll generally need either some ammo or magic device depending",
-		"on the exact type of trap kit.",
-	}
-}
-
-ingame_help
-{
-	["hook"] =      HOOK_RECALC_SKILLS,
-	["event"] =     function() if game.started and (get_melee_skills() > 1) then return TRUE end end,
-	["desc"] =
-	{
-		"Ah, you now possess more than one melee type. To switch between them press m",
-		"and select the switch melee type option.",
-	}
-}
-
-ingame_help
-{
-	["hook"] =      HOOK_GET,
-	["event"] =     function(obj, idx) if obj.tval == TV_WAND or obj.tval == TV_STAFF then return TRUE end end,
-	["desc"] =
-	{
-		"You've found a magical device, either a staff or a wand. Each staff",
-		"contains a spell, often from one of the primary magic schools. There",
-		"is a lot of information you can find about this object if you identify",
-		"it and 'I'nspect it. Check the help file on Magic for more about these.",
-	}
-}
-
-ingame_help
-{
-	["hook"] =      HOOK_PLAYER_LEVEL,
-	["event"] =     function(y, x) if player.lev >= 20 then return TRUE end end,
-	["desc"] =
-	{
-		"I see you are now at least level 20. Nice! If you want to gloat about your",
-		"character you could press 'C' then 'f' to make a character dump and post it to",
-		"http://angband.oook.cz/ where it will end up in the ladder.",
-	}
-}
diff --git a/lib/scpt/init.lua b/lib/scpt/init.lua
deleted file mode 100644
index a6f3f8ab..00000000
--- a/lib/scpt/init.lua
+++ /dev/null
@@ -1,46 +0,0 @@
---
--- This file is loaded at the initialisation of ToME
---
-
--- Load the class specific stuff
-tome_dofile("player.lua")
-
--- Load the ingame contextual help
-tome_dofile("help.lua")
-
--- let the store specific stuff happen!
-tome_dofile("stores.lua")
-
--- Add various 'U' powers
-tome_dofile("powers.lua")
-
--- Add the mimic shapes
-tome_dofile("mimic.lua")
-
--- Add the corruptions
-tome_dofile("corrupt.lua")
-
--- Add the mkey activations
-tome_dofile("mkeys.lua")
-
--- Add the schools of magic
-tome_dofile("spells.lua")
-
--- Add god stuff
-tome_dofile("gods.lua")
-
--- Add some quests
-tome_dofile("bounty.lua")
-tome_dofile("god.lua")
-tome_dofile("fireprof.lua")
-tome_dofile("library.lua")
-
--- Add joke stuff
-tome_dofile("drunk.lua")
-tome_dofile("joke.lua")
-
--- Some tests, if the file is not present, this is fine
-tome_dofile_anywhere(ANGBAND_DIR_SCPT, "dg_test.lua", FALSE)
-
--- A nice custom intro :)
-tome_dofile("intro.lua")
diff --git a/lib/scpt/intro.lua b/lib/scpt/intro.lua
deleted file mode 100644
index ef6041a5..00000000
--- a/lib/scpt/intro.lua
+++ /dev/null
@@ -1,39 +0,0 @@
-function tome_intro()
-	screen_save()
-	Term_clear()
-
-	if (TRUE == drop_text_left(TERM_L_BLUE, "Art thou an adventurer,", 10, 0)) then screen_load() return end
-	if (TRUE == drop_text_right(TERM_L_BLUE, "One who passes through the waterfalls we call danger", 11, -1)) then screen_load() return end
-	if (TRUE == drop_text_left(TERM_L_BLUE, "to find the true nature of the legends beyond them?", 12, 0)) then screen_load() return end
-	if (TRUE == drop_text_right(TERM_L_BLUE, "If this is so, then seeketh me.", 13, -1)) then screen_load() return end
-
-	if (TRUE == drop_text_left(TERM_WHITE, "[Press any key to continue]", 23, -1)) then screen_load() return end
-
-	Term_putch(0, 0, TERM_DARK, 32)
-	inkey_scan = FALSE
-	inkey()
-
-	Term_clear()
-
-	if (TRUE == drop_text_left(TERM_L_BLUE, "DarkGod", 8, 0)) then screen_load() return end
-	if (TRUE == drop_text_right(TERM_WHITE, "in collaboration with", 9, -1)) then screen_load() return end
-	if (TRUE == drop_text_left(TERM_L_GREEN, "Eru Iluvatar,", 10, 0)) then screen_load() return end
-	if (TRUE == drop_text_right(TERM_L_GREEN, "Manwe", 11, -1)) then screen_load() return end
-	if (TRUE == drop_text_left(TERM_WHITE, "and", 12, 0)) then screen_load() return end
-	if (TRUE == drop_text_right(TERM_L_GREEN, "All the T.o.M.E. contributors(see credits.txt)", 13, -1)) then screen_load() return end
-
-	if (TRUE == drop_text_left(TERM_WHITE, "present", 15, 1)) then screen_load() return end
-	if (TRUE == drop_text_right(TERM_YELLOW, "T.o.M.E.", 16, 0)) then screen_load() return end
-
-	if (TRUE == drop_text_left(TERM_WHITE, "[Press any key to continue]", 23, -1)) then screen_load() return end
-	Term_putch(0, 0, TERM_DARK, 32)
-
-	inkey_scan = FALSE
-
-	inkey()
-
-	screen_load()
-	return
-end
-
-add_hook_script(HOOK_INIT, "tome_intro", "lua_intro_init")
diff --git a/lib/scpt/joke.lua b/lib/scpt/joke.lua
deleted file mode 100644
index 2d87b651..00000000
--- a/lib/scpt/joke.lua
+++ /dev/null
@@ -1,31 +0,0 @@
--- Place a monster in a good spot
-function gen_joke_place_monster(r_idx)
-	local try = 1000
-	local x
-	local y
-	while try > 0 do
-		x = randint(cur_hgt - 4) + 2
-		y = randint(cur_wid - 4) + 2
-		if not (0 == place_monster_one(y, x, r_idx, 0, FALSE, MSTATUS_ENEMY)) then
-			return
-		end
-		try = try - 1
-	end
-end
-
--- Check if a special joke monster can be generated here
-function gen_joke_monsters()
-	if joke_monsters == FALSE then
-		return
-	end
-
-	-- Neil
-	if (current_dungeon_idx == 20) and (dun_level == 72) then
-		neil = test_monster_name("Neil, the Sorceror")
-		m_allow_special[neil + 1] = TRUE
-		gen_joke_place_monster(neil)
-		m_allow_special[neil + 1] = FALSE
-	end
-end
-
-add_hook_script(HOOK_LEVEL_END_GEN, "gen_joke_monsters", "gen_joke_monsters")
diff --git a/lib/scpt/library.lua b/lib/scpt/library.lua
deleted file mode 100644
index 1433e47f..00000000
--- a/lib/scpt/library.lua
+++ /dev/null
@@ -1,436 +0,0 @@
--- Library quest in Minas Anor
-
--- Partially based on Fireproofing quest
-
-library_quest = {}
-
--- Map helper
-library_quest.place_random = function(minY, minX, maxY, maxX, monster)
-	y = randint(maxY - minY + 1) + minY
-	x = randint(maxX - minX + 1) + minX
-	return place_monster_one(y, x, monster, 0, TRUE, MSTATUS_ENEMY)
-end
-
--- Book creation helpers
-library_quest.bookable_spells =
-{
-	MANATHRUST, DELCURSES,
-	GLOBELIGHT, FIREGOLEM, FIREFLASH, FIREWALL,
-	GEYSER, VAPOR, ENTPOTION,
-	NOXIOUSCLOUD, POISONBLOOD,
-	STONESKIN, DIG,
-	RECHARGE, DISPERSEMAGIC,
-	BLINK, DISARM, TELEPORT,
-	SENSEMONSTERS, SENSEHIDDEN, REVEALWAYS, IDENTIFY, VISION,
-	MAGELOCK, SLOWMONSTER, ESSENCESPEED,
-	CHARM, CONFUSE, ARMOROFFEAR, STUN,
-	GROWTREE, HEALING, RECOVERY,
-	ERU_SEE, ERU_LISTEN,
-	MANWE_BLESS, MANWE_SHIELD,
-	YAVANNA_CHARM_ANIMAL, YAVANNA_GROW_GRASS, YAVANNA_TREE_ROOTS,
-	TULKAS_AIM, TULKAS_SPIN,
-	MELKOR_CURSE, MELKOR_CORPSE_EXPLOSION,
-	DRAIN
-}
-
-library_quest.get_term_size = function()
-	local width = 0
-	local height = 0
-	ret, width, height = Term_get_size(width, height)
-	return width, height
-end
-
-library_quest.book_slots_left = function()
-	if school_book[61][1] == -1 then
-		return 3
-	elseif school_book[61][2] == -1 then
-		return 2
-	elseif school_book[61][3] == -1 then
-		return 1
-	else
-		return 0
-	end
-end
-
-library_quest.book_contains_spell = function(spell)
-	if school_book[61][1] == spell then
-		return TRUE
-	elseif school_book[61][2] == spell then
-		return TRUE
-	elseif school_book[61][3] == spell then
-		return TRUE
-	else
-		return FALSE
-	end
-end
-
-library_quest.add_spell = function(spell)
-	if school_book[61][1] == -1 then
-		school_book[61][1] = spell
-		return TRUE
-	elseif school_book[61][2] == -1 then
-		school_book[61][2] = spell
-		return TRUE
-	elseif school_book[61][3] == -1 then
-		school_book[61][3] = spell
-		return TRUE
-	else
-		return FALSE
-	end
-end
-
-library_quest.remove_spell = function(spell)
-	if school_book[61][1] == spell then
-		school_book[61][1] = school_book[61][2]
-		school_book[61][2] = school_book[61][3]
-		school_book[61][3] = -1
-		return TRUE
-	elseif school_book[61][2] == spell then
-		school_book[61][2] = school_book[61][3]
-		school_book[61][3] = -1
-		return TRUE
-	elseif school_book[61][3] == spell then
-		school_book[61][3] = -1
-		return TRUE
-	else
-		return FALSE
-	end
-end
-
--- Print a spell (taken from s_aux)
-function library_quest.print_spell(color, y, spl)
-	local x, index, sch, size, s
-
-	x = 0
-	size = 0
-	book = 255
-	obj = nil
-
-	-- Hack if the book is 255 it is a random book
-	if book == 255 then
-		school_book[book] = {spl}
-	end
-
-	-- Parse all spells
-	for index, s in school_book[book] do
-		local lvl, na = get_level_school(s, 50, -50)
-		local xx, sch_str
-
-		sch_str = spell_school_name(s)
-
-		if s == spl then
-			if na then
-				c_prt(color, format("%-20s%-16s   %3s %4s %3d%s %s", spell(s).name, sch_str, na, get_mana(s), spell_chance(s), "%", __spell_info[s]()), y, x)
-			else
-				c_prt(color, format("%-20s%-16s   %3d %4s %3d%s %s", spell(s).name, sch_str, lvl, get_mana(s), spell_chance(s), "%", __spell_info[s]()), y, x)
-			end
-			y = y + 1
-			size = size + 1
-		end
-	end
-	return y
-end
-
--- spell selection routines inspired by skills.c
-library_quest.print_spells = function(first, current)
-	Term_clear()
-	width, height = library_quest.get_term_size()
-	slots = library_quest.book_slots_left()
-
-	c_prt(TERM_WHITE, "Book Creation Screen", 0, 0);
-	c_prt(TERM_WHITE, "Up/Down to move, Right/Left to modify, I to describe, Esc to Save/Cancel", 1, 0);
-
-	if slots == 0 then
-		c_prt(TERM_L_RED, "The book can hold no more spells.", 2, 0);
-	elseif slots == 1 then
-		c_prt(TERM_L_BLUE, "The book can hold 1 more spell.", 2, 0);
-	else
-		c_prt(TERM_L_BLUE, "The book can hold "..slots.." more spells.", 2, 0);
-	end
-
-	row = 3;
-	for index, spell in library_quest.bookable_spells do
-		if index >= first then
-			if index == current then
-				color = TERM_GREEN
-			elseif library_quest.book_contains_spell(spell) == TRUE then
-				color = TERM_WHITE
-			else
-				color = TERM_ORANGE
-			end
-			library_quest.print_spell(color, row, spell)
-	
-			if row == height - 1 then
-				return
-			end
-			row = row + 1
-		end
-	end
-end
-
-library_quest.fill_book = function()
-	-- Always start with a cleared book
-	school_book[61] = {-1, -1, -1}
-
-	screen_save()
-	width, height = library_quest.get_term_size()
-	-- room for legend
-	margin = 3
-
-	first = 1
-	current = 1
-	done = FALSE
-
-	while done == FALSE do
-		library_quest.print_spells(first, current)
-
-		inkey_scan = FALSE
-		inkey_base = TRUE
-		char = inkey()
-		dir = get_keymap_dir(char)
-		if char == ESCAPE then
-			if library_quest.book_slots_left() == 0 then
-				flush()
-				done = get_check("Really create the book?")
-			else
-				done = TRUE
-			end
-		elseif char == strbyte('\r') then
-			-- TODO: make tree of schools
-		elseif char == strbyte('n') then
-			current = current + height
-		elseif char == strbyte('p') then
-			current = current - height
-		elseif char == strbyte('I') then
-			print_spell_desc(library_quest.bookable_spells[current], 0)
-			inkey()
-		elseif dir == 2 then
-			current = current + 1
-		elseif dir == 8 then
-			current = current - 1
-		elseif dir == 6 then
-			if library_quest.book_contains_spell(library_quest.bookable_spells[current]) == FALSE then
-				library_quest.add_spell(library_quest.bookable_spells[current])
-			end
-		elseif dir == 4 then
-			library_quest.remove_spell(library_quest.bookable_spells[current])
-		end
-		total = getn(library_quest.bookable_spells)
-		if current > total then
-			current = total
-		elseif current < 1 then
-			current = 1
-		end
-		
-		if current > (first + height - margin - 1) then
-			first = current - height + margin + 1
-		elseif first > current then
-			first = current
-		end
-	end
-
-	screen_load()
-end
-
--- Quest data and hooks
-add_quest
-{
-	["global"] = "LIBRARY_QUEST",
-	["name"] = "Library quest",
-	["desc"] = function()
-		-- Quest taken
-		if (quest(LIBRARY_QUEST).status == QUEST_STATUS_TAKEN) then
-			print_hook("#####yAn Old Mages Quest! (Danger Level: 35)\n")
-			print_hook("Make the library safe for the old mage in Minas Anor.\n")
-			print_hook("\n")
-		-- Quest done, book not gotten yet
-		elseif (quest(LIBRARY_QUEST).status == QUEST_STATUS_COMPLETED) then
-			print_hook("#####yAn Old Mages Quest!\n")
-			print_hook("You have made the library safe for the old mage in Minas Anor.\n")
-			print_hook("Perhaps you should see about a reward.\n")
-			print_hook("\n")
-		end
-	end,
-	["level"] = 35,
-	["data"] =
-	{
-		["school_book[61][1]"] = -1,
-		["school_book[61][2]"] = -1,
-		["school_book[61][3]"] = -1
-	},
-	["hooks"] =
-	{
-		-- Start the game without the quest, need to request it
-		[HOOK_BIRTH_OBJECTS] = function()
-			quest(LIBRARY_QUEST).status = QUEST_STATUS_UNTAKEN
-			school_book[61] = {-1, -1, -1}
-		end,
-
-		[HOOK_GEN_QUEST] = function()
-			-- Only if player doing this quest
-			if (player.inside_quest ~= LIBRARY_QUEST) then
-				return FALSE
-			end
-
-			load_map("library.map", 2, 2)
-			level_flags2 = DF2_NO_GENO
-
-			-- generate the Liches 518
-			liches = damroll(4, 2) -- plus one on the map
-			while(liches > 0) do
-				if 0 < library_quest.place_random(4, 4, 14, 37, 518) then
-					liches = liches - 1
-				end
-			end
-
-			-- generate the Monastic liches 611
-			liches = damroll(1, 2)
-			while(liches > 0) do
-				if 0 < library_quest.place_random(14, 34, 37, 67, 611) then
-					liches = liches - 1
-				end
-			end
-
-			-- generate more Monastic liches 611
-			liches = damroll(1, 2) - 1
-			while(liches > 0) do
-				if 0 < library_quest.place_random(4, 34, 14, 67, 611) then
-					liches = liches - 1
-				end
-			end
-
-			-- generate even more Monastic liches 611
-			liches = damroll(1, 2) - 1
-			while(liches > 0) do
-				if 0 < library_quest.place_random(14, 4, 37, 34, 611) then
-					liches = liches - 1
-				end
-			end
-
-			-- Flesh golem 256
-			golems = 2
-			while(golems > 0) do
-				if 0 < library_quest.place_random(10, 10, 37, 67, 256) then
-					golems = golems - 1
-				end
-			end
-
-			-- Clay golem 261
-			golems = 2
-			while(golems > 0) do
-				if 0 < library_quest.place_random(10, 10, 37, 67, 261) then
-					golems = golems - 1
-				end
-			end
-
-			-- Iron golem 367
-			golems = 2
-			while(golems > 0) do
-				if 0 < library_quest.place_random(10, 10, 37, 67, 367) then
-					golems = golems - 1
-				end
-			end
-
-			-- Mithril Golem 464
-			golems = 1
-			while(golems > 0) do
-				if 0 < library_quest.place_random(10, 10, 37, 67, 464) then
-					golems = golems - 1
-				end
-			end
-
-			-- one Master lich is on the map
-
-			return TRUE
-		end,
-		[HOOK_STAIR] = function()
-			local ret
-
-			-- only ask this if player about to go up stairs of quest and hasn't won yet
-			if (player.inside_quest ~= LIBRARY_QUEST) or (quest(LIBRARY_QUEST).status == QUEST_STATUS_COMPLETED) then
-				return FALSE
-			end
-
-			if cave(player.py, player.px).feat ~= FEAT_LESS then return end
-
-			-- flush all pending input
-			flush()
-
-			-- confirm
-			ret = get_check("Really abandon the quest?")
-
-			-- if yes, then
-			if ret == TRUE then
-				-- fail the quest
-				quest(LIBRARY_QUEST).status = QUEST_STATUS_FAILED
-				return FALSE
-			else 
-				-- if no, they stay in the quest
-				return TRUE
-			end
-		end,
-		[HOOK_MONSTER_DEATH] = function()
-			-- if they're in the quest and haven't won, continue
-			if (player.inside_quest ~= LIBRARY_QUEST) or (quest(LIBRARY_QUEST).status == QUEST_STATUS_COMPLETED) then
-				return FALSE
-			end
-
-			i = 1
-			count = -1
-			while i <= m_max do
-				local monster = m_list[i]
-				if (monster.r_idx > 0) and (monster.status <= MSTATUS_ENEMY) then
-					count = count + 1
-				end
-				i = i + 1
-			end
-
-			if count == 0 then
-				quest(LIBRARY_QUEST).status = QUEST_STATUS_COMPLETED
-				msg_print(TERM_YELLOW, "The library is safe now.")
-			end
-		end,
-	},
-}
-
--- Library store action
-add_building_action
-{
-	["index"] = 61,
-	["action"] = function()
-		-- the quest hasn't been requested already, right?
-		if quest(LIBRARY_QUEST).status == QUEST_STATUS_UNTAKEN then
-			-- quest has been taken now
-			quest(LIBRARY_QUEST).status = QUEST_STATUS_TAKEN
-
-			-- issue instructions
-			msg_print("I need get some stock from my main library, but it is infested with monsters!")
-			msg_print("Please use the side entrance and vanquish the intruders for me.")
-
-			return TRUE, FALSE, TRUE
-		-- if quest completed
-		elseif (quest(LIBRARY_QUEST).status == QUEST_STATUS_COMPLETED) then
-			msg_print("Thank you!  Let me make a special book for you.")
-			msg_print("Tell me three spells and I will write them in the book.")
-			library_quest.fill_book()
-			if library_quest.book_slots_left() == 0 then
-				quest(LIBRARY_QUEST).status = QUEST_STATUS_REWARDED
-				book = create_object(TV_BOOK, 61)
-				book.art_name = quark_add(player_name())
-				book.found = OBJ_FOUND_REWARD
-				set_aware(book)
-				set_known(book)
-				inven_carry(book, FALSE)
-			end
-
-		-- if the player asks for a quest when they already have it, but haven't failed it, give them some extra instructions
-		elseif (quest(LIBRARY_QUEST).status == QUEST_STATUS_TAKEN) then
-			msg_print("Please use the side entrance and vanquish the intruders for me.")
-
-		-- quest failed or completed, then give no more quests
-		elseif (quest(LIBRARY_QUEST).status == QUEST_STATUS_FAILED) or (quest(LIBRARY_QUEST).status == QUEST_STATUS_REWARDED) then
-			msg_print("I have no more quests for you.")
-		end
-		return TRUE
-	end,
-}
diff --git a/lib/scpt/mimic.lua b/lib/scpt/mimic.lua
deleted file mode 100644
index 6529f35c..00000000
--- a/lib/scpt/mimic.lua
+++ /dev/null
@@ -1,419 +0,0 @@
--- Define the various possible mimic shapes
-
--- Nature shapes
-add_mimic_shape
-{
-	["name"] =      "Mouse",
-	["obj_name"] =  "Mouse Fur",
-	["desc"] = 	"Mice are small, fast and very stealthy",
-	["realm"] =     "nature",
-	["level"] =     1,
-	["rarity"] =    10,
-	["duration"] =  {20, 40},
-	["calc"] =      function ()
-			-- Mice run!
-			player.pspeed = player.pspeed + 5 + (player.mimic_level / 7)
-
-			-- They can crtawl under your armor to hit you ;)
-			player.to_h = player.to_h + 10 + (player.mimic_level / 5)
-			player.dis_to_h = player.dis_to_h + 10 + (player.mimic_level / 5)
-
-			-- But they are not very powerfull
-			player.to_d = player.to_d / 5
-			player.dis_to_d = player.dis_to_d / 5
-
-			-- But they are stealthy
-			player.skill_stl = player.skill_stl + 10 + (player.mimic_level / 5)
-
-			-- Stat mods
-			player.modify_stat(A_STR, -5)
-			player.modify_stat(A_DEX, 3)
-			player.modify_stat(A_CON, 1)
-
-	end,
-	["power"] =     function()
-			if player.mimic_level >= 30 then
-				player.add_power(POWER_INVISIBILITY)
-			end
-	end,
-}
-
-add_mimic_shape
-{
-	["name"] =      "Eagle",
-	["obj_name"] =  "Feathers Cloak",
-	["desc"] = 	"Eagles are master of the air, good hunters with excellent vision.",
-	["realm"] =     "nature",
-	["level"] =     10,
-	["rarity"] =    30,
-	["duration"] =  {10, 50},
-	["calc"] =      function ()
-			player.ffall = TRUE
-			player.pspeed = player.pspeed + 2 + (player.mimic_level / 6)
-
-			player.modify_stat(A_STR, -3)
-			player.modify_stat(A_DEX, 2 + (player.mimic_level / 15))
-			player.modify_stat(A_CON, 4 + (player.mimic_level / 20))
-			player.modify_stat(A_INT, -1)
-			player.modify_stat(A_WIS, 1)
-			player.modify_stat(A_CHR, -1)
-
-			if player.mimic_level >= 20 then
-                player.xtra_f4 = bor(player.xtra_f4, TR4_FLY)
-                player.xtra_f3 = bor(player.xtra_f3, TR3_SEE_INVIS)
-			end
-			if player.mimic_level >= 25 then
-                player.xtra_f2 = bor(player.xtra_f2, TR2_FREE_ACT)
-			end
-			if player.mimic_level >= 30 then
-                player.xtra_f2 = bor(player.xtra_f2, TR2_RES_ELEC)
-			end
-			if player.mimic_level >= 30 then
-                player.xtra_f3 = bor(player.xtra_f3, TR3_SH_ELEC)
-			end
-	end,
-}
-
-add_mimic_shape
-{
-	["name"] =      "Wolf",
-	["obj_name"] =  "Wolf Pelt",
-	["desc"] = 	"Wolves are masters of movement, strong and have excellent eyesight.",
-	["realm"] =     "nature",
-	["level"] =     20,
-	["rarity"] =    40,
-	["duration"] =  {10, 50},
-	["calc"] =      function ()
-			player.modify_stat(A_STR, 2 + (player.mimic_level / 20))
-			player.modify_stat(A_DEX, 3 + (player.mimic_level / 20))
-			player.modify_stat(A_INT, -3)
-			player.modify_stat(A_CHR, -2)
-
-			player.pspeed = player.pspeed + 10 + (player.mimic_level / 5)
-
-            player.xtra_f2 = bor(player.xtra_f2, TR2_FREE_ACT)
-            player.xtra_f2 = bor(player.xtra_f2, TR2_RES_FEAR)
-
-			if player.mimic_level >= 10 then
-				player.xtra_f2 = bor(player.xtra_f2, TR2_RES_COLD)
-			end
-			if player.mimic_level >= 15 then
-                player.xtra_f3 = bor(player.xtra_f3, TR3_SEE_INVIS)
-			end
-			if player.mimic_level >= 30 then
-				player.xtra_f2 = bor(player.xtra_f2, TR2_RES_DARK)
-			end
-			if player.mimic_level >= 35 then
-				player.xtra_f2 = bor(player.xtra_f2, TR2_RES_CONF)
-			end
-	end,
-}
-
-add_mimic_shape
-{
-	["name"] =      "Spider",
-	["obj_name"] =  "Spider Web",
-	["desc"] = 	"Spiders are clever and become good climbers.",
-	["realm"] =     "nature",
-	["level"] =     25,
-	["rarity"] =    50,
-	["duration"] =  {10, 50},
-	["calc"] =      function ()
-			player.modify_stat(A_STR, -4)
-			player.modify_stat(A_DEX, 1 + (player.mimic_level / 8))
-			player.modify_stat(A_INT, 1 + (player.mimic_level / 5))
-			player.modify_stat(A_WIS, 1 + (player.mimic_level / 5))
-			player.modify_stat(A_CON, -5)
-			player.modify_stat(A_CHR, -10)
-
-			player.pspeed = player.pspeed + 5
-
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_POIS)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_FEAR)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_DARK)
-
-			if player.mimic_level >= 40 then
-                player.xtra_f4 = bor(player.xtra_f4, TR4_CLIMB)
-			end
-
-	end,
-	["power"] =     function()
-			if player.mimic_level >= 25 then
-				player.add_power(POWER_WEB)
-			end
-	end,
-}
-
-add_mimic_shape
-{
-	["name"] =      "Elder Ent",
-	["obj_name"] =  "Entish Bark",
-	["desc"] = 	"Ents are powerful tree-like beings dating from the dawn of time.",
-	["realm"] =     "nature",
-	["level"] =     40,
-	["rarity"] =    60,
-	["duration"] =  {10, 30},
-	["limit"] =     TRUE,
-	["calc"] =      function ()
-			player.pspeed = player.pspeed - 5 - (player.mimic_level / 10)
-
-			player.to_a = player.to_a + 10 + player.mimic_level
-			player.dis_to_a = player.dis_to_a + 10 + player.mimic_level
-
-			player.modify_stat(A_STR, player.mimic_level / 5)
-			player.modify_stat(A_INT, - (player.mimic_level / 7))
-			player.modify_stat(A_WIS, - (player.mimic_level / 7))
-			player.modify_stat(A_DEX, -4)
-			player.modify_stat(A_CON, player.mimic_level / 5)
-			player.modify_stat(A_CHR, -7)
-
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_POIS)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_COLD)
-            player.xtra_f2 = bor(player.xtra_f2, TR2_FREE_ACT)
-            player.xtra_f3 = bor(player.xtra_f3, TR3_REGEN)
-            player.xtra_f3 = bor(player.xtra_f3, TR3_SEE_INVIS)
-            player.xtra_f2 = bor(player.xtra_f2, TR2_SENS_FIRE)
-	end,
-	["power"] =     function ()
-			player.add_power(PWR_GROW_TREE)
-	end,
-}
-
-add_mimic_shape
-{
-	["name"] =      "Vapour",
-	["obj_name"] =  "Cloak of Mist",
-	["desc"] = 	"A sentient cloud, darting around",
-	["realm"] =     "nature",
-	["level"] =     15,
-	["rarity"] =    10,
-	["duration"] =  {10, 40},
-	["calc"] =      function ()
-
-			player.pspeed = player.pspeed + 5
-
-			--Try to hit a cloud!
-			player.to_a = player.to_a + 40 + player.mimic_level
-			player.dis_to_a = player.dis_to_a + 40 + player.mimic_level
-
-			--Try to hit WITH a cloud!
-			player.to_h = player.to_h - 40
-			player.dis_to_h = player.dis_to_h -40
-
-			-- Stat mods
-			player.modify_stat(A_STR, -4)
-			player.modify_stat(A_DEX, 5)
-			player.modify_stat(A_CON, -4)
-			player.modify_stat(A_CHR, -10)
-
-			-- But they are stealthy
-			player.skill_stl = player.skill_stl + 10 + (player.mimic_level / 5)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_POIS)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_SHARDS)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_IM_COLD)
-            player.xtra_f2 = bor(player.xtra_f2, TR2_FREE_ACT)
-            player.xtra_f3 = bor(player.xtra_f3, TR3_REGEN)
-            player.xtra_f3 = bor(player.xtra_f3, TR3_SEE_INVIS)
-            player.xtra_f2 = bor(player.xtra_f2, TR2_SENS_FIRE)
-            player.xtra_f3 = bor(player.xtra_f3, TR3_FEATHER)
-	end,
-}
-
-add_mimic_shape
-{
-	["name"] =      "Serpent",
-	["obj_name"] =  "Snakeskin Cloak",
-	["desc"] = 	"Serpents are fast, lethal predators.",
-	["realm"] =     "nature",
-	["level"] =     30,
-	["rarity"] =    25,
-	["duration"] =  {15, 20},
-	["calc"] =      function ()
-			player.pspeed = player.pspeed + 10 + (player.mimic_level / 6)
-			player.to_a = player.to_a + 3 + (player.mimic_level / 8)
-			player.dis_to_a = player.dis_to_a + 3 + (player.mimic_level / 8)
-
-			player.modify_stat(A_STR, player.mimic_level / 8)
-			player.modify_stat(A_INT, -6)
-			player.modify_stat(A_WIS, -6)
-			player.modify_stat(A_DEX, -4)
-			player.modify_stat(A_CON, player.mimic_level / 7)
-			player.modify_stat(A_CHR, -6)
-
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_POIS)
-			if player.mimic_level >= 25 then
-            	player.xtra_f2 = bor(player.xtra_f2, TR2_FREE_ACT)
-			end
-	end,
-}
-
-add_mimic_shape
-{
-	["name"] =      "Mumak",
-	["obj_name"] =  "Mumak Hide",
-	["desc"] = 	"A giant, elaphantine form.",
-	["realm"] =     "nature",
-	["level"] =     40,
-	["rarity"] =    40,
-	["duration"] =  {15, 20},
-	["calc"] =      function ()
-			player.pspeed = player.pspeed - 5 - (player.mimic_level / 10)
-			player.to_a = player.to_a + 10 + (player.mimic_level / 6)
-			player.dis_to_a = player.dis_to_a + 10 + (player.mimic_level / 6)
-			player.to_d = player.to_d + 5 + ((player.mimic_level * 2) / 3)
-			player.dis_to_d = player.dis_to_d + 5 + ((player.mimic_level * 2) / 3)
-
-			player.modify_stat(A_STR, player.mimic_level / 4)
-			player.modify_stat(A_INT, -8)
-			player.modify_stat(A_WIS, -4)
-			player.modify_stat(A_DEX, -5)
-			player.modify_stat(A_CON, player.mimic_level / 3)
-			player.modify_stat(A_CHR, -10)
-
-			if player.mimic_level >= 10 then
-				player.xtra_f2 = bor(player.xtra_f2, TR2_RES_FEAR)
-			end
-			if player.mimic_level >= 25 then
-				player.xtra_f2 = bor(player.xtra_f2, TR2_RES_CONF)
-			end
-			if player.mimic_level >= 30 then
-            	player.xtra_f2 = bor(player.xtra_f2, TR2_FREE_ACT)
-			end
-			if player.mimic_level >= 35 then
-				player.xtra_f2 = bor(player.xtra_f2, TR2_RES_NEXUS)
-			end
-	end,
-}
-
---------- Extra shapes -----------
-
--- For Beornings
-add_mimic_shape
-{
-	["name"] =      "Bear",
-	["desc"] = 	"A fierce, terrible bear.",
-	["realm"] =     nil,
-	["level"] =     1,
-	["rarity"] =    101,
-	["duration"] =  {50, 200},
-	["limit"] =     TRUE,
-	["calc"] =      function ()
-			player.pspeed = player.pspeed - 5 + (player.mimic_level / 5)
-
-			player.to_a = player.to_a + 5 + ((player.mimic_level * 2) / 3)
-			player.dis_to_a = player.dis_to_a + 5 + ((player.mimic_level * 2) / 3)
-
-			player.modify_stat(A_STR, player.mimic_level / 11)
-			player.modify_stat(A_INT, player.mimic_level / 11)
-			player.modify_stat(A_WIS, player.mimic_level / 11)
-			player.modify_stat(A_DEX, -1)
-			player.modify_stat(A_CON, player.mimic_level / 11)
-			player.modify_stat(A_CHR, -10)
-
-			if player.mimic_level >= 10 then
-            	player.xtra_f2 = bor(player.xtra_f2, TR2_FREE_ACT)
-			end
-			if player.mimic_level >= 20 then
-	            player.xtra_f3 = bor(player.xtra_f3, TR3_REGEN)
-			end
-			if player.mimic_level >= 30 then
-				player.xtra_f2 = bor(player.xtra_f2, TR2_RES_CONF)
-			end
-			if player.mimic_level >= 35 then
-				player.xtra_f2 = bor(player.xtra_f2, TR2_RES_NEXUS)
-			end
-
-			-- activate the skill
-			skill(SKILL_BEAR).hidden = FALSE
-	end,
-}
-
--- For balrog corruptions
-add_mimic_shape
-{
-	["name"] =      "Balrog",
-	["desc"] = 	"A corrupted maia.",
-	["realm"] =     nil,
-	["level"] =     1,
-	["rarity"] =    101,
-	["duration"] =  {30, 70},
-	["limit"] =     TRUE,
-	["calc"] =      function ()
-			player.modify_stat(A_STR, 5 + player.mimic_level / 5)
-			player.modify_stat(A_INT, player.mimic_level / 10)
-			player.modify_stat(A_WIS, - ( 5 + player.mimic_level / 10))
-			player.modify_stat(A_DEX, player.mimic_level / 10)
-			player.modify_stat(A_CON, 5 + player.mimic_level / 5)
-			player.modify_stat(A_CHR, - ( 5 + player.mimic_level / 10))
-
-			player.xtra_f2 = bor(player.xtra_f2, TR2_IM_ACID)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_IM_FIRE)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_IM_ELEC)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_DARK)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_CHAOS)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_POIS)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_HOLD_LIFE)
-			player.xtra_f3 = bor(player.xtra_f3, TR3_FEATHER)
-			player.xtra_f3 = bor(player.xtra_f3, TR3_REGEN)
-			player.xtra_f3 = bor(player.xtra_f3, TR3_SH_FIRE)
-			player.xtra_f3 = bor(player.xtra_f3, TR3_LITE1)
-			return 1
-	end,
-}
-
--- For avatar spell
-add_mimic_shape
-{
-	["name"] =      "Maia",
-	["desc"] = 	"A near god-like being.",
-	["realm"] =     nil,
-	["level"] =     1,
-	["rarity"] =    101,
-	["duration"] =  {30, 70},
-	["limit"] =     TRUE,
-	["calc"] =      function ()
-			player.modify_stat(A_STR, 5 + player.mimic_level / 5)
-			player.modify_stat(A_INT, 5 + player.mimic_level / 5)
-			player.modify_stat(A_WIS, 5 + player.mimic_level / 5)
-			player.modify_stat(A_DEX, 5 + player.mimic_level / 5)
-			player.modify_stat(A_CON, 5 + player.mimic_level / 5)
-			player.modify_stat(A_CHR, 5 + player.mimic_level / 5)
-
-			player.xtra_f2 = bor(player.xtra_f2, TR2_IM_FIRE)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_IM_ELEC)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_IM_ACID)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_IM_COLD)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_POIS)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_LITE)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_DARK)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_CHAOS)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_HOLD_LIFE)
-			player.xtra_f3 = bor(player.xtra_f3, TR3_FEATHER)
-			player.xtra_f3 = bor(player.xtra_f3, TR3_REGEN)
-			return 2
-	end,
-}
-
--- For Geomancy
-add_mimic_shape
-{
-	["name"] =      "Fire Elem.",
-	["desc"] = 	"A towering column of flames",
-	["realm"] =     nil,
-	["level"] =     1,
-	["rarity"] =    101,
-	["duration"] =  {10, 10},
-	["limit"] =     TRUE,
-	["calc"] =      function ()
-			player.modify_stat(A_STR, 5 + (player.mimic_level / 5))
-			player.modify_stat(A_DEX, 5 + (player.mimic_level / 5))
-			player.modify_stat(A_WIS, -5 - (player.mimic_level / 5))
-
-			player.xtra_f2 = bor(player.xtra_f2, TR2_IM_FIRE)
-			-- was immune to poison in the 3.0.0 version
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_POIS)
-			player.xtra_f3 = bor(player.xtra_f3, TR3_SH_FIRE)
-			player.xtra_f3 = bor(player.xtra_f3, TR3_LITE1)
-			return 0
-	end,
-}
diff --git a/lib/scpt/mkeys.lua b/lib/scpt/mkeys.lua
deleted file mode 100644
index 07105c64..00000000
--- a/lib/scpt/mkeys.lua
+++ /dev/null
@@ -1,95 +0,0 @@
--- Mkeys for skills & abilities
-
-GF_INSTA_DEATH = add_spell_type
-{
-	["color"]       = { TERM_DARK, 0 },
-	["angry"]       = function() return TRUE, TRUE end,
-	["monster"]     = function(who, dam, rad, y, x, monst)
-			local race = race_info_idx(monst.r_idx, monst.ego)
-			if magik(5) == FALSE or band(race.flags1, RF1_UNIQUE) ~= FALSE or band(race.flags3, RF3_UNDEAD) ~= FALSE or band(race.flags3, RF3_NONLIVING) ~= FALSE then
-				return TRUE, FALSE
-			else
-				-- Reduce the exp gained this way
-				monst.level = monst.level / 3
-				return TRUE, FALSE, 32535, 0, 0, 0, 0, 0, 0, 0, " faints.", " is sucked out of life."
-			end
-	end,
-}
-
--- Death touch ability
-add_mkey
-{
-	["mkey"] 	= 100,
-	["fct"] 	= function()
-			if player.csp > 40 then
-				increase_mana(-40)
-				set_project(randint(30) + 10, GF_INSTA_DEATH, 1, 0, bor(PROJECT_STOP, PROJECT_KILL))
-				energy_use = 100
-			else
-				msg_print("You need at least 40 mana.")
-			end
-	end,
-}
-
-
--- Geomancy skill
-add_mkey
-{
-	["mkey"] 	= 101,
-	["fct"] 	= function()
-			local s
-
-			-- No magic
-			if (player.antimagic > 0) then
-				msg_print("Your anti-magic field disrupts any magic attempts.")
-				return
-			end
-
-			local obj = get_object(INVEN_WIELD)
-			if (obj.k_idx <= 0) or (obj.tval ~= TV_MSTAFF) then
-				msg_print('You must wield a magestaff to use Geomancy.')
-				return
-			end
-
-			s = get_school_spell("cast", "is_ok_spell", 62);
-
-			-- Actualy cast the choice
-			if (s ~= -1) then
-				cast_school_spell(s, spell(s))
-			end
-	end,
-}
-
--- Far reaching attack of polearms
-add_mkey
-{
-	["mkey"]	= 102,
-	["fct"]	 = function()
-			local weapon = get_object(INVEN_WIELD);
-			if weapon.tval == TV_POLEARM then
-			else
-				msg_print("You will need a long polearm for this!")
-				return
-			end
-
-			ret, dir = get_rep_dir()
-			if ret == FALSE then return end
-
-			local dy, dx = explode_dir(dir)
-			dy = dy * 2
-			dx = dx * 2
-		    	targety = player.py + dy
-		    	targetx = player.px + dx
-
-			local max_blows = get_skill_scale(SKILL_POLEARM, player.num_blow / 2)
-			if max_blows == 0 then max_blows = 1 end
-
-			if get_skill(SKILL_POLEARM) >= 40 then
-				energy_use = energy_use + 200
-				return project(0, 0, targety, targetx, max_blows, GF_ATTACK, bor(PROJECT_BEAM, PROJECT_KILL))
-			else
-				energy_use = energy_use + 200
-				return project(0, 0, targety, targetx, max_blows, GF_ATTACK, bor(PROJECT_BEAM, PROJECT_STOP, PROJECT_KILL))
-			end
-	end,
-}
diff --git a/lib/scpt/player.lua b/lib/scpt/player.lua
deleted file mode 100644
index 2a617608..00000000
--- a/lib/scpt/player.lua
+++ /dev/null
@@ -1,76 +0,0 @@
-------------------------------------------------------------------------------
------------------------ Hook to create birth objects -------------------------
-------------------------------------------------------------------------------
-function __birth_hook_objects()
-	-- Provide a book of blink to rangers
-	if get_class_name() == "Ranger" then
-		local obj = create_object(TV_BOOK, 255);
-		obj.pval = find_spell("Phase Door")
-		obj.ident = bor(obj.ident, IDENT_MENTAL, IDENT_KNOWN)
-		inven_carry(obj, FALSE)
-		end_object(obj)
-	end
-
-	-- Provide a book of Geyser to Geomancers
-	if get_class_name() == "Geomancer" then
-		local obj = create_object(TV_BOOK, 255);
-		obj.pval = find_spell("Geyser")
-		obj.ident = bor(obj.ident, IDENT_MENTAL, IDENT_KNOWN)
-		inven_carry(obj, FALSE)
-		end_object(obj)
-	end
-
-	-- Provide a book of prayer to priests
-	if get_class_name() == "Priest(Eru)" then
-		local obj = create_object(TV_BOOK, 255);
-		obj.pval = find_spell("See the Music")
-		obj.ident = bor(obj.ident, IDENT_MENTAL, IDENT_KNOWN)
-		inven_carry(obj, FALSE)
-		end_object(obj)
-	end
-	if get_class_name() == "Priest(Manwe)" then
-		local obj = create_object(TV_BOOK, 255);
-		obj.pval = find_spell("Manwe's Blessing")
-		obj.ident = bor(obj.ident, IDENT_MENTAL, IDENT_KNOWN)
-		inven_carry(obj, FALSE)
-		end_object(obj)
-	end
-	if get_class_name() == "Druid" then
-		local obj = create_object(TV_BOOK, 255);
-		obj.pval = find_spell("Charm Animal")
-		obj.ident = bor(obj.ident, IDENT_MENTAL, IDENT_KNOWN)
-		inven_carry(obj, FALSE)
-		end_object(obj)
-	end
-	if get_class_name() == "Dark-Priest" then
-		local obj = create_object(TV_BOOK, 255);
-		obj.pval = find_spell("Curse")
-		obj.ident = bor(obj.ident, IDENT_MENTAL, IDENT_KNOWN)
-		inven_carry(obj, FALSE)
-		end_object(obj)
-	end
-	if get_class_name() == "Paladin" then
-		local obj = create_object(TV_BOOK, 255);
-		obj.pval = find_spell("Divine Aim")
-		obj.ident = bor(obj.ident, IDENT_MENTAL, IDENT_KNOWN)
-		inven_carry(obj, FALSE)
-		end_object(obj)
-	end
-	if get_class_name() == "Mimic" then
-		local obj = create_object(TV_CLOAK, 100);
-		obj.pval2 = resolve_mimic_name("Mouse")
-		obj.ident = bor(obj.ident, IDENT_MENTAL, IDENT_KNOWN)
-		inven_carry(obj, FALSE)
-		end_object(obj)
-	end
-
-	-- Start the undeads, as undeads with the corruptions
-	if get_subrace_name() == "Vampire" then
-		player.corruption(CORRUPT_VAMPIRE_TEETH, TRUE)
-		player.corruption(CORRUPT_VAMPIRE_STRENGTH, TRUE)
-		player.corruption(CORRUPT_VAMPIRE_VAMPIRE, TRUE)
-	end
-end
-
--- Register in the hook list
-add_hook_script(HOOK_BIRTH_OBJECTS, "__birth_hook_objects", "__birth_hook_objects")
diff --git a/lib/scpt/powers.lua b/lib/scpt/powers.lua
deleted file mode 100644
index ff4c62c5..00000000
--- a/lib/scpt/powers.lua
+++ /dev/null
@@ -1,61 +0,0 @@
--- Various 'U' powers
-
--- Invisibility power, for the mouse mimic shape
-POWER_INVISIBILITY = add_power
-{
-	["name"] =      "invisibility",
-	["desc"] =      "You are able melt into the shadows to become invisible.",
-	["desc_get"] =  "You suddenly become able to melt into the shadows.",
-	["desc_lose"] = "You lose your shadow-melting ability.",
-	["level"] =     30,
-	["cost"] =      10,
-	["stat"] =      A_DEX,
-	["fail"] =      20,
-	["power"] =     function()
-			set_invis(20 + randint(30), 30)
-	end,
-}
-
--- Web power, for the spider mimic shape
-POWER_WEB = add_power
-{
-	["name"] =      "web",
-	["desc"] =      "You are able throw a thick and very resistant spider web.",
-	["desc_get"] =  "You suddenly become able to weave webs.",
-	["desc_lose"] = "You lose your web-weaving capability.",
-	["level"] =     25,
-	["cost"] =      30,
-	["stat"] =      A_DEX,
-	["fail"] =      20,
-	["power"] =     function()
-			-- Warning, beware of f_info changes .. I hate to do that ..
-			grow_things(16, 1 + (player.lev / 10))
-	end,
-}
-
--- Activating/stopping space-continuum
--- When stopped it will induce constant mana loss
-player.corrupt_anti_teleport_stopped = FALSE
-add_loadsave("player.corrupt_anti_teleport_stopped", FALSE)
-POWER_COR_SPACE_TIME = add_power
-{
-	["name"] =      "control space/time continuum",
-	["desc"] =      "You are able to control the space/time continuum.",
-	["desc_get"] =  "You become able to control the space/time continuum.",
-	["desc_lose"] = "You are no more able to control the space/time continuum.",
-	["level"] =     1,
-	["cost"] =      10,
-	["stat"] =      A_WIS,
-	["fail"] =      10,
-	["power"] =     function()
-		if player.corrupt_anti_teleport_stopped == TRUE then
-			player.corrupt_anti_teleport_stopped = FALSE
-			msg_print("You stop controlling your corruption.")
-			player.update = bor(player.update, PU_BONUS)
-		else
-			player.corrupt_anti_teleport_stopped = TRUE
-			msg_print("You start controlling your corruption, teleportation works once more.")
-			player.update = bor(player.update, PU_BONUS)
-		end
-	end,
-}
diff --git a/lib/scpt/s_air.lua b/lib/scpt/s_air.lua
deleted file mode 100644
index afd1f584..00000000
--- a/lib/scpt/s_air.lua
+++ /dev/null
@@ -1,193 +0,0 @@
--- handle the air school
-
-NOXIOUSCLOUD = add_spell
-{
-	["name"] = 	"Noxious Cloud",
-	["school"] = 	{SCHOOL_AIR},
-	["level"] = 	3,
-	["mana"] = 	3,
-	["mana_max"] = 	30,
-	["fail"] = 	20,
-	["stick"] =
-	{
-			["charge"] =    { 5, 7 },
-			[TV_WAND] =
-			{
-				["rarity"] = 		15,
-				["base_level"] =	{ 1, 15 },
-				["max_level"] =		{ 25, 50 },
-			},
-	},
-	["spell"] = 	function()
-			local ret, dir, type
-
-			ret, dir = get_aim_dir()
-			if ret == FALSE then return end
-			if get_level(NOXIOUSCLOUD, 50) >= 30 then type = GF_UNBREATH
-			else type = GF_POIS end
-			fire_cloud(type, dir, 7 + get_level(NOXIOUSCLOUD, 150), 3, 5 + get_level(NOXIOUSCLOUD, 40))
-			return TRUE
-	end,
-	["info"] = 	function()
-			return "dam "..(7 + get_level(NOXIOUSCLOUD, 150)).." rad 3 dur "..(5 + get_level(NOXIOUSCLOUD, 40))
-	end,
-	["desc"] =	{
-			"Creates a cloud of poison",
-			"The cloud will persist for some turns, damaging all monsters passing by",
-			"At spell level 30 it turns into a thick gas attacking all living beings"
-	}
-}
-
-AIRWINGS = add_spell
-{
-	["name"] = 	"Wings of Winds",
-	["school"] = 	{SCHOOL_AIR, SCHOOL_CONVEYANCE},
-	["level"] = 	22,
-	["mana"] = 	30,
-	["mana_max"] = 	40,
-	["fail"] = 	60,
-	["stick"] =
-	{
-			["charge"] =    { 7, 5 },
-			[TV_STAFF] =
-			{
-				["rarity"] = 		27,
-				["base_level"] =	{ 1, 10 },
-				["max_level"] =		{ 20, 50 },
-			},
-	},
-	["inertia"] = 	{ 1, 10 },
-	["spell"] = 	function()
-			if get_level(AIRWINGS, 50) >= 16 then
-				if player.tim_fly == 0 then return set_tim_fly(randint(10) + 5 + get_level(AIRWINGS, 25)) end
-			else
-				if player.tim_ffall == 0 then return set_tim_ffall(randint(10) + 5 + get_level(AIRWINGS, 25)) end
-			end
-			return FALSE
-	end,
-	["info"] = 	function()
-			return "dur "..(5 + get_level(AIRWINGS, 25)).."+d10"
-	end,
-	["desc"] =	{
-			"Grants the power of levitation",
-			"At level 16 it grants the power of controlled flight"
-	}
-}
-
-INVISIBILITY = add_spell
-{
-	["name"] = 	"Invisibility",
-	["school"] = 	{SCHOOL_AIR},
-	["level"] = 	16,
-	["mana"] = 	10,
-	["mana_max"] = 	20,
-	["fail"] = 	50,
-	["inertia"] = 	{ 1, 30 },
-	["spell"] = 	function()
-			if player.tim_invisible == 0 then return set_invis(randint(20) + 15 + get_level(INVISIBILITY, 50), 20 + get_level(INVISIBILITY, 50)) end
-	end,
-	["info"] = 	function()
-			return "dur "..(15 + get_level(INVISIBILITY, 50)).."+d20 power "..(20 + get_level(INVISIBILITY, 50))
-	end,
-	["desc"] =	{
-			"Grants invisibility"
-	}
-}
-
-POISONBLOOD = add_spell
-{
-	["name"] = 	"Poison Blood",
-	["school"] = 	{SCHOOL_AIR},
-	["level"] = 	12,
-	["mana"] = 	10,
-	["mana_max"] = 	20,
-	["fail"] = 	30,
-	["stick"] =
-	{
-			["charge"] =    { 10, 15 },
-			[TV_WAND] =
-			{
-				["rarity"] = 		45,
-				["base_level"] =	{ 1, 25 },
-				["max_level"] =		{ 35, 50 },
-			},
-	},
-	["inertia"] = 	{ 1, 35 },
-	["spell"] = 	function()
-			local obvious = nil
-		       	if player.oppose_pois == 0 then obvious = set_oppose_pois(randint(30) + 25 + get_level(POISONBLOOD, 25)) end
-		       	if (player.tim_poison == 0) and (get_level(POISONBLOOD, 50) >= 15) then obvious = is_obvious(set_poison(randint(30) + 25 + get_level(POISONBLOOD, 25)), obvious) end
-			return obvious
-       	end,
-	["info"] = 	function()
-			return "dur "..(25 + get_level(POISONBLOOD, 25)).."+d30"
-	end,
-	["desc"] =	{
-			"Grants resist poison",
-			"At level 15 it provides poison branding to wielded weapon"
-	}
-}
-
-THUNDERSTORM = add_spell
-{
-	["name"] = 	"Thunderstorm",
-	["school"] = 	{SCHOOL_AIR, SCHOOL_NATURE},
-	["level"] = 	25,
-	["mana"] = 	40,
-	["mana_max"] = 	60,
-	["fail"] = 	60,
-	["stick"] =
-	{
-			["charge"] =    { 5, 5 },
-			[TV_WAND] =
-			{
-				["rarity"] = 		85,
-				["base_level"] =	{ 1, 5 },
-				["max_level"] =		{ 25, 50 },
-			},
-	},
-	["inertia"] = 	{ 2, 15 },
-	["spell"] = 	function()
-			if player.tim_thunder == 0 then return set_tim_thunder(randint(10) + 10 + get_level(THUNDERSTORM, 25), 5 + get_level(THUNDERSTORM, 10), 10 + get_level(THUNDERSTORM, 25)) end
-			return FALSE
-	end,
-	["info"] = 	function()
-			return "dam "..(5 + get_level(THUNDERSTORM, 10)).."d"..(10 + get_level(THUNDERSTORM, 25)).." dur "..(10 + get_level(THUNDERSTORM, 25)).."+d10"
-	end,
-	["desc"] =	{
-			"Charges up the air around you with electricity",
-			"Each turn it will throw a thunder bolt at a random monster in sight",
-			"The thunder does 3 types of damage, one third of lightning",
-			"one third of sound and one third of light"
-	}
-}
-
-STERILIZE = add_spell
-{
-	["name"] = 	"Sterilize",
-	["school"] = 	{SCHOOL_AIR},
-	["level"] = 	20,
-	["mana"] = 	10,
-	["mana_max"] = 	100,
-	["fail"] = 	50,
-	["stick"] =
-	{
-			["charge"] =    { 7, 5 },
-			[TV_STAFF] =
-			{
-				["rarity"] = 		20,
-				["base_level"] =	{ 1, 10 },
-				["max_level"] =		{ 20, 50 },
-			},
-	},
-	["spell"] = 	function()
-			set_no_breeders((30) + 20 + get_level(STERILIZE, 70))
-			return TRUE
-	end,
-	["info"] = 	function()
-			return "dur "..(20 + get_level(STERILIZE, 70)).."+d30"
-	end,
-	["desc"] =	{
-			"Prevents explosive breeding for a while."
-	}
-}
diff --git a/lib/scpt/s_convey.lua b/lib/scpt/s_convey.lua
deleted file mode 100644
index e7856c43..00000000
--- a/lib/scpt/s_convey.lua
+++ /dev/null
@@ -1,227 +0,0 @@
--- handle the conveyance school
-
-BLINK = add_spell
-{
-	["name"] = 	"Phase Door",
-	["school"] = 	{SCHOOL_CONVEYANCE},
-	["level"] = 	1,
-	["mana"] = 	1,
-	["mana_max"] =  3,
-	["fail"] = 	10,
-	["inertia"] = 	{ 1, 5 },
-	["spell"] = 	function()
-			if get_level(BLINK, 50) >= 30 then
-				local oy, ox = player.py, player.px
-
-				teleport_player(10 + get_level(BLINK, 8))
-				create_between_gate(0, oy, ox)
-				return TRUE
-			else
-				teleport_player(10 + get_level(BLINK, 8))
-				return TRUE
-			end
-	end,
-	["info"] = 	function()
-	       		return "distance "..(10 + get_level(BLINK, 8))
-	end,
-	["desc"] =	{
-			"Teleports you on a small scale range",
-			"At level 30 it creates void jumpgates",
-	}
-}
-
-DISARM = add_spell
-{
-	["name"] = 	"Disarm",
-	["school"] = 	{SCHOOL_CONVEYANCE},
-	["level"] = 	3,
-	["mana"] = 	2,
-	["mana_max"] = 	4,
-	["fail"] = 	15,
-	["stick"] =
-	{
-			["charge"] =    { 10, 15 },
-			[TV_STAFF] =
-			{
-				["rarity"] = 		4,
-				["base_level"] =	{ 1, 10 },
-				["max_level"] =		{ 10, 50 },
-			},
-	},
-	["spell"] = 	function()
-			local obvious
-			obvious = destroy_doors_touch()
-			if get_level(DISARM, 50) >= 10 then obvious = is_obvious(destroy_traps_touch(), obvious) end
-			return obvious
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"Destroys doors and traps",
-			"At level 10 it destroys doors and traps, then reveals and unlocks any secret",
-			"doors"
-	}
-}
-
-TELEPORT = add_spell
-{
-	["name"] = 	"Teleportation",
-	["school"] = 	{SCHOOL_CONVEYANCE},
-	["level"] = 	10,
-	["mana"] = 	8,
-	["mana_max"] = 	14,
-	["fail"] = 	30,
-	["stick"] =
-	{
-			["charge"] =    { 7, 7 },
-			[TV_STAFF] =
-			{
-				["rarity"] = 		50,
-				["base_level"] =	{ 1, 20 },
-				["max_level"] =		{ 20, 50 },
-			},
-	},
-	["inertia"] = 	{ 1, 10 },
-	["spell"] = 	function()
-			player.energy = player.energy - (25 - get_level(TELEPORT, 50))
-			teleport_player(100 + get_level(TELEPORT, 100))
-			return TRUE
-	end,
-	["info"] = 	function()
-			return "distance "..(100 + get_level(TELEPORT, 100))
-	end,
-	["desc"] =	{
-			"Teleports you around the level. The casting time decreases with level",
-	}
-}
-
-TELEAWAY = add_spell
-{
-	["name"] = 	"Teleport Away",
-	["school"] = 	{SCHOOL_CONVEYANCE},
-	["level"] = 	23,
-	["mana"] = 	15,
-	["mana_max"] = 	40,
-	["fail"] = 	60,
-	["stick"] =
-	{
-			["charge"] =    { 3, 5 },
-			[TV_WAND] =
-			{
-				["rarity"] = 		75,
-				["base_level"] =	{ 1, 20 },
-				["max_level"] =		{ 20, 50 },
-			},
-	},
-	["spell"] = 	function()
-	       		local ret, dir
-
-			if get_level(TELEAWAY, 50) >= 20 then
-				return project_los(GF_AWAY_ALL, 100)
-			elseif get_level(TELEAWAY, 50) >= 10 then
-				ret, dir = get_aim_dir()
-				if ret == FALSE then return end
-				return fire_ball(GF_AWAY_ALL, dir, 100, 3 + get_level(TELEAWAY, 4))
-			else
-				ret, dir = get_aim_dir()
-				if ret == FALSE then return end
-				return teleport_monster(dir)
-			end
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"Teleports a line of monsters away",
-			"At level 10 it turns into a ball",
-			"At level 20 it teleports all monsters in sight"
-	}
-}
-
-RECALL = add_spell
-{
-	["name"] = 	"Recall",
-	["school"] = 	{SCHOOL_CONVEYANCE},
-	["level"] = 	30,
-	["mana"] = 	25,
-	["mana_max"] = 	25,
-	["fail"] =      60,
-	["spell"] = 	function()
-			local ret, x, y, c_ptr
-			ret, x, y = tgt_pt()
-			if ret == FALSE then return end
-			c_ptr = cave(y, x)
-			if (y == player.py) and (x == player.px) then
-				local d = 21 - get_level(RECALL, 15)
-				if d < 0 then
-					d = 0
-				end
-				local f = 15 - get_level(RECALL, 10)
-				if f < 1 then
-					f = 1
-				end
-				recall_player(d, f)
-				return TRUE
-			elseif c_ptr.m_idx > 0 then
-				swap_position(y, x)
-				return TRUE
-			elseif c_ptr.o_idx > 0 then
-				set_target(y, x)
-				if get_level(RECALL, 50) >= 15 then
-					fetch(5, 10 + get_level(RECALL, 150), FALSE)
-				else
-					fetch(5, 10 + get_level(RECALL, 150), TRUE)
-				end
-				return TRUE
-			end
-	end,
-	["info"] = 	function()
-			local d = 21 - get_level(RECALL, 15)
-			if d < 0 then
-				d = 0
-			end
-			local f = 15 - get_level(RECALL, 10)
-			if f < 1 then
-				f = 1
-			end
-			return "dur "..f.."+d"..d.." weight "..(1 + get_level(RECALL, 15)).."lb"
-	end,
-	["desc"] =	{
-			"Cast on yourself it will recall you to the surface/dungeon.",
-			"Cast at a monster you will swap positions with the monster.",
-			"Cast at an object it will fetch the object to you."
-	}
-}
-
-PROBABILITY_TRAVEL = add_spell
-{
-	["name"] = 	"Probability Travel",
-	["school"] = 	{SCHOOL_CONVEYANCE},
-	["level"] = 	35,
-	["mana"] = 	30,
-	["mana_max"] = 	50,
-	["fail"] = 	90,
-	["stick"] =
-	{
-			["charge"] =    { 1, 2 },
-			[TV_STAFF] =
-			{
-				["rarity"] = 		97,
-				["base_level"] =	{ 1, 5 },
-				["max_level"] =		{ 8, 25 },
-			},
-	},
-	["inertia"] = 	{ 6, 40 },
-	["spell"] = 	function()
-			return set_prob_travel(randint(20) + get_level(PROBABILITY_TRAVEL, 60))
-	end,
-	["info"] = 	function()
-			return "dur "..get_level(PROBABILITY_TRAVEL, 60).."+d20"
-	end,
-	["desc"] =	{
-			"Renders you immaterial, when you hit a wall you travel through it and",
-			"instantly appear on the other side of it. You can also float up and down",
-			"at will"
-	}
-}
diff --git a/lib/scpt/s_demon.lua b/lib/scpt/s_demon.lua
deleted file mode 100644
index ada97310..00000000
--- a/lib/scpt/s_demon.lua
+++ /dev/null
@@ -1,337 +0,0 @@
--- handle the demonology school
-
--- Demonblade
-DEMON_BLADE = add_spell
-{
-	["name"] =      "Demon Blade",
-	["school"] =    {SCHOOL_DEMON},
-	["level"] =     1,
-	["mana"] =      4,
-	["mana_max"] =  44,
-	["fail"] =      10,
-	["random"] =    0,
-	["stick"] =
-	{
-			["charge"] =    { 3, 7 },
-			[TV_WAND] =
-			{
-				["rarity"] =	    75,
-				["base_level"] =	{ 1, 17 },
-				["max_level"] =		{ 20, 40 },
-			},
-	},
-	["spell"] =     function()
-			local type, rad
-
-			type = GF_FIRE
-			if get_level(DEMON_BLADE) >= 30 then type = GF_HELL_FIRE end
-
-			rad = 0
-			if get_level(DEMON_BLADE) >= 45 then rad = 1 end
-
-			return set_project(randint(20) + get_level(DEMON_BLADE, 80),
-				    type,
-				    4 + get_level(DEMON_BLADE, 40),
-				    rad,
-				    bor(PROJECT_STOP, PROJECT_KILL))
-	end,
-	["info"] =      function()
-			return "dur "..(get_level(DEMON_BLADE, 80)).."+d20 dam "..(4 + get_level(DEMON_BLADE, 40)).."/blow"
-	end,
-	["desc"] =      {
-			"Imbues your blade with fire to deal more damage",
-			"At level 30 it deals hellfire damage",
-			"At level 45 it spreads over a 1 radius zone around your target",
-	}
-}
-
-DEMON_MADNESS = add_spell
-{
-	["name"] =      "Demon Madness",
-	["school"] =    {SCHOOL_DEMON},
-	["level"] =     10,
-	["mana"] =      5,
-	["mana_max"] =  20,
-	["fail"] =      25,
-	["random"] =    0,
-	["spell"] =     function()
-			local ret, dir, type, y1, x1, y2, x2
-
-			ret, dir = get_aim_dir()
-			if ret == FALSE then return end
-
-			type = GF_CHAOS
-			if magik(33) == TRUE then type = GF_CONFUSION end
-			if magik(33) == TRUE then type = GF_CHARM end
-
-			-- Calc the coordinates of arrival
-			y1, x1 = get_target(dir)
-			y2 = player.py - (y1 - player.py)
-			x2 = player.px - (x1 - player.px)
-
-			local obvious = nil
-			obvious = project(0, 1 + get_level(DEMON_MADNESS, 4, 0),
-				y1, x1,
-				20 + get_level(DEMON_MADNESS, 200),
-				type, bor(PROJECT_STOP, PROJECT_GRID, PROJECT_ITEM, PROJECT_KILL))
-			obvious = is_obvious(project(0, 1 + get_level(DEMON_MADNESS, 4, 0),
-				y2, x2,
-				20 + get_level(DEMON_MADNESS, 200),
-				type, bor(PROJECT_STOP, PROJECT_GRID, PROJECT_ITEM, PROJECT_KILL)), obvious)
-			return obvious
-	end,
-	["info"] =      function()
-			return "dam "..(20 + get_level(DEMON_MADNESS, 200)).." rad "..(1 + get_level(DEMON_MADNESS, 4, 0))
-	end,
-	["desc"] =      {
-			"Fire 2 balls in opposite directions of randomly chaos, confusion or charm",
-	}
-}
-
-DEMON_FIELD = add_spell
-{
-	["name"] =      "Demon Field",
-	["school"] =    {SCHOOL_DEMON},
-	["level"] =     20,
-	["mana"] =      20,
-	["mana_max"] =  60,
-	["fail"] =      60,
-	["random"] =    0,
-	["spell"] =     function()
-			local ret, dir
-
-			ret, dir = get_aim_dir()
-			if ret == FALSE then return end
-			return fire_cloud(GF_NEXUS, dir, 20 + get_level(DEMON_FIELD, 70), 7, 30 + get_level(DEMON_FIELD, 100))
-	end,
-	["info"] =      function()
-			return "dam "..(20 + get_level(DEMON_FIELD, 70)).." dur "..(30 + get_level(DEMON_FIELD, 100))
-	end,
-	["desc"] =      {
-			"Fires a cloud of deadly nexus over a radius of 7",
-	}
-}
-
--- Demonshield
-
-DOOM_SHIELD = add_spell
-{
-	["name"] =      "Doom Shield",
-	["school"] =    {SCHOOL_DEMON},
-	["level"] =     1,
-	["mana"] =      2,
-	["mana_max"] =  30,
-	["fail"] =      10,
-	["random"] =    0,
-	["spell"] =     function()
-			return set_shield(randint(10) + 20 + get_level(DOOM_SHIELD, 100), -300 + get_level(DOOM_SHIELD, 100), SHIELD_COUNTER, 1 + get_level(DOOM_SHIELD, 14), 10 + get_level(DOOM_SHIELD, 15))
-	end,
-	["info"] =      function()
-			return "dur "..(20 + get_level(DOOM_SHIELD, 100)).."+d10 dam "..(1 + get_level(DOOM_SHIELD, 14)).."d"..(10 + get_level(DOOM_SHIELD, 15))
-	end,
-	["desc"] =      {
-			"Raises a mirror of pain around you, doing very high damage to your foes",
-			"that dare hit you, but greatly reduces your armour class",
-	}
-}
-
-UNHOLY_WORD = add_spell
-{
-	["name"] =      "Unholy Word",
-	["school"] =    {SCHOOL_DEMON},
-	["level"] =     25,
-	["mana"] =      15,
-	["mana_max"] =  45,
-	["fail"] =      55,
-	["random"] =    0,
-	["spell"] =     function()
-			local ret, x, y, c_ptr
-			ret, x, y = tgt_pt()
-			if ret == FALSE then return end
-			c_ptr = cave(y, x)
-
-			-- ok that is a monster
-			if c_ptr.m_idx > 0 then
-				local m_ptr = monster(c_ptr.m_idx)
-				if m_ptr.status ~= MSTATUS_PET then
-					msg_print("You can only target a pet.")
-					return
-				end
-
-				-- Oups he is angry now
-				if magik(30 - get_level(UNHOLY_WORD, 25, 0)) == TRUE then
-					local m_name = monster_desc(m_ptr, 0).." turns against you."
-					msg_print(strupper(strsub(m_name, 0, 1))..strsub(m_name, 2))
-				else
-					local m_name = monster_desc(m_ptr, 0)
-					msg_print("You consume "..m_name..".")
-
-					local heal = (m_ptr.hp * 100) / m_ptr.maxhp
-					heal = ((30 + get_level(UNHOLY_WORD, 50, 0)) * heal) / 100
-
-					hp_player(heal)
-
-					delete_monster_idx(c_ptr.m_idx)
-				end
-				return TRUE
-			end
-	end,
-	["info"] =      function()
-			return "heal mhp% of "..(30 + get_level(UNHOLY_WORD, 50, 0)).."%"
-	end,
-	["desc"] =      {
-			"Kills a pet to heal you",
-			"There is a chance that the pet won't die but will turn against you",
-			"it will decrease with higher level",
-	}
-}
-
-DEMON_CLOAK = add_spell
-{
-	["name"] =      "Demon Cloak",
-	["school"] =    {SCHOOL_DEMON},
-	["level"] =     20,
-	["mana"] =      10,
-	["mana_max"] =  40,
-	["fail"] =      70,
-	["random"] =    0,
-	["spell"] =     function()
-			return set_tim_reflect(randint(5) + 5 + get_level(DEMON_CLOAK, 15, 0))
-	end,
-	["info"] =      function()
-			return "dur "..(5 + get_level(DEMON_CLOAK, 15, 0)).."+d5"
-	end,
-	["desc"] =      {
-			"Raises a mirror that can reflect bolts and arrows for a time",
-	}
-}
-
-
--- Demonhorn
-DEMON_SUMMON = add_spell
-{
-	["name"] =      "Summon Demon",
-	["school"] =    {SCHOOL_DEMON},
-	["level"] =     5,
-	["mana"] =      10,
-	["mana_max"] =  50,
-	["fail"] =      30,
-	["random"] =    0,
-	["spell"] =     function()
-			local type = SUMMON_DEMON
-			local level = dun_level
-			local minlevel = 4
-			if level < minlevel then level=minlevel end
-			summon_specific_level = 5 + get_level(DEMON_SUMMON, 100)
-			if get_level(DEMON_SUMMON) >= 35 then type = SUMMON_HI_DEMON end
-			if summon_monster(player.py, player.px, level, TRUE, type) == TRUE then
-				return TRUE
-			else
-				msg_print("Something blocks your summoning!")
-				return FALSE
-			end
-	end,
-	["info"] =      function()
-			return "level "..(5 + get_level(DEMON_SUMMON, 100))
-	end,
-	["desc"] =      {
-			"Summons a leveled demon to your side",
-			"At level 35 it summons a high demon",
-	}
-}
-
-DISCHARGE_MINION = add_spell
-{
-	["name"] =      "Discharge Minion",
-	["school"] =    {SCHOOL_DEMON},
-	["level"] =     10,
-	["mana"] =      20,
-	["mana_max"] =  50,
-	["fail"] =      30,
-	["random"] =    0,
-	["spell"] =     function()
-			local ret, x, y, c_ptr
-			ret, x, y = tgt_pt()
-			if ret == FALSE then return end
-			c_ptr = cave(y, x)
-
-			-- ok that is a monster
-			if c_ptr.m_idx > 0 then
-				local m_ptr = monster(c_ptr.m_idx)
-				if m_ptr.status ~= MSTATUS_PET then
-					msg_print("You can only target a pet.")
-					return
-				end
-
-				local dam = m_ptr.hp
-				delete_monster_idx(c_ptr.m_idx)
-				dam = (dam * (20 + get_level(DISCHARGE_MINION, 60, 0))) / 100
-				if dam > 100 + get_level(DISCHARGE_MINION, 500, 0) then
-					dam = 100 + get_level(DISCHARGE_MINION, 500, 0)
-				end
-
-				-- We use project instead of fire_ball because we must tell it exactly where to land
-				return project(0, 2,
-					y, x,
-					dam,
-					GF_GRAVITY, bor(PROJECT_STOP, PROJECT_GRID, PROJECT_ITEM, PROJECT_KILL))
-			end
-	end,
-	["info"] =      function()
-			return "dam "..(20 + get_level(DISCHARGE_MINION, 60, 0)).."% max "..(100 + get_level(DISCHARGE_MINION, 500, 0))
-	end,
-	["desc"] =      {
-			"The targeted pet will explode in a burst of gravity",
-	}
-}
-
-CONTROL_DEMON = add_spell
-{
-	["name"] =      "Control Demon",
-	["school"] =    {SCHOOL_DEMON},
-	["level"] =     25,
-	["mana"] =      30,
-	["mana_max"] =  70,
-	["fail"] =      55,
-	["random"] =    0,
-	["spell"] =     function()
-			local ret, dir = get_aim_dir()
-			return fire_ball(GF_CONTROL_DEMON, dir, 50 + get_level(CONTROL_DEMON, 250), 0)
-	end,
-	["info"] =      function()
-			return "power "..(50 + get_level(CONTROL_DEMON, 250))
-	end,
-	["desc"] =      {
-			"Attempts to control a demon",
-	}
-}
-
--- ok we need to have different wield slots
-add_hooks
-{
-	[HOOK_WIELD_SLOT] =     function (obj, ideal)
-			if (obj.tval == TV_DAEMON_BOOK) then
-				local slot
-				if (obj.sval == SV_DEMONBLADE) then
-					if(ideal == TRUE) then
-						slot = INVEN_WIELD
-					else
-						slot = get_slot(INVEN_WIELD)
-					end
-				elseif (obj.sval == SV_DEMONSHIELD) then
-					if(ideal == TRUE) then
-						slot = INVEN_ARM
-					else
-						slot = get_slot(INVEN_ARM)
-					end
-				elseif (obj.sval == SV_DEMONHORN) then
-					if(ideal == TRUE) then
-						slot = INVEN_HEAD
-					else
-						slot = get_slot(INVEN_HEAD)
-					end
-				end
-				return TRUE, slot
-			end
-	end,
-}
diff --git a/lib/scpt/s_divin.lua b/lib/scpt/s_divin.lua
deleted file mode 100644
index 60b0275f..00000000
--- a/lib/scpt/s_divin.lua
+++ /dev/null
@@ -1,230 +0,0 @@
--- Handles thhe divination school
-
-
-STARIDENTIFY = add_spell
-{
-	["name"] = 	"Greater Identify",
-	["school"] = 	{SCHOOL_DIVINATION},
-	["level"] = 	35,
-	["mana"] = 	30,
-	["mana_max"] = 	30,
-	["fail"] = 	80,
-	["spell"] = 	function()
-			if get_check("Cast on yourself?") == TRUE then
-				self_knowledge()
-			else
-				identify_fully()
-			end
-			return TRUE
-	end,
-	["info"] = 	function()
-		       	return ""
-	end,
-	["desc"] =	{
-			"Asks for an object and fully identify it, providing the full list of powers",
-			"Cast at yourself it will reveal your powers"
-	}
-}
-
-IDENTIFY = add_spell
-{
-	["name"] = 	"Identify",
-	["school"] = 	{SCHOOL_DIVINATION},
-	["level"] = 	8,
-	["mana"] = 	10,
-	["mana_max"] = 	50,
-	["fail"] = 	40,
-	["stick"] =
-	{
-			["charge"] =    { 7, 10 },
-			[TV_STAFF] =
-			{
-				["rarity"] = 		45,
-				["base_level"] =	{ 1, 15 },
-				["max_level"] =		{ 15, 40 },
-			},
-	},
-	["spell"] = 	function()
-			if get_level(IDENTIFY, 50) >= 27 then
-				local obvious
-				obvious = identify_pack()
-				obvious = is_obvious(fire_ball(GF_IDENTIFY, 0, 1, get_level(IDENTIFY, 3)), obvious)
-				if obvious == TRUE then
-					player.notice = bor(player.notice, PN_COMBINE, PN_REORDER)
-				end
-				return obvious
-			elseif get_level(IDENTIFY, 50) >= 17 then
-				local obvious
-				obvious = identify_pack()
-				obvious = is_obvious(fire_ball(GF_IDENTIFY, 0, 1, 0), obvious)
-				if obvious == TRUE then
-					player.notice = bor(player.notice, PN_COMBINE, PN_REORDER)
-				end
-				return obvious
-			else
-				if ident_spell() == TRUE then return TRUE else return end
-			end
-	end,
-	["info"] = 	function()
-			if get_level(IDENTIFY, 50) >= 27 then
-				return "rad "..(get_level(IDENTIFY, 3))
-			else
-				return ""
-			end
-	end,
-	["desc"] =	{
-			"Asks for an object and identifies it",
-			"At level 17 it identifies all objects in the inventory",
-			"At level 27 it identifies all objects in the inventory and in a",
-			"radius on the floor, as well as probing monsters in that radius"
-	}
-}
-
-VISION = add_spell
-{
-	["name"] = 	"Vision",
-	["school"] = 	{SCHOOL_DIVINATION},
-	["level"] = 	15,
-	["mana"] = 	7,
-	["mana_max"] = 	55,
-	["fail"] = 	45,
-	["stick"] =
-	{
-			["charge"] =    { 4, 6 },
-			[TV_STAFF] =
-			{
-				["rarity"] = 		60,
-				["base_level"] =	{ 1, 5 },
-				["max_level"] =		{ 10, 30 },
-			},
-	},
-	["inertia"] = 	{ 2, 200 },
-	["spell"] = 	function()
-			if get_level(VISION, 50) >= 25 then
-				wiz_lite_extra()
-			else
-				map_area()
-			end
-			return TRUE
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"Detects the layout of the surrounding area",
-			"At level 25 it maps and lights the whole level",
-	}
-}
-
-SENSEHIDDEN = add_spell
-{
-	["name"] = 	"Sense Hidden",
-	["school"] = 	{SCHOOL_DIVINATION},
-	["level"] = 	5,
-	["mana"] = 	2,
-	["mana_max"] = 	10,
-	["fail"] = 	25,
-	["stick"] =
-	{
-			["charge"] =    { 1, 15 },
-			[TV_STAFF] =
-			{
-				["rarity"] = 		20,
-				["base_level"] =	{ 1, 15 },
-				["max_level"] =		{ 10, 50 },
-			},
-	},
-	["inertia"] = 	{ 1, 10 },
-	["spell"] = 	function()
-			local obvious = nil
-			obvious = detect_traps(15 + get_level(SENSEHIDDEN, 40, 0))
-			if get_level(SENSEHIDDEN, 50) >= 15 then
-				obvious = is_obvious(set_tim_invis(10 + randint(20) + get_level(SENSEHIDDEN, 40)), obvious)
-			end
-			return obvious
-	end,
-	["info"] = 	function()
-			if get_level(SENSEHIDDEN, 50) >= 15 then
-				return "rad "..(15 + get_level(SENSEHIDDEN, 40)).." dur "..(10 + get_level(SENSEHIDDEN, 40)).."+d20"
-			else
-				return "rad "..(15 + get_level(SENSEHIDDEN, 40))
-			end
-	end,
-	["desc"] =	{
-			"Detects the traps in a certain radius around you",
-			"At level 15 it allows you to sense invisible for a while"
-	}
-}
-
-REVEALWAYS = add_spell
-{
-	["name"] = 	"Reveal Ways",
-	["school"] = 	{SCHOOL_DIVINATION},
-	["level"] = 	9,
-	["mana"] = 	3,
-	["mana_max"] = 	15,
-	["fail"] = 	20,
-	["stick"] =
-	{
-			["charge"] =    { 6, 6 },
-			[TV_STAFF] =
-			{
-				["rarity"] = 		35,
-				["base_level"] =	{ 1, 15 },
-				["max_level"] =		{ 25, 50 },
-			},
-	},
-	["inertia"] = 	{ 1, 10 },
-	["spell"] = 	function()
-			local obvious
-			obvious = detect_doors(10 + get_level(REVEALWAYS, 40, 0))
-			obvious = is_obvious(detect_stairs(10 + get_level(REVEALWAYS, 40, 0)), obvious)
-			return obvious
-	end,
-	["info"] = 	function()
-			return "rad "..(10 + get_level(REVEALWAYS, 40))
-	end,
-	["desc"] =	{
-			"Detects the doors/stairs/ways in a certain radius around you",
-	}
-}
-
-SENSEMONSTERS = add_spell
-{
-	["name"] = 	"Sense Monsters",
-	["school"] = 	{SCHOOL_DIVINATION},
-	["level"] = 	1,
-	["mana"] =      1,
-	["mana_max"] =  20,
-	["fail"] = 	10,
-	["stick"] =
-	{
-			["charge"] =    { 5, 10 },
-			[TV_STAFF] =
-			{
-				["rarity"] = 		37,
-				["base_level"] =	{ 1, 10 },
-				["max_level"] =		{ 15, 40 },
-			},
-	},
-	["inertia"] = 	{ 1, 10 },
-	["spell"] = 	function()
-			local obvious
-			obvious = detect_monsters_normal(10 + get_level(SENSEMONSTERS, 40, 0))
-			if get_level(SENSEMONSTERS, 50) >= 30 then
-				obvious = is_obvious(set_tim_esp(10 + randint(10) + get_level(SENSEMONSTERS, 20)), obvious)
-			end
-			return obvious
-	end,
-	["info"] = 	function()
-			if get_level(SENSEMONSTERS, 50) >= 30 then
-				return "rad "..(10 + get_level(SENSEMONSTERS, 40)).." dur "..(10 + get_level(SENSEMONSTERS, 20)).."+d10"
-			else
-				return "rad "..(10 + get_level(SENSEMONSTERS, 40))
-			end
-	end,
-	["desc"] =	{
-			"Detects all monsters near you",
-			"At level 30 it allows you to sense monster minds for a while"
-	}
-}
diff --git a/lib/scpt/s_earth.lua b/lib/scpt/s_earth.lua
deleted file mode 100644
index 23aa001c..00000000
--- a/lib/scpt/s_earth.lua
+++ /dev/null
@@ -1,184 +0,0 @@
--- The earth school
-
-STONESKIN = add_spell
-{
-	["name"] = 	"Stone Skin",
-	["school"] = 	SCHOOL_EARTH,
-	["level"] = 	1,
-	["mana"] = 	1,
-	["mana_max"] = 	50,
-	["fail"] = 	10,
-	["inertia"] = 	{ 2, 50 },
-	["spell"] = 	function()
-			local type
-			if get_level(STONESKIN, 50) >= 25 then
-				type = SHIELD_COUNTER
-			else
-				type = 0
-			end
-			return set_shield(randint(10) + 10 + get_level(STONESKIN, 100), 10 + get_level(STONESKIN, 50), type, 2 + get_level(STONESKIN, 5), 3 + get_level(STONESKIN, 5))
-	end,
-	["info"] = 	function()
-			if get_level(STONESKIN, 50) >= 25 then
-				return "dam "..(2 + get_level(STONESKIN, 5)).."d"..(3 + get_level(STONESKIN, 5)).." dur "..(10 + get_level(STONESKIN, 100)).."+d10 AC "..(10 + get_level(STONESKIN, 50))
-			else
-				return "dur "..(10 + get_level(STONESKIN, 100)).."+d10 AC "..(10 + get_level(STONESKIN, 50))
-			end
-	end,
-	["desc"] =	{
-			"Creates a shield of earth around you to protect you",
-			"At level 25 it starts dealing damage to attackers"
-		}
-}
-
-DIG = add_spell
-{
-	["name"] = 	"Dig",
-	["school"] = 	SCHOOL_EARTH,
-	["level"] = 	12,
-	["mana"] = 	14,
-	["mana_max"] = 	14,
-	["fail"] = 	20,
-	["stick"] =
-	{
-			["charge"] =    { 15, 5 },
-			[TV_WAND] =
-			{
-				["rarity"] = 		25,
-				["base_level"] =	{ 1, 1 },
-				["max_level"] =		{ 1, 1 },
-			},
-	},
-	["spell"] = 	function()
-			local ret, dir
-			ret, dir = get_aim_dir()
-			if ret == FALSE then return end
-			return wall_to_mud(dir)
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"Digs a hole in a wall much faster than any shovels",
-		}
-}
-
-STONEPRISON = add_spell
-{
-	["name"] = 	"Stone Prison",
-	["school"] = 	SCHOOL_EARTH,
-	["level"] = 	25,
-	["mana"] = 	30,
-	["mana_max"] = 	50,
-	["fail"] = 	65,
-	["stick"] =
-	{
-			["charge"] =    { 5, 3 },
-			[TV_WAND] =
-			{
-				["rarity"] = 		57,
-				["base_level"] =	{ 1, 3 },
-				["max_level"] =		{ 5, 20 },
-			},
-	},
-	["spell"] = 	function()
-			local ret, x, y
-			if get_level(STONEPRISON, 50) >= 10 then
-				ret, x, y = tgt_pt()
-			else
-				y = player.py
-				x = player.px
-			end
-			wall_stone(y, x)
-			return TRUE
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"Creates a prison of walls around you",
-			"At level 10 it allows you to target a monster"
-		}
-}
-
-STRIKE = add_spell
-{
-	["name"] = 	"Strike",
-	["school"] = 	{SCHOOL_EARTH},
-	["level"] = 	30,
-	["mana"] = 	30,
-	["mana_max"] = 	50,
-	["fail"] = 	60,
-	["stick"] =
-	{
-			["charge"] =    { 2, 6 },
-			[TV_WAND] =
-			{
-				["rarity"] = 		635,
-				["base_level"] =	{ 1, 5 },
-				["max_level"] =		{ 10, 50 },
-			},
-	},
-	["spell"] = 	function()
-			local ret, dir, rad
-			ret, dir = get_aim_dir()
-			if ret == FALSE then return end
-			if get_level(STRIKE, 50) >= 12 then
-				return fire_ball(GF_FORCE, dir, 50 + get_level(STRIKE, 50), 1)
-			else
-				return fire_ball(GF_FORCE, dir, 50 + get_level(STRIKE, 50), 0)
-			end
-	end,
-	["info"] = 	function()
-			if get_level(STRIKE, 50) >= 12 then
-	       			return "dam "..(50 + get_level(STRIKE, 50)).." rad 1"
-			else
-				return "dam "..(50 + get_level(STRIKE, 50))
-			end
-	end,
-	["desc"] =	{
-			"Creates a micro-ball of force that will push monsters backwards",
-			"If the monster is caught near a wall, it'll be crushed against it",
-			"At level 12 it turns into a ball of radius 1"
-	}
-}
-
-SHAKE = add_spell
-{
-	["name"] = 	"Shake",
-	["school"] = 	{SCHOOL_EARTH},
-	["level"] = 	27,
-	["mana"] = 	25,
-	["mana_max"] = 	30,
-	["fail"] = 	60,
-	["stick"] =
-	{
-			["charge"] =    { 5, 10 },
-			[TV_STAFF] =
-			{
-				["rarity"] = 		75,
-				["base_level"] =	{ 1, 3 },
-				["max_level"] =		{ 9, 20 },
-			},
-	},
-	["inertia"] = 	{ 2, 50 },
-	["spell"] = 	function()
-			local ret, x, y
-			if get_level(SHAKE, 50) >= 10 then
-			       	ret, x, y = tgt_pt()
-				if ret == FALSE then return end
-			else
-				x = player.px
-				y = player.py
-			end
-			earthquake(y, x, 4 + get_level(SHAKE, 10));
-			return TRUE
-	end,
-	["info"] = 	function()
-			return "rad "..(4 + get_level(SHAKE, 10))
-	end,
-	["desc"] =	{
-			"Creates a localised earthquake",
-			"At level 10 it can be targeted at any location"
-	}
-}
diff --git a/lib/scpt/s_eru.lua b/lib/scpt/s_eru.lua
deleted file mode 100644
index c0cb0aaf..00000000
--- a/lib/scpt/s_eru.lua
+++ /dev/null
@@ -1,130 +0,0 @@
--- Handle Eru Iluvatar magic school
-
-ERU_SEE = add_spell
-{
-	["name"] = 	"See the Music",
-	["school"] = 	{SCHOOL_ERU},
-	["level"] = 	1,
-	["mana"] = 	1,
-	["mana_max"] = 	50,
-	["fail"] = 	20,
-	-- Uses piety to cast
-	["piety"] =     TRUE,
-	["stat"] =      A_WIS,
-	-- Unnafected by blindness
-	["blind"] =     FALSE,
-	["random"] = 	SKILL_SPIRITUALITY,
-	["spell"] = 	function()
-			local obvious
-			obvious = set_tim_invis(randint(20) + 10 + get_level(ERU_SEE, 100))
-			if get_level(ERU_SEE) >= 30 then
-				wiz_lite_extra()
-				obvious = TRUE
-			elseif get_level(ERU_SEE) >= 10 then
-				map_area()
-				obvious = TRUE
-			end
-			if get_level(ERU_SEE) >= 20 then
-				obvious = is_obvious(set_blind(0), obvious)
-			end
-			return obvious
-	end,
-	["info"] = 	function()
-			return "dur "..(10 + get_level(ERU_SEE, 100)).."+d20"
-	end,
-	["desc"] =	{
-			"Allows you to 'see' the Great Music from which the world",
-			"originates, allowing you to see unseen things",
-			"At level 10 it allows you to see your surroundings",
-			"At level 20 it allows you to cure blindness",
-			"At level 30 it allows you to fully see all the level"
-	}
-}
-
-ERU_LISTEN = add_spell
-{
-	["name"] = 	"Listen to the Music",
-	["school"] = 	{SCHOOL_ERU},
-	["level"] = 	7,
-	["mana"] = 	15,
-	["mana_max"] = 	200,
-	["fail"] = 	25,
-	-- Uses piety to cast
-	["piety"] =     TRUE,
-	["stat"] =      A_WIS,
-	["random"] = 	SKILL_SPIRITUALITY,
-	["spell"] = 	function()
-			if get_level(ERU_LISTEN) >= 30 then
-				ident_all()
-				identify_pack()
-				return TRUE
-			elseif get_level(ERU_LISTEN) >= 14 then
-				identify_pack()
-				return TRUE
-			else
-				return ident_spell()
-			end
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"Allows you to listen to the Great Music from which the world",
-			"originates, allowing you to understand the meaning of things",
-			"At level 14 it allows you to identify all your pack",
-			"At level 30 it allows you to identify all items on the level",
-	}
-}
-
-ERU_UNDERSTAND = add_spell
-{
-	["name"] = 	"Know the Music",
-	["school"] = 	{SCHOOL_ERU},
-	["level"] = 	30,
-	["mana"] = 	200,
-	["mana_max"] = 	600,
-	["fail"] = 	50,
-	-- Uses piety to cast
-	["piety"] =     TRUE,
-	["stat"] =      A_WIS,
-	["random"] = 	SKILL_SPIRITUALITY,
-	["spell"] = 	function()
-			if get_level(ERU_UNDERSTAND) >= 10 then
-				identify_pack_fully()
-				return TRUE
-			else
-				return identify_fully()
-			end
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"Allows you to understand the Great Music from which the world",
-			"originates, allowing you to know the full abilities of things",
-			"At level 10 it allows you to *identify* all your pack",
-	}
-}
-
-ERU_PROT = add_spell
-{
-	["name"] = 	"Lay of Protection",
-	["school"] = 	{SCHOOL_ERU},
-	["level"] = 	35,
-	["mana"] = 	400,
-	["mana_max"] = 	400,
-	["fail"] = 	80,
-	-- Uses piety to cast
-	["piety"] =     TRUE,
-	["stat"] =      A_WIS,
-	["random"] = 	SKILL_SPIRITUALITY,
-	["spell"] = 	function()
-			return fire_ball(GF_MAKE_GLYPH, 0, 1, 1 + get_level(ERU_PROT, 2, 0))
-	end,
-	["info"] = 	function()
-			return "rad "..(1 + get_level(ERU_PROT, 2, 0))
-	end,
-	["desc"] =	{
-			"Creates a circle of safety around you",
-	}
-}
diff --git a/lib/scpt/s_fire.lua b/lib/scpt/s_fire.lua
deleted file mode 100644
index dbbf7604..00000000
--- a/lib/scpt/s_fire.lua
+++ /dev/null
@@ -1,227 +0,0 @@
--- handle the fire school
-
-GLOBELIGHT = add_spell
-{
-	["name"] =      "Globe of Light",
-	["school"] =    {SCHOOL_FIRE},
-	["level"] =     1,
-	["mana"] =      2,
-	["mana_max"] =  15,
-	["fail"] =      10,
-	["stick"] =
-	{
-			["charge"] =    { 10, 5 },
-			[TV_STAFF] =
-			{
-				["rarity"] =	    7,
-				["base_level"] =	{ 1, 15 },
-				["max_level"] =		{ 10, 45 },
-			},
-	},
-	["inertia"] = 	{ 1, 40 },
-	["spell"] =     function()
-		local obvious
-		if get_level(GLOBELIGHT, 50) >= 3 then
-			obvious = lite_area(10, 4)
-		else
-			lite_room(player.py, player.px)
-			obvious = TRUE
-		end
-		if get_level(GLOBELIGHT, 50) >= 15 then
-			obvious = is_obvious(fire_ball(GF_LITE, 0, 10 + get_level(GLOBELIGHT, 100), 5 + get_level(GLOBELIGHT, 6)), obvious)
-			player.update = bor(player.update, PU_VIEW)
-		end
-		return obvious
-	end,
-	["info"] =      function()
-		if get_level(GLOBELIGHT, 50) >= 15 then
-			return "dam "..(10 + get_level(GLOBELIGHT, 100)).." rad "..(5 + get_level(GLOBELIGHT, 6))
-		else
-			return ""
-		end
-	end,
-	["desc"] =      {
-			"Creates a globe of pure light",
-			"At level 3 it starts damaging monsters",
-			"At level 15 it starts creating a more powerful kind of light",
-	}
-}
-
-FIREFLASH = add_spell
-{
-	["name"] =      "Fireflash",
-	["school"] =    {SCHOOL_FIRE},
-	["level"] =     10,
-	["mana"] =      5,
-	["mana_max"] =  70,
-	["fail"] =      35,
-	["stick"] =
-	{
-			["charge"] =    { 5, 5 },
-			[TV_WAND] =
-			{
-				["rarity"] =	    35,
-				["base_level"] =	{ 1, 15 },
-				["max_level"] =		{ 15, 35 },
-			},
-	},
-	["spell"] =     function()
-		local ret, dir, type
-		if (get_level(FIREFLASH, 50) >= 20) then
-			type = GF_HOLY_FIRE
-		else
-			type = GF_FIRE
-		end
-		ret, dir = get_aim_dir()
-		if ret == FALSE then return end
-		return fire_ball(type, dir, 20 + get_level(FIREFLASH, 500), 2 + get_level(FIREFLASH, 5))
-	end,
-	["info"] =      function()
-		return "dam "..(20 + get_level(FIREFLASH, 500)).." rad "..(2 + get_level(FIREFLASH, 5))
-	end,
-	["desc"] =      {
-			"Conjures a ball of fire to burn your foes to ashes",
-			"At level 20 it turns into a ball of holy fire"
-	}
-}
-
-FIERYAURA = add_spell
-{
-	["name"] =      "Fiery Shield",
-	["school"] =    {SCHOOL_FIRE},
-	["level"] =     20,
-	["mana"] =      20,
-	["mana_max"] =  60,
-	["fail"] =      50,
-	["stick"] =
-	{
-			["charge"] =    { 3, 5 },
-			[TV_STAFF] =
-			{
-				["rarity"] =	    50,
-				["base_level"] =	{ 1, 10 },
-				["max_level"] =		{ 5, 40 },
-			},
-	},
-	["inertia"] = 	{ 2, 15 },
-	["spell"] =     function()
-		local type
-		if (get_level(FIERYAURA, 50) >= 8) then
-			type = SHIELD_GREAT_FIRE
-		else
-			type = SHIELD_FIRE
-		end
-		return set_shield(randint(20) + 10 + get_level(FIERYAURA, 70), 10, type, 5 + get_level(FIERYAURA, 10), 5 + get_level(FIERYAURA, 7))
-	end,
-	["info"] =      function()
-		return "dam "..(5 + get_level(FIERYAURA, 15)).."d"..(5 + get_level(FIERYAURA, 7)).." dur "..(10 + get_level(FIERYAURA, 70)).."+d20"
-	end,
-	["desc"] =      {
-			"Creates a shield of fierce flames around you",
-			"At level 8 it turns into a greater kind of flame that can not be resisted"
-	}
-}
-
-FIREWALL = add_spell
-{
-	["name"] =      "Firewall",
-	["school"] =    {SCHOOL_FIRE},
-	["level"] =     15,
-	["mana"] =      25,
-	["mana_max"] =  100,
-	["fail"] =      40,
-	["stick"] =
-	{
-			["charge"] =    { 4, 5 },
-			[TV_WAND] =
-			{
-				["rarity"] =	    55,
-				["base_level"] =	{ 1, 10 },
-				["max_level"] =		{ 5, 40 },
-			},
-	},
-	["spell"] =     function()
-		local ret, dir, type
-		if (get_level(FIREWALL, 50) >= 6) then
-			type = GF_HELL_FIRE
-		else
-			type = GF_FIRE
-		end
-		ret, dir = get_aim_dir()
-		if ret == FALSE then return end
-		fire_wall(type, dir, 40 + get_level(FIREWALL, 150), 10 + get_level(FIREWALL, 14))
-		return TRUE
-	end,
-	["info"] =      function()
-		return "dam "..(40 + get_level(FIREWALL, 150)).." dur "..(10 + get_level(FIREWALL, 14))
-	end,
-	["desc"] =      {
-			"Creates a fiery wall to incinerate monsters stupid enough to attack you",
-			"At level 6 it turns into a wall of hell fire"
-	}
-}
-
-FIREGOLEM = add_spell
-{
-	["name"] =      "Fire Golem",
-	["school"] =    {SCHOOL_FIRE, SCHOOL_MIND},
-	["level"] =     7,
-	["mana"] =      16,
-	["mana_max"] =  70,
-	["fail"] =      40,
-	["spell"] =     function()
-			local m_idx, y, x, ret, item
-
-			-- Can we reconnect ?
-			if do_control_reconnect() == TRUE then
-				msg_print("Control re-established.")
-				return
-			end
-
-			ret, item = get_item("Which light source do you want to use to create the golem?",
-					     "You have no light source for the golem",
-					     bor(USE_INVEN, USE_EQUIP),
-					     function (obj)
-						if (obj.tval == TV_LITE) and ((obj.sval == SV_LITE_TORCH) or (obj.sval == SV_LITE_LANTERN)) then
-							return TRUE
-							end
-							return FALSE
-					     end
-			)
-			if ret == FALSE then return TRUE end
-			inven_item_increase(item, -1)
-			inven_item_describe(item)
-			inven_item_optimize(item)
-
-			-- Summon it
-			m_allow_special[1043 + 1] = TRUE
-			y, x = find_position(player.py, player.px)
-			m_idx = place_monster_one(y, x, 1043, 0, FALSE, MSTATUS_FRIEND)
-			m_allow_special[1043 + 1] = FALSE
-
-			-- level it
-			if m_idx ~= 0 then
-				monster_set_level(m_idx, 7 + get_level(FIREGOLEM, 70))
-				player.control = m_idx
-				monster(m_idx).mflag = bor(monster(m_idx).mflag, MFLAG_CONTROL)
-			end
-			return TRUE
-	end,
-	["info"] =      function()
-			return "golem level "..(7 + get_level(FIREGOLEM, 70))
-	end,
-	["desc"] =      {
-			"Creates a fiery golem and controls it",
-			"During the control the available keylist is:",
-			"Movement keys: movement of the golem(depending on its speed",
-			"               it can move more than one square)",
-			", : pickup all items on the floor",
-			"d : drop all carried items",
-			"i : list all carried items",
-			"m : end the possession/use golem powers",
-			"Most of the other keys are disabled, you cannot interact with your",
-			"real body while controlling the golem",
-			"But to cast the spell you will need a lantern or a wooden torch to",
-			"Create the golem from"
-	}
-}
diff --git a/lib/scpt/s_geom.lua b/lib/scpt/s_geom.lua
deleted file mode 100644
index b9730318..00000000
--- a/lib/scpt/s_geom.lua
+++ /dev/null
@@ -1,656 +0,0 @@
--- Geomancy school
-
-function geomancy_random_wall(y, x)
-	local c_ptr = cave(y, x)
-
-	-- Do not destroy permanent things
-	if cave_is(c_ptr, FF1_PERMANENT) ~= FALSE then return end
-
-	local feat = nil
-	local table =
-	{
-		[1] = { SKILL_FIRE, FEAT_SANDWALL, 1},
-
-		[2] = { SKILL_WATER, FEAT_TREES, 1},
-		[3] = { SKILL_WATER, FEAT_ICE_WALL, 12},
-
-		[4] = { SKILL_EARTH, FEAT_WALL_EXTRA, 1},
-	}
-
-	while feat == nil do
-		local t = table[randint(getn(table))]
-
-		-- Do we meet the requirements ?
-		-- And then select the features based on skill proportions
-		if get_skill(t[1]) >= t[3] and magik(get_skill_scale(t[1], 100)) == TRUE then
-			feat = t[2]
-		end
-	end
-
-	cave_set_feat(y, x, feat)
-end
-
-
-GF_ELEMENTAL_WALL = add_spell_type
-{
-	["color"]       = { TERM_GREEN, 0 },
-	["angry"]       = function() return TRUE, FALSE end,
-	["grid"]     	= function(who, dam, rad, y, x)
-			if player.py ~= y or player.px ~= x then
-				geomancy_random_wall(y, x)
-			end
-	end,
-}
-
-function geomancy_random_floor(y, x, kill_wall)
-	local c_ptr = cave(y, x)
-
-	-- Do not destroy permanent things
-	if cave_is(c_ptr, FF1_PERMANENT) ~= FALSE then return end
-	if not kill_wall then
-		if cave_is(c_ptr, FF1_FLOOR) ~= TRUE then return end
-	end
-
-	local feat = nil
-	local table =
-	{
-		[1] = { SKILL_FIRE, FEAT_SAND, 1},
-		[2] = { SKILL_FIRE, FEAT_SHAL_LAVA, 8},
-		[3] = { SKILL_FIRE, FEAT_DEEP_LAVA, 18},
-
-		[4] = { SKILL_WATER, FEAT_SHAL_WATER, 1},
-		[5] = { SKILL_WATER, FEAT_DEEP_WATER, 8},
-		[6] = { SKILL_WATER, FEAT_ICE, 18},
-
-		[7] = { SKILL_EARTH, FEAT_GRASS, 1},
-		[8] = { SKILL_EARTH, FEAT_FLOWER, 8},
-		[9] = { SKILL_EARTH, FEAT_DARK_PIT, 18},
-	}
-
-	while feat == nil do
-		local t = table[randint(getn(table))]
-
-		-- Do we meet the requirements ?
-		-- And then select the features based on skill proportions
-		if get_skill(t[1]) >= t[3] and magik(get_skill_scale(t[1], 100)) == TRUE then
-			feat = t[2]
-		end
-	end
-
-	cave_set_feat(y, x, feat)
-end
-
-
-GF_ELEMENTAL_GROWTH = add_spell_type
-{
-	["color"]       = { TERM_GREEN, 0 },
-	["angry"]       = function() return TRUE, FALSE end,
-	["grid"]     	= function(who, dam, rad, y, x)
-			geomancy_random_floor(y, x)
-	end,
-}
-
-CALL_THE_ELEMENTS = add_spell
-{
-	["name"] = 	"Call the Elements",
-	["school"] = 	{SCHOOL_GEOMANCY},
-	["level"] = 	1,
-	["mana"] = 	2,
-	["mana_max"] = 	20,
-	["fail"] = 	10,
-	-- Unnafected by blindness
-	["blind"] =     FALSE,
-	["random"] =    0,
-	["spell"] = 	function()
-			local ret, dir = 0, 0
-
-			if get_level(CALL_THE_ELEMENTS) >= 17 then
-				ret, dir = get_aim_dir()
-				if ret == FALSE then return end
-			end
-
-			fire_ball(GF_ELEMENTAL_GROWTH, dir, 1, 1 + get_level(CALL_THE_ELEMENTS, 5, 0))
-			return TRUE
-	end,
-	["info"] = 	function()
-			return "rad "..(1 + get_level(CALL_THE_ELEMENTS, 5, 0))
-	end,
-	["desc"] =	{
-			"Randomly creates various elements around you",
-			"Each type of element chance is controlled by your level",
-			"in the corresponding skill",
-			"At level 17 it can be targeted",
-	}
-}
-
--- Seperate function because an other spell needs it
-function channel_the_elements(y, x, level, silent)
-	local t =
-	{
-		-- Earth stuff
-		[FEAT_GRASS] = function()
-			hp_player(player.mhp * (5 + get_skill_scale(SKILL_EARTH, 20)) / 100)
-		end,
-		[FEAT_FLOWER] = function()
-			hp_player(player.mhp * (5 + get_skill_scale(SKILL_EARTH, 30)) / 100)
-		end,
-		[FEAT_DARK_PIT] = function()
-			local ret, dir = get_aim_dir()
-			if ret == FALSE then return end
-
-			local type = GF_DARK
-			if get_skill(SKILL_EARTH) >= 18 then type = GF_NETHER end
-			fire_bolt(type, dir, damroll(10, get_skill(SKILL_EARTH)))
-		end,
-
-		-- Water stuff
-		[FEAT_SHAL_WATER] = function()
-			local ret, dir = get_aim_dir()
-			if ret == FALSE then return end
-
-			local type = GF_WATER
-			if get_skill(SKILL_WATER) >= 18 then type = GF_WAVE end
-
-			if get_skill(SKILL_WATER) >= 8 then
-				fire_beam(type, dir, damroll(3, get_skill(SKILL_WATER)))
-			else
-				fire_bolt(type, dir, damroll(3, get_skill(SKILL_WATER)))
-			end
-		end,
-		[FEAT_DEEP_WATER] = function()
-			local ret, dir = get_aim_dir()
-			if ret == FALSE then return end
-
-			local type = GF_WATER
-			if get_skill(SKILL_WATER) >= 18 then type = GF_WAVE end
-
-			if get_skill(SKILL_WATER) >= 8 then
-				fire_beam(type, dir, damroll(5, get_skill(SKILL_WATER)))
-			else
-				fire_bolt(type, dir, damroll(5, get_skill(SKILL_WATER)))
-			end
-		end,
-		[FEAT_ICE] = function()
-			local ret, dir = get_aim_dir()
-			if ret == FALSE then return end
-
-			if get_skill(SKILL_WATER) >= 12 then
-				fire_ball(GF_ICE, dir, get_skill_scale(SKILL_WATER, 340), 3)
-			else
-				fire_bolt(GF_ICE, dir, damroll(3, get_skill(SKILL_WATER)))
-			end
-		end,
-
-		-- Fire stuff
-		[FEAT_SAND] = function()
-			local type
-			if (get_level(FIERYAURA, 50) >= 8) then
-				type = SHIELD_GREAT_FIRE
-			else
-				type = SHIELD_FIRE
-			end
-			local dur = randint(20) + %level + get_skill(SKILL_AIR)
-			set_shield(dur, 0, type, 5 + get_skill_scale(SKILL_FIRE, 20), 5 + get_skill_scale(SKILL_FIRE, 14))
-			set_blind(dur)
-		end,
-		[FEAT_SHAL_LAVA] = function()
-			local ret, dir = get_aim_dir()
-			if ret == FALSE then return end
-
-			if get_skill(SKILL_FIRE) >= 15 then
-				fire_bolt(GF_HELL_FIRE, dir, damroll(get_skill_scale(SKILL_FIRE, 30), 15))
-			else
-				fire_bolt(GF_FIRE, dir, damroll(get_skill_scale(SKILL_FIRE, 30), 15))
-			end
-		end,
-		[FEAT_DEEP_LAVA] = function()
-			local ret, dir = get_aim_dir()
-			if ret == FALSE then return end
-
-			if get_skill(SKILL_FIRE) >= 15 then
-				fire_ball(GF_HELL_FIRE, dir, damroll(get_skill_scale(SKILL_FIRE, 30), 15), 3)
-			else
-				fire_ball(GF_FIRE, dir, damroll(get_skill_scale(SKILL_FIRE, 30), 15), 3)
-			end
-		end,
-	}
-
-	if t[cave(y, x).feat] then
-		t[cave(y, x).feat]()
-
-		if magik(100 - level) == TRUE then
-			if cave(y, x).feat == FEAT_FLOWER then
-				cave_set_feat(y, x, FEAT_GRASS)
-			else
-				cave_set_feat(y, x, FEAT_FLOOR)
-			end
-			msg_print("The area is drained.")
-		end
-	elseif not silent then
-		msg_print("You cannot channel this area.")
-	end
-end
-
-CHANNEL_ELEMENTS = add_spell
-{
-	["name"] = 	"Channel Elements",
-	["school"] = 	{SCHOOL_GEOMANCY},
-	["level"] = 	3,
-	["mana"] = 	3,
-	["mana_max"] = 	30,
-	["fail"] = 	20,
-	-- Unnafected by blindness
-	["blind"] =     FALSE,
-	["random"] =    0,
-	["spell"] = 	function()
-			channel_the_elements(player.py, player.px, get_level(CHANNEL_ELEMENTS), nil)
-			return TRUE
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"Draws on the caster's immediate environs to form an attack or other effect.",
-			"Grass/Flower heals.",
-			"Water creates water bolt attacks.",
-			"Ice creates ice bolt attacks.",
-			"Sand creates a wall of thick, blinding, burning sand around you.",
-			"Lava creates fire bolt attacks.",
-			"Deep lava creates fire ball attacks.",
-			"Chasm creates darkness bolt attacks.",
-			"At Earth level 18, darkness becomes nether.",
-			"At Water level 8, water attacks become beams with a striking effect.",
-			"At Water level 12, ice attacks become balls of ice shards.",
-			"At Water level 18, water attacks push monsters back.",
-			"At Fire level 15, fire become hellfire.",
-	}
-}
-
-ELEMENTAL_WAVE = add_spell
-{
-	["name"] = 	"Elemental Wave",
-	["school"] = 	{SCHOOL_GEOMANCY},
-	["level"] = 	15,
-	["mana"] = 	15,
-	["mana_max"] = 	50,
-	["fail"] = 	20,
-	-- Unnafected by blindness
-	["blind"] =     FALSE,
-	["random"] =    0,
-	["spell"] = 	function()
-			local ret, dir = get_rep_dir()
-			if ret == FALSE then return end
-
-			local y, x = explode_dir(dir)
-			y = y + player.py
-			x = x + player.px
-
-			local t =
-			{
-				-- Earth stuff
-				[FEAT_GRASS] 		= { GF_POIS, GF_POIS, 10 + get_skill_scale(SKILL_EARTH, 200) },
-				[FEAT_FLOWER] 		= { GF_POIS, GF_POIS, 10 + get_skill_scale(SKILL_EARTH, 300) },
-				-- cannot turn chasm into a wave
-
-				-- Water stuff
-				[FEAT_SHAL_WATER] 	= { GF_WATER, GF_WATER, 10 + get_skill_scale(SKILL_WATER, 200) },
-				[FEAT_DEEP_WATER] 	= { GF_WATER, GF_WATER, 10 + get_skill_scale(SKILL_WATER, 300) },
-				[FEAT_ICE] 		= { GF_ICE, GF_ICE, 10 + get_skill_scale(SKILL_WATER, 200) },
-
-				-- Fire stuff
-				[FEAT_SAND] 		= { GF_LITE, GF_LITE, 10 + get_skill_scale(SKILL_FIRE, 400) },
-				[FEAT_SHAL_LAVA] 	= { GF_FIRE, GF_HOLY_FIRE, 10 + get_skill_scale(SKILL_FIRE, 200) },
-				[FEAT_DEEP_LAVA] 	= { GF_FIRE, GF_HOLY_FIRE, 10 + get_skill_scale(SKILL_FIRE, 300) },
-			}
-
-
-			local effect = t[cave(y, x).feat]
-			if not effect then
-				msg_print("You cannot channel this area.")
-			else
-				local typ = effect[1]
-				if get_level(ELEMENTAL_WAVE) >= 20 then typ = effect[2] end
-
-				cave_set_feat(y, x, FEAT_FLOOR)
-
-				fire_wave(typ, 0, effect[3], 0, 6 + get_level(ELEMENTAL_WAVE, 20), EFF_WAVE + EFF_LAST + getglobal("EFF_DIR"..dir))
-			end
-
-			return TRUE
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"Draws on an adjacent special square to project a slow-moving",
-			"wave of that element in that direction",
-			"Abyss squares cannot be channeled into a wave.",
-	}
-}
-
-VAPORIZE = add_spell
-{
-	["name"] = 	"Vaporize",
-	["school"] = 	{SCHOOL_GEOMANCY},
-	["level"] = 	4,
-	["mana"] = 	3,
-	["mana_max"] = 	30,
-	["fail"] = 	15,
-	-- Unnafected by blindness
-	["blind"] =     FALSE,
-	-- Must have at least 4 Air
-	["random"] =    0,
-	["depend"] =    function()
-			if get_skill(SKILL_AIR) >= 4 then return TRUE end
-	end,
-	["spell"] = 	function()
-			local t =
-			{
-				-- Earth stuff
-				[FEAT_GRASS] 		= { GF_POIS, GF_POIS, 5 + get_skill_scale(SKILL_EARTH, 100) },
-				[FEAT_FLOWER] 		= { GF_POIS, GF_POIS, 5 + get_skill_scale(SKILL_EARTH, 150) },
-				[FEAT_DARK_PIT] 	= { GF_DARK, GF_DARK, 5 + get_skill_scale(SKILL_EARTH, 200) },
-
-				-- Water stuff
-				[FEAT_SHAL_WATER] 	= { GF_WATER, GF_WATER, 5 + get_skill_scale(SKILL_WATER, 100) },
-				[FEAT_DEEP_WATER] 	= { GF_WATER, GF_WATER, 5 + get_skill_scale(SKILL_WATER, 150) },
-				[FEAT_ICE] 		= { GF_ICE, GF_ICE, 5 + get_skill_scale(SKILL_WATER, 100) },
-
-				-- Fire stuff
-				[FEAT_SAND] 		= { GF_LITE, GF_LITE, 5 + get_skill_scale(SKILL_FIRE, 200) },
-				[FEAT_SHAL_LAVA] 	= { GF_FIRE, GF_HOLY_FIRE, 5 + get_skill_scale(SKILL_FIRE, 100) },
-				[FEAT_DEEP_LAVA] 	= { GF_FIRE, GF_HOLY_FIRE, 5 + get_skill_scale(SKILL_FIRE, 150) },
-			}
-
-			local effect = t[cave(player.py, player.px).feat]
-			if not effect then
-				msg_print("You cannot channel this area.")
-			else
-				local typ = effect[1]
-				if get_level(VAPORIZE) >= 20 then typ = effect[2] end
-
-				cave_set_feat(player.py, player.px, FEAT_FLOOR)
-
-				fire_cloud(typ, 0, effect[3], 1 + get_level(VAPORIZE, 4), 10 + get_level(VAPORIZE, 20))
-			end
-
-			return TRUE
-	end,
-	["info"] = 	function()
-			return "rad "..(1 + get_level(VAPORIZE, 4)).." dur "..(10 + get_level(VAPORIZE, 20))
-	end,
-	["desc"] =	{
-			"Draws upon your immediate environs to form a cloud of damaging vapors",
-	}
-}
-
-geomancy_can_tunnel =
-{
-	[FEAT_WALL_EXTRA] = TRUE,
-	[FEAT_WALL_OUTER] = TRUE,
-	[FEAT_WALL_INNER] = TRUE,
-	[FEAT_WALL_SOLID] = TRUE,
-
-	[FEAT_MAGMA] = TRUE,
-	[FEAT_QUARTZ] = TRUE,
-	[FEAT_MAGMA_H] = TRUE,
-	[FEAT_QUARTZ_H] = TRUE,
-	[FEAT_MAGMA_K] = TRUE,
-	[FEAT_QUARTZ_K] = TRUE,
-
-	[FEAT_TREES] = TRUE,
-	[FEAT_DEAD_TREE] = TRUE,
-
-	[FEAT_SANDWALL] = TRUE,
-	[FEAT_SANDWALL_H] = TRUE,
-	[FEAT_SANDWALL_K] = TRUE,
-
-	[FEAT_ICE_WALL] = TRUE,
-}
-
--- Dig & sprew
-function geomancy_dig(oy, ox, dir, length)
-	local dy, dx = explode_dir(dir)
-	local y = dy + oy
-	local x = dx + ox
-
-	for i = 1, length do
-		local c_ptr = cave(y, x)
-		local ox = x - dx
-		local oy = y - dy
-
-		-- stop at the end of tunnelable things
-		if not geomancy_can_tunnel[c_ptr.feat] then break end
-
-		if geomancy_can_tunnel[cave(y - 1, x - 1).feat] then geomancy_random_wall(y - 1, x - 1) end
-		if geomancy_can_tunnel[cave(y - 1, x).feat] then geomancy_random_wall(y - 1, x) end
-		if geomancy_can_tunnel[cave(y - 1, x + 1).feat] then geomancy_random_wall(y - 1, x + 1) end
-
-		if geomancy_can_tunnel[cave(y, x - 1).feat] then geomancy_random_wall(y, x - 1) end
-		if geomancy_can_tunnel[cave(y, x + 1).feat] then geomancy_random_wall(y, x + 1) end
-
-		if geomancy_can_tunnel[cave(y + 1, x - 1).feat] then geomancy_random_wall(y + 1, x - 1) end
-		if geomancy_can_tunnel[cave(y + 1, x).feat] then geomancy_random_wall(y + 1, x) end
-		if geomancy_can_tunnel[cave(y + 1, x + 1).feat] then geomancy_random_wall(y + 1, x + 1) end
-
-		y = y + dy
-		x = x + dx
-	end
-
-	y = y - dy
-	x = x - dx
-	while (y ~= oy) or (x ~= ox) do
-		geomancy_random_floor(y, x, TRUE)
-
-		-- Should we branch ?
-		if magik(20) == TRUE then
-			local rot = 1
-			if magik(50) == TRUE then rot = -1 end
-			geomancy_dig(y, x, rotate_dir(dir, rot), length / 3)
-		end
-
-		y = y - dy
-		x = x - dx
-	end
-end
-
-GEOLYSIS = add_spell
-{
-	["name"] = 	"Geolysis",
-	["school"] = 	{SCHOOL_GEOMANCY},
-	["level"] = 	7,
-	["mana"] = 	15,
-	["mana_max"] = 	40,
-	["fail"] = 	15,
-	-- Unnafected by blindness
-	["blind"] =     FALSE,
-	["random"] =    0,
-	-- Must have at least 7 Earth
-	["depend"] =    function()
-			if get_skill(SKILL_EARTH) >= 7 then return TRUE end
-	end,
-	["spell"] = 	function()
-			local ret, dir = get_rep_dir()
-			if ret == FALSE then return end
-
-			msg_print("Elements recombine before you, laying down an open path.")
-			geomancy_dig(player.py, player.px, dir, 5 + get_level(GEOLYSIS, 12))
-
-			return TRUE
-	end,
-	["info"] = 	function()
-			return "length "..(5 + get_level(GEOLYSIS, 12))
-	end,
-	["desc"] =	{
-			"Burrows deeply and slightly at random into a wall,",
-			"leaving behind tailings of various different sorts of walls in the passage.",
-	}
-}
-
-player.dripping_tread = 0
-add_loadsave("player.dripping_tread", 0)
-add_hooks
-{
-	[HOOK_MOVED] = function(oy, ox)
-		if player.dripping_tread > 0 then
-			geomancy_random_floor(oy, ox)
-			player.dripping_tread = player.dripping_tread - 1
-			if player.dripping_tread == 0 then
-				msg_print("You stop dripping raw elemental energies.")
-			end
-		end
-	end
-}
-DRIPPING_TREAD = add_spell
-{
-	["name"] = 	"Dripping Tread",
-	["school"] = 	{SCHOOL_GEOMANCY},
-	["level"] = 	10,
-	["mana"] = 	15,
-	["mana_max"] = 	25,
-	["fail"] = 	15,
-	-- Unnafected by blindness
-	["blind"] =     FALSE,
-	["random"] =    0,
-	-- Must have at least 10 Water
-	["depend"] =    function()
-			if get_skill(SKILL_WATER) >= 10 then return TRUE end
-	end,
-	["spell"] =     function()
-			if player.dripping_tread == 0 then
-				player.dripping_tread = randint(15) + 10 + get_level(DRIPPING_TREAD)
-				msg_print("You start dripping raw elemental energies.")
-			else
-				player.dripping_tread = 0
-				msg_print("You stop dripping raw elemental energies.")
-			end
-			return TRUE
-	end,
-	["info"] = 	function()
-			return "dur "..(10 + get_level(DRIPPING_TREAD)).."+d15 movs"
-	end,
-	["desc"] =	{
-			"Causes you to leave random elemental forms behind as you walk",
-	}
-}
-
-GROW_BARRIER = add_spell
-{
-	["name"] = 	"Grow Barrier",
-	["school"] = 	{SCHOOL_GEOMANCY},
-	["level"] = 	12,
-	["mana"] = 	30,
-	["mana_max"] = 	40,
-	["fail"] = 	15,
-	-- Unnafected by blindness
-	["blind"] =     FALSE,
-	["random"] =    0,
-	-- Must have at least 12 Earth
-	["depend"] =    function()
-			if get_skill(SKILL_EARTH) >= 12 then return TRUE end
-	end,
-	["spell"] = 	function()
-			local ret, dir = 0, 0
-
-			if get_level(GROW_BARRIER) >= 20 then
-				ret, dir = get_aim_dir()
-				if ret == FALSE then return end
-			end
-
-			fire_ball(GF_ELEMENTAL_WALL, dir, 1, 1)
-			return TRUE
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"Creates impassable terrain (walls, trees, etc.) around you.",
-			"At level 20 it can be projected around another area.",
-	}
-}
-
-ELEMENTAL_MINION = add_spell
-{
-	["name"] = 	"Elemental Minion",
-	["school"] = 	{SCHOOL_GEOMANCY},
-	["level"] = 	20,
-	["mana"] = 	40,
-	["mana_max"] = 	80,
-	["fail"] = 	25,
-	-- Unnafected by blindness
-	["random"] =    0,
-	-- Must have at least 12 Earth
-	["spell"] = 	function()
-			local ret, dir = 0, 0
-
-			ret, dir = get_rep_dir()
-			if ret == FALSE then return end
-
-			local t =
-			{
-				[FEAT_WALL_EXTRA] = { SKILL_EARTH, { "Earth elemental", "Xorn", "Xaren" } },
-				[FEAT_WALL_OUTER] = { SKILL_EARTH, { "Earth elemental", "Xorn", "Xaren" } },
-				[FEAT_WALL_INNER] = { SKILL_EARTH, { "Earth elemental", "Xorn", "Xaren" } },
-				[FEAT_WALL_SOLID] = { SKILL_EARTH, { "Earth elemental", "Xorn", "Xaren" } },
-				[FEAT_MAGMA] = { SKILL_EARTH, { "Earth elemental", "Xorn", "Xaren" } },
-				[FEAT_QUARTZ] = { SKILL_EARTH, { "Earth elemental", "Xorn", "Xaren" } },
-				[FEAT_MAGMA_H] = { SKILL_EARTH, { "Earth elemental", "Xorn", "Xaren" } },
-				[FEAT_QUARTZ_H] = { SKILL_EARTH, { "Earth elemental", "Xorn", "Xaren" } },
-				[FEAT_MAGMA_K] = { SKILL_EARTH, { "Earth elemental", "Xorn", "Xaren" } },
-				[FEAT_QUARTZ_K] = { SKILL_EARTH, { "Earth elemental", "Xorn", "Xaren" } },
-
-				[FEAT_DARK_PIT] = { SKILL_AIR, { "Air elemental", "Ancient blue dragon", "Great Storm Wyrm", "Sky Drake" } },
-
-				[FEAT_SANDWALL] = { SKILL_FIRE, { "Fire elemental", "Ancient red dragon" } },
-				[FEAT_SANDWALL_H] = { SKILL_FIRE, { "Fire elemental", "Ancient red dragon" } },
-				[FEAT_SANDWALL_K] = { SKILL_FIRE, { "Fire elemental", "Ancient red dragon" } },
-				[FEAT_SHAL_LAVA] = { SKILL_FIRE, { "Fire elemental", "Ancient red dragon" } },
-				[FEAT_DEEP_LAVA] = { SKILL_FIRE, { "Fire elemental", "Ancient red dragon" } },
-
-				[FEAT_ICE_WALL] = { SKILL_WATER, { "Water elemental", "Water troll", "Water demon" } },
-				[FEAT_SHAL_WATER] = { SKILL_WATER, { "Water elemental", "Water troll", "Water demon" } },
-				[FEAT_DEEP_WATER] = { SKILL_WATER, { "Water elemental", "Water troll", "Water demon" } },
-			}
-
-			local y, x = explode_dir(dir)
-			y = y + player.py
-			x = x + player.px
-
-			local effect = t[cave(y, x).feat]
-			if not effect then
-				msg_print("You cannot summon from this area.")
-			else
-				local skill = effect[1]
-				local types = effect[2]
-
-				local max = get_skill_scale(skill, getn(types))
-				if max == 0 then max = 1 end
-
-				local r_idx = test_monster_name(types[rand_range(1, max)])
-
-				-- Summon it
-				local my, mx = find_position(y, x)
-				local m_idx = place_monster_one(my, mx, r_idx, 0, FALSE, MSTATUS_FRIEND)
-
-				-- level it
-				if m_idx ~= 0 then
-					monster_set_level(m_idx, 10 + get_level(ELEMENTAL_MINION, 120))
-				end
-
-				cave_set_feat(y, x, FEAT_FLOOR)
-			end
-
-			return TRUE
-	end,
-	["info"] = 	function()
-			return "min level "..(10 + get_level(ELEMENTAL_MINION, 120))
-	end,
-	["desc"] =	{
-			"Summons a minion from a nearby element.",
-			"Walls can summon Earth elmentals, Xorns and Xarens",
-			"Dark Pits can summon Air elementals, Ancient blue dragons, Great Storm Wyrms",
-			"and Sky Drakes",
-			"Sandwalls and lava can summon Fire elementals and Ancient red dragons",
-			"Icewall, and water can summon Water elementals, Water trolls and Water demons",
-	}
-}
diff --git a/lib/scpt/s_mana.lua b/lib/scpt/s_mana.lua
deleted file mode 100644
index 736b06b0..00000000
--- a/lib/scpt/s_mana.lua
+++ /dev/null
@@ -1,132 +0,0 @@
--- The mana school
-
-function get_manathrust_dam()
-	return 3 + get_level(MANATHRUST, 50), 1 + get_level(MANATHRUST, 20)
-end
-
-MANATHRUST = add_spell
-{
-	["name"] = 	"Manathrust",
-	["school"] = 	SCHOOL_MANA,
-	["level"] = 	1,
-	["mana"] = 	1,
-	["mana_max"] =  25,
-	["fail"] = 	10,
-	["stick"] =
-	{
-			["charge"] =    { 7, 10 },
-			[TV_WAND] =
-			{
-				["rarity"] = 		5,
-				["base_level"] =	{ 1, 20 },
-				["max_level"] =		{ 15, 33 },
-			},
-	},
-	["spell"] = 	function()
-			local ret, dir	
-
-			ret, dir = get_aim_dir()
-			if ret == FALSE then return end
-			return fire_bolt(GF_MANA, dir, damroll(get_manathrust_dam()))
-	end,
-	["info"] = 	function()
-			local x, y
-
-			x, y = get_manathrust_dam()
-			return "dam "..x.."d"..y
-	end,
-	["desc"] =	{
-			"Conjures up mana into a powerful bolt",
-			"The damage is irresistible and will increase with level"
-		}
-}
-
-DELCURSES = add_spell
-{
-	["name"] = 	"Remove Curses",
-	["school"] = 	SCHOOL_MANA,
-	["level"] = 	10,
-	["mana"] = 	20,
-	["mana_max"] = 	40,
-	["fail"] = 	30,
-	["stick"] =
-	{
-			["charge"] =    { 3, 8 },
-			[TV_STAFF] =
-			{
-				["rarity"] = 		70,
-				["base_level"] =	{ 1, 5 },
-				["max_level"] =		{ 15, 50 },
-			},
-	},
-	["inertia"] = 	{ 1, 10 },
-	["spell"] = 	function()
-			local done
-
-			if get_level(DELCURSES, 50) >= 20 then done = remove_all_curse()
-			else done = remove_curse() end
-			if done == TRUE then msg_print("The curse is broken!") end
-			return done
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"Remove curses of worn objects",
-			"At level 20 switches to *remove curses*"
-		}
-}
-
-RESISTS = add_spell
-{
-	["name"] = 	"Elemental Shield",
-	["school"] = 	SCHOOL_MANA,
-	["level"] = 	20,
-	["mana"] = 	17,
-	["mana_max"] = 	20,
-	["fail"] = 	40,
-	["inertia"] = 	{ 2, 25 },
-	["spell"] = 	function()
-			local obvious
-		       	if player.oppose_fire == 0 then obvious = set_oppose_fire(randint(10) + 15 + get_level(RESISTS, 50)) end
-		       	if player.oppose_cold == 0 then obvious = is_obvious(set_oppose_cold(randint(10) + 15 + get_level(RESISTS, 50)), obvious) end
-		       	if player.oppose_elec == 0 then obvious = is_obvious(set_oppose_elec(randint(10) + 15 + get_level(RESISTS, 50)), obvious) end
-		       	if player.oppose_acid == 0 then obvious = is_obvious(set_oppose_acid(randint(10) + 15 + get_level(RESISTS, 50)), obvious) end
-			return obvious
-	end,
-	["info"] = 	function()
-			return "dur "..(15 + get_level(RESISTS, 50)).."+d10"
-	end,
-	["desc"] =	{
-			"Provide resistances to the four basic elements",
-		}
-}
-
-MANASHIELD = add_spell
-{
-	["name"] = 	"Disruption Shield",
-	["school"] = 	SCHOOL_MANA,
-	["level"] = 	45,
-	["mana"] = 	50,
-	["mana_max"] = 	50,
-	["fail"] = 	90,
-	["inertia"] = 	{ 9, 10},
-	["spell"] = 	function()
-			if get_level(MANASHIELD, 50) >= 5 then
-			       	if (player.invuln == 0) then
-					return set_invuln(randint(5) + 3 + get_level(MANASHIELD, 10))
-				end
-			else
-			       	if (player.disrupt_shield == 0) then return set_disrupt_shield(randint(5) + 3 + get_level(MANASHIELD, 10)) end
-			end
-	end,
-	["info"] = 	function()
-			return "dur "..(3 + get_level(MANASHIELD, 10)).."+d5"
-	end,
-	["desc"] =	{
-			"Uses mana instead of hp to take damage",
-			"At level 5 switches to Globe of Invulnerability.",
-			"The spell breaks as soon as a melee, shooting, throwing or magical",
-			"skill action is attempted, and lasts only a short time."
-		}
-}
diff --git a/lib/scpt/s_manwe.lua b/lib/scpt/s_manwe.lua
deleted file mode 100644
index 6f0f9661..00000000
--- a/lib/scpt/s_manwe.lua
+++ /dev/null
@@ -1,144 +0,0 @@
--- Handle Manwe Sulimo magic school
-
-MANWE_SHIELD = add_spell
-{
-	["name"] =      "Wind Shield",
-	["school"] =    {SCHOOL_MANWE},
-	["level"] =     10,
-	["mana"] =      100,
-	["mana_max"] =  500,
-	["fail"] = 	30,
-	-- Uses piety to cast
-	["piety"] =     TRUE,
-	["stat"] =      A_WIS,
-	["random"] = 	SKILL_SPIRITUALITY,
-	["spell"] = 	function()
-			local dur = get_level(MANWE_SHIELD, 50) + 10 + randint(20)
-			local obvious
-
-			obvious = set_protevil(dur)
-			if get_level(MANWE_SHIELD) >= 10 then
-				local type
-
-				type = 0
-				if get_level(MANWE_SHIELD) >= 20 then
-					type = SHIELD_COUNTER
-				end
-				obvious = is_obvious(set_shield(dur, get_level(MANWE_SHIELD, 30), type, 1 + get_level(MANWE_SHIELD, 2), 1 + get_level(MANWE_SHIELD, 6)), obvious)
-			end
-			return obvious
-	end,
-	["info"] = 	function()
-			local desc = "dur "..(get_level(MANWE_SHIELD, 50) + 10).."+d20"
-
-			if get_level(MANWE_SHIELD) >= 10 then
-				desc = desc.." AC "..(get_level(MANWE_SHIELD, 30))
-			end
-			if get_level(MANWE_SHIELD) >= 20 then
-				desc = desc.." dam "..(1 + get_level(MANWE_SHIELD, 2)).."d"..(1 + get_level(MANWE_SHIELD, 6))
-			end
-			return desc
-	end,
-	["desc"] =	{
-			"It surrounds you with a shield of wind that deflects blows from evil monsters",
-			"At level 10 it increases your armour rating",
-			"At level 20 it retaliates against monsters that melee you",
-	}
-}
-
-MANWE_AVATAR = add_spell
-{
-	["name"] =      "Avatar",
-	["school"] =    {SCHOOL_MANWE},
-	["level"] =     35,
-	["mana"] =      1000,
-	["mana_max"] =  1000,
-	["fail"] = 	80,
-	-- Uses piety to cast
-	["piety"] =     TRUE,
-	["stat"] =      A_WIS,
-	["random"] = 	SKILL_SPIRITUALITY,
-	["spell"] = 	function()
-			return set_mimic(get_level(MANWE_AVATAR, 20) + randint(10), resolve_mimic_name("Maia"), player.lev)
-	end,
-	["info"] =      function()
-			return "dur "..(get_level(MANWE_AVATAR, 20)).."+d10"
-	end,
-	["desc"] =	{
-			"It turns you into a full grown Maia",
-	}
-}
-
-MANWE_BLESS = add_spell
-{
-	["name"] =      "Manwe's Blessing",
-	["school"] =    {SCHOOL_MANWE},
-	["level"] =     1,
-	["mana"] =      10,
-	["mana_max"] =  100,
-	["fail"] = 	20,
-	-- Uses piety to cast
-	["piety"] =     TRUE,
-	["stat"] =      A_WIS,
-	["random"] = 	SKILL_SPIRITUALITY,
-	["spell"] = 	function()
-			local dur = get_level(MANWE_BLESS, 70) + 30 + randint(40)
-			local obvious
-
-			obvious = set_blessed(dur)
-			obvious = is_obvious(set_afraid(0), obvious)
-			obvious = is_obvious(set_lite(0), obvious)
-			if get_level(MANWE_BLESS) >= 10 then
-				obvious = is_obvious(set_hero(dur), obvious)
-			end
-			if get_level(MANWE_BLESS) >= 20 then
-				obvious = is_obvious(set_shero(dur), obvious)
-			end
-			if get_level(MANWE_BLESS) >= 30 then
-				obvious = is_obvious(set_holy(dur), obvious)
-			end
-			return obvious
-	end,
-	["info"] =      function()
-			return "dur "..(get_level(MANWE_BLESS, 70) + 30).."+d40"
-	end,
-	["desc"] =	{
-			"Manwe's Blessing removes your fears, blesses you and surrounds you with",
-			"holy light",
-			"At level 10 it also grants heroism",
-			"At level 20 it also grants super heroism",
-			"At level 30 it also grants holy luck and life protection",
-	}
-}
-
-MANWE_CALL = add_spell
-{
-	["name"] =      "Manwe's Call",
-	["school"] =    {SCHOOL_MANWE},
-	["level"] =     20,
-	["mana"] =      200,
-	["mana_max"] =  500,
-	["fail"] = 	40,
-	-- Uses piety to cast
-	["piety"] =     TRUE,
-	["stat"] =      A_WIS,
-	["random"] = 	SKILL_SPIRITUALITY,
-	["spell"] = 	function()
-			local y, x, m_idx
-
-			y, x = find_position(player.py, player.px)
-			m_idx = place_monster_one(y, x, test_monster_name("Great eagle"), 0, FALSE, MSTATUS_FRIEND)
-
-			if m_idx ~= 0 then
-				monster_set_level(m_idx, 20 + get_level(MANWE_CALL, 70, 0))
-				return TRUE
-			end
-	end,
-	["info"] =      function()
-			return "level "..(get_level(MANWE_CALL, 70) + 20)
-	end,
-	["desc"] =	{
-			"Manwe's Call summons a Great Eagle to help you battle the forces",
-			"of Morgoth"
-	}
-}
diff --git a/lib/scpt/s_melkor.lua b/lib/scpt/s_melkor.lua
deleted file mode 100644
index b2c693dd..00000000
--- a/lib/scpt/s_melkor.lua
+++ /dev/null
@@ -1,154 +0,0 @@
--- handle the melkor school
-
--- Not included in the spell code directly because I need to call it from somewhere else too
-function do_melkor_curse(who)
-	local m_ptr = monster(who)
-
-	if get_level(MELKOR_CURSE) >= 35 then
-		local r_ptr = race_info_idx(m_ptr.r_idx, m_ptr.ego)
-
-		m_ptr.maxhp = m_ptr.maxhp - r_ptr.hside;
-		if m_ptr.maxhp < 1 then m_ptr.maxhp = 1 end
-		if m_ptr.hp > m_ptr.maxhp then m_ptr.hp = m_ptr.maxhp end
-		player.redraw = bor(player.redraw, PR_HEALTH)
-	end
-	if get_level(MELKOR_CURSE) >= 25 then
-		m_ptr.speed = m_ptr.speed - get_level(MELKOR_CURSE, 7)
-		m_ptr.mspeed = m_ptr.mspeed - get_level(MELKOR_CURSE, 7)
-
-		if m_ptr.speed < 70 then m_ptr.speed = 70 end
-		if m_ptr.mspeed < 70 then m_ptr.mspeed = 70 end
-	end
-	if get_level(MELKOR_CURSE) >= 15 then
-		m_ptr.ac = m_ptr.ac - get_level(MELKOR_CURSE, 50)
-
-		if m_ptr.ac < -70 then m_ptr.ac = -70 end
-	end
-
-	local i, pow
-	i = 1
-	pow = get_level(MELKOR_CURSE, 2)
-	while (i <= 4) do
-		if m_ptr.blow[i].d_dice > 0 then
-			if m_ptr.blow[i].d_dice < pow then
-				pow = m_ptr.blow[i].d_dice
-			end
-			if m_ptr.blow[i].d_side < pow then
-				pow = m_ptr.blow[i].d_side
-			end
-			m_ptr.blow[i].d_dice = m_ptr.blow[i].d_dice - pow
-		end
-		i = i + 1
-	end
-
-	local m_name = monster_desc(m_ptr, 0).." looks weaker."
-	msg_print(strupper(strsub(m_name, 0, 1))..strsub(m_name, 2))
-
-	-- wake it
-	m_ptr.csleep = 0;
-end
-
-MELKOR_CURSE = add_spell
-{
-	["name"] =      "Curse",
-	["school"] =    {SCHOOL_MELKOR},
-	["level"] =     1,
-	["mana"] =      50,
-	["mana_max"] =  300,
-	["fail"] = 	20,
-	-- Uses piety to cast
-	["piety"] =     TRUE,
-	["stat"] =      A_WIS,
-	["random"] = 	SKILL_SPIRITUALITY,
-	["spell"] = 	function()
-				local ret, dir = get_aim_dir()
-				if ret == FALSE then return end
-
-				if target_who == -1 then
-					msg_print("You must target a monster.")
-				else
-					do_melkor_curse(target_who)
-				end
-				return TRUE
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"It curses a monster, reducing its melee power",
-			"At level 5 it can be auto-casted (with no piety cost) while fighting",
-			"At level 15 it also reduces armor",
-			"At level 25 it also reduces speed",
-			"At level 35 it also reduces max life (but it is never fatal)",
-	}
-}
-
-MELKOR_CORPSE_EXPLOSION = add_spell
-{
-	["name"] =      "Corpse Explosion",
-	["school"] =    {SCHOOL_MELKOR},
-	["level"] =     10,
-	["mana"] =      100,
-	["mana_max"] =  500,
-	["fail"] = 	45,
-	-- Uses piety to cast
-	["piety"] =     TRUE,
-	["stat"] =      A_WIS,
-	["random"] = 	SKILL_SPIRITUALITY,
-	["spell"] = 	function()
-			return fire_ball(GF_CORPSE_EXPL, 0, 20 + get_level(MELKOR_CORPSE_EXPLOSION, 70), 2 + get_level(MELKOR_CORPSE_EXPLOSION, 5))
-	end,
-	["info"] = 	function()
-			return "dam "..(20 + get_level(MELKOR_CORPSE_EXPLOSION, 70)).."%"
-	end,
-	["desc"] =	{
-			"It makes corpses in an area around you explode for a percent of their",
-			"hit points as damage",
-	}
-}
-
-MELKOR_MIND_STEAL = add_spell
-{
-	["name"] =      "Mind Steal",
-	["school"] =    {SCHOOL_MELKOR},
-	["level"] =     20,
-	["mana"] =      1000,
-	["mana_max"] =  3000,
-	["fail"] = 	90,
-	-- Uses piety to cast
-	["piety"] =     TRUE,
-	["stat"] =      A_WIS,
-	["random"] = 	SKILL_SPIRITUALITY,
-	["spell"] = 	function()
-				local ret, dir = get_aim_dir()
-				if ret == FALSE then return end
-
-				if target_who == -1 then
-					msg_print("You must target a monster.")
-				else
-					local chance, m_ptr, r_ptr
-
-					m_ptr = monster(target_who)
-					r_ptr = race_info_idx(m_ptr.r_idx, m_ptr.ego)
-					chance = get_level(MELKOR_MIND_STEAL)
-					if (randint(m_ptr.level) < chance) and (band(r_ptr.flags1, RF1_UNIQUE) == 0) then
-						player.control = target_who
-						m_ptr.mflag = bor(m_ptr.mflag, MFLAG_CONTROL)
-
-						local m_name = monster_desc(m_ptr, 0).." falls under your control."
-						msg_print(strupper(strsub(m_name, 0, 1))..strsub(m_name, 2))
-					else
-						local m_name = monster_desc(m_ptr, 0).." resists."
-						msg_print(strupper(strsub(m_name, 0, 1))..strsub(m_name, 2))
-					end
-					return TRUE
-				end
-	end,
-	["info"] = 	function()
-			return "chance 1d(mlvl)<"..(get_level(MELKOR_MIND_STEAL))
-	end,
-	["desc"] =	{
-			"It allows your spirit to temporarily leave your own body, which will",
-			"be vulnerable, to control one of your enemies body."
-	}
-}
diff --git a/lib/scpt/s_meta.lua b/lib/scpt/s_meta.lua
deleted file mode 100644
index eab691d8..00000000
--- a/lib/scpt/s_meta.lua
+++ /dev/null
@@ -1,287 +0,0 @@
--- handle the meta school
-
-RECHARGE = add_spell
-{
-	["name"] = 	"Recharge",
-	["school"] = 	{SCHOOL_META},
-	["level"] = 	5,
-	["mana"] = 	10,
-	["mana_max"] = 	100,
-	["fail"] = 	20,
-	["spell"] = 	function()
-			return recharge(60 + get_level(RECHARGE, 140))
-	end,
-	["info"] = 	function()
-			return "power "..(60 + get_level(RECHARGE, 140))
-	end,
-	["desc"] =	{
-			"Taps on the ambient mana to recharge an object's power (charges or mana)",
-	}
-}
-
-function get_spellbinder_max()
-	local i
-
-	i = get_level(SPELLBINDER, 4)
-	if i > 4 then i = 4 end
-	return i
-end
---'
-SPELLBINDER = add_spell
-{
-	["name"] = 	"Spellbinder",
-	["school"] = 	{SCHOOL_META},
-	["level"] = 	20,
-	["mana"] = 	100,
-	["mana_max"] = 	300,
-	["fail"] = 	85,
-	["spell"] = 	function()
-			local i, ret, c
-
-			if player.spellbinder_num ~= 0 then
-				local t =
-				{
-					[SPELLBINDER_HP75] = "75% HP",
-					[SPELLBINDER_HP50] = "50% HP",
-					[SPELLBINDER_HP25] = "25% HP",
-				}
-				msg_print("The spellbinder is already active.")
-				msg_print("It will trigger at "..t[player.spellbinder_trigger]..".")
-				msg_print("With the spells: ")
-				for i = 1, player.spellbinder_num do
-					msg_print(spell(player.spellbinder[i]).name)
-				end
-				return TRUE
-			end
-
-			ret, c = get_com("Trigger at [a]75% hp [b]50% hp [c]25% hp?", strbyte("a"))
-			if ret == FALSE then return TRUE end
-			
-			if c == strbyte("a") then
-				player.spellbinder_trigger = SPELLBINDER_HP75
-			elseif c == strbyte("b") then
-				player.spellbinder_trigger = SPELLBINDER_HP50
-			elseif c == strbyte("c") then
-				player.spellbinder_trigger = SPELLBINDER_HP25
-			else
-				return
-			end
-			player.spellbinder_num = get_spellbinder_max()
-			i = player.spellbinder_num
-			while i > 0 do
-				local s
-
-				s = get_school_spell("bind", "is_ok_spell", 0)
-				if s == -1 then
-					player.spellbinder_trigger = 0
-					player.spellbinder_num = 0
-					return TRUE
-				else
-					if spell(s).skill_level > 7 + get_level(SPELLBINDER, 35) then
-						msg_print("You are only allowed spells with a base level of "..(7 + get_level(SPELLBINDER, 35))..".");
-						return TRUE
-					end
-				end
-				player.spellbinder[i] = s
-				i = i - 1
-			end
-			player.energy = player.energy - 3100;
-			msg_print("Spellbinder ready.")
-			return TRUE
-	end,
-	["info"] = 	function()
-			return "number "..(get_spellbinder_max()).." max level "..(7 + get_level(SPELLBINDER, 35))
-	end,
-	["desc"] =	{
-			"Stores spells in a trigger.",
-			"When the condition is met all spells fire off at the same time",
-			"This spell takes a long time to cast so you are advised to prepare it",
-			"in a safe area.",
-			"Also it will use the mana for the Spellbinder and the mana for the",
-			"selected spells"
-	}
-}
-
-DISPERSEMAGIC = add_spell
-{
-	["name"] = 	"Disperse Magic",
-	["school"] = 	{SCHOOL_META},
-	["level"] = 	15,
-	["mana"] = 	30,
-	["mana_max"] = 	60,
-	["fail"] = 	40,
-	-- Unnafected by blindness
-	["blind"] =     FALSE,
-	-- Unnafected by confusion
-	["confusion"] = FALSE,
-	["stick"] =
-	{
-			["charge"] =    { 5, 5 },
-			[TV_WAND] =
-			{
-				["rarity"] = 		25,
-				["base_level"] =	{ 1, 15 },
-				["max_level"] =		{ 5, 40 },
-			},
-	},
-	["inertia"] = 	{ 1, 5 },
-	["spell"] = 	function()
-			local obvious
-			obvious = set_blind(0)
-			obvious = is_obvious(set_lite(0), obvious)
-			if get_level(DISPERSEMAGIC, 50) >= 5 then
-				obvious = is_obvious(set_confused(0), obvious)
-				obvious = is_obvious(set_image(0), obvious)
-			end
-			if get_level(DISPERSEMAGIC, 50) >= 10 then
-				obvious = is_obvious(set_slow(0), obvious)
-				obvious = is_obvious(set_fast(0, 0), obvious)
-				obvious = is_obvious(set_light_speed(0), obvious)
-			end
-			if get_level(DISPERSEMAGIC, 50) >= 15 then
-				obvious = is_obvious(set_stun(0), obvious)
-				obvious = is_obvious(set_meditation(0), obvious)
-				obvious = is_obvious(set_cut(0), obvious)
-			end
-			if get_level(DISPERSEMAGIC, 50) >= 20 then
-				obvious = is_obvious(set_hero(0), obvious)
-				obvious = is_obvious(set_shero(0), obvious)
-				obvious = is_obvious(set_blessed(0), obvious)
-				obvious = is_obvious(set_shield(0, 0, 0, 0, 0), obvious)
-				obvious = is_obvious(set_afraid(0), obvious)
-				obvious = is_obvious(set_parasite(0, 0), obvious)
-				obvious = is_obvious(set_mimic(0, 0, 0), obvious)
-			end
-			return TRUE
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"Dispels a lot of magic that can affect you, be it good or bad",
-			"Level 1: blindness and light",
-			"Level 5: confusion and hallucination",
-			"Level 10: speed (both bad or good) and light speed",
-			"Level 15: stunning, meditation, cuts",
-			"Level 20: hero, super hero, bless, shields, afraid, parasites, mimicry",
-	}
-}
-
-TRACKER = add_spell
-{
-	["name"] = 	"Tracker",
-	["school"] = 	{SCHOOL_META, SCHOOL_CONVEYANCE},
-	["level"] = 	30,
-	["mana"] = 	50,
-	["mana_max"] = 	50,
-	["fail"] = 	95,
-	["spell"] = 	function()
-			if last_teleportation_y == -1 then
-				msg_print("There has not been any teleporatation here.")
-				return TRUE
-			end
-			teleport_player_to(last_teleportation_y, last_teleportation_x)
-			return TRUE
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"Tracks down the last teleportation that happened on the level and teleports",
-			"you to it",
-	}
-}
-
--- Saves the values of the timer
-save_timer("TIMER_INERTIA_CONTROL")
-add_loadsave("player.inertia_controlled_spell", -1)
-player.inertia_controlled_spell = -1
-
--- Automatically cast the inertia controlled spells
-TIMER_INERTIA_CONTROL = new_timer
-{
-	["enabled"] = FALSE,
-	["delay"] = 10,
-	["callback"] = function()
-		-- Don't cast a controlled spell in wilderness mode
-		if player.antimagic then
-			msg_print("Your anti-magic field disrupts any magic attempts.")
-		elseif player.anti_magic then
-			msg_print("Your anti-magic shell disrupts any magic attempts.")
-		elseif (player.inertia_controlled_spell ~= -1) and (player.wild_mode == FALSE) then
-			__spell_spell[player.inertia_controlled_spell]()
-		end
-	end,
-}
-
-stop_inertia_controlled_spell = function()
-	player.inertia_controlled_spell = -1
-	TIMER_INERTIA_CONTROL.enabled = FALSE
-	player.update = bor(player.update, PU_MANA)
-	return TRUE
-end
-
-add_hooks
-{
-	-- Reduce the mana by four times the cost of the spell
-	[HOOK_CALC_MANA] = function(msp)
-		if player.inertia_controlled_spell ~= -1 then
-			msp = msp - (get_mana(player.inertia_controlled_spell) * 4)
-			if msp < 0 then msp = 0 end
-			return TRUE, msp
-		end
-	end,
-
-	-- Stop a previous spell at birth
-	[HOOK_BIRTH_OBJECTS] = function()
-		stop_inertia_controlled_spell()
-	end,
-}
-
-INERTIA_CONTROL = add_spell
-{
-	["name"] = 	"Inertia Control",
-	["school"] = 	{SCHOOL_META},
-	["level"] = 	37,
-	["mana"] = 	300,
-	["mana_max"] = 	700,
-	["fail"] = 	95,
-	["spell"] = 	function()
-			if player.inertia_controlled_spell ~= -1 then
-				msg_print("You cancel your inertia flow control.")
-				return stop_inertia_controlled_spell()
-			end
-
-			local s = get_school_spell("control", "is_ok_spell", 0)
-			if s == -1 then
-				return stop_inertia_controlled_spell()
-			end
-
-			local inertia = __tmp_spells[s].inertia
-
-			if inertia == nil then
-				msg_print("This spell inertia flow can not be controlled.")
-				return stop_inertia_controlled_spell()
-			end
-			if inertia[1] > get_level(INERTIA_CONTROL, 10) then
-				msg_print("This spell inertia flow("..inertia[1]..") is too strong to be controlled by your current spell.")
-				return stop_inertia_controlled_spell()
-			end
-
-			player.inertia_controlled_spell = s
-			TIMER_INERTIA_CONTROL.enabled = TRUE
-			TIMER_INERTIA_CONTROL.delay = inertia[2]
-			TIMER_INERTIA_CONTROL.countdown = TIMER_INERTIA_CONTROL.delay
-			player.update = bor(player.update, PU_MANA)
-			msg_print("Inertia flow controlling spell "..spell(s).name..".")
-			return TRUE
-	end,
-	["info"] = 	function()
-			return "level "..get_level(INERTIA_CONTROL, 10)
-	end,
-	["desc"] = 	{
-			"Changes the energy flow of a spell to be continuously recasted",
-			"at a given interval. The inertia controlled spell reduces your",
-			"maximum mana by four times its cost.",
-	}
-}
diff --git a/lib/scpt/s_mind.lua b/lib/scpt/s_mind.lua
deleted file mode 100644
index d1b25e9e..00000000
--- a/lib/scpt/s_mind.lua
+++ /dev/null
@@ -1,132 +0,0 @@
--- handle the mind school
-
-CHARM = add_spell
-{
-	["name"] = 	"Charm",
-	["school"] = 	{SCHOOL_MIND},
-	["level"] = 	1,
-	["mana"] = 	1,
-	["mana_max"] = 	20,
-	["fail"] = 	10,
-	["stick"] =
-	{
-			["charge"] =    { 7, 5 },
-			[TV_WAND] =
-			{
-				["rarity"] = 		35,
-				["base_level"] =	{ 1, 15 },
-				["max_level"] =		{ 20, 40 },
-			},
-	},
-	["spell"] = 	function()
-			if get_level(CHARM, 50) >= 35 then
-				return project_los(GF_CHARM, 10 + get_level(CHARM, 150))
-			elseif get_level(CHARM, 50) >= 15 then
-				local ret, dir = get_aim_dir()
-				if ret == FALSE then return end
-				return fire_ball(GF_CHARM, dir, 10 + get_level(CHARM, 150), 3)
-			else
-				local ret, dir = get_aim_dir()
-				if ret == FALSE then return end
-				return fire_bolt(GF_CHARM, dir, 10 + get_level(CHARM, 150))
-			end
-	end,
-	["info"] = 	function()
-			return "power "..(10 + get_level(CHARM, 150))
-	end,
-	["desc"] =	{
-			"Tries to manipulate the mind of a monster to make it friendly",
-			"At level 15 it turns into a ball",
-			"At level 35 it affects all monsters in sight"
-	}
-}
-
-CONFUSE = add_spell
-{
-	["name"] = 	"Confuse",
-	["school"] = 	{SCHOOL_MIND},
-	["level"] = 	5,
-	["mana"] = 	5,
-	["mana_max"] = 	30,
-	["fail"] = 	20,
-	["stick"] =
-	{
-			["charge"] =    { 3, 4 },
-			[TV_WAND] =
-			{
-				["rarity"] = 		45,
-				["base_level"] =	{ 1, 5 },
-				["max_level"] =		{ 20, 40 },
-			},
-	},
-	["spell"] = 	function()
-			if get_level(CONFUSE, 50) >= 35 then
-				return project_los(GF_OLD_CONF, 10 + get_level(CONFUSE, 150))
-			elseif get_level(CONFUSE, 50) >= 15 then
-				local ret, dir = get_aim_dir()
-				if ret == FALSE then return end
-				return fire_ball(GF_OLD_CONF, dir, 10 + get_level(CONFUSE, 150), 3)
-			else
-				local ret, dir = get_aim_dir()
-				if ret == FALSE then return end
-				return fire_bolt(GF_OLD_CONF, dir, 10 + get_level(CONFUSE, 150))
-			end
-	end,
-	["info"] = 	function()
-			return "power "..(10 + get_level(CONFUSE, 150))
-	end,
-	["desc"] =	{
-			"Tries to manipulate the mind of a monster to confuse it",
-			"At level 15 it turns into a ball",
-			"At level 35 it affects all monsters in sight"
-	}
-}
-
-ARMOROFFEAR = add_spell
-{
-	["name"] = 	"Armor of Fear",
-	["school"] = 	SCHOOL_MIND,
-	["level"] = 	10,
-	["mana"] = 	10,
-	["mana_max"] = 	50,
-	["fail"] = 	35,
-	["inertia"] = 	{ 2, 20 },
-	["spell"] = 	function()
-			return set_shield(randint(10) + 10 + get_level(ARMOROFFEAR, 100), 10, SHIELD_FEAR, 1 + get_level(ARMOROFFEAR, 7), 5 + get_level(ARMOROFFEAR, 20))
-	end,
-	["info"] = 	function()
-			return "dur "..(10 + get_level(ARMOROFFEAR, 100)).." power "..(1 + get_level(ARMOROFFEAR, 7)).."d"..(5 + get_level(ARMOROFFEAR, 20))
-	end,
-	["desc"] =	{
-			"Creates a shield of pure fear around you. Any monster attempting to hit you",
-			"must save or flee",
-		}
-}
-
-STUN = add_spell
-{
-	["name"] = 	"Stun",
-	["school"] = 	{SCHOOL_MIND},
-	["level"] = 	15,
-	["mana"] = 	10,
-	["mana_max"] = 	90,
-	["fail"] = 	45,
-	["spell"] = 	function()
-			if get_level(STUN, 50) >= 20 then
-				local ret, dir = get_aim_dir()
-				if ret == FALSE then return end
-				return fire_ball(GF_STUN, dir, 10 + get_level(STUN, 150), 3)
-			else
-				local ret, dir = get_aim_dir()
-				if ret == FALSE then return end
-				return fire_bolt(GF_STUN, dir, 10 + get_level(STUN, 150))
-			end
-	end,
-	["info"] = 	function()
-			return "power "..(10 + get_level(STUN, 150))
-	end,
-	["desc"] =	{
-			"Tries to manipulate the mind of a monster to stun it",
-			"At level 20 it turns into a ball",
-	}
-}
diff --git a/lib/scpt/s_music.lua b/lib/scpt/s_music.lua
deleted file mode 100644
index 9da6393a..00000000
--- a/lib/scpt/s_music.lua
+++ /dev/null
@@ -1,443 +0,0 @@
--- handle the music school
--- *ALL* lasting spell must return the mana cost in the lasting function
-
-MUSIC_STOP = add_spell
-{
-	["name"] =      "Stop singing(I)",
-	["school"] =    {SCHOOL_MUSIC},
-	["level"] =     1,
-	["mana"] =      0,
-	["mana_max"] =  0,
-	["fail"] =      -400,
-	["stat"] =      A_CHR,
-	["random"] =    SKILL_MUSIC,
-	["pval"] =      1,
-	["blind"] =     FALSE,
-	["spell"] =     function()
-			player.start_lasting_spell(0)
-			return TRUE
-	end,
-	["info"] =      function()
-			return ""
-	end,
-	["desc"] =      {
-			"Stops the current song, if any."
-	}
-}
-
---- Drums
-MUSIC_HOLD = add_spell
-{
-	["name"] =      "Holding Pattern(I)",
-	["school"] =    {SCHOOL_MUSIC},
-	["level"] =     1,
-	["mana"] =      1,
-	["mana_max"] =  10,
-	["fail"] =      20,
-	["stat"] =      A_CHR,
-	["random"] =    SKILL_MUSIC,
-	["pval"] =      1,
-	["blind"] =     FALSE,
-	["lasting"] =   function()
-			project_los(GF_OLD_SLOW, 10 + get_level(MUSIC_HOLD, 100))
-			return get_mana(MUSIC_HOLD)
-	end,
-	["spell"] =     function()
-			player.start_lasting_spell(MUSIC_HOLD)
-			return TRUE
-	end,
-	["info"] =      function()
-			return "power "..(10 + get_level(MUSIC_HOLD, 100))
-	end,
-	["desc"] =      {
-			"Slows down all monsters listening the song.",
-			"Consumes the amount of mana each turn.",
-	}
-}
-
-MUSIC_CONF = add_spell
-{
-	["name"] =      "Illusion Pattern(II)",
-	["school"] =    {SCHOOL_MUSIC},
-	["level"] =     5,
-	["mana"] =      2,
-	["mana_max"] =  15,
-	["fail"] =      30,
-	["stat"] =      A_CHR,
-	["random"] =    SKILL_MUSIC,
-	["pval"] =      2,
-	["blind"] =     FALSE,
-	["lasting"] =   function()
-			project_los(GF_OLD_CONF, 10 + get_level(MUSIC_CONF, 100))
-			return get_mana(MUSIC_CONF)
-	end,
-	["spell"] =     function()
-			player.start_lasting_spell(MUSIC_CONF)
-			return TRUE
-	end,
-	["info"] =      function()
-			return "power "..(10 + get_level(MUSIC_CONF, 100))
-	end,
-	["desc"] =      {
-			"Tries to confuse all monsters listening the song.",
-			"Consumes the amount of mana each turn.",
-	}
-}
-
-MUSIC_STUN = add_spell
-{
-	["name"] =      "Stun Pattern(IV)",
-	["school"] =    {SCHOOL_MUSIC},
-	["level"] =     10,
-	["mana"] =      3,
-	["mana_max"] =  25,
-	["fail"] =      45,
-	["stat"] =      A_CHR,
-	["random"] =    SKILL_MUSIC,
-	["pval"] =      4,
-	["blind"] =     FALSE,
-	["lasting"] =   function()
-			project_los(GF_STUN, 10 + get_level(MUSIC_STUN, 90))
-			return get_mana(MUSIC_STUN)
-	end,
-	["spell"] =     function()
-			player.start_lasting_spell(MUSIC_STUN)
-			return TRUE
-	end,
-	["info"] =      function()
-			return "power "..(10 + get_level(MUSIC_STUN, 90))
-	end,
-	["desc"] =      {
-			"Stuns all monsters listening the song.",
-			"Consumes the amount of mana each turn.",
-	}
-}
-
---- Harps
-MUSIC_LITE = add_spell
-{
-	["name"] =      "Song of the Sun(I)",
-	["school"] =    {SCHOOL_MUSIC},
-	["level"] =     1,
-	["mana"] =      1,
-	["mana_max"] =  1,
-	["fail"] =      20,
-	["stat"] =      A_CHR,
-	["random"] =    SKILL_MUSIC,
-	["blind"] =     FALSE,
-	["pval"] =      1,
-	["lasting"] =   function()
-			set_lite(5)
-			return 1
-	end,
-	["spell"] =     function()
-			player.start_lasting_spell(MUSIC_LITE)
-			return TRUE
-	end,
-	["info"] =      function()
-			return ""
-	end,
-	["desc"] =      {
-			"Provides light as long as you sing.",
-			"Consumes the amount of mana each turn.",
-	}
-}
-
-MUSIC_HEAL = add_spell
-{
-	["name"] =      "Flow of Life(II)",
-	["school"] =    {SCHOOL_MUSIC},
-	["level"] =     7,
-	["mana"] =      5,
-	["mana_max"] =  30,
-	["fail"] =      35,
-	["stat"] =      A_CHR,
-	["random"] =    SKILL_MUSIC,
-	["pval"] =      2,
-	["lasting"] =   function()
-			hp_player(7 + get_level(MUSIC_HEAL, 100))
-			return get_mana(MUSIC_HEAL)
-	end,
-	["spell"] =     function()
-			player.start_lasting_spell(MUSIC_HEAL)
-			return TRUE
-	end,
-	["info"] =      function()
-			return "heal "..(7 + get_level(MUSIC_HEAL, 100)).."/turn"
-	end,
-	["desc"] =      {
-			"Heals you as long as you sing.",
-			"Consumes the amount of mana each turn.",
-	}
-}
-
-MUSIC_HERO = add_spell
-{
-	["name"] =      "Heroic Ballad(II)",
-	["school"] =    {SCHOOL_MUSIC},
-	["level"] =     10,
-	["mana"] =      4,
-	["mana_max"] =  14,
-	["fail"] =      45,
-	["stat"] =      A_CHR,
-	["random"] =    SKILL_MUSIC,
-	["pval"] =      2,
-	["lasting"] =   function()
-			set_hero(5)
-			if get_level(MUSIC_HERO) >= 10 then
-				set_shero(5)
-			end
-			if get_level(MUSIC_HERO) >= 20 then
-				set_strike(5)
-			end
-			if get_level(MUSIC_HERO) >= 25 then
-				set_oppose_cc(5)
-			end
-			return get_mana(MUSIC_HERO)
-	end,
-	["spell"] =     function()
-			player.start_lasting_spell(MUSIC_HERO)
-			return TRUE
-	end,
-	["info"] =      function()
-			return ""
-	end,
-	["desc"] =      {
-			"Increases melee accuracy",
-			"At level 10 it increases it even more and reduces armour a bit",
-			"At level 20 it increases it again",
-			"At level 25 it grants protection against chaos and confusion",
-			"Consumes the amount of mana each turn.",
-	}
-}
-
-MUSIC_TIME = add_spell
-{
-	["name"] =      "Hobbit Melodies(III)",
-	["school"] =    {SCHOOL_MUSIC},
-	["level"] =     20,
-	["mana"] =      10,
-	["mana_max"] =  30,
-	["fail"] =      70,
-	["stat"] =      A_CHR,
-	["random"] =    SKILL_MUSIC,
-	["pval"] =      3,
-	["lasting"] =   function()
-			set_shield(5, 10 + get_level(MUSIC_TIME, 50), 0, 0, 0)
-			if get_level(MUSIC_TIME) >= 15 then
-				set_fast(5, 7 + get_level(MUSIC_TIME, 10))
-			end
-			return get_mana(MUSIC_TIME)
-	end,
-	["spell"] =     function()
-			player.start_lasting_spell(MUSIC_TIME)
-			return TRUE
-	end,
-	["info"] =      function()
-			if get_level(MUSIC_TIME) >= 15 then
-				return "AC "..(10 + get_level(MUSIC_TIME, 50)).." speed "..(7 + get_level(MUSIC_TIME, 10))
-			else
-				return "AC "..(10 + get_level(MUSIC_TIME, 50))
-			end
-	end,
-	["desc"] =      {
-			"Greatly increases your reflexes allowing you to block more melee blows.",
-			"At level 15 it also makes you faster.",
-			"Consumes the amount of mana each turn.",
-	}
-}
-
-MUSIC_MIND = add_spell
-{
-	["name"] =      "Clairaudience(IV)",
-	["school"] =    {SCHOOL_MUSIC},
-	["level"] =     25,
-	["mana"] =      15,
-	["mana_max"] =  30,
-	["fail"] =      75,
-	["stat"] =      A_CHR,
-	["random"] =    SKILL_MUSIC,
-	["pval"] =      4,
-	["lasting"] =   function()
-			set_tim_esp(5)
-			if get_level(MUSIC_MIND) >= 10 then
-				fire_ball(GF_IDENTIFY, 0, 1, 1 + get_level(MUSIC_MIND, 3, 0))
-			end
-			return get_mana(MUSIC_MIND)
-	end,
-	["spell"] =     function()
-			player.start_lasting_spell(MUSIC_MIND)
-			return TRUE
-	end,
-	["info"] =      function()
-			if get_level(MUSIC_MIND) >= 10 then
-				return "rad "..(1 + get_level(MUSIC_MIND, 3, 0))
-			else
-				return ""
-			end
-	end,
-	["desc"] =      {
-			"Allows you to sense monster minds as long as you sing.",
-			"At level 10 it identifies all objects in a radius on the floor,",
-			"as well as probing monsters in that radius.",
-			"Consumes the amount of mana each turn.",
-	}
-}
-
---- Horns
-
-MUSIC_BLOW = add_spell
-{
-	["name"] =      "Blow(I)",
-	["school"] =    {SCHOOL_MUSIC},
-	["level"] =     4,
-	["mana"] =      3,
-	["mana_max"] =  30,
-	["fail"] =      20,
-	["stat"] =      A_CHR,
-	["random"] =    SKILL_MUSIC,
-	["pval"] =      1,
-	["spell"] =     function()
-			fire_ball(GF_SOUND,
-				  0,
-				  damroll(2 + get_level(MUSIC_BLOW, 10, 0), 4 + get_level(MUSIC_BLOW, 40, 0)),
-				  1 + get_level(MUSIC_BLOW, 12, 0)
-				 )
-			return TRUE
-	end,
-	["info"] =      function()
-			return "dam "..(2 + get_level(MUSIC_BLOW, 10, 0)).."d"..(4 + get_level(MUSIC_BLOW, 40, 0)).." rad "..(1 + get_level(MUSIC_BLOW, 12, 0))
-	end,
-	["desc"] =      {
-			"Produces a powerful, blowing, sound all around you.",
-	}
-}
-
-MUSIC_WIND = add_spell
-{
-	["name"] =      "Gush of Wind(II)",
-	["school"] =    {SCHOOL_MUSIC},
-	["level"] =     14,
-	["mana"] =      15,
-	["mana_max"] =  45,
-	["fail"] =      30,
-	["stat"] =      A_CHR,
-	["random"] =    SKILL_MUSIC,
-	["pval"] =      2,
-	["spell"] =     function()
-			fire_ball(GF_AWAY_ALL,
-				  0,
-				  10 + get_level(MUSIC_BLOW, 40, 0),
-				  1 + get_level(MUSIC_BLOW, 12, 0)
-				 )
-			return TRUE
-	end,
-	["info"] =      function()
-			return "dist "..(10 + get_level(MUSIC_BLOW, 40, 0)).." rad "..(1 + get_level(MUSIC_BLOW, 12, 0))
-	end,
-	["desc"] =      {
-			"Produces a outgoing gush of wind that sends monsters away.",
-	}
-}
-
-MUSIC_YLMIR = add_spell
-{
-	["name"] =      "Horns of Ylmir(III)",
-	["school"] =    {SCHOOL_MUSIC},
-	["level"] =     20,
-	["mana"] =      25,
-	["mana_max"] =  30,
-	["fail"] =      20,
-	["stat"] =      A_CHR,
-	["random"] =    SKILL_MUSIC,
-	["pval"] =      3,
-	["spell"] =     function()
-			earthquake(player.py, player.px, 2 + get_level(SHAKE, 10))
-			return TRUE
-	end,
-	["info"] =      function()
-			return "rad "..(2 + get_level(SHAKE, 10))
-	end,
-	["desc"] =      {
-			"Produces an earth shaking sound.",
-	}
-}
-
-MUSIC_AMBARKANTA = add_spell
-{
-	["name"] =      "Ambarkanta(IV)",
-	["school"] =    {SCHOOL_MUSIC},
-	["level"] =     25,
-	["mana"] =      70,
-	["mana_max"] =  70,
-	["fail"] =      60,
-	["stat"] =      A_CHR,
-	["random"] =    SKILL_MUSIC,
-	["pval"] =      4,
-	["spell"] =     function()
-			alter_reality()
-			return TRUE
-	end,
-	["info"] =      function()
-			return ""
-	end,
-	["desc"] =      {
-			"Produces a reality shaking sound that transports you to a nearly",
-			"identical reality.",
-	}
-}
-
-
---[[
-MUSIC_ = add_spell
-{
-	["name"] =      "(I)",
-	["school"] =    {SCHOOL_MUSIC},
-	["level"] =     1,
-	["mana"] =      0,
-	["mana_max"] =  0,
-	["fail"] =      20,
-	["stat"] =      A_CHR,
-	["random"] =    SKILL_MUSIC,
-	["pval"] =      1,
-	["lasting"] =   function()
-			return get_mana(MUSIC_)
-	end,
-	["spell"] =     function()
-			player.start_lasting_spell(MUSIC_)
-			return TRUE
-	end,
-	["info"] =      function()
-			return ""
-	end,
-	["desc"] =      {
-			"",
-			"Consumes the amount of mana each turn.",
-	}
-}
-
-or
-
-MUSIC_ = add_spell
-{
-	["name"] =      "(I)",
-	["school"] =    {SCHOOL_MUSIC},
-	["level"] =     1,
-	["mana"] =      0,
-	["mana_max"] =  0,
-	["fail"] =      20,
-	["stat"] =      A_CHR,
-	["random"] =    SKILL_MUSIC,
-	["pval"] =      1,
-	["spell"] =     function()
-
-			return TRUE
-	end,
-	["info"] =      function()
-			return ""
-	end,
-	["desc"] =      {
-			"",
-	}
-}
-]]
diff --git a/lib/scpt/s_nature.lua b/lib/scpt/s_nature.lua
deleted file mode 100644
index e71a89bf..00000000
--- a/lib/scpt/s_nature.lua
+++ /dev/null
@@ -1,152 +0,0 @@
--- handle the nature school
-
-GROWTREE = add_spell
-{
-	["name"] = 	"Grow Trees",
-	["school"] = 	{SCHOOL_NATURE, SCHOOL_TEMPORAL},
-	["level"] = 	6,
-	["mana"] = 	6,
-	["mana_max"] = 	30,
-	["fail"] = 	35,
-	["inertia"] = 	{ 5, 50 },
-	["spell"] = 	function()
-			grow_trees(2 + get_level(GROWTREE, 7))
-			return TRUE
-	end,
-	["info"] = 	function()
-			return "rad "..(2 + get_level(GROWTREE, 7))
-	end,
-	["desc"] =	{
-			"Makes trees grow extremely quickly around you",
-	}
-}
-
-HEALING = add_spell
-{
-	["name"] = 	"Healing",
-	["school"] = 	{SCHOOL_NATURE},
-	["level"] = 	10,
-	["mana"] = 	15,
-	["mana_max"] = 	50,
-	["fail"] = 	45,
-	["stick"] =
-	{
-			["charge"] =    { 2, 3 },
-			[TV_STAFF] =
-			{
-				["rarity"] = 		90,
-				["base_level"] =	{ 1, 5 },
-				["max_level"] =		{ 20, 40 },
-			},
-	},
-	["spell"] = 	function()
-			return hp_player(player.mhp * (15 + get_level(HEALING, 35)) / 100)
-	end,
-	["info"] = 	function()
-			return "heal "..(15 + get_level(HEALING, 35)).."% = "..(player.mhp * (15 + get_level(HEALING, 35)) / 100).."hp"
-	end,
-	["desc"] =	{
-			"Heals a percent of hitpoints",
-	}
-}
-
-RECOVERY = add_spell
-{
-	["name"] = 	"Recovery",
-	["school"] = 	{SCHOOL_NATURE},
-	["level"] = 	15,
-	["mana"] = 	10,
-	["mana_max"] = 	25,
-	["fail"] = 	60,
-	["stick"] =
-	{
-			["charge"] =    { 5, 10 },
-			[TV_STAFF] =
-			{
-				["rarity"] = 		50,
-				["base_level"] =	{ 1, 5 },
-				["max_level"] =		{ 10, 30 },
-			},
-	},
-	["inertia"] = 	{ 2, 100 },
-	["spell"] = 	function()
-			local obvious
-			obvious = set_poisoned(player.poisoned / 2)
-			if get_level(RECOVERY, 50) >= 5 then
-				obvious = is_obvious(set_poisoned(0), obvious)
-				obvious = is_obvious(set_cut(0), obvious)
-			end
-			if get_level(RECOVERY, 50) >= 10 then
-				obvious = is_obvious(do_res_stat(A_STR, TRUE), obvious)
-				obvious = is_obvious(do_res_stat(A_CON, TRUE), obvious)
-				obvious = is_obvious(do_res_stat(A_DEX, TRUE), obvious)
-				obvious = is_obvious(do_res_stat(A_WIS, TRUE), obvious)
-				obvious = is_obvious(do_res_stat(A_INT, TRUE), obvious)
-				obvious = is_obvious(do_res_stat(A_CHR, TRUE), obvious)
-			end
-			if get_level(RECOVERY, 50) >= 15 then
-				obvious = is_obvious(restore_level(), obvious)
-			end
-			return obvious
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"Reduces the length of time that you are poisoned",
-			"At level 5 it cures poison and cuts",
-			"At level 10 it restores drained stats",
-			"At level 15 it restores lost experience"
-	}
-}
-
-REGENERATION = add_spell
-{
-	["name"] = 	"Regeneration",
-	["school"] = 	{SCHOOL_NATURE},
-	["level"] = 	20,
-	["mana"] = 	30,
-	["mana_max"] = 	55,
-	["fail"] = 	70,
-	["inertia"] = 	{ 4, 40 },
-	["spell"] = 	function()
-			if player.tim_regen == 0 then return set_tim_regen(randint(10) + 5 + get_level(REGENERATION, 50), 300 + get_level(REGENERATION, 700)) end
-	end,
-	["info"] = 	function()
-			return "dur "..(5 + get_level(REGENERATION, 50)).."+d10 power "..(300 + get_level(REGENERATION, 700))
-	end,
-	["desc"] =	{
-			"Increases your body's regeneration rate",
-	}
-}
-
-
-SUMMONANNIMAL = add_spell
-{
-	["name"] =      "Summon Animal",
-	["school"] = 	{SCHOOL_NATURE},
-	["level"] = 	25,
-	["mana"] = 	25,
-	["mana_max"] = 	50,
-	["fail"] = 	90,
-	["stick"] =
-	{
-			["charge"] =    { 1, 3 },
-			[TV_WAND] =
-			{
-				["rarity"] = 		85,
-				["base_level"] =	{ 1, 5 },
-				["max_level"] =		{ 15, 45 },
-			},
-	},
-	["spell"] = 	function()
-			summon_specific_level = 25 + get_level(SUMMONANNIMAL, 50)
-			return summon_monster(player.py, player.px, dun_level, TRUE, SUMMON_ANIMAL)
-	end,
-	["info"] = 	function()
-			return "level "..(25 + get_level(SUMMONANNIMAL, 50))
-	end,
-	["desc"] =	{
-			"Summons a leveled animal to your aid",
-	}
-}
diff --git a/lib/scpt/s_stick.lua b/lib/scpt/s_stick.lua
deleted file mode 100644
index 36647414..00000000
--- a/lib/scpt/s_stick.lua
+++ /dev/null
@@ -1,444 +0,0 @@
--- Spells that are stick or artifacts/... only
-
-DEVICE_HEAL_MONSTER = add_spell
-{
-	["name"] = 	"Heal Monster",
-	["school"] = 	{SCHOOL_DEVICE},
-	["level"] = 	3,
-	["mana"] = 	5,
-	["mana_max"] = 	20,
-	["fail"] = 	15,
-	["random"] =    -1,
-	["stick"] =
-	{
-			["charge"] =    { 10, 10 },
-			[TV_WAND] =
-			{
-				["rarity"] = 		17,
-				["base_level"] =	{ 1, 15 },
-				["max_level"] =		{ 20, 50 },
-			},
-	},
-	["spell"] = 	function()
-			local ret, dir = get_aim_dir()
-			if ret == FALSE then return end
-
-			return fire_ball(GF_OLD_HEAL, dir, 20 + get_level(DEVICE_HEAL_MONSTER, 380), 0)
-	end,
-	["info"] = 	function()
-			return "heal "..(20 + get_level(DEVICE_HEAL_MONSTER, 380))
-	end,
-	["desc"] =	{
-			"Heals a monster",
-	}
-}
-
-DEVICE_SPEED_MONSTER = add_spell
-{
-	["name"] = 	"Haste Monster",
-	["school"] = 	{SCHOOL_DEVICE},
-	["level"] = 	10,
-	["mana"] = 	10,
-	["mana_max"] = 	10,
-	["fail"] = 	30,
-	["random"] =    -1,
-	["stick"] =
-	{
-			["charge"] =    { 10, 5 },
-			[TV_WAND] =
-			{
-				["rarity"] = 		7,
-				["base_level"] =	{ 1, 1 },
-				["max_level"] =		{ 20, 50 },
-			},
-	},
-	["spell"] = 	function()
-			local ret, dir = get_aim_dir()
-			if ret == FALSE then return end
-
-			return fire_ball(GF_OLD_SPEED, dir, 1, 0)
-	end,
-	["info"] = 	function()
-			return "speed +10"
-	end,
-	["desc"] =	{
-			"Haste a monster",
-	}
-}
-
-DEVICE_WISH = add_spell
-{
-	["name"] = 	"Wish",
-	["school"] = 	{SCHOOL_DEVICE},
-	["level"] = 	50,
-	["mana"] = 	400,
-	["mana_max"] = 	400,
-	["fail"] = 	99,
-	["random"] =    -1,
-	["stick"] =
-	{
-			["charge"] =    { 1, 2 },
-			[TV_STAFF] =
-			{
-				["rarity"] = 		98,
-				["base_level"] =	{ 1, 1 },
-				["max_level"] =		{ 1, 1 },
-			},
-	},
-	["spell"] = 	function()
-			make_wish()
-			return TRUE
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"This grants you a wish, beware of what you ask for!",
-	}
-}
-
-DEVICE_SUMMON = add_spell
-{
-	["name"] = 	"Summon",
-	["school"] = 	{SCHOOL_DEVICE},
-	["level"] = 	5,
-	["mana"] = 	5,
-	["mana_max"] = 	25,
-	["fail"] = 	20,
-	["random"] =    -1,
-	["stick"] =
-	{
-			["charge"] =    { 1, 20 },
-			[TV_STAFF] =
-			{
-				["rarity"] = 		13,
-				["base_level"] =	{ 1, 40 },
-				["max_level"] =		{ 25, 50 },
-			},
-	},
-	["spell"] = 	function()
-			local i, obvious
-			obvious = nil
-			for i = 1, 4 + get_level(DEVICE_SUMMON, 30) do
-				obvious = is_obvious(summon_specific(player.py, player.px, dun_level, 0), obvious)
-			end
-			return obvious
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"Summons hostile monsters near you",
-	}
-}
-
-DEVICE_MANA = add_spell
-{
-	["name"] = 	"Mana",
-	["school"] = 	{SCHOOL_DEVICE},
-	["level"] = 	30,
-	["mana"] = 	1,
-	["mana_max"] = 	1,
-	["fail"] = 	80,
-	["random"] =    -1,
-	["stick"] =
-	{
-			["charge"] =    { 2, 3 },
-			[TV_STAFF] =
-			{
-				["rarity"] = 		78,
-				["base_level"] =	{ 1, 5 },
-				["max_level"] =		{ 20, 35 },
-			},
-	},
-	["spell"] = 	function()
-			increase_mana((player.msp * (20 + get_level(DEVICE_MANA, 50))) / 100)
-			return TRUE
-	end,
-	["info"] = 	function()
-			return "restore "..(20 + get_level(DEVICE_MANA, 50)).."%"
-	end,
-	["desc"] =	{
-			"Restores a part(or all) of your mana",
-	}
-}
-
-DEVICE_NOTHING = add_spell
-{
-	["name"] = 	"Nothing",
-	["school"] = 	{SCHOOL_DEVICE},
-	["level"] = 	1,
-	["mana"] = 	0,
-	["mana_max"] = 	0,
-	["fail"] = 	0,
-	["random"] =    -1,
-	["stick"] =
-	{
-			["charge"] =    { 0, 0 },
-			[TV_WAND] =
-			{
-				["rarity"] = 		3,
-				["base_level"] =	{ 1, 1 },
-				["max_level"] =		{ 1, 1 },
-			},
-			[TV_STAFF] =
-			{
-				["rarity"] = 		3,
-				["base_level"] =	{ 1, 1 },
-				["max_level"] =		{ 1, 1},
-			},
-	},
-	["spell"] = 	function()
-			return FALSE
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"It does nothing.",
-	}
-}
-
-DEVICE_LEBOHAUM = add_spell
-{
-	["name"] = 	"Artifact Lebauhaum",
-	["school"] = 	{SCHOOL_DEVICE},
-	["level"] = 	1,
-	["mana"] = 	0,
-	["mana_max"] = 	0,
-	["fail"] = 	0,
-	["random"] =    -1,
-	["activate"] =  3,
-	["spell"] = 	function()
-			msg_print("You hear a little song in your head in some unknown tongue:")
-			msg_print("'Avec le casque Lebohaum y a jamais d'anicroches, je parcours les dongeons,")
-			msg_print("j'en prend plein la caboche. Avec le casque Lebohaum, tout ces monstres a la")
-			msg_print("con, je leur met bien profond: c'est moi le maitre du dongeon!'")
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"sing a cheerful song",
-	}
-}
-
-DEVICE_MAGGOT = add_spell
-{
-	["name"] = 	"Artifact Maggot",
-	["school"] = 	{SCHOOL_DEVICE},
-	["level"] = 	1,
-	["mana"] = 	7,
-	["mana_max"] = 	7,
-	["fail"] = 	20,
-	["random"] =    -1,
-	["activate"] =  { 10, 50 },
-	["spell"] = 	function()
-			local ret, dir = get_aim_dir()
-			if ret == FALSE then return end
-			return fire_ball(GF_TURN_ALL, dir, 40, 2)
-	end,
-	["info"] = 	function()
-			return "power 40 rad 2"
-	end,
-	["desc"] =	{
-			"terrify",
-	}
-}
-
-DEVICE_HOLY_FIRE = add_spell
-{
-	["name"] = 	"Holy Fire of Mithrandir",
-	["school"] = 	{SCHOOL_DEVICE},
-	["level"] = 	30,
-	["mana"] = 	50,
-	["mana_max"] = 	150,
-	["fail"] = 	75,
-	["random"] =    -1,
-	["stick"] =
-	{
-			["charge"] =    { 2, 5 },
-			[TV_STAFF] =
-			{
-				-- Rarity higher than 100 to be sure to not have it generated randomly
-				["rarity"] = 		999,
-				["base_level"] =	{ 1, 1 },
-				["max_level"] =		{ 35, 35 },
-			},
-	},
-	["spell"] = 	function()
-			return project_los(GF_HOLY_FIRE, 50 + get_level(DEVICE_HOLY_FIRE, 300))
-	end,
-	["info"] = 	function()
-			return "dam "..(50 + get_level(DEVICE_HOLY_FIRE, 250))
-	end,
-	["desc"] =	{
-			"The Holy Fire created by this staff will deeply(double damage) burn",
-			"all that is evil.",
-	}
-}
-
--- Ok the Eternal Flame, to craete one of the 4 ultimate arts
--- needed to enter the last level of the Void
-DEVICE_ETERNAL_FLAME = add_spell
-{
-	["name"] = 	"Artifact Eternal Flame",
-	["school"] = 	{SCHOOL_DEVICE},
-	["level"] = 	1,
-	["mana"] = 	0,
-	["mana_max"] = 	0,
-	["fail"] = 	0,
-	["random"] =    -1,
-	["activate"] =  { 0, 0 },
-	["spell"] = 	function(flame_item)
-			local ret, item, obj
-
-			ret, item = get_item("Which object do you want to imbue?",
-					     "You have no objects to imbue.",
-					     bor(USE_INVEN),
-					     function (obj)
-						if obj.name1 > 0 or obj.name2 > 0 then return FALSE end
-					     	if (obj.tval == TV_SWORD) and (obj.sval == SV_LONG_SWORD) then
-							return TRUE
-					     	elseif (obj.tval == TV_MSTAFF) and (obj.sval == SV_MSTAFF) then
-							return TRUE
-					     	elseif (obj.tval == TV_BOW) and (obj.sval == SV_HEAVY_XBOW) then
-							return TRUE
-					     	elseif (obj.tval == TV_DRAG_ARMOR) and (obj.sval == SV_DRAGON_POWER) then
-							return TRUE
-					     	end
-						return FALSE
-					     end
-			)
-			if ret == FALSE then return FALSE end
-
-			obj = get_object(item)
-
-			if (obj.tval == TV_SWORD) and (obj.sval == SV_LONG_SWORD) then
-				obj.name1 = 147
-			elseif (obj.tval == TV_MSTAFF) and (obj.sval == SV_MSTAFF) then
-				obj.name1 = 127
-			elseif (obj.tval == TV_BOW) and (obj.sval == SV_HEAVY_XBOW) then
-				obj.name1 = 152
-			elseif (obj.tval == TV_DRAG_ARMOR) and (obj.sval == SV_DRAGON_POWER) then
-				obj.name1 = 17
-			end
-			apply_magic(obj, -1, TRUE, TRUE, TRUE)
-
-			obj.found = OBJ_FOUND_SELFMADE
-
-			inven_item_increase(flame_item, -1)
-			inven_item_describe(flame_item)
-			inven_item_optimize(flame_item)
-
-			return TRUE
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"Imbuing an object with the eternal fire",
-	}
-}
-
--- And one more silly activation :)
-DEVICE_DURANDIL = add_spell
-{
-	["name"] = 	"Artifact Durandil",
-	["school"] = 	{SCHOOL_DEVICE},
-	["level"] = 	1,
-	["mana"] = 	0,
-	["mana_max"] = 	0,
-	["fail"] = 	0,
-	["random"] =    -1,
-	["activate"] =  3,
-	["spell"] = 	function()
-			msg_print("You hear a little song in your head in some unknown tongue:")
-			msg_print("'Les epees Durandils sont forgees dans les mines par des nains.")
-			msg_print("Avec ca c'est facile de tuer un troll avec une seule main. Pas besoin")
-			msg_print("de super entrainement nis de niveau 28. Quand tu sors l'instrument")
-			msg_print("c'est l'ennemi qui prend la fuite! Avec ton epee Durandil quand tu")
-			msg_print("parcours les chemins, tu massacre sans peine les brigands et les gobelins,")
-			msg_print("les rats geants, les ogres mutants, les zombies et les liches, tu les")
-			msg_print("decoupe en tranches comme si c'etait des parts de quiches.")
-			msg_print("Les epees Durandil! Les epees Durandil!")
-			msg_print("Quand tu la sort dans un dongeon au moins t'as pas l'air debile.")
-			msg_print("C'est l'arme des bourins qui savent etre subtils.")
-			msg_print("Ne partez pas a l'aventure sans votre epee Durandil!'")
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"sing a cheerful song",
-	}
-}
-
-DEVICE_THUNDERLORDS = add_spell
-{
-	["name"] = 	"Artifact Thunderlords",
-	["school"] = 	{SCHOOL_DEVICE},
-	["level"] = 	1,
-	["mana"] = 	1,
-	["mana_max"] = 	1,
-	["fail"] = 	20,
-	["random"] =    -1,
-	["stick"] =
-	{
-			["charge"] =    { 3, 3 },
-			[TV_STAFF] =
-			{
-				-- Rarity higher than 100 to be sure to not have it generated randomly
-				["rarity"] = 		999,
-				["base_level"] =	{ 1, 1 },
-				["max_level"] =		{ 1, 1 },
-			},
-	},
-	["spell"] = 	function()
-			if dun_level > 0 then
-				msg_print("As you blow the horn a thunderlord pops out of nowhere and grabs you.")
-				recall_player(0, 1)
-			else
-				msg_print("You cannot use it there.")
-			end
-			return TRUE
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"A thunderlord will appear to transport you quickly to the surface.",
-	}
-}
-
---[[ Template
-DEVICE_ = add_spell
-{
-	["name"] = 	"",
-	["school"] = 	{SCHOOL_DEVICE},
-	["level"] = 	1,
-	["mana"] = 	2,
-	["mana_max"] = 	15,
-	["fail"] = 	10,
-	["random"] =    -1,
-	["stick"] =
-	{
-			["charge"] =    { 10, 5 },
-			[TV_STAFF] =
-			{
-				["rarity"] = 		7,
-				["base_level"] =	{ 1, 15 },
-				["max_level"] =		{ 25, 50 },
-			},
-	},
-	["spell"] = 	function()
-			return FALSE
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"",
-	}
-}
-]]
diff --git a/lib/scpt/s_tempo.lua b/lib/scpt/s_tempo.lua
deleted file mode 100644
index d3d2fbb5..00000000
--- a/lib/scpt/s_tempo.lua
+++ /dev/null
@@ -1,162 +0,0 @@
--- Handles thhe temporal school
-
-
-MAGELOCK = add_spell
-{
-	["name"] = 	"Magelock",
-	["school"] = 	{SCHOOL_TEMPORAL},
-	["level"] = 	1,
-	["mana"] = 	1,
-	["mana_max"] = 	35,
-	["fail"] = 	10,
-	["stick"] =
-	{
-			["charge"] =    { 7, 5 },
-			[TV_WAND] =
-			{
-				["rarity"] = 		30,
-				["base_level"] =	{ 1, 5 },
-				["max_level"] =		{ 15, 45 },
-			},
-	},
-	["spell"] = 	function()
-			if get_level(MAGELOCK, 50) >= 30 then
-				local ret, x, y, c_ptr
-
-				if get_level(MAGELOCK, 50) >= 40 then
-					ret, x, y = tgt_pt()
-					if ret == FALSE then return end
-					if cave_is(cave(y, x), FF1_FLOOR) == FALSE or cave_is(cave(y, x), FF1_PERMANENT) == TRUE or los(player.py, player.px, y, x) == FALSE then
-						msg_print("You cannot place it there.")
-						return TRUE
-					end
-				else
-					y = player.py
-					x = player.px
-				end
-				cave_set_feat(y, x, 3)
-				return TRUE
-			else
-				ret, dir = get_aim_dir()
-				if ret == FALSE then return end
-				return wizard_lock(dir)
-			end
-	end,
-	["info"] = 	function()
-		       	return ""
-	end,
-	["desc"] =	{
-			"Magically locks a door",
-			"At level 30 it creates a glyph of warding",
-			"At level 40 the glyph can be placed anywhere in the field of vision"
-	}
-}
-
-SLOWMONSTER = add_spell
-{
-	["name"] = 	"Slow Monster",
-	["school"] = 	{SCHOOL_TEMPORAL},
-	["level"] = 	10,
-	["mana"] = 	10,
-	["mana_max"] = 	15,
-	["fail"] = 	35,
-	["stick"] =
-	{
-			["charge"] =    { 5, 5 },
-			[TV_WAND] =
-			{
-				["rarity"] = 		23,
-				["base_level"] =	{ 1, 15 },
-				["max_level"] =		{ 20, 50 },
-			},
-	},
-	["spell"] = 	function()
-	       		local ret, dir
-
-			ret, dir = get_aim_dir()
-			if ret == FALSE then return end
-			if get_level(SLOWMONSTER, 50) >= 20 then
-				return fire_ball(GF_OLD_SLOW, dir, 40 + get_level(SLOWMONSTER, 160), 1)
-			else
-				return fire_bolt(GF_OLD_SLOW, dir, 40 + get_level(SLOWMONSTER, 160))
-			end
-	end,
-	["info"] = 	function()
-			if get_level(SLOWMONSTER, 50) >= 20 then
-			       	return "power "..(40 + get_level(SLOWMONSTER, 160)).." rad 1"
-			else
-			       	return "power "..(40 + get_level(SLOWMONSTER, 160))
-			end
-	end,
-	["desc"] =	{
-			"Magically slows down the passing of time around a monster",
-			"At level 20 it affects a zone"
-	}
-}
-
-ESSENCESPEED = add_spell
-{
-	["name"] = 	"Essence of Speed",
-	["school"] = 	{SCHOOL_TEMPORAL},
-	["level"] = 	15,
-	["mana"] = 	20,
-	["mana_max"] = 	40,
-	["fail"] = 	50,
-	["stick"] =
-	{
-			["charge"] =    { 3, 3 },
-			[TV_WAND] =
-			{
-				["rarity"] = 		80,
-				["base_level"] =	{ 1, 1 },
-				["max_level"] =		{ 10, 39 },
-			},
-	},
-	["inertia"] = 	{ 5, 20 },
-	["spell"] = 	function()
-			if player.fast == 0 then return set_fast(10 + randint(10) + get_level(ESSENCESPEED, 50), 5 + get_level(ESSENCESPEED, 20)) end
-	end,
-	["info"] = 	function()
-		       	return "dur "..(10 + get_level(ESSENCESPEED, 50)).."+d10 speed "..(5 + get_level(ESSENCESPEED, 20))
-	end,
-	["desc"] =	{
-			"Magically decreases the passing of time around you, making you move faster with",
-			"respect to the rest of the universe."
-	}
-}
-
-BANISHMENT = add_spell
-{
-	["name"] = 	"Banishment",
-	["school"] = 	{SCHOOL_TEMPORAL, SCHOOL_CONVEYANCE},
-	["level"] = 	30,
-	["mana"] = 	30,
-	["mana_max"] = 	40,
-	["fail"] = 	95,
-	["stick"] =
-	{
-			["charge"] =    { 1, 3 },
-			[TV_WAND] =
-			{
-				["rarity"] = 		98,
-				["base_level"] =	{ 1, 15 },
-				["max_level"] =		{ 10, 36 },
-			},
-	},
-	["inertia"] = 	{ 5, 50 },
-	["spell"] = 	function()
-			local obvious
-			obvious = project_los(GF_AWAY_ALL, 40 + get_level(BANISHMENT, 160))
-			if get_level(BANISHMENT, 50) >= 15 then
-				obvious = is_obvious(project_los(GF_STASIS, 20 + get_level(BANISHMENT, 120)), obvious)
-			end
-			return obvious
-	end,
-	["info"] = 	function()
-		     	return "power "..(40 + get_level(BANISHMENT, 160))
-	end,
-	["desc"] =	{
-			"Disrupts the space/time continuum in your area and teleports all monsters away.",
-			"At level 15 it may also lock them in a time bubble for a while."
-	}
-}
diff --git a/lib/scpt/s_tulkas.lua b/lib/scpt/s_tulkas.lua
deleted file mode 100644
index 4afa8082..00000000
--- a/lib/scpt/s_tulkas.lua
+++ /dev/null
@@ -1,81 +0,0 @@
--- Handle Tulkas magic school
-
-TULKAS_AIM = add_spell
-{
-	["name"] =      "Divine Aim",
-	["school"] =    {SCHOOL_TULKAS},
-	["level"] =     1,
-	["mana"] =      30,
-	["mana_max"] =  500,
-	["fail"] = 	20,
-	-- Uses piety to cast
-	["piety"] =     TRUE,
-	["stat"] =      A_WIS,
-	["random"] = 	SKILL_SPIRITUALITY,
-	["spell"] = 	function()
-			local dur = get_level(TULKAS_AIM, 50) + randint(10)
-			local obvious
-
-			obvious = set_strike(dur)
-			if get_level(TULKAS_AIM) >= 20 then
-				obvious = is_obvious(set_tim_deadly(dur), obvious)
-			end
-			return obvious
-	end,
-	["info"] = 	function()
-			return "dur "..(get_level(TULKAS_AIM, 50)).."+d10"
-	end,
-	["desc"] =	{
-			"It makes you more accurate in combat",
-			"At level 20 all your blows are critical hits",
-	}
-}
-
-TULKAS_WAVE = add_spell
-{
-	["name"] =      "Wave of Power",
-	["school"] =    {SCHOOL_TULKAS},
-	["level"] =     20,
-	["mana"] =      200,
-	["mana_max"] =  200,
-	["fail"] = 	75,
-	-- Uses piety to cast
-	["piety"] =     TRUE,
-	["stat"] =      A_WIS,
-	["random"] = 	SKILL_SPIRITUALITY,
-	["spell"] = 	function()
-			local ret, dir = get_aim_dir()
-			if ret == FALSE then return end
-
-			return fire_bolt(GF_ATTACK, dir, get_level(TULKAS_WAVE, player.num_blow))
-	end,
-	["info"] = 	function()
-			return "blows "..(get_level(TULKAS_WAVE, player.num_blow))
-	end,
-	["desc"] =	{
-			"It allows you to project a number of melee blows across a distance",
-	}
-}
-
-TULKAS_SPIN = add_spell
-{
-	["name"] =      "Whirlwind",
-	["school"] =    {SCHOOL_TULKAS},
-	["level"] =     10,
-	["mana"] =      100,
-	["mana_max"] =  100,
-	["fail"] = 	45,
-	-- Uses piety to cast
-	["piety"] =     TRUE,
-	["stat"] =      A_WIS,
-	["random"] = 	SKILL_SPIRITUALITY,
-	["spell"] = 	function()
-			return fire_ball(GF_ATTACK, 0, 1, 1)
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"It allows you to spin around and hit all monsters nearby",
-	}
-}
diff --git a/lib/scpt/s_udun.lua b/lib/scpt/s_udun.lua
deleted file mode 100644
index c4266239..00000000
--- a/lib/scpt/s_udun.lua
+++ /dev/null
@@ -1,180 +0,0 @@
--- handle the udun school
-
-DRAIN = add_spell
-{
-	["name"] = 	"Drain",
-	["school"] = 	{SCHOOL_UDUN, SCHOOL_MANA},
-	["level"] = 	1,
-	["mana"] = 	0,
-	["mana_max"] = 	0,
-	["fail"] = 	20,
-	["spell"] = 	function()
-			local ret, item, obj, o_name, add
-
-			-- Ask for an item
-			ret, item = get_item("What item to drain?", "You have nothing you can drain", USE_INVEN,
-				function (obj)
-					if (obj.tval == TV_WAND) or (obj.tval == TV_ROD_MAIN) or (obj.tval == TV_STAFF) then
-						return TRUE
-					end
-					return FALSE
-				end
-			)
-
-			if ret == TRUE then
-				-- get the item
-				obj = get_object(item)
-
-				add = 0
-				if (obj.tval == TV_STAFF) or (obj.tval == TV_WAND) then
-					local kind = get_kind(obj)
-
-					add = kind.level * obj.pval * obj.number
-
-					-- Destroy it!
-					inven_item_increase(item, -99)
-					inven_item_describe(item)
-					inven_item_optimize(item)
-				end
-				if obj.tval == TV_ROD_MAIN then
-					add = obj.timeout
-					obj.timeout = 0;
-
-					--Combine / Reorder the pack (later)
-					player.notice = bor(player.notice, PN_COMBINE, PN_REORDER)
-					player.window = bor(player.window, PW_INVEN, PW_EQUIP, PW_PLAYER)
-				end
-				increase_mana(add)
-			end
-			return TRUE
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"Drains the mana contained in wands, staves and rods to increase yours",
-	}
-}
-
-GENOCIDE = add_spell
-{
-	["name"] = 	"Genocide",
-	["school"] = 	{SCHOOL_UDUN, SCHOOL_NATURE},
-	["level"] = 	25,
-	["mana"] = 	50,
-	["mana_max"] = 	50,
-	["fail"] = 	90,
-	["stick"] =
-	{
-			["charge"] =    { 2, 2 },
-			[TV_STAFF] =
-			{
-				["rarity"] = 		85,
-				["base_level"] =	{ 1, 1 },
-				["max_level"] =		{ 5, 15 },
-			},
-	},
-	["spell"] = 	function()
-			local type
-
-			type = 0
-			if get_level(GENOCIDE) >= 10 then type = 1 end
-			if type == 0 then
-				genocide(TRUE)
-				return TRUE
-			else
-				if get_check("Genocide all monsters near you? ") == TRUE then
-					mass_genocide(TRUE)
-				else
-					genocide(TRUE)
-				end
-				return TRUE
-			end
-	end,
-	["info"] = 	function()
-			return ""
-	end,
-	["desc"] =	{
-			"Genocides all monsters of a race on the level",
-			"At level 10 it can genocide all monsters near you"
-	}
-}
-
-WRAITHFORM = add_spell
-{
-	["name"] = 	"Wraithform",
-	["school"] = 	{SCHOOL_UDUN, SCHOOL_CONVEYANCE},
-	["level"] = 	30,
-	["mana"] = 	20,
-	["mana_max"] = 	40,
-	["fail"] = 	95,
-	["inertia"] = 	{ 4, 30 },
-	["spell"] = 	function()
-		       	return set_shadow(randint(30) + 20 + get_level(WRAITHFORM, 40))
-	end,
-	["info"] = 	function()
-			return "dur "..(20 + get_level(WRAITHFORM, 40)).."+d30"
-	end,
-	["desc"] =	{
-			"Turns you into an immaterial being",
-	}
-}
-
-FLAMEOFUDUN = add_spell
-{
-	["name"] = 	"Flame of Udun",
-	["school"] = 	{SCHOOL_UDUN, SCHOOL_FIRE},
-	["level"] = 	35,
-	["mana"] = 	70,
-	["mana_max"] = 	100,
-	["fail"] = 	95,
-	["inertia"] = 	{ 7, 15 },
-	["spell"] = 	function()
-			return set_mimic(randint(15) + 5 + get_level(FLAMEOFUDUN, 30), resolve_mimic_name("Balrog"), get_level(FLAMEOFUDUN))
-	end,
-	["info"] = 	function()
-			return "dur "..(5 + get_level(FLAMEOFUDUN, 30)).."+d15"
-	end,
-	["desc"] =	{
-			"Turns you into a powerful Balrog",
-	}
-}
-
-
--- Return the number of Udun/Melkor spells in a given book
-function udun_in_book(sval, pval)
-	local i, y, index, sch, s
-
-	i = 0
-
-	-- Hack if the book is 255 it is a random book
-	if sval == 255 then
-		school_book[sval] = {pval}
-	end
-	-- Parse all spells
-	for index, s in school_book[sval] do
-		for index, sch in __spell_school[s] do
-			if sch == SCHOOL_UDUN then i = i + 1 end
-			if sch == SCHOOL_MELKOR then i = i + 1 end
-		end
-	end
-	return i
-end
-
--- Return the total level of spells
-function levels_in_book(sval, pval)
-	local i, y, index, sch, s
-
-	i = 0
-
-	-- Hack if the book is 255 it is a random book
-	if sval == 255 then
-		school_book[sval] = {pval}
-	end
-
-	-- Parse all spells
-	for index, s in school_book[sval] do
-		i = i + __tmp_spells[s].level
-	end
-	return i
-end
diff --git a/lib/scpt/s_water.lua b/lib/scpt/s_water.lua
deleted file mode 100644
index 739b066b..00000000
--- a/lib/scpt/s_water.lua
+++ /dev/null
@@ -1,154 +0,0 @@
--- handle the water school
-
-TIDALWAVE = add_spell
-{
-	["name"] = 	"Tidal Wave",
-	["school"] = 	{SCHOOL_WATER},
-	["level"] = 	16,
-	["mana"] = 	16,
-	["mana_max"] = 	40,
-	["fail"] = 	65,
-	["stick"] =
-	{
-			["charge"] =    { 6, 5 },
-			[TV_WAND] =
-			{
-				["rarity"] = 		54,
-				["base_level"] =	{ 1, 10 },
-				["max_level"] =		{ 20, 50 },
-			},
-	},
-	["inertia"] = 	{ 4, 100 },
-	["spell"] = 	function()
-			fire_wave(GF_WAVE, 0, 40 + get_level(TIDALWAVE, 200), 0, 6 + get_level(TIDALWAVE, 10), EFF_WAVE)
-			return TRUE
-	end,
-	["info"] = 	function()
-			return "dam "..(40 + get_level(TIDALWAVE,  200)).." rad "..(6 + get_level(TIDALWAVE,  10))
-	end,
-	["desc"] =	{
-			"Summons a monstrous tidal wave that will expand and crush the",
-			"monsters under its mighty waves."
-	}
-}
-
-ICESTORM = add_spell
-{
-	["name"] = 	"Ice Storm",
-	["school"] = 	{SCHOOL_WATER},
-	["level"] = 	22,
-	["mana"] = 	30,
-	["mana_max"] = 	60,
-	["fail"] = 	80,
-	["stick"] =
-	{
-			["charge"] =    { 3, 7 },
-			[TV_WAND] =
-			{
-				["rarity"] = 		65,
-				["base_level"] =	{ 1, 5 },
-				["max_level"] =		{ 25, 45 },
-			},
-	},
-	["inertia"] = 	{ 3, 40 },
-	["spell"] = 	function()
-			local type
-	
-			if get_level(ICESTORM, 50) >= 10 then type = GF_ICE
-			else type = GF_COLD end
-			fire_wave(type, 0, 80 + get_level(ICESTORM, 200), 1 + get_level(ICESTORM, 3, 0), 20 + get_level(ICESTORM, 70), EFF_STORM)
-			return TRUE
-	end,
-	["info"] = 	function()
-			return "dam "..(80 + get_level(ICESTORM, 200)).." rad "..(1 + get_level(ICESTORM, 3, 0)).." dur "..(20 + get_level(ICESTORM, 70))
-	end,
-	["desc"] =	{
-			"Engulfs you in a storm of roaring cold that strikes your foes.",
-			"At level 10 it turns into shards of ice."
-	}
-}
-
-ENTPOTION = add_spell
-{
-	["name"] = 	"Ent's Potion",
-	["school"] = 	{SCHOOL_WATER},
-	["level"] = 	6,
-	["mana"] = 	7,
-	["mana_max"] = 	15,
-	["fail"] = 	35,
-	["inertia"] = 	{ 1, 30 },
-	["spell"] = 	function()
-			set_food(PY_FOOD_MAX - 1)
-			msg_print("The Ent's Potion fills your stomach.")
-			if get_level(ENTPOTION, 50) >= 5 then
-				set_afraid(0)
-			end
-			if get_level(ENTPOTION, 50) >= 12 then
-				set_hero(player.hero + randint(25) + 25 + get_level(ENTPOTION, 40))
-			end
-			return TRUE
-	end,
-	["info"] = 	function()
-			if get_level(ENTPOTION, 50) >= 12 then
-				return "dur "..(25 + get_level(ENTPOTION, 40)).."+d25"
-			else
-				return ""
-			end
-	end,
-	["desc"] =	{
-			"Fills up your stomach.",
-			"At level 5 it boldens your heart.",
-			"At level 12 it makes you heroic."
-	}
-}
-
-VAPOR = add_spell
-{
-	["name"] = 	"Vapor",
-	["school"] = 	{SCHOOL_WATER},
-	["level"] = 	2,
-	["mana"] = 	2,
-	["mana_max"] = 	12,
-	["fail"] = 	20,
-	["inertia"] = 	{ 1, 30 },
-	["spell"] = 	function()
-			fire_cloud(GF_WATER, 0, 3 + get_level(VAPOR, 20), 3 + get_level(VAPOR, 9, 0), 5)
-			return TRUE
-	end,
-	["info"] = 	function()
-       			return "dam "..(3 + get_level(VAPOR, 20)).." rad "..(3 + get_level(VAPOR, 9, 0)).." dur 5"
-	end,
-	["desc"] =	{
-			"Fills the air with toxic moisture to eradicate annoying critters."
-	}
-}
-
-function get_geyser_damage()
-	return get_level(GEYSER, 10), 3 + get_level(GEYSER, 35)
-end
-
-GEYSER = add_spell
-{
-	["name"] = "Geyser",
-	["school"] = SCHOOL_WATER,
-	["level"] = 1,
-	["mana"] = 1,
-	["mana_max"] = 35,
-	["fail"] = 5,
-	["spell"] = function()
-		local ret, dir
-		ret, dir = get_aim_dir()
-		if ret == FALSE then return end
-		return fire_bolt_or_beam(2 * get_level(GEYSER, 85), GF_WATER, dir, damroll(get_geyser_damage()))
-	end,
-	["info"] = function()
-		local n, d
-		n, d = get_geyser_damage()
-		return "dam "..n.."d"..d
-	end,
-	["desc"] =
-	{
-		"Shoots a geyser of water from your fingertips.",
-		"Sometimes it can blast through its first target."
-	},
-}
diff --git a/lib/scpt/s_yavann.lua b/lib/scpt/s_yavann.lua
deleted file mode 100644
index 2f594e85..00000000
--- a/lib/scpt/s_yavann.lua
+++ /dev/null
@@ -1,157 +0,0 @@
--- Handle Yavanna kementari magic school
-
-YAVANNA_CHARM_ANIMAL = add_spell
-{
-	["name"] =      "Charm Animal",
-	["school"] =    {SCHOOL_YAVANNA},
-	["level"] =     1,
-	["mana"] =      10,
-	["mana_max"] =  100,
-	["fail"] =      30,
-	-- Uses piety to cast
-	["piety"] =     TRUE,
-	["stat"] =      A_WIS,
-	["random"] =    SKILL_SPIRITUALITY,
-	["spell"] =     function()
-			local ret, dir = get_aim_dir()
-			if ret == FALSE then return end
-
-			return fire_ball(GF_CONTROL_ANIMAL, dir, 10 + get_level(YAVANNA_CHARM_ANIMAL, 170), get_level(YAVANNA_CHARM_ANIMAL, 2))
-	end,
-	["info"] =      function()
-			return "power "..(10 + get_level(YAVANNA_CHARM_ANIMAL, 170)).." rad "..(get_level(YAVANNA_CHARM_ANIMAL, 2))
-	end,
-	["desc"] =      {
-			"It tries to tame an animal",
-	}
-}
-
-YAVANNA_GROW_GRASS = add_spell
-{
-	["name"] =      "Grow Grass",
-	["school"] =    {SCHOOL_YAVANNA},
-	["level"] =     10,
-	["mana"] =      70,
-	["mana_max"] =  150,
-	["fail"] =      65,
-	-- Uses piety to cast
-	["piety"] =     TRUE,
-	["stat"] =      A_WIS,
-	["random"] =    SKILL_SPIRITUALITY,
-	["spell"] =     function()
-			grow_grass(get_level(YAVANNA_GROW_GRASS, 4))
-			return TRUE
-	end,
-	["info"] =      function()
-			return "rad "..(get_level(YAVANNA_GROW_GRASS, 4))
-	end,
-	["desc"] =      {
-			"Create a floor of grass around you. While on grass and praying",
-			"a worshipper of Yavanna will know a greater regeneration rate"
-	}
-}
-
-YAVANNA_TREE_ROOTS = add_spell
-{
-	["name"] =      "Tree Roots",
-	["school"] =    {SCHOOL_YAVANNA},
-	["level"] =     15,
-	["mana"] =      50,
-	["mana_max"] =  1000,
-	["fail"] =      70,
-	-- Uses piety to cast
-	["piety"] =     TRUE,
-	["stat"] =      A_WIS,
-	["random"] =    SKILL_SPIRITUALITY,
-	["spell"] =     function()
-			return set_roots(10 + get_level(YAVANNA_TREE_ROOTS, 30), 10 + get_level(YAVANNA_TREE_ROOTS, 60), 10 + get_level(YAVANNA_TREE_ROOTS, 20))
-	end,
-	["info"] =      function()
-			return "dur "..(10 + get_level(YAVANNA_TREE_ROOTS, 30)).." AC "..(10 + get_level(YAVANNA_TREE_ROOTS, 60)).." dam "..(10 + get_level(YAVANNA_TREE_ROOTS, 20))
-	end,
-	["desc"] =      {
-			"Creates roots deep in the floor from your feet, making you more stable and able",
-			"to make stronger attacks, but prevents any movement (even teleportation).",
-			"It also makes you recover from stunning almost immediately."
-	}
-}
-
-YAVANNA_WATER_BITE = add_spell
-{
-	["name"] =      "Water Bite",
-	["school"] =    {SCHOOL_YAVANNA},
-	["level"] =     20,
-	["mana"] =      150,
-	["mana_max"] =  300,
-	["fail"] =      90,
-	-- Uses piety to cast
-	["piety"] =     TRUE,
-	["stat"] =      A_WIS,
-	["random"] =    SKILL_SPIRITUALITY,
-	["spell"] =     function()
-			local rad
-
-			rad = 0
-			if get_level(YAVANNA_WATER_BITE) >= 25 then rad = 1 end
-
-			return set_project(randint(30) + 30 + get_level(YAVANNA_WATER_BITE, 150),
-				    GF_WATER,
-				    10 + get_level(YAVANNA_WATER_BITE),
-				    rad,
-				    bor(PROJECT_STOP, PROJECT_KILL))
-	end,
-	["info"] =      function()
-			return "dur "..(30 + get_level(YAVANNA_WATER_BITE, 150)).."+d30 dam "..(10 + get_level(YAVANNA_WATER_BITE)).."/blow"
-	end,
-	["desc"] =      {
-			"Imbues your melee weapon with a natural stream of water",
-			"At level 25, it spreads over a 1 radius zone around your target"
-	}
-}
-
-YAVANNA_UPROOT = add_spell
-{
-	["name"] =      "Uproot",
-	["school"] =    {SCHOOL_YAVANNA},
-	["level"] =     35,
-	["mana"] =      250,
-	["mana_max"] =  350,
-	["fail"] =      95,
-	-- Uses piety to cast
-	["piety"] =     TRUE,
-	["stat"] =      A_WIS,
-	["random"] =    SKILL_SPIRITUALITY,
-	["spell"] =     function()
-			local m_idx, x, y, c_ptr, ret, dir
-
-			ret, dir = get_rep_dir()
-			if ret == FALSE then return end
-			y, x = explode_dir(dir)
-			y, x = y + player.py, x + player.px
-			c_ptr = cave(y, x)
-
-			if c_ptr.feat == FEAT_TREES then
-				cave_set_feat(y, x, FEAT_GRASS);
-
-				-- Summon it
-				y, x = find_position(y, x)
-				m_idx = place_monster_one(y, x, test_monster_name("Ent"), 0, FALSE, MSTATUS_FRIEND)
-
-				-- level it
-				if m_idx ~= 0 then
-					monster_set_level(m_idx, 30 + get_level(YAVANNA_UPROOT, 70))
-				end
-
-				msg_print("The tree awakes!");
-			else
-				msg_print("There is no tree there.")
-			end
-			return TRUE
-	end,
-	["info"] =      function()
-			return "lev "..(30 + get_level(YAVANNA_UPROOT, 70))
-	end,
-	["desc"] =      {
-			"Awakes a tree to help you battle the forces of Morgoth",
-	}
-}
diff --git a/lib/scpt/spells.lua b/lib/scpt/spells.lua
deleted file mode 100644
index 2f90c10b..00000000
--- a/lib/scpt/spells.lua
+++ /dev/null
@@ -1,475 +0,0 @@
---
--- This file takes care of the schools of magic
---
-
--- Create the schools
-SCHOOL_MANA = add_school
-{
-	["name"] = "Mana", 
-	["skill"] = SKILL_MANA,
-	["spell_power"] = TRUE,
-	["sorcery"] = TRUE,
-	["gods"] =
-	{
-		-- Eru Iluvatar provides the Mana school at half the prayer skill
-		[GOD_ERU] =
-		{
-			["skill"] = SKILL_PRAY,
-			["mul"] = 1,
-			["div"] = 2,
-		},
-	},
-	["hooks"] =
-	{
-		[HOOK_CALC_MANA] = function(msp)
-			if get_skill(SKILL_MANA) >= 35 then
-				msp = msp + (msp * ((get_skill(SKILL_MANA) - 34)) / 100)
-				return TRUE, msp
-			end
-		end
-	},
-}
-SCHOOL_FIRE = add_school
-{
-	["name"] = "Fire", 
-	["skill"] = SKILL_FIRE,
-	["spell_power"] = TRUE,
-	["sorcery"] = TRUE,
-}
-SCHOOL_AIR = add_school
-{
-	["name"] = "Air", 
-	["skill"] = SKILL_AIR,
-	["spell_power"] = TRUE,
-	["sorcery"] = TRUE,
-	["hooks"] =
-	{
-		[HOOK_CALC_BONUS] = function()
-			if get_skill(SKILL_AIR) >= 50 then
-				player.magical_breath = TRUE
-			end
-		end,
-	},
-	["gods"] =
-	{
-		-- Manwe Sulimo provides the Air school at 2/3 the prayer skill
-		[GOD_MANWE] =
-		{
-			["skill"] = SKILL_PRAY,
-			["mul"] = 2,
-			["div"] = 3,
-		},
-	},
-}
-SCHOOL_WATER = add_school
-{
-	["name"] = "Water", 
-	["skill"] = SKILL_WATER,
-	["spell_power"] = TRUE,
-	["sorcery"] = TRUE,
-	["hooks"] =
-	{
-		[HOOK_CALC_BONUS] = function()
-			if get_skill(SKILL_WATER) >= 30 then
-				player.water_breath = TRUE
-			end
-		end,
-	},
-	["gods"] =
-	{
-		-- Yavanna Kementari provides the Water school at 1/2 the prayer skill
-		[GOD_YAVANNA] =
-		{
-			["skill"] = SKILL_PRAY,
-			["mul"] = 1,
-			["div"] = 2,
-		},
-	},
-}
-SCHOOL_EARTH = add_school
-{
-	["name"] = "Earth", 
-	["skill"] = SKILL_EARTH,
-	["spell_power"] = TRUE,
-	["sorcery"] = TRUE,
-	["gods"] =
-	{
-		-- Tulkas provides the Earth school at 4/5 the prayer skill
-		[GOD_TULKAS] =
-		{
-			["skill"] = SKILL_PRAY,
-			["mul"] = 4,
-			["div"] = 5,
-		},
-		-- Yavanna Kementari provides the Earth school at 1/2 the prayer skill
-		[GOD_YAVANNA] =
-		{
-			["skill"] = SKILL_PRAY,
-			["mul"] = 1,
-			["div"] = 2,
-		},
-	},
-}
-SCHOOL_CONVEYANCE = add_school
-{
-	["name"] = "Conveyance", 
-	["skill"] = SKILL_CONVEYANCE,
-	["spell_power"] = TRUE,
-	["sorcery"] = TRUE,
-	["gods"] =
-	{
-		-- Manwe Sulimo provides the Conveyance school at 1/2 the prayer skill
-		[GOD_MANWE] =
-		{
-			["skill"] = SKILL_PRAY,
-			["mul"] = 1,
-			["div"] = 2,
-		},
-	},
-}
-SCHOOL_GEOMANCY = add_school
-{
-	["name"] = "Geomancy",
-	["skill"] = SKILL_GEOMANCY,
-	["spell_power"] = TRUE,
-	-- Require to wield a Mage Staff, as the spells requries the caster to stomp the floor with it
-	["depend"] = function()
-		-- Require at least one point in each school
-		if get_skill(SKILL_FIRE) == 0 then return end
-		if get_skill(SKILL_AIR) == 0 then return end
-		if get_skill(SKILL_EARTH) == 0 then return end
-		if get_skill(SKILL_WATER) == 0 then return end
-
-		local obj = get_object(INVEN_WIELD)
-		if (obj.k_idx > 0) and (obj.tval == TV_MSTAFF) then return TRUE end
-	end,
-}
-SCHOOL_DIVINATION = add_school
-{
-	["name"] = "Divination", 
-	["skill"] = SKILL_DIVINATION,
-	["spell_power"] = TRUE,
-	["sorcery"] = TRUE,
-	["gods"] =
-	{
-		-- Eru Iluvatar provides the Divination school at 2/3 the prayer skill
-		[GOD_ERU] =
-		{
-			["skill"] = SKILL_PRAY,
-			["mul"] = 2,
-			["div"] = 3,
-		},
-	},
-}
-SCHOOL_TEMPORAL = add_school
-{
-	["name"] = "Temporal", 
-	["skill"] = SKILL_TEMPORAL,
-	["spell_power"] = TRUE,
-	["sorcery"] = TRUE,
-	["gods"] =
-	{
-		-- Yavanna Kementari provides the Temporal school at 1/6 the prayer skill
-		[GOD_YAVANNA] =
-		{
-			["skill"] = SKILL_PRAY,
-			["mul"] = 1,
-			["div"] = 6,
-		},
-	},
-}
-SCHOOL_NATURE = add_school
-{
-	["name"] = "Nature", 
-	["skill"] = SKILL_NATURE,
-	["spell_power"] = TRUE,
-	["sorcery"] = TRUE,
-	["gods"] =
-	{
-		-- Yavanna Kementari provides the Nature school at 1/2 the prayer skill
-		[GOD_YAVANNA] =
-		{
-			["skill"] = SKILL_PRAY,
-			["mul"] = 1,
-			["div"] = 2,
-		},
-	},
-}
-SCHOOL_META = add_school
-{
-	["name"] = "Meta", 
-	["skill"] = SKILL_META,
-	["spell_power"] = TRUE,
-	["sorcery"] = TRUE,
-	["gods"] =
-	{
-		-- Manwe Sulimo provides the Meta school at 1/3 the prayer skill
-		[GOD_MANWE] =
-		{
-			["skill"] = SKILL_PRAY,
-			["mul"] = 1,
-			["div"] = 3,
-		},
-	},
-}
-SCHOOL_MIND = add_school
-{
-	["name"] = "Mind",
-	["skill"] = SKILL_MIND,
-	["spell_power"] = TRUE,
-	["sorcery"] = TRUE,
-	["gods"] =
-	{
-		-- Eru Iluvatar provides the Mind school at 1/3 the prayer skill
-		[GOD_ERU] =
-		{
-			["skill"] = SKILL_PRAY,
-			["mul"] = 1,
-			["div"] = 3,
-		},
-		-- Melkor Bauglir provides the Mind school at 1/3 the prayer skill
-		[GOD_MELKOR] =
-		{
-			["skill"] = SKILL_PRAY,
-			["mul"] = 1,
-			["div"] = 3,
-		},
-	},
-}
-SCHOOL_UDUN = add_school
-{
-	["name"] = 		"Udun",
-	["skill"] = 		SKILL_UDUN,
-	["bonus_level"] = 	function()
-					return ((player.lev * 2) / 3)
-				end,
-}
-SCHOOL_DEMON = add_school
-{
-	["name"] = "Demon",
-	["skill"] = SKILL_DAEMON,
-	["no_random"] = TRUE,
-}
-
--- The God specific schools, all tied to the prayer skill
-SCHOOL_ERU = add_school
-{
-	["name"] = "Eru Iluvatar",
-	["skill"] = SKILL_PRAY,
-	["spell_power"] = TRUE,
-	["god"] = GOD_ERU,
-}
-SCHOOL_MANWE = add_school
-{
-	["name"] = "Manwe Sulimo",
-	["skill"] = SKILL_PRAY,
-	["spell_power"] = TRUE,
-	["god"] = GOD_MANWE,
-}
-SCHOOL_TULKAS = add_school
-{
-	["name"] = "Tulkas",
-	["skill"] = SKILL_PRAY,
-	["spell_power"] = TRUE,
-	["god"] = GOD_TULKAS,
-}
-SCHOOL_MELKOR = add_school
-{
-	["name"] = "Melkor Bauglir",
-	["skill"] = SKILL_PRAY,
-	["spell_power"] = TRUE,
-	["god"] = GOD_MELKOR,
-}
-SCHOOL_YAVANNA = add_school
-{
-	["name"] = "Yavanna Kementari",
-	["skill"] = SKILL_PRAY,
-	["spell_power"] = TRUE,
-	["god"] = GOD_YAVANNA,
-}
-
--- Not a real school, rather a palcehodler for stick only spells
-SCHOOL_DEVICE = add_school
-{
-	["name"] = "Device",
-	["skill"] = SKILL_DEVICE,
-}
-
--- Music "spells"
-SCHOOL_MUSIC = add_school
-{
-	["name"] = "Music",
-	["skill"] = SKILL_MUSIC,
-}
-
--- Put some spells
-tome_dofile("s_fire.lua")
-tome_dofile("s_mana.lua")
-tome_dofile("s_water.lua")
-tome_dofile("s_air.lua")
-tome_dofile("s_earth.lua")
-tome_dofile("s_convey.lua")
-tome_dofile("s_nature.lua")
-tome_dofile("s_divin.lua")
-tome_dofile("s_tempo.lua")
-tome_dofile("s_meta.lua")
-tome_dofile("s_mind.lua")
-tome_dofile("s_udun.lua")
-tome_dofile("s_geom.lua")
-
--- God's specific spells
-tome_dofile("s_eru.lua")
-tome_dofile("s_manwe.lua")
-tome_dofile("s_tulkas.lua")
-tome_dofile("s_melkor.lua")
-tome_dofile("s_yavann.lua")
-
--- Specific schools
-tome_dofile("s_demon.lua")
-
--- Device spells
-tome_dofile("s_stick.lua")
-
--- Musics
-tome_dofile("s_music.lua")
-
--- List of spellbooks
-
--- Create the crystal of mana
-school_book[0] = {
-	MANATHRUST, DELCURSES, RESISTS, MANASHIELD,
-}
-
--- The book of the eternal flame
-school_book[1] = {
-	GLOBELIGHT, FIREGOLEM, FIREFLASH, FIREWALL, FIERYAURA,
-}
-
--- The book of the blowing winds
-school_book[2] = {
-	NOXIOUSCLOUD, POISONBLOOD, INVISIBILITY, STERILIZE, AIRWINGS, THUNDERSTORM,
-}
-
--- The book of the impenetrable earth
-school_book[3] = {
-	STONESKIN, DIG, STONEPRISON, SHAKE, STRIKE,
-}
-
--- The book of the unstopable wave
-school_book[4] = {
-	GEYSER, VAPOR, ENTPOTION, TIDALWAVE, ICESTORM
-}
-
--- Create the book of translocation
-school_book[5] = {
-	BLINK, DISARM, TELEPORT, TELEAWAY, RECALL, PROBABILITY_TRAVEL,
-}
-
--- Create the book of the tree
-school_book[6] = {
-	GROWTREE, HEALING, RECOVERY, REGENERATION, SUMMONANNIMAL,
-}
-
--- Create the book of Knowledge
-school_book[7] = {
-	SENSEMONSTERS, SENSEHIDDEN, REVEALWAYS, IDENTIFY, VISION, STARIDENTIFY,
-}
-
--- Create the book of the Time
-school_book[8] = {
-	MAGELOCK, SLOWMONSTER, ESSENCESPEED, BANISHMENT,
-}
-
--- Create the book of meta spells
-school_book[9] = {
-	RECHARGE, DISPERSEMAGIC, SPELLBINDER, TRACKER, INERTIA_CONTROL,
-}
-
--- Create the book of the mind
-school_book[10] = {
-	CHARM, CONFUSE, ARMOROFFEAR, STUN,
-}
-
--- Create the book of hellflame
-school_book[11] = {
-	DRAIN, GENOCIDE, WRAITHFORM, FLAMEOFUDUN,
-}
-
--- Create the book of eru
-school_book[20] = {
-	ERU_SEE, ERU_LISTEN, ERU_UNDERSTAND, ERU_PROT,
-}
-
--- Create the book of manwe
-school_book[21] = {
-	MANWE_BLESS, MANWE_SHIELD, MANWE_CALL, MANWE_AVATAR,
-}
-
--- Create the book of tulkas
-school_book[22] = {
-	TULKAS_AIM, TULKAS_SPIN, TULKAS_WAVE,
-}
-
--- Create the book of melkor
-school_book[23] = {
-	MELKOR_CURSE, MELKOR_CORPSE_EXPLOSION, MELKOR_MIND_STEAL,
-}
-
--- Create the book of yavanna
-school_book[24] = {
-	YAVANNA_CHARM_ANIMAL, YAVANNA_GROW_GRASS, YAVANNA_TREE_ROOTS, YAVANNA_WATER_BITE, YAVANNA_UPROOT,
-}
-
--- Create the book of beginner's cantrip
-school_book[50] = {
-	MANATHRUST, GLOBELIGHT, ENTPOTION, BLINK, SENSEMONSTERS, SENSEHIDDEN,
-}
-
--- Create the book of teleporatation
-school_book[51] = {
-	BLINK, TELEPORT, TELEAWAY
-}
-
--- Create the book of summoning
-school_book[52] = {
-	FIREGOLEM, SUMMONANNIMAL
-}
-
-
--- Create the Armageddon Demonblade
-school_book[55] = {
-	DEMON_BLADE, DEMON_MADNESS, DEMON_FIELD,
-}
-
--- Create the Shield Demonblade
-school_book[56] = {
-	DOOM_SHIELD, DEMON_CLOAK, UNHOLY_WORD,
-}
-
--- Create the Control Demonblade
-school_book[57] = {
-	DEMON_SUMMON, DISCHARGE_MINION, CONTROL_DEMON,
-}
-
--- Create the Drums
-school_book[58] = {
-	MUSIC_STOP, MUSIC_HOLD, MUSIC_CONF, MUSIC_STUN, 
-}
-
--- Create the Harps
-school_book[59] = {
-	MUSIC_STOP, MUSIC_LITE, MUSIC_HERO, MUSIC_HEAL, MUSIC_TIME, MUSIC_MIND,
-}
-
--- Create the Horns
-school_book[60] = {
-	MUSIC_STOP, MUSIC_BLOW, MUSIC_WIND, MUSIC_YLMIR, MUSIC_AMBARKANTA,
-}
-
--- Book of the Player, filled in by the Library Quest
-school_book[61] = { }
-
--- Geomancy spells, not a real book
-school_book[62] = {
-	CALL_THE_ELEMENTS, CHANNEL_ELEMENTS, ELEMENTAL_WAVE, VAPORIZE, GEOLYSIS, DRIPPING_TREAD, GROW_BARRIER, ELEMENTAL_MINION
-}
diff --git a/lib/scpt/stores.lua b/lib/scpt/stores.lua
deleted file mode 100644
index 03d29e6e..00000000
--- a/lib/scpt/stores.lua
+++ /dev/null
@@ -1,132 +0,0 @@
--- Whats shops can buy what
-store_buy_list
-{
-	["General Store"] =
-	{
-		TV_CORPSE,
-		TV_FOOD,
-		TV_LITE,
-		TV_FLASK,
-		TV_SPIKE,
-		TV_SHOT,
-		TV_ARROW,
-		TV_BOLT,
-		TV_DIGGING,
-		TV_CLOAK,
-		TV_BOTTLE,
-	},
-	["Armoury"] =
-	{
-		TV_BOOTS,
-		TV_GLOVES,
-		TV_CROWN,
-		TV_HELM,
-		TV_SHIELD,
-		TV_CLOAK,
-		TV_SOFT_ARMOR,
-		TV_HARD_ARMOR,
-		TV_DRAG_ARMOR,
-	},
-	["Weaponsmith"] =
-	{
-		TV_SHOT,
-		TV_BOLT,
-		TV_ARROW,
-		TV_BOOMERANG,
-		TV_BOW,
-		TV_DIGGING,
-		TV_HAFTED,
-		TV_POLEARM,
-		TV_SWORD,
-		TV_AXE,
-		TV_MSTAFF,
-	},
-	-- We use a function because we want to restrict to blessed weapons and god spells
-	["Temple"] = function (obj)
-		if obj.tval == TV_DRUID_BOOK then return TRUE
-		elseif obj.tval == TV_BOOK and obj.sval == 255 and (can_spell_random(obj.pval) == SKILL_SPIRITUALITY) then return TRUE
-		elseif obj.tval == TV_SCROLL then return TRUE
-		elseif obj.tval == TV_POTION2 then return TRUE
-		elseif obj.tval == TV_POTION then return TRUE
-		elseif obj.tval == TV_HAFTED then return TRUE
-		elseif obj.tval == TV_POLEARM and is_blessed(obj) == TRUE then return TRUE
-		elseif obj.tval == TV_SWORD and is_blessed(obj) == TRUE then return TRUE
-		elseif obj.tval == TV_AXE and is_blessed(obj) == TRUE then return TRUE
-		elseif obj.tval == TV_BOOMERANG and is_blessed(obj) == TRUE then return TRUE
-		end
-	end,
-	["Alchemy shop"] =
-	{
-		TV_SCROLL,
-		TV_POTION2,
-		TV_POTION,
-		TV_BATERIE,
-		TV_BOTTLE,
-	},
-	-- We use a function because we dont want god spells
-	["Magic shop"] = function (obj)
-		local buy =
-		{
-			[TV_SYMBIOTIC_BOOK] = TRUE,
-			[TV_AMULET] = TRUE,
-			[TV_RING] = TRUE,
-			[TV_STAFF] = TRUE,
-			[TV_WAND] = TRUE,
-			[TV_ROD] = TRUE,
-			[TV_ROD_MAIN] = TRUE,
-			[TV_SCROLL] = TRUE,
-			[TV_POTION2] = TRUE,
-			[TV_POTION] = TRUE,
-			[TV_MSTAFF] = TRUE,
-			[TV_RANDART] = TRUE,
-		}
-
-		if obj.tval == TV_BOOK and obj.sval == 255 and (can_spell_random(obj.pval) == SKILL_MAGIC) then return TRUE
-		elseif obj.tval == TV_BOOK and obj.sval ~= 255 then return TRUE
-		elseif buy[obj.tval] == TRUE then return TRUE
-		end
-	end,
-	-- Black markets wants ALL!
-	["Black Market"] = function (obj)
-		return TRUE
-	end,
-	["Book Store"] =
-	{
-		TV_BOOK,
-		TV_SYMBIOTIC_BOOK,
-		TV_MUSIC_BOOK,
-		TV_DAEMON_BOOK,
-		TV_DRUID_BOOK,
-	},
-	["Pet Shop"] =
-	{
-		TV_EGG,
-	},
-}
-
--- Take care to have Magic shop/Temple have specific spells only
-add_hooks
-{
-	[HOOK_STORE_STOCK] = function (index, name, level)
-			if name == "Magic shop" then
-				-- Books
-				if magik(20) == TRUE then
-					object_prep(obj_forge, lookup_kind(TV_BOOK, 255))
-					local spell = get_random_spell(SKILL_MAGIC, 20)
-					if spell > -1 then
-						obj_forge.pval = spell
-						return TRUE, obj_forge
-					end
-				end
-			elseif name == "Temple" then
-				if magik(20) == TRUE then
-					object_prep(obj_forge, lookup_kind(TV_BOOK, 255))
-					local spell = get_random_spell(SKILL_SPIRITUALITY, 20)
-					if spell > -1 then
-						obj_forge.pval = spell
-						return TRUE, obj_forge
-					end
-				end
-			end
-	end,
-}
diff --git a/lib/user/automat.atm b/lib/user/automat.atm
deleted file mode 100644
index e69de29b..00000000
--- a/lib/user/automat.atm
+++ /dev/null
diff --git a/lib/xtra/graf/16x16.bmp b/lib/xtra/graf/16x16.bmp
deleted file mode 100644
index 2e6b0ebf..00000000
--- a/lib/xtra/graf/16x16.bmp
+++ /dev/null
diff --git a/lib/xtra/graf/16x16.png b/lib/xtra/graf/16x16.png
deleted file mode 100644
index 9fc1681a..00000000
--- a/lib/xtra/graf/16x16.png
+++ /dev/null
diff --git a/lib/xtra/graf/8x8.bmp b/lib/xtra/graf/8x8.bmp
deleted file mode 100644
index 02d2d1a9..00000000
--- a/lib/xtra/graf/8x8.bmp
+++ /dev/null
diff --git a/lib/xtra/graf/8x8.png b/lib/xtra/graf/8x8.png
deleted file mode 100644
index d56e9d6a..00000000
--- a/lib/xtra/graf/8x8.png
+++ /dev/null
diff --git a/lib/xtra/graf/mask.bmp b/lib/xtra/graf/mask.bmp
deleted file mode 100644
index fced8b05..00000000
--- a/lib/xtra/graf/mask.bmp
+++ /dev/null
diff --git a/lib/xtra/graf/tome-128.png b/lib/xtra/graf/tome-128.png
deleted file mode 100644
index 31b79c31..00000000
--- a/lib/xtra/graf/tome-128.png
+++ /dev/null
diff --git a/lib/xtra/sound/Sound.cfg b/lib/xtra/sound/Sound.cfg
deleted file mode 100644
index eb3a7f39..00000000
--- a/lib/xtra/sound/Sound.cfg
+++ /dev/null
@@ -1,79 +0,0 @@
-# sound.cfg
-#
-# Configuration file for the Angband sound events
-#
-# The format is:
-# name of the Angband event = list of the available sample-names seperated by spaces.
-#
-# Example:
-# hit = hit.wav hit1.wav
-#
-# Look at the definition of "angband_sound_name" in variable.c for a complete list of
-# all the available event names.
-
-[Sound]
-hit = hit.wav drop.wav hit1.wav
-miss = miss.wav miss1.wav
-flee = flee.wav
-drop = clunk.wav
-kill = kill.wav destroy.wav kill1.wav
-level = level.wav 
-death = death.wav
-study = 
-teleport =
-shoot = 
-quaff = 
-zap =
-walk = 
-tpother =
-hitwall = 
-eat = eat.wav
-store1 = money.wav
-store2 = money.wav
-store3 = money.wav
-store4 = money.wav
-dig = thump.wav
-opendoor = opendoor.wav
-shutdoor = shutdoor.wav
-tplevel = teleport.wav
-scroll =
-buy =
-sell =
-warn =
-rocket =
-n_kill =
-u_kill =
-quest =
-heal =
-x_heal =
-bite =
-claw =
-m_spell =
-summon =
-breath =
-ball =
-m_heal =
-atkspell =
-evil =
-touch =
-sting =
-crush =
-slime =
-wail =
-winner =
-fire =
-acid =
-elec =
-cold =
-illegal =
-fail =
-wakeup =
-invuln =
-fall =
-pain =
-destitem =
-moan =
-show =
-unused =
-explode =
-
diff --git a/lib/xtra/sound/readme.txt b/lib/xtra/sound/readme.txt
deleted file mode 100644
index 49bb86a1..00000000
--- a/lib/xtra/sound/readme.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-New Sound Effect For Angband 2.8.1 Windows 95 (beta release)
-
-Changes since Alpha release:
-
-Altered sounds:	breath.wav
-		death.wav
-		flee.wav
-		hit.wav
-		kill.wav
-		
-
-New sounds:	None (no new events yet)
-
-
-Useage:
-
-Unzip files into your angband 2.8.1 sounds directory EG:
-
-C:\angband-281\lib\xtra\sound
-
-That's it!
-
-If you wish to use the sounds for any other purpose or wish to include them as the default sounds
-in your variant of Angband, contact me at either:
-
-tim.haywood@ocean.co.uk		or		timothy.haywood@virgin.net
-
-Legal Stuff:
-
-This is a patch for Angband 2.8.1 (Windows95 Version).
-Copyright @ 1997 Tim Haywood
-Not for resale.
-Not for release with original version of Angband without permission.